From 0de816cbfb5d685fdbad09eda4149e172e38973b Mon Sep 17 00:00:00 2001 From: joao-m-santos Date: Fri, 12 Apr 2024 18:13:40 +0200 Subject: [PATCH 01/14] Fix PWA on Chromium browsers --- logo512.png | Bin 0 -> 6198 bytes manifest.json | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 logo512.png diff --git a/logo512.png b/logo512.png new file mode 100644 index 0000000000000000000000000000000000000000..7fdde1f6b829693f13355b8bdd4c8f05439f3443 GIT binary patch literal 6198 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 Date: Fri, 12 Apr 2024 14:40:14 -0500 Subject: [PATCH 02/14] Update Gen 4 & 9 egg moves --- src/data/ability.ts | 2 +- src/data/egg-moves.ts | 268 +++++++++++++++++++++--------------------- 2 files changed, 135 insertions(+), 135 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index c9217e17ac5..b8c19ef9fb5 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -2091,7 +2091,7 @@ export function initAbilities() { .bypassFaint() .ignorable(), new Ability(Abilities.SHED_SKIN, "Shed Skin", "The Pokémon may heal its own status conditions by shedding its skin.", 3) - .conditionalAttr(pokemon => !Utils.randSeedInt(3), PostTurnResetStatusAbAttr), + .conditionalAttr(pokemon => !Utils.randSeedInt(3), PostTurnResetStatusAbAttr), new Ability(Abilities.GUTS, "Guts", "It's so gutsy that having a status condition boosts the Pokémon's Attack stat.", 3) .attr(BypassBurnDamageReductionAbAttr) .conditionalAttr(pokemon => !!pokemon.status, BattleStatMultiplierAbAttr, BattleStat.ATK, 1.5), diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts index 1413bc4bf41..63067b61658 100644 --- a/src/data/egg-moves.ts +++ b/src/data/egg-moves.ts @@ -26,7 +26,7 @@ export const speciesEggMoves = { [Species.MEOWTH]: [ Moves.COVET, Moves.HAPPY_HOUR, Moves.PARTING_SHOT, Moves.MAKE_IT_RAIN ], [Species.PSYDUCK]: [ Moves.MYSTICAL_POWER, Moves.AQUA_STEP, Moves.PSYCHIC, Moves.MIND_BLOWN ], [Species.MANKEY]: [ Moves.BEAT_UP, Moves.PLAY_ROUGH, Moves.TAUNT, Moves.CLOSE_COMBAT ], - [Species.GROWLITHE]: [ Moves.THUNDER_FANG, Moves.HYPER_VOICE, Moves.NOBLE_ROAR, Moves.RAGING_FURY ], + [Species.GROWLITHE]: [ Moves.TRAILBLAZE, Moves.U_TURN, Moves.MORNING_SUN, Moves.V_CREATE ], [Species.POLIWAG]: [ Moves.BOUNCY_BUBBLE, Moves.AURORA_BEAM, Moves.ZEN_HEADBUTT, Moves.SURGING_STRIKES ], [Species.ABRA]: [ Moves.MYSTICAL_FIRE, Moves.HEX, Moves.MAGICAL_LEAF, Moves.MYSTICAL_POWER ], [Species.MACHOP]: [ Moves.BULLET_PUNCH, Moves.KNOCK_OFF, Moves.COACHING, Moves.CLOSE_COMBAT ], @@ -41,7 +41,7 @@ export const speciesEggMoves = { [Species.SEEL]: [ Moves.FREEZE_DRY, Moves.CHILLING_WATER, Moves.ENCORE, Moves.RECOVER ], [Species.GRIMER]: [ Moves.SHADOW_SNEAK, Moves.CURSE, Moves.CORROSIVE_GAS, Moves.PAIN_SPLIT ], [Species.SHELLDER]: [ Moves.BODY_PRESS, Moves.WATER_SHURIKEN, Moves.BANEFUL_BUNKER, Moves.RECOVER ], - [Species.GASTLY]: [ Moves.CLEAR_SMOG, Moves.THIEF, Moves.NASTY_PLOT, Moves.SPECTRAL_THIEF ], + [Species.GASTLY]: [ Moves.CLEAR_SMOG, Moves.NIGHT_DAZE, Moves.NASTY_PLOT, Moves.SPECTRAL_THIEF ], [Species.ONIX]: [ Moves.SHORE_UP, Moves.DRAGON_TAIL, Moves.HEAD_SMASH, Moves.BODY_PRESS ], [Species.DROWZEE]: [ Moves.DREAM_EATER, Moves.METRONOME, Moves.NIGHTMARE, Moves.SYNCHRONOISE ], [Species.KRABBY]: [ Moves.CRUSH_GRIP, Moves.CEASELESS_EDGE, Moves.SHORE_UP, Moves.SHELL_SMASH ], @@ -72,7 +72,7 @@ export const speciesEggMoves = { [Species.DRATINI]: [ Moves.SCALE_SHOT, Moves.AQUA_JET, Moves.WHIRLWIND, Moves.SHED_TAIL ], [Species.MEWTWO]: [ Moves.PSYBLADE, Moves.POLTERGEIST, Moves.ARMOR_CANNON, Moves.PSYCHO_BOOST ], [Species.MEW]: [ Moves.PSYSTRIKE, Moves.DECORATE, Moves.REVIVAL_BLESSING, Moves.SKETCH ], - [Species.CHIKORITA]: [ Moves.ROCK_SLIDE, Moves.LUNGE, Moves.DRAGON_DANCE, Moves.SAPPY_SEED ], + [Species.CHIKORITA]: [ Moves.ROCK_SLIDE, Moves.PLAY_ROUGH, Moves.DRAGON_DANCE, Moves.SAPPY_SEED ], [Species.CYNDAQUIL]: [ Moves.EXTRASENSORY, Moves.SCORCHING_SANDS, Moves.FIERY_DANCE, Moves.NASTY_PLOT ], [Species.TOTODILE]: [ Moves.AQUA_JET, Moves.DRAGON_DANCE, Moves.ICE_PUNCH, Moves.WAVE_CRASH ], [Species.SENTRET]: [ Moves.TIDY_UP, Moves.TAIL_SLAP, Moves.ENCORE, Moves.EXTREME_SPEED ], @@ -149,7 +149,7 @@ export const speciesEggMoves = { [Species.MAWILE]: [ Moves.SPIRIT_BREAK, Moves.JAW_LOCK, Moves.HYPER_FANG, Moves.HARD_PRESS ], [Species.ARON]: [ Moves.HEAD_SMASH, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.BEHEMOTH_BASH ], [Species.MEDITITE]: [ Moves.TRAILBLAZE, Moves.FAKE_OUT, Moves.BULLET_PUNCH, Moves.PSYBLADE ], - [Species.ELECTRIKE]: [ Moves.NUZZLE, Moves.JAW_LOCK, Moves.FLAME_CHARGE, Moves.WILDBOLT_STORM ], + [Species.ELECTRIKE]: [ Moves.NUZZLE, Moves.TEMPER_FLARE, Moves.TRAILBLAZE, Moves.WILDBOLT_STORM ], [Species.PLUSLE]: [ Moves.FLAMETHROWER, Moves.PARABOLIC_CHARGE, Moves.ALLURING_VOICE, Moves.TAIL_GLOW ], [Species.MINUN]: [ Moves.ICE_BEAM, Moves.PARABOLIC_CHARGE, Moves.ALLURING_VOICE, Moves.TAIL_GLOW ], [Species.VOLBEAT]: [ Moves.FLAME_CHARGE, Moves.LUNGE, Moves.ACROBATICS, Moves.VICTORY_DANCE ], @@ -198,66 +198,66 @@ export const speciesEggMoves = { [Species.RAYQUAZA]: [ Moves.OBLIVION_WING, Moves.DRAGON_DARTS, Moves.SUPERCELL_SLAM, Moves.V_CREATE ], [Species.JIRACHI]: [ Moves.IRON_HEAD, Moves.TRI_ATTACK, Moves.EERIE_SPELL, Moves.TAKE_HEART ], [Species.DEOXYS]: [ Moves.CLOSE_COMBAT, Moves.METEOR_BEAM, Moves.NIGHT_DAZE, Moves.PHOTON_GEYSER ], - [Species.TURTWIG]: [ Moves.HEADLONG_RUSH, Moves.SHELTER, Moves.BODY_PRESS, Moves.FRENZY_PLANT ], - [Species.CHIMCHAR]: [ Moves.RAGING_FURY, Moves.BURN_UP, Moves.WORK_UP, Moves.WICKED_BLOW ], - [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.FLIP_TURN, Moves.NOBLE_ROAR, Moves.SUNSTEEL_STRIKE ], - [Species.STARLY]: [ Moves.SWORDS_DANCE, Moves.OUTRAGE, Moves.FLAME_CHARGE, Moves.COLLISION_COURSE ], - [Species.BIDOOF]: [ Moves.SUPER_FANG, Moves.LIQUIDATION, Moves.BODY_PRESS, Moves.NO_RETREAT ], - [Species.KRICKETOT]: [ Moves.BOOMBURST, Moves.ALLURING_VOICE, Moves.SPARKLING_ARIA, Moves.QUIVER_DANCE ], - [Species.SHINX]: [ Moves.PSYCHIC_FANGS, Moves.JAW_LOCK, Moves.FACADE, Moves.VOLT_TACKLE ], - [Species.BUDEW]: [ Moves.FLORAL_HEALING, Moves.ACID_SPRAY, Moves.SPORE, Moves.SEED_FLARE ], - [Species.CRANIDOS]: [ Moves.STONE_AXE, Moves.DRAGON_RUSH, Moves.SUPERPOWER, Moves.ROCK_WRECKER ], - [Species.SHIELDON]: [ Moves.COSMIC_POWER, Moves.BODY_PRESS, Moves.KINGS_SHIELD, Moves.BEHEMOTH_BASH ], - [Species.BURMY]: [ Moves.BODY_PRESS, Moves.TOXIC, Moves.RECOVER, Moves.SHELTER ], - [Species.COMBEE]: [ Moves.TWINEEDLE, Moves.AIR_SLASH, Moves.KINGS_SHIELD, Moves.SPORE ], - [Species.PACHIRISU]: [ Moves.SUPER_FANG, Moves.EXTREME_SPEED, Moves.SUPERPOWER, Moves.VOLT_TACKLE ], - [Species.BUIZEL]: [ Moves.JET_PUNCH, Moves.ICE_PUNCH, Moves.HIGH_HORSEPOWER, Moves.SURGING_STRIKES ], - [Species.CHERUBI]: [ Moves.FLOWER_SHIELD, Moves.GRASSY_TERRAIN, Moves.GRASSY_GLIDE, Moves.SPORE ], - [Species.SHELLOS]: [ Moves.LIFE_DEW, Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.FREEZY_FROST ], - [Species.DRIFLOON]: [ Moves.THIEF, Moves.ACUPRESSURE, Moves.WILL_O_WISP, Moves.HURRICANE ], - [Species.BUNEARY]: [ Moves.TRIPLE_AXEL, Moves.TROP_KICK, Moves.FAKE_OUT, Moves.SWORDS_DANCE ], - [Species.GLAMEOW]: [ Moves.U_TURN, Moves.STOMPING_TANTRUM, Moves.COVET, Moves.WICKED_BLOW ], - [Species.CHINGLING]: [ Moves.BUZZY_BUZZ, Moves.BOOMBURST, Moves.TORCH_SONG, Moves.EERIE_SPELL ], - [Species.STUNKY]: [ Moves.CORROSIVE_GAS, Moves.BURNING_JEALOUSY, Moves.SUPER_FANG, Moves.WICKED_BLOW ], - [Species.BRONZOR]: [ Moves.PSYSHIELD_BASH, Moves.COSMIC_POWER, Moves.MIRROR_COAT, Moves.TACHYON_CUTTER ], - [Species.BONSLY]: [ Moves.INGRAIN, Moves.GRASSY_GLIDE, Moves.EXTREME_SPEED, Moves.HEAD_SMASH ], - [Species.MIME_JR]: [ Moves.CALM_MIND, Moves.ATTRACT, Moves.TAUNT, Moves.GLITZY_GLOW ], - [Species.HAPPINY]: [ Moves.HAPPY_HOUR, Moves.SEISMIC_TOSS, Moves.STEALTH_ROCK, Moves.INSTRUCT ], - [Species.CHATOT]: [ Moves.SPARKLING_ARIA, Moves.BOOMBURST, Moves.TAUNT, Moves.TORCH_SONG ], - [Species.SPIRITOMB]: [ Moves.POLTERGEIST, Moves.PAIN_SPLIT, Moves.BURNING_JEALOUSY, Moves.MAKE_IT_RAIN ], - [Species.GIBLE]: [ Moves.DRAGON_HAMMER, Moves.AQUA_JET, Moves.POISON_FANG, Moves.GLAIVE_RUSH ], - [Species.MUNCHLAX]: [ Moves.TEATIME, Moves.BODY_PRESS, Moves.HEAVY_SLAM, Moves.SLACK_OFF ], - [Species.RIOLU]: [ Moves.UPPER_HAND, Moves.ARM_THRUST, Moves.ICE_PUNCH, Moves.PLAY_ROUGH ], - [Species.HIPPOPOTAS]: [ Moves.BODY_PRESS, Moves.HARD_PRESS, Moves.SCORCHING_SANDS, Moves.LANDS_WRATH ], - [Species.SKORUPI]: [ Moves.COIL, Moves.DIRE_CLAW, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], - [Species.CROAGUNK]: [ Moves.GUNK_SHOT, Moves.LASH_OUT, Moves.MACH_PUNCH, Moves.SWORDS_DANCE ], - [Species.CARNIVINE]: [ Moves.SNAP_TRAP, Moves.JAW_LOCK, Moves.RAGE_POWDER, Moves.FLOWER_TRICK ], - [Species.FINNEON]: [ Moves.QUIVER_DANCE, Moves.BOUNCY_BUBBLE, Moves.MOONBLAST, Moves.MOONGEIST_BEAM ], - [Species.MANTYKE]: [ Moves.BOUNCY_BUBBLE, Moves.ICY_WIND, Moves.TAILWIND, Moves.RECOVER ], - [Species.SNOVER]: [ Moves.DRUM_BEATING, Moves.ICE_HAMMER, Moves.AURORA_VEIL, Moves.IVY_CUDGEL ], - [Species.ROTOM]: [ Moves.FREEZE_DRY, Moves.FLAME_BURST, Moves.WATER_PULSE, Moves.AIR_SLASH ], - [Species.UXIE]: [ Moves.REVELATION_DANCE, Moves.TEETER_DANCE, Moves.DARK_PULSE, Moves.PRISMATIC_LASER ], - [Species.MESPRIT]: [ Moves.REVELATION_DANCE, Moves.LUNAR_DANCE, Moves.MOONBLAST, Moves.PRISMATIC_LASER ], - [Species.AZELF]: [ Moves.REVELATION_DANCE, Moves.DRAGON_DANCE, Moves.PHANTOM_FORCE, Moves.PRISMATIC_LASER ], - [Species.DIALGA]: [ Moves.SPACIAL_REND, Moves.EXTREME_SPEED, Moves.GEAR_GRIND, Moves.FREEZING_GLARE ], - [Species.PALKIA]: [ Moves.ROAR_OF_TIME, Moves.LIQUIDATION, Moves.AQUA_CUTTER, Moves.DRAGON_ENERGY ], - [Species.HEATRAN]: [ Moves.FIRE_LASH, Moves.HEAVY_SLAM, Moves.FIERY_DANCE, Moves.BEHEMOTH_BASH ], - [Species.REGIGIGAS]: [ Moves.MIGHTY_CLEAVE, Moves.PRECIPICE_BLADES, Moves.EXTREME_SPEED, Moves.SKILL_SWAP ], - [Species.GIRATINA]: [ Moves.DRAGON_HAMMER, Moves.SPACIAL_REND, Moves.SPIRIT_SHACKLE, Moves.ASTRAL_BARRAGE ], - [Species.CRESSELIA]: [ Moves.MIST_BALL, Moves.LUMINA_CRASH, Moves.INFERNAL_PARADE, Moves.HYPERSPACE_HOLE ], - [Species.PHIONE]: [ Moves.SPARKLING_ARIA, Moves.MAKE_IT_RAIN, Moves.TAIL_GLOW, Moves.LIGHT_OF_RUIN ], - [Species.MANAPHY]: [ Moves.BOUNCY_BUBBLE, Moves.RECOVER, Moves.MOONBLAST, Moves.QUIVER_DANCE ], - [Species.DARKRAI]: [ Moves.NIGHT_DAZE, Moves.KNOCK_OFF, Moves.BITTER_MALICE, Moves.SHADOW_FORCE ], - [Species.SHAYMIN]: [ Moves.FLOWER_SHIELD, Moves.FLOWER_TRICK, Moves.CHLOROBLAST, Moves.FLEUR_CANNON ], - [Species.ARCEUS]: [ Moves.SKETCH, Moves.ROAR_OF_TIME, Moves.SPACIAL_REND, Moves.GEOMANCY ], + [Species.TURTWIG]: [ Moves.STONE_AXE, Moves.SHELTER, Moves.BODY_PRESS, Moves.SHELL_SMASH ], + [Species.CHIMCHAR]: [ Moves.SWORDS_DANCE, Moves.THUNDEROUS_KICK, Moves.ICE_PUNCH, Moves.SACRED_FIRE ], + [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.SPIKES, 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.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.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.BOUNCY_BUBBLE ], + [Species.DRIFLOON]: [ Moves.WILL_O_WISP, Moves.SHADOW_BONE, 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.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.BONSLY]: [ Moves.STONE_AXE, Moves.LEAF_BLADE, Moves.STRENGTH_SAP, Moves.HEAD_SMASH ], + [Species.MIME_JR]: [ Moves.CALM_MIND, Moves.NONE, Moves.WILL_O_WISP, Moves.TWIN_BEAM ], + [Species.HAPPINY]: [ Moves.IRON_DEFENSE, Moves.SEISMIC_TOSS, Moves.STEALTH_ROCK, Moves.SIZZLY_SLIDE ], + [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.RIOLU]: [ Moves.THUNDEROUS_KICK, Moves.FLASH_CANNON, Moves.TRIPLE_AXEL, Moves.DOUBLE_IRON_BASH ], + [Species.HIPPOPOTAS]: [ Moves.BODY_PRESS, Moves.STONE_AXE, Moves.SALT_CURE, Moves.IRON_DEFENSE ], + [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.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.ROTOM]: [ Moves.RECOVER, Moves.FIERY_DANCE, Moves.SPLISHY_SPLASH, Moves.ELECTRO_DRIFT ], + [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.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.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.NONE, Moves.SEARING_SHOT, Moves.MALIGNANT_CHAIN ], + [Species.SHAYMIN]: [ Moves.SEARING_SHOT, Moves.HURRICANE, Moves.MATCHA_GOTCHA, Moves.CHLOROBLAST ], + [Species.ARCEUS]: [ Moves.QUIVER_DANCE, Moves.MULTI_ATTACK, Moves.VICTORY_DANCE, Moves.COLLISION_COURSE ], [Species.VICTINI]: [ Moves.VICTORY_DANCE, Moves.FUSION_BOLT, Moves.GLACIATE, Moves.BLUE_FLARE ], [Species.SNIVY]: [ Moves.SYNTHESIS, Moves.SAPPY_SEED, Moves.POWER_GEM, Moves.DRACO_METEOR ], [Species.TEPIG]: [ Moves.SUCKER_PUNCH, Moves.SLACK_OFF, Moves.MACH_PUNCH, Moves.VICTORY_DANCE ], [Species.OSHAWOTT]: [ Moves.SECRET_SWORD, Moves.AQUA_CUTTER, Moves.NASTY_PLOT, Moves.BEHEMOTH_BLADE ], [Species.PATRAT]: [ Moves.COVET, Moves.EXTREME_SPEED, Moves.ACUPRESSURE, Moves.LAST_RESORT ], [Species.LILLIPUP]: [ Moves.COVET, Moves.LAST_RESPECTS, Moves.HIGH_HORSEPOWER, Moves.NO_RETREAT ], - [Species.PURRLOIN]: [ Moves.THIEF, Moves.SWORDS_DANCE, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], - [Species.PANSAGE]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.STRENGTH_SAP, Moves.FRENZY_PLANT ], + [Species.PURRLOIN]: [ Moves.PSYCHIC_FANGS, Moves.SWORDS_DANCE, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], + [Species.PANSAGE]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.TRAILBLAZE, Moves.FRENZY_PLANT ], [Species.PANSEAR]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.SCORCHING_SANDS, Moves.BLAST_BURN ], [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.FREEZE_DRY, Moves.HYDRO_CANNON ], [Species.MUNNA]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.MYSTICAL_POWER ], @@ -312,7 +312,7 @@ export const speciesEggMoves = { [Species.MIENFOO]: [ Moves.TIDY_UP, Moves.ICE_SPINNER, Moves.SUPERCELL_SLAM, Moves.BRAVE_BIRD ], [Species.DRUDDIGON]: [ Moves.SPIKY_SHIELD, Moves.STOMPING_TANTRUM, Moves.CLANGOROUS_SOUL, Moves.DIAMOND_STORM ], [Species.GOLETT]: [ Moves.BULK_UP, Moves.RAGE_FIST, Moves.HEADLONG_RUSH, Moves.DOUBLE_IRON_BASH ], - [Species.PAWNIARD]: [ Moves.ATTACK_ORDER, Moves.CEASELESS_EDGE, Moves.AQUA_CUTTER, Moves.PSYBLADE ], + [Species.PAWNIARD]: [ Moves.SUCKER_PUNCH, Moves.CEASELESS_EDGE, Moves.AQUA_CUTTER, Moves.PSYBLADE ], [Species.BOUFFALANT]: [ Moves.EARTHQUAKE, Moves.FLAME_CHARGE, Moves.IRON_HEAD, Moves.RAGING_BULL ], [Species.RUFFLET]: [ Moves.FLOATY_FALL, Moves.DAZZLING_GLEAM, Moves.HEAT_WAVE, Moves.BOLT_BEAK ], [Species.VULLABY]: [ Moves.RUINATION, Moves.BODY_PRESS, Moves.ROOST, Moves.BADDY_BAD ], @@ -471,78 +471,78 @@ export const speciesEggMoves = { [Species.SPECTRIER]: [ Moves.EARTH_POWER, Moves.PSYCHIC, Moves.GLARE, Moves.ASTRAL_BARRAGE ], [Species.CALYREX]: [ Moves.POWER_GEM, Moves.ICE_BEAM, Moves.SHADOW_BALL, Moves.MALIGNANT_CHAIN ], [Species.ENAMORUS]: [ Moves.SPIRIT_BREAK, Moves.TAKE_HEART, Moves.STORED_POWER, Moves.OVERHEAT ], - [Species.SPRIGATITO]: [ Moves.PETAL_BLIZZARD, Moves.COPYCAT, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ], - [Species.FUECOCO]: [ Moves.EARTHQUAKE, Moves.SLACK_OFF, Moves.INFERNAL_PARADE, Moves.SEARING_SHOT ], - [Species.QUAXLY]: [ Moves.HIGH_JUMP_KICK, Moves.ROOST, Moves.REVELATION_DANCE, Moves.SURGING_STRIKES ], - [Species.LECHONK]: [ Moves.PLUCK, Moves.RECYCLE, Moves.POWER_TRIP, Moves.FILLET_AWAY ], - [Species.TAROUNTULA]: [ Moves.STEAMROLLER, Moves.LUNGE, Moves.SUCKER_PUNCH, Moves.FIRST_IMPRESSION ], - [Species.NYMBLE]: [ Moves.POWER_UP_PUNCH, Moves.KNOCK_OFF, Moves.LEECH_LIFE, Moves.WICKED_BLOW ], - [Species.PAWMI]: [ Moves.DRAIN_PUNCH, Moves.WISH, Moves.HELPING_HAND, Moves.VOLT_TACKLE ], - [Species.TANDEMAUS]: [ Moves.BITE, Moves.FEINT, Moves.BARRAGE, Moves.BOOMBURST ], - [Species.FIDOUGH]: [ Moves.COPYCAT, Moves.WISH, Moves.COVET, Moves.MAGICAL_TORQUE ], - [Species.SMOLIV]: [ Moves.STRENGTH_SAP, Moves.SYNTHESIS, Moves.WEATHER_BALL, Moves.CHLOROBLAST ], - [Species.SQUAWKABILLY]: [ Moves.PARTING_SHOT, Moves.FINAL_GAMBIT, Moves.DOUBLE_EDGE, Moves.BOOMBURST ], - [Species.NACLI]: [ Moves.BODY_PRESS, Moves.POWER_GEM, Moves.EXPLOSION, Moves.PRECIPICE_BLADES ], - [Species.CHARCADET]: [ Moves.DISABLE, Moves.FLASH_CANNON, Moves.THIEF, Moves.SPECTRAL_THIEF ], - [Species.TADBULB]: [ Moves.MUDDY_WATER, Moves.PARABOLIC_CHARGE, Moves.NUZZLE, Moves.SURF ], - [Species.WATTREL]: [ Moves.FEATHER_DANCE, Moves.WEATHER_BALL, Moves.ENDEAVOR, Moves.BOLT_BEAK ], - [Species.MASCHIFF]: [ Moves.BADDY_BAD, Moves.RETALIATE, Moves.ENDEAVOR, Moves.PLAY_ROUGH ], - [Species.SHROODLE]: [ Moves.COPYCAT, Moves.SUPER_FANG, Moves.TOXIC, Moves.SKETCH ], - [Species.BRAMBLIN]: [ Moves.SHADOW_SNEAK, Moves.STRENGTH_SAP, Moves.POLTERGEIST, Moves.SAPPY_SEED ], - [Species.TOEDSCOOL]: [ Moves.RAPID_SPIN, Moves.KNOCK_OFF, Moves.TOXIC, Moves.NOXIOUS_TORQUE ], - [Species.KLAWF]: [ Moves.ANCIENT_POWER, Moves.KNOCK_OFF, Moves.CRABHAMMER, Moves.DIRE_CLAW ], - [Species.CAPSAKID]: [ Moves.RAGE_POWDER, Moves.ROLLOUT, Moves.LEECH_SEED, Moves.FIERY_DANCE ], - [Species.RELLOR]: [ Moves.COSMIC_POWER, Moves.RECOVER, Moves.WEATHER_BALL, Moves.GLITZY_GLOW ], - [Species.FLITTLE]: [ Moves.GLITZY_GLOW, Moves.HYPNOSIS, Moves.ROOST, Moves.OBLIVION_WING ], - [Species.TINKATINK]: [ Moves.FALSE_SURRENDER, Moves.DRAIN_PUNCH, Moves.ICE_HAMMER, Moves.NO_RETREAT ], - [Species.WIGLETT]: [ Moves.FINAL_GAMBIT, Moves.THIEF, Moves.IRON_HEAD, Moves.SURGING_STRIKES ], - [Species.BOMBIRDIER]: [ Moves.SKY_ATTACK, Moves.POWER_TRIP, Moves.SUCKER_PUNCH, Moves.POPULATION_BOMB ], - [Species.FINIZEN]: [ Moves.BOUNCE, Moves.DRAIN_PUNCH, Moves.COUNTER, Moves.BOOMBURST ], - [Species.VAROOM]: [ Moves.TOXIC, Moves.GEAR_GRIND, Moves.BLAZING_TORQUE, Moves.NOXIOUS_TORQUE ], - [Species.CYCLIZAR]: [ Moves.AQUA_TAIL, Moves.IRON_TAIL, Moves.POWER_WHIP, Moves.DRAGON_DANCE ], - [Species.ORTHWORM]: [ Moves.METAL_BURST, Moves.COIL, Moves.BODY_PRESS, Moves.DRAGON_HAMMER ], - [Species.GLIMMET]: [ Moves.PURIFY, Moves.MOONBLAST, Moves.FLASH_CANNON, Moves.BANEFUL_BUNKER ], - [Species.GREAVARD]: [ Moves.SHADOW_SNEAK, Moves.DISABLE, Moves.YAWN, Moves.SHADOW_FORCE ], - [Species.FLAMIGO]: [ Moves.DOUBLE_TEAM, Moves.SKY_ATTACK, Moves.VICTORY_DANCE, Moves.HIGH_JUMP_KICK ], - [Species.CETODDLE]: [ Moves.ICICLE_CRASH, Moves.SUPERPOWER, Moves.ENTRAINMENT, Moves.BELLY_DRUM ], - [Species.VELUZA]: [ Moves.RECOVER, Moves.THRASH, Moves.KOWTOW_CLEAVE, Moves.PSYBLADE ], - [Species.DONDOZO]: [ Moves.OUTRAGE, Moves.YAWN, Moves.HEAVY_SLAM, Moves.FISHIOUS_REND ], - [Species.TATSUGIRI]: [ Moves.RAPID_SPIN, Moves.BATON_PASS, Moves.MIMIC, Moves.COUNTER ], - [Species.GREAT_TUSK]: [ Moves.HIGH_HORSEPOWER, Moves.DRILL_RUN, Moves.SUPERPOWER, Moves.BEHEMOTH_BASH ], - [Species.SCREAM_TAIL]: [ Moves.PSYCHIC, Moves.MOONBLAST, Moves.MOONLIGHT, Moves.LIGHT_OF_RUIN ], - [Species.BRUTE_BONNET]: [ Moves.CRUNCH, Moves.SAPPY_SEED, Moves.FRENZY_PLANT, Moves.STRENGTH_SAP ], - [Species.FLUTTER_MANE]: [ Moves.MOONLIGHT, Moves.SNARL, Moves.EARTH_POWER, Moves.MOONGEIST_BEAM ], - [Species.SLITHER_WING]: [ Moves.DRAIN_PUNCH, Moves.VICTORY_DANCE, Moves.SIZZLY_SLIDE, Moves.COLLISION_COURSE ], - [Species.SANDY_SHOCKS]: [ Moves.PARABOLIC_CHARGE, Moves.SCORCHING_SANDS, Moves.CALM_MIND, Moves.ELECTRO_SHOT ], - [Species.IRON_TREADS]: [ Moves.SUPERCELL_SLAM, Moves.BULK_UP, Moves.HEAD_SMASH, Moves.COLLISION_COURSE ], - [Species.IRON_BUNDLE]: [ Moves.PARABOLIC_CHARGE, Moves.SCALD, Moves.NASTY_PLOT, Moves.GLACIATE ], - [Species.IRON_HANDS]: [ Moves.MACH_PUNCH, Moves.HIGH_HORSEPOWER, Moves.MAT_BLOCK, Moves.PLASMA_FISTS ], - [Species.IRON_JUGULIS]: [ Moves.FIERY_WRATH, Moves.FLAMETHROWER, Moves.NASTY_PLOT, Moves.OBLIVION_WING ], - [Species.IRON_MOTH]: [ Moves.PARABOLIC_CHARGE, Moves.QUIVER_DANCE, Moves.FLASH_CANNON, Moves.TORCH_SONG ], - [Species.IRON_THORNS]: [ Moves.DRAIN_PUNCH, Moves.SUPERPOWER, Moves.SHIFT_GEAR, Moves.FUSION_BOLT ], - [Species.FRIGIBAX]: [ Moves.ICICLE_SPEAR, Moves.AQUA_TAIL, Moves.FREEZE_DRY, Moves.DRAGON_RUSH ], - [Species.GIMMIGHOUL]: [ Moves.PAY_DAY, Moves.HAPPY_HOUR, Moves.MIRROR_COAT, Moves.TECHNO_BLAST ], - [Species.WO_CHIEN]: [ Moves.POLLEN_PUFF, Moves.FORESTS_CURSE, Moves.FOLLOW_ME, Moves.SPORE ], - [Species.CHIEN_PAO]: [ Moves.STOMPING_TANTRUM, Moves.WATERFALL, Moves.CHILLY_RECEPTION, Moves.BEHEMOTH_BLADE ], - [Species.TING_LU]: [ Moves.HEAT_CRASH, Moves.IRON_HEAD, Moves.HORN_LEECH, Moves.STRENGTH_SAP ], - [Species.CHI_YU]: [ Moves.ENERGY_BALL, Moves.STORED_POWER, Moves.SCALD, Moves.BLUE_FLARE ], - [Species.ROARING_MOON]: [ Moves.RAGING_FURY, Moves.FLOATY_FALL, Moves.OBSTRUCT, Moves.COLLISION_COURSE ], - [Species.IRON_VALIANT]: [ Moves.SECRET_SWORD, Moves.PLAY_ROUGH, Moves.QUIVER_DANCE, Moves.ELECTRO_DRIFT ], - [Species.KORAIDON]: [ Moves.HEAD_SMASH, Moves.BULK_UP, Moves.IRON_HEAD, Moves.CLANGOROUS_SOUL ], - [Species.MIRAIDON]: [ Moves.ICE_BEAM, Moves.CALM_MIND, Moves.FLASH_CANNON, Moves.CLANGOROUS_SOUL ], - [Species.WALKING_WAKE]: [ Moves.THUNDERCLAP, Moves.FLASH_CANNON, Moves.ALLURING_VOICE, Moves.ELECTRO_DRIFT ], - [Species.IRON_LEAVES]: [ Moves.MIGHTY_CLEAVE, Moves.TACHYON_CUTTER, Moves.SPIRIT_BREAK, Moves.COLLISION_COURSE ], - [Species.POLTCHAGEIST]: [ Moves.TEATIME, Moves.AROMATHERAPY, Moves.STRENGTH_SAP, Moves.MILK_DRINK ], - [Species.OKIDOGI]: [ Moves.JAW_LOCK, Moves.OBSTRUCT, Moves.DIRE_CLAW, Moves.MALIGNANT_CHAIN ], - [Species.MUNKIDORI]: [ Moves.PSYSTRIKE, Moves.MYSTICAL_FIRE, Moves.WILL_O_WISP, Moves.MALIGNANT_CHAIN ], - [Species.FEZANDIPITI]: [ Moves.DUAL_WINGBEAT, Moves.DRAINING_KISS, Moves.TRIPLE_AXEL, Moves.MALIGNANT_CHAIN ], - [Species.OGERPON]: [ Moves.JUNGLE_HEALING, Moves.NUZZLE, Moves.TRIPLE_AXEL, Moves.GIGATON_HAMMER ], - [Species.GOUGING_FIRE]: [ Moves.PLAY_ROUGH, Moves.HORN_LEECH, Moves.HYDRO_STEAM, Moves.ELECTRO_DRIFT ], - [Species.RAGING_BOLT]: [ Moves.HYDRO_STEAM, Moves.FLASH_CANNON, Moves.PARABOLIC_CHARGE, Moves.ELECTRO_DRIFT ], - [Species.IRON_BOULDER]: [ Moves.PSYBLADE, Moves.TACHYON_CUTTER, Moves.LEAF_BLADE, Moves.COLLISION_COURSE ], - [Species.IRON_CROWN]: [ Moves.MIGHTY_CLEAVE, Moves.PSYBLADE, Moves.AQUA_CUTTER, Moves.COLLISION_COURSE ], - [Species.TERAPAGOS]: [ Moves.EARTH_POWER, Moves.BOOMBURST, Moves.ICE_BEAM, Moves.DIAMOND_STORM ], - [Species.PECHARUNT]: [ Moves.VENOSHOCK, Moves.VENOM_DRENCH, Moves.HEX, Moves.BANEFUL_BUNKER ], + [Species.SPRIGATITO]: [ Moves.FIRE_LASH, 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.THUNDEROUS_KICK, Moves.ROOST, Moves.TROP_KICK, Moves.DRAGON_DANCE ], + [Species.LECHONK]: [ Moves.MILK_DRINK, Moves.BLAZING_TORQUE, Moves.NONE, Moves.HEAD_CHARGE ], + [Species.TAROUNTULA]: [ Moves.STRENGTH_SAP, Moves.LEECH_LIFE, Moves.PARTING_SHOT, Moves.STONE_AXE ], + [Species.NYMBLE]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.LEECH_LIFE, Moves.NONE ], + [Species.PAWMI]: [ Moves.ICE_SPINNER, Moves.WISH, Moves.PARTING_SHOT, Moves.PLASMA_FISTS ], + [Species.TANDEMAUS]: [ Moves.BATON_PASS, Moves.HEALING_WISH, Moves.NUZZLE, Moves.WICKED_BLOW ], + [Species.FIDOUGH]: [ Moves.MILK_DRINK, Moves.SIZZLY_SLIDE, Moves.PARTING_SHOT, Moves.MAGICAL_TORQUE ], + [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.NACLI]: [ Moves.BODY_PRESS, Moves.SPIKES, Moves.CURSE, Moves.DIAMOND_STORM ], + [Species.CHARCADET]: [ Moves.SACRED_SWORD, Moves.NONE, Moves.PHOTON_GEYSER, Moves.SPECTRAL_THIEF ], + [Species.TADBULB]: [ Moves.SLACK_OFF, Moves.MUDDY_WATER, Moves.EARTH_POWER, Moves.ELECTRO_SHOT ], + [Species.WATTREL]: [ Moves.NASTY_PLOT, Moves.TAILWIND, Moves.HEAT_WAVE, Moves.ELECTRO_DRIFT ], + [Species.MASCHIFF]: [ Moves.PARTING_SHOT, Moves.DARKEST_LARIAT, Moves.NUZZLE, Moves.COLLISION_COURSE ], + [Species.SHROODLE]: [ Moves.BLAZING_TORQUE, Moves.RAGING_BULL, Moves.TOXIC_SPIKES, Moves.TIDY_UP ], + [Species.BRAMBLIN]: [ Moves.TAILWIND, Moves.STRENGTH_SAP, Moves.CEASELESS_EDGE, Moves.POLTERGEIST ], + [Species.TOEDSCOOL]: [ Moves.STRENGTH_SAP, Moves.SCALD, Moves.PARTING_SHOT, Moves.SAPPY_SEED ], + [Species.KLAWF]: [ Moves.BODY_PRESS, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE, Moves.SHELL_SMASH ], + [Species.CAPSAKID]: [ Moves.STRENGTH_SAP, Moves.NONE, Moves.ICE_SPINNER, Moves.TORCH_SONG ], + [Species.RELLOR]: [ Moves.GLITZY_GLOW, Moves.RECOVER, Moves.MYSTICAL_FIRE, 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.STONE_AXE, Moves.SWORDS_DANCE, Moves.SUCKER_PUNCH, Moves.MIGHTY_CLEAVE ], + [Species.FINIZEN]: [ Moves.ICE_SPINNER, Moves.DRAIN_PUNCH, Moves.LEAF_BLADE, Moves.RECOVER ], + [Species.VAROOM]: [ Moves.COMBAT_TORQUE, Moves.GEAR_GRIND, Moves.BLAZING_TORQUE, Moves.NOXIOUS_TORQUE ], + [Species.CYCLIZAR]: [ Moves.BATON_PASS, Moves.BLAZING_TORQUE, Moves.RAGING_BULL, Moves.CLANGOROUS_SOUL ], + [Species.ORTHWORM]: [ Moves.STONE_AXE, Moves.CURSE, 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.RECOVER, Moves.COLLISION_COURSE ], + [Species.FLAMIGO]: [ Moves.SKY_UPPERCUT, Moves.TRIPLE_AXEL, Moves.THUNDER_PUNCH, Moves.VICTORY_DANCE ], + [Species.CETODDLE]: [ Moves.ICICLE_CRASH, Moves.TIDY_UP, Moves.RECOVER, Moves.COLLISION_COURSE ], + [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.NONE ], + [Species.GREAT_TUSK]: [ Moves.STONE_AXE, Moves.CEASELESS_EDGE, 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.SIZZLY_SLIDE, Moves.FLYING_PRESS ], + [Species.SANDY_SHOCKS]: [ Moves.SHORE_UP, Moves.ICE_BEAM, Moves.NASTY_PLOT, Moves.BUZZY_BUZZ ], + [Species.IRON_TREADS]: [ Moves.AURA_WHEEL, Moves.BULK_UP, Moves.SPIKES, 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.PLASMA_FISTS, Moves.CURSE, 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.AURA_WHEEL ], + [Species.FRIGIBAX]: [ Moves.DRAGON_HAMMER, Moves.BULK_UP, Moves.SHORE_UP, Moves.GLACIAL_LANCE ], + [Species.GIMMIGHOUL]: [ Moves.COSMIC_POWER, Moves.STORED_POWER, Moves.MIRROR_COAT, Moves.ASTRAL_BARRAGE ], + [Species.WO_CHIEN]: [ Moves.SPORE, Moves.SPIKES, Moves.SAPPY_SEED, Moves.JUNGLE_HEALING ], + [Species.CHIEN_PAO]: [ Moves.NONE, 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.HYDRO_STEAM, Moves.ERUPTION, Moves.TORCH_SONG ], + [Species.ROARING_MOON]: [ Moves.SIZZLY_SLIDE, 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.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.OKIDOGI]: [ Moves.MORNING_SUN, Moves.OBSTRUCT, Moves.DIRE_CLAW, Moves.COLLISION_COURSE ], + [Species.MUNKIDORI]: [ Moves.PSYSTRIKE, Moves.SEARING_SHOT, 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.STONE_AXE, 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.PARABOLIC_CHARGE, Moves.ELECTRO_DRIFT ], + [Species.IRON_BOULDER]: [ Moves.PSYBLADE, Moves.TACHYON_CUTTER, Moves.STONE_AXE, Moves.V_CREATE ], + [Species.IRON_CROWN]: [ Moves.NONE, Moves.SECRET_SWORD, Moves.PHOTON_GEYSER, Moves.ELECTRO_DRIFT ], + [Species.TERAPAGOS]: [ Moves.EARTH_POWER, Moves.BOOMBURST, Moves.ICE_BEAM, Moves.RECOVER ], + [Species.PECHARUNT]: [ Moves.TOXIC_SPIKES, Moves.BODY_PRESS, Moves.HEX, Moves.BANEFUL_BUNKER ], [Species.ALOLA_RATTATA]: [ Moves.STUFF_CHEEKS, Moves.BADDY_BAD, Moves.FLAME_WHEEL, Moves.RECYCLE ], [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.ICE_SHARD, Moves.CRUSH_CLAW, Moves.SPIN_OUT ], [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.HYPNOSIS, Moves.CHILLING_WATER, Moves.FREEZY_FROST ], @@ -568,9 +568,9 @@ export const speciesEggMoves = { [Species.HISUI_QWILFISH]: [ Moves.NUZZLE, Moves.SCALE_SHOT, Moves.SUPERSONIC, Moves.PARTING_SHOT ], [Species.HISUI_SNEASEL]: [ Moves.DRAIN_PUNCH, Moves.BULLET_PUNCH, Moves.FAKE_OUT, Moves.VICTORY_DANCE ], [Species.HISUI_ZORUA]: [ Moves.ALLURING_VOICE, Moves.GLARE, Moves.TORCH_SONG, Moves.TRANSFORM ], - [Species.PALDEA_TAUROS]: [ Moves.HEAD_CHARGE, Moves.BLAZE_KICK, Moves.AQUA_STEP, Moves.NO_RETREAT ], - [Species.PALDEA_WOOPER]: [ Moves.RECOVER, Moves.DOUBLE_KICK, Moves.ANCIENT_POWER, Moves.VENOM_DRENCH ], - [Species.BLOODMOON_URSALUNA]: [ Moves.GLARE, Moves.SCORCHING_SANDS, Moves.CALM_MIND, Moves.BOOMBURST ] + [Species.PALDEA_TAUROS]: [ Moves.THUNDEROUS_KICK, Moves.BLAZING_TORQUE, Moves.AQUA_STEP, Moves.NO_RETREAT ], + [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.BOOMBURST ] }; function parseEggMoves(content: string): void { From dcb4688c76a470eec6edfa767084c03f97b08c2d Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Fri, 12 Apr 2024 14:54:01 -0500 Subject: [PATCH 03/14] Revert "Update Gen 4 & 9 egg moves" This reverts commit eef83432ab360ef2c7356f45761923a69a2f2297. --- src/data/ability.ts | 2 +- src/data/egg-moves.ts | 268 +++++++++++++++++++++--------------------- 2 files changed, 135 insertions(+), 135 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index b8c19ef9fb5..c9217e17ac5 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -2091,7 +2091,7 @@ export function initAbilities() { .bypassFaint() .ignorable(), new Ability(Abilities.SHED_SKIN, "Shed Skin", "The Pokémon may heal its own status conditions by shedding its skin.", 3) - .conditionalAttr(pokemon => !Utils.randSeedInt(3), PostTurnResetStatusAbAttr), + .conditionalAttr(pokemon => !Utils.randSeedInt(3), PostTurnResetStatusAbAttr), new Ability(Abilities.GUTS, "Guts", "It's so gutsy that having a status condition boosts the Pokémon's Attack stat.", 3) .attr(BypassBurnDamageReductionAbAttr) .conditionalAttr(pokemon => !!pokemon.status, BattleStatMultiplierAbAttr, BattleStat.ATK, 1.5), diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts index 63067b61658..1413bc4bf41 100644 --- a/src/data/egg-moves.ts +++ b/src/data/egg-moves.ts @@ -26,7 +26,7 @@ export const speciesEggMoves = { [Species.MEOWTH]: [ Moves.COVET, Moves.HAPPY_HOUR, Moves.PARTING_SHOT, Moves.MAKE_IT_RAIN ], [Species.PSYDUCK]: [ Moves.MYSTICAL_POWER, Moves.AQUA_STEP, Moves.PSYCHIC, Moves.MIND_BLOWN ], [Species.MANKEY]: [ Moves.BEAT_UP, Moves.PLAY_ROUGH, Moves.TAUNT, Moves.CLOSE_COMBAT ], - [Species.GROWLITHE]: [ Moves.TRAILBLAZE, Moves.U_TURN, Moves.MORNING_SUN, Moves.V_CREATE ], + [Species.GROWLITHE]: [ Moves.THUNDER_FANG, Moves.HYPER_VOICE, Moves.NOBLE_ROAR, Moves.RAGING_FURY ], [Species.POLIWAG]: [ Moves.BOUNCY_BUBBLE, Moves.AURORA_BEAM, Moves.ZEN_HEADBUTT, Moves.SURGING_STRIKES ], [Species.ABRA]: [ Moves.MYSTICAL_FIRE, Moves.HEX, Moves.MAGICAL_LEAF, Moves.MYSTICAL_POWER ], [Species.MACHOP]: [ Moves.BULLET_PUNCH, Moves.KNOCK_OFF, Moves.COACHING, Moves.CLOSE_COMBAT ], @@ -41,7 +41,7 @@ export const speciesEggMoves = { [Species.SEEL]: [ Moves.FREEZE_DRY, Moves.CHILLING_WATER, Moves.ENCORE, Moves.RECOVER ], [Species.GRIMER]: [ Moves.SHADOW_SNEAK, Moves.CURSE, Moves.CORROSIVE_GAS, Moves.PAIN_SPLIT ], [Species.SHELLDER]: [ Moves.BODY_PRESS, Moves.WATER_SHURIKEN, Moves.BANEFUL_BUNKER, Moves.RECOVER ], - [Species.GASTLY]: [ Moves.CLEAR_SMOG, Moves.NIGHT_DAZE, Moves.NASTY_PLOT, Moves.SPECTRAL_THIEF ], + [Species.GASTLY]: [ Moves.CLEAR_SMOG, Moves.THIEF, Moves.NASTY_PLOT, Moves.SPECTRAL_THIEF ], [Species.ONIX]: [ Moves.SHORE_UP, Moves.DRAGON_TAIL, Moves.HEAD_SMASH, Moves.BODY_PRESS ], [Species.DROWZEE]: [ Moves.DREAM_EATER, Moves.METRONOME, Moves.NIGHTMARE, Moves.SYNCHRONOISE ], [Species.KRABBY]: [ Moves.CRUSH_GRIP, Moves.CEASELESS_EDGE, Moves.SHORE_UP, Moves.SHELL_SMASH ], @@ -72,7 +72,7 @@ export const speciesEggMoves = { [Species.DRATINI]: [ Moves.SCALE_SHOT, Moves.AQUA_JET, Moves.WHIRLWIND, Moves.SHED_TAIL ], [Species.MEWTWO]: [ Moves.PSYBLADE, Moves.POLTERGEIST, Moves.ARMOR_CANNON, Moves.PSYCHO_BOOST ], [Species.MEW]: [ Moves.PSYSTRIKE, Moves.DECORATE, Moves.REVIVAL_BLESSING, Moves.SKETCH ], - [Species.CHIKORITA]: [ Moves.ROCK_SLIDE, Moves.PLAY_ROUGH, Moves.DRAGON_DANCE, Moves.SAPPY_SEED ], + [Species.CHIKORITA]: [ Moves.ROCK_SLIDE, Moves.LUNGE, Moves.DRAGON_DANCE, Moves.SAPPY_SEED ], [Species.CYNDAQUIL]: [ Moves.EXTRASENSORY, Moves.SCORCHING_SANDS, Moves.FIERY_DANCE, Moves.NASTY_PLOT ], [Species.TOTODILE]: [ Moves.AQUA_JET, Moves.DRAGON_DANCE, Moves.ICE_PUNCH, Moves.WAVE_CRASH ], [Species.SENTRET]: [ Moves.TIDY_UP, Moves.TAIL_SLAP, Moves.ENCORE, Moves.EXTREME_SPEED ], @@ -149,7 +149,7 @@ export const speciesEggMoves = { [Species.MAWILE]: [ Moves.SPIRIT_BREAK, Moves.JAW_LOCK, Moves.HYPER_FANG, Moves.HARD_PRESS ], [Species.ARON]: [ Moves.HEAD_SMASH, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.BEHEMOTH_BASH ], [Species.MEDITITE]: [ Moves.TRAILBLAZE, Moves.FAKE_OUT, Moves.BULLET_PUNCH, Moves.PSYBLADE ], - [Species.ELECTRIKE]: [ Moves.NUZZLE, Moves.TEMPER_FLARE, Moves.TRAILBLAZE, Moves.WILDBOLT_STORM ], + [Species.ELECTRIKE]: [ Moves.NUZZLE, Moves.JAW_LOCK, Moves.FLAME_CHARGE, Moves.WILDBOLT_STORM ], [Species.PLUSLE]: [ Moves.FLAMETHROWER, Moves.PARABOLIC_CHARGE, Moves.ALLURING_VOICE, Moves.TAIL_GLOW ], [Species.MINUN]: [ Moves.ICE_BEAM, Moves.PARABOLIC_CHARGE, Moves.ALLURING_VOICE, Moves.TAIL_GLOW ], [Species.VOLBEAT]: [ Moves.FLAME_CHARGE, Moves.LUNGE, Moves.ACROBATICS, Moves.VICTORY_DANCE ], @@ -198,66 +198,66 @@ export const speciesEggMoves = { [Species.RAYQUAZA]: [ Moves.OBLIVION_WING, Moves.DRAGON_DARTS, Moves.SUPERCELL_SLAM, Moves.V_CREATE ], [Species.JIRACHI]: [ Moves.IRON_HEAD, Moves.TRI_ATTACK, Moves.EERIE_SPELL, Moves.TAKE_HEART ], [Species.DEOXYS]: [ Moves.CLOSE_COMBAT, Moves.METEOR_BEAM, Moves.NIGHT_DAZE, Moves.PHOTON_GEYSER ], - [Species.TURTWIG]: [ Moves.STONE_AXE, Moves.SHELTER, Moves.BODY_PRESS, Moves.SHELL_SMASH ], - [Species.CHIMCHAR]: [ Moves.SWORDS_DANCE, Moves.THUNDEROUS_KICK, Moves.ICE_PUNCH, Moves.SACRED_FIRE ], - [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.SPIKES, 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.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.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.BOUNCY_BUBBLE ], - [Species.DRIFLOON]: [ Moves.WILL_O_WISP, Moves.SHADOW_BONE, 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.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.BONSLY]: [ Moves.STONE_AXE, Moves.LEAF_BLADE, Moves.STRENGTH_SAP, Moves.HEAD_SMASH ], - [Species.MIME_JR]: [ Moves.CALM_MIND, Moves.NONE, Moves.WILL_O_WISP, Moves.TWIN_BEAM ], - [Species.HAPPINY]: [ Moves.IRON_DEFENSE, Moves.SEISMIC_TOSS, Moves.STEALTH_ROCK, Moves.SIZZLY_SLIDE ], - [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.RIOLU]: [ Moves.THUNDEROUS_KICK, Moves.FLASH_CANNON, Moves.TRIPLE_AXEL, Moves.DOUBLE_IRON_BASH ], - [Species.HIPPOPOTAS]: [ Moves.BODY_PRESS, Moves.STONE_AXE, Moves.SALT_CURE, Moves.IRON_DEFENSE ], - [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.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.ROTOM]: [ Moves.RECOVER, Moves.FIERY_DANCE, Moves.SPLISHY_SPLASH, Moves.ELECTRO_DRIFT ], - [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.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.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.NONE, Moves.SEARING_SHOT, Moves.MALIGNANT_CHAIN ], - [Species.SHAYMIN]: [ Moves.SEARING_SHOT, Moves.HURRICANE, Moves.MATCHA_GOTCHA, Moves.CHLOROBLAST ], - [Species.ARCEUS]: [ Moves.QUIVER_DANCE, Moves.MULTI_ATTACK, Moves.VICTORY_DANCE, Moves.COLLISION_COURSE ], + [Species.TURTWIG]: [ Moves.HEADLONG_RUSH, Moves.SHELTER, Moves.BODY_PRESS, Moves.FRENZY_PLANT ], + [Species.CHIMCHAR]: [ Moves.RAGING_FURY, Moves.BURN_UP, Moves.WORK_UP, Moves.WICKED_BLOW ], + [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.FLIP_TURN, Moves.NOBLE_ROAR, Moves.SUNSTEEL_STRIKE ], + [Species.STARLY]: [ Moves.SWORDS_DANCE, Moves.OUTRAGE, Moves.FLAME_CHARGE, Moves.COLLISION_COURSE ], + [Species.BIDOOF]: [ Moves.SUPER_FANG, Moves.LIQUIDATION, Moves.BODY_PRESS, Moves.NO_RETREAT ], + [Species.KRICKETOT]: [ Moves.BOOMBURST, Moves.ALLURING_VOICE, Moves.SPARKLING_ARIA, Moves.QUIVER_DANCE ], + [Species.SHINX]: [ Moves.PSYCHIC_FANGS, Moves.JAW_LOCK, Moves.FACADE, Moves.VOLT_TACKLE ], + [Species.BUDEW]: [ Moves.FLORAL_HEALING, Moves.ACID_SPRAY, Moves.SPORE, Moves.SEED_FLARE ], + [Species.CRANIDOS]: [ Moves.STONE_AXE, Moves.DRAGON_RUSH, Moves.SUPERPOWER, Moves.ROCK_WRECKER ], + [Species.SHIELDON]: [ Moves.COSMIC_POWER, Moves.BODY_PRESS, Moves.KINGS_SHIELD, Moves.BEHEMOTH_BASH ], + [Species.BURMY]: [ Moves.BODY_PRESS, Moves.TOXIC, Moves.RECOVER, Moves.SHELTER ], + [Species.COMBEE]: [ Moves.TWINEEDLE, Moves.AIR_SLASH, Moves.KINGS_SHIELD, Moves.SPORE ], + [Species.PACHIRISU]: [ Moves.SUPER_FANG, Moves.EXTREME_SPEED, Moves.SUPERPOWER, Moves.VOLT_TACKLE ], + [Species.BUIZEL]: [ Moves.JET_PUNCH, Moves.ICE_PUNCH, Moves.HIGH_HORSEPOWER, Moves.SURGING_STRIKES ], + [Species.CHERUBI]: [ Moves.FLOWER_SHIELD, Moves.GRASSY_TERRAIN, Moves.GRASSY_GLIDE, Moves.SPORE ], + [Species.SHELLOS]: [ Moves.LIFE_DEW, Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.FREEZY_FROST ], + [Species.DRIFLOON]: [ Moves.THIEF, Moves.ACUPRESSURE, Moves.WILL_O_WISP, Moves.HURRICANE ], + [Species.BUNEARY]: [ Moves.TRIPLE_AXEL, Moves.TROP_KICK, Moves.FAKE_OUT, Moves.SWORDS_DANCE ], + [Species.GLAMEOW]: [ Moves.U_TURN, Moves.STOMPING_TANTRUM, Moves.COVET, Moves.WICKED_BLOW ], + [Species.CHINGLING]: [ Moves.BUZZY_BUZZ, Moves.BOOMBURST, Moves.TORCH_SONG, Moves.EERIE_SPELL ], + [Species.STUNKY]: [ Moves.CORROSIVE_GAS, Moves.BURNING_JEALOUSY, Moves.SUPER_FANG, Moves.WICKED_BLOW ], + [Species.BRONZOR]: [ Moves.PSYSHIELD_BASH, Moves.COSMIC_POWER, Moves.MIRROR_COAT, Moves.TACHYON_CUTTER ], + [Species.BONSLY]: [ Moves.INGRAIN, Moves.GRASSY_GLIDE, Moves.EXTREME_SPEED, Moves.HEAD_SMASH ], + [Species.MIME_JR]: [ Moves.CALM_MIND, Moves.ATTRACT, Moves.TAUNT, Moves.GLITZY_GLOW ], + [Species.HAPPINY]: [ Moves.HAPPY_HOUR, Moves.SEISMIC_TOSS, Moves.STEALTH_ROCK, Moves.INSTRUCT ], + [Species.CHATOT]: [ Moves.SPARKLING_ARIA, Moves.BOOMBURST, Moves.TAUNT, Moves.TORCH_SONG ], + [Species.SPIRITOMB]: [ Moves.POLTERGEIST, Moves.PAIN_SPLIT, Moves.BURNING_JEALOUSY, Moves.MAKE_IT_RAIN ], + [Species.GIBLE]: [ Moves.DRAGON_HAMMER, Moves.AQUA_JET, Moves.POISON_FANG, Moves.GLAIVE_RUSH ], + [Species.MUNCHLAX]: [ Moves.TEATIME, Moves.BODY_PRESS, Moves.HEAVY_SLAM, Moves.SLACK_OFF ], + [Species.RIOLU]: [ Moves.UPPER_HAND, Moves.ARM_THRUST, Moves.ICE_PUNCH, Moves.PLAY_ROUGH ], + [Species.HIPPOPOTAS]: [ Moves.BODY_PRESS, Moves.HARD_PRESS, Moves.SCORCHING_SANDS, Moves.LANDS_WRATH ], + [Species.SKORUPI]: [ Moves.COIL, Moves.DIRE_CLAW, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], + [Species.CROAGUNK]: [ Moves.GUNK_SHOT, Moves.LASH_OUT, Moves.MACH_PUNCH, Moves.SWORDS_DANCE ], + [Species.CARNIVINE]: [ Moves.SNAP_TRAP, Moves.JAW_LOCK, Moves.RAGE_POWDER, Moves.FLOWER_TRICK ], + [Species.FINNEON]: [ Moves.QUIVER_DANCE, Moves.BOUNCY_BUBBLE, Moves.MOONBLAST, Moves.MOONGEIST_BEAM ], + [Species.MANTYKE]: [ Moves.BOUNCY_BUBBLE, Moves.ICY_WIND, Moves.TAILWIND, Moves.RECOVER ], + [Species.SNOVER]: [ Moves.DRUM_BEATING, Moves.ICE_HAMMER, Moves.AURORA_VEIL, Moves.IVY_CUDGEL ], + [Species.ROTOM]: [ Moves.FREEZE_DRY, Moves.FLAME_BURST, Moves.WATER_PULSE, Moves.AIR_SLASH ], + [Species.UXIE]: [ Moves.REVELATION_DANCE, Moves.TEETER_DANCE, Moves.DARK_PULSE, Moves.PRISMATIC_LASER ], + [Species.MESPRIT]: [ Moves.REVELATION_DANCE, Moves.LUNAR_DANCE, Moves.MOONBLAST, Moves.PRISMATIC_LASER ], + [Species.AZELF]: [ Moves.REVELATION_DANCE, Moves.DRAGON_DANCE, Moves.PHANTOM_FORCE, Moves.PRISMATIC_LASER ], + [Species.DIALGA]: [ Moves.SPACIAL_REND, Moves.EXTREME_SPEED, Moves.GEAR_GRIND, Moves.FREEZING_GLARE ], + [Species.PALKIA]: [ Moves.ROAR_OF_TIME, Moves.LIQUIDATION, Moves.AQUA_CUTTER, Moves.DRAGON_ENERGY ], + [Species.HEATRAN]: [ Moves.FIRE_LASH, Moves.HEAVY_SLAM, Moves.FIERY_DANCE, Moves.BEHEMOTH_BASH ], + [Species.REGIGIGAS]: [ Moves.MIGHTY_CLEAVE, Moves.PRECIPICE_BLADES, Moves.EXTREME_SPEED, Moves.SKILL_SWAP ], + [Species.GIRATINA]: [ Moves.DRAGON_HAMMER, Moves.SPACIAL_REND, Moves.SPIRIT_SHACKLE, Moves.ASTRAL_BARRAGE ], + [Species.CRESSELIA]: [ Moves.MIST_BALL, Moves.LUMINA_CRASH, Moves.INFERNAL_PARADE, Moves.HYPERSPACE_HOLE ], + [Species.PHIONE]: [ Moves.SPARKLING_ARIA, Moves.MAKE_IT_RAIN, Moves.TAIL_GLOW, Moves.LIGHT_OF_RUIN ], + [Species.MANAPHY]: [ Moves.BOUNCY_BUBBLE, Moves.RECOVER, Moves.MOONBLAST, Moves.QUIVER_DANCE ], + [Species.DARKRAI]: [ Moves.NIGHT_DAZE, Moves.KNOCK_OFF, Moves.BITTER_MALICE, Moves.SHADOW_FORCE ], + [Species.SHAYMIN]: [ Moves.FLOWER_SHIELD, Moves.FLOWER_TRICK, Moves.CHLOROBLAST, Moves.FLEUR_CANNON ], + [Species.ARCEUS]: [ Moves.SKETCH, Moves.ROAR_OF_TIME, Moves.SPACIAL_REND, Moves.GEOMANCY ], [Species.VICTINI]: [ Moves.VICTORY_DANCE, Moves.FUSION_BOLT, Moves.GLACIATE, Moves.BLUE_FLARE ], [Species.SNIVY]: [ Moves.SYNTHESIS, Moves.SAPPY_SEED, Moves.POWER_GEM, Moves.DRACO_METEOR ], [Species.TEPIG]: [ Moves.SUCKER_PUNCH, Moves.SLACK_OFF, Moves.MACH_PUNCH, Moves.VICTORY_DANCE ], [Species.OSHAWOTT]: [ Moves.SECRET_SWORD, Moves.AQUA_CUTTER, Moves.NASTY_PLOT, Moves.BEHEMOTH_BLADE ], [Species.PATRAT]: [ Moves.COVET, Moves.EXTREME_SPEED, Moves.ACUPRESSURE, Moves.LAST_RESORT ], [Species.LILLIPUP]: [ Moves.COVET, Moves.LAST_RESPECTS, Moves.HIGH_HORSEPOWER, Moves.NO_RETREAT ], - [Species.PURRLOIN]: [ Moves.PSYCHIC_FANGS, Moves.SWORDS_DANCE, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], - [Species.PANSAGE]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.TRAILBLAZE, Moves.FRENZY_PLANT ], + [Species.PURRLOIN]: [ Moves.THIEF, Moves.SWORDS_DANCE, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], + [Species.PANSAGE]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.STRENGTH_SAP, Moves.FRENZY_PLANT ], [Species.PANSEAR]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.SCORCHING_SANDS, Moves.BLAST_BURN ], [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.FREEZE_DRY, Moves.HYDRO_CANNON ], [Species.MUNNA]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.MYSTICAL_POWER ], @@ -312,7 +312,7 @@ export const speciesEggMoves = { [Species.MIENFOO]: [ Moves.TIDY_UP, Moves.ICE_SPINNER, Moves.SUPERCELL_SLAM, Moves.BRAVE_BIRD ], [Species.DRUDDIGON]: [ Moves.SPIKY_SHIELD, Moves.STOMPING_TANTRUM, Moves.CLANGOROUS_SOUL, Moves.DIAMOND_STORM ], [Species.GOLETT]: [ Moves.BULK_UP, Moves.RAGE_FIST, Moves.HEADLONG_RUSH, Moves.DOUBLE_IRON_BASH ], - [Species.PAWNIARD]: [ Moves.SUCKER_PUNCH, Moves.CEASELESS_EDGE, Moves.AQUA_CUTTER, Moves.PSYBLADE ], + [Species.PAWNIARD]: [ Moves.ATTACK_ORDER, Moves.CEASELESS_EDGE, Moves.AQUA_CUTTER, Moves.PSYBLADE ], [Species.BOUFFALANT]: [ Moves.EARTHQUAKE, Moves.FLAME_CHARGE, Moves.IRON_HEAD, Moves.RAGING_BULL ], [Species.RUFFLET]: [ Moves.FLOATY_FALL, Moves.DAZZLING_GLEAM, Moves.HEAT_WAVE, Moves.BOLT_BEAK ], [Species.VULLABY]: [ Moves.RUINATION, Moves.BODY_PRESS, Moves.ROOST, Moves.BADDY_BAD ], @@ -471,78 +471,78 @@ export const speciesEggMoves = { [Species.SPECTRIER]: [ Moves.EARTH_POWER, Moves.PSYCHIC, Moves.GLARE, Moves.ASTRAL_BARRAGE ], [Species.CALYREX]: [ Moves.POWER_GEM, Moves.ICE_BEAM, Moves.SHADOW_BALL, Moves.MALIGNANT_CHAIN ], [Species.ENAMORUS]: [ Moves.SPIRIT_BREAK, Moves.TAKE_HEART, Moves.STORED_POWER, Moves.OVERHEAT ], - [Species.SPRIGATITO]: [ Moves.FIRE_LASH, 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.THUNDEROUS_KICK, Moves.ROOST, Moves.TROP_KICK, Moves.DRAGON_DANCE ], - [Species.LECHONK]: [ Moves.MILK_DRINK, Moves.BLAZING_TORQUE, Moves.NONE, Moves.HEAD_CHARGE ], - [Species.TAROUNTULA]: [ Moves.STRENGTH_SAP, Moves.LEECH_LIFE, Moves.PARTING_SHOT, Moves.STONE_AXE ], - [Species.NYMBLE]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.LEECH_LIFE, Moves.NONE ], - [Species.PAWMI]: [ Moves.ICE_SPINNER, Moves.WISH, Moves.PARTING_SHOT, Moves.PLASMA_FISTS ], - [Species.TANDEMAUS]: [ Moves.BATON_PASS, Moves.HEALING_WISH, Moves.NUZZLE, Moves.WICKED_BLOW ], - [Species.FIDOUGH]: [ Moves.MILK_DRINK, Moves.SIZZLY_SLIDE, Moves.PARTING_SHOT, Moves.MAGICAL_TORQUE ], - [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.NACLI]: [ Moves.BODY_PRESS, Moves.SPIKES, Moves.CURSE, Moves.DIAMOND_STORM ], - [Species.CHARCADET]: [ Moves.SACRED_SWORD, Moves.NONE, Moves.PHOTON_GEYSER, Moves.SPECTRAL_THIEF ], - [Species.TADBULB]: [ Moves.SLACK_OFF, Moves.MUDDY_WATER, Moves.EARTH_POWER, Moves.ELECTRO_SHOT ], - [Species.WATTREL]: [ Moves.NASTY_PLOT, Moves.TAILWIND, Moves.HEAT_WAVE, Moves.ELECTRO_DRIFT ], - [Species.MASCHIFF]: [ Moves.PARTING_SHOT, Moves.DARKEST_LARIAT, Moves.NUZZLE, Moves.COLLISION_COURSE ], - [Species.SHROODLE]: [ Moves.BLAZING_TORQUE, Moves.RAGING_BULL, Moves.TOXIC_SPIKES, Moves.TIDY_UP ], - [Species.BRAMBLIN]: [ Moves.TAILWIND, Moves.STRENGTH_SAP, Moves.CEASELESS_EDGE, Moves.POLTERGEIST ], - [Species.TOEDSCOOL]: [ Moves.STRENGTH_SAP, Moves.SCALD, Moves.PARTING_SHOT, Moves.SAPPY_SEED ], - [Species.KLAWF]: [ Moves.BODY_PRESS, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE, Moves.SHELL_SMASH ], - [Species.CAPSAKID]: [ Moves.STRENGTH_SAP, Moves.NONE, Moves.ICE_SPINNER, Moves.TORCH_SONG ], - [Species.RELLOR]: [ Moves.GLITZY_GLOW, Moves.RECOVER, Moves.MYSTICAL_FIRE, 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.STONE_AXE, Moves.SWORDS_DANCE, Moves.SUCKER_PUNCH, Moves.MIGHTY_CLEAVE ], - [Species.FINIZEN]: [ Moves.ICE_SPINNER, Moves.DRAIN_PUNCH, Moves.LEAF_BLADE, Moves.RECOVER ], - [Species.VAROOM]: [ Moves.COMBAT_TORQUE, Moves.GEAR_GRIND, Moves.BLAZING_TORQUE, Moves.NOXIOUS_TORQUE ], - [Species.CYCLIZAR]: [ Moves.BATON_PASS, Moves.BLAZING_TORQUE, Moves.RAGING_BULL, Moves.CLANGOROUS_SOUL ], - [Species.ORTHWORM]: [ Moves.STONE_AXE, Moves.CURSE, 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.RECOVER, Moves.COLLISION_COURSE ], - [Species.FLAMIGO]: [ Moves.SKY_UPPERCUT, Moves.TRIPLE_AXEL, Moves.THUNDER_PUNCH, Moves.VICTORY_DANCE ], - [Species.CETODDLE]: [ Moves.ICICLE_CRASH, Moves.TIDY_UP, Moves.RECOVER, Moves.COLLISION_COURSE ], - [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.NONE ], - [Species.GREAT_TUSK]: [ Moves.STONE_AXE, Moves.CEASELESS_EDGE, 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.SIZZLY_SLIDE, Moves.FLYING_PRESS ], - [Species.SANDY_SHOCKS]: [ Moves.SHORE_UP, Moves.ICE_BEAM, Moves.NASTY_PLOT, Moves.BUZZY_BUZZ ], - [Species.IRON_TREADS]: [ Moves.AURA_WHEEL, Moves.BULK_UP, Moves.SPIKES, 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.PLASMA_FISTS, Moves.CURSE, 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.AURA_WHEEL ], - [Species.FRIGIBAX]: [ Moves.DRAGON_HAMMER, Moves.BULK_UP, Moves.SHORE_UP, Moves.GLACIAL_LANCE ], - [Species.GIMMIGHOUL]: [ Moves.COSMIC_POWER, Moves.STORED_POWER, Moves.MIRROR_COAT, Moves.ASTRAL_BARRAGE ], - [Species.WO_CHIEN]: [ Moves.SPORE, Moves.SPIKES, Moves.SAPPY_SEED, Moves.JUNGLE_HEALING ], - [Species.CHIEN_PAO]: [ Moves.NONE, 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.HYDRO_STEAM, Moves.ERUPTION, Moves.TORCH_SONG ], - [Species.ROARING_MOON]: [ Moves.SIZZLY_SLIDE, 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.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.OKIDOGI]: [ Moves.MORNING_SUN, Moves.OBSTRUCT, Moves.DIRE_CLAW, Moves.COLLISION_COURSE ], - [Species.MUNKIDORI]: [ Moves.PSYSTRIKE, Moves.SEARING_SHOT, 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.STONE_AXE, 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.PARABOLIC_CHARGE, Moves.ELECTRO_DRIFT ], - [Species.IRON_BOULDER]: [ Moves.PSYBLADE, Moves.TACHYON_CUTTER, Moves.STONE_AXE, Moves.V_CREATE ], - [Species.IRON_CROWN]: [ Moves.NONE, Moves.SECRET_SWORD, Moves.PHOTON_GEYSER, Moves.ELECTRO_DRIFT ], - [Species.TERAPAGOS]: [ Moves.EARTH_POWER, Moves.BOOMBURST, Moves.ICE_BEAM, Moves.RECOVER ], - [Species.PECHARUNT]: [ Moves.TOXIC_SPIKES, Moves.BODY_PRESS, Moves.HEX, Moves.BANEFUL_BUNKER ], + [Species.SPRIGATITO]: [ Moves.PETAL_BLIZZARD, Moves.COPYCAT, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ], + [Species.FUECOCO]: [ Moves.EARTHQUAKE, Moves.SLACK_OFF, Moves.INFERNAL_PARADE, Moves.SEARING_SHOT ], + [Species.QUAXLY]: [ Moves.HIGH_JUMP_KICK, Moves.ROOST, Moves.REVELATION_DANCE, Moves.SURGING_STRIKES ], + [Species.LECHONK]: [ Moves.PLUCK, Moves.RECYCLE, Moves.POWER_TRIP, Moves.FILLET_AWAY ], + [Species.TAROUNTULA]: [ Moves.STEAMROLLER, Moves.LUNGE, Moves.SUCKER_PUNCH, Moves.FIRST_IMPRESSION ], + [Species.NYMBLE]: [ Moves.POWER_UP_PUNCH, Moves.KNOCK_OFF, Moves.LEECH_LIFE, Moves.WICKED_BLOW ], + [Species.PAWMI]: [ Moves.DRAIN_PUNCH, Moves.WISH, Moves.HELPING_HAND, Moves.VOLT_TACKLE ], + [Species.TANDEMAUS]: [ Moves.BITE, Moves.FEINT, Moves.BARRAGE, Moves.BOOMBURST ], + [Species.FIDOUGH]: [ Moves.COPYCAT, Moves.WISH, Moves.COVET, Moves.MAGICAL_TORQUE ], + [Species.SMOLIV]: [ Moves.STRENGTH_SAP, Moves.SYNTHESIS, Moves.WEATHER_BALL, Moves.CHLOROBLAST ], + [Species.SQUAWKABILLY]: [ Moves.PARTING_SHOT, Moves.FINAL_GAMBIT, Moves.DOUBLE_EDGE, Moves.BOOMBURST ], + [Species.NACLI]: [ Moves.BODY_PRESS, Moves.POWER_GEM, Moves.EXPLOSION, Moves.PRECIPICE_BLADES ], + [Species.CHARCADET]: [ Moves.DISABLE, Moves.FLASH_CANNON, Moves.THIEF, Moves.SPECTRAL_THIEF ], + [Species.TADBULB]: [ Moves.MUDDY_WATER, Moves.PARABOLIC_CHARGE, Moves.NUZZLE, Moves.SURF ], + [Species.WATTREL]: [ Moves.FEATHER_DANCE, Moves.WEATHER_BALL, Moves.ENDEAVOR, Moves.BOLT_BEAK ], + [Species.MASCHIFF]: [ Moves.BADDY_BAD, Moves.RETALIATE, Moves.ENDEAVOR, Moves.PLAY_ROUGH ], + [Species.SHROODLE]: [ Moves.COPYCAT, Moves.SUPER_FANG, Moves.TOXIC, Moves.SKETCH ], + [Species.BRAMBLIN]: [ Moves.SHADOW_SNEAK, Moves.STRENGTH_SAP, Moves.POLTERGEIST, Moves.SAPPY_SEED ], + [Species.TOEDSCOOL]: [ Moves.RAPID_SPIN, Moves.KNOCK_OFF, Moves.TOXIC, Moves.NOXIOUS_TORQUE ], + [Species.KLAWF]: [ Moves.ANCIENT_POWER, Moves.KNOCK_OFF, Moves.CRABHAMMER, Moves.DIRE_CLAW ], + [Species.CAPSAKID]: [ Moves.RAGE_POWDER, Moves.ROLLOUT, Moves.LEECH_SEED, Moves.FIERY_DANCE ], + [Species.RELLOR]: [ Moves.COSMIC_POWER, Moves.RECOVER, Moves.WEATHER_BALL, Moves.GLITZY_GLOW ], + [Species.FLITTLE]: [ Moves.GLITZY_GLOW, Moves.HYPNOSIS, Moves.ROOST, Moves.OBLIVION_WING ], + [Species.TINKATINK]: [ Moves.FALSE_SURRENDER, Moves.DRAIN_PUNCH, Moves.ICE_HAMMER, Moves.NO_RETREAT ], + [Species.WIGLETT]: [ Moves.FINAL_GAMBIT, Moves.THIEF, Moves.IRON_HEAD, Moves.SURGING_STRIKES ], + [Species.BOMBIRDIER]: [ Moves.SKY_ATTACK, Moves.POWER_TRIP, Moves.SUCKER_PUNCH, Moves.POPULATION_BOMB ], + [Species.FINIZEN]: [ Moves.BOUNCE, Moves.DRAIN_PUNCH, Moves.COUNTER, Moves.BOOMBURST ], + [Species.VAROOM]: [ Moves.TOXIC, Moves.GEAR_GRIND, Moves.BLAZING_TORQUE, Moves.NOXIOUS_TORQUE ], + [Species.CYCLIZAR]: [ Moves.AQUA_TAIL, Moves.IRON_TAIL, Moves.POWER_WHIP, Moves.DRAGON_DANCE ], + [Species.ORTHWORM]: [ Moves.METAL_BURST, Moves.COIL, Moves.BODY_PRESS, Moves.DRAGON_HAMMER ], + [Species.GLIMMET]: [ Moves.PURIFY, Moves.MOONBLAST, Moves.FLASH_CANNON, Moves.BANEFUL_BUNKER ], + [Species.GREAVARD]: [ Moves.SHADOW_SNEAK, Moves.DISABLE, Moves.YAWN, Moves.SHADOW_FORCE ], + [Species.FLAMIGO]: [ Moves.DOUBLE_TEAM, Moves.SKY_ATTACK, Moves.VICTORY_DANCE, Moves.HIGH_JUMP_KICK ], + [Species.CETODDLE]: [ Moves.ICICLE_CRASH, Moves.SUPERPOWER, Moves.ENTRAINMENT, Moves.BELLY_DRUM ], + [Species.VELUZA]: [ Moves.RECOVER, Moves.THRASH, Moves.KOWTOW_CLEAVE, Moves.PSYBLADE ], + [Species.DONDOZO]: [ Moves.OUTRAGE, Moves.YAWN, Moves.HEAVY_SLAM, Moves.FISHIOUS_REND ], + [Species.TATSUGIRI]: [ Moves.RAPID_SPIN, Moves.BATON_PASS, Moves.MIMIC, Moves.COUNTER ], + [Species.GREAT_TUSK]: [ Moves.HIGH_HORSEPOWER, Moves.DRILL_RUN, Moves.SUPERPOWER, Moves.BEHEMOTH_BASH ], + [Species.SCREAM_TAIL]: [ Moves.PSYCHIC, Moves.MOONBLAST, Moves.MOONLIGHT, Moves.LIGHT_OF_RUIN ], + [Species.BRUTE_BONNET]: [ Moves.CRUNCH, Moves.SAPPY_SEED, Moves.FRENZY_PLANT, Moves.STRENGTH_SAP ], + [Species.FLUTTER_MANE]: [ Moves.MOONLIGHT, Moves.SNARL, Moves.EARTH_POWER, Moves.MOONGEIST_BEAM ], + [Species.SLITHER_WING]: [ Moves.DRAIN_PUNCH, Moves.VICTORY_DANCE, Moves.SIZZLY_SLIDE, Moves.COLLISION_COURSE ], + [Species.SANDY_SHOCKS]: [ Moves.PARABOLIC_CHARGE, Moves.SCORCHING_SANDS, Moves.CALM_MIND, Moves.ELECTRO_SHOT ], + [Species.IRON_TREADS]: [ Moves.SUPERCELL_SLAM, Moves.BULK_UP, Moves.HEAD_SMASH, Moves.COLLISION_COURSE ], + [Species.IRON_BUNDLE]: [ Moves.PARABOLIC_CHARGE, Moves.SCALD, Moves.NASTY_PLOT, Moves.GLACIATE ], + [Species.IRON_HANDS]: [ Moves.MACH_PUNCH, Moves.HIGH_HORSEPOWER, Moves.MAT_BLOCK, Moves.PLASMA_FISTS ], + [Species.IRON_JUGULIS]: [ Moves.FIERY_WRATH, Moves.FLAMETHROWER, Moves.NASTY_PLOT, Moves.OBLIVION_WING ], + [Species.IRON_MOTH]: [ Moves.PARABOLIC_CHARGE, Moves.QUIVER_DANCE, Moves.FLASH_CANNON, Moves.TORCH_SONG ], + [Species.IRON_THORNS]: [ Moves.DRAIN_PUNCH, Moves.SUPERPOWER, Moves.SHIFT_GEAR, Moves.FUSION_BOLT ], + [Species.FRIGIBAX]: [ Moves.ICICLE_SPEAR, Moves.AQUA_TAIL, Moves.FREEZE_DRY, Moves.DRAGON_RUSH ], + [Species.GIMMIGHOUL]: [ Moves.PAY_DAY, Moves.HAPPY_HOUR, Moves.MIRROR_COAT, Moves.TECHNO_BLAST ], + [Species.WO_CHIEN]: [ Moves.POLLEN_PUFF, Moves.FORESTS_CURSE, Moves.FOLLOW_ME, Moves.SPORE ], + [Species.CHIEN_PAO]: [ Moves.STOMPING_TANTRUM, Moves.WATERFALL, Moves.CHILLY_RECEPTION, Moves.BEHEMOTH_BLADE ], + [Species.TING_LU]: [ Moves.HEAT_CRASH, Moves.IRON_HEAD, Moves.HORN_LEECH, Moves.STRENGTH_SAP ], + [Species.CHI_YU]: [ Moves.ENERGY_BALL, Moves.STORED_POWER, Moves.SCALD, Moves.BLUE_FLARE ], + [Species.ROARING_MOON]: [ Moves.RAGING_FURY, Moves.FLOATY_FALL, Moves.OBSTRUCT, Moves.COLLISION_COURSE ], + [Species.IRON_VALIANT]: [ Moves.SECRET_SWORD, Moves.PLAY_ROUGH, Moves.QUIVER_DANCE, Moves.ELECTRO_DRIFT ], + [Species.KORAIDON]: [ Moves.HEAD_SMASH, Moves.BULK_UP, Moves.IRON_HEAD, Moves.CLANGOROUS_SOUL ], + [Species.MIRAIDON]: [ Moves.ICE_BEAM, Moves.CALM_MIND, Moves.FLASH_CANNON, Moves.CLANGOROUS_SOUL ], + [Species.WALKING_WAKE]: [ Moves.THUNDERCLAP, Moves.FLASH_CANNON, Moves.ALLURING_VOICE, Moves.ELECTRO_DRIFT ], + [Species.IRON_LEAVES]: [ Moves.MIGHTY_CLEAVE, Moves.TACHYON_CUTTER, Moves.SPIRIT_BREAK, Moves.COLLISION_COURSE ], + [Species.POLTCHAGEIST]: [ Moves.TEATIME, Moves.AROMATHERAPY, Moves.STRENGTH_SAP, Moves.MILK_DRINK ], + [Species.OKIDOGI]: [ Moves.JAW_LOCK, Moves.OBSTRUCT, Moves.DIRE_CLAW, Moves.MALIGNANT_CHAIN ], + [Species.MUNKIDORI]: [ Moves.PSYSTRIKE, Moves.MYSTICAL_FIRE, Moves.WILL_O_WISP, Moves.MALIGNANT_CHAIN ], + [Species.FEZANDIPITI]: [ Moves.DUAL_WINGBEAT, Moves.DRAINING_KISS, Moves.TRIPLE_AXEL, Moves.MALIGNANT_CHAIN ], + [Species.OGERPON]: [ Moves.JUNGLE_HEALING, Moves.NUZZLE, Moves.TRIPLE_AXEL, Moves.GIGATON_HAMMER ], + [Species.GOUGING_FIRE]: [ Moves.PLAY_ROUGH, Moves.HORN_LEECH, Moves.HYDRO_STEAM, Moves.ELECTRO_DRIFT ], + [Species.RAGING_BOLT]: [ Moves.HYDRO_STEAM, Moves.FLASH_CANNON, Moves.PARABOLIC_CHARGE, Moves.ELECTRO_DRIFT ], + [Species.IRON_BOULDER]: [ Moves.PSYBLADE, Moves.TACHYON_CUTTER, Moves.LEAF_BLADE, Moves.COLLISION_COURSE ], + [Species.IRON_CROWN]: [ Moves.MIGHTY_CLEAVE, Moves.PSYBLADE, Moves.AQUA_CUTTER, Moves.COLLISION_COURSE ], + [Species.TERAPAGOS]: [ Moves.EARTH_POWER, Moves.BOOMBURST, Moves.ICE_BEAM, Moves.DIAMOND_STORM ], + [Species.PECHARUNT]: [ Moves.VENOSHOCK, Moves.VENOM_DRENCH, Moves.HEX, Moves.BANEFUL_BUNKER ], [Species.ALOLA_RATTATA]: [ Moves.STUFF_CHEEKS, Moves.BADDY_BAD, Moves.FLAME_WHEEL, Moves.RECYCLE ], [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.ICE_SHARD, Moves.CRUSH_CLAW, Moves.SPIN_OUT ], [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.HYPNOSIS, Moves.CHILLING_WATER, Moves.FREEZY_FROST ], @@ -568,9 +568,9 @@ export const speciesEggMoves = { [Species.HISUI_QWILFISH]: [ Moves.NUZZLE, Moves.SCALE_SHOT, Moves.SUPERSONIC, Moves.PARTING_SHOT ], [Species.HISUI_SNEASEL]: [ Moves.DRAIN_PUNCH, Moves.BULLET_PUNCH, Moves.FAKE_OUT, Moves.VICTORY_DANCE ], [Species.HISUI_ZORUA]: [ Moves.ALLURING_VOICE, Moves.GLARE, Moves.TORCH_SONG, Moves.TRANSFORM ], - [Species.PALDEA_TAUROS]: [ Moves.THUNDEROUS_KICK, Moves.BLAZING_TORQUE, Moves.AQUA_STEP, Moves.NO_RETREAT ], - [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.BOOMBURST ] + [Species.PALDEA_TAUROS]: [ Moves.HEAD_CHARGE, Moves.BLAZE_KICK, Moves.AQUA_STEP, Moves.NO_RETREAT ], + [Species.PALDEA_WOOPER]: [ Moves.RECOVER, Moves.DOUBLE_KICK, Moves.ANCIENT_POWER, Moves.VENOM_DRENCH ], + [Species.BLOODMOON_URSALUNA]: [ Moves.GLARE, Moves.SCORCHING_SANDS, Moves.CALM_MIND, Moves.BOOMBURST ] }; function parseEggMoves(content: string): void { From 930c14fa62b0362736a70cdb05c1a76889f93358 Mon Sep 17 00:00:00 2001 From: EmoUsedHM01 <131687820+EmoUsedHM01@users.noreply.github.com> Date: Fri, 12 Apr 2024 21:05:32 +0100 Subject: [PATCH 04/14] Laser Focus support, with the added BattlerTagTypes to support it (#103) * Added a new BattlerTagType and support for Laser Focus BattlerTagType.ALWAYS_CRIT * Updated battler-tags to support ALWAYS_CRIT * Added ALWAYS_CRIT = "ALWAYS_CRIT", for the updated battler-tag-type * Updated the crit formula to include the new critAlways * Updated crit logic to include critAlways, fixed indents --- src/data/battler-tags.ts | 8 ++++++++ src/data/enums/battler-tag-type.ts | 1 + src/data/move.ts | 19 ++++++++++++++++++- src/field/pokemon.ts | 5 +++-- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 1244d8697e6..d182a4c45a5 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -956,6 +956,12 @@ export class CritBoostTag extends BattlerTag { } } +export class AlwaysCritTag extends BattlerTag { + constructor(sourceMove: Moves) { + super(BattlerTagType.ALWAYS_CRIT, BattlerTagLapseType.TURN_END, 2, sourceMove); + } +} + export class IgnoreAccuracyTag extends BattlerTag { constructor(sourceMove: Moves) { super(BattlerTagType.IGNORE_ACCURACY, BattlerTagLapseType.TURN_END, 2, sourceMove); @@ -1077,6 +1083,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc return new TypeBoostTag(tagType, sourceMove, Type.FIRE); case BattlerTagType.CRIT_BOOST: return new CritBoostTag(tagType, sourceMove); + case BattlerTagType.ALWAYS_CRIT: + return new AlwaysCritTag(tagType, sourceMove); case BattlerTagType.NO_CRIT: return new BattlerTag(tagType, BattlerTagLapseType.AFTER_MOVE, turnCount, sourceMove); case BattlerTagType.IGNORE_ACCURACY: diff --git a/src/data/enums/battler-tag-type.ts b/src/data/enums/battler-tag-type.ts index 4aecd5195db..85f00753457 100644 --- a/src/data/enums/battler-tag-type.ts +++ b/src/data/enums/battler-tag-type.ts @@ -41,6 +41,7 @@ export enum BattlerTagType { HIDDEN = "HIDDEN", FIRE_BOOST = "FIRE_BOOST", CRIT_BOOST = "CRIT_BOOST", + ALWAYS_CRIT = "ALWAYS_CRIT", NO_CRIT = "NO_CRIT", IGNORE_ACCURACY = "IGNORE_ACCURACY", BYPASS_SLEEP = "BYPASS_SLEEP", diff --git a/src/data/move.ts b/src/data/move.ts index a0f1a93118a..e0535ed6746 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2300,6 +2300,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr { case BattlerTagType.PROTECTED: case BattlerTagType.FLYING: case BattlerTagType.CRIT_BOOST: + case BattlerTagType.ALWAYS_CRIT: return 5; } } @@ -2421,6 +2422,21 @@ export class IgnoreAccuracyAttr extends AddBattlerTagAttr { } } +export class AlwaysCritsAttr extends AddBattlerTagAttr { + constructor() { + super(BattlerTagType.ALWAYS_CRIT, true, false, 2); + } + + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + if (!super.apply(user, target, move, args)) + return false; + + user.scene.queueMessage(getPokemonMessage(user, ` took aim\nat ${target.name}!`)); + + return true; + } +} + export class FaintCountdownAttr extends AddBattlerTagAttr { constructor() { super(BattlerTagType.PERISH_SONG, false, true, 4); @@ -4678,7 +4694,8 @@ export function initMoves() { new StatusMove(Moves.TOXIC_THREAD, "Toxic Thread", Type.POISON, 100, 20, "The user shoots poisonous threads to poison the target and lower the target's Speed stat.", 100, 0, 7) .attr(StatusEffectAttr, StatusEffect.POISON) .attr(StatChangeAttr, BattleStat.SPD, -1), - new SelfStatusMove(Moves.LASER_FOCUS, "Laser Focus (N)", Type.NORMAL, -1, 30, "The user concentrates intensely. The attack on the next turn always results in a critical hit.", -1, 0, 7), + new SelfStatusMove(Moves.LASER_FOCUS, "Laser Focus", Type.NORMAL, -1, 30, "The user concentrates intensely. The attack on the next turn always results in a critical hit.", -1, 0, 7) + .attr(AddBattlerTagAttr, BattlerTagType.ALWAYS_CRIT, true, false), new StatusMove(Moves.GEAR_UP, "Gear Up", Type.STEEL, -1, 20, "The user engages its gears to raise the Attack and Sp. Atk stats of ally Pokémon with the Plus or Minus Ability.", -1, 0, 7) .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPATK ], 1, false, (user, target, move) => [ Abilities.PLUS, Abilities.MINUS ].includes(target.getAbility().id) || (target.canApplyPassive() && [ Abilities.PLUS, Abilities.MINUS ].includes(target.getPassiveAbility().id))) .target(MoveTarget.USER_AND_ALLIES) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 9dc560d8000..5631a39fed3 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1174,8 +1174,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { power.value *= 1.5; let isCritical: boolean; const critOnly = new Utils.BooleanHolder(false); + const critAlways = source.getTag(BattlerTagType.ALWAYS_CRIT); applyMoveAttrs(CritOnlyAttr, source, this, move, critOnly); - if (critOnly.value) + if (critOnly.value || critAlways) isCritical = true; else { const critLevel = new Utils.IntegerHolder(0); @@ -2879,4 +2880,4 @@ export class PokemonMove { getName(): string { return this.getMove().name; } -} \ No newline at end of file +} From 389278a1b0ba4216a287d71ae62fc689a7794506 Mon Sep 17 00:00:00 2001 From: William Burleson <72857839+Admiral-Billy@users.noreply.github.com> Date: Fri, 12 Apr 2024 16:08:04 -0400 Subject: [PATCH 05/14] Implement download (#99) * Implement Download * Fix formatting --- src/data/ability.ts | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index c9217e17ac5..ddf92724070 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -941,6 +941,34 @@ export class PostSummonStatChangeAbAttr extends PostSummonAbAttr { } } +export class DownloadAbAttr extends PostSummonAbAttr { + private enemyDef: integer; + private enemySpDef: integer; + private stats: BattleStat[]; + + applyPostSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean { + this.enemyDef = 0; + this.enemySpDef = 0; + + for (let opponent of pokemon.getOpponents()) { + this.enemyDef += opponent.stats[BattleStat.DEF]; + this.enemySpDef += opponent.stats[BattleStat.SPDEF]; + } + + if (this.enemyDef < this.enemySpDef) + this.stats = [BattleStat.ATK]; + else + this.stats = [BattleStat.SPATK]; + + if (this.enemyDef > 0 && this.enemySpDef > 0) { // only activate if there's actually an enemy to download from + pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), false, this.stats, 1)); + return true; + } + + return false; + } +} + export class PostSummonWeatherChangeAbAttr extends PostSummonAbAttr { private weatherType: WeatherType; @@ -2159,8 +2187,9 @@ export function initAbilities() { .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 1.25) .attr(TypeImmunityHealAbAttr, Type.WATER) .ignorable(), - new Ability(Abilities.DOWNLOAD, "Download (N)", "Compares an opposing Pokémon's Defense and Sp. Def stats before raising its own Attack or Sp. Atk stat—whichever will be more effective.", 4), - new Ability(Abilities.IRON_FIST, "Iron Fist", "Powers up punching moves.", 4) + new Ability(Abilities.DOWNLOAD, "Download", "Compares an opposing Pokémon's Defense and Sp. Def stats before raising its own Attack or Sp. Atk stat—whichever will be more effective.", 4) + .attr(DownloadAbAttr), + new Ability(Abilities.IRON_FIST, "Iron Fist", "Powers up punching moves.", 4) .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.PUNCHING_MOVE), 1.2), new Ability(Abilities.POISON_HEAL, "Poison Heal (N)", "Restores HP if the Pokémon is poisoned instead of losing HP.", 4), new Ability(Abilities.ADAPTABILITY, "Adaptability", "Powers up moves of the same type as the Pokémon.", 4) From eb791747fe4836fb8c9be217ba1bc6c21e18acda Mon Sep 17 00:00:00 2001 From: Dovie Shalev Date: Fri, 12 Apr 2024 16:16:08 -0400 Subject: [PATCH 06/14] Last respects Fully Implemented (#105) * Last Respects fully implemented * Fixed Last Respects * Last Respects Fully Implemented * Last Respects Fully Implemented --------- Co-authored-by: dshalev --- src/data/move.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index e0535ed6746..cd7e2e2a6bc 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -5185,7 +5185,11 @@ export function initMoves() { new AttackMove(Moves.AXE_KICK, "Axe Kick", Type.FIGHTING, MoveCategory.PHYSICAL, 120, 90, 10, "The user attacks by kicking up into the air and slamming its heel down upon the target. This may also confuse the target. If it misses, the user takes damage instead.", 30, 0, 9) .attr(MissEffectAttr, halveHpMissEffectFunc) .attr(ConfuseAttr), - new AttackMove(Moves.LAST_RESPECTS, "Last Respects (P)", Type.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, "The user attacks to avenge its allies. The more defeated allies there are in the user's party, the greater the move's power.", -1, 0, 9) + new AttackMove(Moves.LAST_RESPECTS, "Last Respects", Type.GHOST, MoveCategory.PHYSICAL, 50, 100, 10, "The user attacks to avenge its allies. The more defeated allies there are in the user's party, the greater the move's power.", -1, 0, 9) + .attr(MovePowerMultiplierAttr, (user, target, move) => { + return user.scene.getParty().reduce((acc, pokemonInParty) => acc + (pokemonInParty.status?.effect == StatusEffect.FAINT ? 1 : 0), + 1,) + }) .makesContact(false), new AttackMove(Moves.LUMINA_CRASH, "Lumina Crash", Type.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, "The user attacks by unleashing a peculiar light that even affects the mind. This also harshly lowers the target's Sp. Def stat.", 100, 0, 9) .attr(StatChangeAttr, BattleStat.SPDEF, -2), From cabba43598b9e7fead7b79bb4e4f21834621d029 Mon Sep 17 00:00:00 2001 From: EmoUsedHM01 <131687820+EmoUsedHM01@users.noreply.github.com> Date: Fri, 12 Apr 2024 22:21:56 +0100 Subject: [PATCH 07/14] Added support for Super Luck with BonusCritAbAttr (#106) * Fixed Super Luck, and added a new BonusCritAbAttr * Added crit clause for BonusCritAbAttr ( Super Luck ) * Changed it to +1 like it should be --- src/data/ability.ts | 12 ++++++++++-- src/field/pokemon.ts | 7 ++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index ddf92724070..66d286a8f36 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -1179,6 +1179,13 @@ export class BlockCritAbAttr extends AbAttr { } } +export class BonusCritAbAttr extends AbAttr { + apply(pokemon: Pokemon, cancelled: Utils.BooleanHolder, args: any[]): boolean { + (args[0] as Utils.BooleanHolder).value = true; + return true; + } +} + export class BlockNonDirectDamageAbAttr extends AbAttr { apply(pokemon: Pokemon, passive: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { cancelled.value = true; @@ -2189,7 +2196,7 @@ export function initAbilities() { .ignorable(), new Ability(Abilities.DOWNLOAD, "Download", "Compares an opposing Pokémon's Defense and Sp. Def stats before raising its own Attack or Sp. Atk stat—whichever will be more effective.", 4) .attr(DownloadAbAttr), - new Ability(Abilities.IRON_FIST, "Iron Fist", "Powers up punching moves.", 4) + new Ability(Abilities.IRON_FIST, "Iron Fist", "Powers up punching moves.", 4) .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.PUNCHING_MOVE), 1.2), new Ability(Abilities.POISON_HEAL, "Poison Heal (N)", "Restores HP if the Pokémon is poisoned instead of losing HP.", 4), new Ability(Abilities.ADAPTABILITY, "Adaptability", "Powers up moves of the same type as the Pokémon.", 4) @@ -2220,7 +2227,8 @@ export function initAbilities() { new Ability(Abilities.MOLD_BREAKER, "Mold Breaker", "Moves can be used on the target regardless of its Abilities.", 4) .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => getPokemonMessage(pokemon, ' breaks the mold!')) .attr(MoveAbilityBypassAbAttr), - new Ability(Abilities.SUPER_LUCK, "Super Luck (N)", "The Pokémon is so lucky that the critical-hit ratios of its moves are boosted.", 4), + new Ability(Abilities.SUPER_LUCK, "Super Luck (P)", "The Pokémon is so lucky that the critical-hit ratios of its moves are boosted.", 4) + .attr(BonusCritAbAttr), new Ability(Abilities.AFTERMATH, "Aftermath", "Damages the attacker if it contacts the Pokémon with a finishing hit.", 4) .attr(PostFaintContactDamageAbAttr,4) .bypassFaint(), diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 5631a39fed3..e0b351b9082 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -25,7 +25,7 @@ import { TempBattleStat } from '../data/temp-battle-stat'; import { ArenaTagSide, WeakenMoveScreenTag, WeakenMoveTypeTag } from '../data/arena-tag'; import { ArenaTagType } from "../data/enums/arena-tag-type"; import { Biome } from "../data/enums/biome"; -import { Ability, BattleStatMultiplierAbAttr, BlockCritAbAttr, BypassBurnDamageReductionAbAttr, FieldVariableMovePowerAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, NonSuperEffectiveImmunityAbAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, VariableMoveTypeAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPostDefendAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs } from '../data/ability'; +import { Ability, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldVariableMovePowerAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, NonSuperEffectiveImmunityAbAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, VariableMoveTypeAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPostDefendAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs } from '../data/ability'; import { Abilities } from "#app/data/enums/abilities"; import PokemonData from '../system/pokemon-data'; import { BattlerIndex } from '../battle'; @@ -1182,6 +1182,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const critLevel = new Utils.IntegerHolder(0); applyMoveAttrs(HighCritAttr, source, this, move, critLevel); this.scene.applyModifiers(TempBattleStatBoosterModifier, source.isPlayer(), TempBattleStat.CRIT, critLevel); + const bonusCrit = new Utils.BooleanHolder(false); + if (applyAbAttrs(BonusCritAbAttr, this, null, bonusCrit)) { + if (bonusCrit.value) + critLevel.value += 1; + } if (source.getTag(BattlerTagType.CRIT_BOOST)) critLevel.value += 2; const critChance = Math.ceil(16 / Math.pow(2, critLevel.value)); From 086c64b8f8228ec844ef607455c6b60741ca9d12 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 12 Apr 2024 18:44:20 -0400 Subject: [PATCH 08/14] Fix invalid constructor arguments to always crit tag --- src/data/battler-tags.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index d182a4c45a5..20946c784cb 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -1084,7 +1084,7 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc case BattlerTagType.CRIT_BOOST: return new CritBoostTag(tagType, sourceMove); case BattlerTagType.ALWAYS_CRIT: - return new AlwaysCritTag(tagType, sourceMove); + return new AlwaysCritTag(sourceMove); case BattlerTagType.NO_CRIT: return new BattlerTag(tagType, BattlerTagLapseType.AFTER_MOVE, turnCount, sourceMove); case BattlerTagType.IGNORE_ACCURACY: From f6770b83b589a6769a84a41ae4dadb57034f311e Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 12 Apr 2024 19:31:08 -0400 Subject: [PATCH 09/14] Add missing passive parameter to BonusCritAbAttr --- src/data/ability.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 66d286a8f36..7478026380c 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -1180,7 +1180,7 @@ export class BlockCritAbAttr extends AbAttr { } export class BonusCritAbAttr extends AbAttr { - apply(pokemon: Pokemon, cancelled: Utils.BooleanHolder, args: any[]): boolean { + apply(pokemon: Pokemon, passive: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean { (args[0] as Utils.BooleanHolder).value = true; return true; } From 40cdd6ace298c89b48f47b0c453df4f2095d6367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Santos?= Date: Sat, 13 Apr 2024 00:11:44 +0200 Subject: [PATCH 10/14] Fix PWA setup --- index.html | 6 ++++-- logo.png => public/logo128.png | Bin logo512.png => public/logo512.png | Bin manifest.json => public/manifest.webmanifest | 13 +++---------- 4 files changed, 7 insertions(+), 12 deletions(-) rename logo.png => public/logo128.png (100%) rename logo512.png => public/logo512.png (100%) rename manifest.json => public/manifest.webmanifest (68%) diff --git a/index.html b/index.html index 4d3fe513570..40b52ffe739 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,9 @@ - + + + - +