From 933f547e960dcac753a665ea40d65977eb02bc23 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 26 Apr 2024 15:38:06 -0400 Subject: [PATCH 01/23] Fix egg shiny variant generation --- src/egg-hatch-phase.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/egg-hatch-phase.ts b/src/egg-hatch-phase.ts index a28d8e2983c..19934ad6e81 100644 --- a/src/egg-hatch-phase.ts +++ b/src/egg-hatch-phase.ts @@ -416,6 +416,7 @@ export class EggHatchPhase extends Phase { } ret.trySetShiny(this.egg.gachaType === GachaType.SHINY ? 1024 : 512); + ret.variant = ret.shiny ? ret.generateVariant() : 0; const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967295)); From 9c922ddc551648f59d3b4beab415564bfae26bb0 Mon Sep 17 00:00:00 2001 From: Lugiad Date: Fri, 26 Apr 2024 21:44:54 +0200 Subject: [PATCH 02/23] Update menu.ts --- src/locales/fr/menu.ts | 74 +++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/locales/fr/menu.ts b/src/locales/fr/menu.ts index 8c9a8f07322..f3d211f0517 100644 --- a/src/locales/fr/menu.ts +++ b/src/locales/fr/menu.ts @@ -8,25 +8,25 @@ export const menu: SimpleTranslationEntries = { "newGame": "Nouvelle partie", "selectGameMode": "Sélectionnez un mode de jeu.", "logInOrCreateAccount": "Connectez-vous ou créez un compte pour commencer. Aucun e-mail requis !", - "username": "Nom d'utilisateur", + "username": "Nom d’utilisateur", "password": "Mot de passe", "login": "Connexion", - "register": "S'inscrire", - "emptyUsername": "Le nom d'utilisateur est manquant", - "invalidLoginUsername": "Le nom d'utilisateur n'est pas valide", - "invalidRegisterUsername": "Le nom d'utilisateur ne doit contenir que\ndes lettres, chiffres ou traits bas", - "invalidLoginPassword": "Le mot de passe n'est pas valide", + "register": "S’inscrire", + "emptyUsername": "Le nom d’utilisateur est manquant", + "invalidLoginUsername": "Le nom d’utilisateur n’est pas valide", + "invalidRegisterUsername": "Le nom d’utilisateur ne doit contenir que\ndes lettres, chiffres ou traits bas", + "invalidLoginPassword": "Le mot de passe n’est pas valide", "invalidRegisterPassword": "Le mot de passe doit contenir 6 caractères ou plus", - "usernameAlreadyUsed": "Le nom d'utilisateur est déjà utilisé", - "accountNonExistent": "Le nom d'utilisateur n'existe pas", - "unmatchingPassword": "Le mot de passe n'est pas correct", + "usernameAlreadyUsed": "Le nom d’utilisateur est déjà utilisé", + "accountNonExistent": "Le nom d’utilisateur n’existe pas", + "unmatchingPassword": "Le mot de passe n’est pas correct", "passwordNotMatchingConfirmPassword": "Les mots de passe ne correspondent pas", "confirmPassword": "Confirmer le MDP", "registrationAgeWarning": "Vous confirmez en vous inscrivant que vous avez 13 ans ou plus.", "backToLogin": "Retour", - "failedToLoadSaveData": "Échec du chargement des données. Veuillez recharger la page.\nSi cela continue, veuillez contacter l'administrateur.", + "failedToLoadSaveData": "Échec du chargement des données. Veuillez recharger la page.\nSi cela continue, veuillez contacter l’administrateur.", "sessionSuccess": "Session chargée avec succès.", - "failedToLoadSession": "Vos données de session n'ont pas pu être chargées.\nElles pourraient être corrompues.", + "failedToLoadSession": "Vos données de session n’ont pas pu être chargées.\nElles pourraient être corrompues.", "boyOrGirl": "Es-tu un garçon ou une fille ?", "boy": "Garçon", "girl": "Fille", @@ -39,38 +39,38 @@ export const menu: SimpleTranslationEntries = { "playerGo": "{{pokemonName}} ! Go !", "trainerGo": "{{pokemonName}} est envoyé par\n{{trainerName}} !", "switchQuestion": "Voulez-vous changer\n{{pokemonName}} ?", - "trainerDefeated": `You defeated\n{{trainerName}}!`, - "pokemonCaught": "{{pokemonName}} was caught!", + "trainerDefeated": `Vous avez battu\n{{trainerName}} !`, + "pokemonCaught": "Vous avez attrapé {{pokemonName}} !", "pokemon": "Pokémon", "sendOutPokemon": "{{pokemonName}} ! Go !", - "attackFailed": "But it failed!", - "attackHitsCount": `Hit {{count}} time(s)!`, - "expGain": "{{pokemonName}} gained\n{{exp}} EXP. Points!", - "levelUp": "{{pokemonName}} grew to\nLv. {{level}}!", - "learnMove": "{{pokemonName}} learned\n{{moveName}}!", - "learnMovePrompt": "{{pokemonName}} wants to learn the\nmove {{moveName}}.", - "learnMoveLimitReached": "However, {{pokemonName}} already\nknows four moves.", - "learnMoveReplaceQuestion": "Should a move be forgotten and\nreplaced with {{moveName}}?", - "learnMoveStopTeaching": "Stop trying to teach\n{{moveName}}?", - "learnMoveNotLearned": "{{pokemonName}} did not learn the\nmove {{moveName}}.", - "learnMoveForgetQuestion": "Which move should be forgotten?", - "learnMoveForgetSuccess": "{{pokemonName}} forgot how to\nuse {{moveName}}.", + "attackFailed": "Mais cela échoue !", + "attackHitsCount": `Touché {{count}} fois !`, + "expGain": "{{pokemonName}} gagne\n{{exp}} Points d’Exp !", + "levelUp": "{{pokemonName}} monte au\nN. {{level}} !", + "learnMove": "{{pokemonName}} apprend \n{{moveName}} !", + "learnMovePrompt": "{{pokemonName}} veut apprendre\n{{moveName}}.", + "learnMoveLimitReached": "Cependant, {{pokemonName}} connait\ndéjà quatre capacités.", + "learnMoveReplaceQuestion": "Voulez-vous oublier une capacité\net la remplacer par {{moveName}} ?", + "learnMoveStopTeaching": "Arrêter d’apprendre\n{{moveName}} ?", + "learnMoveNotLearned": "{{pokemonName}} n’a pas appris\n{{moveName}}.", + "learnMoveForgetQuestion": "Quelle capacité doit être oubliée ?", + "learnMoveForgetSuccess": "{{pokemonName}} oublie comment\nutiliser {{moveName}}.", "levelCapUp": "La limite de niveau\na été augmentée à {{levelCap}} !", - "moveNotImplemented": "{{moveName}} n'est pas encore implémenté et ne peut pas être sélectionné.", + "moveNotImplemented": "{{moveName}} n’est pas encore implémenté et ne peut pas être sélectionné.", "moveDisabled": "{{moveName}} est sous entrave !", - "noPokeballForce": "Une force mystérieuse\nempêche l'utilisation des Poké Balls.", - "noPokeballTrainer": "Le Dresseur détourne la Ball\nVoler, c'est mal !", + "noPokeballForce": "Une force mystérieuse\nempêche l’utilisation des Poké Balls.", + "noPokeballTrainer": "Le Dresseur détourne la Ball\nVoler, c’est mal !", "noPokeballMulti": "Impossible ! On ne peut pas viser\nquand il y a deux Pokémon!", - "noPokeballStrong": "Le Pokémon est trop fort pour être capturé !\nVous devez d'abord l'affaiblir !", + "noPokeballStrong": "Le Pokémon est trop fort pour être capturé !\nVous devez d’abord l’affaiblir !", "noEscapeForce": "Une force mystérieuse\nempêche la fuite.", - "noEscapeTrainer": "On ne s'enfuit pas d'un\ncombat de Dresseurs !", + "noEscapeTrainer": "On ne s’enfuit pas d’un\ncombat de Dresseurs !", "noEscapePokemon": "{{moveName}} de {{pokemonName}}\nempêche {{escapeVerb}} !", - "runAwaySuccess": "You got away safely!", - "runAwayCannotEscape": 'You can\'t escape!', + "runAwaySuccess": "Vous prenez la fuite !", + "runAwayCannotEscape": "Fuite impossible !", "escapeVerbSwitch": "le changement", "escapeVerbFlee": "la fuite", - "notDisabled": "{{moveName}} n'est plus sous entrave !", - "skipItemQuestion": "Are you sure you want to skip taking an item?", - "eggHatching": "Oh?", - "ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?", -} as const; \ No newline at end of file + "notDisabled": "{{moveName}} n’est plus sous entrave !", + "skipItemQuestion": "Êtes vous sûr·e de ne pas vouloir prendre d’objet ?", + "eggHatching": "Oh ?", + "ivScannerUseQuestion": "Utiliser le Scanner d’IV sur {{pokemonName}} ?", +} as const; From ad87727517ba7bcd779cee65acc61f526684787a Mon Sep 17 00:00:00 2001 From: Lugiad Date: Fri, 26 Apr 2024 22:17:26 +0200 Subject: [PATCH 03/23] menu.ts French typo --- src/locales/fr/menu.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/fr/menu.ts b/src/locales/fr/menu.ts index f3d211f0517..015132bc6c5 100644 --- a/src/locales/fr/menu.ts +++ b/src/locales/fr/menu.ts @@ -70,7 +70,7 @@ export const menu: SimpleTranslationEntries = { "escapeVerbSwitch": "le changement", "escapeVerbFlee": "la fuite", "notDisabled": "{{moveName}} n’est plus sous entrave !", - "skipItemQuestion": "Êtes vous sûr·e de ne pas vouloir prendre d’objet ?", + "skipItemQuestion": "Êtes-vous sûr·e de ne pas vouloir prendre d’objet ?", "eggHatching": "Oh ?", "ivScannerUseQuestion": "Utiliser le Scanner d’IV sur {{pokemonName}} ?", } as const; From 744ff2899bc4ed8debfef4d1c91c167389c7148e Mon Sep 17 00:00:00 2001 From: Lugiad Date: Fri, 26 Apr 2024 22:42:21 +0200 Subject: [PATCH 04/23] Update pokemon.ts with Spanish names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added Spanish names of Type: Null and Paradox Pokémon --- src/locales/es/pokemon.ts | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/locales/es/pokemon.ts b/src/locales/es/pokemon.ts index 09be8894eb4..7826e15ba67 100644 --- a/src/locales/es/pokemon.ts +++ b/src/locales/es/pokemon.ts @@ -772,7 +772,7 @@ export const pokemon: SimpleTranslationEntries = { "sandygast": "Sandygast", "palossand": "Palossand", "pyukumuku": "Pyukumuku", - "type_null": "Type: Null", + "type_null": "Código Cero", "silvally": "Silvally", "minior": "Minior", "komala": "Komala", @@ -984,18 +984,18 @@ export const pokemon: SimpleTranslationEntries = { "farigiraf": "Farigiraf", "dudunsparce": "Dudunsparce", "kingambit": "Kingambit", - "great_tusk": "Great Tusk", - "scream_tail": "Scream Tail", - "brute_bonnet": "Brute Bonnet", - "flutter_mane": "Flutter Mane", - "slither_wing": "Slither Wing", - "sandy_shocks": "Sandy Shocks", - "iron_treads": "Iron Treads", - "iron_bundle": "Iron Bundle", - "iron_hands": "Iron Hands", - "iron_jugulis": "Iron Jugulis", - "iron_moth": "Iron Moth", - "iron_thorns": "Iron Thorns", + "great_tusk": "Colmilargo", + "scream_tail": "Colagrito", + "brute_bonnet": "Furioseta", + "flutter_mane": "Melenaleteo", + "slither_wing": "Reptalada", + "sandy_shocks": "Pelarena", + "iron_treads": "Ferrodada", + "iron_bundle": "Ferrosaco", + "iron_hands": "Ferropalmas", + "iron_jugulis": "Ferrocuello", + "iron_moth": "Ferropolilla", + "iron_thorns": "Ferropúas", "frigibax": "Frigibax", "arctibax": "Arctibax", "baxcalibur": "Baxcalibur", @@ -1005,12 +1005,12 @@ export const pokemon: SimpleTranslationEntries = { "chien_pao": "Chien-Pao", "ting_lu": "Ting-Lu", "chi_yu": "Chi-Yu", - "roaring_moon": "Roaring Moon", - "iron_valiant": "Iron Valiant", + "roaring_moon": "Bramaluna", + "iron_valiant": "Ferropaladín", "koraidon": "Koraidon", "miraidon": "Miraidon", - "walking_wake": "Walking Wake", - "iron_leaves": "Iron Leaves", + "walking_wake": "Ondulagua", + "iron_leaves": "Ferroverdor", "dipplin": "Dipplin", "poltchageist": "Poltchageist", "sinistcha": "Sinistcha", @@ -1020,10 +1020,10 @@ export const pokemon: SimpleTranslationEntries = { "ogerpon": "Ogerpon", "archaludon": "Archaludon", "hydrapple": "Hydrapple", - "gouging_fire": "Gouging Fire", - "raging_bolt": "Raging Bolt", - "iron_boulder": "Iron Boulder", - "iron_crown": "Iron Crown", + "gouging_fire": "Flamariete", + "raging_bolt": "Electrofuria", + "iron_boulder": "Ferromole", + "iron_crown": "Ferrotesta", "terapagos": "Terapagos", "pecharunt": "Pecharunt", "alola_rattata": "Rattata", @@ -1083,4 +1083,4 @@ export const pokemon: SimpleTranslationEntries = { "paldea_tauros": "Tauros", "paldea_wooper": "Wooper", "bloodmoon_ursaluna": "Ursaluna", -} as const; \ No newline at end of file +} as const; From bf2a83993cc79d611646e1203fd68928f8ac6eb5 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 26 Apr 2024 17:32:28 -0400 Subject: [PATCH 05/23] Make luck independent from shininess and variant --- src/field/pokemon.ts | 4 ++++ src/modifier/modifier-type.ts | 2 +- src/phases.ts | 1 + src/system/game-data.ts | 4 ++++ src/system/pokemon-data.ts | 2 ++ src/ui/starter-select-ui-handler.ts | 20 ++++++++++++++++++++ src/ui/summary-ui-handler.ts | 13 ++++++++++++- 7 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index af97a4e65db..89cfa8fac45 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -75,6 +75,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { public friendship: integer; public metLevel: integer; public metBiome: Biome | -1; + public luck: integer; public pauseEvolutions: boolean; public pokerus: boolean; @@ -142,6 +143,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.status = dataSource.status; this.friendship = dataSource.friendship !== undefined ? dataSource.friendship : this.species.baseFriendship; this.metLevel = dataSource.metLevel || 5; + this.luck = dataSource.luck; this.metBiome = dataSource.metBiome; this.pauseEvolutions = dataSource.pauseEvolutions; this.pokerus = !!dataSource.pokerus; @@ -189,6 +191,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.generateFusionSpecies(); } } + + this.luck = this.isShiny() ? this.variant + this.fusionVariant : 0; } this.generateName(); diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 54484a1e0f8..a4b369d409a 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -1518,7 +1518,7 @@ export class ModifierTypeOption { } export function getPartyLuckValue(party: Pokemon[]): integer { - return Phaser.Math.Clamp(party.map(p => p.isFainted() || !p.isShiny() ? 0 : !p.isFusion() || !p.shiny || !p.fusionShiny ? p.variant + 1 : (p.variant + 1) + (p.fusionVariant + 1)) + return Phaser.Math.Clamp(party.map(p => p.isFainted() ? 0 : p.luck) .reduce((total: integer, value: integer) => total += value, 0), 0, 14); } diff --git a/src/phases.ts b/src/phases.ts index 535a6c2b2c3..640f475927e 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -497,6 +497,7 @@ export class SelectStarterPhase extends Phase { starterPokemon.tryPopulateMoveset(starter.moveset); if (starter.passive) starterPokemon.passive = true; + starterPokemon.luck = this.scene.gameData.getDexAttrLuck(this.scene.gameData.dexData[starter.species.speciesId].caughtAttr); if (starter.pokerus) starterPokemon.pokerus = true; if (this.scene.gameMode.isSplicedOnly) diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 23c3f24affb..e11c2dcc572 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -1189,6 +1189,10 @@ export class GameData { return Math.pow(2, this.getSpeciesDefaultNature(species)); } + getDexAttrLuck(dexAttr: bigint): integer { + return dexAttr & DexAttr.SHINY ? dexAttr & DexAttr.VARIANT_3 ? 3 : dexAttr & DexAttr.VARIANT_2 ? 2 : 1 : 0; + } + getNaturesForAttr(natureAttr: integer): Nature[] { let ret: Nature[] = []; for (let n = 0; n < 25; n++) { diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts index 8ad14d5ca81..2fc4cac2b55 100644 --- a/src/system/pokemon-data.ts +++ b/src/system/pokemon-data.ts @@ -36,6 +36,7 @@ export default class PokemonData { public friendship: integer; public metLevel: integer; public metBiome: Biome | -1; + public luck: integer; public pauseEvolutions: boolean; public pokerus: boolean; @@ -75,6 +76,7 @@ export default class PokemonData { this.friendship = source.friendship !== undefined ? source.friendship : getPokemonSpecies(this.species).baseFriendship; this.metLevel = source.metLevel || 5; this.metBiome = source.metBiome !== undefined ? source.metBiome : -1; + this.luck = source.luck !== undefined ? source.luck : (source.shiny ? (source.variant + 1) : 0) + (source.fusionShiny ? source.fusionVariant + 1 : 0); if (!forHistory) this.pauseEvolutions = !!source.pauseEvolutions; this.pokerus = !!source.pokerus; diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 369dcf44f7a..2fd67ac0485 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -97,6 +97,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { private pokemonGrowthRateText: Phaser.GameObjects.Text; private type1Icon: Phaser.GameObjects.Sprite; private type2Icon: Phaser.GameObjects.Sprite; + private pokemonLuckLabelText: Phaser.GameObjects.Text; + private pokemonLuckText: Phaser.GameObjects.Text; private pokemonGenderText: Phaser.GameObjects.Text; private pokemonUncaughtText: Phaser.GameObjects.Text; private pokemonAbilityLabelText: Phaser.GameObjects.Text; @@ -418,6 +420,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.type2Icon.setOrigin(0, 0); this.starterSelectContainer.add(this.type2Icon); + this.pokemonLuckLabelText = addTextObject(this.scene, 8, 89, 'Luck:', TextStyle.WINDOW_ALT, { fontSize: '56px' }); + this.pokemonLuckLabelText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonLuckLabelText); + + this.pokemonLuckText = addTextObject(this.scene, 8 + this.pokemonLuckLabelText.displayWidth + 2, 89, '0', TextStyle.WINDOW, { fontSize: '56px' }); + this.pokemonLuckText.setOrigin(0, 0); + this.starterSelectContainer.add(this.pokemonLuckText); + this.pokemonCandyIcon = this.scene.add.sprite(1, 12, 'items', 'candy'); this.pokemonCandyIcon.setScale(0.5); this.pokemonCandyIcon.setOrigin(0, 0); @@ -1249,6 +1259,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (this.speciesStarterDexEntry?.caughtAttr) { const colorScheme = starterColors[species.speciesId]; + const luck = this.scene.gameData.getDexAttrLuck(this.speciesStarterDexEntry.caughtAttr); + this.pokemonLuckText.setVisible(!!luck); + this.pokemonLuckText.setText(luck.toString()); + this.pokemonLuckText.setTint(getVariantTint(Math.min(luck - 1, 2) as Variant)); + this.pokemonLuckLabelText.setVisible(this.pokemonLuckText.visible); + this.pokemonGrowthRateText.setText(Utils.toReadableString(GrowthRate[species.growthRate])); this.pokemonGrowthRateText.setColor(getGrowthRateColor(species.growthRate)); this.pokemonGrowthRateText.setShadowColor(getGrowthRateColor(species.growthRate, true)); @@ -1310,6 +1326,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonGrowthRateLabelText.setVisible(false); this.type1Icon.setVisible(false); this.type2Icon.setVisible(false); + this.pokemonLuckLabelText.setVisible(false); + this.pokemonLuckText.setVisible(false); this.pokemonUncaughtText.setVisible(true); this.pokemonAbilityLabelText.setVisible(false); this.pokemonPassiveLabelText.setVisible(false); @@ -1334,6 +1352,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonGrowthRateLabelText.setVisible(false); this.type1Icon.setVisible(false); this.type2Icon.setVisible(false); + this.pokemonLuckLabelText.setVisible(false); + this.pokemonLuckText.setVisible(false); this.pokemonUncaughtText.setVisible(!!species); this.pokemonAbilityLabelText.setVisible(false); this.pokemonPassiveLabelText.setVisible(false); diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index e6f3d2233e5..c06b16df430 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -16,7 +16,7 @@ import { getBiomeName } from "../data/biomes"; import { Nature, getNatureStatMultiplier } from "../data/nature"; import { loggedInUser } from "../account"; import { PlayerGender } from "../system/game-data"; -import { getVariantTint } from "#app/data/variant"; +import { Variant, getVariantTint } from "#app/data/variant"; enum Page { PROFILE, @@ -604,6 +604,17 @@ export default class SummaryUiHandler extends UiHandler { if (this.pokemon.isTerastallized()) profileContainer.add(getTypeIcon(types.length, this.pokemon.getTeraType(), true)); + if (this.pokemon.luck) { + const luckLabelText = addTextObject(this.scene, 141, 28, 'Luck:', TextStyle.SUMMARY_ALT); + luckLabelText.setOrigin(0, 0); + profileContainer.add(luckLabelText); + + const luckText = addTextObject(this.scene, 141 + luckLabelText.displayWidth + 2, 28, this.pokemon.luck.toString(), TextStyle.SUMMARY); + luckText.setOrigin(0, 0); + luckText.setTint(getVariantTint((Math.min(this.pokemon.luck - 1, 2)) as Variant)); + profileContainer.add(luckText); + } + const ability = this.pokemon.getAbility(true); const abilityNameText = addTextObject(this.scene, 7, 66, ability.name, TextStyle.SUMMARY_ALT); From 6b9542511fc934bafadc4a75c55f0b44bbf8effa Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 26 Apr 2024 18:27:00 -0400 Subject: [PATCH 06/23] Add fusion luck as a separate field --- src/field/pokemon.ts | 12 +++++++++++- src/modifier/modifier-type.ts | 2 +- src/system/pokemon-data.ts | 4 +++- src/ui/summary-ui-handler.ts | 6 +++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 89cfa8fac45..7408b86deca 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -85,6 +85,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { public fusionShiny: boolean; public fusionVariant: Variant; public fusionGender: Gender; + public fusionLuck: integer; private summonDataPrimer: PokemonSummonData; @@ -153,6 +154,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.fusionShiny = dataSource.fusionShiny; this.fusionVariant = dataSource.fusionVariant || 0; this.fusionGender = dataSource.fusionGender; + this.fusionLuck = dataSource.fusionLuck; } else { this.id = Utils.randSeedInt(4294967296); this.ivs = ivs || Utils.getIvsFromId(this.id); @@ -192,7 +194,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - this.luck = this.isShiny() ? this.variant + this.fusionVariant : 0; + this.luck = (this.shiny ? (this.variant + 1) : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); } this.generateName(); @@ -690,6 +692,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return !this.isFusion() ? this.variant : Math.max(this.variant, this.fusionVariant) as Variant; } + getLuck(): integer { + return this.luck + this.fusionLuck; + } + isFusion(): boolean { return !!this.fusionSpecies; } @@ -1052,6 +1058,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } this.fusionFormIndex = this.scene.getSpeciesFormIndex(this.fusionSpecies, this.fusionGender, this.getNature(), true); + this.fusionLuck = this.luck; this.generateName(); } @@ -1062,6 +1069,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.fusionAbilityIndex = 0; this.fusionShiny = false; this.fusionGender = 0; + this.fusionLuck = 0; this.generateName(); this.calculateStats(); @@ -2418,6 +2426,7 @@ export class PlayerPokemon extends Pokemon { newPokemon.fusionShiny = this.fusionShiny; newPokemon.fusionVariant = this.fusionVariant; newPokemon.fusionGender = this.fusionGender; + newPokemon.fusionLuck = this.fusionLuck; this.scene.getParty().push(newPokemon); newPokemon.evolve(newEvolution); const modifiers = this.scene.findModifiers(m => m instanceof PokemonHeldItemModifier @@ -2477,6 +2486,7 @@ export class PlayerPokemon extends Pokemon { this.fusionShiny = pokemon.shiny; this.fusionVariant = pokemon.fusionVariant; this.fusionGender = pokemon.gender; + this.fusionLuck = pokemon.luck; this.scene.validateAchv(achvs.SPLICE); this.scene.gameData.gameStats.pokemonFused++; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index a4b369d409a..6237e8b5a50 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -1518,7 +1518,7 @@ export class ModifierTypeOption { } export function getPartyLuckValue(party: Pokemon[]): integer { - return Phaser.Math.Clamp(party.map(p => p.isFainted() ? 0 : p.luck) + return Phaser.Math.Clamp(party.map(p => p.isFainted() ? 0 : p.getLuck()) .reduce((total: integer, value: integer) => total += value, 0), 0, 14); } diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts index 2fc4cac2b55..b9589020e9b 100644 --- a/src/system/pokemon-data.ts +++ b/src/system/pokemon-data.ts @@ -46,6 +46,7 @@ export default class PokemonData { public fusionShiny: boolean; public fusionVariant: Variant; public fusionGender: Gender; + public fusionLuck: integer; public boss: boolean; @@ -76,7 +77,7 @@ export default class PokemonData { this.friendship = source.friendship !== undefined ? source.friendship : getPokemonSpecies(this.species).baseFriendship; this.metLevel = source.metLevel || 5; this.metBiome = source.metBiome !== undefined ? source.metBiome : -1; - this.luck = source.luck !== undefined ? source.luck : (source.shiny ? (source.variant + 1) : 0) + (source.fusionShiny ? source.fusionVariant + 1 : 0); + this.luck = source.luck !== undefined ? source.luck : (source.shiny ? (source.variant + 1) : 0); if (!forHistory) this.pauseEvolutions = !!source.pauseEvolutions; this.pokerus = !!source.pokerus; @@ -87,6 +88,7 @@ export default class PokemonData { this.fusionShiny = source.fusionShiny; this.fusionVariant = source.fusionVariant; this.fusionGender = source.fusionGender; + this.fusionLuck = source.fusionLuck !== undefined ? source.fusionLuck : (source.fusionShiny ? source.fusionVariant + 1 : 0); if (!forHistory) this.boss = (source instanceof EnemyPokemon && !!source.bossSegments) || (!this.player && !!source.boss); diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index c06b16df430..bf5a12b3f7d 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -604,14 +604,14 @@ export default class SummaryUiHandler extends UiHandler { if (this.pokemon.isTerastallized()) profileContainer.add(getTypeIcon(types.length, this.pokemon.getTeraType(), true)); - if (this.pokemon.luck) { + if (this.pokemon.getLuck()) { const luckLabelText = addTextObject(this.scene, 141, 28, 'Luck:', TextStyle.SUMMARY_ALT); luckLabelText.setOrigin(0, 0); profileContainer.add(luckLabelText); - const luckText = addTextObject(this.scene, 141 + luckLabelText.displayWidth + 2, 28, this.pokemon.luck.toString(), TextStyle.SUMMARY); + const luckText = addTextObject(this.scene, 141 + luckLabelText.displayWidth + 2, 28, this.pokemon.getLuck().toString(), TextStyle.SUMMARY); luckText.setOrigin(0, 0); - luckText.setTint(getVariantTint((Math.min(this.pokemon.luck - 1, 2)) as Variant)); + luckText.setTint(getVariantTint((Math.min(this.pokemon.getLuck() - 1, 2)) as Variant)); profileContainer.add(luckText); } From f2816051460a43fccfa6735f37f75d028bc57269 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 26 Apr 2024 19:36:27 -0400 Subject: [PATCH 07/23] Fix wild shiny luck generation --- src/field/pokemon.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 7408b86deca..a17621f4b5f 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -194,7 +194,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - this.luck = (this.shiny ? (this.variant + 1) : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); + this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); } this.generateName(); @@ -693,7 +693,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getLuck(): integer { - return this.luck + this.fusionLuck; + return this.luck + (this.isFusion() ? this.fusionLuck : 0); } isFusion(): boolean { @@ -2111,7 +2111,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (variantColors) { const color = Utils.rgbaToInt([r, g, b, a]); if (variantColorSet.has(color)) { - console.log(color); const mappedPixel = variantColorSet.get(color); [ r, g, b, a ] = mappedPixel; } @@ -2550,6 +2549,8 @@ export class EnemyPokemon extends Pokemon { if (this.shiny) this.variant = this.generateVariant(); + this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); + let prevolution: Species; let speciesId = species.speciesId; while ((prevolution = pokemonPrevolutions[speciesId])) { From e475d566b60706705340048340c9dc1021eb1f0e Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Fri, 26 Apr 2024 18:50:14 -0500 Subject: [PATCH 08/23] Revise egg moves again These revisions spans across all generations with vastly different moves. Once again, if moves seem weird or too overpowered, please bring it up in the egg move discussion thread. --- src/data/egg-moves.ts | 462 +++++++++++++++++++++--------------------- 1 file changed, 231 insertions(+), 231 deletions(-) diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts index 91a78a9b276..f2b9a55d3fa 100644 --- a/src/data/egg-moves.ts +++ b/src/data/egg-moves.ts @@ -5,37 +5,37 @@ import * as Utils from "../utils"; export const speciesEggMoves = { - [Species.BULBASAUR]: [ Moves.GIGA_DRAIN, Moves.SLUDGE_BOMB, Moves.EARTH_POWER, Moves.STRENGTH_SAP ], - [Species.CHARMANDER]: [ Moves.DRAGON_DANCE, Moves.BITTER_BLADE, Moves.EARTH_POWER, Moves.GLAIVE_RUSH ], - [Species.SQUIRTLE]: [ Moves.AURA_SPHERE, Moves.DARK_PULSE, Moves.BOUNCY_BUBBLE, Moves.ORIGIN_PULSE ], + [Species.BULBASAUR]: [ Moves.STRENGTH_SAP, Moves.SLUDGE_BOMB, Moves.EARTH_POWER, Moves.SAPPY_SEED ], + [Species.CHARMANDER]: [ Moves.DRAGON_DANCE, Moves.BITTER_BLADE, Moves.EARTH_POWER, Moves.OBLIVION_WING ], + [Species.SQUIRTLE]: [ Moves.ICE_BEAM, Moves.DARK_PULSE, Moves.BOUNCY_BUBBLE, Moves.ORIGIN_PULSE ], [Species.CATERPIE]: [ Moves.EARTH_POWER, Moves.SILK_TRAP, Moves.STICKY_WEB, Moves.BLEAKWIND_STORM ], - [Species.WEEDLE]: [ Moves.DRILL_RUN, Moves.ROCK_BLAST, Moves.BANEFUL_BUNKER, Moves.BARB_BARRAGE ], + [Species.WEEDLE]: [ Moves.DRILL_RUN, Moves.SWORDS_DANCE, Moves.BANEFUL_BUNKER, Moves.BARB_BARRAGE ], [Species.PIDGEY]: [ Moves.HEAT_WAVE, Moves.FOCUS_BLAST, Moves.U_TURN, Moves.WILDBOLT_STORM ], [Species.RATTATA]: [ Moves.HYPER_FANG, Moves.PSYCHIC_FANGS, Moves.FIRE_FANG, Moves.EXTREME_SPEED ], [Species.SPEAROW]: [ Moves.DUAL_WINGBEAT, Moves.SUCKER_PUNCH, Moves.PARTING_SHOT, Moves.HYPER_DRILL ], - [Species.EKANS]: [ Moves.SHED_TAIL, Moves.DRAGON_DANCE, Moves.LEECH_LIFE, Moves.NOXIOUS_TORQUE ], - [Species.SANDSHREW]: [ Moves.DIRE_CLAW, Moves.SPIKY_SHIELD, Moves.SHORE_UP, Moves.PRECIPICE_BLADES ], + [Species.EKANS]: [ Moves.SHED_TAIL, Moves.DRAGON_DANCE, Moves.SLACK_OFF, Moves.NOXIOUS_TORQUE ], + [Species.SANDSHREW]: [ Moves.DIRE_CLAW, Moves.CEASELESS_EDGE, Moves.SHORE_UP, Moves.PRECIPICE_BLADES ], [Species.NIDORAN_F]: [ Moves.SCALD, Moves.SHORE_UP, Moves.CALM_MIND, Moves.BANEFUL_BUNKER ], [Species.NIDORAN_M]: [ Moves.DARK_PULSE, Moves.SHORE_UP, Moves.CALM_MIND, Moves.KINGS_SHIELD ], [Species.VULPIX]: [ Moves.MOONBLAST, Moves.PSYCHIC, Moves.MORNING_SUN, Moves.TAIL_GLOW ], - [Species.ZUBAT]: [ Moves.CRUNCH, Moves.DIRE_CLAW, Moves.SWORDS_DANCE, Moves.FLOATY_FALL ], - [Species.ODDISH]: [ Moves.POLLEN_PUFF, Moves.FIERY_DANCE, Moves.FLORAL_HEALING, Moves.SPORE ], - [Species.PARAS]: [ Moves.FIRST_IMPRESSION, Moves.DIRE_CLAW, Moves.CRABHAMMER, Moves.SAPPY_SEED ], - [Species.VENONAT]: [ Moves.TWIN_BEAM, Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.BLOOD_MOON ], - [Species.DIGLETT]: [ Moves.STRENGTH_SAP, Moves.SWORDS_DANCE, Moves.CLOSE_COMBAT, Moves.HEADLONG_RUSH ], + [Species.ZUBAT]: [ Moves.FLOATY_FALL, Moves.DIRE_CLAW, Moves.SWORDS_DANCE, Moves.BRAVE_BIRD ], + [Species.ODDISH]: [ Moves.SLUDGE_BOMB, Moves.FIERY_DANCE, Moves.STRENGTH_SAP, Moves.SPORE ], + [Species.PARAS]: [ Moves.FIRST_IMPRESSION, Moves.SAPPY_SEED, Moves.CRABHAMMER, Moves.DIRE_CLAW ], + [Species.VENONAT]: [ Moves.SLUDGE_BOMB, Moves.MOONLIGHT, Moves.EARTH_POWER, Moves.MYSTICAL_POWER ], + [Species.DIGLETT]: [ Moves.STRENGTH_SAP, Moves.SWORDS_DANCE, Moves.ICE_SPINNER, Moves.HEADLONG_RUSH ], [Species.MEOWTH]: [ Moves.COVET, Moves.HAPPY_HOUR, Moves.PARTING_SHOT, Moves.MAKE_IT_RAIN ], [Species.PSYDUCK]: [ Moves.MYSTICAL_POWER, Moves.AQUA_STEP, Moves.AURA_SPHERE, Moves.MIND_BLOWN ], - [Species.MANKEY]: [ Moves.DRAIN_PUNCH, Moves.PLAY_ROUGH, Moves.METEOR_MASH, Moves.NO_RETREAT ], + [Species.MANKEY]: [ Moves.DRAIN_PUNCH, Moves.RAGING_FURY, Moves.METEOR_MASH, Moves.NO_RETREAT ], [Species.GROWLITHE]: [ Moves.ZING_ZAP, Moves.PARTING_SHOT, Moves.MORNING_SUN, Moves.SACRED_FIRE ], [Species.POLIWAG]: [ Moves.BOUNCY_BUBBLE, Moves.WILDBOLT_STORM, Moves.DRAIN_PUNCH, Moves.SURGING_STRIKES ], - [Species.ABRA]: [ Moves.MYSTICAL_FIRE, Moves.AURA_SPHERE, Moves.THUNDERBOLT, Moves.MYSTICAL_POWER ], - [Species.MACHOP]: [ Moves.BULLET_PUNCH, Moves.KNOCK_OFF, Moves.FLYING_PRESS, Moves.FISSURE ], + [Species.ABRA]: [ Moves.MOONBLAST, Moves.EARTH_POWER, Moves.THUNDERBOLT, Moves.LUSTER_PURGE ], + [Species.MACHOP]: [ Moves.MACH_PUNCH, Moves.METEOR_MASH, Moves.FLYING_PRESS, Moves.FISSURE ], [Species.BELLSPROUT]: [ Moves.SOLAR_BLADE, Moves.WEATHER_BALL, Moves.FIRE_LASH, Moves.STRENGTH_SAP ], [Species.TENTACOOL]: [ Moves.BANEFUL_BUNKER, Moves.STRENGTH_SAP, Moves.HAZE, Moves.MALIGNANT_CHAIN ], [Species.GEODUDE]: [ Moves.BODY_PRESS, Moves.BULK_UP, Moves.SHORE_UP, Moves.HEAD_SMASH ], [Species.PONYTA]: [ Moves.HIGH_HORSEPOWER, Moves.FIRE_LASH, Moves.MORNING_SUN, Moves.VOLT_TACKLE ], - [Species.SLOWPOKE]: [ Moves.BOUNCY_BUBBLE, Moves.PARTING_SHOT, Moves.COSMIC_POWER, Moves.PSYSTRIKE ], - [Species.MAGNEMITE]: [ Moves.PARABOLIC_CHARGE, Moves.BODY_PRESS, Moves.ENERGY_BALL, Moves.THUNDERCLAP ], + [Species.SLOWPOKE]: [ Moves.BOUNCY_BUBBLE, Moves.PARTING_SHOT, Moves.COSMIC_POWER, Moves.LUMINA_CRASH ], + [Species.MAGNEMITE]: [ Moves.RECOVER, Moves.BODY_PRESS, Moves.ICE_BEAM, Moves.THUNDERCLAP ], [Species.FARFETCHD]: [ Moves.BATON_PASS, Moves.SACRED_SWORD, Moves.ROOST, Moves.VICTORY_DANCE ], [Species.DODUO]: [ Moves.TRIPLE_AXEL, Moves.HEAD_CHARGE, Moves.BRAVE_BIRD, Moves.TRIPLE_ARROWS ], [Species.SEEL]: [ Moves.FREEZE_DRY, Moves.CHILLY_RECEPTION, Moves.SLACK_OFF, Moves.BOUNCY_BUBBLE ], @@ -44,81 +44,81 @@ export const speciesEggMoves = { [Species.GASTLY]: [ Moves.FROST_BREATH, Moves.AURA_SPHERE, Moves.NASTY_PLOT, Moves.MALIGNANT_CHAIN ], [Species.ONIX]: [ Moves.SHORE_UP, Moves.BODY_PRESS, Moves.HEAD_SMASH, Moves.SPIN_OUT ], [Species.DROWZEE]: [ Moves.DREAM_EATER, Moves.RECOVER, Moves.NIGHTMARE, Moves.SPORE ], - [Species.KRABBY]: [ Moves.CRUSH_GRIP, Moves.LIQUIDATION, Moves.SHORE_UP, Moves.SHELL_SMASH ], + [Species.KRABBY]: [ Moves.MOUNTAIN_GALE, Moves.LIQUIDATION, Moves.SHORE_UP, Moves.SHELL_SMASH ], [Species.VOLTORB]: [ Moves.BUZZY_BUZZ, Moves.VOLT_SWITCH, Moves.ENERGY_BALL, Moves.NASTY_PLOT ], [Species.EXEGGCUTE]: [ Moves.MYSTICAL_POWER, Moves.APPLE_ACID, Moves.TRICK_ROOM, Moves.FICKLE_BEAM ], [Species.CUBONE]: [ Moves.HEAD_SMASH, Moves.WOOD_HAMMER, Moves.PAIN_SPLIT, Moves.VOLT_TACKLE ], [Species.LICKITUNG]: [ Moves.BODY_SLAM, Moves.FIRE_LASH, Moves.GRAV_APPLE, Moves.MILK_DRINK ], - [Species.KOFFING]: [ Moves.SCALD, Moves.RECOVER, Moves.MOONBLAST, Moves.SEARING_SHOT ], - [Species.RHYHORN]: [ Moves.HIGH_HORSEPOWER, Moves.METEOR_MASH, Moves.WILD_CHARGE, Moves.HEAD_SMASH ], + [Species.KOFFING]: [ Moves.SCALD, Moves.RECOVER, Moves.SEARING_SHOT, Moves.MALIGNANT_CHAIN ], + [Species.RHYHORN]: [ Moves.SHORE_UP, Moves.WAVE_CRASH, Moves.FLARE_BLITZ, Moves.HEAD_SMASH ], [Species.TANGELA]: [ Moves.STRENGTH_SAP, Moves.INFESTATION, Moves.PARTING_SHOT, Moves.SAPPY_SEED ], [Species.KANGASKHAN]: [ Moves.POWER_UP_PUNCH, Moves.BREAKING_SWIPE, Moves.RETURN, Moves.SEISMIC_TOSS ], - [Species.HORSEA]: [ Moves.SNIPE_SHOT, Moves.SPACIAL_REND, Moves.HURRICANE, Moves.DRAGON_ENERGY ], + [Species.HORSEA]: [ Moves.SNIPE_SHOT, Moves.NASTY_PLOT, Moves.HURRICANE, Moves.SPACIAL_REND ], [Species.GOLDEEN]: [ Moves.DRILL_RUN, Moves.FLIP_TURN, Moves.DRAGON_DANCE, Moves.FISHIOUS_REND ], - [Species.STARYU]: [ Moves.METEOR_BEAM, Moves.BOUNCY_BUBBLE, Moves.MOONBLAST, Moves.MYSTICAL_POWER ], - [Species.SCYTHER]: [ Moves.DUAL_WINGBEAT, Moves.BUG_BITE, Moves.STORM_THROW, Moves.MIGHTY_CLEAVE ], - [Species.PINSIR]: [ Moves.CRUSH_GRIP, Moves.LUNGE, Moves.CLOSE_COMBAT, Moves.EXTREME_SPEED ], + [Species.STARYU]: [ Moves.CALM_MIND, Moves.BOUNCY_BUBBLE, Moves.MOONBLAST, Moves.MYSTICAL_POWER ], + [Species.SCYTHER]: [ Moves.GEAR_GRIND, Moves.BUG_BITE, Moves.STORM_THROW, Moves.MIGHTY_CLEAVE ], + [Species.PINSIR]: [ Moves.CRUSH_GRIP, Moves.U_TURN, Moves.CLOSE_COMBAT, Moves.EXTREME_SPEED ], [Species.TAUROS]: [ Moves.HIGH_HORSEPOWER, Moves.FLARE_BLITZ, Moves.WAVE_CRASH, Moves.HEAD_CHARGE ], [Species.MAGIKARP]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.LIQUIDATION, Moves.DRAGON_ASCENT ], - [Species.LAPRAS]: [ Moves.RECOVER, Moves.FREEZE_DRY, Moves.CHILLY_RECEPTION, Moves.RELIC_SONG ], + [Species.LAPRAS]: [ Moves.RECOVER, Moves.FREEZE_DRY, Moves.CHILLY_RECEPTION, Moves.BOOMBURST ], [Species.DITTO]: [ Moves.MIMIC, Moves.COPYCAT, Moves.ME_FIRST, Moves.METRONOME ], - [Species.EEVEE]: [ Moves.WISH, Moves.REVELATION_DANCE, Moves.VEEVEE_VOLLEY, Moves.CLANGOROUS_SOUL ], - [Species.PORYGON]: [ Moves.PARABOLIC_CHARGE, Moves.AURA_SPHERE, Moves.TOPSY_TURVY, Moves.TECHNO_BLAST ], - [Species.OMANYTE]: [ Moves.SCALD, Moves.EERIE_SPELL, Moves.POWER_GEM, Moves.STRENGTH_SAP ], + [Species.EEVEE]: [ Moves.WISH, Moves.REVELATION_DANCE, Moves.SIZZLY_SLIDE, Moves.NO_RETREAT ], + [Species.PORYGON]: [ Moves.BUZZY_BUZZ, Moves.AURA_SPHERE, Moves.TOPSY_TURVY, Moves.TECHNO_BLAST ], + [Species.OMANYTE]: [ Moves.SCALD, Moves.EARTH_POWER, Moves.POWER_GEM, Moves.STRENGTH_SAP ], [Species.KABUTO]: [ Moves.CEASELESS_EDGE, Moves.DRILL_RUN, Moves.AQUA_CUTTER, Moves.MIGHTY_CLEAVE ], - [Species.AERODACTYL]: [ Moves.DUAL_WINGBEAT, Moves.SUPERCELL_SLAM, Moves.SWORDS_DANCE, Moves.MIGHTY_CLEAVE ], - [Species.ARTICUNO]: [ Moves.FREEZING_GLARE, Moves.GLACIATE, Moves.AURORA_VEIL, Moves.BLEAKWIND_STORM ], - [Species.ZAPDOS]: [ Moves.THUNDEROUS_KICK, Moves.PARABOLIC_CHARGE, Moves.SPIKY_SHIELD, Moves.BOLT_BEAK ], - [Species.MOLTRES]: [ Moves.FIERY_WRATH, Moves.SCORCHING_SANDS, Moves.BURNING_BULWARK, Moves.ERUPTION ], - [Species.DRATINI]: [ Moves.DRAGON_HAMMER, Moves.METEOR_MASH, Moves.DRAIN_PUNCH, Moves.FLOATY_FALL ], - [Species.MEWTWO]: [ Moves.PHOTON_GEYSER, Moves.MOONBLAST, Moves.PLASMA_FISTS, Moves.DOUBLE_IRON_BASH ], + [Species.AERODACTYL]: [ Moves.FLOATY_FALL, Moves.HEAD_SMASH, Moves.SWORDS_DANCE, Moves.MIGHTY_CLEAVE ], + [Species.ARTICUNO]: [ Moves.AURA_SPHERE, Moves.CALM_MIND, Moves.AURORA_VEIL, Moves.AEROBLAST ], + [Species.ZAPDOS]: [ Moves.WEATHER_BALL, Moves.CALM_MIND, Moves.SPIKY_SHIELD, Moves.ELECTRO_SHOT ], + [Species.MOLTRES]: [ Moves.SCORCHING_SANDS, Moves.CALM_MIND, Moves.BURNING_BULWARK, Moves.TORCH_SONG ], + [Species.DRATINI]: [ Moves.DRAGON_HAMMER, Moves.METEOR_MASH, Moves.FIRE_LASH, Moves.FLOATY_FALL ], + [Species.MEWTWO]: [ Moves.METEOR_MASH, Moves.MOONBLAST, Moves.PLASMA_FISTS, Moves.PHOTON_GEYSER ], [Species.MEW]: [ Moves.PHOTON_GEYSER, Moves.QUIVER_DANCE, Moves.VICTORY_DANCE, Moves.REVIVAL_BLESSING ], [Species.CHIKORITA]: [ Moves.ROCK_SLIDE, Moves.PLAY_ROUGH, Moves.DRAGON_DANCE, Moves.SAPPY_SEED ], [Species.CYNDAQUIL]: [ Moves.NASTY_PLOT, Moves.SCORCHING_SANDS, Moves.FIERY_DANCE, Moves.ELECTRO_DRIFT ], [Species.TOTODILE]: [ Moves.THUNDER_PUNCH, Moves.DRAGON_DANCE, Moves.ICICLE_CRASH, Moves.FISHIOUS_REND ], - [Species.SENTRET]: [ Moves.TIDY_UP, Moves.COVET, Moves.NUZZLE, Moves.EXTREME_SPEED ], + [Species.SENTRET]: [ Moves.TIDY_UP, Moves.THIEF, Moves.NUZZLE, Moves.EXTREME_SPEED ], [Species.HOOTHOOT]: [ Moves.CALM_MIND, Moves.ESPER_WING, Moves.BOOMBURST, Moves.OBLIVION_WING ], - [Species.LEDYBA]: [ Moves.FIRST_IMPRESSION, Moves.FLOATY_FALL, Moves.VICTORY_DANCE, Moves.DOUBLE_IRON_BASH ], + [Species.LEDYBA]: [ Moves.POLLEN_PUFF, Moves.THIEF, Moves.PARTING_SHOT, Moves.SPORE ], [Species.SPINARAK]: [ Moves.PARTING_SHOT, Moves.MEGAHORN, Moves.SILK_TRAP, Moves.STRENGTH_SAP ], - [Species.CHINCHOU]: [ Moves.PARABOLIC_CHARGE, Moves.BOUNCY_BUBBLE, Moves.VOLT_SWITCH, Moves.TAIL_GLOW ], - [Species.PICHU]: [ Moves.ZIPPY_ZAP, Moves.SPLISHY_SPLASH, Moves.FLOATY_FALL, Moves.PIKA_PAPOW ], - [Species.CLEFFA]: [ Moves.CALM_MIND, Moves.POWER_GEM, Moves.WISH, Moves.LIGHT_OF_RUIN ], + [Species.CHINCHOU]: [ Moves.THUNDERCLAP, Moves.BOUNCY_BUBBLE, Moves.VOLT_SWITCH, Moves.TAIL_GLOW ], + [Species.PICHU]: [ Moves.PIKA_PAPOW, Moves.SPLISHY_SPLASH, Moves.FLOATY_FALL, Moves.ZIPPY_ZAP ], + [Species.CLEFFA]: [ Moves.TAKE_HEART, Moves.POWER_GEM, Moves.WISH, Moves.LIGHT_OF_RUIN ], [Species.IGGLYBUFF]: [ Moves.MOONBLAST, Moves.APPLE_ACID, Moves.WISH, Moves.BOOMBURST ], - [Species.TOGEPI]: [ Moves.EARTH_POWER, Moves.ROOST, Moves.MYSTICAL_FIRE, Moves.MOONBLAST ], - [Species.NATU]: [ Moves.AEROBLAST, Moves.ROOST, Moves.CALM_MIND, Moves.PSYCHO_BOOST ], - [Species.MAREEP]: [ Moves.ICE_BEAM, Moves.AURA_SPHERE, Moves.DRAGON_ENERGY, Moves.TAIL_GLOW ], + [Species.TOGEPI]: [ Moves.SCORCHING_SANDS, Moves.ROOST, Moves.MOONBLAST, Moves.FIERY_DANCE ], + [Species.NATU]: [ Moves.AEROBLAST, Moves.ROOST, Moves.CALM_MIND, Moves.LUMINA_CRASH ], + [Species.MAREEP]: [ Moves.ICE_BEAM, Moves.MILK_DRINK, Moves.DRAGON_ENERGY, Moves.TAIL_GLOW ], [Species.HOPPIP]: [ Moves.AIR_SLASH, Moves.STRENGTH_SAP, Moves.QUIVER_DANCE, Moves.SEED_FLARE ], - [Species.AIPOM]: [ Moves.TIDY_UP, Moves.STORM_THROW, Moves.FAKE_OUT, Moves.CRUSH_GRIP ], - [Species.SUNKERN]: [ Moves.SPORE, Moves.WEATHER_BALL, Moves.FIERY_DANCE, Moves.HYDRO_STEAM ], - [Species.YANMA]: [ Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.PSYCHIC_NOISE, Moves.AEROBLAST ], - [Species.WOOPER]: [ Moves.BODY_PRESS, Moves.RECOVER, Moves.CURSE, Moves.SURGING_STRIKES ], - [Species.MURKROW]: [ Moves.THIEF, Moves.FLOATY_FALL, Moves.TIDY_UP, Moves.WICKED_BLOW ], - [Species.MISDREAVUS]: [ Moves.TAKE_HEART, Moves.DRAINING_KISS, Moves.AURA_SPHERE, Moves.ASTRAL_BARRAGE ], - [Species.UNOWN]: [ Moves.SECRET_POWER, Moves.COSMIC_POWER, Moves.ANCIENT_POWER, Moves.MYSTICAL_POWER ], + [Species.AIPOM]: [ Moves.TIDY_UP, Moves.STORM_THROW, Moves.FAKE_OUT, Moves.POPULATION_BOMB ], + [Species.SUNKERN]: [ Moves.SPORE, Moves.SAPPY_SEED, Moves.FIERY_DANCE, Moves.HYDRO_STEAM ], + [Species.YANMA]: [ Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.HEAT_WAVE, Moves.AEROBLAST ], + [Species.WOOPER]: [ Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.CURSE, Moves.SURGING_STRIKES ], + [Species.MURKROW]: [ Moves.TRIPLE_ARROWS, Moves.FLOATY_FALL, Moves.TIDY_UP, Moves.WICKED_BLOW ], + [Species.MISDREAVUS]: [ Moves.TAKE_HEART, Moves.MOONBLAST, Moves.AURA_SPHERE, Moves.ASTRAL_BARRAGE ], + [Species.UNOWN]: [ Moves.NATURE_POWER, Moves.COSMIC_POWER, Moves.ANCIENT_POWER, Moves.MYSTICAL_POWER ], [Species.GIRAFARIG]: [ Moves.MYSTICAL_POWER, Moves.NIGHT_DAZE, Moves.RECOVER, Moves.BOOMBURST ], [Species.PINECO]: [ Moves.METAL_BURST, Moves.LUNGE, Moves.BODY_PRESS, Moves.SHORE_UP ], [Species.DUNSPARCE]: [ Moves.BODY_SLAM, Moves.WICKED_TORQUE, Moves.BLAZING_TORQUE, Moves.EXTREME_SPEED ], [Species.GLIGAR]: [ Moves.STONE_AXE, Moves.EARTHQUAKE, Moves.ROOST, Moves.FLOATY_FALL ], [Species.SNUBBULL]: [ Moves.PARTING_SHOT, Moves.EARTHQUAKE, Moves.STUFF_CHEEKS, Moves.MAGICAL_TORQUE ], [Species.QWILFISH]: [ Moves.BARB_BARRAGE, Moves.BANEFUL_BUNKER, Moves.NUZZLE, Moves.FISHIOUS_REND ], - [Species.SHUCKLE]: [ Moves.COSMIC_POWER, Moves.ACCELEROCK, Moves.POWER_SHIFT, Moves.BODY_PRESS ], - [Species.HERACROSS]: [ Moves.ROCK_BLAST, Moves.DRAIN_PUNCH, Moves.BULLET_SEED, Moves.FIRST_IMPRESSION ], + [Species.SHUCKLE]: [ Moves.COSMIC_POWER, Moves.SHORE_UP, Moves.BODY_PRESS, Moves.SALT_CURE ], + [Species.HERACROSS]: [ Moves.ROCK_BLAST, Moves.LUNGE, Moves.ICICLE_SPEAR, Moves.TIDY_UP ], [Species.SNEASEL]: [ Moves.DIRE_CLAW, Moves.KOWTOW_CLEAVE, Moves.TRIPLE_AXEL, Moves.GLACIAL_LANCE ], [Species.TEDDIURSA]: [ Moves.DIRE_CLAW, Moves.FACADE, Moves.BULK_UP, Moves.SLACK_OFF ], [Species.SLUGMA]: [ Moves.BURNING_BULWARK, Moves.POWER_GEM, Moves.MAGMA_STORM, Moves.HYDRO_STEAM ], [Species.SWINUB]: [ Moves.ICE_SPINNER, Moves.HEADLONG_RUSH, Moves.MIGHTY_CLEAVE, Moves.GLACIAL_LANCE ], - [Species.CORSOLA]: [ Moves.SCALD, Moves.FREEZE_DRY, Moves.SPIKY_SHIELD, Moves.STRENGTH_SAP ], + [Species.CORSOLA]: [ Moves.SCALD, Moves.FREEZE_DRY, Moves.STRENGTH_SAP, Moves.SALT_CURE ], [Species.REMORAID]: [ Moves.TWIN_BEAM, Moves.SNIPE_SHOT, Moves.SEARING_SHOT, Moves.ELECTRO_SHOT ], - [Species.DELIBIRD]: [ Moves.GLACIATE, Moves.ROCK_BLAST, Moves.CHILLY_RECEPTION, Moves.BLEAKWIND_STORM ], + [Species.DELIBIRD]: [ Moves.GLACIATE, Moves.FREEZE_DRY, Moves.CHILLY_RECEPTION, Moves.BLEAKWIND_STORM ], [Species.SKARMORY]: [ Moves.ROOST, Moves.BODY_PRESS, Moves.SPIKY_SHIELD, Moves.BEAK_BLAST ], [Species.HOUNDOUR]: [ Moves.SEARING_SHOT, Moves.FIERY_WRATH, Moves.PARTING_SHOT, Moves.HYDRO_STEAM ], - [Species.PHANPY]: [ Moves.SHORE_UP, Moves.HEAD_SMASH, Moves.ICE_SHARD, Moves.VOLT_TACKLE ], + [Species.PHANPY]: [ Moves.SHORE_UP, Moves.HEAD_SMASH, Moves.MOUNTAIN_GALE, Moves.VOLT_TACKLE ], [Species.STANTLER]: [ Moves.HORN_LEECH, Moves.HIGH_JUMP_KICK, Moves.BULK_UP, Moves.HEAD_CHARGE ], [Species.SMEARGLE]: [ Moves.BATON_PASS, Moves.BURNING_BULWARK, Moves.SALT_CURE, Moves.SPORE ], [Species.TYROGUE]: [ Moves.MACH_PUNCH, Moves.WICKED_TORQUE, Moves.METEOR_MASH, Moves.COLLISION_COURSE ], - [Species.SMOOCHUM]: [ Moves.FREEZING_GLARE, Moves.AURA_SPHERE, Moves.FREEZE_DRY, Moves.TAKE_HEART ], - [Species.ELEKID]: [ Moves.DRAIN_PUNCH, Moves.BULK_UP, Moves.ICE_HAMMER, Moves.PLASMA_FISTS ], - [Species.MAGBY]: [ Moves.STORED_POWER, Moves.HYDRO_STEAM, Moves.ARMOR_CANNON, Moves.FLEUR_CANNON ], + [Species.SMOOCHUM]: [ Moves.EXPANDING_FORCE, Moves.AURA_SPHERE, Moves.FREEZY_FROST, Moves.TAKE_HEART ], + [Species.ELEKID]: [ Moves.DRAIN_PUNCH, Moves.TIDY_UP, Moves.ICE_HAMMER, Moves.PLASMA_FISTS ], + [Species.MAGBY]: [ Moves.STORED_POWER, Moves.EARTH_POWER, Moves.ARMOR_CANNON, Moves.FLEUR_CANNON ], [Species.MILTANK]: [ Moves.BODY_PRESS, Moves.BULK_UP, Moves.YAWN, Moves.SIZZLY_SLIDE ], [Species.RAIKOU]: [ Moves.THUNDERCLAP, Moves.NASTY_PLOT, Moves.ICE_BEAM, Moves.PARABOLIC_CHARGE ], [Species.ENTEI]: [ Moves.BURNING_BULWARK, Moves.DRAGON_DANCE, Moves.EARTHQUAKE, Moves.MIGHTY_CLEAVE ], @@ -137,9 +137,9 @@ export const speciesEggMoves = { [Species.SEEDOT]: [ Moves.SWORDS_DANCE, Moves.GRASSY_GLIDE, Moves.KOWTOW_CLEAVE, Moves.IVY_CUDGEL ], [Species.TAILLOW]: [ Moves.BOOMBURST, Moves.FACADE, Moves.DRILL_RUN, Moves.VOLT_TACKLE ], [Species.WINGULL]: [ Moves.THUNDER, Moves.FLIP_TURN, Moves.DEFOG, Moves.STEAM_ERUPTION ], - [Species.RALTS]: [ Moves.VICTORY_DANCE, Moves.CEASELESS_EDGE, Moves.ICE_BEAM, Moves.PHOTON_GEYSER ], + [Species.RALTS]: [ Moves.BOOMBURST, Moves.BITTER_BLADE, Moves.PSYBLADE, Moves.VICTORY_DANCE ], [Species.SURSKIT]: [ Moves.ROOST, Moves.FIERY_DANCE, Moves.STICKY_WEB, Moves.BLEAKWIND_STORM ], - [Species.SHROOMISH]: [ Moves.BONEMERANG, Moves.MORTAL_SPIN, Moves.STORM_THROW, Moves.SAPPY_SEED ], + [Species.SHROOMISH]: [ Moves.ACCELEROCK, Moves.TRAILBLAZE, Moves.STORM_THROW, Moves.SAPPY_SEED ], [Species.SLAKOTH]: [ Moves.FACADE, Moves.JUMP_KICK, Moves.KNOCK_OFF, Moves.SKILL_SWAP ], [Species.NINCADA]: [ Moves.ATTACK_ORDER, Moves.STICKY_WEB, Moves.POLTERGEIST, Moves.SHELL_SMASH ], [Species.WHISMUR]: [ Moves.ALLURING_VOICE, Moves.SLACK_OFF, Moves.SPARKLING_ARIA, Moves.TORCH_SONG ], @@ -148,12 +148,12 @@ export const speciesEggMoves = { [Species.NOSEPASS]: [ Moves.SHORE_UP, Moves.BODY_PRESS, Moves.CALM_MIND, Moves.TACHYON_CUTTER ], [Species.SKITTY]: [ Moves.THUNDEROUS_KICK, Moves.SKETCH, Moves.TIDY_UP, Moves.V_CREATE ], [Species.SABLEYE]: [ Moves.RECOVER, Moves.TOPSY_TURVY, Moves.PARTING_SHOT, Moves.SALT_CURE ], - [Species.MAWILE]: [ Moves.BULLET_PUNCH, Moves.RECOVER, Moves.EARTHQUAKE, Moves.FIRE_LASH ], - [Species.ARON]: [ Moves.HEAD_SMASH, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.DOUBLE_IRON_BASH ], + [Species.MAWILE]: [ Moves.BULLET_PUNCH, Moves.RECOVER, Moves.EARTHQUAKE, Moves.DOUBLE_IRON_BASH ], + [Species.ARON]: [ Moves.HEAD_SMASH, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SALT_CURE ], [Species.MEDITITE]: [ Moves.THUNDEROUS_KICK, Moves.SUCKER_PUNCH, Moves.BULLET_PUNCH, Moves.PHOTON_GEYSER ], [Species.ELECTRIKE]: [ Moves.RISING_VOLTAGE, Moves.FLAMETHROWER, Moves.NASTY_PLOT, Moves.ICE_BEAM ], - [Species.PLUSLE]: [ Moves.FLAMETHROWER, Moves.PARABOLIC_CHARGE, Moves.SPLISHY_SPLASH, Moves.TAIL_GLOW ], - [Species.MINUN]: [ Moves.ICE_BEAM, Moves.PARABOLIC_CHARGE, Moves.SIZZLY_SLIDE, Moves.TAIL_GLOW ], + [Species.PLUSLE]: [ Moves.FLAMETHROWER, Moves.GLITZY_GLOW, Moves.SPLISHY_SPLASH, Moves.TAIL_GLOW ], + [Species.MINUN]: [ Moves.ICE_BEAM, Moves.BADDY_BAD, Moves.SIZZLY_SLIDE, Moves.TAIL_GLOW ], [Species.VOLBEAT]: [ Moves.PARTING_SHOT, Moves.LUNGE, Moves.POWDER, Moves.VICTORY_DANCE ], [Species.ILLUMISE]: [ Moves.PARTING_SHOT, Moves.POLLEN_PUFF, Moves.POWDER, Moves.QUIVER_DANCE ], [Species.GULPIN]: [ Moves.STRENGTH_SAP, Moves.EARTH_POWER, Moves.GROWTH, Moves.MALIGNANT_CHAIN ], @@ -176,10 +176,10 @@ export const speciesEggMoves = { [Species.LILEEP]: [ Moves.METEOR_BEAM, Moves.SCALD, Moves.STEALTH_ROCK, Moves.SAPPY_SEED ], [Species.ANORITH]: [ Moves.LIQUIDATION, Moves.LEECH_LIFE, Moves.DRAGON_DANCE, Moves.MIGHTY_CLEAVE ], [Species.FEEBAS]: [ Moves.CALM_MIND, Moves.FREEZE_DRY, Moves.MOONBLAST, Moves.STEAM_ERUPTION ], - [Species.CASTFORM]: [ Moves.SANDSEAR_STORM, Moves.ERUPTION, Moves.WATER_SPOUT, Moves.GLACIATE ], + [Species.CASTFORM]: [ Moves.BOOMBURST, Moves.HYDRO_STEAM, Moves.CLEAR_SMOG, Moves.QUIVER_DANCE ], [Species.KECLEON]: [ Moves.DRAIN_PUNCH, Moves.DRAGON_DANCE, Moves.EXTREME_SPEED, Moves.MULTI_ATTACK ], [Species.SHUPPET]: [ Moves.DRAIN_PUNCH, Moves.RECOVER, Moves.PARTING_SHOT, Moves.SPECTRAL_THIEF ], - [Species.DUSKULL]: [ Moves.BULK_UP, Moves.BODY_PRESS, Moves.RECOVER, Moves.RAGE_FIST ], + [Species.DUSKULL]: [ Moves.BULK_UP, Moves.DRAIN_PUNCH, Moves.RECOVER, Moves.RAGE_FIST ], [Species.TROPIUS]: [ Moves.STUFF_CHEEKS, Moves.EARTH_POWER, Moves.APPLE_ACID, Moves.SAPPY_SEED ], [Species.ABSOL]: [ Moves.KOWTOW_CLEAVE, Moves.SACRED_SWORD, Moves.DIRE_CLAW, Moves.BITTER_BLADE ], [Species.WYNAUT]: [ Moves.RECOVER, Moves.COSMIC_POWER, Moves.TAUNT, Moves.SHED_TAIL ], @@ -189,95 +189,95 @@ export const speciesEggMoves = { [Species.RELICANTH]: [ Moves.BODY_PRESS, Moves.SHORE_UP, Moves.WAVE_CRASH, Moves.FISHIOUS_REND ], [Species.LUVDISC]: [ Moves.BATON_PASS, Moves.THIEF, Moves.BOUNCY_BUBBLE, Moves.TAKE_HEART ], [Species.BAGON]: [ Moves.IRON_HEAD, Moves.FIRE_LASH, Moves.DRAGON_DANCE, Moves.GLAIVE_RUSH ], - [Species.BELDUM]: [ Moves.PHOTON_GEYSER, Moves.RECOVER, Moves.SHIFT_GEAR, Moves.DOUBLE_IRON_BASH ], + [Species.BELDUM]: [ Moves.PSYCHIC_FANGS, Moves.RECOVER, Moves.MOUNTAIN_GALE, Moves.SHIFT_GEAR ], [Species.REGIROCK]: [ Moves.STONE_AXE, Moves.BODY_PRESS, Moves.RECOVER, Moves.SALT_CURE ], [Species.REGICE]: [ Moves.EARTH_POWER, Moves.COSMIC_POWER, Moves.RECOVER, Moves.FREEZE_DRY ], [Species.REGISTEEL]: [ Moves.BODY_PRESS, Moves.HEAT_CRASH, Moves.RECOVER, Moves.GIGATON_HAMMER ], - [Species.LATIAS]: [ Moves.TAKE_HEART, Moves.SPARKLY_SWIRL, Moves.SCALD, Moves.DRAGON_ENERGY ], - [Species.LATIOS]: [ Moves.NASTY_PLOT, Moves.FIERY_DANCE, Moves.OBLIVION_WING, Moves.DRAGON_ENERGY ], - [Species.KYOGRE]: [ Moves.FREEZE_DRY, Moves.HURRICANE, Moves.THUNDER, Moves.RECOVER ], - [Species.GROUDON]: [ Moves.STONE_AXE, Moves.SOLAR_BLADE, Moves.SHORE_UP, Moves.SACRED_FIRE ], - [Species.RAYQUAZA]: [ Moves.OBLIVION_WING, Moves.DRAGON_DARTS, Moves.THOUSAND_ARROWS, Moves.V_CREATE ], + [Species.LATIAS]: [ Moves.CORE_ENFORCER, Moves.SEARING_SHOT, Moves.DRAGON_ENERGY, Moves.QUIVER_DANCE ], + [Species.LATIOS]: [ Moves.CORE_ENFORCER, Moves.SEARING_SHOT, Moves.DRAGON_ENERGY, Moves.QUIVER_DANCE ], + [Species.KYOGRE]: [ Moves.BOUNCY_BUBBLE, Moves.HURRICANE, Moves.THUNDER, Moves.RECOVER ], + [Species.GROUDON]: [ Moves.STONE_AXE, Moves.SOLAR_BLADE, Moves.MORNING_SUN, Moves.SACRED_FIRE ], + [Species.RAYQUAZA]: [ Moves.OBLIVION_WING, Moves.DRAGON_DARTS, Moves.DRAGON_ENERGY, Moves.V_CREATE ], [Species.JIRACHI]: [ Moves.IRON_HEAD, Moves.FLOATY_FALL, Moves.ROCK_SLIDE, Moves.SHIFT_GEAR ], [Species.DEOXYS]: [ Moves.COLLISION_COURSE, Moves.EARTH_POWER, Moves.PARTING_SHOT, Moves.LUMINA_CRASH ], - [Species.TURTWIG]: [ Moves.SHELL_SMASH, Moves.SHELTER, Moves.BODY_PRESS, Moves.SAPPY_SEED ], + [Species.TURTWIG]: [ Moves.SHELL_SMASH, Moves.MIGHTY_CLEAVE, Moves.ICE_SPINNER, Moves.SAPPY_SEED ], [Species.CHIMCHAR]: [ Moves.SWORDS_DANCE, Moves.THUNDEROUS_KICK, Moves.ICE_PUNCH, Moves.SACRED_FIRE ], - [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.FLASH_CANNON, Moves.ROOST, Moves.STEAM_ERUPTION ], - [Species.STARLY]: [ Moves.SWORDS_DANCE, Moves.EXTREME_SPEED, Moves.FLARE_BLITZ, Moves.HIGH_JUMP_KICK ], - [Species.BIDOOF]: [ Moves.EXTREME_SPEED, Moves.NO_RETREAT, Moves.BODY_PRESS, Moves.SURGING_STRIKES ], + [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.TACHYON_CUTTER, Moves.ROOST, Moves.STEAM_ERUPTION ], + [Species.STARLY]: [ Moves.SWORDS_DANCE, Moves.EXTREME_SPEED, Moves.FLARE_BLITZ, Moves.HEAD_CHARGE ], + [Species.BIDOOF]: [ Moves.EXTREME_SPEED, Moves.STOCKPILE, Moves.POWER_TRIP, Moves.AQUA_STEP ], [Species.KRICKETOT]: [ Moves.BONEMERANG, Moves.ROOST, Moves.ROCK_BLAST, Moves.VICTORY_DANCE ], [Species.SHINX]: [ Moves.FIRE_LASH, Moves.TRIPLE_AXEL, Moves.FACADE, Moves.BOLT_STRIKE ], - [Species.BUDEW]: [ Moves.PARTING_SHOT, Moves.SPIKES, Moves.SPORE, Moves.MALIGNANT_CHAIN ], + [Species.BUDEW]: [ Moves.FIERY_DANCE, Moves.SLUDGE_WAVE, Moves.SPORE, Moves.QUIVER_DANCE ], [Species.CRANIDOS]: [ Moves.STONE_AXE, Moves.ACCELEROCK, Moves.HEADLONG_RUSH, Moves.DRAGON_DANCE ], [Species.SHIELDON]: [ Moves.PAIN_SPLIT, Moves.BODY_PRESS, Moves.KINGS_SHIELD, Moves.DIAMOND_STORM ], - [Species.BURMY]: [ Moves.BODY_PRESS, Moves.TOXIC, Moves.RECOVER, Moves.DEFEND_ORDER ], - [Species.COMBEE]: [ Moves.SPORE, Moves.MYSTICAL_FIRE, Moves.KINGS_SHIELD, Moves.QUIVER_DANCE ], - [Species.PACHIRISU]: [ Moves.BADDY_BAD, Moves.BUZZY_BUZZ, Moves.U_TURN, Moves.SIZZLY_SLIDE ], - [Species.BUIZEL]: [ Moves.JET_PUNCH, Moves.TRIPLE_AXEL, Moves.THUNDER_PUNCH, Moves.SURGING_STRIKES ], - [Species.CHERUBI]: [ Moves.SPORE, Moves.STRENGTH_SAP, Moves.APPLE_ACID, Moves.FIERY_DANCE ], - [Species.SHELLOS]: [ Moves.SHORE_UP, Moves.SPIKES, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ], - [Species.DRIFLOON]: [ Moves.WILL_O_WISP, Moves.SHADOW_BONE, Moves.CALM_MIND, Moves.OBLIVION_WING ], + [Species.BURMY]: [ Moves.BODY_PRESS, Moves.TOXIC, Moves.HEAL_ORDER, Moves.DEFEND_ORDER ], + [Species.COMBEE]: [ Moves.SPORE, Moves.HEAT_WAVE, Moves.KINGS_SHIELD, Moves.QUIVER_DANCE ], + [Species.PACHIRISU]: [ Moves.BADDY_BAD, Moves.SIZZLY_SLIDE, Moves.U_TURN, Moves.ZIPPY_ZAP ], + [Species.BUIZEL]: [ Moves.JET_PUNCH, Moves.TRIPLE_AXEL, Moves.SUPERCELL_SLAM, Moves.SURGING_STRIKES ], + [Species.CHERUBI]: [ Moves.SPORE, Moves.STRENGTH_SAP, Moves.FIERY_DANCE, Moves.FLOWER_TRICK ], + [Species.SHELLOS]: [ Moves.STRENGTH_SAP, Moves.SCORCHING_SANDS, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ], + [Species.DRIFLOON]: [ Moves.WILL_O_WISP, Moves.HEAT_WAVE, Moves.CALM_MIND, Moves.OBLIVION_WING ], [Species.BUNEARY]: [ Moves.TRIPLE_AXEL, Moves.SWORDS_DANCE, Moves.THUNDEROUS_KICK, Moves.MULTI_ATTACK ], - [Species.GLAMEOW]: [ Moves.U_TURN, Moves.STOMPING_TANTRUM, Moves.BULK_UP, Moves.RAGING_BULL ], + [Species.GLAMEOW]: [ Moves.U_TURN, Moves.HIGH_HORSEPOWER, Moves.BULK_UP, Moves.EXTREME_SPEED ], [Species.CHINGLING]: [ Moves.BUZZY_BUZZ, Moves.COSMIC_POWER, Moves.TORCH_SONG, Moves.LUMINA_CRASH ], - [Species.STUNKY]: [ Moves.SPIKES, Moves.KNOCK_OFF, Moves.RECOVER, Moves.DIRE_CLAW ], - [Species.BRONZOR]: [ Moves.RECOVER, Moves.COSMIC_POWER, Moves.SPIKES, Moves.TACHYON_CUTTER ], + [Species.STUNKY]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.RECOVER, Moves.DIRE_CLAW ], + [Species.BRONZOR]: [ Moves.RECOVER, Moves.COSMIC_POWER, Moves.GLARE, Moves.TACHYON_CUTTER ], [Species.BONSLY]: [ Moves.STONE_AXE, Moves.LEAF_BLADE, Moves.STRENGTH_SAP, Moves.HEAD_SMASH ], - [Species.MIME_JR]: [ Moves.CALM_MIND, Moves.MOONBLAST, Moves.WILL_O_WISP, Moves.TWIN_BEAM ], - [Species.HAPPINY]: [ Moves.IRON_DEFENSE, Moves.SEISMIC_TOSS, Moves.STEALTH_ROCK, Moves.SIZZLY_SLIDE ], + [Species.MIME_JR]: [ Moves.CALM_MIND, Moves.MOONBLAST, Moves.WILL_O_WISP, Moves.LUMINA_CRASH ], + [Species.HAPPINY]: [ Moves.COTTON_GUARD, Moves.SEISMIC_TOSS, Moves.SIZZLY_SLIDE, Moves.REVIVAL_BLESSING ], [Species.CHATOT]: [ Moves.SPARKLING_ARIA, Moves.TORCH_SONG, Moves.BATON_PASS, Moves.BOOMBURST ], - [Species.SPIRITOMB]: [ Moves.PARTING_SHOT, Moves.FOUL_PLAY, Moves.RECOVER, Moves.POLTERGEIST ], - [Species.GIBLE]: [ Moves.DRAGON_HAMMER, Moves.LANDS_WRATH, Moves.SHORE_UP, Moves.BITTER_BLADE ], - [Species.MUNCHLAX]: [ Moves.IRON_DEFENSE, Moves.BODY_PRESS, Moves.HEAVY_SLAM, Moves.SLACK_OFF ], + [Species.SPIRITOMB]: [ Moves.PARTING_SHOT, Moves.FOUL_PLAY, Moves.RECOVER, Moves.SPECTRAL_THIEF ], + [Species.GIBLE]: [ Moves.DRAGON_DANCE, Moves.THOUSAND_WAVES, Moves.SHORE_UP, Moves.BITTER_BLADE ], + [Species.MUNCHLAX]: [ Moves.CURSE, Moves.BODY_PRESS, Moves.KNOCK_OFF, Moves.SLACK_OFF ], [Species.RIOLU]: [ Moves.THUNDEROUS_KICK, Moves.BULLET_PUNCH, Moves.TRIPLE_AXEL, Moves.DOUBLE_IRON_BASH ], - [Species.HIPPOPOTAS]: [ Moves.BODY_PRESS, Moves.STONE_AXE, Moves.SALT_CURE, Moves.IRON_DEFENSE ], + [Species.HIPPOPOTAS]: [ Moves.BODY_PRESS, Moves.STONE_AXE, Moves.IRON_DEFENSE, Moves.SALT_CURE ], [Species.SKORUPI]: [ Moves.CEASELESS_EDGE, Moves.DIRE_CLAW, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], [Species.CROAGUNK]: [ Moves.DIRE_CLAW, Moves.ICE_PUNCH, Moves.THUNDEROUS_KICK, Moves.VICTORY_DANCE ], - [Species.CARNIVINE]: [ Moves.SWORDS_DANCE, Moves.FIRE_LASH, Moves.MIGHTY_CLEAVE, Moves.FLOWER_TRICK ], + [Species.CARNIVINE]: [ Moves.STRENGTH_SAP, Moves.FIRE_LASH, Moves.MIGHTY_CLEAVE, Moves.FLOWER_TRICK ], [Species.FINNEON]: [ Moves.QUIVER_DANCE, Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.ORIGIN_PULSE ], [Species.MANTYKE]: [ Moves.BOUNCY_BUBBLE, Moves.SPIKES, Moves.ROOST, Moves.STEAM_ERUPTION ], - [Species.SNOVER]: [ Moves.STOMPING_TANTRUM, Moves.ICE_HAMMER, Moves.AURORA_VEIL, Moves.IVY_CUDGEL ], + [Species.SNOVER]: [ Moves.HIGH_HORSEPOWER, Moves.STRENGTH_SAP, Moves.AURORA_VEIL, Moves.IVY_CUDGEL ], [Species.ROTOM]: [ Moves.RECOVER, Moves.FIERY_DANCE, Moves.SPLISHY_SPLASH, Moves.RISING_VOLTAGE ], [Species.UXIE]: [ Moves.COSMIC_POWER, Moves.BODY_PRESS, Moves.RECOVER, Moves.LUMINA_CRASH ], [Species.MESPRIT]: [ Moves.QUIVER_DANCE, Moves.AURA_SPHERE, Moves.RECOVER, Moves.LUMINA_CRASH ], [Species.AZELF]: [ Moves.PHOTON_GEYSER, Moves.DRAGON_DANCE, Moves.RECOVER, Moves.LUMINA_CRASH ], - [Species.DIALGA]: [ Moves.CORE_ENFORCER, Moves.CALM_MIND, Moves.RECOVER, Moves.MAKE_IT_RAIN ], - [Species.PALKIA]: [ Moves.RECOVER, Moves.FREEZE_DRY, Moves.WATER_SPOUT, Moves.DRAGON_ENERGY ], - [Species.HEATRAN]: [ Moves.TORCH_SONG, Moves.SPIKES, Moves.FLASH_CANNON, Moves.RECOVER ], - [Species.REGIGIGAS]: [ Moves.MIGHTY_CLEAVE, Moves.SHORE_UP, Moves.EXTREME_SPEED, Moves.SKILL_SWAP ], + [Species.DIALGA]: [ Moves.CORE_ENFORCER, Moves.TAKE_HEART, Moves.RECOVER, Moves.MAKE_IT_RAIN ], + [Species.PALKIA]: [ Moves.RECOVER, Moves.TAKE_HEART, Moves.WATER_SPOUT, Moves.DRAGON_ENERGY ], + [Species.HEATRAN]: [ Moves.TORCH_SONG, Moves.RECOVER, Moves.FLASH_CANNON, Moves.MATCHA_GOTCHA ], + [Species.REGIGIGAS]: [ Moves.SKILL_SWAP, Moves.SHORE_UP, Moves.EXTREME_SPEED, Moves.GIGATON_HAMMER ], [Species.GIRATINA]: [ Moves.DRAGON_DANCE, Moves.GLAIVE_RUSH, Moves.RECOVER, Moves.ASTRAL_BARRAGE ], - [Species.CRESSELIA]: [ Moves.COSMIC_POWER, Moves.SECRET_SWORD, Moves.INFERNAL_PARADE, Moves.LUMINA_CRASH ], + [Species.CRESSELIA]: [ Moves.COSMIC_POWER, Moves.SECRET_SWORD, Moves.SIZZLY_SLIDE, Moves.LUMINA_CRASH ], [Species.PHIONE]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.RECOVER, Moves.QUIVER_DANCE ], [Species.MANAPHY]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.RECOVER, Moves.QUIVER_DANCE ], - [Species.DARKRAI]: [ Moves.FIERY_WRATH, Moves.MOONBLAST, Moves.SEARING_SHOT, Moves.MALIGNANT_CHAIN ], + [Species.DARKRAI]: [ Moves.FIERY_WRATH, Moves.MOONBLAST, Moves.SEARING_SHOT, Moves.SPORE ], [Species.SHAYMIN]: [ Moves.SPRINGTIDE_STORM, Moves.HEAT_WAVE, Moves.BLEAKWIND_STORM, Moves.MATCHA_GOTCHA ], - [Species.ARCEUS]: [ Moves.QUIVER_DANCE, Moves.SPIRIT_SHACKLE, Moves.VICTORY_DANCE, Moves.COLLISION_COURSE ], + [Species.ARCEUS]: [ Moves.QUIVER_DANCE, Moves.COLLISION_COURSE, Moves.VICTORY_DANCE, Moves.SPECTRAL_THIEF ], [Species.VICTINI]: [ Moves.RECOVER, Moves.BOLT_STRIKE, Moves.PHOTON_GEYSER, Moves.VICTORY_DANCE ], [Species.SNIVY]: [ Moves.BURNING_JEALOUSY, Moves.SAPPY_SEED, Moves.SUPERPOWER, Moves.FLEUR_CANNON ], [Species.TEPIG]: [ Moves.AXE_KICK, Moves.VOLT_TACKLE, Moves.DRAIN_PUNCH, Moves.VICTORY_DANCE ], [Species.OSHAWOTT]: [ Moves.ICE_SPINNER, Moves.SHELL_SIDE_ARM, Moves.SACRED_SWORD, Moves.SHELL_SMASH ], - [Species.PATRAT]: [ Moves.YAWN, Moves.PSYCHIC_FANGS, Moves.GLARE, Moves.EXTREME_SPEED ], + [Species.PATRAT]: [ Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.GLARE, Moves.TIDY_UP ], [Species.LILLIPUP]: [ Moves.CLOSE_COMBAT, Moves.THIEF, Moves.HIGH_HORSEPOWER, Moves.LAST_RESPECTS ], [Species.PURRLOIN]: [ Moves.ENCORE, Moves.ASSIST, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], [Species.PANSAGE]: [ Moves.SWORDS_DANCE, Moves.TEMPER_FLARE, Moves.EARTHQUAKE, Moves.IVY_CUDGEL ], [Species.PANSEAR]: [ Moves.NASTY_PLOT, Moves.SCALD, Moves.SCORCHING_SANDS, Moves.SEARING_SHOT ], [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.ENERGY_BALL, Moves.AURA_SPHERE, Moves.STEAM_ERUPTION ], - [Species.MUNNA]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.MYSTICAL_POWER ], - [Species.PIDOVE]: [ Moves.NIGHT_SLASH, Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ], + [Species.MUNNA]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.LUMINA_CRASH ], + [Species.PIDOVE]: [ Moves.GUNK_SHOT, Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ], [Species.BLITZLE]: [ Moves.HIGH_HORSEPOWER, Moves.THUNDEROUS_KICK, Moves.FLARE_BLITZ, Moves.VOLT_TACKLE ], [Species.ROGGENROLA]: [ Moves.BODY_PRESS, Moves.CURSE, Moves.SHORE_UP, Moves.DIAMOND_STORM ], - [Species.WOOBAT]: [ Moves.QUIVER_DANCE, Moves.STORED_POWER, Moves.MYSTICAL_FIRE, Moves.OBLIVION_WING ], - [Species.DRILBUR]: [ Moves.IRON_HEAD, Moves.ICE_SPINNER, Moves.SHIFT_GEAR, Moves.BEHEMOTH_BASH ], + [Species.WOOBAT]: [ Moves.TAKE_HEART, Moves.STORED_POWER, Moves.MYSTICAL_FIRE, Moves.OBLIVION_WING ], + [Species.DRILBUR]: [ Moves.IRON_HEAD, Moves.ICE_SPINNER, Moves.SHIFT_GEAR, Moves.HEADLONG_RUSH ], [Species.AUDINO]: [ Moves.FOLLOW_ME, Moves.MOONBLAST, Moves.WISH, Moves.LUNAR_BLESSING ], [Species.TIMBURR]: [ Moves.MACH_PUNCH, Moves.DRAIN_PUNCH, Moves.ICE_HAMMER, Moves.DOUBLE_IRON_BASH ], [Species.TYMPOLE]: [ Moves.LIQUIDATION, Moves.HIGH_HORSEPOWER, Moves.TOXIC, Moves.SHORE_UP ], [Species.THROH]: [ Moves.DRAIN_PUNCH, Moves.SLACK_OFF, Moves.METEOR_MASH, Moves.NO_RETREAT ], [Species.SAWK]: [ Moves.DRAIN_PUNCH, Moves.MACH_PUNCH, Moves.ENDEAVOR, Moves.VICTORY_DANCE ], [Species.SEWADDLE]: [ Moves.STONE_AXE, Moves.PSYCHO_CUT, Moves.TIDY_UP, Moves.BITTER_BLADE ], - [Species.VENIPEDE]: [ Moves.SWORDS_DANCE, Moves.BATON_PASS, Moves.NOXIOUS_TORQUE, Moves.EARTHQUAKE ], + [Species.VENIPEDE]: [ Moves.SWORDS_DANCE, Moves.BATON_PASS, Moves.NOXIOUS_TORQUE, Moves.BLAZING_TORQUE ], [Species.COTTONEE]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.SLEEP_POWDER, Moves.SEED_FLARE ], [Species.PETILIL]: [ Moves.THUNDEROUS_KICK, Moves.BATON_PASS, Moves.AQUA_STEP, Moves.FIERY_DANCE ], - [Species.BASCULIN]: [ Moves.LAST_RESPECTS, Moves.CLOSE_COMBAT, Moves.DRAGON_DANCE, Moves.FISHIOUS_REND ], + [Species.BASCULIN]: [ Moves.LAST_RESPECTS, Moves.CLOSE_COMBAT, Moves.TRIPLE_DIVE, Moves.DRAGON_DANCE ], [Species.SANDILE]: [ Moves.DIRE_CLAW, Moves.PARTING_SHOT, Moves.FIRE_LASH, Moves.PRECIPICE_BLADES ], [Species.DARUMAKA]: [ Moves.DRAIN_PUNCH, Moves.THUNDER_PUNCH, Moves.BLAZING_TORQUE, Moves.V_CREATE ], [Species.MARACTUS]: [ Moves.SCORCHING_SANDS, Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.SEED_FLARE ], @@ -285,35 +285,35 @@ export const speciesEggMoves = { [Species.SCRAGGY]: [ Moves.SUCKER_PUNCH, Moves.TRIPLE_AXEL, Moves.DRAGON_DANCE, Moves.COLLISION_COURSE ], [Species.SIGILYPH]: [ Moves.STORED_POWER, Moves.TAKE_HEART, Moves.FREEZING_GLARE, Moves.OBLIVION_WING ], [Species.YAMASK]: [ Moves.RECOVER, Moves.INFERNAL_PARADE, Moves.AURA_SPHERE, Moves.TOPSY_TURVY ], - [Species.TIRTOUGA]: [ Moves.ICE_SPINNER, Moves.ACCELEROCK, Moves.SHORE_UP, Moves.WAVE_CRASH ], - [Species.ARCHEN]: [ Moves.ROOST, Moves.ACCELEROCK, Moves.FLOATY_FALL, Moves.MIGHTY_CLEAVE ], + [Species.TIRTOUGA]: [ Moves.ICE_SPINNER, Moves.WAVE_CRASH, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE ], + [Species.ARCHEN]: [ Moves.ROOST, Moves.MIGHTY_CLEAVE, Moves.FLOATY_FALL, Moves.SKILL_SWAP ], [Species.TRUBBISH]: [ Moves.TIDY_UP, Moves.RECOVER, Moves.DIRE_CLAW, Moves.GIGATON_HAMMER ], - [Species.ZORUA]: [ Moves.BADDY_BAD, Moves.PSYCHIC, Moves.AURA_SPHERE, Moves.WICKED_BLOW ], - [Species.MINCCINO]: [ Moves.ICICLE_SPEAR, Moves.TIDY_UP, Moves.BONE_RUSH, Moves.POPULATION_BOMB ], + [Species.ZORUA]: [ Moves.FLAMETHROWER, Moves.PSYCHIC, Moves.AURA_SPHERE, Moves.BADDY_BAD ], + [Species.MINCCINO]: [ Moves.ICICLE_SPEAR, Moves.TIDY_UP, Moves.KNOCK_OFF, Moves.POPULATION_BOMB ], [Species.GOTHITA]: [ Moves.MILK_DRINK, Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.PSYSTRIKE ], [Species.SOLOSIS]: [ Moves.COSMIC_POWER, Moves.MOONBLAST, Moves.AURA_SPHERE, Moves.PSYSTRIKE ], [Species.DUCKLETT]: [ Moves.QUIVER_DANCE, Moves.EARTH_POWER, Moves.FREEZE_DRY, Moves.OBLIVION_WING ], - [Species.VANILLITE]: [ Moves.EARTH_POWER, Moves.AURORA_VEIL, Moves.LOCK_ON, Moves.MILK_DRINK ], - [Species.DEERLING]: [ Moves.TIDY_UP, Moves.HEADBUTT, Moves.BODY_SLAM, Moves.FLOWER_TRICK ], + [Species.VANILLITE]: [ Moves.EARTH_POWER, Moves.AURORA_VEIL, Moves.DECORATE, Moves.MILK_DRINK ], + [Species.DEERLING]: [ Moves.TIDY_UP, Moves.FLOWER_TRICK, Moves.BODY_SLAM, Moves.COMBAT_TORQUE ], [Species.EMOLGA]: [ Moves.ROOST, Moves.HEAT_WAVE, Moves.TAILWIND, Moves.ZING_ZAP ], [Species.KARRABLAST]: [ Moves.TRICK_ROOM, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE, Moves.BITTER_BLADE ], - [Species.FOONGUS]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.FOUL_PLAY, Moves.STRENGTH_SAP ], + [Species.FOONGUS]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.FOUL_PLAY, Moves.SAPPY_SEED ], [Species.FRILLISH]: [ Moves.STRENGTH_SAP, Moves.INFERNAL_PARADE, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ], [Species.ALOMOMOLA]: [ Moves.FLIP_TURN, Moves.HEART_SWAP, Moves.TOXIC, Moves.GLITZY_GLOW ], [Species.JOLTIK]: [ Moves.THUNDER, Moves.PARABOLIC_CHARGE, Moves.EARTH_POWER, Moves.QUIVER_DANCE ], [Species.FERROSEED]: [ Moves.STRENGTH_SAP, Moves.BODY_PRESS, Moves.SPIKY_SHIELD, Moves.SAPPY_SEED ], [Species.KLINK]: [ Moves.FLARE_BLITZ, Moves.HIGH_HORSEPOWER, Moves.FUSION_BOLT, Moves.DOUBLE_IRON_BASH ], - [Species.TYNAMO]: [ Moves.LIQUIDATION, Moves.RECOVER, Moves.PARTING_SHOT, Moves.BOLT_BEAK ], - [Species.ELGYEM]: [ Moves.MYSTICAL_POWER, Moves.TRICK_ROOM, Moves.STORED_POWER, Moves.PSYSTRIKE ], + [Species.TYNAMO]: [ Moves.SCALD, Moves.RECOVER, Moves.FIRE_LASH, Moves.PLASMA_FISTS ], + [Species.ELGYEM]: [ Moves.MYSTICAL_POWER, Moves.TRICK_ROOM, Moves.STORED_POWER, Moves.LUMINA_CRASH ], [Species.LITWICK]: [ Moves.FIERY_DANCE, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.ASTRAL_BARRAGE ], [Species.AXEW]: [ Moves.STONE_AXE, Moves.DIRE_CLAW, Moves.FIRE_LASH, Moves.GLAIVE_RUSH ], - [Species.CUBCHOO]: [ Moves.MOUNTAIN_GALE, Moves.WOOD_HAMMER, Moves.SWORDS_DANCE, Moves.WAVE_CRASH ], - [Species.CRYOGONAL]: [ Moves.SURF, Moves.EARTH_POWER, Moves.NASTY_PLOT, Moves.FREEZY_FROST ], + [Species.CUBCHOO]: [ Moves.TRIPLE_AXEL, Moves.LIQUIDATION, Moves.SWORDS_DANCE, Moves.COLLISION_COURSE ], + [Species.CRYOGONAL]: [ Moves.SURF, Moves.FREEZY_FROST, Moves.NASTY_PLOT, Moves.AURORA_VEIL ], [Species.SHELMET]: [ Moves.SHED_TAIL, Moves.NASTY_PLOT, Moves.BATON_PASS, Moves.HEAT_WAVE ], [Species.STUNFISK]: [ Moves.SHORE_UP, Moves.BANEFUL_BUNKER, Moves.THUNDER_CAGE, Moves.THUNDERCLAP ], - [Species.MIENFOO]: [ Moves.GUNK_SHOT, Moves.TRIPLE_AXEL, Moves.SUPERCELL_SLAM, Moves.TIDY_UP ], - [Species.DRUDDIGON]: [ Moves.SPIKY_SHIELD, Moves.ROOST, Moves.DRAGON_HAMMER, Moves.FIRE_LASH ], - [Species.GOLETT]: [ Moves.BULK_UP, Moves.BULLET_PUNCH, Moves.HEADLONG_RUSH, Moves.RAGE_FIST ], + [Species.MIENFOO]: [ Moves.GUNK_SHOT, Moves.SUPERCELL_SLAM, Moves.KNOCK_OFF, Moves.MOUNTAIN_GALE ], + [Species.DRUDDIGON]: [ Moves.GLARE, Moves.ROOST, Moves.DRAGON_HAMMER, Moves.FIRE_LASH ], + [Species.GOLETT]: [ Moves.BULK_UP, Moves.RECOVER, Moves.HEADLONG_RUSH, Moves.RAGE_FIST ], [Species.PAWNIARD]: [ Moves.SUCKER_PUNCH, Moves.CEASELESS_EDGE, Moves.BITTER_BLADE, Moves.LAST_RESPECTS ], [Species.BOUFFALANT]: [ Moves.SLACK_OFF, Moves.JUMP_KICK, Moves.HEAD_SMASH, Moves.FLARE_BLITZ ], [Species.RUFFLET]: [ Moves.FLOATY_FALL, Moves.MOONBLAST, Moves.HEAT_WAVE, Moves.BOLT_BEAK ], @@ -321,32 +321,32 @@ export const speciesEggMoves = { [Species.HEATMOR]: [ Moves.EARTH_POWER, Moves.OVERHEAT, Moves.FLASH_CANNON, Moves.V_CREATE ], [Species.DURANT]: [ Moves.HIGH_HORSEPOWER, Moves.FIRST_IMPRESSION, Moves.SWORDS_DANCE, Moves.BEHEMOTH_BASH ], [Species.DEINO]: [ Moves.FIERY_WRATH, Moves.ESPER_WING, Moves.SLUDGE_WAVE, Moves.FICKLE_BEAM ], - [Species.LARVESTA]: [ Moves.THUNDERBOLT, Moves.ERUPTION, Moves.EARTH_POWER, Moves.TORCH_SONG ], - [Species.COBALION]: [ Moves.TACHYON_CUTTER, Moves.BODY_PRESS, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ], + [Species.LARVESTA]: [ Moves.THUNDERBOLT, Moves.MATCHA_GOTCHA, Moves.EARTH_POWER, Moves.TORCH_SONG ], + [Species.COBALION]: [ Moves.BEHEMOTH_BLADE, Moves.BODY_PRESS, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ], [Species.TERRAKION]: [ Moves.MIGHTY_CLEAVE, Moves.HEADLONG_RUSH, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ], [Species.VIRIZION]: [ Moves.PSYBLADE, Moves.SAPPY_SEED, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ], - [Species.TORNADUS]: [ Moves.EARTH_POWER, Moves.U_TURN, Moves.ICE_BEAM, Moves.AEROBLAST ], - [Species.THUNDURUS]: [ Moves.EARTH_POWER, Moves.AEROBLAST, Moves.THUNDERCLAP, Moves.ELECTRO_SHOT ], - [Species.RESHIRAM]: [ Moves.FUSION_BOLT, Moves.CALM_MIND, Moves.SOLAR_BEAM, Moves.DRAGON_ENERGY ], - [Species.ZEKROM]: [ Moves.FUSION_FLARE, Moves.THUNDEROUS_KICK, Moves.DRAGON_HAMMER, Moves.BOLT_BEAK ], - [Species.LANDORUS]: [ Moves.STONE_AXE, Moves.HIGH_HORSEPOWER, Moves.ROOST, Moves.FLOATY_FALL ], - [Species.KYUREM]: [ Moves.ICICLE_CRASH, Moves.DRAGON_ENERGY, Moves.PHOTON_GEYSER, Moves.GLACIAL_LANCE ], - [Species.KELDEO]: [ Moves.TACHYON_CUTTER, Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.STEAM_ERUPTION ], - [Species.MELOETTA]: [ Moves.THUNDEROUS_KICK, Moves.QUIVER_DANCE, Moves.VICTORY_DANCE, Moves.BOOMBURST ], - [Species.GENESECT]: [ Moves.AURA_SPHERE, Moves.U_TURN, Moves.SHIFT_GEAR, Moves.TAIL_GLOW ], + [Species.TORNADUS]: [ Moves.EARTH_POWER, Moves.U_TURN, Moves.ICE_BEAM, Moves.OBLIVION_WING ], + [Species.THUNDURUS]: [ Moves.EARTH_POWER, Moves.HURRICANE, Moves.THUNDERCLAP, Moves.ELECTRO_SHOT ], + [Species.RESHIRAM]: [ Moves.ROOST, Moves.TAKE_HEART, Moves.ERUPTION, Moves.DRAGON_ENERGY ], + [Species.ZEKROM]: [ Moves.ROOST, Moves.THUNDEROUS_KICK, Moves.DRAGON_HAMMER, Moves.BOLT_BEAK ], + [Species.LANDORUS]: [ Moves.STONE_AXE, Moves.THOUSAND_ARROWS, Moves.ROOST, Moves.FLOATY_FALL ], + [Species.KYUREM]: [ Moves.ICICLE_CRASH, Moves.DRAGON_ENERGY, Moves.NASTY_PLOT, Moves.GLACIAL_LANCE ], + [Species.KELDEO]: [ Moves.BOUNCY_BUBBLE, Moves.THUNDERBOLT, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ], + [Species.MELOETTA]: [ Moves.TORCH_SONG, Moves.QUIVER_DANCE, Moves.THUNDEROUS_KICK, Moves.BOOMBURST ], + [Species.GENESECT]: [ Moves.EXTREME_SPEED, Moves.U_TURN, Moves.SHIFT_GEAR, Moves.TAIL_GLOW ], [Species.CHESPIN]: [ Moves.DRAIN_PUNCH, Moves.SYNTHESIS, Moves.CEASELESS_EDGE, Moves.SAPPY_SEED ], [Species.FENNEKIN]: [ Moves.BITTER_MALICE, Moves.MOONBLAST, Moves.THUNDERBOLT, Moves.TORCH_SONG ], [Species.FROAKIE]: [ Moves.MOONBLAST, Moves.EARTH_POWER, Moves.TRIPLE_AXEL, Moves.SURGING_STRIKES ], - [Species.BUNNELBY]: [ Moves.DRAIN_PUNCH, Moves.RECYCLE, Moves.RETURN, Moves.EXTREME_SPEED ], + [Species.BUNNELBY]: [ Moves.DRAIN_PUNCH, Moves.TIDY_UP, Moves.FACADE, Moves.EXTREME_SPEED ], [Species.FLETCHLING]: [ Moves.DRILL_RUN, Moves.U_TURN, Moves.SUPERCELL_SLAM, Moves.TIDY_UP ], - [Species.SCATTERBUG]: [ Moves.MOONBLAST, Moves.POLLEN_PUFF, Moves.TAILWIND, Moves.FOCUS_BLAST ], + [Species.SCATTERBUG]: [ Moves.MOONBLAST, Moves.POLLEN_PUFF, Moves.TAILWIND, Moves.HEAT_WAVE ], [Species.LITLEO]: [ Moves.EARTH_POWER, Moves.NASTY_PLOT, Moves.YAWN, Moves.TORCH_SONG ], [Species.FLABEBE]: [ Moves.GLITZY_GLOW, Moves.MYSTICAL_FIRE, Moves.FLORAL_HEALING, Moves.TAKE_HEART ], [Species.SKIDDO]: [ Moves.HIGH_HORSEPOWER, Moves.GRASSY_GLIDE, Moves.STONE_AXE, Moves.SAPPY_SEED ], [Species.PANCHAM]: [ Moves.DRAIN_PUNCH, Moves.FAKE_OUT, Moves.BULLET_PUNCH, Moves.WICKED_BLOW ], [Species.FURFROU]: [ Moves.TIDY_UP, Moves.CRUNCH, Moves.COVET, Moves.MULTI_ATTACK ], [Species.ESPURR]: [ Moves.GLARE, Moves.MOONBLAST, Moves.FLAMETHROWER, Moves.PSYSTRIKE ], - [Species.HONEDGE]: [ Moves.TACHYON_CUTTER, Moves.POLTERGEIST, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ], + [Species.HONEDGE]: [ Moves.TACHYON_CUTTER, Moves.POLTERGEIST, Moves.BITTER_BLADE, Moves.PAIN_SPLIT ], [Species.SPRITZEE]: [ Moves.TRICK_ROOM, Moves.FOUL_PLAY, Moves.WISH, Moves.REVIVAL_BLESSING ], [Species.SWIRLIX]: [ Moves.BELLY_DRUM, Moves.SUCKER_PUNCH, Moves.SPIRIT_BREAK, Moves.SIZZLY_SLIDE ], [Species.INKAY]: [ Moves.POWER_TRIP, Moves.STORED_POWER, Moves.RECOVER, Moves.PSYCHO_BOOST ], @@ -364,57 +364,57 @@ export const speciesEggMoves = { [Species.PHANTUMP]: [ Moves.POLTERGEIST, Moves.TRICK_ROOM, Moves.SYNTHESIS, Moves.SAPPY_SEED ], [Species.PUMPKABOO]: [ Moves.POLTERGEIST, Moves.FIRE_LASH, Moves.DIRE_CLAW, Moves.SAPPY_SEED ], [Species.BERGMITE]: [ Moves.STONE_AXE, Moves.METAL_BURST, Moves.BODY_PRESS, Moves.GLACIAL_LANCE ], - [Species.NOIBAT]: [ Moves.AEROBLAST, Moves.PSYCHIC_NOISE, Moves.NASTY_PLOT, Moves.CLANGING_SCALES ], + [Species.NOIBAT]: [ Moves.AEROBLAST, Moves.OVERDRIVE, Moves.NASTY_PLOT, Moves.CLANGING_SCALES ], [Species.XERNEAS]: [ Moves.LIGHT_OF_RUIN, Moves.LUMINA_CRASH, Moves.STRENGTH_SAP, Moves.REVIVAL_BLESSING ], - [Species.YVELTAL]: [ Moves.NASTY_PLOT, Moves.FLOATY_FALL, Moves.IRON_HEAD, Moves.WICKED_BLOW ], - [Species.ZYGARDE]: [ Moves.DRAGON_HAMMER, Moves.SHORE_UP, Moves.HEAT_CRASH, Moves.POPULATION_BOMB ], + [Species.YVELTAL]: [ Moves.IRON_HEAD, Moves.FLOATY_FALL, Moves.NASTY_PLOT, Moves.WICKED_BLOW ], + [Species.ZYGARDE]: [ Moves.DRAGON_DARTS, Moves.SHORE_UP, Moves.VICTORY_DANCE, Moves.DOUBLE_IRON_BASH ], [Species.DIANCIE]: [ Moves.MAGICAL_TORQUE, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.GEOMANCY ], [Species.HOOPA]: [ Moves.PHOTON_GEYSER, Moves.EARTH_POWER, Moves.BATON_PASS, Moves.TIDY_UP ], [Species.VOLCANION]: [ Moves.HYDRO_STEAM, Moves.CALM_MIND, Moves.ENERGY_BALL, Moves.SEARING_SHOT ], [Species.ROWLET]: [ Moves.SNIPE_SHOT, Moves.POLTERGEIST, Moves.FIRST_IMPRESSION, Moves.VICTORY_DANCE ], - [Species.LITTEN]: [ Moves.FAKE_OUT, Moves.PARTING_SHOT, Moves.SUCKER_PUNCH, Moves.SACRED_FIRE ], + [Species.LITTEN]: [ Moves.FAKE_OUT, Moves.PARTING_SHOT, Moves.MORNING_SUN, Moves.SACRED_FIRE ], [Species.POPPLIO]: [ Moves.PSYCHIC_NOISE, Moves.BOUNCY_BUBBLE, Moves.ALLURING_VOICE, Moves.TORCH_SONG ], - [Species.PIKIPEK]: [ Moves.FLOATY_FALL, Moves.BONE_RUSH, Moves.KNOCK_OFF, Moves.BURNING_BULWARK ], - [Species.YUNGOOS]: [ Moves.EXTREME_SPEED, Moves.PURSUIT, Moves.TIDY_UP, Moves.MULTI_ATTACK ], - [Species.GRUBBIN]: [ Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.QUIVER_DANCE, Moves.THUNDERCLAP ], + [Species.PIKIPEK]: [ Moves.FLOATY_FALL, Moves.BONE_RUSH, Moves.BURNING_BULWARK, Moves.TIDY_UP ], + [Species.YUNGOOS]: [ Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.TIDY_UP, Moves.HEAD_CHARGE ], + [Species.GRUBBIN]: [ Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.THUNDERCLAP, Moves.QUIVER_DANCE ], [Species.CRABRAWLER]: [ Moves.CURSE, Moves.SHORE_UP, Moves.SUCKER_PUNCH, Moves.SURGING_STRIKES ], - [Species.ORICORIO]: [ Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.PETAL_DANCE, Moves.LUNAR_DANCE ], - [Species.CUTIEFLY]: [ Moves.SILK_TRAP, Moves.DECORATE, Moves.PARTING_SHOT, Moves.FLORAL_HEALING ], - [Species.ROCKRUFF]: [ Moves.KNOCK_OFF, Moves.TIDY_UP, Moves.ICE_SPINNER, Moves.MIGHTY_CLEAVE ], - [Species.WISHIWASHI]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.SWORDS_DANCE, Moves.POPULATION_BOMB ], + [Species.ORICORIO]: [ Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.THUNDERCLAP, Moves.OBLIVION_WING ], + [Species.CUTIEFLY]: [ Moves.STICKY_WEB, Moves.MOONBLAST, Moves.HEAT_WAVE, Moves.SPORE ], + [Species.ROCKRUFF]: [ Moves.DRILL_RUN, Moves.TIDY_UP, Moves.ICE_SPINNER, Moves.MIGHTY_CLEAVE ], + [Species.WISHIWASHI]: [ Moves.LIQUIDATION, Moves.ICE_SPINNER, Moves.DRAGON_DANCE, Moves.HEAL_ORDER ], [Species.MAREANIE]: [ Moves.SPIKES, Moves.SIZZLY_SLIDE, Moves.MORTAL_SPIN, Moves.LEECH_SEED ], - [Species.MUDBRAY]: [ Moves.BODY_PRESS, Moves.YAWN, Moves.SHORE_UP, Moves.LANDS_WRATH ], - [Species.DEWPIDER]: [ Moves.AQUA_JET, Moves.SILK_TRAP, Moves.ROCK_SLIDE, Moves.AQUA_STEP ], - [Species.FOMANTIS]: [ Moves.SUPERPOWER, Moves.STONE_AXE, Moves.PSYCHO_CUT, Moves.BITTER_BLADE ], + [Species.MUDBRAY]: [ Moves.BODY_PRESS, Moves.YAWN, Moves.SHORE_UP, Moves.THOUSAND_WAVES ], + [Species.DEWPIDER]: [ Moves.AQUA_JET, Moves.SILK_TRAP, Moves.SWORDS_DANCE, Moves.AQUA_STEP ], + [Species.FOMANTIS]: [ Moves.SUPERPOWER, Moves.HEADLONG_RUSH, Moves.ICE_HAMMER, Moves.BITTER_BLADE ], [Species.MORELULL]: [ Moves.CALM_MIND, Moves.LEECH_SEED, Moves.STRENGTH_SAP, Moves.SPARKLY_SWIRL ], [Species.SALANDIT]: [ Moves.FAKE_OUT, Moves.FIERY_DANCE, Moves.SCALD, Moves.MALIGNANT_CHAIN ], - [Species.STUFFUL]: [ Moves.DRAIN_PUNCH, Moves.THUNDER_PUNCH, Moves.ICE_PUNCH, Moves.RAGE_FIST ], + [Species.STUFFUL]: [ Moves.DRAIN_PUNCH, Moves.METEOR_MASH, Moves.ICE_HAMMER, Moves.RAGE_FIST ], [Species.BOUNSWEET]: [ Moves.TRIPLE_AXEL, Moves.AQUA_STEP, Moves.THUNDEROUS_KICK, Moves.SAPPY_SEED ], [Species.COMFEY]: [ Moves.BUZZY_BUZZ, Moves.POLLEN_PUFF, Moves.STRENGTH_SAP, Moves.MATCHA_GOTCHA ], [Species.ORANGURU]: [ Moves.FOUL_PLAY, Moves.YAWN, Moves.FOLLOW_ME, Moves.LUNAR_BLESSING ], - [Species.PASSIMIAN]: [ Moves.FAKE_OUT, Moves.SUCKER_PUNCH, Moves.SPIKES, Moves.SWORDS_DANCE ], + [Species.PASSIMIAN]: [ Moves.FAKE_OUT, Moves.SUCKER_PUNCH, Moves.SWORDS_DANCE, Moves.PYRO_BALL ], [Species.WIMPOD]: [ Moves.ICE_SPINNER, Moves.OBSTRUCT, Moves.KNOCK_OFF, Moves.SURGING_STRIKES ], [Species.SANDYGAST]: [ Moves.SCORCHING_SANDS, Moves.PARTING_SHOT, Moves.CURSE, Moves.SALT_CURE ], [Species.PYUKUMUKU]: [ Moves.MIRROR_COAT, Moves.BANEFUL_BUNKER, Moves.TOXIC_SPIKES, Moves.SALT_CURE ], [Species.TYPE_NULL]: [ Moves.DIRE_CLAW, Moves.RECOVER, Moves.EXTREME_SPEED, Moves.NO_RETREAT ], - [Species.MINIOR]: [ Moves.EARTH_POWER, Moves.FLOATY_FALL, Moves.SUPERCELL_SLAM, Moves.DIAMOND_STORM ], - [Species.KOMALA]: [ Moves.SLACK_OFF, Moves.EXTREME_SPEED, Moves.DARKEST_LARIAT, Moves.CLOSE_COMBAT ], + [Species.MINIOR]: [ Moves.EARTH_POWER, Moves.FLOATY_FALL, Moves.ZING_ZAP, Moves.DIAMOND_STORM ], + [Species.KOMALA]: [ Moves.SLACK_OFF, Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.CLOSE_COMBAT ], [Species.TURTONATOR]: [ Moves.SHELL_SMASH, Moves.ARMOR_CANNON, Moves.EARTH_POWER, Moves.CLANGING_SCALES ], - [Species.TOGEDEMARU]: [ Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.SPIKES, Moves.DOUBLE_IRON_BASH ], + [Species.TOGEDEMARU]: [ Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.METEOR_MASH, Moves.BEHEMOTH_BASH ], [Species.MIMIKYU]: [ Moves.SPIRIT_BREAK, Moves.NUZZLE, Moves.PARTING_SHOT, Moves.SPECTRAL_THIEF ], - [Species.BRUXISH]: [ Moves.SUPER_FANG, Moves.JAW_LOCK, Moves.PAIN_SPLIT, Moves.FISHIOUS_REND ], - [Species.DRAMPA]: [ Moves.YAWN, Moves.FLAMETHROWER, Moves.CLANGING_SCALES, Moves.CLANGOROUS_SOUL ], - [Species.DHELMISE]: [ Moves.POLTERGEIST, Moves.SHIFT_GEAR, Moves.LEAF_BLADE, Moves.DOUBLE_IRON_BASH ], + [Species.BRUXISH]: [ Moves.ICE_FANG, Moves.FIRE_FANG, Moves.FLIP_TURN, Moves.FILLET_AWAY ], + [Species.DRAMPA]: [ Moves.SLACK_OFF, Moves.FLAMETHROWER, Moves.CLANGING_SCALES, Moves.CLANGOROUS_SOUL ], + [Species.DHELMISE]: [ Moves.POLTERGEIST, Moves.STRENGTH_SAP, Moves.LEAF_BLADE, Moves.DOUBLE_IRON_BASH ], [Species.JANGMO_O]: [ Moves.ICE_BEAM, Moves.RECOVER, Moves.SECRET_SWORD, Moves.GLAIVE_RUSH ], - [Species.TAPU_KOKO]: [ Moves.PLAY_ROUGH, Moves.ICE_SPINNER, Moves.RISING_VOLTAGE, Moves.BOLT_BEAK ], + [Species.TAPU_KOKO]: [ Moves.PLAY_ROUGH, Moves.MOUNTAIN_GALE, Moves.RISING_VOLTAGE, Moves.BOLT_BEAK ], [Species.TAPU_LELE]: [ Moves.MOONLIGHT, Moves.NASTY_PLOT, Moves.HEAT_WAVE, Moves.EXPANDING_FORCE ], - [Species.TAPU_BULU]: [ Moves.JUNGLE_HEALING, Moves.CLOSE_COMBAT, Moves.PLAY_ROUGH, Moves.GRASSY_GLIDE ], + [Species.TAPU_BULU]: [ Moves.GRASSY_GLIDE, Moves.CLOSE_COMBAT, Moves.PLAY_ROUGH, Moves.VICTORY_DANCE ], [Species.TAPU_FINI]: [ Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.RECOVER, Moves.QUIVER_DANCE ], [Species.COSMOG]: [ Moves.VICTORY_DANCE, Moves.QUIVER_DANCE, Moves.STORED_POWER, Moves.PHOTON_GEYSER ], [Species.NIHILEGO]: [ Moves.RECOVER, Moves.QUIVER_DANCE, Moves.GIGA_DRAIN, Moves.MALIGNANT_CHAIN ], [Species.BUZZWOLE]: [ Moves.LEECH_LIFE, Moves.BULLET_PUNCH, Moves.DARKEST_LARIAT, Moves.COLLISION_COURSE ], [Species.PHEROMOSA]: [ Moves.AURA_SPHERE, Moves.MAKE_IT_RAIN, Moves.ATTACK_ORDER, Moves.COLLISION_COURSE ], - [Species.XURKITREE]: [ Moves.OVERHEAT, Moves.GIGA_DRAIN, Moves.THUNDERCLAP, Moves.TAIL_GLOW ], + [Species.XURKITREE]: [ Moves.OVERHEAT, Moves.GIGA_DRAIN, Moves.TAIL_GLOW, Moves.THUNDERCLAP ], [Species.CELESTEELA]: [ Moves.ROOST, Moves.BUZZY_BUZZ, Moves.SPIKES, Moves.OBLIVION_WING ], [Species.KARTANA]: [ Moves.MIGHTY_CLEAVE, Moves.CEASELESS_EDGE, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ], [Species.GUZZLORD]: [ Moves.DIRE_CLAW, Moves.GLAIVE_RUSH, Moves.SLACK_OFF, Moves.BADDY_BAD ], @@ -422,144 +422,144 @@ export const speciesEggMoves = { [Species.MAGEARNA]: [ Moves.RECOVER, Moves.EARTH_POWER, Moves.COSMIC_POWER, Moves.MAKE_IT_RAIN ], [Species.MARSHADOW]: [ Moves.POWER_UP_PUNCH, Moves.TRIPLE_AXEL, Moves.STORM_THROW, Moves.DOUBLE_IRON_BASH ], [Species.POIPOLE]: [ Moves.SLUDGE_BOMB, Moves.BUG_BUZZ, Moves.SEARING_SHOT, Moves.DRAGON_ENERGY ], - [Species.STAKATAKA]: [ Moves.SALT_CURE, Moves.SHORE_UP, Moves.CURSE, Moves.DOUBLE_IRON_BASH ], + [Species.STAKATAKA]: [ Moves.HEAVY_SLAM, Moves.SHORE_UP, Moves.CURSE, Moves.SALT_CURE ], [Species.BLACEPHALON]: [ Moves.NASTY_PLOT, Moves.SEARING_SHOT, Moves.GIGA_DRAIN, Moves.ASTRAL_BARRAGE ], [Species.ZERAORA]: [ Moves.SWORDS_DANCE, Moves.TRIPLE_AXEL, Moves.BOLT_STRIKE, Moves.PYRO_BALL ], [Species.MELTAN]: [ Moves.BULLET_PUNCH, Moves.DRAIN_PUNCH, Moves.BULK_UP, Moves.RECOVER ], - [Species.GROOKEY]: [ Moves.HEADLONG_RUSH, Moves.CLOSE_COMBAT, Moves.GRASSY_GLIDE, Moves.BELLY_DRUM ], - [Species.SCORBUNNY]: [ Moves.HIGH_JUMP_KICK, Moves.SUPERCELL_SLAM, Moves.TRIPLE_AXEL, Moves.AQUA_STEP ], + [Species.GROOKEY]: [ Moves.HEADLONG_RUSH, Moves.CLOSE_COMBAT, Moves.GRASSY_GLIDE, Moves.CLANGOROUS_SOUL ], + [Species.SCORBUNNY]: [ Moves.EXTREME_SPEED, Moves.TROP_KICK, Moves.TRIPLE_AXEL, Moves.THUNDEROUS_KICK ], [Species.SOBBLE]: [ Moves.AEROBLAST, Moves.FROST_BREATH, Moves.SEARING_SHOT, Moves.SURGING_STRIKES ], - [Species.SKWOVET]: [ Moves.RECYCLE, Moves.GRAV_APPLE, Moves.BODY_PRESS, Moves.SLACK_OFF ], + [Species.SKWOVET]: [ Moves.KNOCK_OFF, Moves.GRAV_APPLE, Moves.BODY_PRESS, Moves.SLACK_OFF ], [Species.ROOKIDEE]: [ Moves.ROOST, Moves.BODY_PRESS, Moves.IRON_HEAD, Moves.KINGS_SHIELD ], [Species.BLIPBUG]: [ Moves.RECOVER, Moves.FREEZING_GLARE, Moves.SPORE, Moves.TAIL_GLOW ], - [Species.NICKIT]: [ Moves.KNOCK_OFF, Moves.BURNING_JEALOUSY, Moves.FALSE_SURRENDER, Moves.TIDY_UP ], + [Species.NICKIT]: [ Moves.BADDY_BAD, Moves.BURNING_JEALOUSY, Moves.SPARKLY_SWIRL, Moves.FIERY_WRATH ], [Species.GOSSIFLEUR]: [ Moves.TAILWIND, Moves.STRENGTH_SAP, Moves.PARTING_SHOT, Moves.SEED_FLARE ], - [Species.WOOLOO]: [ Moves.PSYSHIELD_BASH, Moves.HEAD_CHARGE, Moves.BODY_PRESS, Moves.HEAD_CHARGE ], + [Species.WOOLOO]: [ Moves.PSYSHIELD_BASH, Moves.HEAD_CHARGE, Moves.BODY_PRESS, Moves.MILK_DRINK ], [Species.CHEWTLE]: [ Moves.FIRE_FANG, Moves.ACCELEROCK, Moves.SHELL_SMASH, Moves.WAVE_CRASH ], - [Species.YAMPER]: [ Moves.ICE_FANG, Moves.TIDY_UP, Moves.THUNDERCLAP, Moves.ZIPPY_ZAP ], + [Species.YAMPER]: [ Moves.ICE_FANG, Moves.TIDY_UP, Moves.THUNDERCLAP, Moves.ZING_ZAP ], [Species.ROLYCOLY]: [ Moves.BURNING_BULWARK, Moves.ZING_ZAP, Moves.WORK_UP, Moves.DIAMOND_STORM ], [Species.APPLIN]: [ Moves.DRAGON_CHEER, Moves.PARTING_SHOT, Moves.FLOWER_TRICK, Moves.STRENGTH_SAP ], [Species.SILICOBRA]: [ Moves.SHORE_UP, Moves.SHED_TAIL, Moves.STONE_EDGE, Moves.PRECIPICE_BLADES ], - [Species.CRAMORANT]: [ Moves.APPLE_ACID, Moves.AQUA_JET, Moves.SCORCHING_SANDS, Moves.WAVE_CRASH ], + [Species.CRAMORANT]: [ Moves.APPLE_ACID, Moves.SURF, Moves.SCORCHING_SANDS, Moves.ROOST ], [Species.ARROKUDA]: [ Moves.THUNDER_FANG, Moves.KNOCK_OFF, Moves.ICE_FANG, Moves.FILLET_AWAY ], [Species.TOXEL]: [ Moves.NASTY_PLOT, Moves.BANEFUL_BUNKER, Moves.SPARKLING_ARIA, Moves.TORCH_SONG ], [Species.SIZZLIPEDE]: [ Moves.BURNING_BULWARK, Moves.ZING_ZAP, Moves.FIRST_IMPRESSION, Moves.VICTORY_DANCE ], - [Species.CLOBBOPUS]: [ Moves.OBSTRUCT, Moves.NO_RETREAT, Moves.MACH_PUNCH, Moves.SURGING_STRIKES ], + [Species.CLOBBOPUS]: [ Moves.DRAIN_PUNCH, Moves.NO_RETREAT, Moves.MACH_PUNCH, Moves.SURGING_STRIKES ], [Species.SINISTEA]: [ Moves.SCALD, Moves.TAKE_HEART, Moves.SPARKLY_SWIRL, Moves.MATCHA_GOTCHA ], - [Species.HATENNA]: [ Moves.TAKE_HEART, Moves.MOONBLAST, Moves.FIERY_WRATH, Moves.PSYSTRIKE ], + [Species.HATENNA]: [ Moves.TAKE_HEART, Moves.MOONBLAST, Moves.BUZZY_BUZZ, Moves.SEARING_SHOT ], [Species.IMPIDIMP]: [ Moves.ENCORE, Moves.PARTING_SHOT, Moves.TOPSY_TURVY, Moves.WICKED_BLOW ], - [Species.MILCERY]: [ Moves.MOONBLAST, Moves.SYRUP_BOMB, Moves.EARTH_POWER, Moves.MILK_DRINK ], - [Species.FALINKS]: [ Moves.COMBAT_TORQUE, Moves.PSYSHIELD_BASH, Moves.SPIKY_SHIELD, Moves.POPULATION_BOMB ], - [Species.PINCURCHIN]: [ Moves.BANEFUL_BUNKER, Moves.FREEZE_DRY, Moves.STRENGTH_SAP, Moves.TRICK_ROOM ], + [Species.MILCERY]: [ Moves.MOONBLAST, Moves.SYRUP_BOMB, Moves.EARTH_POWER, Moves.SEARING_SHOT ], + [Species.FALINKS]: [ Moves.COMBAT_TORQUE, Moves.PSYSHIELD_BASH, Moves.HEAL_ORDER, Moves.POPULATION_BOMB ], + [Species.PINCURCHIN]: [ Moves.TRICK_ROOM, Moves.RISING_VOLTAGE, Moves.STRENGTH_SAP, Moves.THUNDERCLAP ], [Species.SNOM]: [ Moves.MOONBLAST, Moves.SURF, Moves.EARTH_POWER, Moves.FIERY_DANCE ], - [Species.STONJOURNER]: [ Moves.BODY_PRESS, Moves.CURSE, Moves.SHORE_UP, Moves.ACCELEROCK ], + [Species.STONJOURNER]: [ Moves.BODY_PRESS, Moves.BULK_UP, Moves.SHORE_UP, Moves.ACCELEROCK ], [Species.EISCUE]: [ Moves.TRIPLE_AXEL, Moves.AQUA_STEP, Moves.SHELL_SMASH, Moves.GLACIAL_LANCE ], [Species.INDEEDEE]: [ Moves.MATCHA_GOTCHA, Moves.EXPANDING_FORCE, Moves.MOONBLAST, Moves.REVIVAL_BLESSING ], - [Species.MORPEKO]: [ Moves.GRAV_APPLE, Moves.OBSTRUCT, Moves.DARKEST_LARIAT, Moves.TIDY_UP ], + [Species.MORPEKO]: [ Moves.TRIPLE_AXEL, Moves.OBSTRUCT, Moves.PARTING_SHOT, Moves.SWORDS_DANCE ], [Species.CUFANT]: [ Moves.LIQUIDATION, Moves.HEAVY_SLAM, Moves.CLOSE_COMBAT, Moves.GIGATON_HAMMER ], - [Species.DRACOZOLT]: [ Moves.ICE_SPINNER, Moves.DRAGON_HAMMER, Moves.TEMPER_FLARE, Moves.DRAGON_DANCE ], - [Species.ARCTOZOLT]: [ Moves.SHIFT_GEAR, Moves.ICE_SPINNER, Moves.HIGH_HORSEPOWER, Moves.GLACIAL_LANCE ], - [Species.DRACOVISH]: [ Moves.ICE_FANG, Moves.DRAGON_HAMMER, Moves.THUNDER_FANG, Moves.DRAGON_DANCE ], - [Species.ARCTOVISH]: [ Moves.SHIFT_GEAR, Moves.ICE_SPINNER, Moves.HIGH_HORSEPOWER, Moves.GLACIAL_LANCE ], - [Species.DURALUDON]: [ Moves.FLAMETHROWER, Moves.RECOVER, Moves.EARTH_POWER, Moves.CALM_MIND ], - [Species.DREEPY]: [ Moves.EXTREME_SPEED, Moves.SPIRIT_BREAK, Moves.BLAZING_TORQUE, Moves.SPECTRAL_THIEF ], - [Species.ZACIAN]: [ Moves.MAGICAL_TORQUE, Moves.AQUA_CUTTER, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ], - [Species.ZAMAZENTA]: [ Moves.PSYSHIELD_BASH, Moves.BODY_PRESS, Moves.BULK_UP, Moves.KINGS_SHIELD ], - [Species.KUBFU]: [ Moves.BULLET_PUNCH, Moves.DRAIN_PUNCH, Moves.JET_PUNCH, Moves.DRAGON_DANCE ], - [Species.ZARUDE]: [ Moves.VICTORY_DANCE, Moves.PARTING_SHOT, Moves.WICKED_BLOW, Moves.SAPPY_SEED ], - [Species.REGIELEKI]: [ Moves.NASTY_PLOT, Moves.ICE_BEAM, Moves.PARTING_SHOT, Moves.ELECTRO_DRIFT ], + [Species.DRACOZOLT]: [ Moves.TRIPLE_AXEL, Moves.DRAGON_HAMMER, Moves.FIRE_LASH, Moves.DRAGON_DANCE ], + [Species.ARCTOZOLT]: [ Moves.TRIPLE_AXEL, Moves.EARTHQUAKE, Moves.HIGH_HORSEPOWER, Moves.SHIFT_GEAR ], + [Species.DRACOVISH]: [ Moves.TRIPLE_AXEL, Moves.DRAGON_HAMMER, Moves.THUNDER_FANG, Moves.DRAGON_DANCE ], + [Species.ARCTOVISH]: [ Moves.TRIPLE_AXEL, Moves.EARTHQUAKE, Moves.HIGH_HORSEPOWER, Moves.SHIFT_GEAR ], + [Species.DURALUDON]: [ Moves.CALM_MIND, Moves.BODY_PRESS, Moves.EARTH_POWER, Moves.RECOVER ], + [Species.DREEPY]: [ Moves.DRAGON_ENERGY, Moves.SHED_TAIL, Moves.BLAZING_TORQUE, Moves.SPECTRAL_THIEF ], + [Species.ZACIAN]: [ Moves.MAGICAL_TORQUE, Moves.BITTER_BLADE, Moves.LEAF_BLADE, Moves.VICTORY_DANCE ], + [Species.ZAMAZENTA]: [ Moves.PSYSHIELD_BASH, Moves.BODY_PRESS, Moves.SLACK_OFF, Moves.VICTORY_DANCE ], + [Species.KUBFU]: [ Moves.METEOR_MASH, Moves.DRAIN_PUNCH, Moves.JET_PUNCH, Moves.DRAGON_DANCE ], + [Species.ZARUDE]: [ Moves.SAPPY_SEED, Moves.PARTING_SHOT, Moves.WICKED_BLOW, Moves.VICTORY_DANCE ], + [Species.REGIELEKI]: [ Moves.NASTY_PLOT, Moves.FROST_BREATH, Moves.PARTING_SHOT, Moves.ELECTRO_DRIFT ], [Species.REGIDRAGO]: [ Moves.METEOR_MASH, Moves.FLAMETHROWER, Moves.CALM_MIND, Moves.DRAGON_DARTS ], [Species.GLASTRIER]: [ Moves.TRICK_ROOM, Moves.SLACK_OFF, Moves.HIGH_HORSEPOWER, Moves.GLACIAL_LANCE ], [Species.SPECTRIER]: [ Moves.EARTH_POWER, Moves.PARTING_SHOT, Moves.AURA_SPHERE, Moves.ASTRAL_BARRAGE ], - [Species.CALYREX]: [ Moves.KINGS_SHIELD, Moves.RECOVER, Moves.AURA_SPHERE, Moves.PHOTON_GEYSER ], - [Species.ENAMORUS]: [ Moves.AEROBLAST, Moves.TAKE_HEART, Moves.STORED_POWER, Moves.FLEUR_CANNON ], + [Species.CALYREX]: [ Moves.SAPPY_SEED, Moves.RECOVER, Moves.AURA_SPHERE, Moves.PHOTON_GEYSER ], + [Species.ENAMORUS]: [ Moves.FLEUR_CANNON, Moves.TAKE_HEART, Moves.STORED_POWER, Moves.OBLIVION_WING ], [Species.SPRIGATITO]: [ Moves.BLAZE_KICK, Moves.STRENGTH_SAP, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ], [Species.FUECOCO]: [ Moves.COSMIC_POWER, Moves.SLACK_OFF, Moves.INFERNAL_PARADE, Moves.MOONGEIST_BEAM ], [Species.QUAXLY]: [ Moves.DRAGON_DANCE, Moves.ROOST, Moves.TROP_KICK, Moves.THUNDEROUS_KICK ], - [Species.LECHONK]: [ Moves.MILK_DRINK, Moves.TEMPER_FLARE, Moves.FILLET_AWAY, Moves.HEAD_CHARGE ], - [Species.TAROUNTULA]: [ Moves.STRENGTH_SAP, Moves.LEECH_LIFE, Moves.PARTING_SHOT, Moves.STEALTH_ROCK ], + [Species.LECHONK]: [ Moves.MILK_DRINK, Moves.BLAZING_TORQUE, Moves.FILLET_AWAY, Moves.MULTI_ATTACK ], + [Species.TAROUNTULA]: [ Moves.STONE_AXE, Moves.LEECH_LIFE, Moves.THIEF, Moves.SPORE ], [Species.NYMBLE]: [ Moves.CEASELESS_EDGE, Moves.FELL_STINGER, Moves.LEECH_LIFE, Moves.WICKED_BLOW ], [Species.PAWMI]: [ Moves.DRAIN_PUNCH, Moves.WISH, Moves.PARTING_SHOT, Moves.PLASMA_FISTS ], - [Species.TANDEMAUS]: [ Moves.BATON_PASS, Moves.BITE, Moves.NUZZLE, Moves.REVIVAL_BLESSING ], - [Species.FIDOUGH]: [ Moves.WISH, Moves.SPIKES, Moves.PARTING_SHOT, Moves.SIZZLY_SLIDE ], + [Species.TANDEMAUS]: [ Moves.BATON_PASS, Moves.BITE, Moves.SIZZLY_SLIDE, Moves.REVIVAL_BLESSING ], + [Species.FIDOUGH]: [ Moves.WISH, Moves.BODY_PRESS, Moves.PARTING_SHOT, Moves.SIZZLY_SLIDE ], [Species.SMOLIV]: [ Moves.STRENGTH_SAP, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.BOOMBURST ], - [Species.SQUAWKABILLY]: [ Moves.PARTING_SHOT, Moves.BULK_UP, Moves.TEMPER_FLARE, Moves.HEAD_CHARGE ], + [Species.SQUAWKABILLY]: [ Moves.PARTING_SHOT, Moves.BULK_UP, Moves.FLARE_BLITZ, Moves.HEAD_CHARGE ], [Species.NACLI]: [ Moves.BODY_PRESS, Moves.SPIKES, Moves.CURSE, Moves.DIAMOND_STORM ], - [Species.CHARCADET]: [ Moves.SACRED_SWORD, Moves.BURNING_BULWARK, Moves.RECOVER, Moves.PHOTON_GEYSER ], - [Species.TADBULB]: [ Moves.PARABOLIC_CHARGE, Moves.MUDDY_WATER, Moves.EARTH_POWER, Moves.ELECTRO_SHOT ], + [Species.CHARCADET]: [ Moves.SACRED_SWORD, Moves.PHOTON_GEYSER, Moves.RECOVER, Moves.SPECTRAL_THIEF ], + [Species.TADBULB]: [ Moves.PARABOLIC_CHARGE, Moves.SCALD, Moves.EARTH_POWER, Moves.ELECTRO_SHOT ], [Species.WATTREL]: [ Moves.NASTY_PLOT, Moves.TAILWIND, Moves.HEAT_WAVE, Moves.AEROBLAST ], - [Species.MASCHIFF]: [ Moves.PARTING_SHOT, Moves.DARKEST_LARIAT, Moves.NUZZLE, Moves.COLLISION_COURSE ], - [Species.SHROODLE]: [ Moves.TEMPER_FLARE, Moves.PARTING_SHOT, Moves.TOXIC, Moves.TIDY_UP ], + [Species.MASCHIFF]: [ Moves.PARTING_SHOT, Moves.KNOCK_OFF, Moves.NUZZLE, Moves.COLLISION_COURSE ], + [Species.SHROODLE]: [ Moves.FIRE_LASH, Moves.PARTING_SHOT, Moves.TOXIC, Moves.TOPSY_TURVY ], [Species.BRAMBLIN]: [ Moves.TAILWIND, Moves.STRENGTH_SAP, Moves.CEASELESS_EDGE, Moves.LAST_RESPECTS ], - [Species.TOEDSCOOL]: [ Moves.STRENGTH_SAP, Moves.SCALD, Moves.PARTING_SHOT, Moves.SAPPY_SEED ], + [Species.TOEDSCOOL]: [ Moves.STRENGTH_SAP, Moves.HEART_SWAP, Moves.PARTING_SHOT, Moves.SAPPY_SEED ], [Species.KLAWF]: [ Moves.CRABHAMMER, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE, Moves.SHELL_SMASH ], - [Species.CAPSAKID]: [ Moves.STRENGTH_SAP, Moves.BURNING_BULWARK, Moves.ICE_SPINNER, Moves.TORCH_SONG ], - [Species.RELLOR]: [ Moves.TOXIC_SPIKES, Moves.RECOVER, Moves.MYSTICAL_FIRE, Moves.LUMINA_CRASH ], + [Species.CAPSAKID]: [ Moves.STRENGTH_SAP, Moves.APPLE_ACID, Moves.FROST_BREATH, Moves.TORCH_SONG ], + [Species.RELLOR]: [ Moves.TOXIC_SPIKES, Moves.RECOVER, Moves.HEAT_WAVE, Moves.LUMINA_CRASH ], [Species.FLITTLE]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.ROOST, Moves.SEARING_SHOT ], [Species.TINKATINK]: [ Moves.NUZZLE, Moves.SHIFT_GEAR, Moves.ICE_HAMMER, Moves.PYRO_BALL ], [Species.WIGLETT]: [ Moves.SHELL_SMASH, Moves.ICICLE_CRASH, Moves.SEED_BOMB, Moves.SURGING_STRIKES ], - [Species.BOMBIRDIER]: [ Moves.U_TURN, Moves.SWORDS_DANCE, Moves.SUCKER_PUNCH, Moves.MIGHTY_CLEAVE ], - [Species.FINIZEN]: [ Moves.ICE_SPINNER, Moves.DRAIN_PUNCH, Moves.RECOVER, Moves.WOOD_HAMMER ], + [Species.BOMBIRDIER]: [ Moves.U_TURN, Moves.TIDY_UP, Moves.SUCKER_PUNCH, Moves.MIGHTY_CLEAVE ], + [Species.FINIZEN]: [ Moves.TRIPLE_AXEL, Moves.DRAIN_PUNCH, Moves.RECOVER, Moves.WOOD_HAMMER ], [Species.VAROOM]: [ Moves.COMBAT_TORQUE, Moves.U_TURN, Moves.BLAZING_TORQUE, Moves.NOXIOUS_TORQUE ], [Species.CYCLIZAR]: [ Moves.BATON_PASS, Moves.BLAZING_TORQUE, Moves.HEAD_CHARGE, Moves.CLANGOROUS_SOUL ], [Species.ORTHWORM]: [ Moves.GLARE, Moves.COIL, Moves.BODY_PRESS, Moves.SHORE_UP ], [Species.GLIMMET]: [ Moves.CALM_MIND, Moves.SHORE_UP, Moves.PARTING_SHOT, Moves.FIERY_DANCE ], - [Species.GREAVARD]: [ Moves.BULK_UP, Moves.AGILITY, Moves.SHORE_UP, Moves.COLLISION_COURSE ], + [Species.GREAVARD]: [ Moves.TIDY_UP, Moves.YAWN, Moves.SHORE_UP, Moves.COLLISION_COURSE ], [Species.FLAMIGO]: [ Moves.THUNDEROUS_KICK, Moves.TRIPLE_AXEL, Moves.U_TURN, Moves.VICTORY_DANCE ], [Species.CETODDLE]: [ Moves.ICICLE_CRASH, Moves.HIGH_HORSEPOWER, Moves.RECOVER, Moves.DRAGON_DANCE ], - [Species.VELUZA]: [ Moves.RECOVER, Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.PHOTON_GEYSER ], - [Species.DONDOZO]: [ Moves.RECOVER, Moves.ICE_SPINNER, Moves.CURSE, Moves.WOOD_HAMMER ], - [Species.TATSUGIRI]: [ Moves.ICE_BEAM, Moves.BATON_PASS, Moves.SCALD, Moves.CLANGOROUS_SOUL ], - [Species.GREAT_TUSK]: [ Moves.STONE_AXE, Moves.CEASELESS_EDGE, Moves.DRAGON_DANCE, Moves.COLLISION_COURSE ], + [Species.VELUZA]: [ Moves.CEASELESS_EDGE, Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.PSYBLADE ], + [Species.DONDOZO]: [ Moves.SOFT_BOILED, Moves.ICE_SPINNER, Moves.TOXIC, Moves.SALT_CURE ], + [Species.TATSUGIRI]: [ Moves.ICE_BEAM, Moves.BATON_PASS, Moves.SCALD, Moves.FILLET_AWAY ], + [Species.GREAT_TUSK]: [ Moves.STONE_AXE, Moves.MORNING_SUN, Moves.DRAGON_DANCE, Moves.COLLISION_COURSE ], [Species.SCREAM_TAIL]: [ Moves.COSMIC_POWER, Moves.LUMINA_CRASH, Moves.MOONLIGHT, Moves.SHED_TAIL ], [Species.BRUTE_BONNET]: [ Moves.DARKEST_LARIAT, Moves.STRENGTH_SAP, Moves.EARTHQUAKE, Moves.SAPPY_SEED ], [Species.FLUTTER_MANE]: [ Moves.MOONLIGHT, Moves.FLAMETHROWER, Moves.EARTH_POWER, Moves.ASTRAL_BARRAGE ], - [Species.SLITHER_WING]: [ Moves.KNOCK_OFF, Moves.VICTORY_DANCE, Moves.FIRE_LASH, Moves.FLYING_PRESS ], + [Species.SLITHER_WING]: [ Moves.KNOCK_OFF, Moves.VICTORY_DANCE, Moves.FIRE_LASH, Moves.THUNDEROUS_KICK ], [Species.SANDY_SHOCKS]: [ Moves.SHORE_UP, Moves.ICE_BEAM, Moves.NASTY_PLOT, Moves.THUNDERCLAP ], - [Species.IRON_TREADS]: [ Moves.SUPERCELL_SLAM, Moves.BULK_UP, Moves.SPIKES, Moves.DOUBLE_IRON_BASH ], + [Species.IRON_TREADS]: [ Moves.SUPERCELL_SLAM, Moves.BULK_UP, Moves.SHORE_UP, Moves.DOUBLE_IRON_BASH ], [Species.IRON_BUNDLE]: [ Moves.EARTH_POWER, Moves.BOUNCY_BUBBLE, Moves.NASTY_PLOT, Moves.WATER_SPOUT ], - [Species.IRON_HANDS]: [ Moves.HAMMER_ARM, Moves.CURSE, Moves.PLASMA_FISTS, Moves.RECOVER ], + [Species.IRON_HANDS]: [ Moves.DRAIN_PUNCH, Moves.CURSE, Moves.PLASMA_FISTS, Moves.RECOVER ], [Species.IRON_JUGULIS]: [ Moves.FIERY_WRATH, Moves.ROOST, Moves.NASTY_PLOT, Moves.OBLIVION_WING ], [Species.IRON_MOTH]: [ Moves.EARTH_POWER, Moves.SEARING_SHOT, Moves.QUIVER_DANCE, Moves.MALIGNANT_CHAIN ], [Species.IRON_THORNS]: [ Moves.MIGHTY_CLEAVE, Moves.SHORE_UP, Moves.SHIFT_GEAR, Moves.FUSION_BOLT ], - [Species.FRIGIBAX]: [ Moves.DRAGON_HAMMER, Moves.BULK_UP, Moves.SHORE_UP, Moves.GLACIAL_LANCE ], + [Species.FRIGIBAX]: [ Moves.DRAGON_DARTS, Moves.BULK_UP, Moves.SHORE_UP, Moves.GLACIAL_LANCE ], [Species.GIMMIGHOUL]: [ Moves.COSMIC_POWER, Moves.STORED_POWER, Moves.BATON_PASS, Moves.ASTRAL_BARRAGE ], - [Species.WO_CHIEN]: [ Moves.SPORE, Moves.RAGE_POWDER, Moves.SAPPY_SEED, Moves.JUNGLE_HEALING ], - [Species.CHIEN_PAO]: [ Moves.HEAD_CHARGE, Moves.PARTING_SHOT, Moves.BITTER_BLADE, Moves.GLACIAL_LANCE ], - [Species.TING_LU]: [ Moves.SHORE_UP, Moves.CURSE, Moves.LEECH_SEED, Moves.THOUSAND_ARROWS ], - [Species.CHI_YU]: [ Moves.FIERY_WRATH, Moves.EARTH_POWER, Moves.BURNING_BULWARK, Moves.ERUPTION ], + [Species.WO_CHIEN]: [ Moves.SPORE, Moves.RAGE_POWDER, Moves.SAPPY_SEED, Moves.RECOVER ], + [Species.CHIEN_PAO]: [ Moves.KNOCK_OFF, Moves.PARTING_SHOT, Moves.BITTER_BLADE, Moves.GLACIAL_LANCE ], + [Species.TING_LU]: [ Moves.SHORE_UP, Moves.CURSE, Moves.SAPPY_SEED, Moves.THOUSAND_ARROWS ], + [Species.CHI_YU]: [ Moves.FIERY_WRATH, Moves.HYDRO_STEAM, Moves.TORCH_SONG, Moves.ERUPTION ], [Species.ROARING_MOON]: [ Moves.FIRE_LASH, Moves.DRAGON_HAMMER, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ], [Species.IRON_VALIANT]: [ Moves.PLASMA_FISTS, Moves.VICTORY_DANCE, Moves.QUIVER_DANCE, Moves.MAGICAL_TORQUE ], - [Species.KORAIDON]: [ Moves.MIGHTY_CLEAVE, Moves.RECOVER, Moves.GLAIVE_RUSH, Moves.CLANGOROUS_SOUL ], + [Species.KORAIDON]: [ Moves.SACRED_FIRE, Moves.RECOVER, Moves.GLAIVE_RUSH, Moves.CLANGOROUS_SOUL ], [Species.MIRAIDON]: [ Moves.ICE_BEAM, Moves.RECOVER, Moves.RISING_VOLTAGE, Moves.DRAGON_ENERGY ], [Species.WALKING_WAKE]: [ Moves.BOUNCY_BUBBLE, Moves.NASTY_PLOT, Moves.EARTH_POWER, Moves.DRAGON_ENERGY ], - [Species.IRON_LEAVES]: [ Moves.SPORE, Moves.BLAZING_TORQUE, Moves.SAPPY_SEED, Moves.PHOTON_GEYSER ], - [Species.POLTCHAGEIST]: [ Moves.COSMIC_POWER, Moves.INFERNAL_PARADE, Moves.LEECH_SEED, Moves.FOLLOW_ME ], + [Species.IRON_LEAVES]: [ Moves.SPORE, Moves.U_TURN, Moves.MIGHTY_CLEAVE, Moves.BITTER_BLADE ], + [Species.POLTCHAGEIST]: [ Moves.COSMIC_POWER, Moves.INFERNAL_PARADE, Moves.LEECH_SEED, Moves.SPARKLY_SWIRL ], [Species.OKIDOGI]: [ Moves.MORNING_SUN, Moves.OBSTRUCT, Moves.DIRE_CLAW, Moves.COLLISION_COURSE ], [Species.MUNKIDORI]: [ Moves.PSYSTRIKE, Moves.HEAT_WAVE, Moves.EARTH_POWER, Moves.MALIGNANT_CHAIN ], [Species.FEZANDIPITI]: [ Moves.BATON_PASS, Moves.COSMIC_POWER, Moves.SIZZLY_SLIDE, Moves.MALIGNANT_CHAIN ], - [Species.OGERPON]: [ Moves.JUNGLE_HEALING, Moves.BONEMERANG, Moves.TRIPLE_AXEL, Moves.GIGATON_HAMMER ], + [Species.OGERPON]: [ Moves.FLOWER_TRICK, Moves.BONEMERANG, Moves.TRIPLE_AXEL, Moves.GIGATON_HAMMER ], [Species.GOUGING_FIRE]: [ Moves.SUPERCELL_SLAM, Moves.BULK_UP, Moves.SACRED_FIRE, Moves.GLAIVE_RUSH ], [Species.RAGING_BOLT]: [ Moves.NASTY_PLOT, Moves.FLAMETHROWER, Moves.RECOVER, Moves.ELECTRO_DRIFT ], - [Species.IRON_BOULDER]: [ Moves.PSYBLADE, Moves.TACHYON_CUTTER, Moves.STONE_AXE, Moves.BITTER_BLADE ], - [Species.IRON_CROWN]: [ Moves.KINGS_SHIELD, Moves.SECRET_SWORD, Moves.PHOTON_GEYSER, Moves.ELECTRO_DRIFT ], + [Species.IRON_BOULDER]: [ Moves.PSYBLADE, Moves.KOWTOW_CLEAVE, Moves.STONE_AXE, Moves.BITTER_BLADE ], + [Species.IRON_CROWN]: [ Moves.NASTY_PLOT, Moves.SECRET_SWORD, Moves.PHOTON_GEYSER, Moves.ELECTRO_DRIFT ], [Species.TERAPAGOS]: [ Moves.EARTH_POWER, Moves.SHORE_UP, Moves.ICE_BEAM, Moves.SHELL_SMASH ], [Species.PECHARUNT]: [ Moves.TOXIC_SPIKES, Moves.BODY_PRESS, Moves.HEX, Moves.BANEFUL_BUNKER ], [Species.ALOLA_RATTATA]: [ Moves.STORM_THROW, Moves.PLAY_ROUGH, Moves.TIDY_UP, Moves.POPULATION_BOMB ], [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.AQUA_CUTTER, Moves.SHIFT_GEAR, Moves.GLACIAL_LANCE ], [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.AURORA_VEIL, Moves.PARTING_SHOT, Moves.FREEZY_FROST ], - [Species.ALOLA_DIGLETT]: [ Moves.LANDS_WRATH, Moves.SWORDS_DANCE, Moves.TRIPLE_DIVE, Moves.DOUBLE_IRON_BASH ], + [Species.ALOLA_DIGLETT]: [ Moves.THOUSAND_WAVES, Moves.SWORDS_DANCE, Moves.TRIPLE_DIVE, Moves.MOUNTAIN_GALE ], [Species.ALOLA_MEOWTH]: [ Moves.MAKE_IT_RAIN, Moves.BUZZY_BUZZ, Moves.PARTING_SHOT, Moves.BADDY_BAD ], [Species.ALOLA_GEODUDE]: [ Moves.HIGH_HORSEPOWER, Moves.BULK_UP, Moves.STONE_AXE, Moves.EXTREME_SPEED ], [Species.ALOLA_GRIMER]: [ Moves.SUCKER_PUNCH, Moves.DIRE_CLAW, Moves.STRENGTH_SAP, Moves.SURGING_STRIKES ], - [Species.ETERNAL_FLOETTE]: [ Moves.DECORATE, Moves.FORESTS_CURSE, Moves.POLLEN_PUFF, Moves.QUIVER_DANCE ], + [Species.ETERNAL_FLOETTE]: [ Moves.FIERY_DANCE, Moves.GIGA_DRAIN, Moves.POLLEN_PUFF, Moves.QUIVER_DANCE ], [Species.GALAR_MEOWTH]: [ Moves.AQUA_CUTTER, Moves.KNOCK_OFF, Moves.BULLET_PUNCH, Moves.BEHEMOTH_BASH ], [Species.GALAR_PONYTA]: [ Moves.SPIRIT_BREAK, Moves.EXTREME_SPEED, Moves.FLARE_BLITZ, Moves.PHOTON_GEYSER ], - [Species.GALAR_SLOWPOKE]: [ Moves.TRICK_ROOM, Moves.BADDY_BAD, Moves.MOONBLAST, Moves.PHOTON_GEYSER ], + [Species.GALAR_SLOWPOKE]: [ Moves.TRICK_ROOM, Moves.BADDY_BAD, Moves.MOONBLAST, Moves.LUMINA_CRASH ], [Species.GALAR_FARFETCHD]: [ Moves.ROOST, Moves.SACRED_SWORD, Moves.KINGS_SHIELD, Moves.BEHEMOTH_BLADE ], - [Species.GALAR_ARTICUNO]: [ Moves.AURA_SPHERE, Moves.BLEAKWIND_STORM, Moves.ICE_BEAM, Moves.PSYSTRIKE ], + [Species.GALAR_ARTICUNO]: [ Moves.AURA_SPHERE, Moves.OBLIVION_WING, Moves.ICE_BEAM, Moves.PSYSTRIKE ], [Species.GALAR_ZAPDOS]: [ Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.ROOST, Moves.BOLT_BEAK ], - [Species.GALAR_MOLTRES]: [ Moves.CALM_MIND, Moves.SLUDGE_BOMB, Moves.FLAMETHROWER, Moves.OBLIVION_WING ], + [Species.GALAR_MOLTRES]: [ Moves.ROOST, Moves.SLUDGE_BOMB, Moves.FLAMETHROWER, Moves.OBLIVION_WING ], [Species.GALAR_CORSOLA]: [ Moves.TRICK_ROOM, Moves.MOONBLAST, Moves.COSMIC_POWER, Moves.ASTRAL_BARRAGE ], [Species.GALAR_ZIGZAGOON]: [ Moves.CEASELESS_EDGE, Moves.DIRE_CLAW, Moves.PARTING_SHOT, Moves.EXTREME_SPEED ], [Species.GALAR_DARUMAKA]: [ Moves.ICE_SPINNER, Moves.ENDURE, Moves.DRAIN_PUNCH, Moves.V_CREATE ], @@ -567,12 +567,12 @@ export const speciesEggMoves = { [Species.GALAR_STUNFISK]: [ Moves.SPIKY_SHIELD, Moves.TRICK_ROOM, Moves.SHORE_UP, Moves.SALT_CURE ], [Species.HISUI_GROWLITHE]: [ Moves.WOOD_HAMMER, Moves.HEAD_SMASH, Moves.VOLT_TACKLE, Moves.MORNING_SUN ], [Species.HISUI_VOLTORB]: [ Moves.FROST_BREATH, Moves.NASTY_PLOT, Moves.PARABOLIC_CHARGE, Moves.SEED_FLARE ], - [Species.HISUI_QWILFISH]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.PARTING_SHOT, Moves.STRENGTH_SAP ], - [Species.HISUI_SNEASEL]: [ Moves.AXE_KICK, Moves.BULLET_PUNCH, Moves.ICE_SPINNER, Moves.VICTORY_DANCE ], + [Species.HISUI_QWILFISH]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.STRENGTH_SAP, Moves.FISHIOUS_REND ], + [Species.HISUI_SNEASEL]: [ Moves.THUNDEROUS_KICK, Moves.KNOCK_OFF, Moves.ICE_SPINNER, Moves.VICTORY_DANCE ], [Species.HISUI_ZORUA]: [ Moves.MOONBLAST, Moves.AURA_SPHERE, Moves.PARTING_SHOT, Moves.BLOOD_MOON ], - [Species.PALDEA_TAUROS]: [ Moves.NO_RETREAT, Moves.FLARE_BLITZ, Moves.WAVE_CRASH, Moves.THUNDEROUS_KICK ], - [Species.PALDEA_WOOPER]: [ Moves.RECOVER, Moves.STONE_AXE, Moves.LEECH_SEED, Moves.BANEFUL_BUNKER ], - [Species.BLOODMOON_URSALUNA]: [ Moves.GLARE, Moves.OBSTRUCT, Moves.PARTING_SHOT, Moves.MIND_BLOWN ] + [Species.PALDEA_TAUROS]: [ Moves.NO_RETREAT, Moves.BLAZING_TORQUE, Moves.AQUA_STEP, Moves.THUNDEROUS_KICK ], + [Species.PALDEA_WOOPER]: [ Moves.RECOVER, Moves.STONE_AXE, Moves.BANEFUL_BUNKER, Moves.SAPPY_SEED ], + [Species.BLOODMOON_URSALUNA]: [ Moves.GLARE, Moves.TRICK_ROOM, Moves.PARTING_SHOT, Moves.MIND_BLOWN ] }; function parseEggMoves(content: string): void { From 4607782578eec09ad143e5be41993922d4f2daa6 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 26 Apr 2024 19:57:38 -0400 Subject: [PATCH 09/23] Add temporary double wild shiny chance --- src/field/pokemon.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index a17621f4b5f..cd6ab257a6e 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -997,8 +997,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let shinyThreshold = new Utils.IntegerHolder(32); if (thresholdOverride === undefined) { - if (!this.hasTrainer()) + if (!this.hasTrainer()) { + if (new Date() < new Date('4/29/2024')) + shinyThreshold.value *= 2; this.scene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); + } } else shinyThreshold.value = thresholdOverride; From 00150fd0bb9b7416da808fdd34c0f12f684be13b Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 26 Apr 2024 20:11:37 -0400 Subject: [PATCH 10/23] Fix using wrong variant value when fusing --- src/field/pokemon.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index cd6ab257a6e..d834ffb35b0 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1071,6 +1071,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.fusionFormIndex = 0; this.fusionAbilityIndex = 0; this.fusionShiny = false; + this.fusionVariant = 0; this.fusionGender = 0; this.fusionLuck = 0; @@ -2486,7 +2487,7 @@ export class PlayerPokemon extends Pokemon { this.fusionFormIndex = pokemon.formIndex; this.fusionAbilityIndex = pokemon.abilityIndex; this.fusionShiny = pokemon.shiny; - this.fusionVariant = pokemon.fusionVariant; + this.fusionVariant = pokemon.variant; this.fusionGender = pokemon.gender; this.fusionLuck = pokemon.luck; From 2cb5aad8b1a1fe6411a03b8c816b8244652b50a2 Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Fri, 26 Apr 2024 20:01:24 -0500 Subject: [PATCH 11/23] Mark Core Enforcer as partial No coding for it yet, but it can function as a regular attack in the meantime. --- src/data/move.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index c9be9f9bd53..1872f6cd0db 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -5577,7 +5577,7 @@ export function initMoves() { .partial(), new AttackMove(Moves.CORE_ENFORCER, Type.DRAGON, MoveCategory.SPECIAL, 100, 100, 10, -1, 0, 7) .target(MoveTarget.ALL_NEAR_ENEMIES) - .unimplemented(), + .partial(), new AttackMove(Moves.TROP_KICK, Type.GRASS, MoveCategory.PHYSICAL, 70, 100, 15, 100, 0, 7) .attr(StatChangeAttr, BattleStat.ATK, -1), new StatusMove(Moves.INSTRUCT, Type.PSYCHIC, -1, 15, -1, 0, 7) From e362289d57bc7602565e1582e095ccf5c9c48049 Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Fri, 26 Apr 2024 20:40:28 -0500 Subject: [PATCH 12/23] Implement Spirit Shackle It's a pretty basic trapping attack --- src/data/move.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 1872f6cd0db..9329d21c1d4 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -5503,8 +5503,8 @@ export function initMoves() { new SelfStatusMove(Moves.BANEFUL_BUNKER, Type.POISON, -1, 10, -1, 4, 7) .attr(ProtectAttr, BattlerTagType.BANEFUL_BUNKER), new AttackMove(Moves.SPIRIT_SHACKLE, Type.GHOST, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 7) - .makesContact(false) - .partial(), + .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1) + .makesContact(false), new AttackMove(Moves.DARKEST_LARIAT, Type.DARK, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 7) .attr(IgnoreOpponentStatChangesAttr), new AttackMove(Moves.SPARKLING_ARIA, Type.WATER, MoveCategory.SPECIAL, 90, 100, 10, -1, 0, 7) From 0b13844d4a152ed4a986e3731db9d54aa6761dc4 Mon Sep 17 00:00:00 2001 From: dpMelian Date: Sat, 27 Apr 2024 03:35:39 +0100 Subject: [PATCH 13/23] Fix issue #312 -> set proper french name for move "smog" (#313) * fix: set proper french name for move "smog" * fix: set proper french description for move "smog" --- src/locales/fr/move.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/fr/move.ts b/src/locales/fr/move.ts index 867fbd4f489..ba3d1e2badc 100644 --- a/src/locales/fr/move.ts +++ b/src/locales/fr/move.ts @@ -490,8 +490,8 @@ export const move: MoveTranslationEntries = { effect: "Un grand coup de langue qui inflige des dégâts à la cible et peut aussi la paralyser (30% de chances)." }, "smog": { - name: "Bain de Smog", - effect: "Le lanceur projette de la boue bizarre sur la cible. Les changements de stats de la cible sont annulés." + name: "Purédpois", + effect: "Le lanceur attaque à l'aide d'une éruption de gaz répugnants qui peuvent aussi empoisonner la cible." }, "sludge": { name: "Détritus", From 3a1393c82868f269fdbf0a8317df7e42ac8b84aa Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Fri, 26 Apr 2024 22:00:28 -0500 Subject: [PATCH 14/23] Replace Archaludon and Hydrapple's graphics --- public/images/pokemon/1019.json | 24 ++++++++++----------- public/images/pokemon/1019.png | Bin 1117 -> 1107 bytes public/images/pokemon/back/1018.json | 24 ++++++++++----------- public/images/pokemon/back/1018.png | Bin 997 -> 1257 bytes public/images/pokemon/back/1019.json | 24 ++++++++++----------- public/images/pokemon/back/1019.png | Bin 823 -> 1022 bytes public/images/pokemon/back/shiny/1018.json | 24 ++++++++++----------- public/images/pokemon/back/shiny/1018.png | Bin 973 -> 1222 bytes public/images/pokemon/back/shiny/1019.json | 24 ++++++++++----------- public/images/pokemon/back/shiny/1019.png | Bin 812 -> 1024 bytes public/images/pokemon/shiny/1019.json | 24 ++++++++++----------- public/images/pokemon/shiny/1019.png | Bin 1107 -> 1107 bytes 12 files changed, 72 insertions(+), 72 deletions(-) diff --git a/public/images/pokemon/1019.json b/public/images/pokemon/1019.json index 0b7bbc992fd..b9a1d141d78 100644 --- a/public/images/pokemon/1019.json +++ b/public/images/pokemon/1019.json @@ -4,30 +4,30 @@ "image": "1019.png", "format": "RGBA8888", "size": { - "w": 86, - "h": 86 + "w": 81, + "h": 81 }, - "scale": 1, + "scale": 0.5, "frames": [ { "filename": "0001.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 71, - "h": 86 + "w": 96, + "h": 96 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 71, - "h": 86 + "x": 13, + "y": 7, + "w": 70, + "h": 81 }, "frame": { "x": 0, "y": 0, - "w": 71, - "h": 86 + "w": 70, + "h": 81 } } ] @@ -36,6 +36,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "" + "smartupdate": "$TexturePacker:SmartUpdate:11370107317bd979f7506ff64ce97f23:d973af1b21e3616a0ed07b332a99654f:7f41678ca2a06ee5c2aed7357b311846$" } } diff --git a/public/images/pokemon/1019.png b/public/images/pokemon/1019.png index 5b1c97d91d658dc2dd19ae37d6dc6b51e84b782e..9c11ccecb89ddf3e8de1fe720cfcbb6e727c1797 100644 GIT binary patch literal 1107 zcmV-Z1g!gsP)cs0yGg0$}_0A zcn^2&s zD02$AAL!xjR*I4e5mOf>JG`oK*hD@PiL|uvorv=H9b8gCEb_mY^c>V~s7dD{Y4MTQ zPhV0*!bK8lFpB<-Xr=Htw}kRCiZSh?wZ{-arU1PeM|qcgkzgrxQ+f@yA~%pT=Ajsk zLuw)+!Ag!Lk#^ofJcx*rviPzZ^}cqsY`nf{K8Ok2hJ?vFPMKyeOFfE*aa0kvPv`Xn zstv?v#6=IBTb{Y)vZW(*CcdA{x(*WY zQjmtHijfn}byA4_kL4jQt@nB@zzEJHAWSV{B&EWpGjT2wQq1Z|>7LU|HA)>z`PMFqJs;Vdc5^C|vV;dJf6fwqG_<^_?R8&-q zoP18Q2v;9|u@rUDjbtV^gjfZMHpmf47cvd9M^thXLvYfB3{ebW1Ft{vBW%xN#<=o1XZ!D8F6Va*@flBSfs3?+Wy> zAf1Y>XA(S$L9)x+f>F^lpK=h+L>I--LFORmD1bhv#7_5!6XxL050f?vu}6%Ph08g_ z7`fj81>|I7x5(b@b_+$y5e)|H6peU7?j}P)#n5x24IzQMsUb_JL+Cpq<1K5lsOcvJ zC*%O}Nq>DHI`@R6*HM%_qg;IPOIk0#(Cuc*jFN~qek@oY>$JAsRbfK%>XDxq74gw= zorbqe+W*g)mMxdL_UklEOg@-ScQW2`AJ}t2_bT1GHFA)BSBUr`*IeZBh`8bh6_ipU zUl`m^on03V=(3S?n&zQKjxTvew|=vUW^eIk zvh|uSnCJ6EYR{j#)<<{NdPOw(R#P)t-s00000 z003BZE6L-2hgLRE2MLL?O0pp&*r#rU78=z&E`LQCL@OeIWm+gl760Oy^xk3eSxZ!c zFpeG%s)|!)NIn1aum6B`>Pje+aowi?0004WQchC3pCB6!FKAUjJj)CEPy>$|#;Zx$hBb08whVu~9qp8w8< zNtv#H86(!dUPE}!X7EsXa$v=j&PoIZhDheXnK(@#`&{*ldu6mS6FnEbC+L0~2!@)v z#Rh-NSgD%RnW3uee+FVS6mgvuQC7&}k@d+@1yqfg%xJ#^p55>WK~7MW0anTa@Y^>i z(g*-%uh#Xw9_k*%LM1sttBPQ`?0Cw0Cg5@SAmVHQ0%x_sZoIj~b(Sh4>%_*!1yN=( zC1YH5mcSmCCNOQW%d*>SyJNA2`+GmJG?2eqdD2}^fTx3R>R zBdAsO)lJD*R~euYzRI=ij=FOyr9^^_EyZD=R$Ws!CpGinYOJ{^4BXsSm+P7VS2eS` zmBsmNuA{BQAJlaiplV5pVq=>dx97TCS_|2?w>O6qOeO0s6s>>P4mUTEUl!p^qLb4so{d+JEr2ZlYSB&vOJHqC7I ze>ctgRgST#SX$v!2C%L=Y+NeGSSBgbGW)Z$RQuhs$SC&QymMvMJ;qX~Dlu2zlm!mB zlvH!n;n_}~WCz#%uAdH8K~Md$vUKn7@Am0jGebROeF&m%CrfvI$=P)k~dP&fj&K%pZnMOa>Um(QWZFu|nxm~+;;LrV9zW2VZU&}ANpF3Wx;~(mm z^2Bvsyi||(`?J%Zmqrtxz5aWx{@d~Kc_|-%f4^M(xDF?DKN<}@;P7qrqdGjMZOwTts=_Y)nFL}dj^dr(gqXC9}CX$Y*-)<+|ykLxR*Xk!A8*MQP%KGItr zLmFTI$#@3SNkcw z@YG{MD!%p_nlGWjj|NkCIx*zpZPw*u3O?28EV^cm#^z{9pJ&o790_K%l%f+E53FnP zrPtVbrum-MwW;*C`m|o#qv$r2;%(6_X!+y%x_FQkp6UT>G<;QdcC^YEjGbrjqDm8j_8OUC@_psYqHsRa^Yj;%(U=rY((OR(y)Mn=*^K{+ z8XBIuss$Lq!7Uf4(_@};@!aj{1?s$$CIe*MvTrWXWzVmr8JcO(j>f*Hmk~>=Ybc8X z)zeTqqsu?4&P#XD=}Rvn#@n#2_@2%SZ7SV~P7T4S(pP%o!8N7ptB>_L>xJSHX z_W948ahH-RSyvq%4=BMv9Kp+X#!lx37_X%p)@jvRg2CGX9h%s6W&zMSpq4(V4#)Mp zRXuHr7oB>lJe+v@2vHtm&~IENB>gAjDHs%;K2qb5&Nx3~@V@nH(J3ljBmp|s>6Pk3 zrK{fhrr&ZCSf3ameRFvKXceSv)xB?HH|r+SI?s%hT}m&yUdF2Q+JM{x>5QYgFS@&0 z$41YWahWc+sp@`QAK|qVMA2Q*%QJy3{D|(`G31LbUk&WCiQ~H8(yjdHuRX6Xc*-cI zCsbOv?W#Yl(}?qZ1D)RIUv(Je)o&YE-A($347M{m`&j1zzq!dXl^VG5#Ja`gxW|Mj}oib zuV>BEYD}zx#jJ74WMi4yM+O6w*#bkfa${(PQrgxdsvPz1$N5~!JQd*3%)djYs37wQ z4Bnw}2J`d;U!VPr9j-aHJSyGmx4)fL4k1e&zQwbSBtWL1#=EmqlItv;tbRQ`#UwKY zLQ08-WS*vmB)Nd;v4&rw%f@m;n&kqb$H%cajkfPXcZj~+rJiE_;ZMRj(P6CjME47vZTq>3V?C$?u_tKTey)nK zifI_q4%&XMim|OEx*ilbq969C0FH$g94-e`1Aw-D+EOgE)&Yh=DnLuQkxgo*iep=E zad2azBiccv_4x~;ZHfg)H0-9fRufH6cqR*>9_Zj$ZPl%|k&0;g*#euKA=XunpVf*Z<(${79o1%jkQ|9X{Z*s0ZspqW12Yz$2TAG)!T zcA9H@bggZqJm&GxL`APQ{*6pq#7!C>$`r6GbdLs&p@T?y%(*mCd@fQzq7sp)Hw!u~ zjZ5oKi8_2<=!e^qOevMIp#bKuZm;XrJr(7@RBNJX#zcN=uUAc?UH`obs4>9@ZsEFV zKCycggI>d6{)eXC-0V}SyCHr2N4P5~OQ@%5mUN1_8r1@rm*d+&iUMZ_!7Vvk;4UVgRZ^x~_9!?ci6z8^Ww#-kUJ z9{wg4k<;dJ&xpDK9ddaY$Io6Lp@lHU$~dMK#U7)OKH^zgR754G0JzNW3}IT5Og$1k z7F)=&xTgUk%}oIi_2cLggUZwGT?J90EXL8|BrDTh5gj$ol;f!IVIXtQcesB5(lz>q TfO*~|00000NkvXXu0mjfZ%oo! diff --git a/public/images/pokemon/back/1019.json b/public/images/pokemon/back/1019.json index eb95065ecbd..1b1dcf05a24 100644 --- a/public/images/pokemon/back/1019.json +++ b/public/images/pokemon/back/1019.json @@ -4,30 +4,30 @@ "image": "1019.png", "format": "RGBA8888", "size": { - "w": 88, - "h": 88 + "w": 84, + "h": 84 }, - "scale": 1, + "scale": 0.333, "frames": [ { "filename": "0001.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 60, - "h": 88 + "w": 96, + "h": 96 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 88 + "x": 19, + "y": 6, + "w": 57, + "h": 84 }, "frame": { "x": 0, "y": 0, - "w": 60, - "h": 88 + "w": 57, + "h": 84 } } ] @@ -36,6 +36,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "" + "smartupdate": "$TexturePacker:SmartUpdate:fa22ad6f533362429e5f16082dee27ef:8dac5b6219bd93d6b6b186a6e5da1962:7f41678ca2a06ee5c2aed7357b311846$" } } diff --git a/public/images/pokemon/back/1019.png b/public/images/pokemon/back/1019.png index e15a6ce36f07cf45d628b7cb1213f41a05aa3351..ece50558c8c1345b9dd89259c26a9ba9fd22f6e1 100644 GIT binary patch literal 1022 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 diff --git a/public/images/pokemon/back/shiny/1019.json b/public/images/pokemon/back/shiny/1019.json index eb95065ecbd..5ee6f7f85cd 100644 --- a/public/images/pokemon/back/shiny/1019.json +++ b/public/images/pokemon/back/shiny/1019.json @@ -4,30 +4,30 @@ "image": "1019.png", "format": "RGBA8888", "size": { - "w": 88, - "h": 88 + "w": 84, + "h": 84 }, - "scale": 1, + "scale": 0.333, "frames": [ { "filename": "0001.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 60, - "h": 88 + "w": 96, + "h": 96 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 60, - "h": 88 + "x": 19, + "y": 6, + "w": 57, + "h": 84 }, "frame": { "x": 0, "y": 0, - "w": 60, - "h": 88 + "w": 57, + "h": 84 } } ] @@ -36,6 +36,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "" + "smartupdate": "$TexturePacker:SmartUpdate:583d46caa69d701c444b02879c33295e:5c81ac32256868d5970b2442ad4a700c:7f41678ca2a06ee5c2aed7357b311846$" } } diff --git a/public/images/pokemon/back/shiny/1019.png b/public/images/pokemon/back/shiny/1019.png index af93cd23c0d02ec3edcaef59a268a5e0fbae1c84..a2c326350782fb778b9dabb82975ec29a0a32862 100644 GIT binary patch literal 1024 zcmV+b1poVqP)K=|LRfc&$BIIC&W|%D*ylh0d!JM zQvg8b*k%9#010qNS#tmY4#WTe4#WYKD-Ig~00V4EL_t(o!`0a9vZEjj0ANilL3`Tw zf85O#(RR)e;m@)&+fH}=3?U#mO@B3<#y2GVAJA>vLLEor^SKR2MMZkQ2WJ8C%_t5| z?Hl;d8%LwuRz^pv@AdUs*U|mQRm{=#irmIe0t6V{{V7SC65vR2<_0N28b;3ExUL4F zg$y;NaVBvSG|kjI=3xR!{j-|*Yi}K;Fu6`m?KPwGJmsbG2cgz`TD9nLeM$GJccdKk z)d`U!WiYh|iytY4GCPs9rkcket1Eo$D^x>mF94iXmApluw67zfQuAs=I_eZ?WhQSe zq1qL!CW+5c9(&xE70`BlsAA!;i)q@?`d>|jNYUTPtQHQcQ(7$nZi3x9T{d;qsOG4k zdziYakbKhL3n9*RED{6GQBiIxNh@pevGSK|CPXaUy&d&WqXgrzv&ZWNR4$WHqeRi1)))wFAfUPJ|@HF?*K5g6dg6Ay2Yu-Lf#TJ*`CI?Lqi}Uc`KkVbUfoch`=6y1lP1yJY>{O zeL$^_-Z`D+FQyi1pwkG{r|Ae(XMRD$#2(aVes&Zb#fMsxBZNXe=u2YA&XS zO1pU*U8-g(Z!DIsK#%C+qqXz}Dp@_T`U8sDgSz^NFS4=9U8WU)k)bZx{^~(hd|0p+ zvt(iEFzqZA8GTd}>^ADBB``Jo+?CP&v?Nvve}HKRMK?t?^CrsM**Gi_Kl9`52`PDp zmABbx+rSS?n9JE|Wfbpab$dQ>dm`xZOX4bvGv#Huo7U|qt{uR1!{h5H3zqsdctJK8_Ci6s{?JC61M0000AFnVmZJt>4(tJ8%bE#OKG9*isc-?9UAE(Vq`{9JZ7xr_yLv&$eHmY;W#15?h7%RdmlLH>ay|A)b>xiEmz zGhpl@lE4<`kP8;sHBlOep^PwkGPy`_4=5jY@sq)?k^mpP`Y8xw9k3r9rW|ZyC3sym z5!l@4aI^~$aoOEi7a-!YyRp5%!R@8Yap?wE8OEA@_@*%;hsobBSqjN9^u?MlA$X_6 z$wy>7QVJ*EUYXQEnz2U1_t-{ z_i^M#t-v41Y7h0iJw;(^3Ge^f6{R|{P%QU@jh|{p96vF>3nkA3-`+c1F zcs%fayWueL5o3Ie0|5n$G%DK~;ylkpIE@wkP?5_U{WwrX7*~#JjRdE-08O0cF(RnA z#0Xc6L<7Jp3b-tAy&}UjK;+P#;sBB%l}yxW^ELUaB3$_yU<3)2MSk{PNTM$j#NExE z_B?3-D1JMd2qr?5dE-4TIYB_ZV1#AavWzSOz(O4RaoIpTvAgjiK~Hd!e)A#(#N%6w zGN+LHfe}7#r6{QoF?Uh2!>byHO%w}}NJ|Spi75Zyz$FL7BL7&@OHjL^CcPI)i;tpy z`;sFP&PdpUCdLn)IkyjfVW66+A5G!7dQ7d>!pdFIy3mX6Rn@$+QXb&!ac zf;>FC7&+lwCzTlgu{_w)dfl%DXy8l&!qg%fDHS%o6Xz;1@r4HdQg>4oSC+C?R0 zmhN(0h;xydcvAE;R9h)p@kkw1BE~b~gn3=1UG>->VK1J!Y~#X*Dn^@yUx=$gRYh6k z6ibptID7GnwWy1(k%ib0;x0(^iJPrt8l)&cjiQpPm{O1?WHK?OHN^8*{0Qr{m~$aF zWGPpquIPMfoSxtrVGTyM?ft`LhF~ z6=YDc^_~QeVv_9gw%}BB&38En@5EqY>L5#ybCf`@Q>@cH;)Esm`^%&+LhKQ3vT!*k zi;?@CP(V&Lc8ly?E|*lL9MNIIPSJ@c7>9vWHXOx34eoO1&7lzHunNbq)!j}d2+kLvXo>gH+%Ic9c zI8MV$A#J~Nre(`zuKhR-GgA&`(4CC8+#B{B(7j5xZjI1;;)gGC%|&jvh!6atf^tga zfx+#rv+JM%Lot#;^SoVYb{>fA=c3)^Z6>v^7Oq$^_?7N4a+7tuJ3i$(-TK`sx~bmx Z{RQcJIqPX1-;MwP002ovPDHLkV1m5(1r7iJ literal 1107 zcmV-Z1g!gsP)t* zMrKGo|MRc-^?^ryMgE``VE_OC0d!JMQvg8b*k%9#1H4H@K~#8NwbqHQ+d2#cP!Fla zOOm^^egFTdkBeCqPGZ!yI=~I$8{}X@39^Sn0fv7N{J=j^SN3+h^)CA*c|6d$?AL#i zua4^NCMr+Ur0!kPu`Ij$^&z=;Q*RGuWr0pCO8G&z$K%1O$~ADwBM8FGrBF)c@qmJt z11bgl^XCLn#Z|J;k1wJMn>6UlPR_~|p%cp!Ry9$PTz82E2%Chhl2l3$7t#;Jlc4>Oxf7g-BnB%qVv9(5IFRuyd5t4qVR@QOx1bg4U_p}k!r8e6#oJ76Oq z*beDmmzlfP1)!=fSw|LDiKp%?iOVTA7|@H2Ls1c!M6_Xv=qOv1RaF9GDJ3#BSUTPt z%*vTs%oeq=WaST%y_;zrpdo|wt@$qAT?o#vXPma7vc zBs<_yFr0xI$s=rvQR`BsSWujJd{-B=vPh|z10qrum3LUY|IEI~(8~T|3|afQ4dFdo zz|3zBEWY2rl}Hj8LM0Ww;##%Rd)05;FGkBn(C-f&r?{(uWT>foZ1Sg!7gfvsTY|~h z-v*cs1;1vAlqF%YWo>e*0;)2q8SO*h-5nk&(EwE?z>Bf~{KMo(5CF`6S=aY^iam%Y zRmcjhN`zor@Rs#d0AgH^$s}i6Q zzRFSdK;1FV^UMM^cAgyuqUtMkcT(fBER8i6vjlGLtIz9N09Q4my1`;u%yqPt_=~zL z3{fpPi`dxaGViL-OKTDK^Yhc;3{{nN7mCL3I^Z&!`sVwnSkC zFSD)&Y+RnNvO`v+W%O%jF`Q4RE#26qc}uYBUSmZFRWMgSl?5)iBB|!6!=s%(*$%Gz zUH?w73VPygu;Si7KJ4%0ni(2z*CCL)!5((sELpCVj1~0^yIC?z&Z4R-RlV$Sce7;f zgN-c^7QhKMZ^y?nt`B Date: Fri, 26 Apr 2024 23:53:09 -0400 Subject: [PATCH 15/23] Fix biome being able to change before a boss in endless --- src/battle-scene.ts | 2 +- src/data/pokemon-species.ts | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 73fa000d840..4aa6c8692a6 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -938,7 +938,7 @@ export default class BattleScene extends SceneBase { if (!waveIndex && lastBattle) { let isNewBiome = !(lastBattle.waveIndex % 10) || ((this.gameMode.hasShortBiomes || this.gameMode.isDaily) && (lastBattle.waveIndex % 50) === 49); - if (!isNewBiome && this.gameMode.hasShortBiomes && (newWaveIndex % 10) < 9) { + if (!isNewBiome && this.gameMode.hasShortBiomes && (lastBattle.waveIndex % 10) < 9) { let w = lastBattle.waveIndex - ((lastBattle.waveIndex % 10) - 1); let biomeWaves = 1; while (w < lastBattle.waveIndex) { diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index ceeca373b97..8be93672f34 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1710,17 +1710,17 @@ export function initSpecies() { new PokemonSpecies(Species.VIRIZION, 5, true, false, false, "Grassland Pokémon", Type.GRASS, Type.FIGHTING, 2, 200, Abilities.JUSTIFIED, Abilities.NONE, Abilities.NONE, 580, 91, 90, 72, 90, 129, 108, 3, 35, 290, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.TORNADUS, 5, true, false, false, "Cyclone Pokémon", Type.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true, new PokemonForm("Incarnate Forme", "incarnate", Type.FLYING, null, 1.5, 63, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290), - new PokemonForm("Therian Forme", "therian", Type.FLYING, null, 1.4, 63, Abilities.REGENERATOR, Abilities.NONE, Abilities.NONE, 580, 79, 100, 80, 110, 90, 121, 3, 90, 290), + new PokemonForm("Therian Forme", "therian", Type.FLYING, null, 1.4, 63, Abilities.REGENERATOR, Abilities.NONE, Abilities.REGENERATOR, 580, 79, 100, 80, 110, 90, 121, 3, 90, 290), ), new PokemonSpecies(Species.THUNDURUS, 5, true, false, false, "Bolt Strike Pokémon", Type.ELECTRIC, Type.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290, GrowthRate.SLOW, 100, false, true, new PokemonForm("Incarnate Forme", "incarnate", Type.ELECTRIC, Type.FLYING, 1.5, 61, Abilities.PRANKSTER, Abilities.NONE, Abilities.DEFIANT, 580, 79, 115, 70, 125, 80, 111, 3, 90, 290), - new PokemonForm("Therian Forme", "therian", Type.ELECTRIC, Type.FLYING, 3, 61, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.NONE, 580, 79, 105, 70, 145, 80, 101, 3, 90, 290), + new PokemonForm("Therian Forme", "therian", Type.ELECTRIC, Type.FLYING, 3, 61, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.VOLT_ABSORB, 580, 79, 105, 70, 145, 80, 101, 3, 90, 290), ), new PokemonSpecies(Species.RESHIRAM, 5, false, true, false, "Vast White Pokémon", Type.DRAGON, Type.FIRE, 3.2, 330, Abilities.TURBOBLAZE, Abilities.NONE, Abilities.NONE, 680, 100, 120, 100, 150, 120, 90, 3, 0, 340, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.ZEKROM, 5, false, true, false, "Deep Black Pokémon", Type.DRAGON, Type.ELECTRIC, 2.9, 345, Abilities.TERAVOLT, Abilities.NONE, Abilities.NONE, 680, 100, 150, 120, 120, 100, 90, 3, 0, 340, GrowthRate.SLOW, null, false), new PokemonSpecies(Species.LANDORUS, 5, true, false, false, "Abundance Pokémon", Type.GROUND, Type.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300, GrowthRate.SLOW, 100, false, true, new PokemonForm("Incarnate Forme", "incarnate", Type.GROUND, Type.FLYING, 1.5, 68, Abilities.SAND_FORCE, Abilities.NONE, Abilities.SHEER_FORCE, 600, 89, 125, 90, 115, 80, 101, 3, 90, 300), - new PokemonForm("Therian Forme", "therian", Type.GROUND, Type.FLYING, 1.3, 68, Abilities.INTIMIDATE, Abilities.NONE, Abilities.NONE, 600, 89, 145, 90, 105, 80, 91, 3, 90, 300), + new PokemonForm("Therian Forme", "therian", Type.GROUND, Type.FLYING, 1.3, 68, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 89, 145, 90, 105, 80, 91, 3, 90, 300), ), new PokemonSpecies(Species.KYUREM, 5, false, true, false, "Boundary Pokémon", Type.DRAGON, Type.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330, GrowthRate.SLOW, null, false, true, new PokemonForm("Normal", "", Type.DRAGON, Type.ICE, 3, 325, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 660, 125, 130, 90, 130, 90, 95, 3, 0, 330), @@ -1752,8 +1752,8 @@ export function initSpecies() { new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", Type.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false), new PokemonSpecies(Species.GRENINJA, 6, false, false, false, "Ninja Pokémon", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, GrowthRate.MEDIUM_SLOW, 87.5, false, false, new PokemonForm("Normal", "", Type.WATER, Type.DARK, 1.5, 40, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239), - new PokemonForm("Battle Bond", "battle-bond", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.NONE, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, false, ""), - new PokemonForm("Ash", "ash", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.NONE, 640, 72, 145, 67, 153, 71, 132, 45, 70, 239), + new PokemonForm("Battle Bond", "battle-bond", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 530, 72, 95, 67, 103, 71, 122, 45, 70, 239, false, ""), + new PokemonForm("Ash", "ash", Type.WATER, Type.DARK, 1.5, 40, Abilities.BATTLE_BOND, Abilities.NONE, Abilities.BATTLE_BOND, 640, 72, 145, 67, 153, 71, 132, 45, 70, 239), ), new PokemonSpecies(Species.BUNNELBY, 6, false, false, false, "Digging Pokémon", Type.NORMAL, null, 0.4, 5, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 237, 38, 36, 38, 32, 36, 57, 255, 50, 47, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.DIGGERSBY, 6, false, false, false, "Digging Pokémon", Type.NORMAL, Type.GROUND, 1, 42.4, Abilities.PICKUP, Abilities.CHEEK_POUCH, Abilities.HUGE_POWER, 423, 85, 56, 77, 50, 77, 78, 127, 50, 148, GrowthRate.MEDIUM_FAST, 50, false), @@ -1970,12 +1970,12 @@ export function initSpecies() { new PokemonSpecies(Species.RIBOMBEE, 7, false, false, false, "Bee Fly Pokémon", Type.BUG, Type.FAIRY, 0.2, 0.5, Abilities.HONEY_GATHER, Abilities.SHIELD_DUST, Abilities.SWEET_VEIL, 464, 60, 55, 60, 95, 70, 124, 75, 50, 162, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.ROCKRUFF, 7, false, false, false, "Puppy Pokémon", Type.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, GrowthRate.MEDIUM_FAST, 50, false, false, new PokemonForm("Normal", "", Type.ROCK, null, 0.5, 9.2, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.STEADFAST, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56), - new PokemonForm("Own Tempo", "own-tempo", Type.ROCK, null, 0.5, 9.2, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.NONE, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, ""), + new PokemonForm("Own Tempo", "own-tempo", Type.ROCK, null, 0.5, 9.2, Abilities.OWN_TEMPO, Abilities.NONE, Abilities.OWN_TEMPO, 280, 45, 65, 40, 30, 40, 60, 190, 50, 56, false, ""), ), new PokemonSpecies(Species.LYCANROC, 7, false, false, false, "Wolf Pokémon", Type.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, false, new PokemonForm("Midday Form", "midday", Type.ROCK, null, 0.8, 25, Abilities.KEEN_EYE, Abilities.SAND_RUSH, Abilities.STEADFAST, 487, 75, 115, 65, 55, 65, 112, 90, 50, 170, false, ""), new PokemonForm("Midnight Form", "midnight", Type.ROCK, null, 1.1, 25, Abilities.KEEN_EYE, Abilities.VITAL_SPIRIT, Abilities.NO_GUARD, 487, 85, 115, 75, 55, 75, 82, 90, 50, 170), - new PokemonForm("Dusk Form", "dusk", Type.ROCK, null, 0.8, 25, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.NONE, 487, 75, 117, 65, 55, 65, 110, 90, 50, 170), + new PokemonForm("Dusk Form", "dusk", Type.ROCK, null, 0.8, 25, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 487, 75, 117, 65, 55, 65, 110, 90, 50, 170), ), new PokemonSpecies(Species.WISHIWASHI, 7, false, false, false, "Small Fry Pokémon", Type.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61, GrowthRate.FAST, 50, false, false, new PokemonForm("Solo Form", "", Type.WATER, null, 0.2, 0.3, Abilities.SCHOOLING, Abilities.NONE, Abilities.NONE, 175, 45, 20, 20, 25, 25, 40, 60, 50, 61), @@ -2295,7 +2295,7 @@ export function initSpecies() { new PokemonSpecies(Species.OVERQWIL, 8, false, false, false, "Pin Cluster Pokémon", Type.DARK, Type.POISON, 2.5, 60.5, Abilities.POISON_POINT, Abilities.SWIFT_SWIM, Abilities.INTIMIDATE, 510, 85, 115, 95, 65, 65, 85, 135, 50, 179, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.ENAMORUS, 8, true, false, false, "Love-Hate Pokémon", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116, GrowthRate.SLOW, 0, false, true, new PokemonForm("Incarnate Forme", "incarnate", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.CUTE_CHARM, Abilities.NONE, Abilities.CONTRARY, 580, 74, 115, 70, 135, 80, 106, 3, 50, 116), - new PokemonForm("Therian Forme", "therian", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.OVERCOAT, Abilities.NONE, Abilities.NONE, 580, 74, 115, 110, 135, 100, 46, 3, 50, 116), + new PokemonForm("Therian Forme", "therian", Type.FAIRY, Type.FLYING, 1.6, 48, Abilities.OVERCOAT, Abilities.NONE, Abilities.OVERCOAT, 580, 74, 115, 110, 135, 100, 46, 3, 50, 116), ), new PokemonSpecies(Species.SPRIGATITO, 9, false, false, false, "Grass Cat Pokémon", Type.GRASS, null, 0.4, 4.1, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 310, 40, 61, 54, 45, 45, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false), new PokemonSpecies(Species.FLORAGATO, 9, false, false, false, "Grass Cat Pokémon", Type.GRASS, null, 0.9, 12.2, Abilities.OVERGROW, Abilities.NONE, Abilities.PROTEAN, 410, 61, 80, 63, 60, 63, 83, 45, 50, 144, GrowthRate.MEDIUM_SLOW, 87.5, false), From 014c13b95bc1b209a80a7f7dada4d602c2cad053 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sat, 27 Apr 2024 00:54:10 -0400 Subject: [PATCH 16/23] Add workaround for crash with static variant sprites --- src/battle-scene.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 4aa6c8692a6..512a196b175 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -13,7 +13,7 @@ import { Biome } from "./data/enums/biome"; import { Arena, ArenaBase } from './field/arena'; import { GameData, PlayerGender } from './system/game-data'; import StarterSelectUiHandler from './ui/starter-select-ui-handler'; -import { TextStyle, addBBCodeTextObject, addTextObject } from './ui/text'; +import { TextStyle, addTextObject } from './ui/text'; import { Moves } from "./data/enums/moves"; import { allMoves } from "./data/move"; import { initMoves } from './data/move'; @@ -249,7 +249,7 @@ export default class BattleScene extends SceneBase { loadPokemonAtlas(key: string, atlasPath: string, experimental?: boolean) { if (experimental === undefined) experimental = this.experimentalSprites; - let variant = atlasPath.includes('variant/'); + let variant = atlasPath.includes('variant/') || /_[0-3]$/.test(atlasPath); if (experimental) experimental = this.hasExpSprite(key); if (variant) From 51408a0c9d7fe8f5dad6d6d44eec540ef31a680c Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sat, 27 Apr 2024 01:13:03 -0400 Subject: [PATCH 17/23] Add missing animated Toxapex variant sprites --- .../images/pokemon/variant/_masterlist.json | 10 ++++++ public/images/pokemon/variant/exp/748.json | 36 +++++++++++++++++++ .../images/pokemon/variant/exp/back/748.json | 32 +++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 public/images/pokemon/variant/exp/748.json create mode 100644 public/images/pokemon/variant/exp/back/748.json diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json index d301065492b..1f8b274f51f 100644 --- a/public/images/pokemon/variant/_masterlist.json +++ b/public/images/pokemon/variant/_masterlist.json @@ -3116,6 +3116,11 @@ 1, 1 ], + "748": [ + 0, + 1, + 1 + ], "755": [ 0, 1, @@ -3573,6 +3578,11 @@ 1, 1 ], + "748": [ + 0, + 1, + 1 + ], "755": [ 0, 1, diff --git a/public/images/pokemon/variant/exp/748.json b/public/images/pokemon/variant/exp/748.json new file mode 100644 index 00000000000..280c676293a --- /dev/null +++ b/public/images/pokemon/variant/exp/748.json @@ -0,0 +1,36 @@ +{ + "1": { + "943732": "490a3c", + "101010": "101010", + "f28c4f": "a21f90", + "e25025": "91138c", + "6f97c4": "be583d", + "455b85": "892e20", + "93d1d7": "df7b52", + "711a6a": "81463e", + "d76fa5": "edd5ca", + "171539": "171539", + "3a3f6d": "462952", + "525898": "6c3776", + "b7429a": "d29784", + "863c79": "9b6459", + "ddac02": "ff71ec" + }, + "2": { + "943732": "c30e49", + "101010": "101010", + "f28c4f": "ff3f5a", + "e25025": "e12350", + "6f97c4": "359d5d", + "455b85": "186443", + "93d1d7": "5bd97f", + "711a6a": "082b29", + "d76fa5": "2b6157", + "171539": "490c06", + "3a3f6d": "862916", + "525898": "d75b3c", + "b7429a": "1c524b", + "863c79": "104445", + "ddac02": "ff5068" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/748.json b/public/images/pokemon/variant/exp/back/748.json new file mode 100644 index 00000000000..22aa3444026 --- /dev/null +++ b/public/images/pokemon/variant/exp/back/748.json @@ -0,0 +1,32 @@ +{ + "1": { + "943732": "490a3c", + "101010": "101010", + "f28c4f": "a21f90", + "e25025": "91138c", + "93d1d7": "df7b52", + "3a3f6d": "462952", + "6f97c4": "be583d", + "711a6a": "81463e", + "455b85": "892e20", + "525898": "6c3776", + "b7429a": "d29784", + "d76fa5": "edd5ca", + "171539": "171539" + }, + "2": { + "943732": "c30e49", + "101010": "101010", + "f28c4f": "ff3f5a", + "e25025": "e12350", + "93d1d7": "5bd97f", + "3a3f6d": "862916", + "6f97c4": "359d5d", + "711a6a": "082b29", + "455b85": "186443", + "525898": "d75b3c", + "b7429a": "1c524b", + "d76fa5": "2b6157", + "171539": "171539" + } +} \ No newline at end of file From 55f68c0ce6a233bdd3314ee88823a1db2902c81d Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sat, 27 Apr 2024 15:52:21 -0400 Subject: [PATCH 18/23] Fix DNA splicer exploit --- src/ui/summary-ui-handler.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index bf5a12b3f7d..44003a7c8fc 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -376,7 +376,10 @@ export default class SummaryUiHandler extends UiHandler { success = true; } } else if (button === Button.CANCEL) { - ui.setMode(Mode.PARTY); + if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) + this.hideMoveSelect(); + else + ui.setMode(Mode.PARTY); success = true; } else { const pages = Utils.getEnumValues(Page); From 854de76467e71f890e9497c909560bcf8cf19f13 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sat, 27 Apr 2024 18:06:41 -0400 Subject: [PATCH 19/23] Improve handling of variant data overrides for mixed animated mode --- src/battle-scene.ts | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 512a196b175..3954e48782e 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -531,10 +531,23 @@ export default class BattleScene extends SceneBase { .then(v => { Object.keys(v).forEach(k => variantData[k] = v[k]); if (this.experimentalSprites) { - const expTree = variantData['exp']; - Object.keys(expTree).forEach(ek => { - variantData[ek] = expTree[ek]; - }); + const expVariantData = variantData['exp']; + const traverseVariantData = (keys: string[]) => { + let variantTree = variantData; + let expTree = expVariantData; + keys.map((k: string, i: integer) => { + if (i < keys.length - 1) { + variantTree = variantTree[k]; + expTree = expTree[k]; + } else if (variantTree.hasOwnProperty(k) && expTree.hasOwnProperty(k)) { + if ([ 'back', 'female' ].includes(k)) + traverseVariantData(keys.concat(k)); + else + variantTree[k] = expTree[k]; + } + }); + }; + Object.keys(expVariantData).forEach(ek => traverseVariantData([ ek ])); } Promise.resolve(); }); From 5fd7b368e295333503d8e702c798cfb51c334283 Mon Sep 17 00:00:00 2001 From: Thomas David <66013753+Kiriox94@users.noreply.github.com> Date: Sun, 28 Apr 2024 11:54:59 +0200 Subject: [PATCH 20/23] Auto select language implementation --- src/plugins/i18n.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index adc1f3d5295..d1a0f490275 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -75,7 +75,7 @@ export interface Localizable { const DEFAULT_LANGUAGE_OVERRIDE = ''; export function initI18n(): void { - let lang = 'en'; + let lang = navigator.language; if (localStorage.getItem('prLang')) lang = localStorage.getItem('prLang'); From a9a9e512a079438f3c8ee7783d4593bc7a09f243 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sun, 28 Apr 2024 10:01:29 -0400 Subject: [PATCH 21/23] Revert "Auto select language implementation" This reverts commit 5fd7b368e295333503d8e702c798cfb51c334283. --- src/plugins/i18n.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index d1a0f490275..adc1f3d5295 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -75,7 +75,7 @@ export interface Localizable { const DEFAULT_LANGUAGE_OVERRIDE = ''; export function initI18n(): void { - let lang = navigator.language; + let lang = 'en'; if (localStorage.getItem('prLang')) lang = localStorage.getItem('prLang'); From c09a0254efd08a5ebd20b64adb64518e4ef57bc4 Mon Sep 17 00:00:00 2001 From: Lugiad Date: Sun, 28 Apr 2024 16:12:29 +0200 Subject: [PATCH 22/23] French moves typos --- src/locales/fr/move.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/locales/fr/move.ts b/src/locales/fr/move.ts index ba3d1e2badc..b6d17252b59 100644 --- a/src/locales/fr/move.ts +++ b/src/locales/fr/move.ts @@ -390,7 +390,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur se relaxe et allège son corps pour beaucoup augmenter sa Vitesse." }, "quickAttack": { - name: "Vive-attaque", + name: "Vive-Attaque", effect: "Le lanceur fonce sur la cible si rapidement qu’on parvient à peine à le discerner. Frappe en priorité." }, "rage": { @@ -1090,7 +1090,7 @@ export const move: MoveTranslationEntries = { effect: "Imite la cible et copie son talent." }, "wish": { - name: "Voeu", + name: "Vœu", effect: "Un vœu qui permet au lanceur ou au Pokémon entrant sur le terrain au tour suivant de récupérer la moitié des PV max du lanceur." }, "assist": { @@ -1410,7 +1410,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur projette une aura aquatique sur la cible, et peut la rendre confuse." }, "doomDesire": { - name: "Voeu Destructeur", + name: "Vœu Destructeur", effect: "Le lanceur génère une sphère lumineuse qu’il projette sur l’ennemi deux tours plus tard." }, "psychoBoost": { @@ -1442,7 +1442,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur effectue une rotation rapide et frappe la cible. Plus la Vitesse du lanceur est basse par rapport à celle de la cible, plus il inflige de dégâts." }, "healingWish": { - name: "Voeu Soin", + name: "Vœu Soin", effect: "Le lanceur tombe K.O. pour soigner les altérations de statut et les PV du Pokémon qui viendra le remplacer sur le terrain." }, "brine": { @@ -1786,7 +1786,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur fait flotter des pierres autour de la cible qui blessent tout adversaire entrant au combat." }, "grassKnot": { - name: "Noeud Herbe", + name: "Nœud Herbe", effect: "Le lanceur fait des nœuds dans l’herbe pour faire trébucher la cible. Plus la cible est lourde, plus la puissance de cette capacité augmente." }, "chatter": { @@ -2030,7 +2030,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur emmène l’ennemi dans les airs au premier tour et le lâche dans le vide au second. L’ennemi saisi ne peut pas attaquer." }, "shiftGear": { - name: "Chgt Vitesse", + name: "Change-Vitesse", effect: "Le lanceur fait tourner ses engrenages. Cela augmente son Attaque et augmente beaucoup sa Vitesse." }, "circleThrow": { @@ -2858,7 +2858,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur attaque avec un rayon de lumière mystérieux. Ignore le talent de la cible." }, "tearfulLook": { - name: "Larme à l’Oeil", + name: "Larme à l’Œil", effect: "Le lanceur regarde la cible avec des yeux remplis de larmes. Celle-ci perd toute combativité et voit son Attaque et son Attaque Spéciale baisser." }, "zingZap": { @@ -3362,7 +3362,7 @@ export const move: MoveTranslationEntries = { effect: "Le lanceur entaille la cible avec ses ailes renforcées par une émanation psychique. Taux de critiques élevé. Cela augmente la Vitesse du lanceur." }, "bitterMalice": { - name: "Coeur de Rancoeur", + name: "Cœur de Rancœur", effect: "Une rancœur glaciale frappe la cible et baisse son Attaque." }, "shelter": { From b43a6ec764db9c5cba39385d5e6e53875e2d4e46 Mon Sep 17 00:00:00 2001 From: Xavion3 Date: Mon, 29 Apr 2024 00:52:43 +1000 Subject: [PATCH 23/23] Fix end catching (#332) * Fix end catching * Remove fusion code --- src/phases.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/phases.ts b/src/phases.ts index 640f475927e..fdca671dbff 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1697,7 +1697,7 @@ export class CommandPhase extends FieldPhase { } break; case Command.BALL: - if (this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1)) { + if (this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || (this.scene.getEnemyField().filter(p => p.isActive(true)).some(p => !p.scene.gameData.dexData[p.species.speciesId].caughtAttr) && this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1))) { this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex); this.scene.ui.setMode(Mode.MESSAGE); this.scene.ui.showText(i18next.t('menu:noPokeballForce'), null, () => {