Merge branch 'main' into Ability-Flower-Veil
Brandon Rodgers
GitHub
commit
246dfe2b87
|
|
@ -11,6 +11,7 @@
|
|||
<meta property="og:image" content="https://pokerogue.net/logo512.png" />
|
||||
<link rel="apple-touch-icon" href="./logo512.png" />
|
||||
<link rel="shortcut icon" type="image/png" href="./logo512.png" />
|
||||
<link rel="canonical" href="https://pokerogue.net" />
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
|
||||
<style type="text/css">
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 60 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 295 B |
Binary file not shown.
|
After Width: | Height: | Size: 310 B |
Binary file not shown.
|
After Width: | Height: | Size: 182 B |
Binary file not shown.
|
After Width: | Height: | Size: 191 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 295 B |
Binary file not shown.
|
After Width: | Height: | Size: 310 B |
Binary file not shown.
|
After Width: | Height: | Size: 182 B |
Binary file not shown.
|
After Width: | Height: | Size: 191 B |
|
|
@ -646,7 +646,16 @@ export default class BattleScene extends SceneBase {
|
|||
const container = this.add.container(x, y);
|
||||
|
||||
const icon = this.add.sprite(0, 0, pokemon.getIconAtlasKey(ignoreOverride));
|
||||
icon.setFrame(pokemon.getIconId(true));
|
||||
icon.setFrame(pokemon.getIconId(true));
|
||||
// Temporary fix to show pokemon's default icon if variant icon doesn't exist
|
||||
if (icon.frame.name != pokemon.getIconId(true)) {
|
||||
console.log(`${pokemon.name}'s variant icon does not exist. Replacing with default.`)
|
||||
const temp = pokemon.shiny;
|
||||
pokemon.shiny = false;
|
||||
icon.setTexture(pokemon.getIconAtlasKey(ignoreOverride));
|
||||
icon.setFrame(pokemon.getIconId(true));
|
||||
pokemon.shiny = temp;
|
||||
}
|
||||
icon.setOrigin(0.5, 0);
|
||||
|
||||
container.add(icon);
|
||||
|
|
@ -732,6 +741,9 @@ export default class BattleScene extends SceneBase {
|
|||
|
||||
this.pokeballCounts = Object.fromEntries(Utils.getEnumValues(PokeballType).filter(p => p <= PokeballType.MASTER_BALL).map(t => [ t, 0 ]));
|
||||
this.pokeballCounts[PokeballType.POKEBALL] += 5;
|
||||
if (Overrides.POKEBALL_OVERRIDE.active) {
|
||||
this.pokeballCounts = Overrides.POKEBALL_OVERRIDE.pokeballs;
|
||||
}
|
||||
|
||||
this.modifiers = [];
|
||||
this.enemyModifiers = [];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { Type } from "./type";
|
|||
import * as Utils from "../utils";
|
||||
import { BattleStat, getBattleStatName } from "./battle-stat";
|
||||
import { PokemonHealPhase, ShowAbilityPhase, StatChangePhase } from "../phases";
|
||||
import { getPokemonMessage } from "../messages";
|
||||
import { getPokemonMessage, getPokemonPrefix } from "../messages";
|
||||
import { Weather, WeatherType } from "./weather";
|
||||
import { BattlerTag } from "./battler-tags";
|
||||
import { BattlerTagType } from "./enums/battler-tag-type";
|
||||
|
|
@ -144,7 +144,7 @@ export class BlockRecoilDamageAttr extends AbAttr {
|
|||
}
|
||||
|
||||
getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]) {
|
||||
return getPokemonMessage(pokemon, `'s ${abilityName}\nprotected it from recoil!`);
|
||||
return i18next.t('abilityTriggers:blockRecoilDamage', {pokemonName: `${getPokemonPrefix(pokemon)}${pokemon.name}`, abilityName: abilityName});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -249,10 +249,13 @@ export class PreDefendFormChangeAbAttr extends PreDefendAbAttr {
|
|||
}
|
||||
export class PreDefendFullHpEndureAbAttr extends PreDefendAbAttr {
|
||||
applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, cancelled: Utils.BooleanHolder, args: any[]): boolean {
|
||||
if (pokemon.getMaxHp() <= 1 && (pokemon.getHpRatio() < 1 || (args[0] as Utils.NumberHolder).value < pokemon.hp))
|
||||
return false;
|
||||
if (pokemon.hp === pokemon.getMaxHp() &&
|
||||
pokemon.getMaxHp() > 1 && //Checks if pokemon has wonder_guard (which forces 1hp)
|
||||
(args[0] as Utils.NumberHolder).value >= pokemon.hp){ //Damage >= hp
|
||||
return pokemon.addTag(BattlerTagType.STURDY, 1);
|
||||
}
|
||||
|
||||
return pokemon.addTag(BattlerTagType.STURDY, 1);
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -988,6 +991,42 @@ export class MoveTypeChangeAttr extends PreAttackAbAttr {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Class for abilities that boost the damage of moves
|
||||
* For abilities that boost the base power of moves, see VariableMovePowerAbAttr
|
||||
* @param damageMultiplier the amount to multiply the damage by
|
||||
* @param condition the condition for this ability to be applied
|
||||
*/
|
||||
export class DamageBoostAbAttr extends PreAttackAbAttr {
|
||||
private damageMultiplier: number;
|
||||
private condition: PokemonAttackCondition;
|
||||
|
||||
constructor(damageMultiplier: number, condition: PokemonAttackCondition){
|
||||
super(true);
|
||||
this.damageMultiplier = damageMultiplier;
|
||||
this.condition = condition;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param pokemon the attacker pokemon
|
||||
* @param passive N/A
|
||||
* @param defender the target pokemon
|
||||
* @param move the move used by the attacker pokemon
|
||||
* @param args Utils.NumberHolder as damage
|
||||
* @returns true if the function succeeds
|
||||
*/
|
||||
applyPreAttack(pokemon: Pokemon, passive: boolean, defender: Pokemon, move: PokemonMove, args: any[]): boolean {
|
||||
if (this.condition(pokemon, defender, move.getMove())) {
|
||||
const power = args[0] as Utils.NumberHolder;
|
||||
power.value = Math.floor(power.value * this.damageMultiplier);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
export class MovePowerBoostAbAttr extends VariableMovePowerAbAttr {
|
||||
private condition: PokemonAttackCondition;
|
||||
private powerMultiplier: number;
|
||||
|
|
@ -1368,6 +1407,23 @@ export class PostSummonMessageAbAttr extends PostSummonAbAttr {
|
|||
}
|
||||
}
|
||||
|
||||
export class PostSummonUnnamedMessageAbAttr extends PostSummonAbAttr {
|
||||
//Attr doesn't force pokemon name on the message
|
||||
private message: string;
|
||||
|
||||
constructor(message: string) {
|
||||
super(true);
|
||||
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
applyPostSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean {
|
||||
pokemon.scene.queueMessage(this.message);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
export class PostSummonAddBattlerTagAbAttr extends PostSummonAbAttr {
|
||||
private tagType: BattlerTagType;
|
||||
private turnCount: integer;
|
||||
|
|
@ -1445,6 +1501,34 @@ export class PostSummonAllyHealAbAttr extends PostSummonAbAttr {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Resets an ally's temporary stat boots to zero with no regard to
|
||||
* whether this is a positive or negative change
|
||||
* @param pokemon The {@link Pokemon} with this {@link AbAttr}
|
||||
* @param passive N/A
|
||||
* @param args N/A
|
||||
* @returns if the move was successful
|
||||
*/
|
||||
export class PostSummonClearAllyStatsAbAttr extends PostSummonAbAttr {
|
||||
constructor() {
|
||||
super();
|
||||
}
|
||||
|
||||
applyPostSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean {
|
||||
const target = pokemon.getAlly();
|
||||
if (target?.isActive(true)) {
|
||||
for (let s = 0; s < target.summonData.battleStats.length; s++)
|
||||
target.summonData.battleStats[s] = 0;
|
||||
|
||||
target.scene.queueMessage(getPokemonMessage(target, `'s stat changes\nwere removed!`));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
export class DownloadAbAttr extends PostSummonAbAttr {
|
||||
private enemyDef: integer;
|
||||
private enemySpDef: integer;
|
||||
|
|
@ -2362,6 +2446,26 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Attribute used for abilities (Innards Out) that damage the opponent based on how much HP the last attack used to knock out the owner of the ability.
|
||||
*/
|
||||
export class PostFaintHPDamageAbAttr extends PostFaintAbAttr {
|
||||
constructor() {
|
||||
super ();
|
||||
}
|
||||
|
||||
applyPostFaint(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean {
|
||||
const damage = pokemon.turnData.attacksReceived[0].damage;
|
||||
attacker.damageAndUpdate((damage), HitResult.OTHER);
|
||||
attacker.turnData.damageTaken += damage;
|
||||
return true;
|
||||
}
|
||||
|
||||
getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
|
||||
return getPokemonMessage(pokemon, `'s ${abilityName} hurt\nits attacker!`);
|
||||
}
|
||||
}
|
||||
|
||||
export class RedirectMoveAbAttr extends AbAttr {
|
||||
apply(pokemon: Pokemon, passive: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
|
||||
if (this.canRedirect(args[0] as Moves)) {
|
||||
|
|
@ -2778,7 +2882,7 @@ export const allAbilities = [ new Ability(Abilities.NONE, 3) ];
|
|||
export function initAbilities() {
|
||||
allAbilities.push(
|
||||
new Ability(Abilities.STENCH, 3)
|
||||
.attr(PostAttackApplyBattlerTagAbAttr, false, (user, target, move) => !move.getMove().findAttr(attr => attr instanceof FlinchAttr) ? 10 : 0, BattlerTagType.FLINCHED),
|
||||
.attr(PostAttackApplyBattlerTagAbAttr, false, (user, target, move) => (move.getMove().category !== MoveCategory.STATUS && !move.getMove().findAttr(attr => attr instanceof FlinchAttr)) ? 10 : 0, BattlerTagType.FLINCHED),
|
||||
new Ability(Abilities.DRIZZLE, 3)
|
||||
.attr(PostSummonWeatherChangeAbAttr, WeatherType.RAIN)
|
||||
.attr(PostBiomeChangeWeatherChangeAbAttr, WeatherType.RAIN),
|
||||
|
|
@ -2992,7 +3096,8 @@ export function initAbilities() {
|
|||
.attr(BlockCritAbAttr)
|
||||
.ignorable(),
|
||||
new Ability(Abilities.AIR_LOCK, 3)
|
||||
.attr(SuppressWeatherEffectAbAttr, true),
|
||||
.attr(SuppressWeatherEffectAbAttr, true)
|
||||
.attr(PostSummonUnnamedMessageAbAttr, "The effects of the weather disappeared."),
|
||||
new Ability(Abilities.TANGLED_FEET, 4)
|
||||
.conditionalAttr(pokemon => !!pokemon.getTag(BattlerTagType.CONFUSED), BattleStatMultiplierAbAttr, BattleStat.EVA, 2)
|
||||
.ignorable(),
|
||||
|
|
@ -3088,7 +3193,7 @@ export function initAbilities() {
|
|||
.attr(IgnoreOpponentStatChangesAbAttr)
|
||||
.ignorable(),
|
||||
new Ability(Abilities.TINTED_LENS, 4)
|
||||
.attr(MovePowerBoostAbAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) <= 0.5, 2),
|
||||
.attr(DamageBoostAbAttr, 2, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) <= 0.5),
|
||||
new Ability(Abilities.FILTER, 4)
|
||||
.attr(ReceivedMoveDamageMultiplierAbAttr,(target, user, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2, 0.75)
|
||||
.ignorable(),
|
||||
|
|
@ -3173,8 +3278,8 @@ export function initAbilities() {
|
|||
new Ability(Abilities.HARVEST, 5)
|
||||
.unimplemented(),
|
||||
new Ability(Abilities.TELEPATHY, 5)
|
||||
.ignorable()
|
||||
.unimplemented(),
|
||||
.attr(MoveImmunityAbAttr, (pokemon, attacker, move) => pokemon.getAlly() === attacker && move.getMove() instanceof AttackMove)
|
||||
.ignorable(),
|
||||
new Ability(Abilities.MOODY, 5)
|
||||
.attr(MoodyAbAttr),
|
||||
new Ability(Abilities.OVERCOAT, 5)
|
||||
|
|
@ -3402,9 +3507,9 @@ export function initAbilities() {
|
|||
.attr(UnsuppressableAbilityAbAttr)
|
||||
.attr(NoFusionAbilityAbAttr),
|
||||
new Ability(Abilities.POWER_CONSTRUCT, 7) // TODO: 10% Power Construct Zygarde isn't accounted for yet. If changed, update Zygarde's getSpeciesFormIndex entry accordingly
|
||||
.attr(PostBattleInitFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2)
|
||||
.attr(PostSummonFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2)
|
||||
.attr(PostTurnFormChangeAbAttr, p => p.getHpRatio() <= 0.5 ? 4 : 2)
|
||||
.attr(PostBattleInitFormChangeAbAttr, p => p.getHpRatio() <= 0.5 || p.getFormKey() === 'complete' ? 4 : 2)
|
||||
.attr(PostSummonFormChangeAbAttr, p => p.getHpRatio() <= 0.5 || p.getFormKey() === 'complete' ? 4 : 2)
|
||||
.attr(PostTurnFormChangeAbAttr, p => p.getHpRatio() <= 0.5 || p.getFormKey() === 'complete' ? 4 : 2)
|
||||
.attr(UncopiableAbilityAbAttr)
|
||||
.attr(UnswappableAbilityAbAttr)
|
||||
.attr(UnsuppressableAbilityAbAttr)
|
||||
|
|
@ -3421,7 +3526,8 @@ export function initAbilities() {
|
|||
.attr(FieldPriorityMoveImmunityAbAttr)
|
||||
.ignorable(),
|
||||
new Ability(Abilities.INNARDS_OUT, 7)
|
||||
.unimplemented(),
|
||||
.attr(PostFaintHPDamageAbAttr)
|
||||
.bypassFaint(),
|
||||
new Ability(Abilities.DANCER, 7)
|
||||
.unimplemented(),
|
||||
new Ability(Abilities.BATTERY, 7)
|
||||
|
|
@ -3569,7 +3675,7 @@ export function initAbilities() {
|
|||
new Ability(Abilities.UNSEEN_FIST, 8)
|
||||
.unimplemented(),
|
||||
new Ability(Abilities.CURIOUS_MEDICINE, 8)
|
||||
.unimplemented(),
|
||||
.attr(PostSummonClearAllyStatsAbAttr),
|
||||
new Ability(Abilities.TRANSISTOR, 8)
|
||||
.attr(MoveTypePowerBoostAbAttr, Type.ELECTRIC),
|
||||
new Ability(Abilities.DRAGONS_MAW, 8)
|
||||
|
|
|
|||
|
|
@ -824,7 +824,7 @@ export class HealAttr extends MoveEffectAttr {
|
|||
|
||||
addHealPhase(target: Pokemon, healRatio: number) {
|
||||
target.scene.unshiftPhase(new PokemonHealPhase(target.scene, target.getBattlerIndex(),
|
||||
Math.max(Math.floor(target.getMaxHp() * healRatio), 1), getPokemonMessage(target, ' regained\nhealth!'), true, !this.showAnim));
|
||||
Math.max(Math.floor(target.getMaxHp() * healRatio), 1), getPokemonMessage(target, ' \nhad its HP restored.'), true, !this.showAnim));
|
||||
}
|
||||
|
||||
getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer {
|
||||
|
|
@ -962,6 +962,42 @@ export class SandHealAttr extends WeatherHealAttr {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Heals the target by either {@link normalHealRatio} or {@link boostedHealRatio}
|
||||
* depending on the evaluation of {@link condition}
|
||||
* @see {@link apply}
|
||||
* @param user The Pokemon using this move
|
||||
* @param target The target Pokemon of this move
|
||||
* @param move This move
|
||||
* @param args N/A
|
||||
* @returns if the move was successful
|
||||
*/
|
||||
export class BoostHealAttr extends HealAttr {
|
||||
private normalHealRatio?: number;
|
||||
private boostedHealRatio?: number;
|
||||
private condition?: MoveConditionFunc;
|
||||
|
||||
/**
|
||||
* @param normalHealRatio Healing received when {@link condition} is false
|
||||
* @param boostedHealRatio Healing received when {@link condition} is true
|
||||
* @param showAnim Should a healing animation be showed?
|
||||
* @param selfTarget Should the move target the user?
|
||||
* @param condition The condition to check against when boosting the healing value
|
||||
*/
|
||||
constructor(normalHealRatio?: number, boostedHealRatio?: number, showAnim?: boolean, selfTarget?: boolean, condition?: MoveConditionFunc) {
|
||||
super(normalHealRatio, showAnim, selfTarget);
|
||||
this.normalHealRatio = normalHealRatio;
|
||||
this.boostedHealRatio = boostedHealRatio;
|
||||
this.condition = condition;
|
||||
}
|
||||
|
||||
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
|
||||
const healRatio = this.condition(user, target, move) ? this.boostedHealRatio : this.normalHealRatio;
|
||||
this.addHealPhase(target, healRatio);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
export class HitHealAttr extends MoveEffectAttr {
|
||||
private healRatio: number;
|
||||
|
||||
|
|
@ -1317,6 +1353,25 @@ export class BypassSleepAttr extends MoveAttr {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Attribute used for moves that bypass the burn damage reduction of physical moves, currently only facade
|
||||
* Called during damage calculation
|
||||
* @param user N/A
|
||||
* @param target N/A
|
||||
* @param move Move with this attribute
|
||||
* @param args Utils.BooleanHolder for burnDamageReductionCancelled
|
||||
* @returns true if the function succeeds
|
||||
*/
|
||||
export class BypassBurnDamageReductionAttr extends MoveAttr {
|
||||
|
||||
/** Prevents the move's damage from being reduced by burn */
|
||||
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
|
||||
(args[0] as Utils.BooleanHolder).value = true;
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
export class WeatherChangeAttr extends MoveEffectAttr {
|
||||
private weatherType: WeatherType;
|
||||
|
||||
|
|
@ -4868,7 +4923,8 @@ export function initMoves() {
|
|||
.attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPATK ], -2),
|
||||
new AttackMove(Moves.FACADE, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 3)
|
||||
.attr(MovePowerMultiplierAttr, (user, target, move) => user.status
|
||||
&& (user.status.effect === StatusEffect.BURN || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.PARALYSIS) ? 2 : 1),
|
||||
&& (user.status.effect === StatusEffect.BURN || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.PARALYSIS) ? 2 : 1)
|
||||
.attr(BypassBurnDamageReductionAttr),
|
||||
new AttackMove(Moves.FOCUS_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 20, -1, -3, 3)
|
||||
.punchingMove()
|
||||
.ignoresVirtual()
|
||||
|
|
@ -5977,9 +6033,8 @@ export function initMoves() {
|
|||
.attr(StatChangeAttr, BattleStat.SPD, -1, true)
|
||||
.punchingMove(),
|
||||
new StatusMove(Moves.FLORAL_HEALING, Type.FAIRY, -1, 10, -1, 0, 7)
|
||||
.attr(HealAttr, 0.5, true, false)
|
||||
.triageMove()
|
||||
.partial(),
|
||||
.attr(BoostHealAttr, 0.5, 2/3, true, false, (user, target, move) => user.scene.arena.terrain?.terrainType === TerrainType.GRASSY)
|
||||
.triageMove(),
|
||||
new AttackMove(Moves.HIGH_HORSEPOWER, Type.GROUND, MoveCategory.PHYSICAL, 95, 95, 10, -1, 0, 7),
|
||||
new StatusMove(Moves.STRENGTH_SAP, Type.GRASS, 100, 10, 100, 0, 7)
|
||||
.attr(StrengthSapHealAttr)
|
||||
|
|
@ -6786,7 +6841,7 @@ export function initMoves() {
|
|||
const turnMove = user.getLastXMoves(1);
|
||||
return !turnMove.length || turnMove[0].move !== move.id || turnMove[0].result !== MoveResult.SUCCESS;
|
||||
}), // TODO Add Instruct/Encore interaction
|
||||
new AttackMove(Moves.COMEUPPANCE, Type.DARK, MoveCategory.PHYSICAL, 1, 100, 10, -1, 0, 9)
|
||||
new AttackMove(Moves.COMEUPPANCE, Type.DARK, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9)
|
||||
.attr(CounterDamageAttr, (move: Move) => (move.category === MoveCategory.PHYSICAL || move.category === MoveCategory.SPECIAL), 1.5)
|
||||
.target(MoveTarget.ATTACKER),
|
||||
new AttackMove(Moves.AQUA_CUTTER, Type.WATER, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 9)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import { Gender } from "./gender";
|
||||
import { AttackTypeBoosterModifier, FlinchChanceModifier } from "../modifier/modifier";
|
||||
import { AttackTypeBoosterModifierType } from "../modifier/modifier-type";
|
||||
import { Moves } from "./enums/moves";
|
||||
import { PokeballType } from "./pokeball";
|
||||
import Pokemon from "../field/pokemon";
|
||||
|
|
@ -1392,9 +1391,9 @@ export const pokemonEvolutions: PokemonEvolutions = {
|
|||
new SpeciesEvolution(Species.CRABOMINABLE, 1, EvolutionItem.ICE_STONE, null)
|
||||
],
|
||||
[Species.ROCKRUFF]: [
|
||||
new SpeciesFormEvolution(Species.LYCANROC, '', 'midday', 25, null, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.DAY), null),
|
||||
new SpeciesFormEvolution(Species.LYCANROC, '', 'dusk', 25, null, new SpeciesEvolutionCondition(p => p.scene.getSpeciesFormIndex(p.species) === 1), null),
|
||||
new SpeciesFormEvolution(Species.LYCANROC, '', 'midnight', 25, null, new SpeciesEvolutionCondition(p => p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), null)
|
||||
new SpeciesFormEvolution(Species.LYCANROC, '', 'midday', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.DAWN || p.scene.arena.getTimeOfDay() === TimeOfDay.DAY) && (p.formIndex === 0)), null),
|
||||
new SpeciesFormEvolution(Species.LYCANROC, '', 'dusk', 25, null, new SpeciesEvolutionCondition(p => p.formIndex === 1), null),
|
||||
new SpeciesFormEvolution(Species.LYCANROC, '', 'midnight', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK || p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT) && (p.formIndex === 0)), null)
|
||||
],
|
||||
[Species.STEENEE]: [
|
||||
new SpeciesEvolution(Species.TSAREENA, 28, null, new SpeciesEvolutionCondition(p => p.moveset.filter(m => m.moveId === Moves.STOMP).length > 0), SpeciesWildEvolutionDelay.LONG)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ export default class DamageNumberHandler {
|
|||
add(target: Pokemon, amount: integer, result: DamageResult | HitResult.HEAL = HitResult.EFFECTIVE, critical: boolean = false): void {
|
||||
const scene = target.scene;
|
||||
|
||||
if (!scene.damageNumbersMode)
|
||||
if (!scene?.damageNumbersMode)
|
||||
return;
|
||||
|
||||
const battlerIndex = target.getBattlerIndex();
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import { Variant, VariantSet, variantColorCache } from '#app/data/variant';
|
|||
import { variantData } from '#app/data/variant';
|
||||
import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from '../ui/battle-info';
|
||||
import { Moves } from "../data/enums/moves";
|
||||
import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, VariablePowerAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, MultiHitAttr, StatusMoveTypeImmunityAttr, MoveTarget, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveTypeAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatChangeAttr, RechargeAttr, ChargeAttr, IgnoreWeatherTypeDebuffAttr } from "../data/move";
|
||||
import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, VariablePowerAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, MultiHitAttr, StatusMoveTypeImmunityAttr, MoveTarget, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveTypeAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatChangeAttr, RechargeAttr, ChargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr } from "../data/move";
|
||||
import { default as PokemonSpecies, PokemonSpeciesForm, SpeciesFormKey, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm, getStarterValueFriendshipCap, speciesStarters, starterPassiveAbilities } from '../data/pokemon-species';
|
||||
import * as Utils from '../utils';
|
||||
import { Type, TypeDamageMultiplier, getTypeDamageMultiplier, getTypeRgb } from '../data/type';
|
||||
|
|
@ -27,7 +27,7 @@ import { TempBattleStat } from '../data/temp-battle-stat';
|
|||
import { ArenaTagSide, WeakenMoveScreenTag, WeakenMoveTypeTag } from '../data/arena-tag';
|
||||
import { ArenaTagType } from "../data/enums/arena-tag-type";
|
||||
import { Biome } from "../data/enums/biome";
|
||||
import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, FieldVariableMovePowerAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, MoveTypeChangeAttr, NonSuperEffectiveImmunityAbAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, VariableMoveTypeAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPostDefendAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, AllyStatusEffectImmunityAbAttr, AllyBattlerTagImmunityAbAttr } from '../data/ability';
|
||||
import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, FieldVariableMovePowerAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, MoveTypeChangeAttr, NonSuperEffectiveImmunityAbAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, VariableMoveTypeAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPostDefendAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, AllyStatusEffectImmunityAbAttr, AllyBattlerTagImmunityAbAttr } from '../data/ability';
|
||||
import { Abilities } from "#app/data/enums/abilities";
|
||||
import PokemonData from '../system/pokemon-data';
|
||||
import Battle, { BattlerIndex } from '../battle';
|
||||
|
|
@ -1096,11 +1096,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
|||
|
||||
let shinyThreshold = new Utils.IntegerHolder(32);
|
||||
if (thresholdOverride === undefined) {
|
||||
if (!this.hasTrainer()) {
|
||||
if (new Date() < new Date('2024-05-13'))
|
||||
shinyThreshold.value *= 3;
|
||||
if (!this.hasTrainer())
|
||||
this.scene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold);
|
||||
}
|
||||
} else
|
||||
shinyThreshold.value = thresholdOverride;
|
||||
|
||||
|
|
@ -1228,24 +1225,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
|||
}
|
||||
}
|
||||
|
||||
if (this.level >= 25) { // No egg moves below level 25
|
||||
if (this.level >= 60) { // No egg moves below level 60
|
||||
for (let i = 0; i < 3; i++) {
|
||||
const moveId = speciesEggMoves[this.species.getRootSpeciesId()][i];
|
||||
if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(' (N)'))
|
||||
movePool.push([moveId, Math.min(this.level * 0.5, 40)]);
|
||||
}
|
||||
const moveId = speciesEggMoves[this.species.getRootSpeciesId()][3];
|
||||
if (this.level >= 60 && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(' (N)')) // No rare egg moves before level 60
|
||||
movePool.push([moveId, Math.min(this.level * 0.2, 20)]);
|
||||
if (this.fusionSpecies) {
|
||||
for (let i = 0; i < 3; i++) {
|
||||
const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][i];
|
||||
if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(' (N)'))
|
||||
movePool.push([moveId, Math.min(this.level * 0.5, 30)]);
|
||||
}
|
||||
const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][3];
|
||||
if (this.level >= 60 && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(' (N)')) // No rare egg moves before level 60
|
||||
movePool.push([moveId, Math.min(this.level * 0.2, 20)]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1543,11 +1534,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
|||
if (!isTypeImmune) {
|
||||
damage.value = Math.ceil(((((2 * source.level / 5 + 2) * power.value * sourceAtk.value / targetDef.value) / 50) + 2) * stabMultiplier.value * typeMultiplier.value * arenaAttackTypeMultiplier.value * screenMultiplier.value * ((this.scene.randBattleSeedInt(15) + 85) / 100) * criticalMultiplier.value);
|
||||
if (isPhysical && source.status && source.status.effect === StatusEffect.BURN) {
|
||||
const burnDamageReductionCancelled = new Utils.BooleanHolder(false);
|
||||
applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled);
|
||||
if (!burnDamageReductionCancelled.value)
|
||||
damage.value = Math.floor(damage.value / 2);
|
||||
if(!move.getAttrs(BypassBurnDamageReductionAttr).length) {
|
||||
const burnDamageReductionCancelled = new Utils.BooleanHolder(false);
|
||||
applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled);
|
||||
if (!burnDamageReductionCancelled.value)
|
||||
damage.value = Math.floor(damage.value / 2);
|
||||
}
|
||||
}
|
||||
|
||||
applyPreAttackAbAttrs(DamageBoostAbAttr, source, this, battlerMove, damage);
|
||||
|
||||
move.getAttrs(HitsTagAttr).map(hta => hta as HitsTagAttr).filter(hta => hta.doubleDamage).forEach(hta => {
|
||||
if (this.getTag(hta.tagType))
|
||||
damage.value *= 2;
|
||||
|
|
@ -2496,6 +2492,13 @@ export class PlayerPokemon extends Pokemon {
|
|||
constructor(scene: BattleScene, species: PokemonSpecies, level: integer, abilityIndex: integer, formIndex: integer, gender: Gender, shiny: boolean, variant: Variant, ivs: integer[], nature: Nature, dataSource: Pokemon | PokemonData) {
|
||||
super(scene, 106, 148, species, level, abilityIndex, formIndex, gender, shiny, variant, ivs, nature, dataSource);
|
||||
|
||||
if (Overrides.SHINY_OVERRIDE) {
|
||||
this.shiny = true;
|
||||
this.initShinySparkle();
|
||||
if (Overrides.VARIANT_OVERRIDE)
|
||||
this.variant = Overrides.VARIANT_OVERRIDE;
|
||||
}
|
||||
|
||||
if (!dataSource)
|
||||
this.generateAndPopulateMoveset();
|
||||
this.generateCompatibleTms();
|
||||
|
|
|
|||
|
|
@ -100,6 +100,10 @@ export class LoadingScene extends SceneBase {
|
|||
this.loadImage('summary_bg', 'ui');
|
||||
this.loadImage('summary_overlay_shiny', 'ui');
|
||||
this.loadImage('summary_profile', 'ui');
|
||||
this.loadImage('summary_profile_prompt_z', 'ui') // The pixel Z button prompt
|
||||
this.loadImage('summary_profile_prompt_a', 'ui'); // The pixel A button prompt
|
||||
this.loadImage('summary_profile_ability', 'ui'); // Pixel text 'ABILITY'
|
||||
this.loadImage('summary_profile_passive', 'ui'); // Pixel text 'PASSIVE'
|
||||
this.loadImage('summary_status', 'ui');
|
||||
this.loadImage('summary_stats', 'ui');
|
||||
this.loadImage('summary_stats_overlay_exp', 'ui');
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const abilityTriggers: SimpleTranslationEntries = {
|
||||
'blockRecoilDamage' : `{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!`,
|
||||
} as const;
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
import { ability } from "./ability";
|
||||
import { abilityTriggers } from "./ability-trigger";
|
||||
import { battle } from "./battle";
|
||||
import { commandUiHandler } from "./command-ui-handler";
|
||||
import { fightUiHandler } from "./fight-ui-handler";
|
||||
|
|
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";
|
|||
|
||||
export const deConfig = {
|
||||
ability: ability,
|
||||
abilityTriggers: abilityTriggers,
|
||||
battle: battle,
|
||||
commandUiHandler: commandUiHandler,
|
||||
fightUiHandler: fightUiHandler,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const fightUiHandler: SimpleTranslationEntries = {
|
||||
"pp": "PP",
|
||||
"power": "Power",
|
||||
"accuracy": "Accuracy",
|
||||
"pp": "AP",
|
||||
"power": "Stärke",
|
||||
"accuracy": "Genauigkeit",
|
||||
} as const;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const growth: SimpleTranslationEntries = {
|
||||
"Erratic": "Erratic",
|
||||
"Fast": "Fast",
|
||||
"Medium_Fast": "Medium Fast",
|
||||
"Medium_Slow": "Medium Slow",
|
||||
"Slow": "Slow",
|
||||
"Fluctuating": "Fluctuating"
|
||||
"Erratic": "Unregelmäßig",
|
||||
"Fast": "Schnell",
|
||||
"Medium_Fast": "Schneller",
|
||||
"Medium_Slow": "Langsamer",
|
||||
"Slow": "Langsam",
|
||||
"Fluctuating": "Schwankend"
|
||||
} as const;
|
||||
|
|
@ -898,14 +898,14 @@ export const pokemon: SimpleTranslationEntries = {
|
|||
"regidrago": "Regidrago",
|
||||
"glastrier": "Polaross",
|
||||
"spectrier": "Phantoross",
|
||||
"calyrex": "Calyrex",
|
||||
"calyrex": "Coronospa",
|
||||
"wyrdeer": "Damythir",
|
||||
"kleavor": "Axantor",
|
||||
"ursaluna": "Ursaluna",
|
||||
"basculegion": "Salmagnis",
|
||||
"sneasler": "Snieboss",
|
||||
"overqwil": "Myriador",
|
||||
"enamorus": "Enamorus",
|
||||
"enamorus": "Cupidos",
|
||||
"sprigatito": "Felori",
|
||||
"floragato": "Feliospa",
|
||||
"meowscarada": "Maskagato",
|
||||
|
|
@ -1059,7 +1059,7 @@ export const pokemon: SimpleTranslationEntries = {
|
|||
"galar_slowking": "Laschoking",
|
||||
"galar_corsola": "Corasonn",
|
||||
"galar_zigzagoon": "Zigzachs",
|
||||
"galar_linoone": "Geradachs",
|
||||
"galar_linoone": "Geradaks",
|
||||
"galar_darumaka": "Flampion",
|
||||
"galar_darmanitan": "Flampivian",
|
||||
"galar_yamask": "Makabaja",
|
||||
|
|
|
|||
|
|
@ -28,5 +28,8 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
|
|||
"cycleNature": "N: Wesen Ändern",
|
||||
"cycleVariant": "V: Seltenheit ändern",
|
||||
"enablePassive": "Passiv-Skill aktivieren",
|
||||
"disablePassive": "Passiv-Skill deaktivieren"
|
||||
"disablePassive": "Passiv-Skill deaktivieren",
|
||||
"locked": "Gesperrt",
|
||||
"disabled": "Deaktiviert",
|
||||
"uncaught": "Uncaught"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const abilityTriggers: SimpleTranslationEntries = {
|
||||
'blockRecoilDamage' : `{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!`,
|
||||
} as const;
|
||||
|
|
@ -475,7 +475,7 @@ export const ability: AbilityTranslationEntries = {
|
|||
},
|
||||
frisk: {
|
||||
name: "Frisk",
|
||||
description: "When it enters a battle, the Pokémon can check an opposing Pokémon's held item.",
|
||||
description: "When it enters a battle, the Pokémon can check an opposing Pokémon's Ability.",
|
||||
},
|
||||
reckless: {
|
||||
name: "Reckless",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { ability } from "./ability";
|
||||
import { abilityTriggers } from "./ability-trigger";
|
||||
import { battle } from "./battle";
|
||||
import { commandUiHandler } from "./command-ui-handler";
|
||||
import { fightUiHandler } from "./fight-ui-handler";
|
||||
|
|
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";
|
|||
|
||||
export const enConfig = {
|
||||
ability: ability,
|
||||
abilityTriggers: abilityTriggers,
|
||||
battle: battle,
|
||||
commandUiHandler: commandUiHandler,
|
||||
fightUiHandler: fightUiHandler,
|
||||
|
|
|
|||
|
|
@ -28,5 +28,8 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
|
|||
"cycleNature": 'N: Cycle Nature',
|
||||
"cycleVariant": 'V: Cycle Variant',
|
||||
"enablePassive": "Enable Passive",
|
||||
"disablePassive": "Disable Passive"
|
||||
"disablePassive": "Disable Passive",
|
||||
"locked": "Locked",
|
||||
"disabled": "Disabled",
|
||||
"uncaught": "Uncaught"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const abilityTriggers: SimpleTranslationEntries = {
|
||||
'blockRecoilDamage' : `{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!`,
|
||||
} as const;
|
||||
|
|
@ -475,7 +475,7 @@ export const ability: AbilityTranslationEntries = {
|
|||
},
|
||||
"frisk": {
|
||||
name: "Cacheo",
|
||||
description: "Puede ver el objeto que lleva el rival al entrar en combate."
|
||||
description: "Cuando entra en combate, el Pokémon puede comprobar la habilidad de un Pokémon rival."
|
||||
},
|
||||
"reckless": {
|
||||
name: "Audaz",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { ability } from "./ability";
|
||||
import { abilityTriggers } from "./ability-trigger";
|
||||
import { battle } from "./battle";
|
||||
import { commandUiHandler } from "./command-ui-handler";
|
||||
import { fightUiHandler } from "./fight-ui-handler";
|
||||
|
|
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";
|
|||
|
||||
export const esConfig = {
|
||||
ability: ability,
|
||||
abilityTriggers: abilityTriggers,
|
||||
battle: battle,
|
||||
commandUiHandler: commandUiHandler,
|
||||
fightUiHandler: fightUiHandler,
|
||||
|
|
|
|||
|
|
@ -28,5 +28,8 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
|
|||
"cycleNature": 'N: Cambiar Naturaleza',
|
||||
"cycleVariant": 'V: Cambiar Variante',
|
||||
"enablePassive": "Activar Pasiva",
|
||||
"disablePassive": "Desactivar Pasiva"
|
||||
"disablePassive": "Desactivar Pasiva",
|
||||
"locked": "Locked",
|
||||
"disabled": "Disabled",
|
||||
"uncaught": "Uncaught"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const abilityTriggers: SimpleTranslationEntries = {
|
||||
'blockRecoilDamage' : `{{abilityName}}\nde {{pokemonName}} le protège du contrecoup !`,
|
||||
} as const;
|
||||
|
|
@ -475,7 +475,7 @@ export const ability: AbilityTranslationEntries = {
|
|||
},
|
||||
frisk: {
|
||||
name: "Fouille",
|
||||
description: "Permet de connaitre l’objet tenu par l’adversaire quand le combat commence.",
|
||||
description: "Lorsqu'il entre en combat, le Pokémon peut vérifier la capacité d'un Pokémon adverse.",
|
||||
},
|
||||
reckless: {
|
||||
name: "Téméraire",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { ability } from "./ability";
|
||||
import { abilityTriggers } from "./ability-trigger";
|
||||
import { battle } from "./battle";
|
||||
import { commandUiHandler } from "./command-ui-handler";
|
||||
import { fightUiHandler } from "./fight-ui-handler";
|
||||
|
|
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";
|
|||
|
||||
export const frConfig = {
|
||||
ability: ability,
|
||||
abilityTriggers: abilityTriggers,
|
||||
battle: battle,
|
||||
commandUiHandler: commandUiHandler,
|
||||
fightUiHandler: fightUiHandler,
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const growth: SimpleTranslationEntries = {
|
||||
"Erratic": "Erratic",
|
||||
"Fast": "Fast",
|
||||
"Medium_Fast": "Medium Fast",
|
||||
"Medium_Slow": "Medium Slow",
|
||||
"Slow": "Slow",
|
||||
"Fluctuating": "Fluctuating"
|
||||
"Erratic": "Erratique",
|
||||
"Fast": "Rapide",
|
||||
"Medium_Fast": "Moyenne-Rapide",
|
||||
"Medium_Slow": "Moyenne-Lente",
|
||||
"Slow": "Lente",
|
||||
"Fluctuating": "Fluctuante"
|
||||
} as const;
|
||||
|
|
@ -28,5 +28,8 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
|
|||
"cycleNature": "N: » Natures",
|
||||
"cycleVariant": "V: » Variants",
|
||||
"enablePassive": "Activer Passif",
|
||||
"disablePassive": "Désactiver Passif"
|
||||
"disablePassive": "Désactiver Passif",
|
||||
"locked": "Verrouillé",
|
||||
"disabled": "Désactivé",
|
||||
"uncaught": "Uncaught"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const abilityTriggers: SimpleTranslationEntries = {
|
||||
'blockRecoilDamage' : `{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!`,
|
||||
} as const;
|
||||
|
|
@ -475,7 +475,7 @@ export const ability: AbilityTranslationEntries = {
|
|||
},
|
||||
frisk: {
|
||||
name: "Indagine",
|
||||
description: "Quando il Pokémon entra in campo, rivela lo strumento del nemico.",
|
||||
description: "Quando entra in battaglia, il Pokémon può controllare il Potere di un Pokémon avversario.",
|
||||
},
|
||||
reckless: {
|
||||
name: "Temerarietà",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { ability } from "./ability";
|
||||
import { abilityTriggers } from "./ability-trigger";
|
||||
import { battle } from "./battle";
|
||||
import { commandUiHandler } from "./command-ui-handler";
|
||||
import { fightUiHandler } from "./fight-ui-handler";
|
||||
|
|
@ -16,6 +17,7 @@ import { tutorial } from "./tutorial";
|
|||
|
||||
export const itConfig = {
|
||||
ability: ability,
|
||||
abilityTriggers: abilityTriggers,
|
||||
battle: battle,
|
||||
commandUiHandler: commandUiHandler,
|
||||
fightUiHandler: fightUiHandler,
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
|||
export const fightUiHandler: SimpleTranslationEntries = {
|
||||
"pp": "PP",
|
||||
"power": "Potenza",
|
||||
"accuracy": "Accuracy",
|
||||
"accuracy": "Precisione",
|
||||
} as const;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const growth: SimpleTranslationEntries = {
|
||||
"Erratic": "Erratic",
|
||||
"Fast": "Fast",
|
||||
"Medium_Fast": "Medium Fast",
|
||||
"Medium_Slow": "Medium Slow",
|
||||
"Slow": "Slow",
|
||||
"Fluctuating": "Fluctuating"
|
||||
"Erratic": "Irregolare",
|
||||
"Fast": "Veloce",
|
||||
"Medium_Fast": "Medio-Veloce",
|
||||
"Medium_Slow": "Medio-Lenta",
|
||||
"Slow": "Lenta",
|
||||
"Fluctuating": "Fluttuante"
|
||||
} as const;
|
||||
|
|
@ -1,29 +1,29 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const nature: SimpleTranslationEntries = {
|
||||
"Hardy": "Hardy",
|
||||
"Lonely": "Lonely",
|
||||
"Brave": "Brave",
|
||||
"Adamant": "Adamant",
|
||||
"Naughty": "Naughty",
|
||||
"Bold": "Bold",
|
||||
"Hardy": "Ardita",
|
||||
"Lonely": "Schiva",
|
||||
"Brave": "Audace",
|
||||
"Adamant": "Decisa",
|
||||
"Naughty": "Birbona",
|
||||
"Bold": "Sicura",
|
||||
"Docile": "Docile",
|
||||
"Relaxed": "Relaxed",
|
||||
"Impish": "Impish",
|
||||
"Lax": "Lax",
|
||||
"Timid": "Timid",
|
||||
"Hasty": "Hasty",
|
||||
"Serious": "Serious",
|
||||
"Jolly": "Jolly",
|
||||
"Naive": "Naive",
|
||||
"Modest": "Modest",
|
||||
"Mild": "Mild",
|
||||
"Quiet": "Quiet",
|
||||
"Bashful": "Bashful",
|
||||
"Rash": "Rash",
|
||||
"Calm": "Calm",
|
||||
"Gentle": "Gentle",
|
||||
"Sassy": "Sassy",
|
||||
"Careful": "Careful",
|
||||
"Quirky": "Quirky"
|
||||
"Relaxed": "Placida",
|
||||
"Impish": "Scaltra",
|
||||
"Lax": "Fiacca",
|
||||
"Timid": "Timida",
|
||||
"Hasty": "Lesta",
|
||||
"Serious": "Seria",
|
||||
"Jolly": "Allegra",
|
||||
"Naive": "Ingenuaa",
|
||||
"Modest": "Modesta",
|
||||
"Mild": "Mite",
|
||||
"Quiet": "Quieta",
|
||||
"Bashful": "Ritrosa",
|
||||
"Rash": "Ardente",
|
||||
"Calm": "Calma",
|
||||
"Gentle": "Gentile",
|
||||
"Sassy": "Vivace",
|
||||
"Careful": "Cauta",
|
||||
"Quirky": "Furba"
|
||||
} as const;
|
||||
|
|
@ -28,5 +28,8 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
|
|||
"cycleNature": 'N: Alterna Natura',
|
||||
"cycleVariant": 'V: Alterna Variante',
|
||||
"enablePassive": "Attiva Passiva",
|
||||
"disablePassive": "Disattiva Passiva"
|
||||
"disablePassive": "Disattiva Passiva",
|
||||
"locked": "Locked",
|
||||
"disabled": "Disabled",
|
||||
"uncaught": "Uncaught"
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,53 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const battle: SimpleTranslationEntries = {
|
||||
"bossAppeared": "{{bossName}} apareceu.",
|
||||
"trainerAppeared": "{{trainerName}}\nquer batalhar!",
|
||||
"singleWildAppeared": "Um {{pokemonName}} selvagem apareceu!",
|
||||
"multiWildAppeared": "Um {{pokemonName1}} e um {{pokemonName2}} selvagens\napareceram!",
|
||||
"playerComeBack": "{{pokemonName}}, retorne!",
|
||||
"trainerComeBack": "{{trainerName}} retirou {{pokemonName}} da batalha!",
|
||||
"playerGo": "{{pokemonName}}, eu escolho você!",
|
||||
"trainerGo": "{{trainerName}} enviou {{pokemonName}}!",
|
||||
"switchQuestion": "Quer trocar\nde {{pokemonName}}?",
|
||||
"trainerDefeated": "Você derrotou\n{{trainerName}}!",
|
||||
"pokemonCaught": "{{pokemonName}} foi capturado!",
|
||||
"pokemon": "Pokémon",
|
||||
"sendOutPokemon": "{{pokemonName}}, eu escolho você!!",
|
||||
"hitResultCriticalHit": "Um golpe crítico!",
|
||||
"hitResultSuperEffective": "É supereficaz!",
|
||||
"hitResultNotVeryEffective": "É pouco eficaz...",
|
||||
"hitResultNoEffect": "Isso não afeta {{pokemonName}}!",
|
||||
"hitResultOneHitKO": "Foi um nocaute de um golpe!",
|
||||
"attackFailed": "Mas falhou!",
|
||||
"attackHitsCount": `Acertou {{count}} vezes.`,
|
||||
"expGain": "{{pokemonName}} ganhou\n{{exp}} pontos de experiência.",
|
||||
"levelUp": "{{pokemonName}} subiu para \nNv. {{level}}!",
|
||||
"learnMove": "{{pokemonName}} aprendeu {{moveName}}!",
|
||||
"learnMovePrompt": "{{pokemonName}} quer aprender\n{{moveName}}.",
|
||||
"learnMoveLimitReached": "Porém, {{pokemonName}} já sabe\nquatro movimentos.",
|
||||
"learnMoveReplaceQuestion": "Quer substituir um de seus movimentos por {{moveName}}?",
|
||||
"learnMoveStopTeaching": "Você não quer aprender\n{{moveName}}?",
|
||||
"learnMoveNotLearned": "{{pokemonName}} não aprendeu {{moveName}}.",
|
||||
"learnMoveForgetQuestion": "Qual movimento quer esquecer?",
|
||||
"learnMoveForgetSuccess": "{{pokemonName}} esqueceu como usar {{moveName}}.",
|
||||
"levelCapUp": "O nível máximo aumentou\npara {{levelCap}}!",
|
||||
"moveNotImplemented": "{{moveName}} ainda não foi implementado e não pode ser usado.",
|
||||
"moveNoPP": "Não há mais PP\npara esse movimento!",
|
||||
"moveDisabled": "Não se pode usar {{moveName}} porque foi desabilitado!",
|
||||
"noPokeballForce": "Uma força misteriosa\nte impede de usar Poké Bolas.",
|
||||
"noPokeballTrainer": "Não se pode capturar\nPokémon dos outros!",
|
||||
"noPokeballMulti": "Não se pode lançar Poké Bolas\nquando há mais de um Pokémon!",
|
||||
"noPokeballStrong": "Este Pokémon é forte demais para ser capturado!\nÉ preciso enfraquecê-lo primeiro!",
|
||||
"noEscapeForce": "Uma força misteriosa\nte impede de fugir.",
|
||||
"noEscapeTrainer": "Não se pode fugir de\nbatalhas contra treinadores!",
|
||||
"noEscapePokemon": "O movimento {{moveName}} de {{pokemonName}} te impede de fugir!",
|
||||
"runAwaySuccess": "Você fugiu com sucesso",
|
||||
"runAwayCannotEscape": "Você nao conseguiu fugir!",
|
||||
"escapeVerbSwitch": "trocar",
|
||||
"escapeVerbFlee": "fugir",
|
||||
"notDisabled": "O movimento {{moveName}}\nnão está mais desabilitado!",
|
||||
"skipItemQuestion": "Tem certeza de que não quer escolher um item?",
|
||||
"eggHatching": "Opa?",
|
||||
"ivScannerUseQuestion": "Quer usar o Scanner de IVs em {{pokemonName}}?"
|
||||
} as const;
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const commandUiHandler: SimpleTranslationEntries = {
|
||||
"fight": "Lutar",
|
||||
"ball": "Bolas",
|
||||
"pokemon": "Pokémon",
|
||||
"run": "Fugir",
|
||||
"actionMessage": "O que {{pokemonName}}\ndeve fazer?",
|
||||
} as const;
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
import { ability } from "./ability";
|
||||
import { battle } from "./battle";
|
||||
import { commandUiHandler } from "./command-ui-handler";
|
||||
import { fightUiHandler } from "./fight-ui-handler";
|
||||
import { growth } from "./growth";
|
||||
import { menu } from "./menu";
|
||||
import { menuUiHandler } from "./menu-ui-handler";
|
||||
import { move } from "./move";
|
||||
import { nature } from "./nature";
|
||||
import { pokeball } from "./pokeball";
|
||||
import { pokemon } from "./pokemon";
|
||||
import { pokemonStat } from "./pokemon-stat";
|
||||
import { starterSelectUiHandler } from "./starter-select-ui-handler";
|
||||
import { tutorial } from "./tutorial";
|
||||
|
||||
|
||||
export const ptBrConfig = {
|
||||
ability: ability,
|
||||
battle: battle,
|
||||
commandUiHandler: commandUiHandler,
|
||||
fightUiHandler: fightUiHandler,
|
||||
menuUiHandler: menuUiHandler,
|
||||
menu: menu,
|
||||
move: move,
|
||||
pokeball: pokeball,
|
||||
pokemonStat: pokemonStat,
|
||||
pokemon: pokemon,
|
||||
starterSelectUiHandler: starterSelectUiHandler,
|
||||
tutorial: tutorial,
|
||||
nature: nature,
|
||||
growth: growth
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const fightUiHandler: SimpleTranslationEntries = {
|
||||
"pp": "PP",
|
||||
"power": "Poder",
|
||||
"accuracy": "Precisão",
|
||||
} as const;
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const growth: SimpleTranslationEntries = {
|
||||
"Erratic": "Instável",
|
||||
"Fast": "Rápido",
|
||||
"Medium_Fast": "Meio Rápido",
|
||||
"Medium_Slow": "Meio Lento",
|
||||
"Slow": "Lento",
|
||||
"Fluctuating": "Flutuante"
|
||||
} as const;
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const menuUiHandler: SimpleTranslationEntries = {
|
||||
"GAME_SETTINGS": 'Configurações',
|
||||
"ACHIEVEMENTS": "Conquistas",
|
||||
"STATS": "Estatísticas",
|
||||
"VOUCHERS": "Vouchers",
|
||||
"EGG_LIST": "Incubadora",
|
||||
"EGG_GACHA": "Gacha de Ovos",
|
||||
"MANAGE_DATA": "Gerenciar Dados",
|
||||
"COMMUNITY": "Comunidade",
|
||||
"RETURN_TO_TITLE": "Voltar ao Início",
|
||||
"LOG_OUT": "Logout",
|
||||
"slot": "Slot {{slotNumber}}",
|
||||
"importSession": "Importar Sessão",
|
||||
"importSlotSelect": "Selecione um slot para importar.",
|
||||
"exportSession": "Exportar Sessão",
|
||||
"exportSlotSelect": "Selecione um slot para exportar.",
|
||||
"importData": "Importar Dados",
|
||||
"exportData": "Exportar Dados",
|
||||
"cancel": "Cancelar",
|
||||
"losingProgressionWarning": "Você vai perder todo o progresso desde o início da batalha. Confirmar?"
|
||||
} as const;
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
/**
|
||||
* The menu namespace holds most miscellaneous text that isn't directly part of the game's
|
||||
* contents or directly related to Pokemon data. This includes menu navigation, settings,
|
||||
* account interactions, descriptive text, etc.
|
||||
*/
|
||||
export const menu: SimpleTranslationEntries = {
|
||||
"cancel": "Cancelar",
|
||||
"continue": "Continuar",
|
||||
"dailyRun": "Desafio diário (Beta)",
|
||||
"loadGame": "Carregar Jogo",
|
||||
"newGame": "Novo Jogo",
|
||||
"selectGameMode": "Escolha um modo de jogo.",
|
||||
"logInOrCreateAccount": "Inicie uma sessão ou crie uma conta para começar. Não é necessário email!",
|
||||
"username": "Nome de Usuário",
|
||||
"password": "Senha",
|
||||
"login": "Iniciar sessão",
|
||||
"register": "Registrar-se",
|
||||
"emptyUsername": "Nome de usuário vazio",
|
||||
"invalidLoginUsername": "Nome de usuário inválido",
|
||||
"invalidRegisterUsername": "O nome de usuário só pode conter letras, números e sublinhados",
|
||||
"invalidLoginPassword": "Senha inválida",
|
||||
"invalidRegisterPassword": "A senha deve ter pelo menos 6 caracteres",
|
||||
"usernameAlreadyUsed": "Esse nome de usuário já está em uso",
|
||||
"accountNonExistent": "Esse nome de usuário não existe",
|
||||
"unmatchingPassword": "Senha incorreta",
|
||||
"passwordNotMatchingConfirmPassword": "As senhas não coincidem",
|
||||
"confirmPassword": "Confirmar senha",
|
||||
"registrationAgeWarning": "Se registrando, você confirma que tem pelo menos 13 anos de idade.",
|
||||
"backToLogin": "Voltar ao Login",
|
||||
"failedToLoadSaveData": "Não foi possível carregar os dados de salvamento. Por favor, recarregue a página.\nSe a falha persistir, contate o administrador.",
|
||||
"sessionSuccess": "Sessão carregada com sucesso.",
|
||||
"failedToLoadSession": "Não foi possível carregar os dados da sua sessão.\nEles podem estar corrompidos.",
|
||||
"boyOrGirl": "Você é um menino ou uma menina?",
|
||||
"boy": "Menino",
|
||||
"girl": "Menina",
|
||||
"dailyRankings": "Classificação Diária",
|
||||
"weeklyRankings": "Classificação Semanal",
|
||||
"noRankings": "Sem Classificação",
|
||||
"loading": "Carregando…",
|
||||
"playersOnline": "Jogadores Ativos",
|
||||
"empty": "Vazio",
|
||||
"yes": "Sim",
|
||||
"no": "Não",
|
||||
} as const;
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,29 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const nature: SimpleTranslationEntries = {
|
||||
"Hardy": "Destemida",
|
||||
"Lonely": "Solitária",
|
||||
"Brave": "Valente",
|
||||
"Adamant": "Rígida",
|
||||
"Naughty": "Teimosa",
|
||||
"Bold": "Corajosa",
|
||||
"Docile": "Dócil",
|
||||
"Relaxed": "Descontraída",
|
||||
"Impish": "Inquieta",
|
||||
"Lax": "Relaxada",
|
||||
"Timid": "Tímida",
|
||||
"Hasty": "Apressada",
|
||||
"Serious": "Séria",
|
||||
"Jolly": "Alegre",
|
||||
"Naive": "Ingênua",
|
||||
"Modest": "Modesta",
|
||||
"Mild": "Mansa",
|
||||
"Quiet": "Quieta",
|
||||
"Bashful": "Atrapalhada",
|
||||
"Rash": "Imprudente",
|
||||
"Calm": "Calma",
|
||||
"Gentle": "Gentil",
|
||||
"Sassy": "Atrevida",
|
||||
"Careful": "Cuidadosa",
|
||||
"Quirky": "Peculiar",
|
||||
} as const;
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const pokeball: SimpleTranslationEntries = {
|
||||
"pokeBall": "Poké Bola",
|
||||
"greatBall": "Grande Bola",
|
||||
"ultraBall": "Ultra Bola",
|
||||
"rogueBall": "Rogue Bola",
|
||||
"masterBall": "Master Bola",
|
||||
"luxuryBall": "Bola de Luxo",
|
||||
} as const;
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const pokemonStat: SimpleTranslationEntries = {
|
||||
"HP": "PS",
|
||||
"HPshortened": "PS",
|
||||
"ATK": "Ataque",
|
||||
"ATKshortened": "Ata",
|
||||
"DEF": "Defesa",
|
||||
"DEFshortened": "Def",
|
||||
"SPATK": "At. Esp.",
|
||||
"SPATKshortened": "AtEsp",
|
||||
"SPDEF": "Def. Esp.",
|
||||
"SPDEFshortened": "DefEsp",
|
||||
"SPD": "Veloc.",
|
||||
"SPDshortened": "Veloc."
|
||||
} as const;
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,35 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
/**
|
||||
* The menu namespace holds most miscellaneous text that isn't directly part of the game's
|
||||
* contents or directly related to Pokemon data. This includes menu navigation, settings,
|
||||
* account interactions, descriptive text, etc.
|
||||
*/
|
||||
export const starterSelectUiHandler: SimpleTranslationEntries = {
|
||||
"confirmStartTeam": 'Começar com esses Pokémon?',
|
||||
"growthRate": "Crescimento:",
|
||||
"ability": "Hab.:",
|
||||
"passive": "Passiva:",
|
||||
"nature": "Nature:",
|
||||
"eggMoves": "Mov. de Ovo",
|
||||
"start": "Iniciar",
|
||||
"addToParty": "Adicionar à equipe",
|
||||
"toggleIVs": "Mostrar IVs",
|
||||
"manageMoves": "Mudar Movimentos",
|
||||
"useCandies": "Usar Doces",
|
||||
"selectMoveSwapOut": "Escolha um movimento para substituir.",
|
||||
"selectMoveSwapWith": "Escolha o movimento que substituirá",
|
||||
"unlockPassive": "Aprender Passiva",
|
||||
"reduceCost": "Reduzir Custo",
|
||||
"cycleShiny": "R: Mudar Shiny",
|
||||
"cycleForm": 'F: Mudar Forma',
|
||||
"cycleGender": 'G: Mudar Gênero',
|
||||
"cycleAbility": 'E: Mudar Habilidade',
|
||||
"cycleNature": 'N: Mudar Nature',
|
||||
"cycleVariant": 'V: Mudar Variante',
|
||||
"enablePassive": "Ativar Passiva",
|
||||
"disablePassive": "Desativar Passiva",
|
||||
"locked": "Bloqueado",
|
||||
"disabled": "Desativado",
|
||||
"uncaught": "Não capturado"
|
||||
}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const tutorial: SimpleTranslationEntries = {
|
||||
"intro": `Bem-vindo ao PokéRogue! Este é um jogo Pokémon feito por fãs focado em batalhas com elementos roguelite.
|
||||
$Este jogo não é monetizado e não reivindicamos propriedade de Pokémon nem dos ativos protegidos
|
||||
$por direitos autorais usados.
|
||||
$O jogo é um trabalho em andamento, mas é totalmente jogável.
|
||||
$Para relatórios de bugs, use a comunidade no Discord.
|
||||
$Se o jogo estiver rodando lentamente, certifique-se de que a 'Aceleração de hardware' esteja ativada
|
||||
$nas configurações do seu navegador.`,
|
||||
|
||||
"accessMenu": `Para acessar o menu, aperte M ou Esc.
|
||||
$O menu contém configurações e diversas funções.`,
|
||||
|
||||
"menu": `A partir deste menu, você pode acessar as configurações.
|
||||
$Nas configurações, você pode alterar a velocidade do jogo,
|
||||
$o estilo da janela, entre outras opções.
|
||||
$Existem também vários outros recursos disponíveis aqui.
|
||||
$Não deixe de conferir todos eles!`,
|
||||
|
||||
"starterSelect": `Aqui você pode escolher seus iniciais.\nEsses serão os primeiro Pokémon da sua equipe.
|
||||
$Cada inicial tem seu custo. Sua equipe pode ter até 6\nmembros, desde que a soma dos custos não ultrapasse 10.
|
||||
$Você pode escolher o gênero, a habilidade\ne até a forma do seu inicial.
|
||||
$Essas opções dependem das variantes dessa\nespécie que você já capturou ou chocou.
|
||||
$Os IVs de cada inicial são os melhores de todos os Pokémon\ndaquela espécie que você já capturou ou chocou.
|
||||
$Sempre capture vários Pokémon de várias espécies!`,
|
||||
|
||||
"pokerus": `Todo dia, 3 Pokémon iniciais ficam com uma borda roxa.
|
||||
$Caso veja um inicial que você possui com uma dessa, tente\nadicioná-lo a sua equipe. Lembre-se de olhar seu sumário!`,
|
||||
|
||||
"statChange": `As mudanças de atributos se mantém após a batalha desde que o Pokémon não seja trocado.
|
||||
$Seus Pokémon voltam a suas Poké Bolas antes de batalhas contra treinadores e de entrar em um novo bioma.
|
||||
$Para ver as mudanças de atributos dos Pokémon em campo, mantena C ou Shift pressionado durante a batalha.`,
|
||||
|
||||
"selectItem": `Após cada batalha, você pode escolher entre 3 itens aleatórios.
|
||||
$Você pode escolher apenas um deles.
|
||||
$Esses itens variam entre consumíveis, itens de segurar e itens passivos permanentes.
|
||||
$A maioria dos efeitos de itens não consumíveis podem ser acumulados.
|
||||
$Alguns itens só aparecerão se puderem ser usados, como os itens de evolução.
|
||||
$Você também pode transferir itens de segurar entre os Pokémon utilizando a opção "Transfer".
|
||||
$A opção de transferir irá aparecer no canto inferior direito assim que você obter um item de segurar.
|
||||
$Você pode comprar itens consumíveis com dinheiro, e sua variedade aumentará conforme você for mais longe.
|
||||
$Certifique-se de comprá-los antes de escolher seu item aleatório. Ao escolhê-lo, a próxima batalha começará.`,
|
||||
|
||||
"eggGacha": `Aqui você pode trocar seus vouchers\npor ovos de Pokémon.
|
||||
$Ovos ficam mais próximos de chocar após cada batalha.\nOvos mais raros demoram mais para chocar.
|
||||
$Pokémon chocados não serão adicionados a sua equipe,\nmas sim aos seus iniciais.
|
||||
$Pokémon chocados geralmente possuem IVs melhores\nque Pokémon selvagens.
|
||||
$Alguns Pokémon só podem ser obtidos através de seus ovos.
|
||||
$Temos 3 máquinas, cada uma com seu bônus específico,\nentão escolha a que mais lhe convém!`,
|
||||
} as const;
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const abilityTriggers: SimpleTranslationEntries = {
|
||||
'blockRecoilDamage' : `{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!`,
|
||||
} as const;
|
||||
|
|
@ -475,7 +475,7 @@ export const ability: AbilityTranslationEntries = {
|
|||
},
|
||||
frisk: {
|
||||
name: "察觉",
|
||||
description: "出场时，可以察觉对手的持\n有物。",
|
||||
description: "进入战斗时，神奇宝贝可以检查对方神奇宝贝的能力。",
|
||||
},
|
||||
reckless: {
|
||||
name: "舍身",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { ability } from "./ability";
|
||||
import { abilityTriggers } from "./ability-trigger";
|
||||
import { battle } from "./battle";
|
||||
import { commandUiHandler } from "./command-ui-handler";
|
||||
import { fightUiHandler } from "./fight-ui-handler";
|
||||
|
|
@ -15,6 +16,7 @@ import { nature } from "./nature";
|
|||
|
||||
export const zhCnConfig = {
|
||||
ability: ability,
|
||||
abilityTriggers: abilityTriggers,
|
||||
battle: battle,
|
||||
commandUiHandler: commandUiHandler,
|
||||
fightUiHandler: fightUiHandler,
|
||||
|
|
|
|||
|
|
@ -28,5 +28,8 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
|
|||
"cycleNature": 'N: 切换性格',
|
||||
"cycleVariant": 'V: 切换变种',
|
||||
"enablePassive": "启用被动",
|
||||
"disablePassive": "禁用被动"
|
||||
"disablePassive": "禁用被动",
|
||||
"locked": "Locked",
|
||||
"disabled": "Disabled",
|
||||
"uncaught": "Uncaught"
|
||||
}
|
||||
|
|
@ -554,10 +554,10 @@ export class EvolutionItemModifierType extends PokemonModifierType implements Ge
|
|||
super(Utils.toReadableString(EvolutionItem[evolutionItem]), `Causes certain Pokémon to evolve`, (_type, args) => new Modifiers.EvolutionItemModifier(this, (args[0] as PlayerPokemon).id),
|
||||
(pokemon: PlayerPokemon) => {
|
||||
if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => e.item === this.evolutionItem
|
||||
&& (!e.condition || e.condition.predicate(pokemon))).length)
|
||||
&& (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.formIndex == 0))
|
||||
return null;
|
||||
else if (pokemon.isFusion() && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => e.item === this.evolutionItem
|
||||
&& (!e.condition || e.condition.predicate(pokemon))).length)
|
||||
&& (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.fusionFormIndex == 0))
|
||||
return null;
|
||||
|
||||
return PartyUiHandler.NoEffectMessage;
|
||||
|
|
|
|||
|
|
@ -635,6 +635,9 @@ export class PokemonBaseStatModifier extends PokemonHeldItemModifier {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Applies Specific Type item boosts (e.g., Magnet)
|
||||
*/
|
||||
export class AttackTypeBoosterModifier extends PokemonHeldItemModifier {
|
||||
private moveType: Type;
|
||||
private boostMultiplier: number;
|
||||
|
|
@ -667,8 +670,15 @@ export class AttackTypeBoosterModifier extends PokemonHeldItemModifier {
|
|||
return super.shouldApply(args) && args.length === 3 && typeof args[1] === 'number' && args[2] instanceof Utils.NumberHolder;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Array<any>} args Array
|
||||
* - Index 0: {Pokemon} Pokemon
|
||||
* - Index 1: {number} Move type
|
||||
* - Index 2: {Utils.NumberHolder} Move power
|
||||
* @returns {boolean} Returns true if boosts have been applied to the move.
|
||||
*/
|
||||
apply(args: any[]): boolean {
|
||||
if (args[1] === this.moveType) {
|
||||
if (args[1] === this.moveType && (args[2] as Utils.NumberHolder).value >= 1) {
|
||||
(args[2] as Utils.NumberHolder).value = Math.floor((args[2] as Utils.NumberHolder).value * (1 + (this.getStackCount() * this.boostMultiplier)));
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ import { TempBattleStat } from './data/temp-battle-stat';
|
|||
import { Nature } from './data/nature';
|
||||
import { Type } from './data/type';
|
||||
import { Stat } from './data/pokemon-stat';
|
||||
import { PokeballCounts } from './battle-scene';
|
||||
import { PokeballType } from './data/pokeball';
|
||||
|
||||
/**
|
||||
* Overrides for testing different in game situations
|
||||
|
|
@ -27,6 +29,16 @@ export const STARTING_WAVE_OVERRIDE: integer = 0;
|
|||
export const STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN;
|
||||
// default 1000
|
||||
export const STARTING_MONEY_OVERRIDE: integer = 0;
|
||||
export const POKEBALL_OVERRIDE: { active: boolean, pokeballs: PokeballCounts } = {
|
||||
active: false,
|
||||
pokeballs: {
|
||||
[PokeballType.POKEBALL]: 5,
|
||||
[PokeballType.GREAT_BALL]: 0,
|
||||
[PokeballType.ULTRA_BALL]: 0,
|
||||
[PokeballType.ROGUE_BALL]: 0,
|
||||
[PokeballType.MASTER_BALL]: 0,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* PLAYER OVERRIDES
|
||||
|
|
@ -39,6 +51,8 @@ export const STARTING_LEVEL_OVERRIDE: integer = 0;
|
|||
export const ABILITY_OVERRIDE: Abilities = Abilities.NONE;
|
||||
export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
|
||||
export const MOVESET_OVERRIDE: Array<Moves> = [];
|
||||
export const SHINY_OVERRIDE: boolean = false;
|
||||
export const VARIANT_OVERRIDE: Variant = 0;
|
||||
|
||||
/**
|
||||
* OPPONENT / ENEMY OVERRIDES
|
||||
|
|
|
|||
|
|
@ -775,11 +775,11 @@ export class EncounterPhase extends BattlePhase {
|
|||
|
||||
this.scene.ui.setMode(Mode.MESSAGE).then(() => {
|
||||
if (!this.loaded) {
|
||||
this.scene.gameData.saveSystem().then(success => {
|
||||
this.scene.gameData.saveAll(this.scene, true).then(success => {
|
||||
this.scene.disableMenu = false;
|
||||
if (!success)
|
||||
return this.scene.reset(true);
|
||||
this.scene.gameData.saveSession(this.scene, true).then(() => this.doEncounter());
|
||||
this.doEncounter();
|
||||
});
|
||||
} else
|
||||
this.doEncounter();
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import { enConfig } from '#app/locales/en/config.js';
|
|||
import { esConfig } from '#app/locales/es/config.js';
|
||||
import { frConfig } from '#app/locales/fr/config.js';
|
||||
import { itConfig } from '#app/locales/it/config.js';
|
||||
import { ptBrConfig } from '#app/locales/pt_BR/config.js';
|
||||
import { zhCnConfig } from '#app/locales/zh_CN/config.js';
|
||||
|
||||
export interface SimpleTranslationEntries {
|
||||
|
|
@ -59,7 +60,7 @@ export function initI18n(): void {
|
|||
i18next.use(LanguageDetector).init({
|
||||
lng: lang,
|
||||
fallbackLng: 'en',
|
||||
supportedLngs: ['en', 'es', 'fr', 'it', 'de', 'zh_CN'],
|
||||
supportedLngs: ['en', 'es', 'fr', 'it', 'de', 'zh_CN','pt_BR'],
|
||||
debug: true,
|
||||
interpolation: {
|
||||
escapeValue: false,
|
||||
|
|
@ -80,6 +81,9 @@ export function initI18n(): void {
|
|||
de: {
|
||||
...deConfig
|
||||
},
|
||||
pt_BR: {
|
||||
...ptBrConfig
|
||||
},
|
||||
zh_CN: {
|
||||
...zhCnConfig
|
||||
}
|
||||
|
|
@ -94,7 +98,8 @@ declare module 'i18next' {
|
|||
menu: SimpleTranslationEntries;
|
||||
menuUiHandler: SimpleTranslationEntries;
|
||||
move: MoveTranslationEntries;
|
||||
battle: SimpleTranslationEntries,
|
||||
battle: SimpleTranslationEntries;
|
||||
abilityTriggers: SimpleTranslationEntries;
|
||||
ability: AbilityTranslationEntries;
|
||||
pokeball: SimpleTranslationEntries;
|
||||
pokemon: SimpleTranslationEntries;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import { pokemonEvolutions, pokemonPrevolutions } from "../data/pokemon-evolutio
|
|||
import PokemonSpecies, { allSpecies, getPokemonSpecies, noStarterFormKeys, speciesStarters } from "../data/pokemon-species";
|
||||
import { Species, defaultStarterSpecies } from "../data/enums/species";
|
||||
import * as Utils from "../utils";
|
||||
import * as Overrides from '../overrides';
|
||||
import PokemonData from "./pokemon-data";
|
||||
import PersistentModifierData from "./modifier-data";
|
||||
import ArenaData from "./arena-data";
|
||||
|
|
@ -250,24 +251,28 @@ export class GameData {
|
|||
this.initStarterData();
|
||||
}
|
||||
|
||||
public getSystemSaveData(): SystemSaveData {
|
||||
return {
|
||||
trainerId: this.trainerId,
|
||||
secretId: this.secretId,
|
||||
gender: this.gender,
|
||||
dexData: this.dexData,
|
||||
starterData: this.starterData,
|
||||
gameStats: this.gameStats,
|
||||
unlocks: this.unlocks,
|
||||
achvUnlocks: this.achvUnlocks,
|
||||
voucherUnlocks: this.voucherUnlocks,
|
||||
voucherCounts: this.voucherCounts,
|
||||
eggs: this.eggs.map(e => new EggData(e)),
|
||||
gameVersion: this.scene.game.config.gameVersion,
|
||||
timestamp: new Date().getTime()
|
||||
};
|
||||
}
|
||||
|
||||
public saveSystem(): Promise<boolean> {
|
||||
return new Promise<boolean>(resolve => {
|
||||
this.scene.ui.savingIcon.show();
|
||||
const data: SystemSaveData = {
|
||||
trainerId: this.trainerId,
|
||||
secretId: this.secretId,
|
||||
gender: this.gender,
|
||||
dexData: this.dexData,
|
||||
starterData: this.starterData,
|
||||
gameStats: this.gameStats,
|
||||
unlocks: this.unlocks,
|
||||
achvUnlocks: this.achvUnlocks,
|
||||
voucherUnlocks: this.voucherUnlocks,
|
||||
voucherCounts: this.voucherCounts,
|
||||
eggs: this.eggs.map(e => new EggData(e)),
|
||||
gameVersion: this.scene.game.config.gameVersion,
|
||||
timestamp: new Date().getTime()
|
||||
};
|
||||
const data = this.getSystemSaveData();
|
||||
|
||||
const maxIntAttrValue = Math.pow(2, 31);
|
||||
const systemData = JSON.stringify(data, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v);
|
||||
|
|
@ -651,6 +656,9 @@ export class GameData {
|
|||
Object.keys(scene.pokeballCounts).forEach((key: string) => {
|
||||
scene.pokeballCounts[key] = sessionData.pokeballCounts[key] || 0;
|
||||
});
|
||||
if (Overrides.POKEBALL_OVERRIDE.active) {
|
||||
scene.pokeballCounts = Overrides.POKEBALL_OVERRIDE.pokeballs;
|
||||
}
|
||||
|
||||
scene.money = sessionData.money || 0;
|
||||
scene.updateMoneyText();
|
||||
|
|
@ -817,6 +825,59 @@ export class GameData {
|
|||
}) as SessionSaveData;
|
||||
}
|
||||
|
||||
saveAll(scene: BattleScene, skipVerification?: boolean): Promise<boolean> {
|
||||
return new Promise<boolean>(resolve => {
|
||||
Utils.executeIf(!skipVerification, updateUserInfo).then(success => {
|
||||
if (success !== null && !success)
|
||||
return resolve(false);
|
||||
this.scene.ui.savingIcon.show();
|
||||
const data = this.getSystemSaveData();
|
||||
const sessionData = this.getSessionSaveData(scene);
|
||||
|
||||
const maxIntAttrValue = Math.pow(2, 31);
|
||||
const systemData = this.getSystemSaveData();
|
||||
|
||||
const request = {
|
||||
system: systemData,
|
||||
session: sessionData,
|
||||
sessionSlotId: scene.sessionSlotId
|
||||
};
|
||||
|
||||
if (!bypassLogin) {
|
||||
Utils.apiPost('savedata/updateall', JSON.stringify(request, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v), undefined, true)
|
||||
.then(response => response.text())
|
||||
.then(error => {
|
||||
this.scene.ui.savingIcon.hide();
|
||||
if (error) {
|
||||
if (error.startsWith('client version out of date')) {
|
||||
this.scene.clearPhaseQueue();
|
||||
this.scene.unshiftPhase(new OutdatedPhase(this.scene));
|
||||
} else if (error.startsWith('session out of date')) {
|
||||
this.scene.clearPhaseQueue();
|
||||
this.scene.unshiftPhase(new ReloadSessionPhase(this.scene));
|
||||
}
|
||||
console.error(error);
|
||||
return resolve(false);
|
||||
}
|
||||
resolve(true);
|
||||
});
|
||||
} else {
|
||||
localStorage.setItem('data_bak', localStorage.getItem('data'));
|
||||
|
||||
localStorage.setItem('data', btoa(JSON.stringify(systemData, (k: any, v: any) => typeof v === 'bigint' ? v <= maxIntAttrValue ? Number(v) : v.toString() : v)));
|
||||
|
||||
localStorage.setItem(`sessionData${scene.sessionSlotId ? scene.sessionSlotId : ''}`, btoa(JSON.stringify(sessionData)));
|
||||
|
||||
console.debug('Session data saved');
|
||||
|
||||
this.scene.ui.savingIcon.hide();
|
||||
|
||||
resolve(true);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
public tryExportData(dataType: GameDataType, slotId: integer = 0): Promise<boolean> {
|
||||
return new Promise<boolean>(resolve => {
|
||||
const dataKey: string = getDataTypeKey(dataType, slotId);
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
import SettingsUiHandler from "#app/ui/settings-ui-handler";
|
||||
import { Mode } from "#app/ui/ui";
|
||||
import i18next from "i18next";
|
||||
import BattleScene from "../battle-scene";
|
||||
import { hasTouchscreen } from "../touch-controls";
|
||||
import { updateWindowType } from "../ui/ui-theme";
|
||||
import { PlayerGender } from "./game-data";
|
||||
import { Mode } from "#app/ui/ui";
|
||||
import SettingsUiHandler from "#app/ui/settings-ui-handler";
|
||||
|
||||
export enum Setting {
|
||||
Game_Speed = "GAME_SPEED",
|
||||
|
|
@ -40,28 +40,28 @@ export interface SettingDefaults {
|
|||
}
|
||||
|
||||
export const settingOptions: SettingOptions = {
|
||||
[Setting.Game_Speed]: [ '1x', '1.25x', '1.5x', '2x', '2.5x', '3x', '4x', '5x' ],
|
||||
[Setting.Game_Speed]: ['1x', '1.25x', '1.5x', '2x', '2.5x', '3x', '4x', '5x'],
|
||||
[Setting.Master_Volume]: new Array(11).fill(null).map((_, i) => i ? (i * 10).toString() : 'Mute'),
|
||||
[Setting.BGM_Volume]: new Array(11).fill(null).map((_, i) => i ? (i * 10).toString() : 'Mute'),
|
||||
[Setting.SE_Volume]: new Array(11).fill(null).map((_, i) => i ? (i * 10).toString() : 'Mute'),
|
||||
[Setting.Language]: [ 'English', 'Change' ],
|
||||
[Setting.Damage_Numbers]: [ 'Off', 'Simple', 'Fancy' ],
|
||||
[Setting.UI_Theme]: [ 'Default', 'Legacy' ],
|
||||
[Setting.Language]: ['English', 'Change'],
|
||||
[Setting.Damage_Numbers]: ['Off', 'Simple', 'Fancy'],
|
||||
[Setting.UI_Theme]: ['Default', 'Legacy'],
|
||||
[Setting.Window_Type]: new Array(5).fill(null).map((_, i) => (i + 1).toString()),
|
||||
[Setting.Tutorials]: [ 'Off', 'On' ],
|
||||
[Setting.Enable_Retries]: [ 'Off', 'On' ],
|
||||
[Setting.Sprite_Set]: [ 'Consistent', 'Mixed Animated' ],
|
||||
[Setting.Move_Animations]: [ 'Off', 'On' ],
|
||||
[Setting.Show_Stats_on_Level_Up]: [ 'Off', 'On' ],
|
||||
[Setting.EXP_Gains_Speed]: [ 'Normal', 'Fast', 'Faster', 'Skip' ],
|
||||
[Setting.EXP_Party_Display]: [ 'Normal', 'Level Up Notification', 'Skip' ],
|
||||
[Setting.HP_Bar_Speed]: [ 'Normal', 'Fast', 'Faster', 'Instant' ],
|
||||
[Setting.Fusion_Palette_Swaps]: [ 'Off', 'On' ],
|
||||
[Setting.Player_Gender]: [ 'Boy', 'Girl' ],
|
||||
[Setting.Gamepad_Support]: [ 'Auto', 'Disabled' ],
|
||||
[Setting.Swap_A_and_B]: [ 'Enabled', 'Disabled' ],
|
||||
[Setting.Touch_Controls]: [ 'Auto', 'Disabled' ],
|
||||
[Setting.Vibration]: [ 'Auto', 'Disabled' ]
|
||||
[Setting.Tutorials]: ['Off', 'On'],
|
||||
[Setting.Enable_Retries]: ['Off', 'On'],
|
||||
[Setting.Sprite_Set]: ['Consistent', 'Mixed Animated'],
|
||||
[Setting.Move_Animations]: ['Off', 'On'],
|
||||
[Setting.Show_Stats_on_Level_Up]: ['Off', 'On'],
|
||||
[Setting.EXP_Gains_Speed]: ['Normal', 'Fast', 'Faster', 'Skip'],
|
||||
[Setting.EXP_Party_Display]: ['Normal', 'Level Up Notification', 'Skip'],
|
||||
[Setting.HP_Bar_Speed]: ['Normal', 'Fast', 'Faster', 'Instant'],
|
||||
[Setting.Fusion_Palette_Swaps]: ['Off', 'On'],
|
||||
[Setting.Player_Gender]: ['Boy', 'Girl'],
|
||||
[Setting.Gamepad_Support]: ['Auto', 'Disabled'],
|
||||
[Setting.Swap_A_and_B]: ['Enabled', 'Disabled'],
|
||||
[Setting.Touch_Controls]: ['Auto', 'Disabled'],
|
||||
[Setting.Vibration]: ['Auto', 'Disabled']
|
||||
};
|
||||
|
||||
export const settingDefaults: SettingDefaults = {
|
||||
|
|
@ -89,7 +89,7 @@ export const settingDefaults: SettingDefaults = {
|
|||
[Setting.Vibration]: 0
|
||||
};
|
||||
|
||||
export const reloadSettings: Setting[] = [ Setting.UI_Theme, Setting.Language, Setting.Sprite_Set ];
|
||||
export const reloadSettings: Setting[] = [Setting.UI_Theme, Setting.Language, Setting.Sprite_Set];
|
||||
|
||||
export function setSetting(scene: BattleScene, setting: Setting, value: integer): boolean {
|
||||
switch (setting) {
|
||||
|
|
@ -206,6 +206,10 @@ export function setSetting(scene: BattleScene, setting: Setting, value: integer)
|
|||
label: 'Deutsch',
|
||||
handler: () => changeLocaleHandler('de')
|
||||
},
|
||||
{
|
||||
label: 'Português (BR)',
|
||||
handler: () => changeLocaleHandler('pt_BR')
|
||||
},
|
||||
{
|
||||
label: '简体中文',
|
||||
handler: () => changeLocaleHandler('zh_CN')
|
||||
|
|
@ -214,7 +218,8 @@ export function setSetting(scene: BattleScene, setting: Setting, value: integer)
|
|||
label: 'Cancel',
|
||||
handler: () => cancelHandler()
|
||||
}
|
||||
]
|
||||
],
|
||||
maxOptions: 7
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
import BattleScene, { starterColors } from "../battle-scene";
|
||||
import PokemonSpecies, { allSpecies, getPokemonSpecies, getPokemonSpeciesForm, speciesStarters, starterPassiveAbilities, getStarterValueFriendshipCap } from "../data/pokemon-species";
|
||||
import { Species } from "../data/enums/species";
|
||||
import { TextStyle, addBBCodeTextObject, addTextObject } from "./text";
|
||||
import { Mode } from "./ui";
|
||||
import MessageUiHandler from "./message-ui-handler";
|
||||
import { Gender, getGenderColor, getGenderSymbol } from "../data/gender";
|
||||
import { allAbilities } from "../data/ability";
|
||||
import { GameModes, gameModes } from "../game-mode";
|
||||
import { GrowthRate, getGrowthRateColor } from "../data/exp";
|
||||
import { AbilityAttr, DexAttr, DexAttrProps, DexEntry, Passive as PassiveAttr, StarterFormMoveData, StarterMoveset } from "../system/game-data";
|
||||
import * as Utils from "../utils";
|
||||
import PokemonIconAnimHandler, { PokemonIconAnimMode } from "./pokemon-icon-anim-handler";
|
||||
import { StatsContainer } from "./stats-container";
|
||||
import { addWindow } from "./ui-theme";
|
||||
import { Nature, getNatureName } from "../data/nature";
|
||||
import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
|
||||
import { pokemonFormChanges } from "../data/pokemon-forms";
|
||||
import { Tutorial, handleTutorial } from "../tutorial";
|
||||
import { LevelMoves, pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "../data/pokemon-level-moves";
|
||||
import { allMoves } from "../data/move";
|
||||
import { Type } from "../data/type";
|
||||
import { Moves } from "../data/enums/moves";
|
||||
import { speciesEggMoves } from "../data/egg-moves";
|
||||
import { TitlePhase } from "../phases";
|
||||
import { argbFromRgba } from "@material/material-color-utilities";
|
||||
import { OptionSelectItem } from "./abstact-option-select-ui-handler";
|
||||
import { pokemonPrevolutions } from "#app/data/pokemon-evolutions";
|
||||
import { Variant, getVariantTint } from "#app/data/variant";
|
||||
import { argbFromRgba } from "@material/material-color-utilities";
|
||||
import i18next from "i18next";
|
||||
import {Button} from "../enums/buttons";
|
||||
import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
|
||||
import BattleScene, { starterColors } from "../battle-scene";
|
||||
import { allAbilities } from "../data/ability";
|
||||
import { speciesEggMoves } from "../data/egg-moves";
|
||||
import { Moves } from "../data/enums/moves";
|
||||
import { Species } from "../data/enums/species";
|
||||
import { GrowthRate, getGrowthRateColor } from "../data/exp";
|
||||
import { Gender, getGenderColor, getGenderSymbol } from "../data/gender";
|
||||
import { allMoves } from "../data/move";
|
||||
import { Nature, getNatureName } from "../data/nature";
|
||||
import { pokemonFormChanges } from "../data/pokemon-forms";
|
||||
import { LevelMoves, pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "../data/pokemon-level-moves";
|
||||
import PokemonSpecies, { allSpecies, getPokemonSpecies, getPokemonSpeciesForm, getStarterValueFriendshipCap, speciesStarters, starterPassiveAbilities } from "../data/pokemon-species";
|
||||
import { Type } from "../data/type";
|
||||
import { Button } from "../enums/buttons";
|
||||
import { GameModes, gameModes } from "../game-mode";
|
||||
import { TitlePhase } from "../phases";
|
||||
import { AbilityAttr, DexAttr, DexAttrProps, DexEntry, Passive as PassiveAttr, StarterFormMoveData, StarterMoveset } from "../system/game-data";
|
||||
import { Tutorial, handleTutorial } from "../tutorial";
|
||||
import * as Utils from "../utils";
|
||||
import { OptionSelectItem } from "./abstact-option-select-ui-handler";
|
||||
import MessageUiHandler from "./message-ui-handler";
|
||||
import PokemonIconAnimHandler, { PokemonIconAnimMode } from "./pokemon-icon-anim-handler";
|
||||
import { StatsContainer } from "./stats-container";
|
||||
import { TextStyle, addBBCodeTextObject, addTextObject } from "./text";
|
||||
import { Mode } from "./ui";
|
||||
import { addWindow } from "./ui-theme";
|
||||
|
||||
export type StarterSelectCallback = (starters: Starter[]) => void;
|
||||
|
||||
|
|
@ -241,7 +241,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
this.pokemonGenderText.setOrigin(0, 0);
|
||||
this.starterSelectContainer.add(this.pokemonGenderText);
|
||||
|
||||
this.pokemonUncaughtText = addTextObject(this.scene, 6, 127, 'Uncaught', TextStyle.SUMMARY_ALT, { fontSize: '56px' });
|
||||
this.pokemonUncaughtText = addTextObject(this.scene, 6, 127, i18next.t("starterSelectUiHandler:uncaught"), TextStyle.SUMMARY_ALT, { fontSize: '56px' });
|
||||
this.pokemonUncaughtText.setOrigin(0, 0);
|
||||
this.starterSelectContainer.add(this.pokemonUncaughtText);
|
||||
|
||||
|
|
@ -357,6 +357,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
icon.setScale(0.5);
|
||||
icon.setOrigin(0, 0);
|
||||
icon.setFrame(species.getIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant));
|
||||
this.checkIconId(icon, species, defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant);
|
||||
icon.setTint(0);
|
||||
this.starterSelectGenIconContainers[g].add(icon);
|
||||
this.iconAnimHandler.addOrUpdate(icon, PokemonIconAnimMode.NONE);
|
||||
|
|
@ -551,7 +552,35 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
|
||||
this.starterSelectContainer.add(this.pokemonEggMovesContainer);
|
||||
|
||||
this.instructionsText = addTextObject(this.scene, 4, 156, '', TextStyle.PARTY, { fontSize: '42px' });
|
||||
|
||||
|
||||
let instructionTextSize = '42px';
|
||||
// The font size should be set per language
|
||||
const currentLanguage = i18next.language;
|
||||
switch (currentLanguage) {
|
||||
case 'en':
|
||||
instructionTextSize = '42px';
|
||||
break;
|
||||
case 'es':
|
||||
instructionTextSize = '35px';
|
||||
break;
|
||||
case 'fr':
|
||||
instructionTextSize = '42px';
|
||||
break;
|
||||
case 'de':
|
||||
instructionTextSize = '35px';
|
||||
break;
|
||||
case 'it':
|
||||
instructionTextSize = '38px';
|
||||
break;
|
||||
case 'zh_CN':
|
||||
instructionTextSize = '42px';
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
|
||||
this.instructionsText = addTextObject(this.scene, 4, 156, '', TextStyle.PARTY, { fontSize: instructionTextSize });
|
||||
this.starterSelectContainer.add(this.instructionsText);
|
||||
|
||||
this.starterSelectMessageBoxContainer = this.scene.add.container(0, this.scene.game.canvas.height / 6);
|
||||
|
|
@ -764,6 +793,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
const props = this.scene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor);
|
||||
this.starterIcons[this.starterCursors.length].setTexture(species.getIconAtlasKey(props.formIndex, props.shiny, props.variant));
|
||||
this.starterIcons[this.starterCursors.length].setFrame(species.getIconId(props.female, props.formIndex, props.shiny, props.variant));
|
||||
this.checkIconId(this.starterIcons[this.starterCursors.length], species, props.female, props.formIndex, props.shiny, props.variant);
|
||||
this.starterGens.push(this.getGenCursorWithScroll());
|
||||
this.starterCursors.push(this.cursor);
|
||||
this.starterAttr.push(this.dexAttrCursor);
|
||||
|
|
@ -1137,6 +1167,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
cycleInstructionLines[0] += ' | ' + cycleInstructionLines.splice(1, 1);
|
||||
if (cycleInstructionLines.length > 2)
|
||||
cycleInstructionLines[1] += ' | ' + cycleInstructionLines.splice(2, 1);
|
||||
if (cycleInstructionLines.length > 2)
|
||||
cycleInstructionLines[2] += ' | ' + cycleInstructionLines.splice(3, 1);
|
||||
}
|
||||
|
||||
for (let cil of cycleInstructionLines)
|
||||
|
|
@ -1276,6 +1308,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
const props = this.scene.gameData.getSpeciesDexAttrProps(this.lastSpecies, dexAttr);
|
||||
const lastSpeciesIcon = (this.starterSelectGenIconContainers[this.lastSpecies.generation - 1].getAt(this.genSpecies[this.lastSpecies.generation - 1].indexOf(this.lastSpecies)) as Phaser.GameObjects.Sprite);
|
||||
lastSpeciesIcon.setTexture(this.lastSpecies.getIconAtlasKey(props.formIndex, props.shiny, props.variant), this.lastSpecies.getIconId(props.female, props.formIndex, props.shiny, props.variant));
|
||||
this.checkIconId(lastSpeciesIcon, this.lastSpecies, props.female, props.formIndex, props.shiny, props.variant);
|
||||
this.iconAnimHandler.addOrUpdate(lastSpeciesIcon, PokemonIconAnimMode.NONE);
|
||||
}
|
||||
|
||||
|
|
@ -1518,7 +1551,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
|
||||
(this.starterSelectGenIconContainers[this.getGenCursorWithScroll()].getAt(this.cursor) as Phaser.GameObjects.Sprite)
|
||||
.setTexture(species.getIconAtlasKey(formIndex, shiny, variant), species.getIconId(female, formIndex, shiny, variant));
|
||||
|
||||
this.checkIconId((this.starterSelectGenIconContainers[this.getGenCursorWithScroll()].getAt(this.cursor) as Phaser.GameObjects.Sprite), species, female, formIndex, shiny, variant);
|
||||
this.canCycleShiny = !!(dexEntry.caughtAttr & DexAttr.NON_SHINY && dexEntry.caughtAttr & DexAttr.SHINY);
|
||||
this.canCycleGender = !!(dexEntry.caughtAttr & DexAttr.MALE && dexEntry.caughtAttr & DexAttr.FEMALE);
|
||||
this.canCycleAbility = [ abilityAttr & AbilityAttr.ABILITY_1, (abilityAttr & AbilityAttr.ABILITY_2) && species.ability2, abilityAttr & AbilityAttr.ABILITY_HIDDEN ].filter(a => a).length > 1;
|
||||
|
|
@ -1545,7 +1578,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
this.pokemonAbilityText.setShadowColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD, true));
|
||||
|
||||
const passiveAttr = this.scene.gameData.starterData[species.speciesId].passiveAttr;
|
||||
this.pokemonPassiveText.setText(passiveAttr & PassiveAttr.UNLOCKED ? passiveAttr & PassiveAttr.ENABLED ? allAbilities[starterPassiveAbilities[this.lastSpecies.speciesId]].name : 'Disabled' : 'Locked');
|
||||
this.pokemonPassiveText.setText(passiveAttr & PassiveAttr.UNLOCKED ? passiveAttr & PassiveAttr.ENABLED ? allAbilities[starterPassiveAbilities[this.lastSpecies.speciesId]].name : i18next.t("starterSelectUiHandler:disabled") : i18next.t("starterSelectUiHandler:locked"));
|
||||
this.pokemonPassiveText.setColor(this.getTextColor(passiveAttr === (PassiveAttr.UNLOCKED | PassiveAttr.ENABLED) ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GRAY));
|
||||
this.pokemonPassiveText.setShadowColor(this.getTextColor(passiveAttr === (PassiveAttr.UNLOCKED | PassiveAttr.ENABLED) ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GRAY, true));
|
||||
|
||||
|
|
@ -1576,6 +1609,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
if (this.starterMoveset.length < 4 && this.starterMoveset.length < availableStarterMoves.length)
|
||||
this.starterMoveset.push(...availableStarterMoves.filter(sm => this.starterMoveset.indexOf(sm) === -1).slice(0, 4 - this.starterMoveset.length));
|
||||
|
||||
// Remove duplicate moves
|
||||
this.starterMoveset = this.starterMoveset.filter(
|
||||
(move, i) => {
|
||||
return this.starterMoveset.indexOf(move) === i;
|
||||
}) as StarterMoveset;
|
||||
|
||||
const speciesForm = getPokemonSpeciesForm(species.speciesId, formIndex);
|
||||
|
||||
const formText = species?.forms[formIndex]?.formKey.split('-');
|
||||
|
|
@ -1786,4 +1825,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
|
|||
if (this.statsMode)
|
||||
this.toggleStatsMode(false);
|
||||
}
|
||||
|
||||
checkIconId(icon: Phaser.GameObjects.Sprite, species: PokemonSpecies, female, formIndex, shiny, variant) {
|
||||
if (icon.frame.name != species.getIconId(female, formIndex, shiny, variant)) {
|
||||
console.log(`${species.name}'s variant icon does not exist. Replacing with default.`);
|
||||
icon.setTexture(species.getIconAtlasKey(formIndex, false, variant));
|
||||
icon.setFrame(species.getIconId(female, formIndex, false, variant));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -20,6 +20,7 @@ import { loggedInUser } from "../account";
|
|||
import { PlayerGender } from "../system/game-data";
|
||||
import { Variant, getVariantTint } from "#app/data/variant";
|
||||
import {Button} from "../enums/buttons";
|
||||
import { Ability } from "../data/ability.js";
|
||||
|
||||
enum Page {
|
||||
PROFILE,
|
||||
|
|
@ -32,6 +33,18 @@ export enum SummaryUiMode {
|
|||
LEARN_MOVE
|
||||
}
|
||||
|
||||
/** Holds all objects related to an ability for each iteration */
|
||||
interface abilityContainer {
|
||||
/** An image displaying the summary label */
|
||||
labelImage: Phaser.GameObjects.Image,
|
||||
/** The ability object */
|
||||
ability: Ability,
|
||||
/** The text object displaying the name of the ability */
|
||||
nameText: Phaser.GameObjects.Text,
|
||||
/** The text object displaying the description of the ability */
|
||||
descriptionText: Phaser.GameObjects.Text,
|
||||
}
|
||||
|
||||
export default class SummaryUiHandler extends UiHandler {
|
||||
private summaryUiMode: SummaryUiMode;
|
||||
|
||||
|
|
@ -54,6 +67,12 @@ export default class SummaryUiHandler extends UiHandler {
|
|||
private championRibbon: Phaser.GameObjects.Image;
|
||||
private statusContainer: Phaser.GameObjects.Container;
|
||||
private status: Phaser.GameObjects.Image;
|
||||
/** The pixel button prompt indicating a passive is unlocked */
|
||||
private abilityPrompt: Phaser.GameObjects.Image;
|
||||
/** Object holding everything needed to display an ability */
|
||||
private abilityContainer: abilityContainer;
|
||||
/** Object holding everything needed to display a passive */
|
||||
private passiveContainer: abilityContainer;
|
||||
private summaryPageContainer: Phaser.GameObjects.Container;
|
||||
private movesContainer: Phaser.GameObjects.Container;
|
||||
private moveDescriptionText: Phaser.GameObjects.Text;
|
||||
|
|
@ -441,6 +460,17 @@ export default class SummaryUiHandler extends UiHandler {
|
|||
this.showMoveSelect();
|
||||
success = true;
|
||||
}
|
||||
// if we're on the PROFILE page and this pokemon has a passive unlocked..
|
||||
else if (this.cursor === Page.PROFILE && this.pokemon.hasPassive()) {
|
||||
// Since abilities are displayed by default, all we need to do is toggle visibility on all elements to show passives
|
||||
this.abilityContainer.nameText.setVisible(!this.abilityContainer.descriptionText.visible);
|
||||
this.abilityContainer.descriptionText.setVisible(!this.abilityContainer.descriptionText.visible);
|
||||
this.abilityContainer.labelImage.setVisible(!this.abilityContainer.labelImage.visible);
|
||||
|
||||
this.passiveContainer.nameText.setVisible(!this.passiveContainer.descriptionText.visible);
|
||||
this.passiveContainer.descriptionText.setVisible(!this.passiveContainer.descriptionText.visible);
|
||||
this.passiveContainer.labelImage.setVisible(!this.passiveContainer.labelImage.visible);
|
||||
}
|
||||
} else if (button === Button.CANCEL) {
|
||||
if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE)
|
||||
this.hideMoveSelect();
|
||||
|
|
@ -686,40 +716,75 @@ export default class SummaryUiHandler extends UiHandler {
|
|||
profileContainer.add(luckText);
|
||||
}
|
||||
|
||||
const ability = this.pokemon.getAbility(true);
|
||||
this.abilityContainer = {
|
||||
labelImage: this.scene.add.image(0, 0, 'summary_profile_ability'),
|
||||
ability: this.pokemon.getAbility(true),
|
||||
nameText: null,
|
||||
descriptionText: null};
|
||||
|
||||
const abilityNameText = addTextObject(this.scene, 7, 66, ability.name, TextStyle.SUMMARY_ALT);
|
||||
abilityNameText.setOrigin(0, 1);
|
||||
profileContainer.add(abilityNameText);
|
||||
const allAbilityInfo = [this.abilityContainer]; // Creates an array to iterate through
|
||||
// Only add to the array and set up displaying a passive if it's unlocked
|
||||
if (this.pokemon.hasPassive()) {
|
||||
this.passiveContainer = {
|
||||
labelImage: this.scene.add.image(0, 0, 'summary_profile_passive'),
|
||||
ability: this.pokemon.getPassiveAbility(),
|
||||
nameText: null,
|
||||
descriptionText: null};
|
||||
allAbilityInfo.push(this.passiveContainer);
|
||||
|
||||
const abilityDescriptionText = addTextObject(this.scene, 7, 69, ability.description, TextStyle.WINDOW_ALT, { wordWrap: { width: 1224 } });
|
||||
abilityDescriptionText.setOrigin(0, 0);
|
||||
profileContainer.add(abilityDescriptionText);
|
||||
|
||||
const abilityDescriptionTextMaskRect = this.scene.make.graphics({});
|
||||
abilityDescriptionTextMaskRect.setScale(6);
|
||||
abilityDescriptionTextMaskRect.fillStyle(0xFFFFFF);
|
||||
abilityDescriptionTextMaskRect.beginPath();
|
||||
abilityDescriptionTextMaskRect.fillRect(110, 90.5, 206, 31);
|
||||
|
||||
const abilityDescriptionTextMask = abilityDescriptionTextMaskRect.createGeometryMask();
|
||||
|
||||
abilityDescriptionText.setMask(abilityDescriptionTextMask);
|
||||
|
||||
const abilityDescriptionLineCount = Math.floor(abilityDescriptionText.displayHeight / 14.83);
|
||||
|
||||
if (abilityDescriptionLineCount > 2) {
|
||||
abilityDescriptionText.setY(69);
|
||||
this.descriptionScrollTween = this.scene.tweens.add({
|
||||
targets: abilityDescriptionText,
|
||||
delay: Utils.fixedInt(2000),
|
||||
loop: -1,
|
||||
hold: Utils.fixedInt(2000),
|
||||
duration: Utils.fixedInt((abilityDescriptionLineCount - 2) * 2000),
|
||||
y: `-=${14.83 * (abilityDescriptionLineCount - 2)}`
|
||||
});
|
||||
// Sets up the pixel button prompt image
|
||||
this.abilityPrompt = this.scene.add.image(0, 0, !this.scene.gamepadSupport ? 'summary_profile_prompt_z' : 'summary_profile_prompt_a');
|
||||
this.abilityPrompt.setPosition(8, 43);
|
||||
this.abilityPrompt.setVisible(true);
|
||||
this.abilityPrompt.setOrigin(0, 0);
|
||||
profileContainer.add(this.abilityPrompt);
|
||||
}
|
||||
|
||||
allAbilityInfo.forEach(abilityInfo => {
|
||||
abilityInfo.labelImage.setPosition(17, 43);
|
||||
abilityInfo.labelImage.setVisible(true);
|
||||
abilityInfo.labelImage.setOrigin(0, 0);
|
||||
profileContainer.add(abilityInfo.labelImage);
|
||||
|
||||
abilityInfo.nameText = addTextObject(this.scene, 7, 66, abilityInfo.ability.name, TextStyle.SUMMARY_ALT);
|
||||
abilityInfo.nameText.setOrigin(0, 1);
|
||||
profileContainer.add(abilityInfo.nameText);
|
||||
|
||||
abilityInfo.descriptionText = addTextObject(this.scene, 7, 69, abilityInfo.ability.description, TextStyle.WINDOW_ALT, { wordWrap: { width: 1224 } });
|
||||
abilityInfo.descriptionText.setOrigin(0, 0);
|
||||
profileContainer.add(abilityInfo.descriptionText);
|
||||
|
||||
// Sets up the mask that hides the description text to give an illusion of scrolling
|
||||
const descriptionTextMaskRect = this.scene.make.graphics({});
|
||||
descriptionTextMaskRect.setScale(6);
|
||||
descriptionTextMaskRect.fillStyle(0xFFFFFF);
|
||||
descriptionTextMaskRect.beginPath();
|
||||
descriptionTextMaskRect.fillRect(110, 90.5, 206, 31);
|
||||
|
||||
const abilityDescriptionTextMask = descriptionTextMaskRect.createGeometryMask();
|
||||
|
||||
abilityInfo.descriptionText.setMask(abilityDescriptionTextMask);
|
||||
|
||||
const abilityDescriptionLineCount = Math.floor(abilityInfo.descriptionText.displayHeight / 14.83);
|
||||
|
||||
// Animates the description text moving upwards
|
||||
if (abilityDescriptionLineCount > 2) {
|
||||
abilityInfo.descriptionText.setY(69);
|
||||
this.descriptionScrollTween = this.scene.tweens.add({
|
||||
targets: abilityInfo.descriptionText,
|
||||
delay: Utils.fixedInt(2000),
|
||||
loop: -1,
|
||||
hold: Utils.fixedInt(2000),
|
||||
duration: Utils.fixedInt((abilityDescriptionLineCount - 2) * 2000),
|
||||
y: `-=${14.83 * (abilityDescriptionLineCount - 2)}`
|
||||
});
|
||||
}
|
||||
});
|
||||
// Turn off visibility of passive info by default
|
||||
this.passiveContainer?.labelImage.setVisible(false);
|
||||
this.passiveContainer?.nameText.setVisible(false);
|
||||
this.passiveContainer?.descriptionText.setVisible(false);
|
||||
|
||||
let memoString = `${getBBCodeFrag(Utils.toReadableString(Nature[this.pokemon.getNature()]), TextStyle.SUMMARY_RED)}${getBBCodeFrag(' nature,', TextStyle.WINDOW_ALT)}\n${getBBCodeFrag(`${this.pokemon.metBiome === -1 ? 'apparently ' : ''}met at Lv`, TextStyle.WINDOW_ALT)}${getBBCodeFrag(this.pokemon.metLevel.toString(), TextStyle.SUMMARY_RED)}${getBBCodeFrag(',', TextStyle.WINDOW_ALT)}\n${getBBCodeFrag(getBiomeName(this.pokemon.metBiome), TextStyle.SUMMARY_RED)}${getBBCodeFrag('.', TextStyle.WINDOW_ALT)}`;
|
||||
|
||||
const memoText = addBBCodeTextObject(this.scene, 7, 113, memoString, TextStyle.WINDOW_ALT);
|
||||
|
|
|
|||
|
|
@ -117,9 +117,9 @@ export function randSeedEasedWeightedItem<T>(items: T[], easingFunction: string
|
|||
}
|
||||
|
||||
export function getSunday(date: Date): Date {
|
||||
const day = date.getDay();
|
||||
const diff = date.getDate() - day;
|
||||
const newDate = new Date(date.setDate(diff));
|
||||
const day = date.getUTCDay();
|
||||
const diff = date.getUTCDate() - day;
|
||||
const newDate = new Date(date.setUTCDate(diff));
|
||||
return new Date(Date.UTC(newDate.getUTCFullYear(), newDate.getUTCMonth(), newDate.getUTCDate()));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue