mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-19 22:09:27 +02:00
Compare commits
1 Commits
1c4956ac41
...
3359b76952
Author | SHA1 | Date | |
---|---|---|---|
|
3359b76952 |
@ -1 +1 @@
|
|||||||
Subproject commit 1ea8f865e30d1940caa0fceeabf37ae2e4689471
|
Subproject commit ab2716d5440c25f73986664aa3f3131821c3c392
|
@ -15,7 +15,6 @@ import type { Pokemon } from "#field/pokemon";
|
|||||||
import type { SpeciesStatBoosterItem, SpeciesStatBoosterModifierType } from "#modifiers/modifier-type";
|
import type { SpeciesStatBoosterItem, SpeciesStatBoosterModifierType } from "#modifiers/modifier-type";
|
||||||
import { coerceArray, isNullOrUndefined, randSeedInt } from "#utils/common";
|
import { coerceArray, isNullOrUndefined, randSeedInt } from "#utils/common";
|
||||||
import { getPokemonSpecies } from "#utils/pokemon-utils";
|
import { getPokemonSpecies } from "#utils/pokemon-utils";
|
||||||
import { toCamelCase } from "#utils/strings";
|
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
|
|
||||||
export enum SpeciesWildEvolutionDelay {
|
export enum SpeciesWildEvolutionDelay {
|
||||||
@ -134,7 +133,7 @@ export class SpeciesEvolutionCondition {
|
|||||||
case EvoCondKey.FRIENDSHIP:
|
case EvoCondKey.FRIENDSHIP:
|
||||||
return i18next.t("pokemonEvolutions:friendship");
|
return i18next.t("pokemonEvolutions:friendship");
|
||||||
case EvoCondKey.TIME:
|
case EvoCondKey.TIME:
|
||||||
return i18next.t(`pokemonEvolutions:timeOfDay.${toCamelCase(TimeOfDay[cond.time[cond.time.length - 1]])}`); // For Day and Night evos, the key we want goes last
|
return i18next.t(`pokemonEvolutions:timeOfDay.${TimeOfDay[cond.time[cond.time.length - 1]]}`); // For Day and Night evos, the key we want goes last
|
||||||
case EvoCondKey.MOVE_TYPE:
|
case EvoCondKey.MOVE_TYPE:
|
||||||
return i18next.t("pokemonEvolutions:moveType", {type: i18next.t(`pokemonInfo:Type.${PokemonType[cond.pkmnType]}`)});
|
return i18next.t("pokemonEvolutions:moveType", {type: i18next.t(`pokemonInfo:Type.${PokemonType[cond.pkmnType]}`)});
|
||||||
case EvoCondKey.PARTY_TYPE:
|
case EvoCondKey.PARTY_TYPE:
|
||||||
@ -157,7 +156,7 @@ export class SpeciesEvolutionCondition {
|
|||||||
case EvoCondKey.SPECIES_CAUGHT:
|
case EvoCondKey.SPECIES_CAUGHT:
|
||||||
return i18next.t("pokemonEvolutions:caught", {species: getPokemonSpecies(cond.speciesCaught).name});
|
return i18next.t("pokemonEvolutions:caught", {species: getPokemonSpecies(cond.speciesCaught).name});
|
||||||
case EvoCondKey.HELD_ITEM:
|
case EvoCondKey.HELD_ITEM:
|
||||||
return i18next.t(`pokemonEvolutions:heldItem.${toCamelCase(cond.itemKey)}`);
|
return i18next.t(`pokemonEvolutions:heldItem.${cond.itemKey}`);
|
||||||
}
|
}
|
||||||
}).filter(s => !isNullOrUndefined(s)); // Filter out stringless conditions
|
}).filter(s => !isNullOrUndefined(s)); // Filter out stringless conditions
|
||||||
return this.desc;
|
return this.desc;
|
||||||
@ -246,7 +245,7 @@ export class SpeciesFormEvolution {
|
|||||||
}
|
}
|
||||||
if (this.item) {
|
if (this.item) {
|
||||||
const itemDescription = i18next.t(`modifierType:EvolutionItem.${EvolutionItem[this.item].toUpperCase()}`);
|
const itemDescription = i18next.t(`modifierType:EvolutionItem.${EvolutionItem[this.item].toUpperCase()}`);
|
||||||
const rarity = this.item > 50 ? i18next.t("pokemonEvolutions:ultra") : i18next.t("pokemonEvolutions:great");
|
const rarity = this.item > 50 ? i18next.t("pokemonEvolutions:ULTRA") : i18next.t("pokemonEvolutions:GREAT");
|
||||||
strings.push(i18next.t("pokemonEvolutions:using", {item: itemDescription, tier: rarity}));
|
strings.push(i18next.t("pokemonEvolutions:using", {item: itemDescription, tier: rarity}));
|
||||||
}
|
}
|
||||||
if (this.condition) {
|
if (this.condition) {
|
||||||
|
@ -45736,285 +45736,6 @@ export const tmSpecies: TmSpecies = {
|
|||||||
SpeciesId.HISUI_ARCANINE,
|
SpeciesId.HISUI_ARCANINE,
|
||||||
SpeciesId.HISUI_AVALUGG,
|
SpeciesId.HISUI_AVALUGG,
|
||||||
],
|
],
|
||||||
[MoveId.SHOCK_WAVE]: [
|
|
||||||
SpeciesId.RATTATA,
|
|
||||||
SpeciesId.RATICATE,
|
|
||||||
SpeciesId.PIKACHU,
|
|
||||||
SpeciesId.RAICHU,
|
|
||||||
SpeciesId.NIDORAN_F,
|
|
||||||
SpeciesId.NIDORINA,
|
|
||||||
SpeciesId.NIDOQUEEN,
|
|
||||||
SpeciesId.NIDORAN_M,
|
|
||||||
SpeciesId.NIDORINO,
|
|
||||||
SpeciesId.NIDOKING,
|
|
||||||
SpeciesId.CLEFAIRY,
|
|
||||||
SpeciesId.CLEFABLE,
|
|
||||||
SpeciesId.JIGGLYPUFF,
|
|
||||||
SpeciesId.WIGGLYTUFF,
|
|
||||||
SpeciesId.MEOWTH,
|
|
||||||
SpeciesId.PERSIAN,
|
|
||||||
SpeciesId.ABRA,
|
|
||||||
SpeciesId.KADABRA,
|
|
||||||
SpeciesId.ALAKAZAM,
|
|
||||||
SpeciesId.MAGNEMITE,
|
|
||||||
SpeciesId.MAGNETON,
|
|
||||||
SpeciesId.GRIMER,
|
|
||||||
SpeciesId.MUK,
|
|
||||||
SpeciesId.VOLTORB,
|
|
||||||
SpeciesId.ELECTRODE,
|
|
||||||
SpeciesId.LICKITUNG,
|
|
||||||
SpeciesId.KOFFING,
|
|
||||||
SpeciesId.WEEZING,
|
|
||||||
SpeciesId.RHYHORN,
|
|
||||||
SpeciesId.RHYDON,
|
|
||||||
SpeciesId.CHANSEY,
|
|
||||||
SpeciesId.TANGELA,
|
|
||||||
SpeciesId.KANGASKHAN,
|
|
||||||
SpeciesId.MR_MIME,
|
|
||||||
SpeciesId.ELECTABUZZ,
|
|
||||||
SpeciesId.TAUROS,
|
|
||||||
SpeciesId.LAPRAS,
|
|
||||||
SpeciesId.JOLTEON,
|
|
||||||
SpeciesId.PORYGON,
|
|
||||||
SpeciesId.SNORLAX,
|
|
||||||
SpeciesId.ZAPDOS,
|
|
||||||
SpeciesId.DRATINI,
|
|
||||||
SpeciesId.DRAGONAIR,
|
|
||||||
SpeciesId.DRAGONITE,
|
|
||||||
SpeciesId.MEWTWO,
|
|
||||||
SpeciesId.MEW,
|
|
||||||
SpeciesId.SENTRET,
|
|
||||||
SpeciesId.FURRET,
|
|
||||||
SpeciesId.CHINCHOU,
|
|
||||||
SpeciesId.LANTURN,
|
|
||||||
SpeciesId.PICHU,
|
|
||||||
SpeciesId.CLEFFA,
|
|
||||||
SpeciesId.IGGLYBUFF,
|
|
||||||
SpeciesId.TOGEPI,
|
|
||||||
SpeciesId.TOGETIC,
|
|
||||||
SpeciesId.MAREEP,
|
|
||||||
SpeciesId.FLAAFFY,
|
|
||||||
SpeciesId.AMPHAROS,
|
|
||||||
SpeciesId.AIPOM,
|
|
||||||
SpeciesId.MISDREAVUS,
|
|
||||||
SpeciesId.GIRAFARIG,
|
|
||||||
SpeciesId.DUNSPARCE,
|
|
||||||
SpeciesId.SNUBBULL,
|
|
||||||
SpeciesId.GRANBULL,
|
|
||||||
SpeciesId.QWILFISH,
|
|
||||||
SpeciesId.PORYGON2,
|
|
||||||
SpeciesId.STANTLER,
|
|
||||||
SpeciesId.ELEKID,
|
|
||||||
SpeciesId.MILTANK,
|
|
||||||
SpeciesId.BLISSEY,
|
|
||||||
SpeciesId.RAIKOU,
|
|
||||||
SpeciesId.TYRANITAR,
|
|
||||||
SpeciesId.LUGIA,
|
|
||||||
SpeciesId.HO_OH,
|
|
||||||
SpeciesId.CELEBI,
|
|
||||||
SpeciesId.ZIGZAGOON,
|
|
||||||
SpeciesId.LINOONE,
|
|
||||||
SpeciesId.WINGULL,
|
|
||||||
SpeciesId.PELIPPER,
|
|
||||||
SpeciesId.RALTS,
|
|
||||||
SpeciesId.KIRLIA,
|
|
||||||
SpeciesId.GARDEVOIR,
|
|
||||||
SpeciesId.SLAKOTH,
|
|
||||||
SpeciesId.VIGOROTH,
|
|
||||||
SpeciesId.SLAKING,
|
|
||||||
SpeciesId.WHISMUR,
|
|
||||||
SpeciesId.LOUDRED,
|
|
||||||
SpeciesId.EXPLOUD,
|
|
||||||
SpeciesId.NOSEPASS,
|
|
||||||
SpeciesId.SKITTY,
|
|
||||||
SpeciesId.DELCATTY,
|
|
||||||
SpeciesId.SABLEYE,
|
|
||||||
SpeciesId.ARON,
|
|
||||||
SpeciesId.LAIRON,
|
|
||||||
SpeciesId.AGGRON,
|
|
||||||
SpeciesId.ELECTRIKE,
|
|
||||||
SpeciesId.MANECTRIC,
|
|
||||||
SpeciesId.PLUSLE,
|
|
||||||
SpeciesId.MINUN,
|
|
||||||
SpeciesId.VOLBEAT,
|
|
||||||
SpeciesId.ILLUMISE,
|
|
||||||
SpeciesId.GULPIN,
|
|
||||||
SpeciesId.SWALOT,
|
|
||||||
SpeciesId.SPOINK,
|
|
||||||
SpeciesId.GRUMPIG,
|
|
||||||
SpeciesId.SPINDA,
|
|
||||||
SpeciesId.ZANGOOSE,
|
|
||||||
SpeciesId.CASTFORM,
|
|
||||||
SpeciesId.KECLEON,
|
|
||||||
SpeciesId.SHUPPET,
|
|
||||||
SpeciesId.BANETTE,
|
|
||||||
SpeciesId.CHIMECHO,
|
|
||||||
SpeciesId.ABSOL,
|
|
||||||
SpeciesId.REGIROCK,
|
|
||||||
SpeciesId.REGICE,
|
|
||||||
SpeciesId.REGISTEEL,
|
|
||||||
SpeciesId.LATIAS,
|
|
||||||
SpeciesId.LATIOS,
|
|
||||||
SpeciesId.KYOGRE,
|
|
||||||
SpeciesId.GROUDON,
|
|
||||||
SpeciesId.RAYQUAZA,
|
|
||||||
SpeciesId.JIRACHI,
|
|
||||||
SpeciesId.DEOXYS,
|
|
||||||
SpeciesId.BIDOOF,
|
|
||||||
SpeciesId.BIBAREL,
|
|
||||||
SpeciesId.SHINX,
|
|
||||||
SpeciesId.LUXIO,
|
|
||||||
SpeciesId.LUXRAY,
|
|
||||||
SpeciesId.CRANIDOS,
|
|
||||||
SpeciesId.RAMPARDOS,
|
|
||||||
SpeciesId.SHIELDON,
|
|
||||||
SpeciesId.BASTIODON,
|
|
||||||
SpeciesId.PACHIRISU,
|
|
||||||
SpeciesId.AMBIPOM,
|
|
||||||
SpeciesId.DRIFLOON,
|
|
||||||
SpeciesId.DRIFBLIM,
|
|
||||||
SpeciesId.BUNEARY,
|
|
||||||
SpeciesId.LOPUNNY,
|
|
||||||
SpeciesId.MISMAGIUS,
|
|
||||||
SpeciesId.GLAMEOW,
|
|
||||||
SpeciesId.PURUGLY,
|
|
||||||
SpeciesId.CHINGLING,
|
|
||||||
SpeciesId.MIME_JR,
|
|
||||||
SpeciesId.HAPPINY,
|
|
||||||
SpeciesId.SPIRITOMB,
|
|
||||||
SpeciesId.MUNCHLAX,
|
|
||||||
SpeciesId.MAGNEZONE,
|
|
||||||
SpeciesId.LICKILICKY,
|
|
||||||
SpeciesId.RHYPERIOR,
|
|
||||||
SpeciesId.TANGROWTH,
|
|
||||||
SpeciesId.ELECTIVIRE,
|
|
||||||
SpeciesId.TOGEKISS,
|
|
||||||
SpeciesId.PORYGON_Z,
|
|
||||||
SpeciesId.GALLADE,
|
|
||||||
SpeciesId.PROBOPASS,
|
|
||||||
SpeciesId.FROSLASS,
|
|
||||||
SpeciesId.ROTOM,
|
|
||||||
SpeciesId.UXIE,
|
|
||||||
SpeciesId.MESPRIT,
|
|
||||||
SpeciesId.AZELF,
|
|
||||||
SpeciesId.DIALGA,
|
|
||||||
SpeciesId.PALKIA,
|
|
||||||
SpeciesId.REGIGIGAS,
|
|
||||||
SpeciesId.GIRATINA,
|
|
||||||
SpeciesId.DARKRAI,
|
|
||||||
SpeciesId.ARCEUS,
|
|
||||||
SpeciesId.VICTINI,
|
|
||||||
SpeciesId.PATRAT,
|
|
||||||
SpeciesId.WATCHOG,
|
|
||||||
SpeciesId.LILLIPUP,
|
|
||||||
SpeciesId.HERDIER,
|
|
||||||
SpeciesId.STOUTLAND,
|
|
||||||
SpeciesId.MUNNA,
|
|
||||||
SpeciesId.MUSHARNA,
|
|
||||||
SpeciesId.BLITZLE,
|
|
||||||
SpeciesId.ZEBSTRIKA,
|
|
||||||
SpeciesId.WOOBAT,
|
|
||||||
SpeciesId.SWOOBAT,
|
|
||||||
SpeciesId.SIGILYPH,
|
|
||||||
SpeciesId.YAMASK,
|
|
||||||
SpeciesId.COFAGRIGUS,
|
|
||||||
SpeciesId.MINCCINO,
|
|
||||||
SpeciesId.CINCCINO,
|
|
||||||
SpeciesId.GOTHITA,
|
|
||||||
SpeciesId.GOTHORITA,
|
|
||||||
SpeciesId.GOTHITELLE,
|
|
||||||
SpeciesId.SOLOSIS,
|
|
||||||
SpeciesId.DUOSION,
|
|
||||||
SpeciesId.REUNICLUS,
|
|
||||||
SpeciesId.EMOLGA,
|
|
||||||
SpeciesId.FRILLISH,
|
|
||||||
SpeciesId.JELLICENT,
|
|
||||||
SpeciesId.JOLTIK,
|
|
||||||
SpeciesId.GALVANTULA,
|
|
||||||
SpeciesId.KLINK,
|
|
||||||
SpeciesId.KLANG,
|
|
||||||
SpeciesId.KLINKLANG,
|
|
||||||
SpeciesId.EELEKTRIK,
|
|
||||||
SpeciesId.EELEKTROSS,
|
|
||||||
SpeciesId.ELGYEM,
|
|
||||||
SpeciesId.BEHEEYEM,
|
|
||||||
SpeciesId.LITWICK,
|
|
||||||
SpeciesId.LAMPENT,
|
|
||||||
SpeciesId.CHANDELURE,
|
|
||||||
SpeciesId.AXEW,
|
|
||||||
SpeciesId.FRAXURE,
|
|
||||||
SpeciesId.HAXORUS,
|
|
||||||
SpeciesId.STUNFISK,
|
|
||||||
SpeciesId.DRUDDIGON,
|
|
||||||
SpeciesId.GOLETT,
|
|
||||||
SpeciesId.GOLURK,
|
|
||||||
SpeciesId.DEINO,
|
|
||||||
SpeciesId.ZWEILOUS,
|
|
||||||
SpeciesId.HYDREIGON,
|
|
||||||
SpeciesId.THUNDURUS,
|
|
||||||
SpeciesId.ZEKROM,
|
|
||||||
SpeciesId.MELOETTA,
|
|
||||||
SpeciesId.GENESECT,
|
|
||||||
SpeciesId.BRAIXEN,
|
|
||||||
SpeciesId.DELPHOX,
|
|
||||||
SpeciesId.ESPURR,
|
|
||||||
SpeciesId.MEOWSTIC,
|
|
||||||
SpeciesId.HONEDGE,
|
|
||||||
SpeciesId.DOUBLADE,
|
|
||||||
SpeciesId.AEGISLASH,
|
|
||||||
SpeciesId.SKRELP,
|
|
||||||
SpeciesId.DRAGALGE,
|
|
||||||
SpeciesId.HELIOPTILE,
|
|
||||||
SpeciesId.HELIOLISK,
|
|
||||||
SpeciesId.DEDENNE,
|
|
||||||
SpeciesId.GOOMY,
|
|
||||||
SpeciesId.SLIGGOO,
|
|
||||||
SpeciesId.GOODRA,
|
|
||||||
SpeciesId.ZYGARDE,
|
|
||||||
SpeciesId.HOOPA,
|
|
||||||
SpeciesId.YUNGOOS,
|
|
||||||
SpeciesId.GUMSHOOS,
|
|
||||||
SpeciesId.GRUBBIN,
|
|
||||||
SpeciesId.CHARJABUG,
|
|
||||||
SpeciesId.VIKAVOLT,
|
|
||||||
SpeciesId.PASSIMIAN,
|
|
||||||
SpeciesId.TURTONATOR,
|
|
||||||
SpeciesId.TOGEDEMARU,
|
|
||||||
SpeciesId.DRAMPA,
|
|
||||||
SpeciesId.KOMMO_O,
|
|
||||||
SpeciesId.TAPU_KOKO,
|
|
||||||
SpeciesId.SOLGALEO,
|
|
||||||
SpeciesId.LUNALA,
|
|
||||||
SpeciesId.PHEROMOSA,
|
|
||||||
SpeciesId.XURKITREE,
|
|
||||||
SpeciesId.CELESTEELA,
|
|
||||||
SpeciesId.GUZZLORD,
|
|
||||||
SpeciesId.NECROZMA,
|
|
||||||
SpeciesId.MAGEARNA,
|
|
||||||
SpeciesId.NAGANADEL,
|
|
||||||
SpeciesId.ZERAORA,
|
|
||||||
SpeciesId.TOXTRICITY,
|
|
||||||
SpeciesId.MR_RIME,
|
|
||||||
SpeciesId.REGIELEKI,
|
|
||||||
SpeciesId.WYRDEER,
|
|
||||||
SpeciesId.FARIGIRAF,
|
|
||||||
SpeciesId.DUDUNSPARCE,
|
|
||||||
SpeciesId.MIRAIDON,
|
|
||||||
SpeciesId.RAGING_BOLT,
|
|
||||||
SpeciesId.ALOLA_RATTATA,
|
|
||||||
SpeciesId.ALOLA_RATICATE,
|
|
||||||
SpeciesId.ALOLA_RAICHU,
|
|
||||||
SpeciesId.ALOLA_MEOWTH,
|
|
||||||
SpeciesId.ALOLA_PERSIAN,
|
|
||||||
SpeciesId.ALOLA_GRAVELER,
|
|
||||||
SpeciesId.ALOLA_GOLEM,
|
|
||||||
SpeciesId.ALOLA_GRIMER,
|
|
||||||
SpeciesId.ALOLA_MUK,
|
|
||||||
SpeciesId.GALAR_WEEZING,
|
|
||||||
SpeciesId.GALAR_MR_MIME,
|
|
||||||
SpeciesId.HISUI_SLIGGOO,
|
|
||||||
SpeciesId.HISUI_GOODRA,
|
|
||||||
],
|
|
||||||
[MoveId.WATER_PULSE]: [
|
[MoveId.WATER_PULSE]: [
|
||||||
SpeciesId.SQUIRTLE,
|
SpeciesId.SQUIRTLE,
|
||||||
SpeciesId.WARTORTLE,
|
SpeciesId.WARTORTLE,
|
||||||
@ -69026,7 +68747,6 @@ export const tmPoolTiers: TmPoolTiers = {
|
|||||||
[MoveId.LEAF_BLADE]: ModifierTier.ULTRA,
|
[MoveId.LEAF_BLADE]: ModifierTier.ULTRA,
|
||||||
[MoveId.DRAGON_DANCE]: ModifierTier.GREAT,
|
[MoveId.DRAGON_DANCE]: ModifierTier.GREAT,
|
||||||
[MoveId.ROCK_BLAST]: ModifierTier.GREAT,
|
[MoveId.ROCK_BLAST]: ModifierTier.GREAT,
|
||||||
[MoveId.SHOCK_WAVE]: ModifierTier.GREAT,
|
|
||||||
[MoveId.WATER_PULSE]: ModifierTier.GREAT,
|
[MoveId.WATER_PULSE]: ModifierTier.GREAT,
|
||||||
[MoveId.ROOST]: ModifierTier.GREAT,
|
[MoveId.ROOST]: ModifierTier.GREAT,
|
||||||
[MoveId.GRAVITY]: ModifierTier.COMMON,
|
[MoveId.GRAVITY]: ModifierTier.COMMON,
|
||||||
|
@ -30,7 +30,7 @@ export abstract class SpeciesFormChangeTrigger {
|
|||||||
export class SpeciesFormChangeManualTrigger extends SpeciesFormChangeTrigger {}
|
export class SpeciesFormChangeManualTrigger extends SpeciesFormChangeTrigger {}
|
||||||
|
|
||||||
export class SpeciesFormChangeAbilityTrigger extends SpeciesFormChangeTrigger {
|
export class SpeciesFormChangeAbilityTrigger extends SpeciesFormChangeTrigger {
|
||||||
public description: string = i18next.t("pokemonEvolutions:forms.ability");
|
public description: string = i18next.t("pokemonEvolutions:Forms.ability");
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SpeciesFormChangeCompoundTrigger {
|
export class SpeciesFormChangeCompoundTrigger {
|
||||||
@ -69,10 +69,10 @@ export class SpeciesFormChangeItemTrigger extends SpeciesFormChangeTrigger {
|
|||||||
this.item = item;
|
this.item = item;
|
||||||
this.active = active;
|
this.active = active;
|
||||||
this.description = this.active
|
this.description = this.active
|
||||||
? i18next.t("pokemonEvolutions:forms.item", {
|
? i18next.t("pokemonEvolutions:Forms.item", {
|
||||||
item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`),
|
item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`),
|
||||||
})
|
})
|
||||||
: i18next.t("pokemonEvolutions:forms.deactivateItem", {
|
: i18next.t("pokemonEvolutions:Forms.deactivateItem", {
|
||||||
item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`),
|
item: i18next.t(`modifierType:FormChangeItem.${FormChangeItem[this.item]}`),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -97,7 +97,7 @@ export class SpeciesFormChangeTimeOfDayTrigger extends SpeciesFormChangeTrigger
|
|||||||
constructor(...timesOfDay: TimeOfDay[]) {
|
constructor(...timesOfDay: TimeOfDay[]) {
|
||||||
super();
|
super();
|
||||||
this.timesOfDay = timesOfDay;
|
this.timesOfDay = timesOfDay;
|
||||||
this.description = i18next.t("pokemonEvolutions:orms.timeOfDay");
|
this.description = i18next.t("pokemonEvolutions:Forms.timeOfDay");
|
||||||
}
|
}
|
||||||
|
|
||||||
canChange(_pokemon: Pokemon): boolean {
|
canChange(_pokemon: Pokemon): boolean {
|
||||||
@ -111,8 +111,8 @@ export class SpeciesFormChangeActiveTrigger extends SpeciesFormChangeTrigger {
|
|||||||
super();
|
super();
|
||||||
this.active = active;
|
this.active = active;
|
||||||
this.description = this.active
|
this.description = this.active
|
||||||
? i18next.t("pokemonEvolutions:forms.enter")
|
? i18next.t("pokemonEvolutions:Forms.enter")
|
||||||
: i18next.t("pokemonEvolutions:forms.leave");
|
: i18next.t("pokemonEvolutions:Forms.leave");
|
||||||
}
|
}
|
||||||
|
|
||||||
canChange(pokemon: Pokemon): boolean {
|
canChange(pokemon: Pokemon): boolean {
|
||||||
@ -128,7 +128,7 @@ export class SpeciesFormChangeStatusEffectTrigger extends SpeciesFormChangeTrigg
|
|||||||
super();
|
super();
|
||||||
this.statusEffects = coerceArray(statusEffects);
|
this.statusEffects = coerceArray(statusEffects);
|
||||||
this.invert = invert;
|
this.invert = invert;
|
||||||
// this.description = i18next.t("pokemonEvolutions:forms.statusEffect");
|
// this.description = i18next.t("pokemonEvolutions:Forms.statusEffect");
|
||||||
}
|
}
|
||||||
|
|
||||||
canChange(pokemon: Pokemon): boolean {
|
canChange(pokemon: Pokemon): boolean {
|
||||||
@ -146,10 +146,10 @@ export class SpeciesFormChangeMoveLearnedTrigger extends SpeciesFormChangeTrigge
|
|||||||
this.known = known;
|
this.known = known;
|
||||||
const moveKey = toCamelCase(MoveId[this.move]);
|
const moveKey = toCamelCase(MoveId[this.move]);
|
||||||
this.description = known
|
this.description = known
|
||||||
? i18next.t("pokemonEvolutions:forms.moveLearned", {
|
? i18next.t("pokemonEvolutions:Forms.moveLearned", {
|
||||||
move: i18next.t(`move:${moveKey}.name`),
|
move: i18next.t(`move:${moveKey}.name`),
|
||||||
})
|
})
|
||||||
: i18next.t("pokemonEvolutions:forms.moveForgotten", {
|
: i18next.t("pokemonEvolutions:Forms.moveForgotten", {
|
||||||
move: i18next.t(`move:${moveKey}.name`),
|
move: i18next.t(`move:${moveKey}.name`),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -171,7 +171,7 @@ export abstract class SpeciesFormChangeMoveTrigger extends SpeciesFormChangeTrig
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class SpeciesFormChangePreMoveTrigger extends SpeciesFormChangeMoveTrigger {
|
export class SpeciesFormChangePreMoveTrigger extends SpeciesFormChangeMoveTrigger {
|
||||||
description = i18next.t("pokemonEvolutions:forms.preMove");
|
description = i18next.t("pokemonEvolutions:Forms.preMove");
|
||||||
canChange(pokemon: Pokemon): boolean {
|
canChange(pokemon: Pokemon): boolean {
|
||||||
const command = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()];
|
const command = globalScene.currentBattle.turnCommands[pokemon.getBattlerIndex()];
|
||||||
return !!command?.move && this.movePredicate(command.move.move) === this.used;
|
return !!command?.move && this.movePredicate(command.move.move) === this.used;
|
||||||
@ -179,7 +179,7 @@ export class SpeciesFormChangePreMoveTrigger extends SpeciesFormChangeMoveTrigge
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class SpeciesFormChangePostMoveTrigger extends SpeciesFormChangeMoveTrigger {
|
export class SpeciesFormChangePostMoveTrigger extends SpeciesFormChangeMoveTrigger {
|
||||||
description = i18next.t("pokemonEvolutions:forms.postMove");
|
description = i18next.t("pokemonEvolutions:Forms.postMove");
|
||||||
canChange(pokemon: Pokemon): boolean {
|
canChange(pokemon: Pokemon): boolean {
|
||||||
return (
|
return (
|
||||||
pokemon.summonData && !!pokemon.getLastXMoves(1).filter(m => this.movePredicate(m.move)).length === this.used
|
pokemon.summonData && !!pokemon.getLastXMoves(1).filter(m => this.movePredicate(m.move)).length === this.used
|
||||||
@ -244,7 +244,7 @@ export class SpeciesFormChangeWeatherTrigger extends SpeciesFormChangeTrigger {
|
|||||||
super();
|
super();
|
||||||
this.ability = ability;
|
this.ability = ability;
|
||||||
this.weathers = weathers;
|
this.weathers = weathers;
|
||||||
this.description = i18next.t("pokemonEvolutions:forms.weather");
|
this.description = i18next.t("pokemonEvolutions:Forms.weather");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -282,7 +282,7 @@ export class SpeciesFormChangeRevertWeatherFormTrigger extends SpeciesFormChange
|
|||||||
super();
|
super();
|
||||||
this.ability = ability;
|
this.ability = ability;
|
||||||
this.weathers = weathers;
|
this.weathers = weathers;
|
||||||
this.description = i18next.t("pokemonEvolutions:forms.weatherRevert");
|
this.description = i18next.t("pokemonEvolutions:Forms.weatherRevert");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -880,7 +880,7 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
|
|||||||
|
|
||||||
localize(): void {
|
localize(): void {
|
||||||
this.name = i18next.t(`pokemon:${SpeciesId[this.speciesId].toLowerCase()}`);
|
this.name = i18next.t(`pokemon:${SpeciesId[this.speciesId].toLowerCase()}`);
|
||||||
this.category = i18next.t(`pokemonCategory:${toCamelCase(SpeciesId[this.speciesId])}Category`);
|
this.category = i18next.t(`pokemonCategory:${SpeciesId[this.speciesId].toLowerCase()}_category`);
|
||||||
}
|
}
|
||||||
|
|
||||||
getWildSpeciesForLevel(level: number, allowEvolving: boolean, isBoss: boolean, gameMode: GameMode): SpeciesId {
|
getWildSpeciesForLevel(level: number, allowEvolving: boolean, isBoss: boolean, gameMode: GameMode): SpeciesId {
|
||||||
|
@ -410,11 +410,6 @@ export class PokedexUiHandler extends MessageUiHandler {
|
|||||||
new DropDownLabel(i18next.t("filterBar:hasHiddenAbility"), undefined, DropDownState.ON),
|
new DropDownLabel(i18next.t("filterBar:hasHiddenAbility"), undefined, DropDownState.ON),
|
||||||
new DropDownLabel(i18next.t("filterBar:noHiddenAbility"), undefined, DropDownState.EXCLUDE),
|
new DropDownLabel(i18next.t("filterBar:noHiddenAbility"), undefined, DropDownState.EXCLUDE),
|
||||||
];
|
];
|
||||||
const seenSpeciesLabels = [
|
|
||||||
new DropDownLabel(i18next.t("filterBar:seenSpecies"), undefined, DropDownState.OFF),
|
|
||||||
new DropDownLabel(i18next.t("filterBar:isSeen"), undefined, DropDownState.ON),
|
|
||||||
new DropDownLabel(i18next.t("filterBar:isUnseen"), undefined, DropDownState.EXCLUDE),
|
|
||||||
];
|
|
||||||
const eggLabels = [
|
const eggLabels = [
|
||||||
new DropDownLabel(i18next.t("filterBar:egg"), undefined, DropDownState.OFF),
|
new DropDownLabel(i18next.t("filterBar:egg"), undefined, DropDownState.OFF),
|
||||||
new DropDownLabel(i18next.t("filterBar:eggPurchasable"), undefined, DropDownState.ON),
|
new DropDownLabel(i18next.t("filterBar:eggPurchasable"), undefined, DropDownState.ON),
|
||||||
@ -428,7 +423,6 @@ export class PokedexUiHandler extends MessageUiHandler {
|
|||||||
new DropDownOption("FAVORITE", favoriteLabels),
|
new DropDownOption("FAVORITE", favoriteLabels),
|
||||||
new DropDownOption("WIN", winLabels),
|
new DropDownOption("WIN", winLabels),
|
||||||
new DropDownOption("HIDDEN_ABILITY", hiddenAbilityLabels),
|
new DropDownOption("HIDDEN_ABILITY", hiddenAbilityLabels),
|
||||||
new DropDownOption("SEEN_SPECIES", seenSpeciesLabels),
|
|
||||||
new DropDownOption("EGG", eggLabels),
|
new DropDownOption("EGG", eggLabels),
|
||||||
new DropDownOption("POKERUS", pokerusLabels),
|
new DropDownOption("POKERUS", pokerusLabels),
|
||||||
];
|
];
|
||||||
@ -798,15 +792,13 @@ export class PokedexUiHandler extends MessageUiHandler {
|
|||||||
this.starterSelectMessageBoxContainer.setVisible(!!text?.length);
|
this.starterSelectMessageBoxContainer.setVisible(!!text?.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
isSeen(species: PokemonSpecies, dexEntry: DexEntry, seenFilter?: boolean): boolean {
|
isSeen(species: PokemonSpecies, dexEntry: DexEntry): boolean {
|
||||||
if (dexEntry?.seenAttr) {
|
if (dexEntry?.seenAttr) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!seenFilter) {
|
|
||||||
const starterDexEntry = globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)];
|
const starterDexEntry = globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)];
|
||||||
return !!starterDexEntry?.caughtAttr;
|
return !!starterDexEntry?.caughtAttr;
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1625,21 +1617,6 @@ export class PokedexUiHandler extends MessageUiHandler {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Seen Filter
|
|
||||||
const dexEntry = globalScene.gameData.dexData[species.speciesId];
|
|
||||||
const isItSeen = this.isSeen(species, dexEntry, true);
|
|
||||||
const fitsSeen = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
|
|
||||||
if (misc.val === "SEEN_SPECIES" && misc.state === DropDownState.ON) {
|
|
||||||
return isItSeen;
|
|
||||||
}
|
|
||||||
if (misc.val === "SEEN_SPECIES" && misc.state === DropDownState.EXCLUDE) {
|
|
||||||
return !isItSeen;
|
|
||||||
}
|
|
||||||
if (misc.val === "SEEN_SPECIES" && misc.state === DropDownState.OFF) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Egg Purchasable Filter
|
// Egg Purchasable Filter
|
||||||
const isEggPurchasable = this.isSameSpeciesEggAvailable(species.speciesId);
|
const isEggPurchasable = this.isSameSpeciesEggAvailable(species.speciesId);
|
||||||
const fitsEgg = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
|
const fitsEgg = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
|
||||||
@ -1681,7 +1658,6 @@ export class PokedexUiHandler extends MessageUiHandler {
|
|||||||
fitsFavorite &&
|
fitsFavorite &&
|
||||||
fitsWin &&
|
fitsWin &&
|
||||||
fitsHA &&
|
fitsHA &&
|
||||||
fitsSeen &&
|
|
||||||
fitsEgg &&
|
fitsEgg &&
|
||||||
fitsPokerus
|
fitsPokerus
|
||||||
) {
|
) {
|
||||||
|
Loading…
Reference in New Issue
Block a user