ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix effect spore immunities, tera blast TM distribution, and IVs shown on catch (#388) 

* Fix effect spore, tera blast distribution, and IVs shown on catch

* Forgot to add tms

* Unown does not learn any TMs

* Fix some tera blast learns

* delelele whooooop
This commit is contained in:
Tempoanon 2024-05-01 17:47:32 -04:00 committed by GitHub
parent 5a6ea40dae
commit 0f153d39b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 433 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/data/ability.ts
View File

@ -679,6 +679,19 @@ export class PostDefendContactApplyStatusEffectAbAttr extends PostDefendAbAttr {
} }
} }
export class EffectSporeAbAttr extends PostDefendContactApplyStatusEffectAbAttr {
constructor() {
super(10, StatusEffect.POISON, StatusEffect.PARALYSIS, StatusEffect.SLEEP);
}
applyPostDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean {
if (attacker.hasAbility(Abilities.OVERCOAT) || attacker.isOfType(Type.GRASS)) {
return false;
}
return super.applyPostDefend(pokemon, passive, attacker, move, hitResult, args);
}
}
export class PostDefendContactApplyTagChanceAbAttr extends PostDefendAbAttr { export class PostDefendContactApplyTagChanceAbAttr extends PostDefendAbAttr {
private chance: integer; private chance: integer;
private tagType: BattlerTagType; private tagType: BattlerTagType;
@ -2572,7 +2585,7 @@ export function initAbilities() {
.attr(TypeImmunityAbAttr, Type.GROUND, (pokemon: Pokemon) => !pokemon.getTag(BattlerTagType.IGNORE_FLYING) && !pokemon.scene.arena.getTag(ArenaTagType.GRAVITY) && !pokemon.getTag(BattlerTagType.GROUNDED)) .attr(TypeImmunityAbAttr, Type.GROUND, (pokemon: Pokemon) => !pokemon.getTag(BattlerTagType.IGNORE_FLYING) && !pokemon.scene.arena.getTag(ArenaTagType.GRAVITY) && !pokemon.getTag(BattlerTagType.GROUNDED))
.ignorable(), .ignorable(),
new Ability(Abilities.EFFECT_SPORE, 3) new Ability(Abilities.EFFECT_SPORE, 3)
.attr(PostDefendContactApplyStatusEffectAbAttr, 10, StatusEffect.POISON, StatusEffect.PARALYSIS, StatusEffect.SLEEP), .attr(EffectSporeAbAttr),
new Ability(Abilities.SYNCHRONIZE, 3) new Ability(Abilities.SYNCHRONIZE, 3)
.attr(SyncEncounterNatureAbAttr) .attr(SyncEncounterNatureAbAttr)
.unimplemented(), .unimplemented(),

435
src/data/tms.ts
View File

@ -29550,7 +29550,6 @@ export const tmSpecies: TmSpecies = {
Species.MURKROW, Species.MURKROW,
Species.SLOWKING, Species.SLOWKING,
Species.MISDREAVUS, Species.MISDREAVUS,
Species.UNOWN,
Species.GIRAFARIG, Species.GIRAFARIG,
Species.PINECO, Species.PINECO,
Species.FORRETRESS, Species.FORRETRESS,
@ -62012,21 +62011,49 @@ export const tmSpecies: TmSpecies = {
Species.ALOLA_MAROWAK, Species.ALOLA_MAROWAK,
], ],
[Moves.TERA_BLAST]: [ [Moves.TERA_BLAST]: [
Species.BULBASAUR,
Species.IVYSAUR,
Species.VENUSAUR,
Species.CHARMANDER, Species.CHARMANDER,
Species.CHARMELEON, Species.CHARMELEON,
Species.CHARIZARD, Species.CHARIZARD,
Species.SQUIRTLE,
Species.WARTORTLE,
Species.BLASTOISE,
Species.BUTTERFREE,
Species.BEEDRILL,
Species.PIDGEY,
Species.PIDGEOTTO,
Species.PIDGEOT,
Species.RATTATA,
Species.RATICATE,
Species.SPEAROW,
Species.FEAROW,
Species.EKANS, Species.EKANS,
Species.ARBOK, Species.ARBOK,
Species.PIKACHU, Species.PIKACHU,
Species.RAICHU, Species.RAICHU,
Species.SANDSHREW, Species.SANDSHREW,
Species.SANDSLASH, Species.SANDSLASH,
Species.NIDORAN_F,
Species.NIDORINA,
Species.NIDOQUEEN,
Species.NIDORAN_M,
Species.NIDORINO,
Species.NIDOKING,
Species.CLEFAIRY, Species.CLEFAIRY,
Species.CLEFABLE, Species.CLEFABLE,
Species.VULPIX, Species.VULPIX,
Species.NINETALES, Species.NINETALES,
Species.JIGGLYPUFF, Species.JIGGLYPUFF,
Species.WIGGLYTUFF, Species.WIGGLYTUFF,
Species.ZUBAT,
Species.GOLBAT,
Species.ODDISH,
Species.GLOOM,
Species.VILEPLUME,
Species.PARAS,
Species.PARASECT,
Species.VENONAT, Species.VENONAT,
Species.VENOMOTH, Species.VENOMOTH,
Species.DIGLETT, Species.DIGLETT,
@ -62042,16 +62069,31 @@ export const tmSpecies: TmSpecies = {
Species.POLIWAG, Species.POLIWAG,
Species.POLIWHIRL, Species.POLIWHIRL,
Species.POLIWRATH, Species.POLIWRATH,
Species.ABRA,
Species.KADABRA,
Species.ALAKAZAM,
Species.MACHOP,
Species.MACHOKE,
Species.MACHAMP,
Species.BELLSPROUT, Species.BELLSPROUT,
Species.WEEPINBELL, Species.WEEPINBELL,
Species.VICTREEBEL, Species.VICTREEBEL,
Species.TENTACOOL,
Species.TENTACRUEL,
Species.GEODUDE, Species.GEODUDE,
Species.GRAVELER, Species.GRAVELER,
Species.GOLEM, Species.GOLEM,
Species.PONYTA,
Species.RAPIDASH,
Species.SLOWPOKE, Species.SLOWPOKE,
Species.SLOWBRO, Species.SLOWBRO,
Species.MAGNEMITE, Species.MAGNEMITE,
Species.MAGNETON, Species.MAGNETON,
Species.FARFETCHD,
Species.DODUO,
Species.DODRIO,
Species.SEEL,
Species.DEWGONG,
Species.GRIMER, Species.GRIMER,
Species.MUK, Species.MUK,
Species.SHELLDER, Species.SHELLDER,
@ -62059,20 +62101,52 @@ export const tmSpecies: TmSpecies = {
Species.GASTLY, Species.GASTLY,
Species.HAUNTER, Species.HAUNTER,
Species.GENGAR, Species.GENGAR,
Species.ONIX,
Species.DROWZEE, Species.DROWZEE,
Species.HYPNO, Species.HYPNO,
Species.KRABBY,
Species.KINGLER,
Species.VOLTORB, Species.VOLTORB,
Species.ELECTRODE, Species.ELECTRODE,
Species.EXEGGCUTE,
Species.EXEGGUTOR,
Species.CUBONE,
Species.MAROWAK,
Species.HITMONLEE,
Species.HITMONCHAN,
Species.LICKITUNG,
Species.KOFFING, Species.KOFFING,
Species.WEEZING, Species.WEEZING,
Species.RHYHORN,
Species.RHYDON,
Species.CHANSEY, Species.CHANSEY,
Species.TANGELA,
Species.KANGASKHAN,
Species.HORSEA,
Species.SEADRA,
Species.GOLDEEN,
Species.SEAKING,
Species.STARYU,
Species.STARMIE,
Species.MR_MIME,
Species.SCYTHER, Species.SCYTHER,
Species.JYNX,
Species.ELECTABUZZ,
Species.MAGMAR,
Species.PINSIR,
Species.TAUROS, Species.TAUROS,
Species.GYARADOS, Species.GYARADOS,
Species.LAPRAS,
Species.EEVEE, Species.EEVEE,
Species.VAPOREON, Species.VAPOREON,
Species.JOLTEON, Species.JOLTEON,
Species.FLAREON, Species.FLAREON,
Species.PORYGON,
Species.OMANYTE,
Species.OMASTAR,
Species.KABUTO,
Species.KABUTOPS,
Species.AERODACTYL,
Species.SNORLAX, Species.SNORLAX,
Species.ARTICUNO, Species.ARTICUNO,
Species.ZAPDOS, Species.ZAPDOS,
@ -62082,21 +62156,37 @@ export const tmSpecies: TmSpecies = {
Species.DRAGONITE, Species.DRAGONITE,
Species.MEWTWO, Species.MEWTWO,
Species.MEW, Species.MEW,
Species.CHIKORITA,
Species.BAYLEEF,
Species.MEGANIUM,
Species.CYNDAQUIL, Species.CYNDAQUIL,
Species.QUILAVA, Species.QUILAVA,
Species.TYPHLOSION, Species.TYPHLOSION,
Species.TOTODILE,
Species.CROCONAW,
Species.FERALIGATR,
Species.SENTRET, Species.SENTRET,
Species.FURRET, Species.FURRET,
Species.HOOTHOOT, Species.HOOTHOOT,
Species.NOCTOWL, Species.NOCTOWL,
Species.LEDYBA,
Species.LEDIAN,
Species.SPINARAK, Species.SPINARAK,
Species.ARIADOS, Species.ARIADOS,
Species.CROBAT,
Species.CHINCHOU,
Species.LANTURN,
Species.PICHU, Species.PICHU,
Species.CLEFFA, Species.CLEFFA,
Species.IGGLYBUFF, Species.IGGLYBUFF,
Species.TOGEPI,
Species.TOGETIC,
Species.NATU,
Species.XATU,
Species.MAREEP, Species.MAREEP,
Species.FLAAFFY, Species.FLAAFFY,
Species.AMPHAROS, Species.AMPHAROS,
Species.BELLOSSOM,
Species.MARILL, Species.MARILL,
Species.AZUMARILL, Species.AZUMARILL,
Species.SUDOWOODO, Species.SUDOWOODO,
@ -62120,8 +62210,12 @@ export const tmSpecies: TmSpecies = {
Species.FORRETRESS, Species.FORRETRESS,
Species.DUNSPARCE, Species.DUNSPARCE,
Species.GLIGAR, Species.GLIGAR,
Species.STEELIX,
Species.SNUBBULL,
Species.GRANBULL,
Species.QWILFISH, Species.QWILFISH,
Species.SCIZOR, Species.SCIZOR,
Species.SHUCKLE,
Species.HERACROSS, Species.HERACROSS,
Species.SNEASEL, Species.SNEASEL,
Species.TEDDIURSA, Species.TEDDIURSA,
@ -62130,24 +62224,58 @@ export const tmSpecies: TmSpecies = {
Species.MAGCARGO, Species.MAGCARGO,
Species.SWINUB, Species.SWINUB,
Species.PILOSWINE, Species.PILOSWINE,
Species.CORSOLA,
Species.REMORAID,
Species.OCTILLERY,
Species.DELIBIRD, Species.DELIBIRD,
Species.MANTINE,
Species.SKARMORY,
Species.HOUNDOUR, Species.HOUNDOUR,
Species.HOUNDOOM, Species.HOUNDOOM,
Species.KINGDRA,
Species.PHANPY, Species.PHANPY,
Species.DONPHAN, Species.DONPHAN,
Species.PORYGON2,
Species.STANTLER, Species.STANTLER,
Species.TYROGUE,
Species.HITMONTOP,
Species.SMOOCHUM,
Species.ELEKID,
Species.MAGBY,
Species.MILTANK,
Species.BLISSEY, Species.BLISSEY,
Species.RAIKOU,
Species.ENTEI,
Species.SUICUNE,
Species.LARVITAR, Species.LARVITAR,
Species.PUPITAR, Species.PUPITAR,
Species.TYRANITAR, Species.TYRANITAR,
Species.LUGIA,
Species.HO_OH,
Species.CELEBI,
Species.TREECKO,
Species.GROVYLE,
Species.SCEPTILE,
Species.TORCHIC,
Species.COMBUSKEN,
Species.BLAZIKEN,
Species.MUDKIP,
Species.MARSHTOMP,
Species.SWAMPERT,
Species.POOCHYENA, Species.POOCHYENA,
Species.MIGHTYENA, Species.MIGHTYENA,
Species.ZIGZAGOON,
Species.LINOONE,
Species.BEAUTIFLY,
Species.DUSTOX,
Species.LOTAD, Species.LOTAD,
Species.LOMBRE, Species.LOMBRE,
Species.LUDICOLO, Species.LUDICOLO,
Species.SEEDOT, Species.SEEDOT,
Species.NUZLEAF, Species.NUZLEAF,
Species.SHIFTRY, Species.SHIFTRY,
Species.TAILLOW,
Species.SWELLOW,
Species.WINGULL, Species.WINGULL,
Species.PELIPPER, Species.PELIPPER,
Species.RALTS, Species.RALTS,
@ -62160,49 +62288,101 @@ export const tmSpecies: TmSpecies = {
Species.SLAKOTH, Species.SLAKOTH,
Species.VIGOROTH, Species.VIGOROTH,
Species.SLAKING, Species.SLAKING,
Species.NINCADA,
Species.NINJASK,
Species.SHEDINJA,
Species.WHISMUR,
Species.LOUDRED,
Species.EXPLOUD,
Species.MAKUHITA, Species.MAKUHITA,
Species.HARIYAMA, Species.HARIYAMA,
Species.AZURILL, Species.AZURILL,
Species.NOSEPASS, Species.NOSEPASS,
Species.SKITTY,
Species.DELCATTY,
Species.SABLEYE, Species.SABLEYE,
Species.MAWILE,
Species.ARON,
Species.LAIRON,
Species.AGGRON,
Species.MEDITITE, Species.MEDITITE,
Species.MEDICHAM, Species.MEDICHAM,
Species.ELECTRIKE,
Species.MANECTRIC,
Species.PLUSLE,
Species.MINUN,
Species.VOLBEAT, Species.VOLBEAT,
Species.ILLUMISE, Species.ILLUMISE,
Species.ROSELIA,
Species.GULPIN, Species.GULPIN,
Species.SWALOT, Species.SWALOT,
Species.CARVANHA,
Species.SHARPEDO,
Species.WAILMER,
Species.WAILORD,
Species.NUMEL, Species.NUMEL,
Species.CAMERUPT, Species.CAMERUPT,
Species.TORKOAL, Species.TORKOAL,
Species.SPOINK, Species.SPOINK,
Species.GRUMPIG, Species.GRUMPIG,
Species.SPINDA,
Species.TRAPINCH,
Species.VIBRAVA,
Species.FLYGON,
Species.CACNEA, Species.CACNEA,
Species.CACTURNE, Species.CACTURNE,
Species.SWABLU, Species.SWABLU,
Species.ALTARIA, Species.ALTARIA,
Species.ZANGOOSE, Species.ZANGOOSE,
Species.SEVIPER, Species.SEVIPER,
Species.LUNATONE,
Species.SOLROCK,
Species.BARBOACH, Species.BARBOACH,
Species.WHISCASH, Species.WHISCASH,
Species.CORPHISH, Species.CORPHISH,
Species.CRAWDAUNT, Species.CRAWDAUNT,
Species.BALTOY,
Species.CLAYDOL,
Species.LILEEP,
Species.CRADILY,
Species.ANORITH,
Species.ARMALDO,
Species.FEEBAS, Species.FEEBAS,
Species.MILOTIC, Species.MILOTIC,
Species.CASTFORM,
Species.KECLEON,
Species.SHUPPET, Species.SHUPPET,
Species.BANETTE, Species.BANETTE,
Species.DUSKULL, Species.DUSKULL,
Species.DUSCLOPS, Species.DUSCLOPS,
Species.TROPIUS, Species.TROPIUS,
Species.CHIMECHO, Species.CHIMECHO,
Species.ABSOL,
Species.SNORUNT, Species.SNORUNT,
Species.GLALIE, Species.GLALIE,
Species.SPHEAL,
Species.SEALEO,
Species.WALREIN,
Species.CLAMPERL,
Species.HUNTAIL,
Species.GOREBYSS,
Species.RELICANTH,
Species.LUVDISC, Species.LUVDISC,
Species.BAGON, Species.BAGON,
Species.SHELGON, Species.SHELGON,
Species.SALAMENCE, Species.SALAMENCE,
Species.METANG,
Species.METAGROSS,
Species.REGIROCK,
Species.REGICE,
Species.REGISTEEL,
Species.LATIAS,
Species.LATIOS,
Species.KYOGRE, Species.KYOGRE,
Species.GROUDON, Species.GROUDON,
Species.RAYQUAZA, Species.RAYQUAZA,
Species.JIRACHI,
Species.DEOXYS,
Species.TURTWIG, Species.TURTWIG,
Species.GROTLE, Species.GROTLE,
Species.TORTERRA, Species.TORTERRA,
@ -62215,30 +62395,49 @@ export const tmSpecies: TmSpecies = {
Species.STARLY, Species.STARLY,
Species.STARAVIA, Species.STARAVIA,
Species.STARAPTOR, Species.STARAPTOR,
Species.BIDOOF,
Species.BIBAREL,
Species.KRICKETOT, Species.KRICKETOT,
Species.KRICKETUNE, Species.KRICKETUNE,
Species.SHINX, Species.SHINX,
Species.LUXIO, Species.LUXIO,
Species.LUXRAY, Species.LUXRAY,
Species.BUDEW,
Species.ROSERADE,
Species.CRANIDOS,
Species.RAMPARDOS,
Species.SHIELDON,
Species.BASTIODON,
Species.BURMY,
Species.WORMADAM,
Species.MOTHIM,
Species.COMBEE, Species.COMBEE,
Species.VESPIQUEN, Species.VESPIQUEN,
Species.PACHIRISU, Species.PACHIRISU,
Species.BUIZEL, Species.BUIZEL,
Species.FLOATZEL, Species.FLOATZEL,
Species.CHERUBI,
Species.CHERRIM,
Species.SHELLOS, Species.SHELLOS,
Species.GASTRODON, Species.GASTRODON,
Species.AMBIPOM, Species.AMBIPOM,
Species.DRIFLOON, Species.DRIFLOON,
Species.DRIFBLIM, Species.DRIFBLIM,
Species.BUNEARY,
Species.LOPUNNY,
Species.MISMAGIUS, Species.MISMAGIUS,
Species.HONCHKROW, Species.HONCHKROW,
Species.GLAMEOW,
Species.PURUGLY,
Species.CHINGLING, Species.CHINGLING,
Species.STUNKY, Species.STUNKY,
Species.SKUNTANK, Species.SKUNTANK,
Species.BRONZOR, Species.BRONZOR,
Species.BRONZONG, Species.BRONZONG,
Species.BONSLY, Species.BONSLY,
Species.MIME_JR,
Species.HAPPINY, Species.HAPPINY,
Species.CHATOT,
Species.SPIRITOMB, Species.SPIRITOMB,
Species.GIBLE, Species.GIBLE,
Species.GABITE, Species.GABITE,
@ -62248,19 +62447,30 @@ export const tmSpecies: TmSpecies = {
Species.LUCARIO, Species.LUCARIO,
Species.HIPPOPOTAS, Species.HIPPOPOTAS,
Species.HIPPOWDON, Species.HIPPOWDON,
Species.SKORUPI,
Species.DRAPION,
Species.CROAGUNK, Species.CROAGUNK,
Species.TOXICROAK, Species.TOXICROAK,
Species.CARNIVINE,
Species.FINNEON, Species.FINNEON,
Species.LUMINEON, Species.LUMINEON,
Species.MANTYKE,
Species.SNOVER, Species.SNOVER,
Species.ABOMASNOW, Species.ABOMASNOW,
Species.WEAVILE, Species.WEAVILE,
Species.MAGNEZONE, Species.MAGNEZONE,
Species.LICKILICKY,
Species.RHYPERIOR,
Species.TANGROWTH,
Species.ELECTIVIRE,
Species.MAGMORTAR,
Species.TOGEKISS,
Species.YANMEGA, Species.YANMEGA,
Species.LEAFEON, Species.LEAFEON,
Species.GLACEON, Species.GLACEON,
Species.GLISCOR, Species.GLISCOR,
Species.MAMOSWINE, Species.MAMOSWINE,
Species.PORYGON_Z,
Species.GALLADE, Species.GALLADE,
Species.PROBOPASS, Species.PROBOPASS,
Species.DUSKNOIR, Species.DUSKNOIR,
@ -62272,39 +62482,127 @@ export const tmSpecies: TmSpecies = {
Species.DIALGA, Species.DIALGA,
Species.PALKIA, Species.PALKIA,
Species.HEATRAN, Species.HEATRAN,
Species.REGIGIGAS,
Species.GIRATINA, Species.GIRATINA,
Species.CRESSELIA, Species.CRESSELIA,
Species.PHIONE,
Species.MANAPHY,
Species.DARKRAI,
Species.SHAYMIN,
Species.ARCEUS, Species.ARCEUS,
Species.VICTINI,
Species.SNIVY,
Species.SERVINE,
Species.SERPERIOR,
Species.TEPIG,
Species.PIGNITE,
Species.EMBOAR,
Species.OSHAWOTT, Species.OSHAWOTT,
Species.DEWOTT, Species.DEWOTT,
Species.SAMUROTT, Species.SAMUROTT,
Species.PATRAT,
Species.WATCHOG,
Species.LILLIPUP,
Species.HERDIER,
Species.STOUTLAND,
Species.PURRLOIN,
Species.LIEPARD,
Species.PANSAGE,
Species.SIMISAGE,
Species.PANSEAR,
Species.SIMISEAR,
Species.PANPOUR,
Species.SIMIPOUR,
Species.MUNNA,
Species.MUSHARNA,
Species.PIDOVE,
Species.TRANQUILL,
Species.UNFEZANT,
Species.BLITZLE,
Species.ZEBSTRIKA,
Species.ROGGENROLA,
Species.BOLDORE,
Species.GIGALITH,
Species.WOOBAT,
Species.SWOOBAT,
Species.DRILBUR,
Species.EXCADRILL,
Species.AUDINO,
Species.TIMBURR, Species.TIMBURR,
Species.GURDURR, Species.GURDURR,
Species.CONKELDURR, Species.CONKELDURR,
Species.TYMPOLE,
Species.PALPITOAD,
Species.SEISMITOAD,
Species.THROH,
Species.SAWK,
Species.SEWADDLE, Species.SEWADDLE,
Species.SWADLOON, Species.SWADLOON,
Species.LEAVANNY, Species.LEAVANNY,
Species.VENIPEDE,
Species.WHIRLIPEDE,
Species.SCOLIPEDE,
Species.COTTONEE,
Species.WHIMSICOTT,
Species.PETILIL, Species.PETILIL,
Species.LILLIGANT, Species.LILLIGANT,
Species.BASCULIN, Species.BASCULIN,
Species.SANDILE, Species.SANDILE,
Species.KROKOROK, Species.KROKOROK,
Species.KROOKODILE, Species.KROOKODILE,
Species.DARUMAKA,
Species.DARMANITAN,
Species.MARACTUS,
Species.DWEBBLE,
Species.CRUSTLE,
Species.SCRAGGY,
Species.SCRAFTY,
Species.SIGILYPH,
Species.YAMASK,
Species.COFAGRIGUS,
Species.TIRTOUGA,
Species.CARRACOSTA,
Species.ARCHEN,
Species.ARCHEOPS,
Species.TRUBBISH,
Species.GARBODOR,
Species.ZORUA, Species.ZORUA,
Species.ZOROARK, Species.ZOROARK,
Species.MINCCINO,
Species.CINCCINO,
Species.GOTHITA, Species.GOTHITA,
Species.GOTHORITA, Species.GOTHORITA,
Species.GOTHITELLE, Species.GOTHITELLE,
Species.SOLOSIS,
Species.DUOSION,
Species.REUNICLUS,
Species.DUCKLETT, Species.DUCKLETT,
Species.SWANNA, Species.SWANNA,
Species.VANILLITE,
Species.VANILLISH,
Species.VANILLUXE,
Species.DEERLING, Species.DEERLING,
Species.SAWSBUCK, Species.SAWSBUCK,
Species.EMOLGA,
Species.KARRABLAST,
Species.ESCAVALIER,
Species.FOONGUS, Species.FOONGUS,
Species.AMOONGUSS, Species.AMOONGUSS,
Species.FRILLISH,
Species.JELLICENT,
Species.ALOMOMOLA, Species.ALOMOMOLA,
Species.JOLTIK,
Species.GALVANTULA,
Species.FERROSEED,
Species.FERROTHORN,
Species.KLINK,
Species.KLANG,
Species.KLINKLANG,
Species.TYNAMO, Species.TYNAMO,
Species.EELEKTRIK, Species.EELEKTRIK,
Species.EELEKTROSS, Species.EELEKTROSS,
Species.ELGYEM,
Species.BEHEEYEM,
Species.LITWICK, Species.LITWICK,
Species.LAMPENT, Species.LAMPENT,
Species.CHANDELURE, Species.CHANDELURE,
@ -62314,23 +62612,40 @@ export const tmSpecies: TmSpecies = {
Species.CUBCHOO, Species.CUBCHOO,
Species.BEARTIC, Species.BEARTIC,
Species.CRYOGONAL, Species.CRYOGONAL,
Species.SHELMET,
Species.ACCELGOR,
Species.STUNFISK,
Species.MIENFOO, Species.MIENFOO,
Species.MIENSHAO, Species.MIENSHAO,
Species.DRUDDIGON,
Species.GOLETT,
Species.GOLURK,
Species.PAWNIARD, Species.PAWNIARD,
Species.BISHARP, Species.BISHARP,
Species.BOUFFALANT,
Species.RUFFLET, Species.RUFFLET,
Species.BRAVIARY, Species.BRAVIARY,
Species.VULLABY, Species.VULLABY,
Species.MANDIBUZZ, Species.MANDIBUZZ,
Species.HEATMOR,
Species.DURANT,
Species.DEINO, Species.DEINO,
Species.ZWEILOUS, Species.ZWEILOUS,
Species.HYDREIGON, Species.HYDREIGON,
Species.LARVESTA, Species.LARVESTA,
Species.VOLCARONA, Species.VOLCARONA,
Species.COBALION,
Species.TERRAKION,
Species.VIRIZION,
Species.TORNADUS, Species.TORNADUS,
Species.THUNDURUS, Species.THUNDURUS,
Species.RESHIRAM,
Species.ZEKROM,
Species.LANDORUS, Species.LANDORUS,
Species.KYUREM,
Species.KELDEO,
Species.MELOETTA, Species.MELOETTA,
Species.GENESECT,
Species.CHESPIN, Species.CHESPIN,
Species.QUILLADIN, Species.QUILLADIN,
Species.CHESNAUGHT, Species.CHESNAUGHT,
@ -62345,6 +62660,8 @@ export const tmSpecies: TmSpecies = {
'battle-bond', 'battle-bond',
'ash', 'ash',
], ],
Species.BUNNELBY,
Species.DIGGERSBY,
Species.FLETCHLING, Species.FLETCHLING,
Species.FLETCHINDER, Species.FLETCHINDER,
Species.TALONFLAME, Species.TALONFLAME,
@ -62354,14 +62671,43 @@ export const tmSpecies: TmSpecies = {
Species.LITLEO, Species.LITLEO,
Species.PYROAR, Species.PYROAR,
Species.FLABEBE, Species.FLABEBE,
Species.FLOETTE, [
Species.FLOETTE,
'red',
'yellow',
'orange',
'blue',
'white',
],
Species.FLORGES, Species.FLORGES,
Species.SKIDDO, Species.SKIDDO,
Species.GOGOAT, Species.GOGOAT,
Species.PANCHAM,
Species.PANGORO,
Species.FURFROU,
Species.ESPURR,
Species.MEOWSTIC,
Species.HONEDGE,
Species.DOUBLADE,
Species.AEGISLASH,
Species.SPRITZEE,
Species.AROMATISSE,
Species.SWIRLIX,
Species.SLURPUFF,
Species.INKAY,
Species.MALAMAR,
Species.BINACLE,
Species.BARBARACLE,
Species.SKRELP, Species.SKRELP,
Species.DRAGALGE, Species.DRAGALGE,
Species.CLAUNCHER, Species.CLAUNCHER,
Species.CLAWITZER, Species.CLAWITZER,
Species.HELIOPTILE,
Species.HELIOLISK,
Species.TYRUNT,
Species.TYRANTRUM,
Species.AMAURA,
Species.AURORUS,
Species.SYLVEON, Species.SYLVEON,
Species.HAWLUCHA, Species.HAWLUCHA,
Species.DEDENNE, Species.DEDENNE,
@ -62372,16 +62718,30 @@ export const tmSpecies: TmSpecies = {
Species.KLEFKI, Species.KLEFKI,
Species.PHANTUMP, Species.PHANTUMP,
Species.TREVENANT, Species.TREVENANT,
Species.PUMPKABOO,
Species.GOURGEIST,
Species.BERGMITE, Species.BERGMITE,
Species.AVALUGG, Species.AVALUGG,
Species.NOIBAT, Species.NOIBAT,
Species.NOIVERN, Species.NOIVERN,
Species.XERNEAS,
Species.YVELTAL,
Species.ZYGARDE,
Species.DIANCIE, Species.DIANCIE,
Species.HOOPA, Species.HOOPA,
Species.VOLCANION, Species.VOLCANION,
Species.ROWLET, Species.ROWLET,
Species.DARTRIX, Species.DARTRIX,
Species.DECIDUEYE, Species.DECIDUEYE,
Species.LITTEN,
Species.TORRACAT,
Species.INCINEROAR,
Species.POPPLIO,
Species.BRIONNE,
Species.PRIMARINA,
Species.PIKIPEK,
Species.TRUMBEAK,
Species.TOUCANNON,
Species.YUNGOOS, Species.YUNGOOS,
Species.GUMSHOOS, Species.GUMSHOOS,
Species.GRUBBIN, Species.GRUBBIN,
@ -62394,28 +62754,84 @@ export const tmSpecies: TmSpecies = {
Species.RIBOMBEE, Species.RIBOMBEE,
Species.ROCKRUFF, Species.ROCKRUFF,
Species.LYCANROC, Species.LYCANROC,
Species.WISHIWASHI,
Species.MAREANIE, Species.MAREANIE,
Species.TOXAPEX, Species.TOXAPEX,
Species.MUDBRAY, Species.MUDBRAY,
Species.MUDSDALE, Species.MUDSDALE,
Species.DEWPIDER,
Species.ARAQUANID,
Species.FOMANTIS, Species.FOMANTIS,
Species.LURANTIS, Species.LURANTIS,
Species.MORELULL,
Species.SHIINOTIC,
Species.SALANDIT, Species.SALANDIT,
Species.SALAZZLE, Species.SALAZZLE,
Species.STUFFUL,
Species.BEWEAR,
Species.BOUNSWEET, Species.BOUNSWEET,
Species.STEENEE, Species.STEENEE,
Species.TSAREENA, Species.TSAREENA,
Species.COMFEY,
Species.ORANGURU, Species.ORANGURU,
Species.PASSIMIAN, Species.PASSIMIAN,
Species.WIMPOD,
Species.GOLISOPOD,
Species.SANDYGAST, Species.SANDYGAST,
Species.PALOSSAND, Species.PALOSSAND,
Species.TYPE_NULL,
Species.SILVALLY,
Species.MINIOR,
Species.KOMALA, Species.KOMALA,
Species.TURTONATOR,
Species.TOGEDEMARU,
Species.MIMIKYU, Species.MIMIKYU,
Species.BRUXISH, Species.BRUXISH,
Species.DRAMPA,
Species.DHELMISE,
Species.JANGMO_O, Species.JANGMO_O,
Species.HAKAMO_O, Species.HAKAMO_O,
Species.KOMMO_O, Species.KOMMO_O,
Species.TAPU_KOKO,
Species.TAPU_LELE,
Species.TAPU_BULU,
Species.TAPU_FINI,
Species.SOLGALEO,
Species.LUNALA,
Species.NIHILEGO,
Species.BUZZWOLE,
Species.PHEROMOSA,
Species.XURKITREE,
Species.CELESTEELA,
Species.KARTANA,
Species.GUZZLORD,
Species.NECROZMA,
Species.MAGEARNA, Species.MAGEARNA,
Species.MARSHADOW,
Species.POIPOLE,
Species.NAGANADEL,
Species.STAKATAKA,
Species.BLACEPHALON,
Species.ZERAORA,
Species.ALOLA_RATTATA,
Species.ALOLA_RATICATE,
Species.ALOLA_RAICHU,
Species.ALOLA_SANDSHREW,
Species.ALOLA_SANDSLASH,
Species.ALOLA_VULPIX,
Species.ALOLA_NINETALES,
Species.ALOLA_DIGLETT,
Species.ALOLA_DUGTRIO,
Species.ALOLA_MEOWTH,
Species.ALOLA_PERSIAN,
Species.ALOLA_GEODUDE,
Species.ALOLA_GRAVELER,
Species.ALOLA_GOLEM,
Species.ALOLA_GRIMER,
Species.ALOLA_MUK,
Species.ALOLA_EXEGGUTOR,
Species.ALOLA_MAROWAK,
Species.ETERNAL_FLOETTE,
Species.GROOKEY, Species.GROOKEY,
Species.THWACKEY, Species.THWACKEY,
Species.RILLABOOM, Species.RILLABOOM,
@ -62596,21 +63012,6 @@ export const tmSpecies: TmSpecies = {
Species.MUNKIDORI, Species.MUNKIDORI,
Species.FEZANDIPITI, Species.FEZANDIPITI,
Species.OGERPON, Species.OGERPON,
Species.ALOLA_RAICHU,
Species.ALOLA_SANDSHREW,
Species.ALOLA_SANDSLASH,
Species.ALOLA_VULPIX,
Species.ALOLA_NINETALES,
Species.ALOLA_DIGLETT,
Species.ALOLA_DUGTRIO,
Species.ALOLA_MEOWTH,
Species.ALOLA_PERSIAN,
Species.ALOLA_GEODUDE,
Species.ALOLA_GRAVELER,
Species.ALOLA_GOLEM,
Species.ALOLA_GRIMER,
Species.ALOLA_MUK,
Species.ETERNAL_FLOETTE,
Species.GALAR_MEOWTH, Species.GALAR_MEOWTH,
Species.GALAR_SLOWPOKE, Species.GALAR_SLOWPOKE,
Species.GALAR_SLOWBRO, Species.GALAR_SLOWBRO,

2
src/phases.ts
View File

@ -4095,7 +4095,7 @@ export class AttemptCapturePhase extends PokemonPhase {
this.scene.pokemonInfoContainer.show(pokemon, true); this.scene.pokemonInfoContainer.show(pokemon, true);
this.scene.gameData.updateSpeciesDexIvs(pokemon.species.speciesId, pokemon.ivs); this.scene.gameData.updateSpeciesDexIvs(pokemon.species.getRootSpeciesId(true), pokemon.ivs);
this.scene.ui.showText(i18next.t('menu:pokemonCaught', { pokemonName: pokemon.name }), null, () => { this.scene.ui.showText(i18next.t('menu:pokemonCaught', { pokemonName: pokemon.name }), null, () => {
const end = () => { const end = () => {