Separate Eternal Floette and Bloodmoon Ursaluna

This makes Eternal Flower Floette and Bloodmoon Ursaluna functionally unique Pokémon now, allowing them to be properly obtained and used as starters.
pull/14/head
Madmadness65 2024-02-11 14:22:13 -06:00
parent 728ee530fc
commit a8d3ccf620
34 changed files with 3490 additions and 3419 deletions

View File

@ -1,7 +1,7 @@
{ {
"textures": [ "textures": [
{ {
"image": "670-eternal.png", "image": "2670.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 67, "w": 67,

View File

Before

Width:  |  Height:  |  Size: 686 B

After

Width:  |  Height:  |  Size: 686 B

View File

@ -1,7 +1,7 @@
{ {
"textures": [ "textures": [
{ {
"image": "901-bloodmoon.png", "image": "8901.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 77, "w": 77,

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -1,7 +1,7 @@
{ {
"textures": [ "textures": [
{ {
"image": "670-eternal.png", "image": "2670.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 67, "w": 67,

View File

Before

Width:  |  Height:  |  Size: 677 B

After

Width:  |  Height:  |  Size: 677 B

View File

@ -1,7 +1,7 @@
{ {
"textures": [ "textures": [
{ {
"image": "901-bloodmoon.png", "image": "8901.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 80, "w": 80,

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -1,7 +1,7 @@
{ {
"textures": [ "textures": [
{ {
"image": "670-eternal.png", "image": "2670.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 67, "w": 67,

View File

Before

Width:  |  Height:  |  Size: 677 B

After

Width:  |  Height:  |  Size: 677 B

View File

@ -1,7 +1,7 @@
{ {
"textures": [ "textures": [
{ {
"image": "901-bloodmoon.png", "image": "8901.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 80, "w": 80,

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

View File

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 392 B

View File

Before

Width:  |  Height:  |  Size: 534 B

After

Width:  |  Height:  |  Size: 534 B

View File

Before

Width:  |  Height:  |  Size: 534 B

After

Width:  |  Height:  |  Size: 534 B

View File

@ -877,7 +877,6 @@ $pkmnTable = @{
"floette-orange" = "670-orange" "floette-orange" = "670-orange"
"floette-blue" = "670-blue" "floette-blue" = "670-blue"
"floette-white" = "670-white" "floette-white" = "670-white"
"floette-eternal" = "670-eternal"
"florges" = "671" "florges" = "671"
"florges-yellow" = "671-yellow" "florges-yellow" = "671-yellow"
"florges-orange" = "671-orange" "florges-orange" = "671-orange"
@ -1192,7 +1191,6 @@ $pkmnTable = @{
"wyrdeer" = "899" "wyrdeer" = "899"
"kleavor" = "900" "kleavor" = "900"
"ursaluna" = "901" "ursaluna" = "901"
"ursaluna-bloodmoon" = "901-bloodmoon"
"basculegion" = "902" "basculegion" = "902"
"basculegion-female" = "902-female" "basculegion-female" = "902-female"
"sneasler" = "903" "sneasler" = "903"
@ -1360,6 +1358,7 @@ $pkmnTable = @{
"muk-alola" = "2089" "muk-alola" = "2089"
"exeggutor-alola" = "2103" "exeggutor-alola" = "2103"
"marowak-alola" = "2105" "marowak-alola" = "2105"
"eternal-floette" = "2670"
"meowth-galar" = "4052" "meowth-galar" = "4052"
"ponyta-galar" = "4077" "ponyta-galar" = "4077"
"rapidash-galar" = "4078" "rapidash-galar" = "4078"
@ -1400,6 +1399,7 @@ $pkmnTable = @{
"tauros-blaze-paldea" = "8128-blaze" "tauros-blaze-paldea" = "8128-blaze"
"tauros-aqua-paldea" = "8128-aqua" "tauros-aqua-paldea" = "8128-aqua"
"wooper-paldea" = "8194" "wooper-paldea" = "8194"
"bloodmoon-ursaluna" = "8901"
} }
$dir = "." $dir = "."

View File

@ -1,7 +1,7 @@
{ {
"textures": [ "textures": [
{ {
"image": "670-eternal.png", "image": "2670.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 67, "w": 67,

View File

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 685 B

View File

@ -1,7 +1,7 @@
{ {
"textures": [ "textures": [
{ {
"image": "901-bloodmoon.png", "image": "8901.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 77, "w": 77,

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -3643,7 +3643,7 @@
} }
}, },
{ {
"filename": "670-eternal", "filename": "2670",
"rotated": false, "rotated": false,
"trimmed": true, "trimmed": true,
"sourceSize": { "sourceSize": {
@ -3664,7 +3664,7 @@
} }
}, },
{ {
"filename": "670s-eternal", "filename": "2670s",
"rotated": false, "rotated": false,
"trimmed": true, "trimmed": true,
"sourceSize": { "sourceSize": {

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 60 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 52 KiB

View File

@ -383,7 +383,7 @@ export const biomePokemonPools: BiomePokemonPools = {
{ 1: [ Species.TOEDSCOOL ], 30: [ Species.TOEDSCRUEL ] } { 1: [ Species.TOEDSCOOL ], 30: [ Species.TOEDSCRUEL ] }
] ]
}, },
[BiomePoolTier.SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.DURANT ] }, [BiomePoolTier.SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [ Species.BLOODMOON_URSALUNA ], [TimeOfDay.ALL]: [ Species.DURANT ] },
[BiomePoolTier.ULTRA_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.KARTANA, Species.WO_CHIEN ] }, [BiomePoolTier.ULTRA_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.KARTANA, Species.WO_CHIEN ] },
[BiomePoolTier.BOSS]: { [BiomePoolTier.BOSS]: {
[TimeOfDay.DAWN]: [ Species.VICTREEBEL, Species.MOTHIM, Species.VESPIQUEN, Species.LILLIGANT, Species.SAWSBUCK ], [TimeOfDay.DAWN]: [ Species.VICTREEBEL, Species.MOTHIM, Species.VESPIQUEN, Species.LILLIGANT, Species.SAWSBUCK ],
@ -396,7 +396,7 @@ export const biomePokemonPools: BiomePokemonPools = {
[TimeOfDay.DAWN]: [ Species.STANTLER ], [TimeOfDay.DAWN]: [ Species.STANTLER ],
[TimeOfDay.DAY]: [ Species.STANTLER ], [TimeOfDay.DAY]: [ Species.STANTLER ],
[TimeOfDay.DUSK]: [], [TimeOfDay.DUSK]: [],
[TimeOfDay.NIGHT]: [ Species.LYCANROC ], [TimeOfDay.NIGHT]: [ Species.LYCANROC, Species.BLOODMOON_URSALUNA ],
[TimeOfDay.ALL]: [ Species.HERACROSS, Species.SCEPTILE, Species.ESCAVALIER, Species.ACCELGOR, Species.DURANT, Species.CHESNAUGHT, Species.DECIDUEYE, Species.TOEDSCRUEL ] [TimeOfDay.ALL]: [ Species.HERACROSS, Species.SCEPTILE, Species.ESCAVALIER, Species.ACCELGOR, Species.DURANT, Species.CHESNAUGHT, Species.DECIDUEYE, Species.TOEDSCRUEL ]
}, },
[BiomePoolTier.BOSS_SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.KARTANA, Species.WO_CHIEN ] }, [BiomePoolTier.BOSS_SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.KARTANA, Species.WO_CHIEN ] },
@ -478,8 +478,8 @@ export const biomePokemonPools: BiomePokemonPools = {
[TimeOfDay.ALL]: [ { 1: [ Species.TOTODILE ], 18: [ Species.CROCONAW ], 30: [ Species.FERALIGATR ] }, { 1: [ Species.MUDKIP ], 16: [ Species.MARSHTOMP ], 36: [ Species.SWAMPERT ] } ] [TimeOfDay.ALL]: [ { 1: [ Species.TOTODILE ], 18: [ Species.CROCONAW ], 30: [ Species.FERALIGATR ] }, { 1: [ Species.MUDKIP ], 16: [ Species.MARSHTOMP ], 36: [ Species.SWAMPERT ] } ]
}, },
[BiomePoolTier.SUPER_RARE]: { [BiomePoolTier.SUPER_RARE]: {
[TimeOfDay.DAWN]: [ { 1: [ Species.GALAR_SLOWPOKE ], 37: [ Species.GALAR_SLOWBRO ] }, Species.HISUI_SLIGGOO, Species.HISUI_GOODRA ], [TimeOfDay.DAWN]: [ { 1: [ Species.GALAR_SLOWPOKE ], 40: [ Species.GALAR_SLOWBRO ] }, Species.HISUI_SLIGGOO, Species.HISUI_GOODRA ],
[TimeOfDay.DAY]: [ { 1: [ Species.GALAR_SLOWPOKE ], 37: [ Species.GALAR_SLOWBRO ] }, Species.HISUI_SLIGGOO, Species.HISUI_GOODRA ], [TimeOfDay.DAY]: [ { 1: [ Species.GALAR_SLOWPOKE ], 40: [ Species.GALAR_SLOWBRO ] }, Species.HISUI_SLIGGOO, Species.HISUI_GOODRA ],
[TimeOfDay.DUSK]: [], [TimeOfDay.DUSK]: [],
[TimeOfDay.NIGHT]: [], [TimeOfDay.NIGHT]: [],
[TimeOfDay.ALL]: [ Species.POLITOED, Species.GALAR_STUNFISK ] [TimeOfDay.ALL]: [ Species.POLITOED, Species.GALAR_STUNFISK ]
@ -1405,7 +1405,7 @@ export const biomePokemonPools: BiomePokemonPools = {
{ 1: [ Species.HATENNA ], 32: [ Species.HATTREM ], 42: [ Species.HATTERENE ] } { 1: [ Species.HATENNA ], 32: [ Species.HATTREM ], 42: [ Species.HATTERENE ] }
] ]
}, },
[BiomePoolTier.RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.AUDINO ] }, [BiomePoolTier.RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.AUDINO, Species.ETERNAL_FLOETTE ] },
[BiomePoolTier.SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [] }, [BiomePoolTier.SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [] },
[BiomePoolTier.ULTRA_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.DIANCIE, Species.ENAMORUS ] }, [BiomePoolTier.ULTRA_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.DIANCIE, Species.ENAMORUS ] },
[BiomePoolTier.BOSS]: { [BiomePoolTier.BOSS]: {
@ -1415,7 +1415,7 @@ export const biomePokemonPools: BiomePokemonPools = {
[TimeOfDay.NIGHT]: [], [TimeOfDay.NIGHT]: [],
[TimeOfDay.ALL]: [ Species.WIGGLYTUFF, Species.MAWILE, Species.TOGEKISS, Species.AUDINO, Species.AROMATISSE, Species.SLURPUFF, Species.CARBINK, Species.RIBOMBEE, Species.SHIINOTIC, Species.COMFEY, Species.HATTERENE, Species.ALCREMIE ] [TimeOfDay.ALL]: [ Species.WIGGLYTUFF, Species.MAWILE, Species.TOGEKISS, Species.AUDINO, Species.AROMATISSE, Species.SLURPUFF, Species.CARBINK, Species.RIBOMBEE, Species.SHIINOTIC, Species.COMFEY, Species.HATTERENE, Species.ALCREMIE ]
}, },
[BiomePoolTier.BOSS_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [] }, [BiomePoolTier.BOSS_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.ETERNAL_FLOETTE ] },
[BiomePoolTier.BOSS_SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.DIANCIE, Species.ENAMORUS ] }, [BiomePoolTier.BOSS_SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.DIANCIE, Species.ENAMORUS ] },
[BiomePoolTier.BOSS_ULTRA_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.XERNEAS ] } [BiomePoolTier.BOSS_ULTRA_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [ Species.XERNEAS ] }
}, },
@ -6944,6 +6944,11 @@ export const biomeTrainerPools: BiomeTrainerPools = {
[ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ] ] [ Biome.ISLAND, BiomePoolTier.BOSS, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ] ]
] ]
], ],
[ Species.ETERNAL_FLOETTE, Type.FAIRY, -1, [
[ Biome.FAIRY_CAVE, BiomePoolTier.RARE ],
[ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_RARE ]
]
],
[ Species.GALAR_MEOWTH, Type.STEEL, -1, [ [ Species.GALAR_MEOWTH, Type.STEEL, -1, [
[ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE, TimeOfDay.DUSK ] [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE, TimeOfDay.DUSK ]
] ]
@ -7101,6 +7106,11 @@ export const biomeTrainerPools: BiomeTrainerPools = {
[ Species.PALDEA_WOOPER, Type.POISON, Type.GROUND, [ [ Species.PALDEA_WOOPER, Type.POISON, Type.GROUND, [
[ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ] ] [ Biome.SWAMP, BiomePoolTier.COMMON, [ TimeOfDay.DUSK, TimeOfDay.NIGHT ] ]
] ]
],
[ Species.BLOODMOON_URSALUNA, Type.GROUND, Type.NORMAL, [
[ Biome.FOREST, BiomePoolTier.SUPER_RARE, TimeOfDay.NIGHT ],
[ Biome.FOREST, BiomePoolTier.BOSS_RARE, TimeOfDay.NIGHT ]
]
] ]
]; ];

View File

@ -1024,6 +1024,7 @@ export enum Species {
IRON_CROWN, IRON_CROWN,
TERAPAGOS, TERAPAGOS,
PECHARUNT, PECHARUNT,
ETERNAL_FLOETTE = 2670,
ALOLA_RATTATA = 2019, ALOLA_RATTATA = 2019,
ALOLA_RATICATE = 2020, ALOLA_RATICATE = 2020,
ALOLA_RAICHU = 2026, ALOLA_RAICHU = 2026,
@ -1079,4 +1080,5 @@ export enum Species {
HISUI_DECIDUEYE = 6724, HISUI_DECIDUEYE = 6724,
PALDEA_TAUROS = 8128, PALDEA_TAUROS = 8128,
PALDEA_WOOPER = 8194, PALDEA_WOOPER = 8194,
BLOODMOON_URSALUNA = 8901,
}; };

View File

@ -1445,8 +1445,8 @@ export const pokemonEvolutions: PokemonEvolutions = {
new SpeciesEvolution(Species.CETITAN, 1, EvolutionItem.ICE_STONE, null, SpeciesWildEvolutionDelay.MEDIUM) new SpeciesEvolution(Species.CETITAN, 1, EvolutionItem.ICE_STONE, null, SpeciesWildEvolutionDelay.MEDIUM)
], ],
[Species.POLTCHAGEIST]: [ [Species.POLTCHAGEIST]: [
new SpeciesFormEvolution(Species.SINISTCHA, 'counterfeit', 'unremarkable', 1, EvolutionItem.UNREMARKABLE_TEACUP, null, null), new SpeciesFormEvolution(Species.SINISTCHA, 'counterfeit', 'unremarkable', 1, EvolutionItem.UNREMARKABLE_TEACUP, null, SpeciesWildEvolutionDelay.LONG),
new SpeciesFormEvolution(Species.SINISTCHA, 'artisan', 'masterpiece', 1, EvolutionItem.MASTERPIECE_TEACUP, null, null) new SpeciesFormEvolution(Species.SINISTCHA, 'artisan', 'masterpiece', 1, EvolutionItem.MASTERPIECE_TEACUP, null, SpeciesWildEvolutionDelay.LONG)
], ],
[Species.DIPPLIN]: [ [Species.DIPPLIN]: [
new SpeciesEvolution(Species.HYDRAPPLE, 1, null, new SpeciesEvolutionCondition(p => p.moveset.filter(m => m.moveId === Moves.DRAGON_CHEER).length > 0), SpeciesWildEvolutionDelay.VERY_LONG) new SpeciesEvolution(Species.HYDRAPPLE, 1, null, new SpeciesEvolutionCondition(p => p.moveset.filter(m => m.moveId === Moves.DRAGON_CHEER).length > 0), SpeciesWildEvolutionDelay.VERY_LONG)

View File

@ -17362,6 +17362,23 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 54, Moves.THRASH ], [ 54, Moves.THRASH ],
[ 60, Moves.FLARE_BLITZ ], [ 60, Moves.FLARE_BLITZ ],
], ],
[Species.ETERNAL_FLOETTE]: [
[ 1, Moves.VINE_WHIP ],
[ 1, Moves.TACKLE ],
[ 1, Moves.FAIRY_WIND ],
[ 10, Moves.LUCKY_CHANT ],
[ 15, Moves.RAZOR_LEAF ],
[ 20, Moves.WISH ],
[ 25, Moves.MAGICAL_LEAF ],
[ 27, Moves.GRASSY_TERRAIN ],
[ 33, Moves.PETAL_BLIZZARD ],
[ 38, Moves.AROMATHERAPY ],
[ 43, Moves.MISTY_TERRAIN ],
[ 46, Moves.MOONBLAST ],
[ 50, Moves.LIGHT_OF_RUIN ],
[ 51, Moves.PETAL_DANCE ],
[ 58, Moves.SOLAR_BEAM ],
],
[Species.GALAR_MEOWTH]: [ [Species.GALAR_MEOWTH]: [
[ 1, Moves.GROWL ], [ 1, Moves.GROWL ],
[ 1, Moves.FAKE_OUT ], [ 1, Moves.FAKE_OUT ],
@ -18049,6 +18066,24 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 32, Moves.AMNESIA ], [ 32, Moves.AMNESIA ],
[ 36, Moves.TOXIC ], [ 36, Moves.TOXIC ],
[ 40, Moves.EARTHQUAKE ], [ 40, Moves.EARTHQUAKE ],
],
[Species.BLOODMOON_URSALUNA]: [
[ 1, Moves.SCRATCH ],
[ 1, Moves.LEER ],
[ 1, Moves.LICK ],
[ 1, Moves.HEADLONG_RUSH ],
[ 8, Moves.FURY_SWIPES ],
[ 13, Moves.PAYBACK ],
[ 17, Moves.HARDEN ],
[ 22, Moves.SLASH ],
[ 25, Moves.PLAY_NICE ],
[ 35, Moves.SCARY_FACE ],
[ 41, Moves.REST ],
[ 41, Moves.SNORE ],
[ 48, Moves.EARTH_POWER ],
[ 56, Moves.MOONBLAST ],
[ 64, Moves.HAMMER_ARM ],
[ 70, Moves.BLOOD_MOON ],
] ]
}; };
@ -18219,25 +18254,6 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
[ 59, Moves.FUTURE_SIGHT ], [ 59, Moves.FUTURE_SIGHT ],
], ],
}, },
[Species.FLOETTE]: {
5: [
[ 1, Moves.VINE_WHIP ],
[ 1, Moves.TACKLE ],
[ 1, Moves.FAIRY_WIND ],
[ 10, Moves.LUCKY_CHANT ],
[ 15, Moves.RAZOR_LEAF ],
[ 20, Moves.WISH ],
[ 25, Moves.MAGICAL_LEAF ],
[ 27, Moves.GRASSY_TERRAIN ],
[ 33, Moves.PETAL_BLIZZARD ],
[ 38, Moves.AROMATHERAPY ],
[ 43, Moves.MISTY_TERRAIN ],
[ 46, Moves.MOONBLAST ],
[ 50, Moves.LIGHT_OF_RUIN ],
[ 51, Moves.PETAL_DANCE ],
[ 58, Moves.SOLAR_BEAM ],
],
},
[Species.HOOPA]: { [Species.HOOPA]: {
1: [ 1: [
[ 1, Moves.CONFUSION ], [ 1, Moves.CONFUSION ],

View File

@ -205,6 +205,10 @@ export abstract class PokemonSpeciesForm {
switch (this.speciesId) { switch (this.speciesId) {
case Species.GALAR_SLOWPOKE: case Species.GALAR_SLOWPOKE:
break; break;
case Species.ETERNAL_FLOETTE:
break;
case Species.BLOODMOON_URSALUNA:
break;
default: default:
speciesId = speciesId % 2000; speciesId = speciesId % 2000;
break; break;
@ -232,7 +236,6 @@ export abstract class PokemonSpeciesForm {
case 'droopy': case 'droopy':
case 'stretchy': case 'stretchy':
case 'roaming': case 'roaming':
case 'eternal':
case 'complete': case 'complete':
case '10': case '10':
case 'super': case 'super':
@ -1549,7 +1552,6 @@ export function initSpecies() {
new PokemonForm("Orange Flower", "orange", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130), new PokemonForm("Orange Flower", "orange", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130),
new PokemonForm("Blue Flower", "blue", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130), new PokemonForm("Blue Flower", "blue", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130),
new PokemonForm("White Flower", "white", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130), new PokemonForm("White Flower", "white", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 371, 54, 45, 47, 75, 98, 52, 120, 70, 130),
new PokemonForm("Eternal", "eternal", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 551, 74, 65, 67, 125, 128, 92, 120, 70, 130),
), ),
new PokemonSpecies(Species.FLORGES, "Florges", 6, false, false, false, "Garden Pokémon", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248, GrowthRate.MEDIUM_FAST, 0, false, false, new PokemonSpecies(Species.FLORGES, "Florges", 6, false, false, false, "Garden Pokémon", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248, GrowthRate.MEDIUM_FAST, 0, false, false,
new PokemonForm("Red Flower", "red", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248), new PokemonForm("Red Flower", "red", Type.FAIRY, null, 1.1, 10, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 552, 78, 65, 68, 112, 154, 75, 45, 70, 248),
@ -1940,10 +1942,7 @@ export function initSpecies() {
), ),
new PokemonSpecies(Species.WYRDEER, "Wyrdeer", 8, false, false, false, "Big Horn Pokémon", Type.NORMAL, Type.PSYCHIC, 1.8, 95.1, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 525, 103, 105, 72, 105, 75, 65, 135, 50, 263, GrowthRate.SLOW, 50, false), new PokemonSpecies(Species.WYRDEER, "Wyrdeer", 8, false, false, false, "Big Horn Pokémon", Type.NORMAL, Type.PSYCHIC, 1.8, 95.1, Abilities.INTIMIDATE, Abilities.FRISK, Abilities.SAP_SIPPER, 525, 103, 105, 72, 105, 75, 65, 135, 50, 263, GrowthRate.SLOW, 50, false),
new PokemonSpecies(Species.KLEAVOR, "Kleavor", 8, false, false, false, "Axe Pokémon", Type.BUG, Type.ROCK, 1.8, 89, Abilities.SWARM, Abilities.SHEER_FORCE, Abilities.SHARPNESS, 500, 70, 135, 95, 45, 70, 85, 115, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.KLEAVOR, "Kleavor", 8, false, false, false, "Axe Pokémon", Type.BUG, Type.ROCK, 1.8, 89, Abilities.SWARM, Abilities.SHEER_FORCE, Abilities.SHARPNESS, 500, 70, 135, 95, 45, 70, 85, 115, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
new PokemonSpecies(Species.URSALUNA, "Ursaluna", 8, false, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false, false, new PokemonSpecies(Species.URSALUNA, "Ursaluna", 8, false, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false),
new PokemonForm("Normal", "", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.GUTS, Abilities.BULLETPROOF, Abilities.UNNERVE, 550, 130, 140, 105, 45, 80, 50, 75, 50, 275),
new PokemonForm("Blood Moon", "bloodmoon", Type.GROUND, Type.NORMAL, 2.4, 290, Abilities.MINDS_EYE, Abilities.NONE, Abilities.NONE, 555, 113, 70, 120, 135, 65, 52, 75, 50, 275),
),
new PokemonSpecies(Species.BASCULEGION, "Basculegion", 8, false, false, false, "Big Fish Pokémon", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, GrowthRate.MEDIUM_FAST, 50, false, false, new PokemonSpecies(Species.BASCULEGION, "Basculegion", 8, false, false, false, "Big Fish Pokémon", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, GrowthRate.MEDIUM_FAST, 50, false, false,
new PokemonForm("Male", "male", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, false, ""), new PokemonForm("Male", "male", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 112, 65, 80, 75, 78, 135, 50, 265, false, ""),
new PokemonForm("Female", "female", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 92, 65, 100, 75, 78, 135, 50, 265), new PokemonForm("Female", "female", Type.WATER, Type.GHOST, 3, 110, Abilities.SWIFT_SWIM, Abilities.ADAPTABILITY, Abilities.MOLD_BREAKER, 530, 120, 92, 65, 100, 75, 78, 135, 50, 265),
@ -2143,6 +2142,7 @@ export function initSpecies() {
new PokemonSpecies(Species.ALOLA_MUK, "Muk", 7, false, false, false, "Sludge Pokémon", Type.POISON, Type.DARK, 1, 52, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.ALOLA_MUK, "Muk", 7, false, false, false, "Sludge Pokémon", Type.POISON, Type.DARK, 1, 52, Abilities.POISON_TOUCH, Abilities.GLUTTONY, Abilities.POWER_OF_ALCHEMY, 500, 105, 105, 75, 65, 100, 50, 75, 70, 175, GrowthRate.MEDIUM_FAST, 50, false),
new PokemonSpecies(Species.ALOLA_EXEGGUTOR, "Exeggutor", 7, false, false, false, "Coconut Pokémon", Type.GRASS, Type.DRAGON, 10.9, 415.6, Abilities.FRISK, Abilities.NONE, Abilities.HARVEST, 530, 95, 105, 85, 125, 75, 45, 45, 50, 186, GrowthRate.SLOW, 50, false), new PokemonSpecies(Species.ALOLA_EXEGGUTOR, "Exeggutor", 7, false, false, false, "Coconut Pokémon", Type.GRASS, Type.DRAGON, 10.9, 415.6, Abilities.FRISK, Abilities.NONE, Abilities.HARVEST, 530, 95, 105, 85, 125, 75, 45, 45, 50, 186, GrowthRate.SLOW, 50, false),
new PokemonSpecies(Species.ALOLA_MAROWAK, "Marowak", 7, false, false, false, "Bone Keeper Pokémon", Type.FIRE, Type.GHOST, 1, 34, Abilities.CURSED_BODY, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.ALOLA_MAROWAK, "Marowak", 7, false, false, false, "Bone Keeper Pokémon", Type.FIRE, Type.GHOST, 1, 34, Abilities.CURSED_BODY, Abilities.LIGHTNING_ROD, Abilities.ROCK_HEAD, 425, 60, 80, 110, 50, 80, 45, 75, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
new PokemonSpecies(Species.ETERNAL_FLOETTE, "Floette", 6, false, false, false, "Single Bloom Pokémon", Type.FAIRY, null, 0.2, 0.9, Abilities.FLOWER_VEIL, Abilities.NONE, Abilities.SYMBIOSIS, 551, 74, 65, 67, 125, 128, 92, 120, 70, 130, GrowthRate.MEDIUM_FAST, 0, false),
new PokemonSpecies(Species.GALAR_MEOWTH, "Meowth", 8, false, false, false, "Scratch Cat Pokémon", Type.STEEL, null, 0.4, 7.5, Abilities.PICKUP, Abilities.TOUGH_CLAWS, Abilities.UNNERVE, 290, 50, 65, 55, 40, 40, 40, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.GALAR_MEOWTH, "Meowth", 8, false, false, false, "Scratch Cat Pokémon", Type.STEEL, null, 0.4, 7.5, Abilities.PICKUP, Abilities.TOUGH_CLAWS, Abilities.UNNERVE, 290, 50, 65, 55, 40, 40, 40, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false),
new PokemonSpecies(Species.GALAR_PONYTA, "Ponyta", 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, null, 0.8, 24, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.GALAR_PONYTA, "Ponyta", 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, null, 0.8, 24, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 410, 50, 85, 55, 65, 65, 90, 190, 50, 82, GrowthRate.MEDIUM_FAST, 50, false),
new PokemonSpecies(Species.GALAR_RAPIDASH, "Rapidash", 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, Type.FAIRY, 1.7, 80, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.GALAR_RAPIDASH, "Rapidash", 8, false, false, false, "Fire Horse Pokémon", Type.PSYCHIC, Type.FAIRY, 1.7, 80, Abilities.RUN_AWAY, Abilities.PASTEL_VEIL, Abilities.ANTICIPATION, 500, 65, 100, 70, 80, 80, 105, 60, 50, 175, GrowthRate.MEDIUM_FAST, 50, false),
@ -2187,6 +2187,7 @@ export function initSpecies() {
new PokemonForm("Aqua Breed", "aqua", Type.FIGHTING, Type.WATER, 1.4, 110, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172), new PokemonForm("Aqua Breed", "aqua", Type.FIGHTING, Type.WATER, 1.4, 110, Abilities.INTIMIDATE, Abilities.ANGER_POINT, Abilities.CUD_CHEW, 490, 75, 110, 105, 30, 70, 100, 45, 50, 172),
), ),
new PokemonSpecies(Species.PALDEA_WOOPER, "Wooper", 9, false, false, false, "Water Fish Pokémon", Type.POISON, Type.GROUND, 0.4, 11, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, true), new PokemonSpecies(Species.PALDEA_WOOPER, "Wooper", 9, false, false, false, "Water Fish Pokémon", Type.POISON, Type.GROUND, 0.4, 11, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, 42, GrowthRate.MEDIUM_FAST, 50, true),
new PokemonSpecies(Species.BLOODMOON_URSALUNA, "Ursaluna", 9, false, false, false, "Peat Pokémon", Type.GROUND, Type.NORMAL, 2.7, 333, Abilities.MINDS_EYE, Abilities.NONE, Abilities.NONE, 555, 113, 70, 120, 135, 65, 52, 75, 50, 275, GrowthRate.MEDIUM_FAST, 50, false),
); );
} }
@ -2563,6 +2564,7 @@ export const speciesStarters = {
[Species.DIANCIE]: 7, [Species.DIANCIE]: 7,
[Species.HOOPA]: 7, [Species.HOOPA]: 7,
[Species.VOLCANION]: 7, [Species.VOLCANION]: 7,
[Species.ETERNAL_FLOETTE]: 5,
[Species.ROWLET]: 3, [Species.ROWLET]: 3,
[Species.LITTEN]: 3, [Species.LITTEN]: 3,
@ -2730,8 +2732,6 @@ export const speciesStarters = {
[Species.VELUZA]: 4, [Species.VELUZA]: 4,
[Species.DONDOZO]: 5, [Species.DONDOZO]: 5,
[Species.TATSUGIRI]: 5, [Species.TATSUGIRI]: 5,
[Species.PALDEA_TAUROS]: 5,
[Species.PALDEA_WOOPER]: 3,
[Species.GREAT_TUSK]: 6, [Species.GREAT_TUSK]: 6,
[Species.SCREAM_TAIL]: 6, [Species.SCREAM_TAIL]: 6,
[Species.BRUTE_BONNET]: 6, [Species.BRUTE_BONNET]: 6,
@ -2767,6 +2767,9 @@ export const speciesStarters = {
[Species.IRON_CROWN]: 7, [Species.IRON_CROWN]: 7,
[Species.TERAPAGOS]: 8, [Species.TERAPAGOS]: 8,
[Species.PECHARUNT]: 7, [Species.PECHARUNT]: 7,
[Species.PALDEA_TAUROS]: 5,
[Species.PALDEA_WOOPER]: 3,
[Species.BLOODMOON_URSALUNA]: 7,
}; };
// TODO: Remove // TODO: Remove

File diff suppressed because it is too large Load Diff