From 0018650688c6a7cd0ceadc2db9ddf977f1be74c0 Mon Sep 17 00:00:00 2001 From: Frederico Santos Date: Thu, 15 Aug 2024 03:27:45 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"[Balance]=20[QoL]=20Allow=20Pirouette?= =?UTF-8?q?=20Meloetta=20to=20be=20selectable=20on=20starter=20=E2=80=A6"?= =?UTF-8?q?=20(#3552)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 16b9df2d158886fb6b33c1e3e9f941e8589dc659. --- src/data/pokemon-forms.ts | 1 + src/data/pokemon-species.ts | 2 +- src/locales/ca_ES/pokemon-form.ts | 1 - src/locales/de/pokemon-form.ts | 1 - src/locales/en/pokemon-form.ts | 1 - src/locales/es/pokemon-form.ts | 3 +-- src/locales/fr/pokemon-form.ts | 1 - src/locales/it/pokemon-form.ts | 1 - src/locales/ja/pokemon-form.ts | 1 - src/locales/ko/pokemon-form.ts | 1 - src/locales/pt_BR/pokemon-form.ts | 1 - src/locales/zh_CN/pokemon-form.ts | 1 - src/locales/zh_TW/pokemon-form.ts | 1 - 13 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index a91f359b521..5180664ce07 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -630,6 +630,7 @@ 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)), diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 3219447f637..31de12a837b 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -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, 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 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), diff --git a/src/locales/ca_ES/pokemon-form.ts b/src/locales/ca_ES/pokemon-form.ts index 896bb48cf24..922f23fafea 100644 --- a/src/locales/ca_ES/pokemon-form.ts +++ b/src/locales/ca_ES/pokemon-form.ts @@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", - "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "Battle Bond", "scatterbugMeadow": "Meadow", diff --git a/src/locales/de/pokemon-form.ts b/src/locales/de/pokemon-form.ts index 5c6556f315f..0aadfc287e0 100644 --- a/src/locales/de/pokemon-form.ts +++ b/src/locales/de/pokemon-form.ts @@ -89,7 +89,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Inkarnationsform", "keldeoOrdinary": "Standardform", "meloettaAria": "Gesangsform", - "meloettaPirouette": "Tanzform", // 6G "froakieBattleBond": "Ash-Form", "scatterbugMeadow": "Blumenmeermuster", diff --git a/src/locales/en/pokemon-form.ts b/src/locales/en/pokemon-form.ts index 896bb48cf24..922f23fafea 100644 --- a/src/locales/en/pokemon-form.ts +++ b/src/locales/en/pokemon-form.ts @@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", - "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "Battle Bond", "scatterbugMeadow": "Meadow", diff --git a/src/locales/es/pokemon-form.ts b/src/locales/es/pokemon-form.ts index 3ca25208753..7098ba597f7 100644 --- a/src/locales/es/pokemon-form.ts +++ b/src/locales/es/pokemon-form.ts @@ -87,8 +87,7 @@ export const pokemonForm: SimpleTranslationEntries = { "thundurusIncarnate": "Incarnate", "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", - "meloettaAria": "Lírica", - "meloettaPirouette": "Danza", + "meloettaAria": "Aria", // 6G "froakieBattleBond": "Fuerte Afecto", "scatterbugMeadow": "Floral", diff --git a/src/locales/fr/pokemon-form.ts b/src/locales/fr/pokemon-form.ts index 9694f04a38e..51158356ef3 100644 --- a/src/locales/fr/pokemon-form.ts +++ b/src/locales/fr/pokemon-form.ts @@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Avatar", "keldeoOrdinary": "Normal", "meloettaAria": "Chant", - "meloettaPirouette": "Danse", // 6G "froakieBattleBond": "Synergie", "scatterbugMeadow": "Floraison", diff --git a/src/locales/it/pokemon-form.ts b/src/locales/it/pokemon-form.ts index 03b854cfa6c..d8bf9eeaab2 100644 --- a/src/locales/it/pokemon-form.ts +++ b/src/locales/it/pokemon-form.ts @@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnazione", "keldeoOrdinary": "Normale", "meloettaAria": "Canto", - "meloettaPirouette": "Danza", // 6G "froakieBattleBond": "Morfosintonia", "scatterbugMeadow": "Giardinfiore", diff --git a/src/locales/ja/pokemon-form.ts b/src/locales/ja/pokemon-form.ts index 896bb48cf24..922f23fafea 100644 --- a/src/locales/ja/pokemon-form.ts +++ b/src/locales/ja/pokemon-form.ts @@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", - "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "Battle Bond", "scatterbugMeadow": "Meadow", diff --git a/src/locales/ko/pokemon-form.ts b/src/locales/ko/pokemon-form.ts index 2e121a75dd7..9f6b9b08408 100644 --- a/src/locales/ko/pokemon-form.ts +++ b/src/locales/ko/pokemon-form.ts @@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "화신폼", "keldeoOrdinary": "평상시 모습", "meloettaAria": "보이스폼", - "meloettaPirouette": "스텝폼", // 6G "froakieBattleBond": "유대변화", "scatterbugMeadow": "화원의 모양", diff --git a/src/locales/pt_BR/pokemon-form.ts b/src/locales/pt_BR/pokemon-form.ts index 6d833673555..062fc165ae0 100644 --- a/src/locales/pt_BR/pokemon-form.ts +++ b/src/locales/pt_BR/pokemon-form.ts @@ -89,7 +89,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", - "meloettaPirouette": "Pirueta", // 6G "froakieBattleBond": "Vínculo de Batalha", "scatterbugMeadow": "Prado", diff --git a/src/locales/zh_CN/pokemon-form.ts b/src/locales/zh_CN/pokemon-form.ts index 4a8860ec84e..ea0c611e5aa 100644 --- a/src/locales/zh_CN/pokemon-form.ts +++ b/src/locales/zh_CN/pokemon-form.ts @@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "化身", "keldeoOrdinary": "通常", "meloettaAria": "歌声", - "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "牵绊变身", "scatterbugMeadow": "花园花纹", diff --git a/src/locales/zh_TW/pokemon-form.ts b/src/locales/zh_TW/pokemon-form.ts index d73fb70db21..55bb13946b7 100644 --- a/src/locales/zh_TW/pokemon-form.ts +++ b/src/locales/zh_TW/pokemon-form.ts @@ -88,7 +88,6 @@ export const pokemonForm: SimpleTranslationEntries = { "landorusIncarnate": "Incarnate", "keldeoOrdinary": "Ordinary", "meloettaAria": "Aria", - "meloettaPirouette": "Pirouette", // 6G "froakieBattleBond": "Battle Bond", "scatterbugMeadow": "Meadow",