Compare commits

..

No commits in common. "4e74007af6729622e429f8d0e0ebd0c2b776362d" and "dff0e9179dc856a6088faf2f4c0dfb37f6681d59" have entirely different histories.

26 changed files with 4227 additions and 4028 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 675 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 633 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 284 B

View File

@ -630,7 +630,6 @@ export const pokemonFormChanges: PokemonFormChanges = {
[Species.MELOETTA]: [
new SpeciesFormChange(Species.MELOETTA, "aria", "pirouette", new SpeciesFormChangePostMoveTrigger(Moves.RELIC_SONG), true),
new SpeciesFormChange(Species.MELOETTA, "pirouette", "aria", new SpeciesFormChangePostMoveTrigger(Moves.RELIC_SONG), true),
new SpeciesFormChange(Species.MELOETTA, "pirouette", "aria", new SpeciesFormChangeActiveTrigger(false), true)
],
[Species.GENESECT]: [
new SpeciesFormChange(Species.GENESECT, "", "shock", new SpeciesFormChangeItemTrigger(FormChangeItem.SHOCK_DRIVE)),

View File

@ -1870,7 +1870,7 @@ export function initSpecies() {
),
new PokemonSpecies(Species.MELOETTA, 5, false, false, true, "Melody Pokémon", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 270, GrowthRate.SLOW, null, false, true,
new PokemonForm("Aria Forme", "aria", Type.NORMAL, Type.PSYCHIC, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 77, 77, 128, 128, 90, 3, 100, 270, false, null, true),
new PokemonForm("Pirouette Forme", "pirouette", Type.NORMAL, Type.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 270),
new PokemonForm("Pirouette Forme", "pirouette", Type.NORMAL, Type.FIGHTING, 0.6, 6.5, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 128, 90, 77, 77, 128, 3, 100, 270, false, null, true),
),
new PokemonSpecies(Species.GENESECT, 5, false, false, true, "Paleozoic Pokémon", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, GrowthRate.SLOW, null, false, true,
new PokemonForm("Normal", "", Type.BUG, Type.STEEL, 1.5, 82.5, Abilities.DOWNLOAD, Abilities.NONE, Abilities.NONE, 600, 71, 120, 95, 120, 95, 99, 3, 0, 300, false, null, true),

View File

@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "Battle Bond",
"scatterbugMeadow": "Meadow",

View File

@ -89,6 +89,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Inkarnationsform",
"keldeoOrdinary": "Standardform",
"meloettaAria": "Gesangsform",
"meloettaPirouette": "Tanzform",
// 6G
"froakieBattleBond": "Ash-Form",
"scatterbugMeadow": "Blumenmeermuster",

View File

@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "Battle Bond",
"scatterbugMeadow": "Meadow",

View File

@ -87,7 +87,8 @@ export const pokemonForm: SimpleTranslationEntries = {
"thundurusIncarnate": "Incarnate",
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaAria": "Lírica",
"meloettaPirouette": "Danza",
// 6G
"froakieBattleBond": "Fuerte Afecto",
"scatterbugMeadow": "Floral",

View File

@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Avatar",
"keldeoOrdinary": "Normal",
"meloettaAria": "Chant",
"meloettaPirouette": "Danse",
// 6G
"froakieBattleBond": "Synergie",
"scatterbugMeadow": "Floraison",

View File

@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnazione",
"keldeoOrdinary": "Normale",
"meloettaAria": "Canto",
"meloettaPirouette": "Danza",
// 6G
"froakieBattleBond": "Morfosintonia",
"scatterbugMeadow": "Giardinfiore",

View File

@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "Battle Bond",
"scatterbugMeadow": "Meadow",

View File

@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "화신폼",
"keldeoOrdinary": "평상시 모습",
"meloettaAria": "보이스폼",
"meloettaPirouette": "스텝폼",
// 6G
"froakieBattleBond": "유대변화",
"scatterbugMeadow": "화원의 모양",

View File

@ -89,6 +89,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirueta",
// 6G
"froakieBattleBond": "Vínculo de Batalha",
"scatterbugMeadow": "Prado",

View File

@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "化身",
"keldeoOrdinary": "通常",
"meloettaAria": "歌声",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "牵绊变身",
"scatterbugMeadow": "花园花纹",

View File

@ -88,6 +88,7 @@ export const pokemonForm: SimpleTranslationEntries = {
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirouette",
// 6G
"froakieBattleBond": "Battle Bond",
"scatterbugMeadow": "Meadow",