From a1dc5c834080215509cae44fba9639926e3db096 Mon Sep 17 00:00:00 2001 From: Patch Notes Guy Date: Fri, 27 Dec 2024 22:40:05 +0000 Subject: [PATCH 001/121] Added translation using Weblate (Vietnamese) --- .../resources/assets/cobblemon/lang/vi.json | 6393 +++++++++++++++++ 1 file changed, 6393 insertions(+) create mode 100644 common/src/main/resources/assets/cobblemon/lang/vi.json diff --git a/common/src/main/resources/assets/cobblemon/lang/vi.json b/common/src/main/resources/assets/cobblemon/lang/vi.json new file mode 100644 index 0000000000..ee17a89844 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/lang/vi.json @@ -0,0 +1,6393 @@ +{ + "item.cobblemon.poke_ball": "", + "item.cobblemon.slate_ball": "", + "item.cobblemon.azure_ball": "", + "item.cobblemon.verdant_ball": "", + "item.cobblemon.roseate_ball": "", + "item.cobblemon.citrine_ball": "", + "item.cobblemon.great_ball": "", + "item.cobblemon.ultra_ball": "", + "item.cobblemon.master_ball": "", + "item.cobblemon.safari_ball": "", + "item.cobblemon.fast_ball": "", + "item.cobblemon.level_ball": "", + "item.cobblemon.lure_ball": "", + "item.cobblemon.heavy_ball": "", + "item.cobblemon.love_ball": "", + "item.cobblemon.friend_ball": "", + "item.cobblemon.moon_ball": "", + "item.cobblemon.sport_ball": "", + "item.cobblemon.net_ball": "", + "item.cobblemon.dive_ball": "", + "item.cobblemon.nest_ball": "", + "item.cobblemon.repeat_ball": "", + "item.cobblemon.timer_ball": "", + "item.cobblemon.luxury_ball": "", + "item.cobblemon.premier_ball": "", + "item.cobblemon.dusk_ball": "", + "item.cobblemon.heal_ball": "", + "item.cobblemon.quick_ball": "", + "item.cobblemon.cherish_ball": "", + "item.cobblemon.park_ball": "", + "item.cobblemon.dream_ball": "", + "item.cobblemon.beast_ball": "", + "item.cobblemon.ancient_poke_ball": "", + "item.cobblemon.ancient_citrine_ball": "", + "item.cobblemon.ancient_verdant_ball": "", + "item.cobblemon.ancient_azure_ball": "", + "item.cobblemon.ancient_roseate_ball": "", + "item.cobblemon.ancient_slate_ball": "", + "item.cobblemon.ancient_ivory_ball": "", + "item.cobblemon.ancient_great_ball": "", + "item.cobblemon.ancient_ultra_ball": "", + "item.cobblemon.ancient_heavy_ball": "", + "item.cobblemon.ancient_leaden_ball": "", + "item.cobblemon.ancient_gigaton_ball": "", + "item.cobblemon.ancient_feather_ball": "", + "item.cobblemon.ancient_wing_ball": "", + "item.cobblemon.ancient_jet_ball": "", + "item.cobblemon.ancient_origin_ball": "", + "item.cobblemon.pokerod_smithing_template": "", + "item.cobblemon.smithing_template.pokerod.ingredients": "", + "item.cobblemon.smithing_template.pokerod.base_slot_description": "", + "item.cobblemon.smithing_template.pokerod.additions_slot_description": "", + "upgrade.cobblemon.pokerod": "", + "item.cobblemon.poke_rod": "", + "cobblemon.pokerod.bobber": "", + "cobblemon.pokerod.bait": "", + "item.cobblemon.black_apricorn_seed": "", + "item.cobblemon.blue_apricorn_seed": "", + "item.cobblemon.green_apricorn_seed": "", + "item.cobblemon.pink_apricorn_seed": "", + "item.cobblemon.red_apricorn_seed": "", + "item.cobblemon.white_apricorn_seed": "", + "item.cobblemon.yellow_apricorn_seed": "", + "item.cobblemon.black_apricorn": "", + "item.cobblemon.blue_apricorn": "", + "item.cobblemon.green_apricorn": "", + "item.cobblemon.pink_apricorn": "", + "item.cobblemon.red_apricorn": "", + "item.cobblemon.white_apricorn": "", + "item.cobblemon.yellow_apricorn": "", + "item.cobblemon.vivichoke_seeds": "", + "item.cobblemon.vivichoke": "", + "item.cobblemon.apricorn_boat": "", + "item.cobblemon.apricorn_chest_boat": "", + "item.cobblemon.pokedex_black": "", + "item.cobblemon.pokedex_blue": "", + "item.cobblemon.pokedex_green": "", + "item.cobblemon.pokedex_pink": "", + "item.cobblemon.pokedex_red": "", + "item.cobblemon.pokedex_white": "", + "item.cobblemon.pokedex_yellow": "", + "item.cobblemon.link_cable": "", + "item.cobblemon.dragon_scale": "", + "item.cobblemon.kings_rock": "", + "item.cobblemon.metal_coat": "", + "item.cobblemon.upgrade": "", + "item.cobblemon.dubious_disc": "", + "item.cobblemon.deep_sea_scale": "", + "item.cobblemon.deep_sea_tooth": "", + "item.cobblemon.electirizer": "", + "item.cobblemon.magmarizer": "", + "item.cobblemon.oval_stone": "", + "item.cobblemon.protector": "", + "item.cobblemon.reaper_cloth": "", + "item.cobblemon.prism_scale": "", + "item.cobblemon.sachet": "", + "item.cobblemon.whipped_dream": "", + "item.cobblemon.strawberry_sweet": "", + "item.cobblemon.love_sweet": "", + "item.cobblemon.berry_sweet": "", + "item.cobblemon.clover_sweet": "", + "item.cobblemon.flower_sweet": "", + "item.cobblemon.star_sweet": "", + "item.cobblemon.ribbon_sweet": "", + "item.cobblemon.chipped_pot": "", + "item.cobblemon.cracked_pot": "", + "item.cobblemon.masterpiece_teacup": "", + "item.cobblemon.unremarkable_teacup": "", + "item.cobblemon.sweet_apple": "", + "item.cobblemon.tart_apple": "", + "item.cobblemon.galarica_cuff": "", + "item.cobblemon.galarica_wreath": "", + "item.cobblemon.black_augurite": "", + "item.cobblemon.peat_block": "", + "item.cobblemon.dawn_stone": "", + "item.cobblemon.dusk_stone": "", + "item.cobblemon.fire_stone": "", + "item.cobblemon.ice_stone": "", + "item.cobblemon.leaf_stone": "", + "item.cobblemon.moon_stone": "", + "item.cobblemon.shiny_stone": "", + "item.cobblemon.sun_stone": "", + "item.cobblemon.thunder_stone": "", + "item.cobblemon.water_stone": "", + "item.cobblemon.rare_candy": "", + "item.cobblemon.exp_candy_xs": "", + "item.cobblemon.exp_candy_s": "", + "item.cobblemon.exp_candy_m": "", + "item.cobblemon.exp_candy_l": "", + "item.cobblemon.exp_candy_xl": "", + "item.cobblemon.calcium": "", + "item.cobblemon.carbos": "", + "item.cobblemon.hp_up": "", + "item.cobblemon.iron": "", + "item.cobblemon.protein": "", + "item.cobblemon.zinc": "", + "item.cobblemon.potion": "", + "item.cobblemon.super_potion": "", + "item.cobblemon.hyper_potion": "", + "item.cobblemon.max_potion": "", + "item.cobblemon.full_restore": "", + "item.cobblemon.health_feather": "", + "item.cobblemon.muscle_feather": "", + "item.cobblemon.resist_feather": "", + "item.cobblemon.genius_feather": "", + "item.cobblemon.clever_feather": "", + "item.cobblemon.swift_feather": "", + "item.cobblemon.ability_capsule": "", + "item.cobblemon.ability_patch": "", + "item.cobblemon.red_mint_leaf": "", + "item.cobblemon.red_mint_leaf.tooltip": "", + "item.cobblemon.blue_mint_leaf": "", + "item.cobblemon.blue_mint_leaf.tooltip": "", + "item.cobblemon.cyan_mint_leaf": "", + "item.cobblemon.cyan_mint_leaf.tooltip": "", + "item.cobblemon.pink_mint_leaf": "", + "item.cobblemon.pink_mint_leaf.tooltip": "", + "item.cobblemon.green_mint_leaf": "", + "item.cobblemon.green_mint_leaf.tooltip": "", + "item.cobblemon.white_mint_leaf": "", + "item.cobblemon.white_mint_leaf.tooltip": "", + "item.cobblemon.lonely_mint": "", + "item.cobblemon.adamant_mint": "", + "item.cobblemon.naughty_mint": "", + "item.cobblemon.brave_mint": "", + "item.cobblemon.bold_mint": "", + "item.cobblemon.impish_mint": "", + "item.cobblemon.lax_mint": "", + "item.cobblemon.relaxed_mint": "", + "item.cobblemon.modest_mint": "", + "item.cobblemon.mild_mint": "", + "item.cobblemon.rash_mint": "", + "item.cobblemon.quiet_mint": "", + "item.cobblemon.calm_mint": "", + "item.cobblemon.gentle_mint": "", + "item.cobblemon.careful_mint": "", + "item.cobblemon.sassy_mint": "", + "item.cobblemon.timid_mint": "", + "item.cobblemon.hasty_mint": "", + "item.cobblemon.jolly_mint": "", + "item.cobblemon.naive_mint": "", + "item.cobblemon.serious_mint": "", + "item.cobblemon.ability_shield": "", + "item.cobblemon.absorb_bulb": "", + "item.cobblemon.air_balloon": "", + "item.cobblemon.assault_vest": "", + "item.cobblemon.auspicious_armor": "", + "item.cobblemon.malicious_armor": "", + "item.cobblemon.binding_band": "", + "item.cobblemon.black_belt": "", + "item.cobblemon.black_glasses": "", + "item.cobblemon.black_sludge": "", + "item.cobblemon.blunder_policy": "", + "item.cobblemon.cell_battery": "", + "item.cobblemon.charcoal_stick": "", + "item.cobblemon.choice_band": "", + "item.cobblemon.choice_scarf": "", + "item.cobblemon.choice_specs": "", + "item.cobblemon.cleanse_tag": "", + "item.cobblemon.clear_amulet": "", + "item.cobblemon.covert_cloak": "", + "item.cobblemon.dragon_fang": "", + "item.cobblemon.eject_button": "", + "item.cobblemon.eject_pack": "", + "item.cobblemon.electric_seed": "", + "item.cobblemon.everstone": "", + "item.cobblemon.eviolite": "", + "item.cobblemon.exp_share": "", + "item.cobblemon.expert_belt": "", + "item.cobblemon.fairy_feather": "", + "item.cobblemon.float_stone": "", + "item.cobblemon.focus_band": "", + "item.cobblemon.focus_sash": "", + "item.cobblemon.grassy_seed": "", + "item.cobblemon.grip_claw": "", + "item.cobblemon.hard_stone": "", + "item.cobblemon.heavy_duty_boots": "", + "item.cobblemon.iron_ball": "", + "item.cobblemon.lagging_tail": "", + "item.cobblemon.leftovers": "", + "item.cobblemon.light_ball": "", + "item.cobblemon.light_clay": "", + "item.cobblemon.loaded_dice": "", + "item.cobblemon.lucky_egg": "", + "item.cobblemon.luminous_moss": "", + "item.cobblemon.magnet": "", + "item.cobblemon.metronome": "", + "item.cobblemon.miracle_seed": "", + "item.cobblemon.muscle_band": "", + "item.cobblemon.mystic_water": "", + "item.cobblemon.never_melt_ice": "", + "item.cobblemon.poison_barb": "", + "item.cobblemon.protective_pads": "", + "item.cobblemon.punching_glove": "", + "item.cobblemon.quick_claw": "", + "item.cobblemon.razor_claw": "", + "item.cobblemon.razor_fang": "", + "item.cobblemon.red_card": "", + "item.cobblemon.ring_target": "", + "item.cobblemon.rocky_helmet": "", + "item.cobblemon.room_service": "", + "item.cobblemon.safety_goggles": "", + "item.cobblemon.scope_lens": "", + "item.cobblemon.sharp_beak": "", + "item.cobblemon.shed_shell": "", + "item.cobblemon.shell_bell": "", + "item.cobblemon.silk_scarf": "", + "item.cobblemon.silver_powder": "", + "item.cobblemon.soft_sand": "", + "item.cobblemon.soothe_bell": "", + "item.cobblemon.spell_tag": "", + "item.cobblemon.sticky_barb": "", + "item.cobblemon.terrain_extender": "", + "item.cobblemon.throat_spray": "", + "item.cobblemon.twisted_spoon": "", + "item.cobblemon.utility_umbrella": "", + "item.cobblemon.weakness_policy": "", + "item.cobblemon.wide_lens": "", + "item.cobblemon.wise_glasses": "", + "item.cobblemon.zoom_lens": "", + "item.cobblemon.mental_herb": "", + "item.cobblemon.mirror_herb": "", + "item.cobblemon.misty_seed": "", + "item.cobblemon.power_herb": "", + "item.cobblemon.white_herb": "", + "item.cobblemon.bright_powder": "", + "item.cobblemon.metal_powder": "", + "item.cobblemon.quick_powder": "", + "item.cobblemon.destiny_knot": "", + "item.cobblemon.power_anklet": "", + "item.cobblemon.power_band": "", + "item.cobblemon.power_belt": "", + "item.cobblemon.power_bracer": "", + "item.cobblemon.power_lens": "", + "item.cobblemon.power_weight": "", + "item.cobblemon.psychic_seed": "", + "item.cobblemon.flame_orb": "", + "item.cobblemon.smoke_ball": "", + "item.cobblemon.toxic_orb": "", + "item.cobblemon.life_orb": "", + "item.cobblemon.damp_rock": "", + "item.cobblemon.heat_rock": "", + "item.cobblemon.smooth_rock": "", + "item.cobblemon.icy_rock": "", + "item.cobblemon.poke_ball.tooltip": "", + "item.cobblemon.slate_ball.tooltip": "", + "item.cobblemon.azure_ball.tooltip": "", + "item.cobblemon.verdant_ball.tooltip": "", + "item.cobblemon.roseate_ball.tooltip": "", + "item.cobblemon.citrine_ball.tooltip": "", + "item.cobblemon.great_ball.tooltip": "", + "item.cobblemon.ultra_ball.tooltip": "", + "item.cobblemon.master_ball.tooltip": "", + "item.cobblemon.safari_ball.tooltip": "", + "item.cobblemon.fast_ball.tooltip": "", + "item.cobblemon.level_ball.tooltip": "", + "item.cobblemon.lure_ball.tooltip": "", + "item.cobblemon.heavy_ball.tooltip": "", + "item.cobblemon.love_ball.tooltip": "", + "item.cobblemon.friend_ball.tooltip": "", + "item.cobblemon.moon_ball.tooltip": "", + "item.cobblemon.sport_ball.tooltip": "", + "item.cobblemon.net_ball.tooltip": "", + "item.cobblemon.dive_ball.tooltip": "", + "item.cobblemon.nest_ball.tooltip": "", + "item.cobblemon.repeat_ball.tooltip": "", + "item.cobblemon.timer_ball.tooltip": "", + "item.cobblemon.luxury_ball.tooltip": "", + "item.cobblemon.premier_ball.tooltip": "", + "item.cobblemon.dusk_ball.tooltip": "", + "item.cobblemon.heal_ball.tooltip": "", + "item.cobblemon.quick_ball.tooltip": "", + "item.cobblemon.cherish_ball.tooltip": "", + "item.cobblemon.park_ball.tooltip": "", + "item.cobblemon.dream_ball.tooltip": "", + "item.cobblemon.beast_ball.tooltip": "", + "item.cobblemon.ancient_poke_ball.tooltip": "", + "item.cobblemon.ancient_citrine_ball.tooltip": "", + "item.cobblemon.ancient_verdant_ball.tooltip": "", + "item.cobblemon.ancient_azure_ball.tooltip": "", + "item.cobblemon.ancient_roseate_ball.tooltip": "", + "item.cobblemon.ancient_slate_ball.tooltip": "", + "item.cobblemon.ancient_ivory_ball.tooltip": "", + "item.cobblemon.ancient_great_ball.tooltip": "", + "item.cobblemon.ancient_ultra_ball.tooltip": "", + "item.cobblemon.ancient_feather_ball.tooltip": "", + "item.cobblemon.ancient_wing_ball.tooltip": "", + "item.cobblemon.ancient_jet_ball.tooltip": "", + "item.cobblemon.ancient_heavy_ball.tooltip": "", + "item.cobblemon.ancient_leaden_ball.tooltip": "", + "item.cobblemon.ancient_gigaton_ball.tooltip": "", + "item.cobblemon.ancient_origin_ball.tooltip": "", + "item.cobblemon.mulch_base": "", + "item.cobblemon.coarse_mulch": "", + "item.cobblemon.growth_mulch": "", + "item.cobblemon.humid_mulch": "", + "item.cobblemon.loamy_mulch": "", + "item.cobblemon.peat_mulch": "", + "item.cobblemon.rich_mulch": "", + "item.cobblemon.sandy_mulch": "", + "item.cobblemon.surprise_mulch": "", + "item.cobblemon.medicinal_leek": "", + "item.cobblemon.energy_root": "", + "item.cobblemon.revival_herb": "", + "item.cobblemon.roasted_leek": "", + "item.cobblemon.leek_and_potato_stew": "", + "item.cobblemon.braised_vivichoke": "", + "item.cobblemon.vivichoke_dip": "", + "item.cobblemon.berry_juice": "", + "item.cobblemon.remedy": "", + "item.cobblemon.fine_remedy": "", + "item.cobblemon.superb_remedy": "", + "item.cobblemon.heal_powder": "", + "item.cobblemon.medicinal_brew": "", + "item.cobblemon.revive": "", + "item.cobblemon.max_revive": "", + "item.cobblemon.pp_up": "", + "item.cobblemon.pp_max": "", + "item.cobblemon.x_attack": "", + "item.cobblemon.x_defence": "", + "item.cobblemon.x_accuracy": "", + "item.cobblemon.x_speed": "", + "item.cobblemon.x_special_defence": "", + "item.cobblemon.x_special_attack": "", + "item.cobblemon.dire_hit": "", + "item.cobblemon.guard_spec": "", + "item.cobblemon.full_heal": "", + "item.cobblemon.antidote": "", + "item.cobblemon.awakening": "", + "item.cobblemon.burn_heal": "", + "item.cobblemon.ice_heal": "", + "item.cobblemon.paralyze_heal": "", + "item.cobblemon.ether": "", + "item.cobblemon.max_ether": "", + "item.cobblemon.elixir": "", + "item.cobblemon.max_elixir": "", + "item.cobblemon.normal_gem": "", + "item.cobblemon.water_gem": "", + "item.cobblemon.fire_gem": "", + "item.cobblemon.grass_gem": "", + "item.cobblemon.dragon_gem": "", + "item.cobblemon.ghost_gem": "", + "item.cobblemon.ground_gem": "", + "item.cobblemon.steel_gem": "", + "item.cobblemon.fairy_gem": "", + "item.cobblemon.rock_gem": "", + "item.cobblemon.psychic_gem": "", + "item.cobblemon.electric_gem": "", + "item.cobblemon.bug_gem": "", + "item.cobblemon.poison_gem": "", + "item.cobblemon.ice_gem": "", + "item.cobblemon.dark_gem": "", + "item.cobblemon.fighting_gem": "", + "item.cobblemon.flying_gem": "", + "item.cobblemon.armor_fossil": "", + "item.cobblemon.fossilized_bird": "", + "item.cobblemon.claw_fossil": "", + "item.cobblemon.cover_fossil": "", + "item.cobblemon.fossilized_dino": "", + "item.cobblemon.dome_fossil": "", + "item.cobblemon.fossilized_drake": "", + "item.cobblemon.fossilized_fish": "", + "item.cobblemon.helix_fossil": "", + "item.cobblemon.jaw_fossil": "", + "item.cobblemon.old_amber_fossil": "", + "item.cobblemon.plume_fossil": "", + "item.cobblemon.root_fossil": "", + "item.cobblemon.sail_fossil": "", + "item.cobblemon.skull_fossil": "", + "item.cobblemon.bygone_sherd": "", + "item.cobblemon.capture_sherd": "", + "item.cobblemon.dome_sherd": "", + "item.cobblemon.helix_sherd": "", + "item.cobblemon.nostalgic_sherd": "", + "item.cobblemon.suspicious_sherd": "", + "item.cobblemon.tumblestone": "", + "item.cobblemon.black_tumblestone": "", + "item.cobblemon.sky_tumblestone": "", + "item.cobblemon.relic_coin": "", + "block.cobblemon.relic_coin_pouch": "", + "block.cobblemon.relic_coin_sack": "", + "item.cobblemon.automaton_armor_trim_smithing_template": "", + "trim_pattern.cobblemon.automaton": "", + "cobblemon.tooltip.see_more_info": "", + "cobblemon.item_class.fishing_bait": "", + "cobblemon.fossil.armor": "", + "cobblemon.fossil.bird": "", + "cobblemon.fossil.claw": "", + "cobblemon.fossil.cover": "", + "cobblemon.fossil.dino": "", + "cobblemon.fossil.dome": "", + "cobblemon.fossil.drake": "", + "cobblemon.fossil.fish": "", + "cobblemon.fossil.helix": "", + "cobblemon.fossil.jaw": "", + "cobblemon.fossil.old_amber": "", + "cobblemon.fossil.plume": "", + "cobblemon.fossil.root": "", + "cobblemon.fossil.sail": "", + "cobblemon.fossil.skull": "", + "cobblemon.gender.female": "", + "cobblemon.gender.male": "", + "cobblemon.gender.genderless": "", + "cobblemon.fossilmachine.protected": "", + "itemGroup.cobblemon.blocks": "", + "itemGroup.cobblemon.utility_item": "", + "itemGroup.cobblemon.agriculture": "", + "itemGroup.cobblemon.consumables": "", + "itemGroup.cobblemon.held_item": "", + "itemGroup.cobblemon.evolution_item": "", + "itemGroup.cobblemon.archaeology": "", + "block.cobblemon.black_apricorn": "", + "block.cobblemon.blue_apricorn": "", + "block.cobblemon.green_apricorn": "", + "block.cobblemon.pink_apricorn": "", + "block.cobblemon.red_apricorn": "", + "block.cobblemon.white_apricorn": "", + "block.cobblemon.yellow_apricorn": "", + "block.cobblemon.apricorn_log": "", + "block.cobblemon.stripped_apricorn_log": "", + "block.cobblemon.apricorn_wood": "", + "block.cobblemon.stripped_apricorn_wood": "", + "block.cobblemon.apricorn_planks": "", + "block.cobblemon.apricorn_leaves": "", + "block.cobblemon.apricorn_fence": "", + "block.cobblemon.apricorn_sign": "", + "block.cobblemon.apricorn_hanging_sign": "", + "block.cobblemon.apricorn_stairs": "", + "block.cobblemon.apricorn_pressure_plate": "", + "block.cobblemon.apricorn_button": "", + "block.cobblemon.apricorn_slab": "", + "block.cobblemon.apricorn_fence_gate": "", + "block.cobblemon.big_root": "", + "block.cobblemon.black_apricorn_sapling": "", + "block.cobblemon.blue_apricorn_sapling": "", + "block.cobblemon.green_apricorn_sapling": "", + "block.cobblemon.pink_apricorn_sapling": "", + "block.cobblemon.red_apricorn_sapling": "", + "block.cobblemon.white_apricorn_sapling": "", + "block.cobblemon.yellow_apricorn_sapling": "", + "block.cobblemon.apricorn_door": "", + "block.cobblemon.apricorn_trapdoor": "", + "block.cobblemon.healing_machine": "", + "block.cobblemon.healing_machine.tooltip1": "", + "block.cobblemon.healing_machine.tooltip2": "", + "block.cobblemon.pc": "", + "block.cobblemon.lectern": "", + "block.cobblemon.restoration_tank": "", + "block.cobblemon.fossil_analyzer": "", + "block.cobblemon.monitor": "", + "block.cobblemon.red_mint": "", + "block.cobblemon.blue_mint": "", + "block.cobblemon.cyan_mint": "", + "block.cobblemon.pink_mint": "", + "block.cobblemon.green_mint": "", + "block.cobblemon.white_mint": "", + "block.cobblemon.vivichoke_seeds": "", + "block.cobblemon.pep_up_flower": "", + "block.cobblemon.potted_pep_up_flower": "", + "block.cobblemon.gilded_chest": "", + "block.cobblemon.gimmighoul_chest": "", + "block.cobblemon.blue_gilded_chest": "", + "block.cobblemon.yellow_gilded_chest": "", + "block.cobblemon.pink_gilded_chest": "", + "block.cobblemon.black_gilded_chest": "", + "block.cobblemon.green_gilded_chest": "", + "block.cobblemon.white_gilded_chest": "", + "block.cobblemon.display_case": "", + "block.cobblemon.small_budding_tumblestone": "", + "block.cobblemon.medium_budding_tumblestone": "", + "block.cobblemon.large_budding_tumblestone": "", + "block.cobblemon.tumblestone_cluster": "", + "block.cobblemon.tumblestone_block": "", + "block.cobblemon.polished_tumblestone": "", + "block.cobblemon.polished_tumblestone_slab": "", + "block.cobblemon.polished_tumblestone_stairs": "", + "block.cobblemon.polished_tumblestone_wall": "", + "block.cobblemon.chiseled_polished_tumblestone": "", + "block.cobblemon.tumblestone_bricks": "", + "block.cobblemon.tumblestone_brick_slab": "", + "block.cobblemon.tumblestone_brick_stairs": "", + "block.cobblemon.tumblestone_brick_wall": "", + "block.cobblemon.chiseled_tumblestone_bricks": "", + "block.cobblemon.smooth_tumblestone": "", + "block.cobblemon.smooth_tumblestone_slab": "", + "block.cobblemon.smooth_tumblestone_stairs": "", + "block.cobblemon.small_budding_sky_tumblestone": "", + "block.cobblemon.medium_budding_sky_tumblestone": "", + "block.cobblemon.large_budding_sky_tumblestone": "", + "block.cobblemon.sky_tumblestone_cluster": "", + "block.cobblemon.sky_tumblestone_block": "", + "block.cobblemon.polished_sky_tumblestone": "", + "block.cobblemon.polished_sky_tumblestone_slab": "", + "block.cobblemon.polished_sky_tumblestone_stairs": "", + "block.cobblemon.polished_sky_tumblestone_wall": "", + "block.cobblemon.chiseled_polished_sky_tumblestone": "", + "block.cobblemon.sky_tumblestone_bricks": "", + "block.cobblemon.sky_tumblestone_brick_slab": "", + "block.cobblemon.sky_tumblestone_brick_stairs": "", + "block.cobblemon.sky_tumblestone_brick_wall": "", + "block.cobblemon.chiseled_sky_tumblestone_bricks": "", + "block.cobblemon.smooth_sky_tumblestone": "", + "block.cobblemon.smooth_sky_tumblestone_slab": "", + "block.cobblemon.smooth_sky_tumblestone_stairs": "", + "block.cobblemon.small_budding_black_tumblestone": "", + "block.cobblemon.medium_budding_black_tumblestone": "", + "block.cobblemon.large_budding_black_tumblestone": "", + "block.cobblemon.black_tumblestone_cluster": "", + "block.cobblemon.black_tumblestone_block": "", + "block.cobblemon.polished_black_tumblestone": "", + "block.cobblemon.polished_black_tumblestone_slab": "", + "block.cobblemon.polished_black_tumblestone_stairs": "", + "block.cobblemon.polished_black_tumblestone_wall": "", + "block.cobblemon.chiseled_polished_black_tumblestone": "", + "block.cobblemon.black_tumblestone_bricks": "", + "block.cobblemon.black_tumblestone_brick_slab": "", + "block.cobblemon.black_tumblestone_brick_stairs": "", + "block.cobblemon.black_tumblestone_brick_wall": "", + "block.cobblemon.chiseled_black_tumblestone_bricks": "", + "block.cobblemon.smooth_black_tumblestone": "", + "block.cobblemon.smooth_black_tumblestone_slab": "", + "block.cobblemon.smooth_black_tumblestone_stairs": "", + "block.cobblemon.fire_stone_block": "", + "block.cobblemon.water_stone_block": "", + "block.cobblemon.thunder_stone_block": "", + "block.cobblemon.leaf_stone_block": "", + "block.cobblemon.ice_stone_block": "", + "block.cobblemon.sun_stone_block": "", + "block.cobblemon.moon_stone_block": "", + "block.cobblemon.shiny_stone_block": "", + "block.cobblemon.dawn_stone_block": "", + "block.cobblemon.dusk_stone_block": "", + "cobblemon.fishing_bait_effect_header": "", + "cobblemon.fishing_bait_effects.nature.tooltip": "", + "cobblemon.fishing_bait_effects.iv.tooltip": "", + "cobblemon.fishing_bait_effects.ev.tooltip": "", + "cobblemon.fishing_bait_effects.bite_time.tooltip": "", + "cobblemon.fishing_bait_effects.gender_chance.tooltip": "", + "cobblemon.fishing_bait_effects.level_raise.tooltip": "", + "cobblemon.fishing_bait_effects.tera.tooltip": "", + "cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "", + "cobblemon.fishing_bait_effects.ha_chance.tooltip": "", + "cobblemon.fishing_bait_effects.pokemon_chance.tooltip": "", + "cobblemon.fishing_bait_effects.friendship.tooltip": "", + "cobblemon.fishing_bait_effects.inert.tooltip": "", + "entity.minecraft.villager.nurse": "", + "entity.minecraft.villager.cobblemon.nurse": "", + "cobblemon.overflow_no_pc": "", + "cobblemon.overflow_no_space": "", + "cobblemon.overflow_to_pc": "", + "cobblemon.your_pc": "", + "cobblemon.command.pokespawn.invalid-pokemon": "", + "cobblemon.command.pokespawn.invalid-move": "", + "cobblemon.command.clearparty.nonethere": "", + "cobblemon.command.clearparty.cleared": "", + "cobblemon.command.clearpc.cleared": "", + "cobblemon.command.dialogue.invalid-dialogue": "", + "cobblemon.ui.generic.yes": "", + "cobblemon.ui.generic.no": "", + "cobblemon.ui.pokenav.title": "", + "cobblemon.ui.pokenav.narrator.backbutton": "", + "cobblemon.ui.summary.title": "", + "cobblemon.ui.starter.title": "", + "cobblemon.ui.starter.choosebutton": "", + "cobblemon.ui.starter.alreadyselected": "", + "cobblemon.ui.starter.cannotchoose": "", + "cobblemon.ui.starter.hasalreadychosen": "", + "cobblemon.ui.starter.skippedchoosing": "", + "cobblemon.ui.starter.choose_starter_title": "", + "cobblemon.ui.starter.narrator.backbutton": "", + "cobblemon.ui.starter.choose_starter_description": "", + "cobblemon.ui.starter.chooseyourstarter": "", + "cobblemon.ui.moves": "", + "cobblemon.ui.moves.switch": "", + "cobblemon.ui.moves.pp": "", + "cobblemon.ui.moves.forget": "", + "cobblemon.ui.stats": "", + "cobblemon.ui.stats.stat": "", + "cobblemon.ui.stats.base": "", + "cobblemon.ui.stats.ivs": "", + "cobblemon.ui.stats.evs": "", + "cobblemon.ui.stats.other": "", + "cobblemon.ui.stats.friendship": "", + "cobblemon.ui.stats.hp": "", + "cobblemon.ui.stats.atk": "", + "cobblemon.ui.stats.def": "", + "cobblemon.ui.stats.sp_atk": "", + "cobblemon.ui.stats.sp_def": "", + "cobblemon.ui.stats.speed": "", + "cobblemon.ui.stash.gold": "", + "cobblemon.ui.stash.netherite": "", + "cobblemon.ui.info": "", + "cobblemon.ui.info.pokedex_number": "", + "cobblemon.ui.info.species": "", + "cobblemon.ui.info.type": "", + "cobblemon.ui.info.original_trainer": "", + "cobblemon.ui.info.nature": "", + "cobblemon.ui.info.ability": "", + "cobblemon.ui.info.experience_points": "", + "cobblemon.ui.info.to_next_level": "", + "cobblemon.ui.trade": "", + "cobblemon.trade.occupied": "", + "cobblemon.trade.request_expired": "", + "cobblemon.trade.request_already_expired": "", + "cobblemon.trade.request_sent": "", + "cobblemon.trade.offer": "", + "cobblemon.ui.party": "", + "cobblemon.ui.power": "", + "cobblemon.ui.accuracy": "", + "cobblemon.ui.effect": "", + "cobblemon.ui.pokemon": "", + "cobblemon.ui.exit": "", + "cobblemon.ui.pc.box.title": "", + "cobblemon.ui.pc.release": "", + "cobblemon.ui.pasture": "", + "cobblemon.ui.pasture.recall_all": "", + "cobblemon.ui.pasture.owned_name": "", + "cobblemon.pasture.too_many_nearby": "", + "cobblemon.ui.interact.give.item": "", + "cobblemon.ui.interact.spectate": "", + "cobblemon.ui.interact.trade": "", + "cobblemon.ui.interact.battle": "", + "cobblemon.ui.interact.unavailable": "", + "cobblemon.ui.interact.accept": "", + "cobblemon.ui.interact.decline": "", + "cobblemon.ui.interact.failed": "", + "cobblemon.ui.interact.mount.shoulder": "", + "cobblemon.ui.interact.team_leave": "", + "cobblemon.ui.interact.team_request": "", + "cobblemon.ui.interact.too_far": "", + "cobblemon.ui.pokedex.scan.registered_suffix": "", + "cobblemon.ui.pokedex.scan.trainer_owned": "", + "cobblemon.ui.pokedex.region.national": "", + "cobblemon.ui.pokedex.region.alola": "", + "cobblemon.ui.pokedex.region.galar": "", + "cobblemon.ui.pokedex.region.hisui": "", + "cobblemon.ui.pokedex.region.hoenn": "", + "cobblemon.ui.pokedex.region.johto": "", + "cobblemon.ui.pokedex.region.kalos": "", + "cobblemon.ui.pokedex.region.kanto": "", + "cobblemon.ui.pokedex.region.paldea": "", + "cobblemon.ui.pokedex.region.sinnoh": "", + "cobblemon.ui.pokedex.region.unknown": "", + "cobblemon.ui.pokedex.region.unova": "", + "cobblemon.ui.pokedex.info.ability": "", + "cobblemon.ui.pokedex.info.entry": "", + "cobblemon.ui.pokedex.info.stats": "", + "cobblemon.ui.pokedex.info.drops": "", + "cobblemon.ui.pokedex.info.drops_display": "", + "cobblemon.ui.pokedex.info.drops_amount": "", + "cobblemon.ui.pokedex.info.drops_range": "", + "cobblemon.ui.pokedex.info.drops_percentage": "", + "cobblemon.ui.pokedex.info.drops_empty": "", + "cobblemon.ui.pokedex.info.variation": "", + "cobblemon.ui.pokedex.info.form": "", + "cobblemon.ui.pokedex.info.form.normal": "", + "cobblemon.ui.pokedex.info.form.alola": "", + "cobblemon.ui.pokedex.info.form.region-bias-alola": "", + "cobblemon.ui.pokedex.info.form.galar": "", + "cobblemon.ui.pokedex.info.form.region-bias-galar": "", + "cobblemon.ui.pokedex.info.form.hisui": "", + "cobblemon.ui.pokedex.info.form.region-bias-hisui": "", + "cobblemon.ui.pokedex.info.form.paldea": "", + "cobblemon.ui.pokedex.info.form.region-bias-paldea": "", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage1": "", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage2": "", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage3": "", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage4": "", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage5": "", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage6": "", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage7": "", + "cobblemon.ui.pokedex.info.form.netherite-coating-full": "", + "cobblemon.ui.pokedex.info.form.roaming": "", + "cobblemon.ui.pokedex.info.form.minecraft": "", + "cobblemon.ui.pokedex.info.form.squawkabilly-color-blue": "", + "cobblemon.ui.pokedex.info.form.squawkabilly-color-gray": "", + "cobblemon.ui.pokedex.info.form.squawkabilly-color-green": "", + "cobblemon.ui.pokedex.info.form.squawkabilly-color-yellow": "", + "cobblemon.ui.pokedex.info.form.maushold-family-four": "", + "cobblemon.ui.pokedex.info.form.no_ice": "", + "cobblemon.ui.pokedex.info.form.color-light_gray": "", + "cobblemon.ui.pokedex.info.form.color-gray": "", + "cobblemon.ui.pokedex.info.form.color-black": "", + "cobblemon.ui.pokedex.info.form.color-brown": "", + "cobblemon.ui.pokedex.info.form.color-red": "", + "cobblemon.ui.pokedex.info.form.color-orange": "", + "cobblemon.ui.pokedex.info.form.color-yellow": "", + "cobblemon.ui.pokedex.info.form.color-lime": "", + "cobblemon.ui.pokedex.info.form.color-green": "", + "cobblemon.ui.pokedex.info.form.color-cyan": "", + "cobblemon.ui.pokedex.info.form.color-light_blue": "", + "cobblemon.ui.pokedex.info.form.color-blue": "", + "cobblemon.ui.pokedex.info.form.color-purple": "", + "cobblemon.ui.pokedex.info.form.color-magenta": "", + "cobblemon.ui.pokedex.info.form.color-pink": "", + "cobblemon.ui.pokedex.info.form.color-white": "", + "cobblemon.ui.pokedex.info.form.tree-oak": "", + "cobblemon.ui.pokedex.info.form.tree-spruce": "", + "cobblemon.ui.pokedex.info.form.tree-acacia": "", + "cobblemon.ui.pokedex.info.form.tree-birch": "", + "cobblemon.ui.pokedex.info.form.tree-darkoak": "", + "cobblemon.ui.pokedex.info.form.tree-jungle": "", + "cobblemon.ui.pokedex.info.form.tree-mangrove": "", + "cobblemon.ui.pokedex.info.form.tree-cherry": "", + "cobblemon.ui.pokedex.info.form.tree-crimson": "", + "cobblemon.ui.pokedex.info.form.tree-warped": "", + "cobblemon.ui.pokedex.info.form.tree-swamp": "", + "cobblemon.ui.pokedex.info.form.tree-azalea": "", + "cobblemon.ui.pokedex.info.form.schooling": "", + "cobblemon.ui.pokedex.info.form.flower-blue": "", + "cobblemon.ui.pokedex.info.form.flower-orange": "", + "cobblemon.ui.pokedex.info.form.flower-yellow": "", + "cobblemon.ui.pokedex.info.form.flower-white": "", + "cobblemon.ui.pokedex.info.form.flower-red": "", + "cobblemon.ui.pokedex.info.form.flower-pink": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-archipelago": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-continental": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-elegant": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-fancy": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-garden": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-high-plains": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-icy-snow": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-jungle": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-marine": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-meadow": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-modern": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-monsoon": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-ocean": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-poke-ball": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-polar": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-river": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-sandstorm": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-savanna": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-sun": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-tundra": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-inferno": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-void": "", + "cobblemon.ui.pokedex.info.form.vivillon-wings-forsaken": "", + "cobblemon.ui.pokedex.info.form.autumn": "", + "cobblemon.ui.pokedex.info.form.summer": "", + "cobblemon.ui.pokedex.info.form.winter": "", + "cobblemon.ui.pokedex.info.form.redstriped": "", + "cobblemon.ui.pokedex.info.form.bluestriped": "", + "cobblemon.ui.pokedex.info.form.whitestriped": "", + "cobblemon.ui.pokedex.info.form.metals-copper": "", + "cobblemon.ui.pokedex.info.form.metals-iron": "", + "cobblemon.ui.pokedex.info.form.metals-gold": "", + "cobblemon.ui.pokedex.info.form.metals-netherite": "", + "cobblemon.ui.pokedex.info.form.mooshtank-red": "", + "cobblemon.ui.pokedex.info.form.mooshtank-brown": "", + "cobblemon.ui.pokedex.info.form.snake-pattern-attack": "", + "cobblemon.ui.pokedex.info.form.snake-pattern-dark": "", + "cobblemon.ui.pokedex.info.form.snake-pattern-elusive": "", + "cobblemon.ui.pokedex.info.form.snake-pattern-heart": "", + "cobblemon.ui.pokedex.info.form.snake-pattern-legacy": "", + "cobblemon.ui.pokedex.info.form.snake-pattern-sound": "", + "cobblemon.ui.pokedex.info.form.snake-pattern-speed": "", + "cobblemon.ui.pokedex.info.form.shulker": "", + "cobblemon.ui.pokedex.info.form.zen_mode": "", + "cobblemon.ui.pokedex.info.form.valencian": "", + "cobblemon.ui.pokedex.info.unimplemented": "", + "cobblemon.ui.pokedex.search": "", + "cobblemon.ui.pokedex.unknown": "", + "cobblemon.ui.pokedex.weight": "", + "cobblemon.ui.pokedex.height": "", + "cobblemon.pokedex.variation.cream": "", + "cobblemon.pokedex.variation.decoration": "", + "cobblemon.pokedex.variation.flower": "", + "cobblemon.pokedex.variation.face_spot_1": "", + "cobblemon.pokedex.variation.face_spot_2": "", + "cobblemon.pokedex.variation.special_spot": "", + "cobblemon.pokedex.variation.left_ear_spot": "", + "cobblemon.pokedex.variation.right_ear_spot": "", + "cobblemon.pokedex.variation.color": "", + "cobblemon.pokedex.variation.pattern": "", + "cobblemon.pokedex.variation.metal": "", + "cobblemon.pokedex.variation.netherite_coating": "", + "cobblemon.pokedex.variation.ice": "", + "cobblemon.pokedex.variation.breed": "", + "cobblemon.pokedex.variation.size": "", + "cobblemon.pokedex.variation.wood": "", + "cobblemon.pokedex.variation.stripes": "", + "cobblemon.pokedex.variation.region_bias": "", + "cobblemon.pokedex.variation.variant": "", + "cobblemon.pokedex.variation.season": "", + "cobblemon.pokedex.variation.snake_pattern": "", + "key.cobblemon.upshiftparty": "", + "key.cobblemon.downshiftparty": "", + "key.cobblemon.hideparty": "", + "key.cobblemon.throwpartypokemon": "", + "key.cobblemon.pokenavigator": "", + "key.cobblemon.summary": "", + "key.cobblemon.pokedex": "", + "key.cobblemon.categories.cobblemon": "", + "key.cobblemon.scaleportraitup": "", + "key.cobblemon.scaleportraitdown": "", + "key.cobblemon.translateportraitup": "", + "key.cobblemon.translateportraitdown": "", + "key.cobblemon.translateportraitleft": "", + "key.cobblemon.translateportraitright": "", + "key.cobblemon.printmodelsettings": "", + "key.cobblemon.categories.cobblemon.debug": "", + "cobblemon.subtitle.poke_ball.capture_succeeded": "", + "cobblemon.subtitle.pokemon.shiny_shine": "", + "cobblemon.subtitle.pokemon.wild_shiny_shine": "", + "cobblemon.subtitle.pokemon.owned_shiny_ambient": "", + "cobblemon.subtitle.pokemon.shiny_ambient": "", + "cobblemon.subtitle.fossilmachine.activate": "", + "cobblemon.subtitle.fossilmachine.active_loop": "", + "cobblemon.subtitle.fossilmachine.dna_full": "", + "cobblemon.subtitle.fossilmachine.finished": "", + "cobblemon.subtitle.fossilmachine.insert_dna": "", + "cobblemon.subtitle.fossilmachine.insert_dna_small": "", + "cobblemon.subtitle.fossilmachine.insert_fossil": "", + "cobblemon.subtitle.fossilmachine.retrieve_fossil": "", + "cobblemon.subtitle.fossilmachine.retrieve_pokemon": "", + "cobblemon.subtitle.fossilmachine.unprotected": "", + "cobblemon.subtitle.fossilmachine.assemble": "", + "cobblemon.healingmachine.alreadyinuse": "", + "cobblemon.healingmachine.nopokemon": "", + "cobblemon.healingmachine.alreadyhealed": "", + "cobblemon.healingmachine.healing": "", + "cobblemon.healingmachine.healed": "", + "cobblemon.healingmachine.notenoughcharge": "", + "cobblemon.healingmachine.inbattle": "", + "cobblemon.healingmachine.alreadyhealing": "", + "cobblemon.pc.inbattle": "", + "cobblemon.held_item": "", + "cobblemon.held_item.give": "", + "cobblemon.held_item.replace": "", + "cobblemon.held_item.take": "", + "cobblemon.held_item.already_holding": "", + "cobblemon.ui.pokemonteam": "", + "cobblemon.ui.lv": "", + "cobblemon.ui.lv.number": "", + "cobblemon.ui.changemove": "", + "cobblemon.ui.status.brn": "", + "cobblemon.ui.status.fnt": "", + "cobblemon.ui.status.frz": "", + "cobblemon.ui.status.par": "", + "cobblemon.ui.status.psn": "", + "cobblemon.ui.status.slp": "", + "cobblemon.ui.status.tox": "", + "cobblemon.battle.ui.fight": "", + "cobblemon.battle.ui.switch": "", + "cobblemon.battle.ui.capture": "", + "cobblemon.battle.ui.run": "", + "cobblemon.battle.ui.forfeit": "", + "cobblemon.battle.ui.forfeit_confirmation": "", + "cobblemon.battle.ui.hide_label": "", + "cobblemon.battle.ui.actions_label": "", + "cobblemon.ui.evolve": "", + "cobblemon.ui.evolution": "", + "cobblemon.ui.evolve.hint": "", + "cobblemon.ui.evolve.into": "", + "cobblemon.label.lv": "", + "cobblemon.challenge_label": "", + "cobblemon.challenge.sender": "", + "cobblemon.challenge.pending": "", + "cobblemon.challenge.receiver": "", + "cobblemon.challenge.challenge": "", + "cobblemon.challenge.request_battle_title": "", + "cobblemon.challenge.rule.level": "", + "cobblemon.challenge.rule.anything_goes": "", + "cobblemon.challenge.request_team_join_title": "", + "cobblemon.challenge.request_team_leave_title": "", + "cobblemon.challenge.multi.team_request.sender": "", + "cobblemon.challenge.multi.team_request.receiver": "", + "cobblemon.challenge.multi.team_request.accept.sender": "", + "cobblemon.challenge.multi.team_request.accept.receiver": "", + "cobblemon.challenge.multi.team_request.decline.sender": "", + "cobblemon.challenge.multi.team_request.decline.receiver": "", + "cobblemon.challenge.multi.team_remove.receiver": "", + "cobblemon.challenge.multi.team_remove.sender": "", + "cobblemon.challenge.multi.team_disband": "", + "cobblemon.challenge.multi.team_reject.existing_team": "", + "cobblemon.challenge.multi.team_reject.max_team_size": "", + "cobblemon.challenge.multi.sender": "", + "cobblemon.challenge.multi.receiver": "", + "cobblemon.challenge.multi.invite": "", + "cobblemon.challenge.multi.leave": "", + "cobblemon.challenge.multi.decline.receiver": "", + "cobblemon.challenge.multi.decline.disband": "", + "cobblemon.challenge.multi.decline.sender": "", + "cobblemon.challenge.multi.decline.sender.personal": "", + "cobblemon.challenge.decline.sender": "", + "cobblemon.challenge.decline.receiver": "", + "cobblemon.drop.item.inventory": "", + "cobblemon.drop.item.full": "", + "cobblemon.mint.interact": "", + "cobblemon.mint.same_nature": "", + "cobblemon.ability_changer.changed": "", + "itemGroup.cobblemon.plants": "", + "item.cobblemon.aguav_berry": "", + "item.cobblemon.aguav_berry.tooltip": "", + "item.cobblemon.apicot_berry": "", + "item.cobblemon.apicot_berry.tooltip": "", + "item.cobblemon.aspear_berry": "", + "item.cobblemon.aspear_berry.tooltip": "", + "item.cobblemon.babiri_berry": "", + "item.cobblemon.babiri_berry.tooltip": "", + "item.cobblemon.belue_berry": "", + "item.cobblemon.belue_berry.tooltip": "", + "item.cobblemon.bluk_berry": "", + "item.cobblemon.bluk_berry.tooltip": "", + "item.cobblemon.charti_berry": "", + "item.cobblemon.charti_berry.tooltip": "", + "item.cobblemon.cheri_berry": "", + "item.cobblemon.cheri_berry.tooltip": "", + "item.cobblemon.chesto_berry": "", + "item.cobblemon.chesto_berry.tooltip": "", + "item.cobblemon.chilan_berry": "", + "item.cobblemon.chilan_berry.tooltip": "", + "item.cobblemon.chople_berry": "", + "item.cobblemon.chople_berry.tooltip": "", + "item.cobblemon.coba_berry": "", + "item.cobblemon.coba_berry.tooltip": "", + "item.cobblemon.colbur_berry": "", + "item.cobblemon.colbur_berry.tooltip": "", + "item.cobblemon.cornn_berry": "", + "item.cobblemon.cornn_berry.tooltip": "", + "item.cobblemon.custap_berry": "", + "item.cobblemon.custap_berry.tooltip": "", + "item.cobblemon.durin_berry": "", + "item.cobblemon.durin_berry.tooltip": "", + "item.cobblemon.enigma_berry": "", + "item.cobblemon.enigma_berry.tooltip": "", + "item.cobblemon.figy_berry": "", + "item.cobblemon.figy_berry.tooltip": "", + "item.cobblemon.ganlon_berry": "", + "item.cobblemon.ganlon_berry.tooltip": "", + "item.cobblemon.grepa_berry": "", + "item.cobblemon.grepa_berry.tooltip": "", + "item.cobblemon.haban_berry": "", + "item.cobblemon.haban_berry.tooltip": "", + "item.cobblemon.hondew_berry": "", + "item.cobblemon.hondew_berry.tooltip": "", + "item.cobblemon.hopo_berry": "", + "item.cobblemon.hopo_berry.tooltip": "", + "item.cobblemon.iapapa_berry": "", + "item.cobblemon.iapapa_berry.tooltip": "", + "item.cobblemon.jaboca_berry": "", + "item.cobblemon.jaboca_berry.tooltip": "", + "item.cobblemon.kasib_berry": "", + "item.cobblemon.kasib_berry.tooltip": "", + "item.cobblemon.kebia_berry": "", + "item.cobblemon.kebia_berry.tooltip": "", + "item.cobblemon.kee_berry": "", + "item.cobblemon.kee_berry.tooltip": "", + "item.cobblemon.kelpsy_berry": "", + "item.cobblemon.kelpsy_berry.tooltip": "", + "item.cobblemon.lansat_berry": "", + "item.cobblemon.lansat_berry.tooltip": "", + "item.cobblemon.leppa_berry": "", + "item.cobblemon.leppa_berry.tooltip": "", + "item.cobblemon.liechi_berry": "", + "item.cobblemon.liechi_berry.tooltip": "", + "item.cobblemon.lum_berry": "", + "item.cobblemon.lum_berry.tooltip": "", + "item.cobblemon.mago_berry": "", + "item.cobblemon.mago_berry.tooltip": "", + "item.cobblemon.magost_berry": "", + "item.cobblemon.magost_berry.tooltip": "", + "item.cobblemon.maranga_berry": "", + "item.cobblemon.maranga_berry.tooltip": "", + "item.cobblemon.micle_berry": "", + "item.cobblemon.micle_berry.tooltip": "", + "item.cobblemon.nanab_berry": "", + "item.cobblemon.nanab_berry.tooltip": "", + "item.cobblemon.touga_berry": "", + "item.cobblemon.touga_berry.tooltip": "", + "item.cobblemon.nomel_berry": "", + "item.cobblemon.nomel_berry.tooltip": "", + "item.cobblemon.occa_berry": "", + "item.cobblemon.occa_berry.tooltip": "", + "item.cobblemon.oran_berry": "", + "item.cobblemon.oran_berry.tooltip": "", + "item.cobblemon.pamtre_berry": "", + "item.cobblemon.pamtre_berry.tooltip": "", + "item.cobblemon.passho_berry": "", + "item.cobblemon.passho_berry.tooltip": "", + "item.cobblemon.payapa_berry": "", + "item.cobblemon.payapa_berry.tooltip": "", + "item.cobblemon.pecha_berry": "", + "item.cobblemon.pecha_berry.tooltip": "", + "item.cobblemon.persim_berry": "", + "item.cobblemon.persim_berry.tooltip": "", + "item.cobblemon.petaya_berry": "", + "item.cobblemon.petaya_berry.tooltip": "", + "item.cobblemon.pinap_berry": "", + "item.cobblemon.pinap_berry.tooltip": "", + "item.cobblemon.pomeg_berry": "", + "item.cobblemon.pomeg_berry.tooltip": "", + "item.cobblemon.qualot_berry": "", + "item.cobblemon.qualot_berry.tooltip": "", + "item.cobblemon.rabuta_berry": "", + "item.cobblemon.rabuta_berry.tooltip": "", + "item.cobblemon.rawst_berry": "", + "item.cobblemon.rawst_berry.tooltip": "", + "item.cobblemon.razz_berry": "", + "item.cobblemon.razz_berry.tooltip": "", + "item.cobblemon.rindo_berry": "", + "item.cobblemon.rindo_berry.tooltip": "", + "item.cobblemon.roseli_berry": "", + "item.cobblemon.roseli_berry.tooltip": "", + "item.cobblemon.rowap_berry": "", + "item.cobblemon.rowap_berry.tooltip": "", + "item.cobblemon.salac_berry": "", + "item.cobblemon.salac_berry.tooltip": "", + "item.cobblemon.shuca_berry": "", + "item.cobblemon.shuca_berry.tooltip": "", + "item.cobblemon.sitrus_berry": "", + "item.cobblemon.sitrus_berry.tooltip": "", + "item.cobblemon.spelon_berry": "", + "item.cobblemon.spelon_berry.tooltip": "", + "item.cobblemon.starf_berry": "", + "item.cobblemon.starf_berry.tooltip": "", + "item.cobblemon.tamato_berry": "", + "item.cobblemon.tamato_berry.tooltip": "", + "item.cobblemon.tanga_berry": "", + "item.cobblemon.tanga_berry.tooltip": "", + "item.cobblemon.wacan_berry": "", + "item.cobblemon.wacan_berry.tooltip": "", + "item.cobblemon.watmel_berry": "", + "item.cobblemon.watmel_berry.tooltip": "", + "item.cobblemon.wepear_berry": "", + "item.cobblemon.wepear_berry.tooltip": "", + "item.cobblemon.wiki_berry": "", + "item.cobblemon.wiki_berry.tooltip": "", + "item.cobblemon.yache_berry": "", + "item.cobblemon.yache_berry.tooltip": "", + "cobblemon.command.general.invalid-party-slot": "", + "cobblemon.command.givepokemon.give": "", + "cobblemon.command.pokemonedit": "", + "cobblemon.command.teach": "", + "cobblemon.command.teach.already_knows": "", + "cobblemon.command.healpokemon.heal": "", + "cobblemon.command.friendship": "", + "cobblemon.command.givepokemon.nospecies": "", + "cobblemon.command.spawnpokemon.nospecies": "", + "cobblemon.command.error.nonpc": "", + "cobblemon.command.held_item": "", + "cobblemon.command.pokeheal.in_battle": "", + "cobblemon.command.spawnpokemonfrompool": "", + "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "", + "cobblemon.command.pokebox.box_does_not_exist": "", + "cobblemon.command.pokebox.box_is_full": "", + "cobblemon.command.pokebox.storage_is_full": "", + "cobblemon.command.pokebox.last_pokemon": "", + "cobblemon.command.pokemonrestart": "", + "cobblemon.command.freezepokemon.non_pokemon": "", + "advancements.cobblemon.root": "", + "advancements.cobblemon.root.description": "", + "advancements.cobblemon.obtain_leftovers": "", + "advancements.cobblemon.obtain_leftovers.description": "", + "advancements.cobblemon.any_plant": "", + "advancements.cobblemon.any_plant.description": "", + "advancements.cobblemon.harvest_apricorn": "", + "advancements.cobblemon.harvest_apricorn.description": "", + "advancements.cobblemon.harvest_apricorn_seed": "", + "advancements.cobblemon.harvest_apricorn_seed.description": "", + "advancements.cobblemon.bone_meal_apricorn": "", + "advancements.cobblemon.bone_meal_apricorn.description": "", + "advancements.cobblemon.rainbow_apricorns": "", + "advancements.cobblemon.rainbow_apricorns.description": "", + "advancements.cobblemon.craft_poke_ball": "", + "advancements.cobblemon.craft_poke_ball.description": "", + "advancements.cobblemon.craft_base_balls": "", + "advancements.cobblemon.craft_base_balls.description": "", + "advancements.cobblemon.craft_apricorn_balls": "", + "advancements.cobblemon.craft_apricorn_balls.description": "", + "advancements.cobblemon.craft_all_balls": "", + "advancements.cobblemon.craft_all_balls.description": "", + "advancements.cobblemon.first_catch": "", + "advancements.cobblemon.first_catch.description": "", + "advancements.cobblemon.full_party": "", + "advancements.cobblemon.full_party.description": "", + "advancements.cobblemon.first_evolution": "", + "advancements.cobblemon.first_evolution.description": "", + "advancements.cobblemon.first_battle_victory": "", + "advancements.cobblemon.first_battle_victory.description": "", + "advancements.cobblemon.first_shiny_catch": "", + "advancements.cobblemon.first_shiny_catch.description": "", + "advancements.cobblemon.healing_machine": "", + "advancements.cobblemon.healing_machine.description": "", + "advancements.cobblemon.obtain_leek": "", + "advancements.cobblemon.obtain_leek.description": "", + "advancements.cobblemon.medicinal_brew": "", + "advancements.cobblemon.medicinal_brew.description": "", + "advancements.cobblemon.brew_potion": "", + "advancements.cobblemon.brew_potion.description": "", + "advancements.cobblemon.brew_full_restore": "", + "advancements.cobblemon.brew_full_restore.description": "", + "advancements.cobblemon.brew_all": "", + "advancements.cobblemon.brew_all.description": "", + "advancements.cobblemon.obtain_mint": "", + "advancements.cobblemon.obtain_mint.description": "", + "advancements.cobblemon.obtain_all_mints": "", + "advancements.cobblemon.obtain_all_mints.description": "", + "advancements.cobblemon.obtain_revival_herb": "", + "advancements.cobblemon.obtain_revival_herb.description": "", + "advancements.cobblemon.use_revive": "", + "advancements.cobblemon.use_revive.description": "", + "advancements.cobblemon.obtain_big_root": "", + "advancements.cobblemon.obtain_big_root.description": "", + "advancements.cobblemon.craft_remedy": "", + "advancements.cobblemon.craft_remedy.description": "", + "advancements.cobblemon.obtain_vivichoke": "", + "advancements.cobblemon.obtain_vivichoke.description": "", + "advancements.cobblemon.obtain_berry": "", + "advancements.cobblemon.obtain_berry.description": "", + "advancements.cobblemon.obtain_mutated_berry": "", + "advancements.cobblemon.obtain_mutated_berry.description": "", + "advancements.cobblemon.obtain_all_berries": "", + "advancements.cobblemon.obtain_all_berries.description": "", + "advancements.cobblemon.use_pasture": "", + "advancements.cobblemon.use_pasture.description": "", + "advancements.cobblemon.catch_all_vivillon": "", + "advancements.cobblemon.catch_all_vivillon.description": "", + "advancements.cobblemon.catch_all_vivillon_but_actually": "", + "advancements.cobblemon.catch_all_vivillon_but_actually.description": "", + "advancements.cobblemon.evolve_veevees": "", + "advancements.cobblemon.evolve_veevees.description": "", + "advancements.cobblemon.evolve_shedinja": "", + "advancements.cobblemon.evolve_shedinja.description": "", + "advancements.cobblemon.trade_pokemon": "", + "advancements.cobblemon.trade_pokemon.description": "", + "advancements.cobblemon.trade_shelmet_karrablast": "", + "advancements.cobblemon.trade_shelmet_karrablast.description": "", + "advancements.cobblemon.max_level_baby": "", + "advancements.cobblemon.max_level_baby.description": "", + "advancements.cobblemon.use_candy": "", + "advancements.cobblemon.use_candy.description": "", + "advancements.cobblemon.own_zangoose_seviper": "", + "advancements.cobblemon.own_zangoose_seviper.description": "", + "advancements.cobblemon.obtain_fossil": "", + "advancements.cobblemon.obtain_fossil.description": "", + "advancements.cobblemon.evolve_gholdengo_netherite": "", + "advancements.cobblemon.evolve_gholdengo_netherite.description": "", + "advancements.cobblemon.resurrect_pokemon": "", + "advancements.cobblemon.resurrect_pokemon.description": "", + "advancements.cobblemon.obtain_tumblestone": "", + "advancements.cobblemon.obtain_tumblestone.description": "", + "advancements.cobblemon.grow_tumblestone": "", + "advancements.cobblemon.grow_tumblestone.description": "", + "advancements.cobblemon.craft_ancient_balls": "", + "advancements.cobblemon.craft_ancient_balls.description": "", + "advancements.cobblemon.craft_rod": "", + "advancements.cobblemon.craft_rod.description": "", + "advancements.cobblemon.use_bait": "", + "advancements.cobblemon.use_bait.description": "", + "advancements.cobblemon.craft_master_rod": "", + "advancements.cobblemon.craft_master_rod.description": "", + "cobblemon.battle.crash": "", + "cobblemon.battle.damage_dealt": "", + "cobblemon.battle.used_move": "", + "cobblemon.battle.used_move_on": "", + "cobblemon.battle.choose_actions": "", + "cobblemon.battle.owned_pokemon": "", + "cobblemon.battle.fainted": "", + "cobblemon.battle.win": "", + "cobblemon.battle.lose": "", + "cobblemon.battle.forfeit": "", + "cobblemon.battle.flee": "", + "cobblemon.battle.switch_option": "", + "cobblemon.battle.your_team": "", + "cobblemon.battle.must_switch": "", + "cobblemon.battle.dragged_out": "", + "cobblemon.battle.shift": "", + "cobblemon.battle.center": "", + "cobblemon.battle.throw_pokeball_prompt": "", + "cobblemon.battle.run_prompt": "", + "cobblemon.battle.resisted": "", + "cobblemon.battle.resisted_spread": "", + "cobblemon.battle.superEffective": "", + "cobblemon.battle.superEffective_spread": "", + "cobblemon.battle.crit": "", + "cobblemon.battle.crit_spread": "", + "cobblemon.battle.nothing": "", + "cobblemon.battle.clearallboost": "", + "cobblemon.battle.clearallnegativeboost": "", + "cobblemon.battle.clearallnegativeboost.zeffect": "", + "cobblemon.battle.clearboost": "", + "cobblemon.battle.unboost.slight": "", + "cobblemon.battle.unboost.sharp": "", + "cobblemon.battle.unboost.severe": "", + "cobblemon.battle.unboost.cap.single": "", + "cobblemon.battle.unboost.cap.multiple": "", + "cobblemon.battle.boost.slight": "", + "cobblemon.battle.boost.slight.zeffect": "", + "cobblemon.battle.boost.sharp": "", + "cobblemon.battle.boost.sharp.zeffect": "", + "cobblemon.battle.boost.severe": "", + "cobblemon.battle.boost.severe.zeffect": "", + "cobblemon.battle.boost.cap.single": "", + "cobblemon.battle.boost.cap.multiple": "", + "cobblemon.battle.setboost.bellydrum": "", + "cobblemon.battle.setboost.angerpoint": "", + "cobblemon.battle.fail": "", + "cobblemon.battle.recharge": "", + "cobblemon.capture.broke_free": "", + "cobblemon.capture.not_your_turn": "", + "cobblemon.capture.attempted_capture": "", + "cobblemon.capture.succeeded": "", + "cobblemon.capture.not_wild": "", + "cobblemon.capture.in_battle": "", + "cobblemon.capture.busy": "", + "cobblemon.capture.you_in_battle": "", + "cobblemon.capture.not_single": "", + "cobblemon.capture.cannot_be_caught": "", + "cobblemon.you_in_battle": "", + "cobblemon.battle.turn": "", + "cobblemon.battle.types.singles": "", + "cobblemon.battle.types.doubles": "", + "cobblemon.battle.types.triples": "", + "cobblemon.battle.types.multi": "", + "cobblemon.battle.types.freeforall": "", + "cobblemon.battle.side_subject.ally": "", + "cobblemon.battle.side_subject.opponent": "", + "cobblemon.battle.transform": "", + "cobblemon.battle.endability": "", + "cobblemon.battle.select_target": "", + "cobblemon.battle.weather.raindance.start": "", + "cobblemon.battle.weather.raindance.upkeep": "", + "cobblemon.battle.weather.raindance.end": "", + "cobblemon.battle.weather.sandstorm.start": "", + "cobblemon.battle.weather.sandstorm.upkeep": "", + "cobblemon.battle.weather.sandstorm.end": "", + "cobblemon.battle.weather.sunnyday.start": "", + "cobblemon.battle.weather.sunnyday.upkeep": "", + "cobblemon.battle.weather.sunnyday.end": "", + "cobblemon.battle.weather.hail.start": "", + "cobblemon.battle.weather.hail.upkeep": "", + "cobblemon.battle.weather.hail.end": "", + "cobblemon.battle.weather.snow.start": "", + "cobblemon.battle.weather.snow.upkeep": "", + "cobblemon.battle.weather.snow.end": "", + "cobblemon.battle.start.bide": "", + "cobblemon.battle.start.magnetrise": "", + "cobblemon.battle.start.disable": "", + "cobblemon.battle.start.nightmare": "", + "cobblemon.battle.start.imprison": "", + "cobblemon.battle.start.snatch": "", + "cobblemon.battle.start.noretreat": "", + "cobblemon.battle.start.saltcure": "", + "cobblemon.battle.start.shedtail": "", + "cobblemon.battle.start.smackdown": "", + "cobblemon.battle.start.torment": "", + "cobblemon.battle.start.foresight": "", + "cobblemon.battle.start.telekinesis": "", + "cobblemon.battle.start.laserfocus": "", + "cobblemon.battle.start.lockon": "", + "cobblemon.battle.start.yawn": "", + "cobblemon.battle.start.perish": "", + "cobblemon.battle.start.leechseed": "", + "cobblemon.battle.start.aquaring": "", + "cobblemon.battle.start.charge": "", + "cobblemon.battle.start.taunt": "", + "cobblemon.battle.start.autotomize": "", + "cobblemon.battle.start.attract": "", + "cobblemon.battle.start.focusenergy": "", + "cobblemon.battle.start.uproar": "", + "cobblemon.battle.start.curse": "", + "cobblemon.battle.start.miracleeye": "", + "cobblemon.battle.start.dynamax": "", + "cobblemon.battle.start.gmax": "", + "cobblemon.battle.start.encore": "", + "cobblemon.battle.start.futuresight": "", + "cobblemon.battle.start.ingrain": "", + "cobblemon.battle.start.healblock": "", + "cobblemon.battle.start.mimic": "", + "cobblemon.battle.start.octolock": "", + "cobblemon.battle.start.burnup": "", + "cobblemon.battle.start.typechange": "", + "cobblemon.battle.start.doomdesire": "", + "cobblemon.battle.start.doubleshock": "", + "cobblemon.battle.start.stockpile": "", + "cobblemon.battle.start.powertrick": "", + "cobblemon.battle.start.powershift": "", + "cobblemon.battle.start.substitute": "", + "cobblemon.battle.start.embargo": "", + "cobblemon.battle.start.typeadd": "", + "cobblemon.battle.start.reflecttype": "", + "cobblemon.battle.start.tarshot": "", + "cobblemon.battle.start.confusion": "", + "cobblemon.battle.start.flashfire": "", + "cobblemon.battle.fieldstart.electricterrain": "", + "cobblemon.battle.fieldstart.grassyterrain": "", + "cobblemon.battle.fieldstart.gravity": "", + "cobblemon.battle.fieldstart.magicroom": "", + "cobblemon.battle.fieldstart.mistyterrain": "", + "cobblemon.battle.fieldstart.mudsport": "", + "cobblemon.battle.fieldstart.psychicterrain": "", + "cobblemon.battle.fieldstart.trickroom": "", + "cobblemon.battle.fieldstart.watersport": "", + "cobblemon.battle.fieldstart.wonderroom": "", + "cobblemon.battle.fieldend.electricterrain": "", + "cobblemon.battle.fieldend.grassyterrain": "", + "cobblemon.battle.fieldend.gravity": "", + "cobblemon.battle.fieldend.magicroom": "", + "cobblemon.battle.fieldend.mistyterrain": "", + "cobblemon.battle.fieldend.mudsport": "", + "cobblemon.battle.fieldend.psychicterrain": "", + "cobblemon.battle.fieldend.trickroom": "", + "cobblemon.battle.fieldend.watersport": "", + "cobblemon.battle.fieldend.wonderroom": "", + "cobblemon.battle.fieldactivate.perishsong": "", + "cobblemon.battle.fieldactivate.iondeluge": "", + "cobblemon.battle.fieldactivate.fairylock": "", + "cobblemon.battle.fieldactivate.teatime": "", + "cobblemon.battle.sidestart.stealthrock": "", + "cobblemon.battle.sidestart.spikes": "", + "cobblemon.battle.sidestart.toxicspikes": "", + "cobblemon.battle.sidestart.stickyweb": "", + "cobblemon.battle.sidestart.reflect": "", + "cobblemon.battle.sidestart.lightscreen": "", + "cobblemon.battle.sidestart.auroraveil": "", + "cobblemon.battle.sidestart.tailwind": "", + "cobblemon.battle.sidestart.safeguard": "", + "cobblemon.battle.sidestart.luckychant": "", + "cobblemon.battle.sidestart.mist": "", + "cobblemon.battle.sideend.stealthrock": "", + "cobblemon.battle.sideend.spikes": "", + "cobblemon.battle.sideend.toxicspikes": "", + "cobblemon.battle.sideend.stickyweb": "", + "cobblemon.battle.sideend.reflect": "", + "cobblemon.battle.sideend.lightscreen": "", + "cobblemon.battle.sideend.auroraveil": "", + "cobblemon.battle.sideend.tailwind": "", + "cobblemon.battle.sideend.safeguard": "", + "cobblemon.battle.sideend.luckychant": "", + "cobblemon.battle.sideend.mist": "", + "cobblemon.battle.cant.generic": "", + "cobblemon.battle.cant.truant": "", + "cobblemon.battle.cant.flinch": "", + "cobblemon.battle.cant.recharge": "", + "cobblemon.battle.cant.attract": "", + "cobblemon.battle.cant.disable": "", + "cobblemon.battle.cant.focuspunch": "", + "cobblemon.battle.cant.healblock": "", + "cobblemon.battle.cant.imprison": "", + "cobblemon.battle.cant.gravity": "", + "cobblemon.battle.cant.shelltrap": "", + "cobblemon.battle.cant.taunt": "", + "cobblemon.battle.cant.throatchop": "", + "cobblemon.battle.cant.nopp": "", + "cobblemon.battle.activate.confusion": "", + "cobblemon.battle.activate.happyhour": "", + "cobblemon.battle.activate.mindreader": "", + "cobblemon.battle.activate.magmastorm": "", + "cobblemon.battle.activate.powersplit": "", + "cobblemon.battle.activate.pursuit": "", + "cobblemon.battle.activate.gravity": "", + "cobblemon.battle.activate.mistyterrain": "", + "cobblemon.battle.activate.psychicterrain": "", + "cobblemon.battle.activate.healbell": "", + "cobblemon.battle.activate.aromatherapy": "", + "cobblemon.battle.activate.trapped": "", + "cobblemon.battle.activate.bind": "", + "cobblemon.battle.activate.wrap": "", + "cobblemon.battle.activate.snatch": "", + "cobblemon.battle.activate.sandtomb": "", + "cobblemon.battle.activate.struggle": "", + "cobblemon.battle.activate.stickyweb": "", + "cobblemon.battle.activate.courtchange": "", + "cobblemon.battle.activate.guardsplit": "", + "cobblemon.battle.activate.spite": "", + "cobblemon.battle.activate.lockon": "", + "cobblemon.battle.activate.protosynthesis": "", + "cobblemon.battle.activate.bide": "", + "cobblemon.battle.activate.protect": "", + "cobblemon.battle.activate.magnitude": "", + "cobblemon.battle.activate.destinybond": "", + "cobblemon.battle.activate.synchronize": "", + "cobblemon.battle.activate.endure": "", + "cobblemon.battle.activate.attract": "", + "cobblemon.battle.activate.firespin": "", + "cobblemon.battle.activate.trick": "", + "cobblemon.battle.activate.quickclaw": "", + "cobblemon.battle.activate.focusband": "", + "cobblemon.battle.activate.forewarn": "", + "cobblemon.battle.activate.disguise": "", + "cobblemon.battle.activate.liquidooze": "", + "cobblemon.battle.activate.whirlpool": "", + "cobblemon.battle.activate.clamp": "", + "cobblemon.battle.activate.afteryou": "", + "cobblemon.battle.activate.beatup": "", + "cobblemon.battle.activate.celebrate": "", + "cobblemon.battle.activate.substitute": "", + "cobblemon.battle.activate.infestation": "", + "cobblemon.battle.activate.phantomforce": "", + "cobblemon.battle.activate.matblock": "", + "cobblemon.battle.activate.electricterrain": "", + "cobblemon.battle.activate.ingrain": "", + "cobblemon.battle.activate.mist": "", + "cobblemon.battle.activate.poltergeist": "", + "cobblemon.battle.activate.powder": "", + "cobblemon.battle.activate.quash": "", + "cobblemon.battle.activate.quickguard": "", + "cobblemon.battle.activate.safeguard": "", + "cobblemon.battle.activate.sketch": "", + "cobblemon.battle.activate.grudge": "", + "cobblemon.battle.activate.speedswap": "", + "cobblemon.battle.activate.switcheroo": "", + "cobblemon.battle.activate.skillswap": "", + "cobblemon.battle.activate.wideguard": "", + "cobblemon.battle.activate.craftyshield": "", + "cobblemon.battle.activate.tidyup": "", + "cobblemon.battle.activate.mummy": "", + "cobblemon.battle.activate.allyswitch": "", + "cobblemon.battle.activate.custapberry": "", + "cobblemon.battle.prepare.bounce": "", + "cobblemon.battle.prepare.dig": "", + "cobblemon.battle.prepare.shelltrap": "", + "cobblemon.battle.prepare.dive": "", + "cobblemon.battle.prepare.fly": "", + "cobblemon.battle.prepare.freezeshock": "", + "cobblemon.battle.prepare.geomancy": "", + "cobblemon.battle.prepare.iceburn": "", + "cobblemon.battle.prepare.meteorbeam": "", + "cobblemon.battle.prepare.phantomforce": "", + "cobblemon.battle.prepare.razorwind": "", + "cobblemon.battle.prepare.skullbash": "", + "cobblemon.battle.prepare.skyattack": "", + "cobblemon.battle.prepare.skydrop": "", + "cobblemon.battle.prepare.solarbeam": "", + "cobblemon.battle.swapboost.generic": "", + "cobblemon.battle.swapboost.guardswap": "", + "cobblemon.battle.swapboost.powerswap": "", + "cobblemon.battle.swapboost.heartswap": "", + "cobblemon.battle.copyboost.generic": "", + "cobblemon.battle.singleturn.protect": "", + "cobblemon.battle.singleturn.endure": "", + "cobblemon.battle.singleturn.craftyshield": "", + "cobblemon.battle.singleturn.powder": "", + "cobblemon.battle.singleturn.followme": "", + "cobblemon.battle.singleturn.snatch": "", + "cobblemon.battle.singleturn.quickguard": "", + "cobblemon.battle.singleturn.wideguard": "", + "cobblemon.battle.singleturn.roost": "", + "cobblemon.battle.singleturn.matblock": "", + "cobblemon.battle.singleturn.maxguard": "", + "cobblemon.battle.singleturn.instruct": "", + "cobblemon.battle.singleturn.focuspunch": "", + "cobblemon.battle.singleturn.electrify": "", + "cobblemon.battle.singleturn.beakblast": "", + "cobblemon.battle.singleturn.helpinghand": "", + "cobblemon.battle.singleturn.magiccoat": "", + "cobblemon.battle.singleturn.ragepowder": "", + "cobblemon.battle.singleturn.shelltrap": "", + "cobblemon.battle.singleturn.spotlight": "", + "cobblemon.battle.singlemove.destinybond": "", + "cobblemon.battle.singlemove.glaiverush": "", + "cobblemon.battle.singlemove.grudge": "", + "cobblemon.battle.singlemove.rage": "", + "cobblemon.battle.damage.wrap": "", + "cobblemon.battle.damage.confusion": "", + "cobblemon.battle.damage.leechseed": "", + "cobblemon.battle.damage.sandstorm": "", + "cobblemon.battle.damage.hail": "", + "cobblemon.battle.damage.saltcure": "", + "cobblemon.battle.damage.nightmare": "", + "cobblemon.battle.damage.magmastorm": "", + "cobblemon.battle.damage.stealthrock": "", + "cobblemon.battle.damage.highjumpkick": "", + "cobblemon.battle.damage.spikes": "", + "cobblemon.battle.damage.recoil": "", + "cobblemon.battle.damage.item": "", + "cobblemon.battle.damage.lifeorb": "", + "cobblemon.battle.damage.rockyhelmet": "", + "cobblemon.battle.damage.generic": "", + "cobblemon.battle.damage.pokemonmimikyubusted": "", + "cobblemon.battle.damage.whirlpool": "", + "cobblemon.battle.damage.clamp": "", + "cobblemon.battle.damage.curse": "", + "cobblemon.battle.damage.firespin": "", + "cobblemon.battle.damage.axekick": "", + "cobblemon.battle.damage.bind": "", + "cobblemon.battle.damage.baddreams": "", + "cobblemon.battle.damage.mindblown": "", + "cobblemon.battle.damage.infestation": "", + "cobblemon.battle.damage.spikyshield": "", + "cobblemon.battle.damage.flameburst": "", + "cobblemon.battle.damage.dryskin": "", + "cobblemon.battle.damage.sandtomb": "", + "cobblemon.battle.damage.roughskin": "", + "cobblemon.battle.damage.ironbarbs": "", + "cobblemon.battle.end.bind": "", + "cobblemon.battle.end.wrap": "", + "cobblemon.battle.end.magnetrise": "", + "cobblemon.battle.end.doomdesire": "", + "cobblemon.battle.end.leechseed": "", + "cobblemon.battle.end.powershift": "", + "cobblemon.battle.end.torment": "", + "cobblemon.battle.end.disable": "", + "cobblemon.battle.end.protosynthesis": "", + "cobblemon.battle.end.taunt": "", + "cobblemon.battle.end.firespin": "", + "cobblemon.battle.end.bide": "", + "cobblemon.battle.end.confusion": "", + "cobblemon.battle.end.whirlpool": "", + "cobblemon.battle.end.clamp": "", + "cobblemon.battle.end.dynamax": "", + "cobblemon.battle.end.telekinesis": "", + "cobblemon.battle.end.encore": "", + "cobblemon.battle.end.attract": "", + "cobblemon.battle.end.futuresight": "", + "cobblemon.battle.end.embargo": "", + "cobblemon.battle.end.substitute": "", + "cobblemon.battle.end.uproar": "", + "cobblemon.battle.end.powertrick": "", + "cobblemon.battle.end.healblock": "", + "cobblemon.battle.end.skydrop": "", + "cobblemon.battle.end.illusion": "", + "cobblemon.battle.end.neutralizinggas": "", + "cobblemon.battle.block.uproar": "", + "cobblemon.battle.fail.substitute": "", + "cobblemon.battle.fail.healblock": "", + "cobblemon.battle.fail.darkvoid": "", + "cobblemon.battle.fail.teatime": "", + "cobblemon.battle.fail.slp": "", + "cobblemon.battle.fail.par": "", + "cobblemon.battle.fail.tox": "", + "cobblemon.battle.fail.psn": "", + "cobblemon.battle.fail.brn": "", + "cobblemon.battle.fail.frz": "", + "cobblemon.battle.fail.uproar": "", + "cobblemon.battle.fail.skydrop": "", + "cobblemon.battle.fail.heal": "", + "cobblemon.battle.fail.grassknot": "", + "cobblemon.battle.fail.unboost.single": "", + "cobblemon.battle.fail.unboost": "", + "cobblemon.battle.sethp.painsplit": "", + "cobblemon.battle.ability.sturdy": "", + "cobblemon.battle.ability.unnerve": "", + "cobblemon.battle.ability.anticipation": "", + "cobblemon.battle.ability.airlock": "", + "cobblemon.battle.ability.trace": "", + "cobblemon.battle.ability.receiver": "", + "cobblemon.battle.ability.generic": "", + "cobblemon.battle.ability.magicbounce": "", + "cobblemon.battle.errors.busy": "", + "cobblemon.battle.error.in_battle": "", + "cobblemon.battle.error.in_battle.personal": "", + "cobblemon.battle.error.no_pokemon": "", + "cobblemon.battle.error.no_pokemon_opponent": "", + "cobblemon.battle.error.insufficient_pokemon": "", + "cobblemon.battle.error.insufficient_pokemon.personal": "", + "cobblemon.battle.error.player_distance": "", + "cobblemon.battle.error.player_different_dimension": "", + "cobblemon.battle.error.incorrect_player_count": "", + "cobblemon.battle.error.pokemon_is_trapped": "", + "cobblemon.battle.error.canceled": "", + "cobblemon.battle.error.no_party": "", + "cobblemon.battle.immune": "", + "cobblemon.battle.invertboost": "", + "cobblemon.battle.missed": "", + "cobblemon.battle.hit_count": "", + "cobblemon.battle.hit_count_singular": "", + "cobblemon.battle.item.airballoon": "", + "cobblemon.battle.item.recycle": "", + "cobblemon.battle.item.frisk": "", + "cobblemon.battle.item.thief": "", + "cobblemon.battle.item.harvest": "", + "cobblemon.battle.item.bestow": "", + "cobblemon.battle.item.trick": "", + "cobblemon.battle.item.eat": "", + "cobblemon.battle.enditem.eat": "", + "cobblemon.battle.enditem.fling": "", + "cobblemon.battle.enditem.knockoff": "", + "cobblemon.battle.enditem.gem": "", + "cobblemon.battle.enditem.incinerate": "", + "cobblemon.battle.enditem.airballoon": "", + "cobblemon.battle.enditem.redcard": "", + "cobblemon.battle.enditem.berryjuice": "", + "cobblemon.battle.enditem.generic": "", + "cobblemon.battle.enditem.mentalherb": "", + "cobblemon.battle.enditem.powerherb": "", + "cobblemon.battle.enditem.mirrorherb": "", + "cobblemon.battle.enditem.whiteherb": "", + "cobblemon.battle.enditem.corrosivegas": "", + "cobblemon.battle.enditem.stealeat": "", + "cobblemon.battle.enditem.cellbattery": "", + "cobblemon.battle.enditem.ejectbutton": "", + "cobblemon.battle.enditem.snowball": "", + "cobblemon.battle.enditem.focusband": "", + "cobblemon.battle.enditem.ejectpack": "", + "cobblemon.battle.heal.zeffect": "", + "cobblemon.battle.heal.wish": "", + "cobblemon.battle.heal.drain": "", + "cobblemon.battle.heal.healingwish": "", + "cobblemon.battle.heal.revivalblessing": "", + "cobblemon.battle.heal.aquaring": "", + "cobblemon.battle.heal.ingrain": "", + "cobblemon.battle.heal.lunardance": "", + "cobblemon.battle.heal.grassyterrain": "", + "cobblemon.battle.heal.leftovers": "", + "cobblemon.battle.heal.item": "", + "cobblemon.battle.heal.raindish": "", + "cobblemon.battle.heal.generic": "", + "cobblemon.battle.heal.bagitempotion": "", + "cobblemon.battle.heal.bagitemrevive": "", + "cobblemon.battle.heal.poisonheal": "", + "cobblemon.battle.heal.cheekpouch": "", + "cobblemon.battle.heal.dryskin": "", + "cobblemon.battle.heal.eartheater": "", + "cobblemon.battle.heal.icybody": "", + "cobblemon.battle.heal.voltabsorb": "", + "cobblemon.battle.heal.waterabsorb": "", + "cobblemon.battle.curestatus.naturalcure": "", + "cobblemon.battle.bagitem.use": "", + "cobblemon.battle.bagitem.cannot": "", + "cobblemon.battle.bagitem.invalid": "", + "cobblemon.battle.zpower": "", + "cobblemon.battle.zbroken": "", + "cobblemon.battle.terastallize": "", + "cobblemon.battle.detailschange.mega": "", + "cobblemon.battle.detailschange.noice": "", + "cobblemon.battle.detailschange.eiscue": "", + "cobblemon.battle.mega": "", + "cobblemon.battle.switch.self": "", + "cobblemon.battle.switch.other": "", + "cobblemon.battle.switch.other.nickname": "", + "cobblemon.battle.withdraw.self": "", + "cobblemon.battle.withdraw.other": "", + "cobblemon.experience.gained": "", + "cobblemon.experience.level_up": "", + "cobblemon.experience.learned_move": "", + "cobblemon.party.faintRecover": "", + "cobblemon.type.suffix": "", + "cobblemon.type.fire": "", + "cobblemon.type.water": "", + "cobblemon.type.grass": "", + "cobblemon.type.electric": "", + "cobblemon.type.ice": "", + "cobblemon.type.normal": "", + "cobblemon.type.fighting": "", + "cobblemon.type.ghost": "", + "cobblemon.type.dark": "", + "cobblemon.type.fairy": "", + "cobblemon.type.bug": "", + "cobblemon.type.psychic": "", + "cobblemon.type.flying": "", + "cobblemon.type.steel": "", + "cobblemon.type.ground": "", + "cobblemon.type.rock": "", + "cobblemon.type.poison": "", + "cobblemon.type.dragon": "", + "cobblemon.terra_type.stellar": "", + "cobblemon.nature.hardy": "", + "cobblemon.nature.lonely": "", + "cobblemon.nature.brave": "", + "cobblemon.nature.adamant": "", + "cobblemon.nature.naughty": "", + "cobblemon.nature.docile": "", + "cobblemon.nature.relaxed": "", + "cobblemon.nature.impish": "", + "cobblemon.nature.lax": "", + "cobblemon.nature.timid": "", + "cobblemon.nature.hasty": "", + "cobblemon.nature.serious": "", + "cobblemon.nature.jolly": "", + "cobblemon.nature.naive": "", + "cobblemon.nature.modest": "", + "cobblemon.nature.mild": "", + "cobblemon.nature.bashful": "", + "cobblemon.nature.rash": "", + "cobblemon.nature.calm": "", + "cobblemon.nature.gentle": "", + "cobblemon.nature.sassy": "", + "cobblemon.nature.careful": "", + "cobblemon.nature.quirky": "", + "cobblemon.nature.bold": "", + "cobblemon.nature.quiet": "", + "cobblemon.species.random": "", + "cobblemon.species.unknown": "", + "cobblemon.a_pokemon": "", + "cobblemon.starterselection.category.kanto": "", + "cobblemon.starterselection.category.johto": "", + "cobblemon.starterselection.category.hoenn": "", + "cobblemon.starterselection.category.sinnoh": "", + "cobblemon.starterselection.category.unova": "", + "cobblemon.starterselection.category.kalos": "", + "cobblemon.starterselection.category.alola": "", + "cobblemon.starterselection.category.galar": "", + "cobblemon.starterselection.category.hisui_bias": "", + "cobblemon.starterselection.category.paldea": "", + "cobblemon.stat.hp.name": "", + "cobblemon.stat.attack.name": "", + "cobblemon.stat.defence.name": "", + "cobblemon.stat.special_attack.name": "", + "cobblemon.stat.special_defence.name": "", + "cobblemon.stat.speed.name": "", + "cobblemon.stat.accuracy.name": "", + "cobblemon.stat.evasion.name": "", + "cobblemon.move.category.physical": "", + "cobblemon.move.category.special": "", + "cobblemon.move.category.status": "", + "cobblemon.status.sleep.apply": "", + "cobblemon.status.sleep.is": "", + "cobblemon.status.sleep.cure": "", + "cobblemon.status.paralysis.apply": "", + "cobblemon.status.paralysis.is": "", + "cobblemon.status.paralysis.cure": "", + "cobblemon.status.poison.apply": "", + "cobblemon.status.poison.cure": "", + "cobblemon.status.poisonbadly.apply": "", + "cobblemon.status.poison.hurt": "", + "cobblemon.status.burn.apply": "", + "cobblemon.status.burn.hurt": "", + "cobblemon.status.burn.cure": "", + "cobblemon.status.frozen.apply": "", + "cobblemon.status.frozen.cure": "", + "cobblemon.status.frozen.is": "", + "block.cobblemon.dawn_stone_ore": "", + "block.cobblemon.dusk_stone_ore": "", + "block.cobblemon.fire_stone_ore": "", + "block.cobblemon.ice_stone_ore": "", + "block.cobblemon.leaf_stone_ore": "", + "block.cobblemon.moon_stone_ore": "", + "block.cobblemon.shiny_stone_ore": "", + "block.cobblemon.sun_stone_ore": "", + "block.cobblemon.thunder_stone_ore": "", + "block.cobblemon.water_stone_ore": "", + "block.cobblemon.deepslate_dawn_stone_ore": "", + "block.cobblemon.deepslate_dusk_stone_ore": "", + "block.cobblemon.deepslate_fire_stone_ore": "", + "block.cobblemon.deepslate_ice_stone_ore": "", + "block.cobblemon.deepslate_leaf_stone_ore": "", + "block.cobblemon.deepslate_moon_stone_ore": "", + "block.cobblemon.deepslate_shiny_stone_ore": "", + "block.cobblemon.deepslate_sun_stone_ore": "", + "block.cobblemon.deepslate_thunder_stone_ore": "", + "block.cobblemon.deepslate_water_stone_ore": "", + "block.cobblemon.dripstone_moon_stone_ore": "", + "block.cobblemon.nether_fire_stone_ore": "", + "block.cobblemon.terracotta_sun_stone_ore": "", + "block.cobblemon.pasture": "", + "gamerule.doPokemonSpawning": "", + "gamerule.doShinyStarters": "", + "gamerule.doPokemonLoot": "", + "gamerule.battleInvulnerability": "", + "gamerule.mobTargetInBattle": "", + "cobblemon.command.checkspawns.invalid-bucket": "", + "cobblemon.command.checkspawns.spawns": "", + "cobblemon.command.checkspawns.nothing": "", + "cobblemon.interaction.ev.add": "", + "cobblemon.interaction.ev.deduct": "", + "cobblemon.interaction.pp.restore": "", + "cobblemon.interaction.friendsip.add": "", + "cobblemon.interaction.status.cure": "", + "cobblemon.interaction.hp.heal": "", + "tag.item.cobblemon.apricorn_logs": "", + "tag.item.cobblemon.apricorn_sprouts": "", + "tag.item.cobblemon.apricorns": "", + "tag.item.cobblemon.azalea_tree": "", + "tag.item.cobblemon.berries": "", + "tag.item.cobblemon.cobblemon_seeds": "", + "tag.item.cobblemon.evolution_items": "", + "tag.item.cobblemon.evolution_stones": "", + "tag.item.cobblemon.experience_candies": "", + "tag.item.cobblemon.held.destiny_knot": "", + "tag.item.cobblemon.held.everstone": "", + "tag.item.cobblemon.held.experience_share": "", + "tag.item.cobblemon.held.consumed_in_npc_battle": "", + "tag.item.cobblemon.held.consumed_in_pvp_battle": "", + "tag.item.cobblemon.held.consumed_in_wild_battle": "", + "tag.item.cobblemon.held.is_held_item": "", + "tag.item.cobblemon.held.lucky_egg": "", + "tag.item.cobblemon.held.power_anklet": "", + "tag.item.cobblemon.held.power_band": "", + "tag.item.cobblemon.held.power_belt": "", + "tag.item.cobblemon.held.power_bracer": "", + "tag.item.cobblemon.held.power_lens": "", + "tag.item.cobblemon.held.power_weight": "", + "tag.item.cobblemon.held.terrain_seeds": "", + "tag.item.cobblemon.herbs": "", + "tag.item.cobblemon.mint_leaf": "", + "tag.item.cobblemon.mints": "", + "tag.item.cobblemon.mint_seeds": "", + "tag.item.cobblemon.mutated_berries": "", + "tag.item.cobblemon.plants": "", + "tag.item.cobblemon.protein_ingredients": "", + "tag.item.cobblemon.zinc_ingredients": "", + "tag.item.cobblemon.seeds": "", + "tag.item.cobblemon.boats": "", + "tag.item.cobblemon.hanging_signs": "", + "tag.item.cobblemon.signs": "", + "tag.item.cobblemon.dawn_stone_ores": "", + "tag.item.cobblemon.dusk_stone_ores": "", + "tag.item.cobblemon.fire_stone_ores": "", + "tag.item.cobblemon.ice_stone_ores": "", + "tag.item.cobblemon.leaf_stone_ores": "", + "tag.item.cobblemon.shiny_stone_ores": "", + "tag.item.cobblemon.moon_stone_ores": "", + "tag.item.cobblemon.sun_stone_ores": "", + "tag.item.cobblemon.thunder_stone_ores": "", + "tag.item.cobblemon.water_stone_ores": "", + "tag.item.cobblemon.fossil_machine_parts": "", + "tag.item.cobblemon.machines": "", + "tag.item.cobblemon.poke_balls": "", + "tag.item.cobblemon.apricorn_poke_balls": "", + "tag.item.cobblemon.ancient_poke_balls": "", + "tag.item.cobblemon.tier_1_poke_balls": "", + "tag.item.cobblemon.tier_2_poke_balls": "", + "tag.item.cobblemon.tier_3_poke_balls": "", + "tag.item.cobblemon.tier_4_poke_balls": "", + "tag.item.cobblemon.tier_5_poke_balls": "", + "tag.item.cobblemon.tier_1_poke_ball_materials": "", + "tag.item.cobblemon.tier_2_poke_ball_materials": "", + "tag.item.cobblemon.tier_3_poke_ball_materials": "", + "tag.item.cobblemon.tier_4_poke_ball_materials": "", + "tag.item.cobblemon.potions": "", + "tag.item.cobblemon.ethers": "", + "tag.item.cobblemon.remedies": "", + "tag.item.cobblemon.restores": "", + "tag.item.cobblemon.revives": "", + "tag.item.cobblemon.battle_items": "", + "tag.item.cobblemon.vitamins": "", + "tag.item.cobblemon.tumblestones": "", + "tag.item.cobblemon.red_tumblestones": "", + "tag.item.cobblemon.black_tumblestones": "", + "tag.item.cobblemon.sky_tumblestones": "", + "tag.item.cobblemon.tumblestone_bricks": "", + "tag.item.cobblemon.red_tumblestone_bricks": "", + "tag.item.cobblemon.black_tumblestone_bricks": "", + "tag.item.cobblemon.sky_tumblestone_bricks": "", + "tag.item.cobblemon.apples": "", + "tag.item.cobblemon.deep_seas": "", + "tag.item.cobblemon.sweets": "", + "tag.item.cobblemon.teapots": "", + "tag.item.cobblemon.teacups": "", + "tag.item.cobblemon.raw_meat": "", + "tag.item.cobblemon.cooked_meat": "", + "tag.item.cobblemon.fossils": "", + "tag.item.cobblemon.held.leaves_leftovers": "", + "tag.item.cobblemon.decorated_pot_sherds": "", + "tag.item.cobblemon.type_gems": "", + "tag.item.cobblemon.feathers": "", + "tag.item.cobblemon.ability_changers": "", + "tag.item.cobblemon.held.is_friendship_booster": "", + "tag.item.cobblemon.poke_rods": "", + "tag.item.cobblemon.evolution_stone_blocks": "", + "tag.item.cobblemon.pokedex": "", + "tag.item.cobblemon.pokedex_screen": "", + "npc.sacchi.name": "", + "cobblemon.move.10000000voltthunderbolt": "", + "cobblemon.move.10000000voltthunderbolt.desc": "", + "cobblemon.move.absorb": "", + "cobblemon.move.absorb.desc": "", + "cobblemon.move.accelerock": "", + "cobblemon.move.accelerock.desc": "", + "cobblemon.move.acid": "", + "cobblemon.move.acid.desc": "", + "cobblemon.move.acidarmor": "", + "cobblemon.move.acidarmor.desc": "", + "cobblemon.move.aciddownpour": "", + "cobblemon.move.aciddownpour.desc": "", + "cobblemon.move.acidspray": "", + "cobblemon.move.acidspray.desc": "", + "cobblemon.move.acrobatics": "", + "cobblemon.move.acrobatics.desc": "", + "cobblemon.move.acupressure": "", + "cobblemon.move.acupressure.desc": "", + "cobblemon.move.aerialace": "", + "cobblemon.move.aerialace.desc": "", + "cobblemon.move.aeroblast": "", + "cobblemon.move.aeroblast.desc": "", + "cobblemon.move.afteryou": "", + "cobblemon.move.afteryou.desc": "", + "cobblemon.move.agility": "", + "cobblemon.move.agility.desc": "", + "cobblemon.move.aircutter": "", + "cobblemon.move.aircutter.desc": "", + "cobblemon.move.airslash": "", + "cobblemon.move.airslash.desc": "", + "cobblemon.move.alloutpummeling": "", + "cobblemon.move.alloutpummeling.desc": "", + "cobblemon.move.allyswitch": "", + "cobblemon.move.allyswitch.desc": "", + "cobblemon.move.amnesia": "", + "cobblemon.move.amnesia.desc": "", + "cobblemon.move.anchorshot": "", + "cobblemon.move.anchorshot.desc": "", + "cobblemon.move.ancientpower": "", + "cobblemon.move.ancientpower.desc": "", + "cobblemon.move.appleacid": "", + "cobblemon.move.appleacid.desc": "", + "cobblemon.move.aquacutter": "", + "cobblemon.move.aquacutter.desc": "", + "cobblemon.move.aquajet": "", + "cobblemon.move.aquajet.desc": "", + "cobblemon.move.aquaring": "", + "cobblemon.move.aquaring.desc": "", + "cobblemon.move.aquastep": "", + "cobblemon.move.aquastep.desc": "", + "cobblemon.move.aquatail": "", + "cobblemon.move.aquatail.desc": "", + "cobblemon.move.armorcannon": "", + "cobblemon.move.armorcannon.desc": "", + "cobblemon.move.armthrust": "", + "cobblemon.move.armthrust.desc": "", + "cobblemon.move.aromatherapy": "", + "cobblemon.move.aromatherapy.desc": "", + "cobblemon.move.aromaticmist": "", + "cobblemon.move.aromaticmist.desc": "", + "cobblemon.move.assist": "", + "cobblemon.move.assist.desc": "", + "cobblemon.move.assurance": "", + "cobblemon.move.assurance.desc": "", + "cobblemon.move.astonish": "", + "cobblemon.move.astonish.desc": "", + "cobblemon.move.astralbarrage": "", + "cobblemon.move.astralbarrage.desc": "", + "cobblemon.move.attackorder": "", + "cobblemon.move.attackorder.desc": "", + "cobblemon.move.attract": "", + "cobblemon.move.attract.desc": "", + "cobblemon.move.aurasphere": "", + "cobblemon.move.aurasphere.desc": "", + "cobblemon.move.aurawheel": "", + "cobblemon.move.aurawheel.desc": "", + "cobblemon.move.aurorabeam": "", + "cobblemon.move.aurorabeam.desc": "", + "cobblemon.move.auroraveil": "", + "cobblemon.move.auroraveil.desc": "", + "cobblemon.move.autotomize": "", + "cobblemon.move.autotomize.desc": "", + "cobblemon.move.avalanche": "", + "cobblemon.move.avalanche.desc": "", + "cobblemon.move.axekick": "", + "cobblemon.move.axekick.desc": "", + "cobblemon.move.babydolleyes": "", + "cobblemon.move.babydolleyes.desc": "", + "cobblemon.move.baddybad": "", + "cobblemon.move.baddybad.desc": "", + "cobblemon.move.banefulbunker": "", + "cobblemon.move.banefulbunker.desc": "", + "cobblemon.move.barbbarrage": "", + "cobblemon.move.barbbarrage.desc": "", + "cobblemon.move.barrage": "", + "cobblemon.move.barrage.desc": "", + "cobblemon.move.barrier": "", + "cobblemon.move.barrier.desc": "", + "cobblemon.move.batonpass": "", + "cobblemon.move.batonpass.desc": "", + "cobblemon.move.beakblast": "", + "cobblemon.move.beakblast.desc": "", + "cobblemon.move.beatup": "", + "cobblemon.move.beatup.desc": "", + "cobblemon.move.behemothbash": "", + "cobblemon.move.behemothbash.desc": "", + "cobblemon.move.behemothblade": "", + "cobblemon.move.behemothblade.desc": "", + "cobblemon.move.belch": "", + "cobblemon.move.belch.desc": "", + "cobblemon.move.bellydrum": "", + "cobblemon.move.bellydrum.desc": "", + "cobblemon.move.bestow": "", + "cobblemon.move.bestow.desc": "", + "cobblemon.move.bide": "", + "cobblemon.move.bide.desc": "", + "cobblemon.move.bind": "", + "cobblemon.move.bind.desc": "", + "cobblemon.move.bite": "", + "cobblemon.move.bite.desc": "", + "cobblemon.move.bitterblade": "", + "cobblemon.move.bitterblade.desc": "", + "cobblemon.move.bittermalice": "", + "cobblemon.move.bittermalice.desc": "", + "cobblemon.move.blackholeeclipse": "", + "cobblemon.move.blackholeeclipse.desc": "", + "cobblemon.move.blastburn": "", + "cobblemon.move.blastburn.desc": "", + "cobblemon.move.blazekick": "", + "cobblemon.move.blazekick.desc": "", + "cobblemon.move.blazingtorque": "", + "cobblemon.move.blazingtorque.desc": "", + "cobblemon.move.bleakwindstorm": "", + "cobblemon.move.bleakwindstorm.desc": "", + "cobblemon.move.blizzard": "", + "cobblemon.move.blizzard.desc": "", + "cobblemon.move.block": "", + "cobblemon.move.block.desc": "", + "cobblemon.move.bloomdoom": "", + "cobblemon.move.bloomdoom.desc": "", + "cobblemon.move.blueflare": "", + "cobblemon.move.blueflare.desc": "", + "cobblemon.move.bodypress": "", + "cobblemon.move.bodypress.desc": "", + "cobblemon.move.bodyslam": "", + "cobblemon.move.bodyslam.desc": "", + "cobblemon.move.boltbeak": "", + "cobblemon.move.boltbeak.desc": "", + "cobblemon.move.boltstrike": "", + "cobblemon.move.boltstrike.desc": "", + "cobblemon.move.boneclub": "", + "cobblemon.move.boneclub.desc": "", + "cobblemon.move.bonemerang": "", + "cobblemon.move.bonemerang.desc": "", + "cobblemon.move.bonerush": "", + "cobblemon.move.bonerush.desc": "", + "cobblemon.move.boomburst": "", + "cobblemon.move.boomburst.desc": "", + "cobblemon.move.bounce": "", + "cobblemon.move.bounce.desc": "", + "cobblemon.move.bouncybubble": "", + "cobblemon.move.bouncybubble.desc": "", + "cobblemon.move.branchpoke": "", + "cobblemon.move.branchpoke.desc": "", + "cobblemon.move.bravebird": "", + "cobblemon.move.bravebird.desc": "", + "cobblemon.move.breakingswipe": "", + "cobblemon.move.breakingswipe.desc": "", + "cobblemon.move.breakneckblitz": "", + "cobblemon.move.breakneckblitz.desc": "", + "cobblemon.move.brickbreak": "", + "cobblemon.move.brickbreak.desc": "", + "cobblemon.move.brine": "", + "cobblemon.move.brine.desc": "", + "cobblemon.move.brutalswing": "", + "cobblemon.move.brutalswing.desc": "", + "cobblemon.move.bubble": "", + "cobblemon.move.bubble.desc": "", + "cobblemon.move.bubblebeam": "", + "cobblemon.move.bubblebeam.desc": "", + "cobblemon.move.bugbite": "", + "cobblemon.move.bugbite.desc": "", + "cobblemon.move.bugbuzz": "", + "cobblemon.move.bugbuzz.desc": "", + "cobblemon.move.bulkup": "", + "cobblemon.move.bulkup.desc": "", + "cobblemon.move.bulldoze": "", + "cobblemon.move.bulldoze.desc": "", + "cobblemon.move.bulletpunch": "", + "cobblemon.move.bulletpunch.desc": "", + "cobblemon.move.bulletseed": "", + "cobblemon.move.bulletseed.desc": "", + "cobblemon.move.burningjealousy": "", + "cobblemon.move.burningjealousy.desc": "", + "cobblemon.move.burnup": "", + "cobblemon.move.burnup.desc": "", + "cobblemon.move.buzzybuzz": "", + "cobblemon.move.buzzybuzz.desc": "", + "cobblemon.move.calmmind": "", + "cobblemon.move.calmmind.desc": "", + "cobblemon.move.camouflage": "", + "cobblemon.move.camouflage.desc": "", + "cobblemon.move.captivate": "", + "cobblemon.move.captivate.desc": "", + "cobblemon.move.catastropika": "", + "cobblemon.move.catastropika.desc": "", + "cobblemon.move.ceaselessedge": "", + "cobblemon.move.ceaselessedge.desc": "", + "cobblemon.move.celebrate": "", + "cobblemon.move.celebrate.desc": "", + "cobblemon.move.charge": "", + "cobblemon.move.charge.desc": "", + "cobblemon.move.chargebeam": "", + "cobblemon.move.chargebeam.desc": "", + "cobblemon.move.charm": "", + "cobblemon.move.charm.desc": "", + "cobblemon.move.chatter": "", + "cobblemon.move.chatter.desc": "", + "cobblemon.move.chillingwater": "", + "cobblemon.move.chillingwater.desc": "", + "cobblemon.move.chillyreception": "", + "cobblemon.move.chillyreception.desc": "", + "cobblemon.move.chipaway": "", + "cobblemon.move.chipaway.desc": "", + "cobblemon.move.chloroblast": "", + "cobblemon.move.chloroblast.desc": "", + "cobblemon.move.circlethrow": "", + "cobblemon.move.circlethrow.desc": "", + "cobblemon.move.clamp": "", + "cobblemon.move.clamp.desc": "", + "cobblemon.move.clangingscales": "", + "cobblemon.move.clangingscales.desc": "", + "cobblemon.move.clangoroussoul": "", + "cobblemon.move.clangoroussoul.desc": "", + "cobblemon.move.clangoroussoulblaze": "", + "cobblemon.move.clangoroussoulblaze.desc": "", + "cobblemon.move.clearsmog": "", + "cobblemon.move.clearsmog.desc": "", + "cobblemon.move.closecombat": "", + "cobblemon.move.closecombat.desc": "", + "cobblemon.move.coaching": "", + "cobblemon.move.coaching.desc": "", + "cobblemon.move.coil": "", + "cobblemon.move.coil.desc": "", + "cobblemon.move.collisioncourse": "", + "cobblemon.move.collisioncourse.desc": "", + "cobblemon.move.combattorque": "", + "cobblemon.move.combattorque.desc": "", + "cobblemon.move.cometpunch": "", + "cobblemon.move.cometpunch.desc": "", + "cobblemon.move.comeuppance": "", + "cobblemon.move.comeuppance.desc": "", + "cobblemon.move.confide": "", + "cobblemon.move.confide.desc": "", + "cobblemon.move.confuseray": "", + "cobblemon.move.confuseray.desc": "", + "cobblemon.move.confusion": "", + "cobblemon.move.confusion.desc": "", + "cobblemon.move.constrict": "", + "cobblemon.move.constrict.desc": "", + "cobblemon.move.continentalcrush": "", + "cobblemon.move.continentalcrush.desc": "", + "cobblemon.move.conversion": "", + "cobblemon.move.conversion.desc": "", + "cobblemon.move.conversion2": "", + "cobblemon.move.conversion2.desc": "", + "cobblemon.move.copycat": "", + "cobblemon.move.copycat.desc": "", + "cobblemon.move.coreenforcer": "", + "cobblemon.move.coreenforcer.desc": "", + "cobblemon.move.corkscrewcrash": "", + "cobblemon.move.corkscrewcrash.desc": "", + "cobblemon.move.corrosivegas": "", + "cobblemon.move.corrosivegas.desc": "", + "cobblemon.move.cosmicpower": "", + "cobblemon.move.cosmicpower.desc": "", + "cobblemon.move.cottonguard": "", + "cobblemon.move.cottonguard.desc": "", + "cobblemon.move.cottonspore": "", + "cobblemon.move.cottonspore.desc": "", + "cobblemon.move.counter": "", + "cobblemon.move.counter.desc": "", + "cobblemon.move.courtchange": "", + "cobblemon.move.courtchange.desc": "", + "cobblemon.move.covet": "", + "cobblemon.move.covet.desc": "", + "cobblemon.move.crabhammer": "", + "cobblemon.move.crabhammer.desc": "", + "cobblemon.move.craftyshield": "", + "cobblemon.move.craftyshield.desc": "", + "cobblemon.move.crosschop": "", + "cobblemon.move.crosschop.desc": "", + "cobblemon.move.crosspoison": "", + "cobblemon.move.crosspoison.desc": "", + "cobblemon.move.crunch": "", + "cobblemon.move.crunch.desc": "", + "cobblemon.move.crushclaw": "", + "cobblemon.move.crushclaw.desc": "", + "cobblemon.move.crushgrip": "", + "cobblemon.move.crushgrip.desc": "", + "cobblemon.move.curse": "", + "cobblemon.move.curse.desc": "", + "cobblemon.move.cut": "", + "cobblemon.move.cut.desc": "", + "cobblemon.move.darkestlariat": "", + "cobblemon.move.darkestlariat.desc": "", + "cobblemon.move.darkpulse": "", + "cobblemon.move.darkpulse.desc": "", + "cobblemon.move.darkvoid": "", + "cobblemon.move.darkvoid.desc": "", + "cobblemon.move.dazzlinggleam": "", + "cobblemon.move.dazzlinggleam.desc": "", + "cobblemon.move.decorate": "", + "cobblemon.move.decorate.desc": "", + "cobblemon.move.defendorder": "", + "cobblemon.move.defendorder.desc": "", + "cobblemon.move.defensecurl": "", + "cobblemon.move.defensecurl.desc": "", + "cobblemon.move.defog": "", + "cobblemon.move.defog.desc": "", + "cobblemon.move.destinybond": "", + "cobblemon.move.destinybond.desc": "", + "cobblemon.move.detect": "", + "cobblemon.move.detect.desc": "", + "cobblemon.move.devastatingdrake": "", + "cobblemon.move.devastatingdrake.desc": "", + "cobblemon.move.diamondstorm": "", + "cobblemon.move.diamondstorm.desc": "", + "cobblemon.move.dig": "", + "cobblemon.move.dig.desc": "", + "cobblemon.move.direclaw": "", + "cobblemon.move.direclaw.desc": "", + "cobblemon.move.disable": "", + "cobblemon.move.disable.desc": "", + "cobblemon.move.disarmingvoice": "", + "cobblemon.move.disarmingvoice.desc": "", + "cobblemon.move.discharge": "", + "cobblemon.move.discharge.desc": "", + "cobblemon.move.dive": "", + "cobblemon.move.dive.desc": "", + "cobblemon.move.dizzypunch": "", + "cobblemon.move.dizzypunch.desc": "", + "cobblemon.move.doodle": "", + "cobblemon.move.doodle.desc": "", + "cobblemon.move.doomdesire": "", + "cobblemon.move.doomdesire.desc": "", + "cobblemon.move.doubleedge": "", + "cobblemon.move.doubleedge.desc": "", + "cobblemon.move.doublehit": "", + "cobblemon.move.doublehit.desc": "", + "cobblemon.move.doubleironbash": "", + "cobblemon.move.doubleironbash.desc": "", + "cobblemon.move.doublekick": "", + "cobblemon.move.doublekick.desc": "", + "cobblemon.move.doubleshock": "", + "cobblemon.move.doubleshock.desc": "", + "cobblemon.move.doubleslap": "", + "cobblemon.move.doubleslap.desc": "", + "cobblemon.move.doubleteam": "", + "cobblemon.move.doubleteam.desc": "", + "cobblemon.move.dracometeor": "", + "cobblemon.move.dracometeor.desc": "", + "cobblemon.move.dragonascent": "", + "cobblemon.move.dragonascent.desc": "", + "cobblemon.move.dragonbreath": "", + "cobblemon.move.dragonbreath.desc": "", + "cobblemon.move.dragonclaw": "", + "cobblemon.move.dragonclaw.desc": "", + "cobblemon.move.dragondance": "", + "cobblemon.move.dragondance.desc": "", + "cobblemon.move.dragondarts": "", + "cobblemon.move.dragondarts.desc": "", + "cobblemon.move.dragonenergy": "", + "cobblemon.move.dragonenergy.desc": "", + "cobblemon.move.dragonhammer": "", + "cobblemon.move.dragonhammer.desc": "", + "cobblemon.move.dragonpulse": "", + "cobblemon.move.dragonpulse.desc": "", + "cobblemon.move.dragonrage": "", + "cobblemon.move.dragonrage.desc": "", + "cobblemon.move.dragonrush": "", + "cobblemon.move.dragonrush.desc": "", + "cobblemon.move.dragontail": "", + "cobblemon.move.dragontail.desc": "", + "cobblemon.move.drainingkiss": "", + "cobblemon.move.drainingkiss.desc": "", + "cobblemon.move.drainpunch": "", + "cobblemon.move.drainpunch.desc": "", + "cobblemon.move.dreameater": "", + "cobblemon.move.dreameater.desc": "", + "cobblemon.move.drillpeck": "", + "cobblemon.move.drillpeck.desc": "", + "cobblemon.move.drillrun": "", + "cobblemon.move.drillrun.desc": "", + "cobblemon.move.drumbeating": "", + "cobblemon.move.drumbeating.desc": "", + "cobblemon.move.dualchop": "", + "cobblemon.move.dualchop.desc": "", + "cobblemon.move.dualwingbeat": "", + "cobblemon.move.dualwingbeat.desc": "", + "cobblemon.move.dynamaxcannon": "", + "cobblemon.move.dynamaxcannon.desc": "", + "cobblemon.move.dynamicpunch": "", + "cobblemon.move.dynamicpunch.desc": "", + "cobblemon.move.earthpower": "", + "cobblemon.move.earthpower.desc": "", + "cobblemon.move.earthquake": "", + "cobblemon.move.earthquake.desc": "", + "cobblemon.move.echoedvoice": "", + "cobblemon.move.echoedvoice.desc": "", + "cobblemon.move.eerieimpulse": "", + "cobblemon.move.eerieimpulse.desc": "", + "cobblemon.move.eeriespell": "", + "cobblemon.move.eeriespell.desc": "", + "cobblemon.move.eggbomb": "", + "cobblemon.move.eggbomb.desc": "", + "cobblemon.move.electricterrain": "", + "cobblemon.move.electricterrain.desc": "", + "cobblemon.move.electrify": "", + "cobblemon.move.electrify.desc": "", + "cobblemon.move.electroball": "", + "cobblemon.move.electroball.desc": "", + "cobblemon.move.electrodrift": "", + "cobblemon.move.electrodrift.desc": "", + "cobblemon.move.electroweb": "", + "cobblemon.move.electroweb.desc": "", + "cobblemon.move.embargo": "", + "cobblemon.move.embargo.desc": "", + "cobblemon.move.ember": "", + "cobblemon.move.ember.desc": "", + "cobblemon.move.encore": "", + "cobblemon.move.encore.desc": "", + "cobblemon.move.endeavor": "", + "cobblemon.move.endeavor.desc": "", + "cobblemon.move.endure": "", + "cobblemon.move.endure.desc": "", + "cobblemon.move.energyball": "", + "cobblemon.move.energyball.desc": "", + "cobblemon.move.entrainment": "", + "cobblemon.move.entrainment.desc": "", + "cobblemon.move.eruption": "", + "cobblemon.move.eruption.desc": "", + "cobblemon.move.esperwing": "", + "cobblemon.move.esperwing.desc": "", + "cobblemon.move.eternabeam": "", + "cobblemon.move.eternabeam.desc": "", + "cobblemon.move.expandingforce": "", + "cobblemon.move.expandingforce.desc": "", + "cobblemon.move.explosion": "", + "cobblemon.move.explosion.desc": "", + "cobblemon.move.extrasensory": "", + "cobblemon.move.extrasensory.desc": "", + "cobblemon.move.extremeevoboost": "", + "cobblemon.move.extremeevoboost.desc": "", + "cobblemon.move.extremespeed": "", + "cobblemon.move.extremespeed.desc": "", + "cobblemon.move.facade": "", + "cobblemon.move.facade.desc": "", + "cobblemon.move.fairylock": "", + "cobblemon.move.fairylock.desc": "", + "cobblemon.move.fairywind": "", + "cobblemon.move.fairywind.desc": "", + "cobblemon.move.fakeout": "", + "cobblemon.move.fakeout.desc": "", + "cobblemon.move.faketears": "", + "cobblemon.move.faketears.desc": "", + "cobblemon.move.falsesurrender": "", + "cobblemon.move.falsesurrender.desc": "", + "cobblemon.move.falseswipe": "", + "cobblemon.move.falseswipe.desc": "", + "cobblemon.move.featherdance": "", + "cobblemon.move.featherdance.desc": "", + "cobblemon.move.feint": "", + "cobblemon.move.feint.desc": "", + "cobblemon.move.feintattack": "", + "cobblemon.move.feintattack.desc": "", + "cobblemon.move.fellstinger": "", + "cobblemon.move.fellstinger.desc": "", + "cobblemon.move.fierydance": "", + "cobblemon.move.fierydance.desc": "", + "cobblemon.move.fierywrath": "", + "cobblemon.move.fierywrath.desc": "", + "cobblemon.move.filletaway": "", + "cobblemon.move.filletaway.desc": "", + "cobblemon.move.finalgambit": "", + "cobblemon.move.finalgambit.desc": "", + "cobblemon.move.fireblast": "", + "cobblemon.move.fireblast.desc": "", + "cobblemon.move.firefang": "", + "cobblemon.move.firefang.desc": "", + "cobblemon.move.firelash": "", + "cobblemon.move.firelash.desc": "", + "cobblemon.move.firepledge": "", + "cobblemon.move.firepledge.desc": "", + "cobblemon.move.firepunch": "", + "cobblemon.move.firepunch.desc": "", + "cobblemon.move.firespin": "", + "cobblemon.move.firespin.desc": "", + "cobblemon.move.firstimpression": "", + "cobblemon.move.firstimpression.desc": "", + "cobblemon.move.fishiousrend": "", + "cobblemon.move.fishiousrend.desc": "", + "cobblemon.move.fissure": "", + "cobblemon.move.fissure.desc": "", + "cobblemon.move.flail": "", + "cobblemon.move.flail.desc": "", + "cobblemon.move.flameburst": "", + "cobblemon.move.flameburst.desc": "", + "cobblemon.move.flamecharge": "", + "cobblemon.move.flamecharge.desc": "", + "cobblemon.move.flamethrower": "", + "cobblemon.move.flamethrower.desc": "", + "cobblemon.move.flamewheel": "", + "cobblemon.move.flamewheel.desc": "", + "cobblemon.move.flareblitz": "", + "cobblemon.move.flareblitz.desc": "", + "cobblemon.move.flash": "", + "cobblemon.move.flash.desc": "", + "cobblemon.move.flashcannon": "", + "cobblemon.move.flashcannon.desc": "", + "cobblemon.move.flatter": "", + "cobblemon.move.flatter.desc": "", + "cobblemon.move.fleurcannon": "", + "cobblemon.move.fleurcannon.desc": "", + "cobblemon.move.fling": "", + "cobblemon.move.fling.desc": "", + "cobblemon.move.flipturn": "", + "cobblemon.move.flipturn.desc": "", + "cobblemon.move.floatyfall": "", + "cobblemon.move.floatyfall.desc": "", + "cobblemon.move.floralhealing": "", + "cobblemon.move.floralhealing.desc": "", + "cobblemon.move.flowershield": "", + "cobblemon.move.flowershield.desc": "", + "cobblemon.move.flowertrick": "", + "cobblemon.move.flowertrick.desc": "", + "cobblemon.move.fly": "", + "cobblemon.move.fly.desc": "", + "cobblemon.move.flyingpress": "", + "cobblemon.move.flyingpress.desc": "", + "cobblemon.move.focusblast": "", + "cobblemon.move.focusblast.desc": "", + "cobblemon.move.focusenergy": "", + "cobblemon.move.focusenergy.desc": "", + "cobblemon.move.focuspunch": "", + "cobblemon.move.focuspunch.desc": "", + "cobblemon.move.followme": "", + "cobblemon.move.followme.desc": "", + "cobblemon.move.forcepalm": "", + "cobblemon.move.forcepalm.desc": "", + "cobblemon.move.foresight": "", + "cobblemon.move.foresight.desc": "", + "cobblemon.move.forestscurse": "", + "cobblemon.move.forestscurse.desc": "", + "cobblemon.move.foulplay": "", + "cobblemon.move.foulplay.desc": "", + "cobblemon.move.freezedry": "", + "cobblemon.move.freezedry.desc": "", + "cobblemon.move.freezeshock": "", + "cobblemon.move.freezeshock.desc": "", + "cobblemon.move.freezingglare": "", + "cobblemon.move.freezingglare.desc": "", + "cobblemon.move.freezyfrost": "", + "cobblemon.move.freezyfrost.desc": "", + "cobblemon.move.frenzyplant": "", + "cobblemon.move.frenzyplant.desc": "", + "cobblemon.move.frostbreath": "", + "cobblemon.move.frostbreath.desc": "", + "cobblemon.move.frustration": "", + "cobblemon.move.frustration.desc": "", + "cobblemon.move.furyattack": "", + "cobblemon.move.furyattack.desc": "", + "cobblemon.move.furycutter": "", + "cobblemon.move.furycutter.desc": "", + "cobblemon.move.furyswipes": "", + "cobblemon.move.furyswipes.desc": "", + "cobblemon.move.fusionbolt": "", + "cobblemon.move.fusionbolt.desc": "", + "cobblemon.move.fusionflare": "", + "cobblemon.move.fusionflare.desc": "", + "cobblemon.move.futuresight": "", + "cobblemon.move.futuresight.desc": "", + "cobblemon.move.gastroacid": "", + "cobblemon.move.gastroacid.desc": "", + "cobblemon.move.geargrind": "", + "cobblemon.move.geargrind.desc": "", + "cobblemon.move.gearup": "", + "cobblemon.move.gearup.desc": "", + "cobblemon.move.genesissupernova": "", + "cobblemon.move.genesissupernova.desc": "", + "cobblemon.move.geomancy": "", + "cobblemon.move.geomancy.desc": "", + "cobblemon.move.gigadrain": "", + "cobblemon.move.gigadrain.desc": "", + "cobblemon.move.gigaimpact": "", + "cobblemon.move.gigaimpact.desc": "", + "cobblemon.move.gigatonhammer": "", + "cobblemon.move.gigatonhammer.desc": "", + "cobblemon.move.gigavolthavoc": "", + "cobblemon.move.gigavolthavoc.desc": "", + "cobblemon.move.glaciallance": "", + "cobblemon.move.glaciallance.desc": "", + "cobblemon.move.glaciate": "", + "cobblemon.move.glaciate.desc": "", + "cobblemon.move.glaiverush": "", + "cobblemon.move.glaiverush.desc": "", + "cobblemon.move.glare": "", + "cobblemon.move.glare.desc": "", + "cobblemon.move.glitzyglow": "", + "cobblemon.move.glitzyglow.desc": "", + "cobblemon.move.gmaxbefuddle": "", + "cobblemon.move.gmaxbefuddle.desc": "", + "cobblemon.move.gmaxcannonade": "", + "cobblemon.move.gmaxcannonade.desc": "", + "cobblemon.move.gmaxcentiferno": "", + "cobblemon.move.gmaxcentiferno.desc": "", + "cobblemon.move.gmaxchistrike": "", + "cobblemon.move.gmaxchistrike.desc": "", + "cobblemon.move.gmaxcuddle": "", + "cobblemon.move.gmaxcuddle.desc": "", + "cobblemon.move.gmaxdepletion": "", + "cobblemon.move.gmaxdepletion.desc": "", + "cobblemon.move.gmaxdrumsolo": "", + "cobblemon.move.gmaxdrumsolo.desc": "", + "cobblemon.move.gmaxfinale": "", + "cobblemon.move.gmaxfinale.desc": "", + "cobblemon.move.gmaxfireball": "", + "cobblemon.move.gmaxfireball.desc": "", + "cobblemon.move.gmaxfoamburst": "", + "cobblemon.move.gmaxfoamburst.desc": "", + "cobblemon.move.gmaxgoldrush": "", + "cobblemon.move.gmaxgoldrush.desc": "", + "cobblemon.move.gmaxgravitas": "", + "cobblemon.move.gmaxgravitas.desc": "", + "cobblemon.move.gmaxhydrosnipe": "", + "cobblemon.move.gmaxhydrosnipe.desc": "", + "cobblemon.move.gmaxmalodor": "", + "cobblemon.move.gmaxmalodor.desc": "", + "cobblemon.move.gmaxmeltdown": "", + "cobblemon.move.gmaxmeltdown.desc": "", + "cobblemon.move.gmaxoneblow": "", + "cobblemon.move.gmaxoneblow.desc": "", + "cobblemon.move.gmaxrapidflow": "", + "cobblemon.move.gmaxrapidflow.desc": "", + "cobblemon.move.gmaxreplenish": "", + "cobblemon.move.gmaxreplenish.desc": "", + "cobblemon.move.gmaxresonance": "", + "cobblemon.move.gmaxresonance.desc": "", + "cobblemon.move.gmaxsandblast": "", + "cobblemon.move.gmaxsandblast.desc": "", + "cobblemon.move.gmaxsmite": "", + "cobblemon.move.gmaxsmite.desc": "", + "cobblemon.move.gmaxsnooze": "", + "cobblemon.move.gmaxsnooze.desc": "", + "cobblemon.move.gmaxsteelsurge": "", + "cobblemon.move.gmaxsteelsurge.desc": "", + "cobblemon.move.gmaxstonesurge": "", + "cobblemon.move.gmaxstonesurge.desc": "", + "cobblemon.move.gmaxstunshock": "", + "cobblemon.move.gmaxstunshock.desc": "", + "cobblemon.move.gmaxsweetness": "", + "cobblemon.move.gmaxsweetness.desc": "", + "cobblemon.move.gmaxtartness": "", + "cobblemon.move.gmaxtartness.desc": "", + "cobblemon.move.gmaxterror": "", + "cobblemon.move.gmaxterror.desc": "", + "cobblemon.move.gmaxvinelash": "", + "cobblemon.move.gmaxvinelash.desc": "", + "cobblemon.move.gmaxvolcalith": "", + "cobblemon.move.gmaxvolcalith.desc": "", + "cobblemon.move.gmaxvoltcrash": "", + "cobblemon.move.gmaxvoltcrash.desc": "", + "cobblemon.move.gmaxwildfire": "", + "cobblemon.move.gmaxwildfire.desc": "", + "cobblemon.move.gmaxwindrage": "", + "cobblemon.move.gmaxwindrage.desc": "", + "cobblemon.move.grassknot": "", + "cobblemon.move.grassknot.desc": "", + "cobblemon.move.grasspledge": "", + "cobblemon.move.grasspledge.desc": "", + "cobblemon.move.grasswhistle": "", + "cobblemon.move.grasswhistle.desc": "", + "cobblemon.move.grassyglide": "", + "cobblemon.move.grassyglide.desc": "", + "cobblemon.move.grassyterrain": "", + "cobblemon.move.grassyterrain.desc": "", + "cobblemon.move.gravapple": "", + "cobblemon.move.gravapple.desc": "", + "cobblemon.move.gravity": "", + "cobblemon.move.gravity.desc": "", + "cobblemon.move.growl": "", + "cobblemon.move.growl.desc": "", + "cobblemon.move.growth": "", + "cobblemon.move.growth.desc": "", + "cobblemon.move.grudge": "", + "cobblemon.move.grudge.desc": "", + "cobblemon.move.guardianofalola": "", + "cobblemon.move.guardianofalola.desc": "", + "cobblemon.move.guardsplit": "", + "cobblemon.move.guardsplit.desc": "", + "cobblemon.move.guardswap": "", + "cobblemon.move.guardswap.desc": "", + "cobblemon.move.guillotine": "", + "cobblemon.move.guillotine.desc": "", + "cobblemon.move.gunkshot": "", + "cobblemon.move.gunkshot.desc": "", + "cobblemon.move.gust": "", + "cobblemon.move.gust.desc": "", + "cobblemon.move.gyroball": "", + "cobblemon.move.gyroball.desc": "", + "cobblemon.move.hail": "", + "cobblemon.move.hail.desc": "", + "cobblemon.move.hammerarm": "", + "cobblemon.move.hammerarm.desc": "", + "cobblemon.move.happyhour": "", + "cobblemon.move.happyhour.desc": "", + "cobblemon.move.harden": "", + "cobblemon.move.harden.desc": "", + "cobblemon.move.haze": "", + "cobblemon.move.haze.desc": "", + "cobblemon.move.headbutt": "", + "cobblemon.move.headbutt.desc": "", + "cobblemon.move.headcharge": "", + "cobblemon.move.headcharge.desc": "", + "cobblemon.move.headlongrush": "", + "cobblemon.move.headlongrush.desc": "", + "cobblemon.move.headsmash": "", + "cobblemon.move.headsmash.desc": "", + "cobblemon.move.healbell": "", + "cobblemon.move.healbell.desc": "", + "cobblemon.move.healblock": "", + "cobblemon.move.healblock.desc": "", + "cobblemon.move.healingwish": "", + "cobblemon.move.healingwish.desc": "", + "cobblemon.move.healorder": "", + "cobblemon.move.healorder.desc": "", + "cobblemon.move.healpulse": "", + "cobblemon.move.healpulse.desc": "", + "cobblemon.move.heartstamp": "", + "cobblemon.move.heartstamp.desc": "", + "cobblemon.move.heartswap": "", + "cobblemon.move.heartswap.desc": "", + "cobblemon.move.heatcrash": "", + "cobblemon.move.heatcrash.desc": "", + "cobblemon.move.heatwave": "", + "cobblemon.move.heatwave.desc": "", + "cobblemon.move.heavyslam": "", + "cobblemon.move.heavyslam.desc": "", + "cobblemon.move.helpinghand": "", + "cobblemon.move.helpinghand.desc": "", + "cobblemon.move.hex": "", + "cobblemon.move.hex.desc": "", + "cobblemon.move.hiddenpower": "", + "cobblemon.move.hiddenpower.desc": "", + "cobblemon.move.highhorsepower": "", + "cobblemon.move.highhorsepower.desc": "", + "cobblemon.move.highjumpkick": "", + "cobblemon.move.highjumpkick.desc": "", + "cobblemon.move.holdback": "", + "cobblemon.move.holdback.desc": "", + "cobblemon.move.holdhands": "", + "cobblemon.move.holdhands.desc": "", + "cobblemon.move.honeclaws": "", + "cobblemon.move.honeclaws.desc": "", + "cobblemon.move.hornattack": "", + "cobblemon.move.hornattack.desc": "", + "cobblemon.move.horndrill": "", + "cobblemon.move.horndrill.desc": "", + "cobblemon.move.hornleech": "", + "cobblemon.move.hornleech.desc": "", + "cobblemon.move.howl": "", + "cobblemon.move.howl.desc": "", + "cobblemon.move.hurricane": "", + "cobblemon.move.hurricane.desc": "", + "cobblemon.move.hydrocannon": "", + "cobblemon.move.hydrocannon.desc": "", + "cobblemon.move.hydropump": "", + "cobblemon.move.hydropump.desc": "", + "cobblemon.move.hydrosteam": "", + "cobblemon.move.hydrosteam.desc": "", + "cobblemon.move.hydrovortex": "", + "cobblemon.move.hydrovortex.desc": "", + "cobblemon.move.hyperbeam": "", + "cobblemon.move.hyperbeam.desc": "", + "cobblemon.move.hyperdrill": "", + "cobblemon.move.hyperdrill.desc": "", + "cobblemon.move.hyperfang": "", + "cobblemon.move.hyperfang.desc": "", + "cobblemon.move.hyperspacefury": "", + "cobblemon.move.hyperspacefury.desc": "", + "cobblemon.move.hyperspacehole": "", + "cobblemon.move.hyperspacehole.desc": "", + "cobblemon.move.hypervoice": "", + "cobblemon.move.hypervoice.desc": "", + "cobblemon.move.hypnosis": "", + "cobblemon.move.hypnosis.desc": "", + "cobblemon.move.iceball": "", + "cobblemon.move.iceball.desc": "", + "cobblemon.move.icebeam": "", + "cobblemon.move.icebeam.desc": "", + "cobblemon.move.iceburn": "", + "cobblemon.move.iceburn.desc": "", + "cobblemon.move.icefang": "", + "cobblemon.move.icefang.desc": "", + "cobblemon.move.icehammer": "", + "cobblemon.move.icehammer.desc": "", + "cobblemon.move.icepunch": "", + "cobblemon.move.icepunch.desc": "", + "cobblemon.move.iceshard": "", + "cobblemon.move.iceshard.desc": "", + "cobblemon.move.icespinner": "", + "cobblemon.move.icespinner.desc": "", + "cobblemon.move.iciclecrash": "", + "cobblemon.move.iciclecrash.desc": "", + "cobblemon.move.iciclespear": "", + "cobblemon.move.iciclespear.desc": "", + "cobblemon.move.icywind": "", + "cobblemon.move.icywind.desc": "", + "cobblemon.move.imprison": "", + "cobblemon.move.imprison.desc": "", + "cobblemon.move.incinerate": "", + "cobblemon.move.incinerate.desc": "", + "cobblemon.move.infernalparade": "", + "cobblemon.move.infernalparade.desc": "", + "cobblemon.move.inferno": "", + "cobblemon.move.inferno.desc": "", + "cobblemon.move.infernooverdrive": "", + "cobblemon.move.infernooverdrive.desc": "", + "cobblemon.move.infestation": "", + "cobblemon.move.infestation.desc": "", + "cobblemon.move.ingrain": "", + "cobblemon.move.ingrain.desc": "", + "cobblemon.move.instruct": "", + "cobblemon.move.instruct.desc": "", + "cobblemon.move.iondeluge": "", + "cobblemon.move.iondeluge.desc": "", + "cobblemon.move.irondefense": "", + "cobblemon.move.irondefense.desc": "", + "cobblemon.move.ironhead": "", + "cobblemon.move.ironhead.desc": "", + "cobblemon.move.irontail": "", + "cobblemon.move.irontail.desc": "", + "cobblemon.move.jawlock": "", + "cobblemon.move.jawlock.desc": "", + "cobblemon.move.jetpunch": "", + "cobblemon.move.jetpunch.desc": "", + "cobblemon.move.judgment": "", + "cobblemon.move.judgment.desc": "", + "cobblemon.move.jumpkick": "", + "cobblemon.move.jumpkick.desc": "", + "cobblemon.move.junglehealing": "", + "cobblemon.move.junglehealing.desc": "", + "cobblemon.move.karatechop": "", + "cobblemon.move.karatechop.desc": "", + "cobblemon.move.kinesis": "", + "cobblemon.move.kinesis.desc": "", + "cobblemon.move.kingsshield": "", + "cobblemon.move.kingsshield.desc": "", + "cobblemon.move.knockoff": "", + "cobblemon.move.knockoff.desc": "", + "cobblemon.move.kowtowcleave": "", + "cobblemon.move.kowtowcleave.desc": "", + "cobblemon.move.landswrath": "", + "cobblemon.move.landswrath.desc": "", + "cobblemon.move.laserfocus": "", + "cobblemon.move.laserfocus.desc": "", + "cobblemon.move.lashout": "", + "cobblemon.move.lashout.desc": "", + "cobblemon.move.lastresort": "", + "cobblemon.move.lastresort.desc": "", + "cobblemon.move.lastrespects": "", + "cobblemon.move.lastrespects.desc": "", + "cobblemon.move.lavaplume": "", + "cobblemon.move.lavaplume.desc": "", + "cobblemon.move.leafage": "", + "cobblemon.move.leafage.desc": "", + "cobblemon.move.leafblade": "", + "cobblemon.move.leafblade.desc": "", + "cobblemon.move.leafstorm": "", + "cobblemon.move.leafstorm.desc": "", + "cobblemon.move.leaftornado": "", + "cobblemon.move.leaftornado.desc": "", + "cobblemon.move.leechlife": "", + "cobblemon.move.leechlife.desc": "", + "cobblemon.move.leechseed": "", + "cobblemon.move.leechseed.desc": "", + "cobblemon.move.leer": "", + "cobblemon.move.leer.desc": "", + "cobblemon.move.letssnuggleforever": "", + "cobblemon.move.letssnuggleforever.desc": "", + "cobblemon.move.lick": "", + "cobblemon.move.lick.desc": "", + "cobblemon.move.lifedew": "", + "cobblemon.move.lifedew.desc": "", + "cobblemon.move.lightofruin": "", + "cobblemon.move.lightofruin.desc": "", + "cobblemon.move.lightscreen": "", + "cobblemon.move.lightscreen.desc": "", + "cobblemon.move.lightthatburnsthesky": "", + "cobblemon.move.lightthatburnsthesky.desc": "", + "cobblemon.move.liquidation": "", + "cobblemon.move.liquidation.desc": "", + "cobblemon.move.lockon": "", + "cobblemon.move.lockon.desc": "", + "cobblemon.move.lovelykiss": "", + "cobblemon.move.lovelykiss.desc": "", + "cobblemon.move.lowkick": "", + "cobblemon.move.lowkick.desc": "", + "cobblemon.move.lowsweep": "", + "cobblemon.move.lowsweep.desc": "", + "cobblemon.move.luckychant": "", + "cobblemon.move.luckychant.desc": "", + "cobblemon.move.luminacrash": "", + "cobblemon.move.luminacrash.desc": "", + "cobblemon.move.lunarblessing": "", + "cobblemon.move.lunarblessing.desc": "", + "cobblemon.move.lunardance": "", + "cobblemon.move.lunardance.desc": "", + "cobblemon.move.lunge": "", + "cobblemon.move.lunge.desc": "", + "cobblemon.move.lusterpurge": "", + "cobblemon.move.lusterpurge.desc": "", + "cobblemon.move.machpunch": "", + "cobblemon.move.machpunch.desc": "", + "cobblemon.move.magicalleaf": "", + "cobblemon.move.magicalleaf.desc": "", + "cobblemon.move.magicaltorque": "", + "cobblemon.move.magicaltorque.desc": "", + "cobblemon.move.magiccoat": "", + "cobblemon.move.magiccoat.desc": "", + "cobblemon.move.magicpowder": "", + "cobblemon.move.magicpowder.desc": "", + "cobblemon.move.magicroom": "", + "cobblemon.move.magicroom.desc": "", + "cobblemon.move.magmastorm": "", + "cobblemon.move.magmastorm.desc": "", + "cobblemon.move.magnetbomb": "", + "cobblemon.move.magnetbomb.desc": "", + "cobblemon.move.magneticflux": "", + "cobblemon.move.magneticflux.desc": "", + "cobblemon.move.magnetrise": "", + "cobblemon.move.magnetrise.desc": "", + "cobblemon.move.magnitude": "", + "cobblemon.move.magnitude.desc": "", + "cobblemon.move.makeitrain": "", + "cobblemon.move.makeitrain.desc": "", + "cobblemon.move.maliciousmoonsault": "", + "cobblemon.move.maliciousmoonsault.desc": "", + "cobblemon.move.malignantchain": "", + "cobblemon.move.malignantchain.desc": "", + "cobblemon.move.matblock": "", + "cobblemon.move.matblock.desc": "", + "cobblemon.move.maxairstream": "", + "cobblemon.move.maxairstream.desc": "", + "cobblemon.move.maxdarkness": "", + "cobblemon.move.maxdarkness.desc": "", + "cobblemon.move.maxflare": "", + "cobblemon.move.maxflare.desc": "", + "cobblemon.move.maxflutterby": "", + "cobblemon.move.maxflutterby.desc": "", + "cobblemon.move.maxgeyser": "", + "cobblemon.move.maxgeyser.desc": "", + "cobblemon.move.maxguard": "", + "cobblemon.move.maxguard.desc": "", + "cobblemon.move.maxhailstorm": "", + "cobblemon.move.maxhailstorm.desc": "", + "cobblemon.move.maxknuckle": "", + "cobblemon.move.maxknuckle.desc": "", + "cobblemon.move.maxlightning": "", + "cobblemon.move.maxlightning.desc": "", + "cobblemon.move.maxmindstorm": "", + "cobblemon.move.maxmindstorm.desc": "", + "cobblemon.move.maxooze": "", + "cobblemon.move.maxooze.desc": "", + "cobblemon.move.maxovergrowth": "", + "cobblemon.move.maxovergrowth.desc": "", + "cobblemon.move.maxphantasm": "", + "cobblemon.move.maxphantasm.desc": "", + "cobblemon.move.maxquake": "", + "cobblemon.move.maxquake.desc": "", + "cobblemon.move.maxrockfall": "", + "cobblemon.move.maxrockfall.desc": "", + "cobblemon.move.maxstarfall": "", + "cobblemon.move.maxstarfall.desc": "", + "cobblemon.move.maxsteelspike": "", + "cobblemon.move.maxsteelspike.desc": "", + "cobblemon.move.maxstrike": "", + "cobblemon.move.maxstrike.desc": "", + "cobblemon.move.maxwyrmwind": "", + "cobblemon.move.maxwyrmwind.desc": "", + "cobblemon.move.meanlook": "", + "cobblemon.move.meanlook.desc": "", + "cobblemon.move.meditate": "", + "cobblemon.move.meditate.desc": "", + "cobblemon.move.mefirst": "", + "cobblemon.move.mefirst.desc": "", + "cobblemon.move.megadrain": "", + "cobblemon.move.megadrain.desc": "", + "cobblemon.move.megahorn": "", + "cobblemon.move.megahorn.desc": "", + "cobblemon.move.megakick": "", + "cobblemon.move.megakick.desc": "", + "cobblemon.move.megapunch": "", + "cobblemon.move.megapunch.desc": "", + "cobblemon.move.memento": "", + "cobblemon.move.memento.desc": "", + "cobblemon.move.menacingmoonrazemaelstrom": "", + "cobblemon.move.menacingmoonrazemaelstrom.desc": "", + "cobblemon.move.metalburst": "", + "cobblemon.move.metalburst.desc": "", + "cobblemon.move.metalclaw": "", + "cobblemon.move.metalclaw.desc": "", + "cobblemon.move.metalsound": "", + "cobblemon.move.metalsound.desc": "", + "cobblemon.move.meteorassault": "", + "cobblemon.move.meteorassault.desc": "", + "cobblemon.move.meteorbeam": "", + "cobblemon.move.meteorbeam.desc": "", + "cobblemon.move.meteormash": "", + "cobblemon.move.meteormash.desc": "", + "cobblemon.move.metronome": "", + "cobblemon.move.metronome.desc": "", + "cobblemon.move.milkdrink": "", + "cobblemon.move.milkdrink.desc": "", + "cobblemon.move.mimic": "", + "cobblemon.move.mimic.desc": "", + "cobblemon.move.mindblown": "", + "cobblemon.move.mindblown.desc": "", + "cobblemon.move.mindreader": "", + "cobblemon.move.mindreader.desc": "", + "cobblemon.move.minimize": "", + "cobblemon.move.minimize.desc": "", + "cobblemon.move.miracleeye": "", + "cobblemon.move.miracleeye.desc": "", + "cobblemon.move.mirrorcoat": "", + "cobblemon.move.mirrorcoat.desc": "", + "cobblemon.move.mirrormove": "", + "cobblemon.move.mirrormove.desc": "", + "cobblemon.move.mirrorshot": "", + "cobblemon.move.mirrorshot.desc": "", + "cobblemon.move.mist": "", + "cobblemon.move.mist.desc": "", + "cobblemon.move.mistball": "", + "cobblemon.move.mistball.desc": "", + "cobblemon.move.mistyexplosion": "", + "cobblemon.move.mistyexplosion.desc": "", + "cobblemon.move.mistyterrain": "", + "cobblemon.move.mistyterrain.desc": "", + "cobblemon.move.moonblast": "", + "cobblemon.move.moonblast.desc": "", + "cobblemon.move.moongeistbeam": "", + "cobblemon.move.moongeistbeam.desc": "", + "cobblemon.move.moonlight": "", + "cobblemon.move.moonlight.desc": "", + "cobblemon.move.morningsun": "", + "cobblemon.move.morningsun.desc": "", + "cobblemon.move.mortalspin": "", + "cobblemon.move.mortalspin.desc": "", + "cobblemon.move.mountaingale": "", + "cobblemon.move.mountaingale.desc": "", + "cobblemon.move.mudbomb": "", + "cobblemon.move.mudbomb.desc": "", + "cobblemon.move.muddywater": "", + "cobblemon.move.muddywater.desc": "", + "cobblemon.move.mudshot": "", + "cobblemon.move.mudshot.desc": "", + "cobblemon.move.mudslap": "", + "cobblemon.move.mudslap.desc": "", + "cobblemon.move.mudsport": "", + "cobblemon.move.mudsport.desc": "", + "cobblemon.move.multiattack": "", + "cobblemon.move.multiattack.desc": "", + "cobblemon.move.mysticalfire": "", + "cobblemon.move.mysticalfire.desc": "", + "cobblemon.move.mysticalpower": "", + "cobblemon.move.mysticalpower.desc": "", + "cobblemon.move.nastyplot": "", + "cobblemon.move.nastyplot.desc": "", + "cobblemon.move.naturalgift": "", + "cobblemon.move.naturalgift.desc": "", + "cobblemon.move.naturepower": "", + "cobblemon.move.naturepower.desc": "", + "cobblemon.move.naturesmadness": "", + "cobblemon.move.naturesmadness.desc": "", + "cobblemon.move.needlearm": "", + "cobblemon.move.needlearm.desc": "", + "cobblemon.move.neverendingnightmare": "", + "cobblemon.move.neverendingnightmare.desc": "", + "cobblemon.move.nightdaze": "", + "cobblemon.move.nightdaze.desc": "", + "cobblemon.move.nightmare": "", + "cobblemon.move.nightmare.desc": "", + "cobblemon.move.nightshade": "", + "cobblemon.move.nightshade.desc": "", + "cobblemon.move.nightslash": "", + "cobblemon.move.nightslash.desc": "", + "cobblemon.move.nobleroar": "", + "cobblemon.move.nobleroar.desc": "", + "cobblemon.move.noretreat": "", + "cobblemon.move.noretreat.desc": "", + "cobblemon.move.noxioustorque": "", + "cobblemon.move.noxioustorque.desc": "", + "cobblemon.move.nuzzle": "", + "cobblemon.move.nuzzle.desc": "", + "cobblemon.move.oblivionwing": "", + "cobblemon.move.oblivionwing.desc": "", + "cobblemon.move.obstruct": "", + "cobblemon.move.obstruct.desc": "", + "cobblemon.move.oceanicoperetta": "", + "cobblemon.move.oceanicoperetta.desc": "", + "cobblemon.move.octazooka": "", + "cobblemon.move.octazooka.desc": "", + "cobblemon.move.octolock": "", + "cobblemon.move.octolock.desc": "", + "cobblemon.move.odorsleuth": "", + "cobblemon.move.odorsleuth.desc": "", + "cobblemon.move.ominouswind": "", + "cobblemon.move.ominouswind.desc": "", + "cobblemon.move.orderup": "", + "cobblemon.move.orderup.desc": "", + "cobblemon.move.originpulse": "", + "cobblemon.move.originpulse.desc": "", + "cobblemon.move.outrage": "", + "cobblemon.move.outrage.desc": "", + "cobblemon.move.overdrive": "", + "cobblemon.move.overdrive.desc": "", + "cobblemon.move.overheat": "", + "cobblemon.move.overheat.desc": "", + "cobblemon.move.painsplit": "", + "cobblemon.move.painsplit.desc": "", + "cobblemon.move.paraboliccharge": "", + "cobblemon.move.paraboliccharge.desc": "", + "cobblemon.move.partingshot": "", + "cobblemon.move.partingshot.desc": "", + "cobblemon.move.payback": "", + "cobblemon.move.payback.desc": "", + "cobblemon.move.payday": "", + "cobblemon.move.payday.desc": "", + "cobblemon.move.peck": "", + "cobblemon.move.peck.desc": "", + "cobblemon.move.perishsong": "", + "cobblemon.move.perishsong.desc": "", + "cobblemon.move.petalblizzard": "", + "cobblemon.move.petalblizzard.desc": "", + "cobblemon.move.petaldance": "", + "cobblemon.move.petaldance.desc": "", + "cobblemon.move.phantomforce": "", + "cobblemon.move.phantomforce.desc": "", + "cobblemon.move.photongeyser": "", + "cobblemon.move.photongeyser.desc": "", + "cobblemon.move.pikapapow": "", + "cobblemon.move.pikapapow.desc": "", + "cobblemon.move.pinmissile": "", + "cobblemon.move.pinmissile.desc": "", + "cobblemon.move.plasmafists": "", + "cobblemon.move.plasmafists.desc": "", + "cobblemon.move.playnice": "", + "cobblemon.move.playnice.desc": "", + "cobblemon.move.playrough": "", + "cobblemon.move.playrough.desc": "", + "cobblemon.move.pluck": "", + "cobblemon.move.pluck.desc": "", + "cobblemon.move.poisonfang": "", + "cobblemon.move.poisonfang.desc": "", + "cobblemon.move.poisongas": "", + "cobblemon.move.poisongas.desc": "", + "cobblemon.move.poisonjab": "", + "cobblemon.move.poisonjab.desc": "", + "cobblemon.move.poisonpowder": "", + "cobblemon.move.poisonpowder.desc": "", + "cobblemon.move.poisonsting": "", + "cobblemon.move.poisonsting.desc": "", + "cobblemon.move.poisontail": "", + "cobblemon.move.poisontail.desc": "", + "cobblemon.move.pollenpuff": "", + "cobblemon.move.pollenpuff.desc": "", + "cobblemon.move.poltergeist": "", + "cobblemon.move.poltergeist.desc": "", + "cobblemon.move.populationbomb": "", + "cobblemon.move.populationbomb.desc": "", + "cobblemon.move.pounce": "", + "cobblemon.move.pounce.desc": "", + "cobblemon.move.pound": "", + "cobblemon.move.pound.desc": "", + "cobblemon.move.powder": "", + "cobblemon.move.powder.desc": "", + "cobblemon.move.powdersnow": "", + "cobblemon.move.powdersnow.desc": "", + "cobblemon.move.powergem": "", + "cobblemon.move.powergem.desc": "", + "cobblemon.move.powershift": "", + "cobblemon.move.powershift.desc": "", + "cobblemon.move.powersplit": "", + "cobblemon.move.powersplit.desc": "", + "cobblemon.move.powerswap": "", + "cobblemon.move.powerswap.desc": "", + "cobblemon.move.powertrick": "", + "cobblemon.move.powertrick.desc": "", + "cobblemon.move.powertrip": "", + "cobblemon.move.powertrip.desc": "", + "cobblemon.move.poweruppunch": "", + "cobblemon.move.poweruppunch.desc": "", + "cobblemon.move.powerwhip": "", + "cobblemon.move.powerwhip.desc": "", + "cobblemon.move.precipiceblades": "", + "cobblemon.move.precipiceblades.desc": "", + "cobblemon.move.present": "", + "cobblemon.move.present.desc": "", + "cobblemon.move.prismaticlaser": "", + "cobblemon.move.prismaticlaser.desc": "", + "cobblemon.move.protect": "", + "cobblemon.move.protect.desc": "", + "cobblemon.move.psybeam": "", + "cobblemon.move.psybeam.desc": "", + "cobblemon.move.psychic": "", + "cobblemon.move.psychic.desc": "", + "cobblemon.move.psychicfangs": "", + "cobblemon.move.psychicfangs.desc": "", + "cobblemon.move.psychicterrain": "", + "cobblemon.move.psychicterrain.desc": "", + "cobblemon.move.psychoboost": "", + "cobblemon.move.psychoboost.desc": "", + "cobblemon.move.psychocut": "", + "cobblemon.move.psychocut.desc": "", + "cobblemon.move.psychoshift": "", + "cobblemon.move.psychoshift.desc": "", + "cobblemon.move.psychup": "", + "cobblemon.move.psychup.desc": "", + "cobblemon.move.psyshieldbash": "", + "cobblemon.move.psyshieldbash.desc": "", + "cobblemon.move.psyshock": "", + "cobblemon.move.psyshock.desc": "", + "cobblemon.move.psystrike": "", + "cobblemon.move.psystrike.desc": "", + "cobblemon.move.psywave": "", + "cobblemon.move.psywave.desc": "", + "cobblemon.move.pulverizingpancake": "", + "cobblemon.move.pulverizingpancake.desc": "", + "cobblemon.move.punishment": "", + "cobblemon.move.punishment.desc": "", + "cobblemon.move.purify": "", + "cobblemon.move.purify.desc": "", + "cobblemon.move.pursuit": "", + "cobblemon.move.pursuit.desc": "", + "cobblemon.move.pyroball": "", + "cobblemon.move.pyroball.desc": "", + "cobblemon.move.quash": "", + "cobblemon.move.quash.desc": "", + "cobblemon.move.quickattack": "", + "cobblemon.move.quickattack.desc": "", + "cobblemon.move.quickguard": "", + "cobblemon.move.quickguard.desc": "", + "cobblemon.move.quiverdance": "", + "cobblemon.move.quiverdance.desc": "", + "cobblemon.move.rage": "", + "cobblemon.move.rage.desc": "", + "cobblemon.move.ragefist": "", + "cobblemon.move.ragefist.desc": "", + "cobblemon.move.ragepowder": "", + "cobblemon.move.ragepowder.desc": "", + "cobblemon.move.ragingbull": "", + "cobblemon.move.ragingbull.desc": "", + "cobblemon.move.ragingfury": "", + "cobblemon.move.ragingfury.desc": "", + "cobblemon.move.raindance": "", + "cobblemon.move.raindance.desc": "", + "cobblemon.move.rapidspin": "", + "cobblemon.move.rapidspin.desc": "", + "cobblemon.move.razorleaf": "", + "cobblemon.move.razorleaf.desc": "", + "cobblemon.move.razorshell": "", + "cobblemon.move.razorshell.desc": "", + "cobblemon.move.razorwind": "", + "cobblemon.move.razorwind.desc": "", + "cobblemon.move.recharge": "", + "cobblemon.move.recover": "", + "cobblemon.move.recover.desc": "", + "cobblemon.move.recycle": "", + "cobblemon.move.recycle.desc": "", + "cobblemon.move.reflect": "", + "cobblemon.move.reflect.desc": "", + "cobblemon.move.reflecttype": "", + "cobblemon.move.reflecttype.desc": "", + "cobblemon.move.refresh": "", + "cobblemon.move.refresh.desc": "", + "cobblemon.move.relicsong": "", + "cobblemon.move.relicsong.desc": "", + "cobblemon.move.rest": "", + "cobblemon.move.rest.desc": "", + "cobblemon.move.retaliate": "", + "cobblemon.move.retaliate.desc": "", + "cobblemon.move.return": "", + "cobblemon.move.return.desc": "", + "cobblemon.move.revelationdance": "", + "cobblemon.move.revelationdance.desc": "", + "cobblemon.move.revenge": "", + "cobblemon.move.revenge.desc": "", + "cobblemon.move.reversal": "", + "cobblemon.move.reversal.desc": "", + "cobblemon.move.revivalblessing": "", + "cobblemon.move.revivalblessing.desc": "", + "cobblemon.move.risingvoltage": "", + "cobblemon.move.risingvoltage.desc": "", + "cobblemon.move.roar": "", + "cobblemon.move.roar.desc": "", + "cobblemon.move.roaroftime": "", + "cobblemon.move.roaroftime.desc": "", + "cobblemon.move.rockblast": "", + "cobblemon.move.rockblast.desc": "", + "cobblemon.move.rockclimb": "", + "cobblemon.move.rockclimb.desc": "", + "cobblemon.move.rockpolish": "", + "cobblemon.move.rockpolish.desc": "", + "cobblemon.move.rockslide": "", + "cobblemon.move.rockslide.desc": "", + "cobblemon.move.rocksmash": "", + "cobblemon.move.rocksmash.desc": "", + "cobblemon.move.rockthrow": "", + "cobblemon.move.rockthrow.desc": "", + "cobblemon.move.rocktomb": "", + "cobblemon.move.rocktomb.desc": "", + "cobblemon.move.rockwrecker": "", + "cobblemon.move.rockwrecker.desc": "", + "cobblemon.move.roleplay": "", + "cobblemon.move.roleplay.desc": "", + "cobblemon.move.rollingkick": "", + "cobblemon.move.rollingkick.desc": "", + "cobblemon.move.rollout": "", + "cobblemon.move.rollout.desc": "", + "cobblemon.move.roost": "", + "cobblemon.move.roost.desc": "", + "cobblemon.move.rototiller": "", + "cobblemon.move.rototiller.desc": "", + "cobblemon.move.round": "", + "cobblemon.move.round.desc": "", + "cobblemon.move.ruination": "", + "cobblemon.move.ruination.desc": "", + "cobblemon.move.sacredfire": "", + "cobblemon.move.sacredfire.desc": "", + "cobblemon.move.sacredsword": "", + "cobblemon.move.sacredsword.desc": "", + "cobblemon.move.safeguard": "", + "cobblemon.move.safeguard.desc": "", + "cobblemon.move.saltcure": "", + "cobblemon.move.saltcure.desc": "", + "cobblemon.move.sandattack": "", + "cobblemon.move.sandattack.desc": "", + "cobblemon.move.sandsearstorm": "", + "cobblemon.move.sandsearstorm.desc": "", + "cobblemon.move.sandstorm": "", + "cobblemon.move.sandstorm.desc": "", + "cobblemon.move.sandtomb": "", + "cobblemon.move.sandtomb.desc": "", + "cobblemon.move.sappyseed": "", + "cobblemon.move.sappyseed.desc": "", + "cobblemon.move.savagespinout": "", + "cobblemon.move.savagespinout.desc": "", + "cobblemon.move.scald": "", + "cobblemon.move.scald.desc": "", + "cobblemon.move.scaleshot": "", + "cobblemon.move.scaleshot.desc": "", + "cobblemon.move.scaryface": "", + "cobblemon.move.scaryface.desc": "", + "cobblemon.move.scorchingsands": "", + "cobblemon.move.scorchingsands.desc": "", + "cobblemon.move.scratch": "", + "cobblemon.move.scratch.desc": "", + "cobblemon.move.screech": "", + "cobblemon.move.screech.desc": "", + "cobblemon.move.searingshot": "", + "cobblemon.move.searingshot.desc": "", + "cobblemon.move.searingsunrazesmash": "", + "cobblemon.move.searingsunrazesmash.desc": "", + "cobblemon.move.secretpower": "", + "cobblemon.move.secretpower.desc": "", + "cobblemon.move.secretsword": "", + "cobblemon.move.secretsword.desc": "", + "cobblemon.move.seedbomb": "", + "cobblemon.move.seedbomb.desc": "", + "cobblemon.move.seedflare": "", + "cobblemon.move.seedflare.desc": "", + "cobblemon.move.seismictoss": "", + "cobblemon.move.seismictoss.desc": "", + "cobblemon.move.selfdestruct": "", + "cobblemon.move.selfdestruct.desc": "", + "cobblemon.move.shadowball": "", + "cobblemon.move.shadowball.desc": "", + "cobblemon.move.shadowbone": "", + "cobblemon.move.shadowbone.desc": "", + "cobblemon.move.shadowclaw": "", + "cobblemon.move.shadowclaw.desc": "", + "cobblemon.move.shadowforce": "", + "cobblemon.move.shadowforce.desc": "", + "cobblemon.move.shadowpunch": "", + "cobblemon.move.shadowpunch.desc": "", + "cobblemon.move.shadowsneak": "", + "cobblemon.move.shadowsneak.desc": "", + "cobblemon.move.sharpen": "", + "cobblemon.move.sharpen.desc": "", + "cobblemon.move.shatteredpsyche": "", + "cobblemon.move.shatteredpsyche.desc": "", + "cobblemon.move.shedtail": "", + "cobblemon.move.shedtail.desc": "", + "cobblemon.move.sheercold": "", + "cobblemon.move.sheercold.desc": "", + "cobblemon.move.shellsidearm": "", + "cobblemon.move.shellsidearm.desc": "", + "cobblemon.move.shellsmash": "", + "cobblemon.move.shellsmash.desc": "", + "cobblemon.move.shelltrap": "", + "cobblemon.move.shelltrap.desc": "", + "cobblemon.move.shelter": "", + "cobblemon.move.shelter.desc": "", + "cobblemon.move.shiftgear": "", + "cobblemon.move.shiftgear.desc": "", + "cobblemon.move.shockwave": "", + "cobblemon.move.shockwave.desc": "", + "cobblemon.move.shoreup": "", + "cobblemon.move.shoreup.desc": "", + "cobblemon.move.signalbeam": "", + "cobblemon.move.signalbeam.desc": "", + "cobblemon.move.silktrap": "", + "cobblemon.move.silktrap.desc": "", + "cobblemon.move.silverwind": "", + "cobblemon.move.silverwind.desc": "", + "cobblemon.move.simplebeam": "", + "cobblemon.move.simplebeam.desc": "", + "cobblemon.move.sing": "", + "cobblemon.move.sing.desc": "", + "cobblemon.move.sinisterarrowraid": "", + "cobblemon.move.sinisterarrowraid.desc": "", + "cobblemon.move.sizzlyslide": "", + "cobblemon.move.sizzlyslide.desc": "", + "cobblemon.move.sketch": "", + "cobblemon.move.sketch.desc": "", + "cobblemon.move.skillswap": "", + "cobblemon.move.skillswap.desc": "", + "cobblemon.move.skittersmack": "", + "cobblemon.move.skittersmack.desc": "", + "cobblemon.move.skullbash": "", + "cobblemon.move.skullbash.desc": "", + "cobblemon.move.skyattack": "", + "cobblemon.move.skyattack.desc": "", + "cobblemon.move.skydrop": "", + "cobblemon.move.skydrop.desc": "", + "cobblemon.move.skyuppercut": "", + "cobblemon.move.skyuppercut.desc": "", + "cobblemon.move.slackoff": "", + "cobblemon.move.slackoff.desc": "", + "cobblemon.move.slam": "", + "cobblemon.move.slam.desc": "", + "cobblemon.move.slash": "", + "cobblemon.move.slash.desc": "", + "cobblemon.move.sleeppowder": "", + "cobblemon.move.sleeppowder.desc": "", + "cobblemon.move.sleeptalk": "", + "cobblemon.move.sleeptalk.desc": "", + "cobblemon.move.sludge": "", + "cobblemon.move.sludge.desc": "", + "cobblemon.move.sludgebomb": "", + "cobblemon.move.sludgebomb.desc": "", + "cobblemon.move.sludgewave": "", + "cobblemon.move.sludgewave.desc": "", + "cobblemon.move.smackdown": "", + "cobblemon.move.smackdown.desc": "", + "cobblemon.move.smartstrike": "", + "cobblemon.move.smartstrike.desc": "", + "cobblemon.move.smellingsalts": "", + "cobblemon.move.smellingsalts.desc": "", + "cobblemon.move.smog": "", + "cobblemon.move.smog.desc": "", + "cobblemon.move.smokescreen": "", + "cobblemon.move.smokescreen.desc": "", + "cobblemon.move.snaptrap": "", + "cobblemon.move.snaptrap.desc": "", + "cobblemon.move.snarl": "", + "cobblemon.move.snarl.desc": "", + "cobblemon.move.snatch": "", + "cobblemon.move.snatch.desc": "", + "cobblemon.move.snipeshot": "", + "cobblemon.move.snipeshot.desc": "", + "cobblemon.move.snore": "", + "cobblemon.move.snore.desc": "", + "cobblemon.move.snowscape": "", + "cobblemon.move.snowscape.desc": "", + "cobblemon.move.soak": "", + "cobblemon.move.soak.desc": "", + "cobblemon.move.softboiled": "", + "cobblemon.move.softboiled.desc": "", + "cobblemon.move.solarbeam": "", + "cobblemon.move.solarbeam.desc": "", + "cobblemon.move.solarblade": "", + "cobblemon.move.solarblade.desc": "", + "cobblemon.move.sonicboom": "", + "cobblemon.move.sonicboom.desc": "", + "cobblemon.move.soulstealing7starstrike": "", + "cobblemon.move.soulstealing7starstrike.desc": "", + "cobblemon.move.spacialrend": "", + "cobblemon.move.spacialrend.desc": "", + "cobblemon.move.spark": "", + "cobblemon.move.spark.desc": "", + "cobblemon.move.sparklingaria": "", + "cobblemon.move.sparklingaria.desc": "", + "cobblemon.move.sparklyswirl": "", + "cobblemon.move.sparklyswirl.desc": "", + "cobblemon.move.spectralthief": "", + "cobblemon.move.spectralthief.desc": "", + "cobblemon.move.speedswap": "", + "cobblemon.move.speedswap.desc": "", + "cobblemon.move.spicyextract": "", + "cobblemon.move.spicyextract.desc": "", + "cobblemon.move.spiderweb": "", + "cobblemon.move.spiderweb.desc": "", + "cobblemon.move.spikecannon": "", + "cobblemon.move.spikecannon.desc": "", + "cobblemon.move.spikes": "", + "cobblemon.move.spikes.desc": "", + "cobblemon.move.spikyshield": "", + "cobblemon.move.spikyshield.desc": "", + "cobblemon.move.spinout": "", + "cobblemon.move.spinout.desc": "", + "cobblemon.move.spiritbreak": "", + "cobblemon.move.spiritbreak.desc": "", + "cobblemon.move.spiritshackle": "", + "cobblemon.move.spiritshackle.desc": "", + "cobblemon.move.spite": "", + "cobblemon.move.spite.desc": "", + "cobblemon.move.spitup": "", + "cobblemon.move.spitup.desc": "", + "cobblemon.move.splash": "", + "cobblemon.move.splash.desc": "", + "cobblemon.move.splinteredstormshards": "", + "cobblemon.move.splinteredstormshards.desc": "", + "cobblemon.move.splishysplash": "", + "cobblemon.move.splishysplash.desc": "", + "cobblemon.move.spore": "", + "cobblemon.move.spore.desc": "", + "cobblemon.move.spotlight": "", + "cobblemon.move.spotlight.desc": "", + "cobblemon.move.springtidestorm": "", + "cobblemon.move.springtidestorm.desc": "", + "cobblemon.move.stealthrock": "", + "cobblemon.move.stealthrock.desc": "", + "cobblemon.move.steameruption": "", + "cobblemon.move.steameruption.desc": "", + "cobblemon.move.steamroller": "", + "cobblemon.move.steamroller.desc": "", + "cobblemon.move.steelbeam": "", + "cobblemon.move.steelbeam.desc": "", + "cobblemon.move.steelroller": "", + "cobblemon.move.steelroller.desc": "", + "cobblemon.move.steelwing": "", + "cobblemon.move.steelwing.desc": "", + "cobblemon.move.stickyweb": "", + "cobblemon.move.stickyweb.desc": "", + "cobblemon.move.stockpile": "", + "cobblemon.move.stockpile.desc": "", + "cobblemon.move.stokedsparksurfer": "", + "cobblemon.move.stokedsparksurfer.desc": "", + "cobblemon.move.stomp": "", + "cobblemon.move.stomp.desc": "", + "cobblemon.move.stompingtantrum": "", + "cobblemon.move.stompingtantrum.desc": "", + "cobblemon.move.stoneaxe": "", + "cobblemon.move.stoneaxe.desc": "", + "cobblemon.move.stoneedge": "", + "cobblemon.move.stoneedge.desc": "", + "cobblemon.move.storedpower": "", + "cobblemon.move.storedpower.desc": "", + "cobblemon.move.stormthrow": "", + "cobblemon.move.stormthrow.desc": "", + "cobblemon.move.strangesteam": "", + "cobblemon.move.strangesteam.desc": "", + "cobblemon.move.strength": "", + "cobblemon.move.strength.desc": "", + "cobblemon.move.strengthsap": "", + "cobblemon.move.strengthsap.desc": "", + "cobblemon.move.stringshot": "", + "cobblemon.move.stringshot.desc": "", + "cobblemon.move.struggle": "", + "cobblemon.move.struggle.desc": "", + "cobblemon.move.strugglebug": "", + "cobblemon.move.strugglebug.desc": "", + "cobblemon.move.stuffcheeks": "", + "cobblemon.move.stuffcheeks.desc": "", + "cobblemon.move.stunspore": "", + "cobblemon.move.stunspore.desc": "", + "cobblemon.move.submission": "", + "cobblemon.move.submission.desc": "", + "cobblemon.move.substitute": "", + "cobblemon.move.substitute.desc": "", + "cobblemon.move.subzeroslammer": "", + "cobblemon.move.subzeroslammer.desc": "", + "cobblemon.move.suckerpunch": "", + "cobblemon.move.suckerpunch.desc": "", + "cobblemon.move.sunnyday": "", + "cobblemon.move.sunnyday.desc": "", + "cobblemon.move.sunsteelstrike": "", + "cobblemon.move.sunsteelstrike.desc": "", + "cobblemon.move.superfang": "", + "cobblemon.move.superfang.desc": "", + "cobblemon.move.superpower": "", + "cobblemon.move.superpower.desc": "", + "cobblemon.move.supersonic": "", + "cobblemon.move.supersonic.desc": "", + "cobblemon.move.supersonicskystrike": "", + "cobblemon.move.supersonicskystrike.desc": "", + "cobblemon.move.surf": "", + "cobblemon.move.surf.desc": "", + "cobblemon.move.surgingstrikes": "", + "cobblemon.move.surgingstrikes.desc": "", + "cobblemon.move.swagger": "", + "cobblemon.move.swagger.desc": "", + "cobblemon.move.swallow": "", + "cobblemon.move.swallow.desc": "", + "cobblemon.move.sweetkiss": "", + "cobblemon.move.sweetkiss.desc": "", + "cobblemon.move.sweetscent": "", + "cobblemon.move.sweetscent.desc": "", + "cobblemon.move.swift": "", + "cobblemon.move.swift.desc": "", + "cobblemon.move.switcheroo": "", + "cobblemon.move.switcheroo.desc": "", + "cobblemon.move.swordsdance": "", + "cobblemon.move.swordsdance.desc": "", + "cobblemon.move.synchronoise": "", + "cobblemon.move.synchronoise.desc": "", + "cobblemon.move.synthesis": "", + "cobblemon.move.synthesis.desc": "", + "cobblemon.move.tackle": "", + "cobblemon.move.tackle.desc": "", + "cobblemon.move.tailglow": "", + "cobblemon.move.tailglow.desc": "", + "cobblemon.move.tailslap": "", + "cobblemon.move.tailslap.desc": "", + "cobblemon.move.tailwhip": "", + "cobblemon.move.tailwhip.desc": "", + "cobblemon.move.tailwind": "", + "cobblemon.move.tailwind.desc": "", + "cobblemon.move.takedown": "", + "cobblemon.move.takedown.desc": "", + "cobblemon.move.takeheart": "", + "cobblemon.move.takeheart.desc": "", + "cobblemon.move.tarshot": "", + "cobblemon.move.tarshot.desc": "", + "cobblemon.move.taunt": "", + "cobblemon.move.taunt.desc": "", + "cobblemon.move.tearfullook": "", + "cobblemon.move.tearfullook.desc": "", + "cobblemon.move.teatime": "", + "cobblemon.move.teatime.desc": "", + "cobblemon.move.technoblast": "", + "cobblemon.move.technoblast.desc": "", + "cobblemon.move.tectonicrage": "", + "cobblemon.move.tectonicrage.desc": "", + "cobblemon.move.teeterdance": "", + "cobblemon.move.teeterdance.desc": "", + "cobblemon.move.telekinesis": "", + "cobblemon.move.telekinesis.desc": "", + "cobblemon.move.teleport": "", + "cobblemon.move.teleport.desc": "", + "cobblemon.move.terablast": "", + "cobblemon.move.terablast.desc": "", + "cobblemon.move.terrainpulse": "", + "cobblemon.move.terrainpulse.desc": "", + "cobblemon.move.thief": "", + "cobblemon.move.thief.desc": "", + "cobblemon.move.thousandarrows": "", + "cobblemon.move.thousandarrows.desc": "", + "cobblemon.move.thousandwaves": "", + "cobblemon.move.thousandwaves.desc": "", + "cobblemon.move.thrash": "", + "cobblemon.move.thrash.desc": "", + "cobblemon.move.throatchop": "", + "cobblemon.move.throatchop.desc": "", + "cobblemon.move.thunder": "", + "cobblemon.move.thunder.desc": "", + "cobblemon.move.thunderbolt": "", + "cobblemon.move.thunderbolt.desc": "", + "cobblemon.move.thundercage": "", + "cobblemon.move.thundercage.desc": "", + "cobblemon.move.thunderfang": "", + "cobblemon.move.thunderfang.desc": "", + "cobblemon.move.thunderouskick": "", + "cobblemon.move.thunderouskick.desc": "", + "cobblemon.move.thunderpunch": "", + "cobblemon.move.thunderpunch.desc": "", + "cobblemon.move.thundershock": "", + "cobblemon.move.thundershock.desc": "", + "cobblemon.move.thunderwave": "", + "cobblemon.move.thunderwave.desc": "", + "cobblemon.move.tickle": "", + "cobblemon.move.tickle.desc": "", + "cobblemon.move.tidyup": "", + "cobblemon.move.tidyup.desc": "", + "cobblemon.move.topsyturvy": "", + "cobblemon.move.topsyturvy.desc": "", + "cobblemon.move.torchsong": "", + "cobblemon.move.torchsong.desc": "", + "cobblemon.move.torment": "", + "cobblemon.move.torment.desc": "", + "cobblemon.move.toxic": "", + "cobblemon.move.toxic.desc": "", + "cobblemon.move.toxicspikes": "", + "cobblemon.move.toxicspikes.desc": "", + "cobblemon.move.toxicthread": "", + "cobblemon.move.toxicthread.desc": "", + "cobblemon.move.trailblaze": "", + "cobblemon.move.trailblaze.desc": "", + "cobblemon.move.transform": "", + "cobblemon.move.transform.desc": "", + "cobblemon.move.triattack": "", + "cobblemon.move.triattack.desc": "", + "cobblemon.move.trick": "", + "cobblemon.move.trick.desc": "", + "cobblemon.move.trickortreat": "", + "cobblemon.move.trickortreat.desc": "", + "cobblemon.move.trickroom": "", + "cobblemon.move.trickroom.desc": "", + "cobblemon.move.triplearrows": "", + "cobblemon.move.triplearrows.desc": "", + "cobblemon.move.tripleaxel": "", + "cobblemon.move.tripleaxel.desc": "", + "cobblemon.move.tripledive": "", + "cobblemon.move.tripledive.desc": "", + "cobblemon.move.triplekick": "", + "cobblemon.move.triplekick.desc": "", + "cobblemon.move.tropkick": "", + "cobblemon.move.tropkick.desc": "", + "cobblemon.move.trumpcard": "", + "cobblemon.move.trumpcard.desc": "", + "cobblemon.move.twinbeam": "", + "cobblemon.move.twinbeam.desc": "", + "cobblemon.move.twineedle": "", + "cobblemon.move.twineedle.desc": "", + "cobblemon.move.twinkletackle": "", + "cobblemon.move.twinkletackle.desc": "", + "cobblemon.move.twister": "", + "cobblemon.move.twister.desc": "", + "cobblemon.move.uproar": "", + "cobblemon.move.uproar.desc": "", + "cobblemon.move.upperhand": "", + "cobblemon.move.upperhand.desc": "", + "cobblemon.move.uturn": "", + "cobblemon.move.uturn.desc": "", + "cobblemon.move.vacuumwave": "", + "cobblemon.move.vacuumwave.desc": "", + "cobblemon.move.vcreate": "", + "cobblemon.move.vcreate.desc": "", + "cobblemon.move.veeveevolley": "", + "cobblemon.move.veeveevolley.desc": "", + "cobblemon.move.venomdrench": "", + "cobblemon.move.venomdrench.desc": "", + "cobblemon.move.venoshock": "", + "cobblemon.move.venoshock.desc": "", + "cobblemon.move.victorydance": "", + "cobblemon.move.victorydance.desc": "", + "cobblemon.move.vinewhip": "", + "cobblemon.move.vinewhip.desc": "", + "cobblemon.move.visegrip": "", + "cobblemon.move.visegrip.desc": "", + "cobblemon.move.vitalthrow": "", + "cobblemon.move.vitalthrow.desc": "", + "cobblemon.move.voltswitch": "", + "cobblemon.move.voltswitch.desc": "", + "cobblemon.move.volttackle": "", + "cobblemon.move.volttackle.desc": "", + "cobblemon.move.wakeupslap": "", + "cobblemon.move.wakeupslap.desc": "", + "cobblemon.move.waterfall": "", + "cobblemon.move.waterfall.desc": "", + "cobblemon.move.watergun": "", + "cobblemon.move.watergun.desc": "", + "cobblemon.move.waterpledge": "", + "cobblemon.move.waterpledge.desc": "", + "cobblemon.move.waterpulse": "", + "cobblemon.move.waterpulse.desc": "", + "cobblemon.move.watershuriken": "", + "cobblemon.move.watershuriken.desc": "", + "cobblemon.move.watersport": "", + "cobblemon.move.watersport.desc": "", + "cobblemon.move.waterspout": "", + "cobblemon.move.waterspout.desc": "", + "cobblemon.move.wavecrash": "", + "cobblemon.move.wavecrash.desc": "", + "cobblemon.move.weatherball": "", + "cobblemon.move.weatherball.desc": "", + "cobblemon.move.whirlpool": "", + "cobblemon.move.whirlpool.desc": "", + "cobblemon.move.whirlwind": "", + "cobblemon.move.whirlwind.desc": "", + "cobblemon.move.wickedblow": "", + "cobblemon.move.wickedblow.desc": "", + "cobblemon.move.wickedtorque": "", + "cobblemon.move.wickedtorque.desc": "", + "cobblemon.move.wideguard": "", + "cobblemon.move.wideguard.desc": "", + "cobblemon.move.wildboltstorm": "", + "cobblemon.move.wildboltstorm.desc": "", + "cobblemon.move.wildcharge": "", + "cobblemon.move.wildcharge.desc": "", + "cobblemon.move.willowisp": "", + "cobblemon.move.willowisp.desc": "", + "cobblemon.move.wingattack": "", + "cobblemon.move.wingattack.desc": "", + "cobblemon.move.wish": "", + "cobblemon.move.wish.desc": "", + "cobblemon.move.withdraw": "", + "cobblemon.move.withdraw.desc": "", + "cobblemon.move.wonderroom": "", + "cobblemon.move.wonderroom.desc": "", + "cobblemon.move.woodhammer": "", + "cobblemon.move.woodhammer.desc": "", + "cobblemon.move.workup": "", + "cobblemon.move.workup.desc": "", + "cobblemon.move.worryseed": "", + "cobblemon.move.worryseed.desc": "", + "cobblemon.move.wrap": "", + "cobblemon.move.wrap.desc": "", + "cobblemon.move.wringout": "", + "cobblemon.move.wringout.desc": "", + "cobblemon.move.xscissor": "", + "cobblemon.move.xscissor.desc": "", + "cobblemon.move.yawn": "", + "cobblemon.move.yawn.desc": "", + "cobblemon.move.zapcannon": "", + "cobblemon.move.zapcannon.desc": "", + "cobblemon.move.zenheadbutt": "", + "cobblemon.move.zenheadbutt.desc": "", + "cobblemon.move.zingzap": "", + "cobblemon.move.zingzap.desc": "", + "cobblemon.move.zippyzap": "", + "cobblemon.move.zippyzap.desc": "", + "cobblemon.entity.pokemon": "", + "entity.cobblemon.empty_pokeball": "", + "cobblemon.species.bulbasaur.name": "", + "cobblemon.species.bulbasaur.desc": "", + "cobblemon.species.ivysaur.name": "", + "cobblemon.species.ivysaur.desc": "", + "cobblemon.species.venusaur.name": "", + "cobblemon.species.venusaur.desc": "", + "cobblemon.species.charmander.name": "", + "cobblemon.species.charmander.desc": "", + "cobblemon.species.charmeleon.name": "", + "cobblemon.species.charmeleon.desc": "", + "cobblemon.species.charizard.name": "", + "cobblemon.species.charizard.desc": "", + "cobblemon.species.squirtle.name": "", + "cobblemon.species.squirtle.desc": "", + "cobblemon.species.wartortle.name": "", + "cobblemon.species.wartortle.desc": "", + "cobblemon.species.blastoise.name": "", + "cobblemon.species.blastoise.desc": "", + "cobblemon.species.caterpie.name": "", + "cobblemon.species.caterpie.desc": "", + "cobblemon.species.metapod.name": "", + "cobblemon.species.metapod.desc": "", + "cobblemon.species.butterfree.name": "", + "cobblemon.species.butterfree.desc": "", + "cobblemon.species.weedle.name": "", + "cobblemon.species.weedle.desc": "", + "cobblemon.species.kakuna.name": "", + "cobblemon.species.kakuna.desc": "", + "cobblemon.species.beedrill.name": "", + "cobblemon.species.beedrill.desc": "", + "cobblemon.species.pidgey.name": "", + "cobblemon.species.pidgey.desc": "", + "cobblemon.species.pidgeotto.name": "", + "cobblemon.species.pidgeotto.desc": "", + "cobblemon.species.pidgeot.name": "", + "cobblemon.species.pidgeot.desc": "", + "cobblemon.species.rattata.name": "", + "cobblemon.species.rattata.desc": "", + "cobblemon.species.raticate.name": "", + "cobblemon.species.raticate.desc": "", + "cobblemon.species.spearow.name": "", + "cobblemon.species.spearow.desc": "", + "cobblemon.species.fearow.name": "", + "cobblemon.species.fearow.desc": "", + "cobblemon.species.ekans.name": "", + "cobblemon.species.ekans.desc": "", + "cobblemon.species.arbok.name": "", + "cobblemon.species.arbok.desc": "", + "cobblemon.species.pikachu.name": "", + "cobblemon.species.pikachu.desc": "", + "cobblemon.species.raichu.name": "", + "cobblemon.species.raichu.desc": "", + "cobblemon.species.sandshrew.name": "", + "cobblemon.species.sandshrew.desc": "", + "cobblemon.species.sandslash.name": "", + "cobblemon.species.sandslash.desc": "", + "cobblemon.species.nidoranf.name": "", + "cobblemon.species.nidoranf.desc": "", + "cobblemon.species.nidorina.name": "", + "cobblemon.species.nidorina.desc": "", + "cobblemon.species.nidoqueen.name": "", + "cobblemon.species.nidoqueen.desc": "", + "cobblemon.species.nidoranm.name": "", + "cobblemon.species.nidoranm.desc": "", + "cobblemon.species.nidorino.name": "", + "cobblemon.species.nidorino.desc": "", + "cobblemon.species.nidoking.name": "", + "cobblemon.species.nidoking.desc": "", + "cobblemon.species.clefairy.name": "", + "cobblemon.species.clefairy.desc": "", + "cobblemon.species.clefable.name": "", + "cobblemon.species.clefable.desc": "", + "cobblemon.species.vulpix.name": "", + "cobblemon.species.vulpix.desc": "", + "cobblemon.species.ninetales.name": "", + "cobblemon.species.ninetales.desc": "", + "cobblemon.species.jigglypuff.name": "", + "cobblemon.species.jigglypuff.desc": "", + "cobblemon.species.wigglytuff.name": "", + "cobblemon.species.wigglytuff.desc": "", + "cobblemon.species.zubat.name": "", + "cobblemon.species.zubat.desc": "", + "cobblemon.species.golbat.name": "", + "cobblemon.species.golbat.desc": "", + "cobblemon.species.oddish.name": "", + "cobblemon.species.oddish.desc": "", + "cobblemon.species.gloom.name": "", + "cobblemon.species.gloom.desc": "", + "cobblemon.species.vileplume.name": "", + "cobblemon.species.vileplume.desc": "", + "cobblemon.species.paras.name": "", + "cobblemon.species.paras.desc": "", + "cobblemon.species.parasect.name": "", + "cobblemon.species.parasect.desc": "", + "cobblemon.species.venonat.name": "", + "cobblemon.species.venonat.desc": "", + "cobblemon.species.venomoth.name": "", + "cobblemon.species.venomoth.desc": "", + "cobblemon.species.diglett.name": "", + "cobblemon.species.diglett.desc": "", + "cobblemon.species.dugtrio.name": "", + "cobblemon.species.dugtrio.desc": "", + "cobblemon.species.meowth.name": "", + "cobblemon.species.meowth.desc": "", + "cobblemon.species.persian.name": "", + "cobblemon.species.persian.desc": "", + "cobblemon.species.psyduck.name": "", + "cobblemon.species.psyduck.desc": "", + "cobblemon.species.golduck.name": "", + "cobblemon.species.golduck.desc": "", + "cobblemon.species.mankey.name": "", + "cobblemon.species.mankey.desc": "", + "cobblemon.species.primeape.name": "", + "cobblemon.species.primeape.desc": "", + "cobblemon.species.growlithe.name": "", + "cobblemon.species.growlithe.desc": "", + "cobblemon.species.arcanine.name": "", + "cobblemon.species.arcanine.desc": "", + "cobblemon.species.poliwag.name": "", + "cobblemon.species.poliwag.desc": "", + "cobblemon.species.poliwhirl.name": "", + "cobblemon.species.poliwhirl.desc": "", + "cobblemon.species.poliwrath.name": "", + "cobblemon.species.poliwrath.desc": "", + "cobblemon.species.abra.name": "", + "cobblemon.species.abra.desc": "", + "cobblemon.species.kadabra.name": "", + "cobblemon.species.kadabra.desc": "", + "cobblemon.species.alakazam.name": "", + "cobblemon.species.alakazam.desc": "", + "cobblemon.species.machop.name": "", + "cobblemon.species.machop.desc": "", + "cobblemon.species.machoke.name": "", + "cobblemon.species.machoke.desc": "", + "cobblemon.species.machamp.name": "", + "cobblemon.species.machamp.desc": "", + "cobblemon.species.bellsprout.name": "", + "cobblemon.species.bellsprout.desc": "", + "cobblemon.species.weepinbell.name": "", + "cobblemon.species.weepinbell.desc": "", + "cobblemon.species.victreebel.name": "", + "cobblemon.species.victreebel.desc": "", + "cobblemon.species.tentacool.name": "", + "cobblemon.species.tentacool.desc": "", + "cobblemon.species.tentacruel.name": "", + "cobblemon.species.tentacruel.desc": "", + "cobblemon.species.geodude.name": "", + "cobblemon.species.geodude.desc": "", + "cobblemon.species.graveler.name": "", + "cobblemon.species.graveler.desc": "", + "cobblemon.species.golem.name": "", + "cobblemon.species.golem.desc": "", + "cobblemon.species.ponyta.name": "", + "cobblemon.species.ponyta.desc": "", + "cobblemon.species.rapidash.name": "", + "cobblemon.species.rapidash.desc": "", + "cobblemon.species.slowpoke.name": "", + "cobblemon.species.slowpoke.desc": "", + "cobblemon.species.slowbro.name": "", + "cobblemon.species.slowbro.desc": "", + "cobblemon.species.magnemite.name": "", + "cobblemon.species.magnemite.desc": "", + "cobblemon.species.magneton.name": "", + "cobblemon.species.magneton.desc": "", + "cobblemon.species.farfetchd.name": "", + "cobblemon.species.farfetchd.desc": "", + "cobblemon.species.doduo.name": "", + "cobblemon.species.doduo.desc": "", + "cobblemon.species.dodrio.name": "", + "cobblemon.species.dodrio.desc": "", + "cobblemon.species.seel.name": "", + "cobblemon.species.seel.desc": "", + "cobblemon.species.dewgong.name": "", + "cobblemon.species.dewgong.desc": "", + "cobblemon.species.grimer.name": "", + "cobblemon.species.grimer.desc": "", + "cobblemon.species.muk.name": "", + "cobblemon.species.muk.desc": "", + "cobblemon.species.shellder.name": "", + "cobblemon.species.shellder.desc": "", + "cobblemon.species.cloyster.name": "", + "cobblemon.species.cloyster.desc": "", + "cobblemon.species.gastly.name": "", + "cobblemon.species.gastly.desc": "", + "cobblemon.species.haunter.name": "", + "cobblemon.species.haunter.desc": "", + "cobblemon.species.gengar.name": "", + "cobblemon.species.gengar.desc": "", + "cobblemon.species.onix.name": "", + "cobblemon.species.onix.desc": "", + "cobblemon.species.drowzee.name": "", + "cobblemon.species.drowzee.desc": "", + "cobblemon.species.hypno.name": "", + "cobblemon.species.hypno.desc": "", + "cobblemon.species.krabby.name": "", + "cobblemon.species.krabby.desc": "", + "cobblemon.species.kingler.name": "", + "cobblemon.species.kingler.desc": "", + "cobblemon.species.voltorb.name": "", + "cobblemon.species.voltorb.desc": "", + "cobblemon.species.electrode.name": "", + "cobblemon.species.electrode.desc": "", + "cobblemon.species.exeggcute.name": "", + "cobblemon.species.exeggcute.desc": "", + "cobblemon.species.exeggutor.name": "", + "cobblemon.species.exeggutor.desc": "", + "cobblemon.species.cubone.name": "", + "cobblemon.species.cubone.desc": "", + "cobblemon.species.marowak.name": "", + "cobblemon.species.marowak.desc": "", + "cobblemon.species.hitmonlee.name": "", + "cobblemon.species.hitmonlee.desc": "", + "cobblemon.species.hitmonchan.name": "", + "cobblemon.species.hitmonchan.desc": "", + "cobblemon.species.lickitung.name": "", + "cobblemon.species.lickitung.desc": "", + "cobblemon.species.koffing.name": "", + "cobblemon.species.koffing.desc": "", + "cobblemon.species.weezing.name": "", + "cobblemon.species.weezing.desc": "", + "cobblemon.species.rhyhorn.name": "", + "cobblemon.species.rhyhorn.desc": "", + "cobblemon.species.rhydon.name": "", + "cobblemon.species.rhydon.desc": "", + "cobblemon.species.chansey.name": "", + "cobblemon.species.chansey.desc": "", + "cobblemon.species.tangela.name": "", + "cobblemon.species.tangela.desc": "", + "cobblemon.species.kangaskhan.name": "", + "cobblemon.species.kangaskhan.desc": "", + "cobblemon.species.horsea.name": "", + "cobblemon.species.horsea.desc": "", + "cobblemon.species.seadra.name": "", + "cobblemon.species.seadra.desc": "", + "cobblemon.species.goldeen.name": "", + "cobblemon.species.goldeen.desc": "", + "cobblemon.species.seaking.name": "", + "cobblemon.species.seaking.desc": "", + "cobblemon.species.staryu.name": "", + "cobblemon.species.staryu.desc": "", + "cobblemon.species.starmie.name": "", + "cobblemon.species.starmie.desc": "", + "cobblemon.species.mrmime.name": "", + "cobblemon.species.mrmime.desc": "", + "cobblemon.species.scyther.name": "", + "cobblemon.species.scyther.desc": "", + "cobblemon.species.jynx.name": "", + "cobblemon.species.jynx.desc": "", + "cobblemon.species.electabuzz.name": "", + "cobblemon.species.electabuzz.desc": "", + "cobblemon.species.magmar.name": "", + "cobblemon.species.magmar.desc": "", + "cobblemon.species.pinsir.name": "", + "cobblemon.species.pinsir.desc": "", + "cobblemon.species.tauros.name": "", + "cobblemon.species.tauros.desc": "", + "cobblemon.species.magikarp.name": "", + "cobblemon.species.magikarp.desc": "", + "cobblemon.species.gyarados.name": "", + "cobblemon.species.gyarados.desc": "", + "cobblemon.species.lapras.name": "", + "cobblemon.species.lapras.desc": "", + "cobblemon.species.ditto.name": "", + "cobblemon.species.ditto.desc": "", + "cobblemon.species.eevee.name": "", + "cobblemon.species.eevee.desc": "", + "cobblemon.species.vaporeon.name": "", + "cobblemon.species.vaporeon.desc": "", + "cobblemon.species.jolteon.name": "", + "cobblemon.species.jolteon.desc": "", + "cobblemon.species.flareon.name": "", + "cobblemon.species.flareon.desc": "", + "cobblemon.species.porygon.name": "", + "cobblemon.species.porygon.desc": "", + "cobblemon.species.omanyte.name": "", + "cobblemon.species.omanyte.desc": "", + "cobblemon.species.omastar.name": "", + "cobblemon.species.omastar.desc": "", + "cobblemon.species.kabuto.name": "", + "cobblemon.species.kabuto.desc": "", + "cobblemon.species.kabutops.name": "", + "cobblemon.species.kabutops.desc": "", + "cobblemon.species.aerodactyl.name": "", + "cobblemon.species.aerodactyl.desc": "", + "cobblemon.species.snorlax.name": "", + "cobblemon.species.snorlax.desc": "", + "cobblemon.species.articuno.name": "", + "cobblemon.species.articuno.desc": "", + "cobblemon.species.zapdos.name": "", + "cobblemon.species.zapdos.desc": "", + "cobblemon.species.moltres.name": "", + "cobblemon.species.moltres.desc": "", + "cobblemon.species.dratini.name": "", + "cobblemon.species.dratini.desc": "", + "cobblemon.species.dragonair.name": "", + "cobblemon.species.dragonair.desc": "", + "cobblemon.species.dragonite.name": "", + "cobblemon.species.dragonite.desc": "", + "cobblemon.species.mewtwo.name": "", + "cobblemon.species.mewtwo.desc": "", + "cobblemon.species.mew.name": "", + "cobblemon.species.mew.desc": "", + "cobblemon.species.chikorita.name": "", + "cobblemon.species.chikorita.desc": "", + "cobblemon.species.bayleef.name": "", + "cobblemon.species.bayleef.desc": "", + "cobblemon.species.meganium.name": "", + "cobblemon.species.meganium.desc": "", + "cobblemon.species.cyndaquil.name": "", + "cobblemon.species.cyndaquil.desc": "", + "cobblemon.species.quilava.name": "", + "cobblemon.species.quilava.desc": "", + "cobblemon.species.typhlosion.name": "", + "cobblemon.species.typhlosion.desc": "", + "cobblemon.species.totodile.name": "", + "cobblemon.species.totodile.desc": "", + "cobblemon.species.croconaw.name": "", + "cobblemon.species.croconaw.desc": "", + "cobblemon.species.feraligatr.name": "", + "cobblemon.species.feraligatr.desc": "", + "cobblemon.species.sentret.name": "", + "cobblemon.species.sentret.desc": "", + "cobblemon.species.furret.name": "", + "cobblemon.species.furret.desc": "", + "cobblemon.species.hoothoot.name": "", + "cobblemon.species.hoothoot.desc": "", + "cobblemon.species.noctowl.name": "", + "cobblemon.species.noctowl.desc": "", + "cobblemon.species.ledyba.name": "", + "cobblemon.species.ledyba.desc": "", + "cobblemon.species.ledian.name": "", + "cobblemon.species.ledian.desc": "", + "cobblemon.species.spinarak.name": "", + "cobblemon.species.spinarak.desc": "", + "cobblemon.species.ariados.name": "", + "cobblemon.species.ariados.desc": "", + "cobblemon.species.crobat.name": "", + "cobblemon.species.crobat.desc": "", + "cobblemon.species.chinchou.name": "", + "cobblemon.species.chinchou.desc": "", + "cobblemon.species.lanturn.name": "", + "cobblemon.species.lanturn.desc": "", + "cobblemon.species.pichu.name": "", + "cobblemon.species.pichu.desc": "", + "cobblemon.species.cleffa.name": "", + "cobblemon.species.cleffa.desc": "", + "cobblemon.species.igglybuff.name": "", + "cobblemon.species.igglybuff.desc": "", + "cobblemon.species.togepi.name": "", + "cobblemon.species.togepi.desc": "", + "cobblemon.species.togetic.name": "", + "cobblemon.species.togetic.desc": "", + "cobblemon.species.natu.name": "", + "cobblemon.species.natu.desc": "", + "cobblemon.species.xatu.name": "", + "cobblemon.species.xatu.desc": "", + "cobblemon.species.mareep.name": "", + "cobblemon.species.mareep.desc": "", + "cobblemon.species.flaaffy.name": "", + "cobblemon.species.flaaffy.desc": "", + "cobblemon.species.ampharos.name": "", + "cobblemon.species.ampharos.desc": "", + "cobblemon.species.bellossom.name": "", + "cobblemon.species.bellossom.desc": "", + "cobblemon.species.marill.name": "", + "cobblemon.species.marill.desc": "", + "cobblemon.species.azumarill.name": "", + "cobblemon.species.azumarill.desc": "", + "cobblemon.species.sudowoodo.name": "", + "cobblemon.species.sudowoodo.desc": "", + "cobblemon.species.politoed.name": "", + "cobblemon.species.politoed.desc": "", + "cobblemon.species.hoppip.name": "", + "cobblemon.species.hoppip.desc": "", + "cobblemon.species.skiploom.name": "", + "cobblemon.species.skiploom.desc": "", + "cobblemon.species.jumpluff.name": "", + "cobblemon.species.jumpluff.desc": "", + "cobblemon.species.aipom.name": "", + "cobblemon.species.aipom.desc": "", + "cobblemon.species.sunkern.name": "", + "cobblemon.species.sunkern.desc": "", + "cobblemon.species.sunflora.name": "", + "cobblemon.species.sunflora.desc": "", + "cobblemon.species.yanma.name": "", + "cobblemon.species.yanma.desc": "", + "cobblemon.species.wooper.name": "", + "cobblemon.species.wooper.desc": "", + "cobblemon.species.quagsire.name": "", + "cobblemon.species.quagsire.desc": "", + "cobblemon.species.espeon.name": "", + "cobblemon.species.espeon.desc": "", + "cobblemon.species.umbreon.name": "", + "cobblemon.species.umbreon.desc": "", + "cobblemon.species.murkrow.name": "", + "cobblemon.species.murkrow.desc": "", + "cobblemon.species.slowking.name": "", + "cobblemon.species.slowking.desc": "", + "cobblemon.species.misdreavus.name": "", + "cobblemon.species.misdreavus.desc": "", + "cobblemon.species.unown.name": "", + "cobblemon.species.unown.desc": "", + "cobblemon.species.wobbuffet.name": "", + "cobblemon.species.wobbuffet.desc": "", + "cobblemon.species.girafarig.name": "", + "cobblemon.species.girafarig.desc": "", + "cobblemon.species.pineco.name": "", + "cobblemon.species.pineco.desc": "", + "cobblemon.species.forretress.name": "", + "cobblemon.species.forretress.desc": "", + "cobblemon.species.dunsparce.name": "", + "cobblemon.species.dunsparce.desc": "", + "cobblemon.species.gligar.name": "", + "cobblemon.species.gligar.desc": "", + "cobblemon.species.steelix.name": "", + "cobblemon.species.steelix.desc": "", + "cobblemon.species.snubbull.name": "", + "cobblemon.species.snubbull.desc": "", + "cobblemon.species.granbull.name": "", + "cobblemon.species.granbull.desc": "", + "cobblemon.species.qwilfish.name": "", + "cobblemon.species.qwilfish.desc": "", + "cobblemon.species.scizor.name": "", + "cobblemon.species.scizor.desc": "", + "cobblemon.species.shuckle.name": "", + "cobblemon.species.shuckle.desc": "", + "cobblemon.species.heracross.name": "", + "cobblemon.species.heracross.desc": "", + "cobblemon.species.sneasel.name": "", + "cobblemon.species.sneasel.desc": "", + "cobblemon.species.teddiursa.name": "", + "cobblemon.species.teddiursa.desc": "", + "cobblemon.species.ursaring.name": "", + "cobblemon.species.ursaring.desc": "", + "cobblemon.species.slugma.name": "", + "cobblemon.species.slugma.desc": "", + "cobblemon.species.magcargo.name": "", + "cobblemon.species.magcargo.desc": "", + "cobblemon.species.swinub.name": "", + "cobblemon.species.swinub.desc": "", + "cobblemon.species.piloswine.name": "", + "cobblemon.species.piloswine.desc": "", + "cobblemon.species.corsola.name": "", + "cobblemon.species.corsola.desc": "", + "cobblemon.species.remoraid.name": "", + "cobblemon.species.remoraid.desc": "", + "cobblemon.species.octillery.name": "", + "cobblemon.species.octillery.desc": "", + "cobblemon.species.delibird.name": "", + "cobblemon.species.delibird.desc": "", + "cobblemon.species.mantine.name": "", + "cobblemon.species.mantine.desc": "", + "cobblemon.species.skarmory.name": "", + "cobblemon.species.skarmory.desc": "", + "cobblemon.species.houndour.name": "", + "cobblemon.species.houndour.desc": "", + "cobblemon.species.houndoom.name": "", + "cobblemon.species.houndoom.desc": "", + "cobblemon.species.kingdra.name": "", + "cobblemon.species.kingdra.desc": "", + "cobblemon.species.phanpy.name": "", + "cobblemon.species.phanpy.desc": "", + "cobblemon.species.donphan.name": "", + "cobblemon.species.donphan.desc": "", + "cobblemon.species.porygon2.name": "", + "cobblemon.species.porygon2.desc": "", + "cobblemon.species.stantler.name": "", + "cobblemon.species.stantler.desc": "", + "cobblemon.species.smeargle.name": "", + "cobblemon.species.smeargle.desc": "", + "cobblemon.species.tyrogue.name": "", + "cobblemon.species.tyrogue.desc": "", + "cobblemon.species.hitmontop.name": "", + "cobblemon.species.hitmontop.desc": "", + "cobblemon.species.smoochum.name": "", + "cobblemon.species.smoochum.desc": "", + "cobblemon.species.elekid.name": "", + "cobblemon.species.elekid.desc": "", + "cobblemon.species.magby.name": "", + "cobblemon.species.magby.desc": "", + "cobblemon.species.miltank.name": "", + "cobblemon.species.miltank.desc": "", + "cobblemon.species.blissey.name": "", + "cobblemon.species.blissey.desc": "", + "cobblemon.species.raikou.name": "", + "cobblemon.species.raikou.desc": "", + "cobblemon.species.entei.name": "", + "cobblemon.species.entei.desc": "", + "cobblemon.species.suicune.name": "", + "cobblemon.species.suicune.desc": "", + "cobblemon.species.larvitar.name": "", + "cobblemon.species.larvitar.desc": "", + "cobblemon.species.pupitar.name": "", + "cobblemon.species.pupitar.desc": "", + "cobblemon.species.tyranitar.name": "", + "cobblemon.species.tyranitar.desc": "", + "cobblemon.species.lugia.name": "", + "cobblemon.species.lugia.desc": "", + "cobblemon.species.hooh.name": "", + "cobblemon.species.hooh.desc": "", + "cobblemon.species.celebi.name": "", + "cobblemon.species.celebi.desc": "", + "cobblemon.species.treecko.name": "", + "cobblemon.species.treecko.desc": "", + "cobblemon.species.grovyle.name": "", + "cobblemon.species.grovyle.desc": "", + "cobblemon.species.sceptile.name": "", + "cobblemon.species.sceptile.desc": "", + "cobblemon.species.torchic.name": "", + "cobblemon.species.torchic.desc": "", + "cobblemon.species.combusken.name": "", + "cobblemon.species.combusken.desc": "", + "cobblemon.species.blaziken.name": "", + "cobblemon.species.blaziken.desc": "", + "cobblemon.species.mudkip.name": "", + "cobblemon.species.mudkip.desc": "", + "cobblemon.species.marshtomp.name": "", + "cobblemon.species.marshtomp.desc": "", + "cobblemon.species.swampert.name": "", + "cobblemon.species.swampert.desc": "", + "cobblemon.species.poochyena.name": "", + "cobblemon.species.poochyena.desc": "", + "cobblemon.species.mightyena.name": "", + "cobblemon.species.mightyena.desc": "", + "cobblemon.species.zigzagoon.name": "", + "cobblemon.species.zigzagoon.desc": "", + "cobblemon.species.linoone.name": "", + "cobblemon.species.linoone.desc": "", + "cobblemon.species.wurmple.name": "", + "cobblemon.species.wurmple.desc": "", + "cobblemon.species.silcoon.name": "", + "cobblemon.species.silcoon.desc": "", + "cobblemon.species.beautifly.name": "", + "cobblemon.species.beautifly.desc": "", + "cobblemon.species.cascoon.name": "", + "cobblemon.species.cascoon.desc": "", + "cobblemon.species.dustox.name": "", + "cobblemon.species.dustox.desc": "", + "cobblemon.species.lotad.name": "", + "cobblemon.species.lotad.desc": "", + "cobblemon.species.lombre.name": "", + "cobblemon.species.lombre.desc": "", + "cobblemon.species.ludicolo.name": "", + "cobblemon.species.ludicolo.desc": "", + "cobblemon.species.seedot.name": "", + "cobblemon.species.seedot.desc": "", + "cobblemon.species.nuzleaf.name": "", + "cobblemon.species.nuzleaf.desc": "", + "cobblemon.species.shiftry.name": "", + "cobblemon.species.shiftry.desc": "", + "cobblemon.species.taillow.name": "", + "cobblemon.species.taillow.desc": "", + "cobblemon.species.swellow.name": "", + "cobblemon.species.swellow.desc": "", + "cobblemon.species.wingull.name": "", + "cobblemon.species.wingull.desc": "", + "cobblemon.species.pelipper.name": "", + "cobblemon.species.pelipper.desc": "", + "cobblemon.species.ralts.name": "", + "cobblemon.species.ralts.desc": "", + "cobblemon.species.kirlia.name": "", + "cobblemon.species.kirlia.desc": "", + "cobblemon.species.gardevoir.name": "", + "cobblemon.species.gardevoir.desc": "", + "cobblemon.species.surskit.name": "", + "cobblemon.species.surskit.desc": "", + "cobblemon.species.masquerain.name": "", + "cobblemon.species.masquerain.desc": "", + "cobblemon.species.shroomish.name": "", + "cobblemon.species.shroomish.desc": "", + "cobblemon.species.breloom.name": "", + "cobblemon.species.breloom.desc": "", + "cobblemon.species.slakoth.name": "", + "cobblemon.species.slakoth.desc": "", + "cobblemon.species.vigoroth.name": "", + "cobblemon.species.vigoroth.desc": "", + "cobblemon.species.slaking.name": "", + "cobblemon.species.slaking.desc": "", + "cobblemon.species.nincada.name": "", + "cobblemon.species.nincada.desc": "", + "cobblemon.species.ninjask.name": "", + "cobblemon.species.ninjask.desc": "", + "cobblemon.species.shedinja.name": "", + "cobblemon.species.shedinja.desc": "", + "cobblemon.species.whismur.name": "", + "cobblemon.species.whismur.desc": "", + "cobblemon.species.loudred.name": "", + "cobblemon.species.loudred.desc": "", + "cobblemon.species.exploud.name": "", + "cobblemon.species.exploud.desc": "", + "cobblemon.species.makuhita.name": "", + "cobblemon.species.makuhita.desc": "", + "cobblemon.species.hariyama.name": "", + "cobblemon.species.hariyama.desc": "", + "cobblemon.species.azurill.name": "", + "cobblemon.species.azurill.desc": "", + "cobblemon.species.nosepass.name": "", + "cobblemon.species.nosepass.desc": "", + "cobblemon.species.skitty.name": "", + "cobblemon.species.skitty.desc": "", + "cobblemon.species.delcatty.name": "", + "cobblemon.species.delcatty.desc": "", + "cobblemon.species.sableye.name": "", + "cobblemon.species.sableye.desc": "", + "cobblemon.species.mawile.name": "", + "cobblemon.species.mawile.desc": "", + "cobblemon.species.aron.name": "", + "cobblemon.species.aron.desc": "", + "cobblemon.species.lairon.name": "", + "cobblemon.species.lairon.desc": "", + "cobblemon.species.aggron.name": "", + "cobblemon.species.aggron.desc": "", + "cobblemon.species.meditite.name": "", + "cobblemon.species.meditite.desc": "", + "cobblemon.species.medicham.name": "", + "cobblemon.species.medicham.desc": "", + "cobblemon.species.electrike.name": "", + "cobblemon.species.electrike.desc": "", + "cobblemon.species.manectric.name": "", + "cobblemon.species.manectric.desc": "", + "cobblemon.species.plusle.name": "", + "cobblemon.species.plusle.desc": "", + "cobblemon.species.minun.name": "", + "cobblemon.species.minun.desc": "", + "cobblemon.species.volbeat.name": "", + "cobblemon.species.volbeat.desc": "", + "cobblemon.species.illumise.name": "", + "cobblemon.species.illumise.desc": "", + "cobblemon.species.roselia.name": "", + "cobblemon.species.roselia.desc": "", + "cobblemon.species.gulpin.name": "", + "cobblemon.species.gulpin.desc": "", + "cobblemon.species.swalot.name": "", + "cobblemon.species.swalot.desc": "", + "cobblemon.species.carvanha.name": "", + "cobblemon.species.carvanha.desc": "", + "cobblemon.species.sharpedo.name": "", + "cobblemon.species.sharpedo.desc": "", + "cobblemon.species.wailmer.name": "", + "cobblemon.species.wailmer.desc": "", + "cobblemon.species.wailord.name": "", + "cobblemon.species.wailord.desc": "", + "cobblemon.species.numel.name": "", + "cobblemon.species.numel.desc": "", + "cobblemon.species.camerupt.name": "", + "cobblemon.species.camerupt.desc": "", + "cobblemon.species.torkoal.name": "", + "cobblemon.species.torkoal.desc": "", + "cobblemon.species.spoink.name": "", + "cobblemon.species.spoink.desc": "", + "cobblemon.species.grumpig.name": "", + "cobblemon.species.grumpig.desc": "", + "cobblemon.species.spinda.name": "", + "cobblemon.species.spinda.desc": "", + "cobblemon.species.trapinch.name": "", + "cobblemon.species.trapinch.desc": "", + "cobblemon.species.vibrava.name": "", + "cobblemon.species.vibrava.desc": "", + "cobblemon.species.flygon.name": "", + "cobblemon.species.flygon.desc": "", + "cobblemon.species.cacnea.name": "", + "cobblemon.species.cacnea.desc": "", + "cobblemon.species.cacturne.name": "", + "cobblemon.species.cacturne.desc": "", + "cobblemon.species.swablu.name": "", + "cobblemon.species.swablu.desc": "", + "cobblemon.species.altaria.name": "", + "cobblemon.species.altaria.desc": "", + "cobblemon.species.zangoose.name": "", + "cobblemon.species.zangoose.desc": "", + "cobblemon.species.seviper.name": "", + "cobblemon.species.seviper.desc": "", + "cobblemon.species.lunatone.name": "", + "cobblemon.species.lunatone.desc": "", + "cobblemon.species.solrock.name": "", + "cobblemon.species.solrock.desc": "", + "cobblemon.species.barboach.name": "", + "cobblemon.species.barboach.desc": "", + "cobblemon.species.whiscash.name": "", + "cobblemon.species.whiscash.desc": "", + "cobblemon.species.corphish.name": "", + "cobblemon.species.corphish.desc": "", + "cobblemon.species.crawdaunt.name": "", + "cobblemon.species.crawdaunt.desc": "", + "cobblemon.species.baltoy.name": "", + "cobblemon.species.baltoy.desc": "", + "cobblemon.species.claydol.name": "", + "cobblemon.species.claydol.desc": "", + "cobblemon.species.lileep.name": "", + "cobblemon.species.lileep.desc": "", + "cobblemon.species.cradily.name": "", + "cobblemon.species.cradily.desc": "", + "cobblemon.species.anorith.name": "", + "cobblemon.species.anorith.desc": "", + "cobblemon.species.armaldo.name": "", + "cobblemon.species.armaldo.desc": "", + "cobblemon.species.feebas.name": "", + "cobblemon.species.feebas.desc": "", + "cobblemon.species.milotic.name": "", + "cobblemon.species.milotic.desc": "", + "cobblemon.species.castform.name": "", + "cobblemon.species.castform.desc": "", + "cobblemon.species.kecleon.name": "", + "cobblemon.species.kecleon.desc": "", + "cobblemon.species.shuppet.name": "", + "cobblemon.species.shuppet.desc": "", + "cobblemon.species.banette.name": "", + "cobblemon.species.banette.desc": "", + "cobblemon.species.duskull.name": "", + "cobblemon.species.duskull.desc": "", + "cobblemon.species.dusclops.name": "", + "cobblemon.species.dusclops.desc": "", + "cobblemon.species.tropius.name": "", + "cobblemon.species.tropius.desc": "", + "cobblemon.species.chimecho.name": "", + "cobblemon.species.chimecho.desc": "", + "cobblemon.species.absol.name": "", + "cobblemon.species.absol.desc": "", + "cobblemon.species.wynaut.name": "", + "cobblemon.species.wynaut.desc": "", + "cobblemon.species.snorunt.name": "", + "cobblemon.species.snorunt.desc": "", + "cobblemon.species.glalie.name": "", + "cobblemon.species.glalie.desc": "", + "cobblemon.species.spheal.name": "", + "cobblemon.species.spheal.desc": "", + "cobblemon.species.sealeo.name": "", + "cobblemon.species.sealeo.desc": "", + "cobblemon.species.walrein.name": "", + "cobblemon.species.walrein.desc": "", + "cobblemon.species.clamperl.name": "", + "cobblemon.species.clamperl.desc": "", + "cobblemon.species.huntail.name": "", + "cobblemon.species.huntail.desc": "", + "cobblemon.species.gorebyss.name": "", + "cobblemon.species.gorebyss.desc": "", + "cobblemon.species.relicanth.name": "", + "cobblemon.species.relicanth.desc": "", + "cobblemon.species.luvdisc.name": "", + "cobblemon.species.luvdisc.desc": "", + "cobblemon.species.bagon.name": "", + "cobblemon.species.bagon.desc": "", + "cobblemon.species.shelgon.name": "", + "cobblemon.species.shelgon.desc": "", + "cobblemon.species.salamence.name": "", + "cobblemon.species.salamence.desc": "", + "cobblemon.species.beldum.name": "", + "cobblemon.species.beldum.desc": "", + "cobblemon.species.metang.name": "", + "cobblemon.species.metang.desc": "", + "cobblemon.species.metagross.name": "", + "cobblemon.species.metagross.desc": "", + "cobblemon.species.regirock.name": "", + "cobblemon.species.regirock.desc": "", + "cobblemon.species.regice.name": "", + "cobblemon.species.regice.desc": "", + "cobblemon.species.registeel.name": "", + "cobblemon.species.registeel.desc": "", + "cobblemon.species.latias.name": "", + "cobblemon.species.latias.desc": "", + "cobblemon.species.latios.name": "", + "cobblemon.species.latios.desc": "", + "cobblemon.species.kyogre.name": "", + "cobblemon.species.kyogre.desc": "", + "cobblemon.species.groudon.name": "", + "cobblemon.species.groudon.desc": "", + "cobblemon.species.rayquaza.name": "", + "cobblemon.species.rayquaza.desc": "", + "cobblemon.species.jirachi.name": "", + "cobblemon.species.jirachi.desc": "", + "cobblemon.species.deoxys.name": "", + "cobblemon.species.deoxys.desc": "", + "cobblemon.species.turtwig.name": "", + "cobblemon.species.turtwig.desc": "", + "cobblemon.species.grotle.name": "", + "cobblemon.species.grotle.desc": "", + "cobblemon.species.torterra.name": "", + "cobblemon.species.torterra.desc": "", + "cobblemon.species.chimchar.name": "", + "cobblemon.species.chimchar.desc": "", + "cobblemon.species.monferno.name": "", + "cobblemon.species.monferno.desc": "", + "cobblemon.species.infernape.name": "", + "cobblemon.species.infernape.desc": "", + "cobblemon.species.piplup.name": "", + "cobblemon.species.piplup.desc": "", + "cobblemon.species.prinplup.name": "", + "cobblemon.species.prinplup.desc": "", + "cobblemon.species.empoleon.name": "", + "cobblemon.species.empoleon.desc": "", + "cobblemon.species.starly.name": "", + "cobblemon.species.starly.desc": "", + "cobblemon.species.staravia.name": "", + "cobblemon.species.staravia.desc": "", + "cobblemon.species.staraptor.name": "", + "cobblemon.species.staraptor.desc": "", + "cobblemon.species.bidoof.name": "", + "cobblemon.species.bidoof.desc": "", + "cobblemon.species.bibarel.name": "", + "cobblemon.species.bibarel.desc": "", + "cobblemon.species.kricketot.name": "", + "cobblemon.species.kricketot.desc": "", + "cobblemon.species.kricketune.name": "", + "cobblemon.species.kricketune.desc": "", + "cobblemon.species.shinx.name": "", + "cobblemon.species.shinx.desc": "", + "cobblemon.species.luxio.name": "", + "cobblemon.species.luxio.desc": "", + "cobblemon.species.luxray.name": "", + "cobblemon.species.luxray.desc": "", + "cobblemon.species.budew.name": "", + "cobblemon.species.budew.desc": "", + "cobblemon.species.roserade.name": "", + "cobblemon.species.roserade.desc": "", + "cobblemon.species.cranidos.name": "", + "cobblemon.species.cranidos.desc": "", + "cobblemon.species.rampardos.name": "", + "cobblemon.species.rampardos.desc": "", + "cobblemon.species.shieldon.name": "", + "cobblemon.species.shieldon.desc": "", + "cobblemon.species.bastiodon.name": "", + "cobblemon.species.bastiodon.desc": "", + "cobblemon.species.burmy.name": "", + "cobblemon.species.burmy.desc": "", + "cobblemon.species.wormadam.name": "", + "cobblemon.species.wormadam.desc": "", + "cobblemon.species.mothim.name": "", + "cobblemon.species.mothim.desc": "", + "cobblemon.species.combee.name": "", + "cobblemon.species.combee.desc": "", + "cobblemon.species.vespiquen.name": "", + "cobblemon.species.vespiquen.desc": "", + "cobblemon.species.pachirisu.name": "", + "cobblemon.species.pachirisu.desc": "", + "cobblemon.species.buizel.name": "", + "cobblemon.species.buizel.desc": "", + "cobblemon.species.floatzel.name": "", + "cobblemon.species.floatzel.desc": "", + "cobblemon.species.cherubi.name": "", + "cobblemon.species.cherubi.desc": "", + "cobblemon.species.cherrim.name": "", + "cobblemon.species.cherrim.desc": "", + "cobblemon.species.shellos.name": "", + "cobblemon.species.shellos.desc": "", + "cobblemon.species.gastrodon.name": "", + "cobblemon.species.gastrodon.desc": "", + "cobblemon.species.ambipom.name": "", + "cobblemon.species.ambipom.desc": "", + "cobblemon.species.drifloon.name": "", + "cobblemon.species.drifloon.desc": "", + "cobblemon.species.drifblim.name": "", + "cobblemon.species.drifblim.desc": "", + "cobblemon.species.buneary.name": "", + "cobblemon.species.buneary.desc": "", + "cobblemon.species.lopunny.name": "", + "cobblemon.species.lopunny.desc": "", + "cobblemon.species.mismagius.name": "", + "cobblemon.species.mismagius.desc": "", + "cobblemon.species.honchkrow.name": "", + "cobblemon.species.honchkrow.desc": "", + "cobblemon.species.glameow.name": "", + "cobblemon.species.glameow.desc": "", + "cobblemon.species.purugly.name": "", + "cobblemon.species.purugly.desc": "", + "cobblemon.species.chingling.name": "", + "cobblemon.species.chingling.desc": "", + "cobblemon.species.stunky.name": "", + "cobblemon.species.stunky.desc": "", + "cobblemon.species.skuntank.name": "", + "cobblemon.species.skuntank.desc": "", + "cobblemon.species.bronzor.name": "", + "cobblemon.species.bronzor.desc": "", + "cobblemon.species.bronzong.name": "", + "cobblemon.species.bronzong.desc": "", + "cobblemon.species.bonsly.name": "", + "cobblemon.species.bonsly.desc": "", + "cobblemon.species.mimejr.name": "", + "cobblemon.species.mimejr.desc": "", + "cobblemon.species.happiny.name": "", + "cobblemon.species.happiny.desc": "", + "cobblemon.species.chatot.name": "", + "cobblemon.species.chatot.desc": "", + "cobblemon.species.spiritomb.name": "", + "cobblemon.species.spiritomb.desc": "", + "cobblemon.species.gible.name": "", + "cobblemon.species.gible.desc": "", + "cobblemon.species.gabite.name": "", + "cobblemon.species.gabite.desc": "", + "cobblemon.species.garchomp.name": "", + "cobblemon.species.garchomp.desc": "", + "cobblemon.species.munchlax.name": "", + "cobblemon.species.munchlax.desc": "", + "cobblemon.species.riolu.name": "", + "cobblemon.species.riolu.desc": "", + "cobblemon.species.lucario.name": "", + "cobblemon.species.lucario.desc": "", + "cobblemon.species.hippopotas.name": "", + "cobblemon.species.hippopotas.desc": "", + "cobblemon.species.hippowdon.name": "", + "cobblemon.species.hippowdon.desc": "", + "cobblemon.species.skorupi.name": "", + "cobblemon.species.skorupi.desc": "", + "cobblemon.species.drapion.name": "", + "cobblemon.species.drapion.desc": "", + "cobblemon.species.croagunk.name": "", + "cobblemon.species.croagunk.desc": "", + "cobblemon.species.toxicroak.name": "", + "cobblemon.species.toxicroak.desc": "", + "cobblemon.species.carnivine.name": "", + "cobblemon.species.carnivine.desc": "", + "cobblemon.species.finneon.name": "", + "cobblemon.species.finneon.desc": "", + "cobblemon.species.lumineon.name": "", + "cobblemon.species.lumineon.desc": "", + "cobblemon.species.mantyke.name": "", + "cobblemon.species.mantyke.desc": "", + "cobblemon.species.snover.name": "", + "cobblemon.species.snover.desc": "", + "cobblemon.species.abomasnow.name": "", + "cobblemon.species.abomasnow.desc": "", + "cobblemon.species.weavile.name": "", + "cobblemon.species.weavile.desc": "", + "cobblemon.species.magnezone.name": "", + "cobblemon.species.magnezone.desc": "", + "cobblemon.species.lickilicky.name": "", + "cobblemon.species.lickilicky.desc": "", + "cobblemon.species.rhyperior.name": "", + "cobblemon.species.rhyperior.desc": "", + "cobblemon.species.tangrowth.name": "", + "cobblemon.species.tangrowth.desc": "", + "cobblemon.species.electivire.name": "", + "cobblemon.species.electivire.desc": "", + "cobblemon.species.magmortar.name": "", + "cobblemon.species.magmortar.desc": "", + "cobblemon.species.togekiss.name": "", + "cobblemon.species.togekiss.desc": "", + "cobblemon.species.yanmega.name": "", + "cobblemon.species.yanmega.desc": "", + "cobblemon.species.leafeon.name": "", + "cobblemon.species.leafeon.desc": "", + "cobblemon.species.glaceon.name": "", + "cobblemon.species.glaceon.desc": "", + "cobblemon.species.gliscor.name": "", + "cobblemon.species.gliscor.desc": "", + "cobblemon.species.mamoswine.name": "", + "cobblemon.species.mamoswine.desc": "", + "cobblemon.species.porygonz.name": "", + "cobblemon.species.porygonz.desc": "", + "cobblemon.species.gallade.name": "", + "cobblemon.species.gallade.desc": "", + "cobblemon.species.probopass.name": "", + "cobblemon.species.probopass.desc": "", + "cobblemon.species.dusknoir.name": "", + "cobblemon.species.dusknoir.desc": "", + "cobblemon.species.froslass.name": "", + "cobblemon.species.froslass.desc": "", + "cobblemon.species.rotom.name": "", + "cobblemon.species.rotom.desc": "", + "cobblemon.species.uxie.name": "", + "cobblemon.species.uxie.desc": "", + "cobblemon.species.mesprit.name": "", + "cobblemon.species.mesprit.desc": "", + "cobblemon.species.azelf.name": "", + "cobblemon.species.azelf.desc": "", + "cobblemon.species.dialga.name": "", + "cobblemon.species.dialga.desc": "", + "cobblemon.species.palkia.name": "", + "cobblemon.species.palkia.desc": "", + "cobblemon.species.heatran.name": "", + "cobblemon.species.heatran.desc": "", + "cobblemon.species.regigigas.name": "", + "cobblemon.species.regigigas.desc": "", + "cobblemon.species.giratina.name": "", + "cobblemon.species.giratina.desc": "", + "cobblemon.species.cresselia.name": "", + "cobblemon.species.cresselia.desc": "", + "cobblemon.species.phione.name": "", + "cobblemon.species.phione.desc": "", + "cobblemon.species.manaphy.name": "", + "cobblemon.species.manaphy.desc": "", + "cobblemon.species.darkrai.name": "", + "cobblemon.species.darkrai.desc": "", + "cobblemon.species.shaymin.name": "", + "cobblemon.species.shaymin.desc": "", + "cobblemon.species.arceus.name": "", + "cobblemon.species.arceus.desc": "", + "cobblemon.species.victini.name": "", + "cobblemon.species.victini.desc": "", + "cobblemon.species.snivy.name": "", + "cobblemon.species.snivy.desc": "", + "cobblemon.species.servine.name": "", + "cobblemon.species.servine.desc": "", + "cobblemon.species.serperior.name": "", + "cobblemon.species.serperior.desc": "", + "cobblemon.species.tepig.name": "", + "cobblemon.species.tepig.desc": "", + "cobblemon.species.pignite.name": "", + "cobblemon.species.pignite.desc": "", + "cobblemon.species.emboar.name": "", + "cobblemon.species.emboar.desc": "", + "cobblemon.species.oshawott.name": "", + "cobblemon.species.oshawott.desc": "", + "cobblemon.species.dewott.name": "", + "cobblemon.species.dewott.desc": "", + "cobblemon.species.samurott.name": "", + "cobblemon.species.samurott.desc": "", + "cobblemon.species.patrat.name": "", + "cobblemon.species.patrat.desc": "", + "cobblemon.species.watchog.name": "", + "cobblemon.species.watchog.desc": "", + "cobblemon.species.lillipup.name": "", + "cobblemon.species.lillipup.desc": "", + "cobblemon.species.herdier.name": "", + "cobblemon.species.herdier.desc": "", + "cobblemon.species.stoutland.name": "", + "cobblemon.species.stoutland.desc": "", + "cobblemon.species.purrloin.name": "", + "cobblemon.species.purrloin.desc": "", + "cobblemon.species.liepard.name": "", + "cobblemon.species.liepard.desc": "", + "cobblemon.species.pansage.name": "", + "cobblemon.species.pansage.desc": "", + "cobblemon.species.simisage.name": "", + "cobblemon.species.simisage.desc": "", + "cobblemon.species.pansear.name": "", + "cobblemon.species.pansear.desc": "", + "cobblemon.species.simisear.name": "", + "cobblemon.species.simisear.desc": "", + "cobblemon.species.panpour.name": "", + "cobblemon.species.panpour.desc": "", + "cobblemon.species.simipour.name": "", + "cobblemon.species.simipour.desc": "", + "cobblemon.species.munna.name": "", + "cobblemon.species.munna.desc": "", + "cobblemon.species.musharna.name": "", + "cobblemon.species.musharna.desc": "", + "cobblemon.species.pidove.name": "", + "cobblemon.species.pidove.desc": "", + "cobblemon.species.tranquill.name": "", + "cobblemon.species.tranquill.desc": "", + "cobblemon.species.unfezant.name": "", + "cobblemon.species.unfezant.desc": "", + "cobblemon.species.blitzle.name": "", + "cobblemon.species.blitzle.desc": "", + "cobblemon.species.zebstrika.name": "", + "cobblemon.species.zebstrika.desc": "", + "cobblemon.species.roggenrola.name": "", + "cobblemon.species.roggenrola.desc": "", + "cobblemon.species.boldore.name": "", + "cobblemon.species.boldore.desc": "", + "cobblemon.species.gigalith.name": "", + "cobblemon.species.gigalith.desc": "", + "cobblemon.species.woobat.name": "", + "cobblemon.species.woobat.desc": "", + "cobblemon.species.swoobat.name": "", + "cobblemon.species.swoobat.desc": "", + "cobblemon.species.drilbur.name": "", + "cobblemon.species.drilbur.desc": "", + "cobblemon.species.excadrill.name": "", + "cobblemon.species.excadrill.desc": "", + "cobblemon.species.audino.name": "", + "cobblemon.species.audino.desc": "", + "cobblemon.species.timburr.name": "", + "cobblemon.species.timburr.desc": "", + "cobblemon.species.gurdurr.name": "", + "cobblemon.species.gurdurr.desc": "", + "cobblemon.species.conkeldurr.name": "", + "cobblemon.species.conkeldurr.desc": "", + "cobblemon.species.tympole.name": "", + "cobblemon.species.tympole.desc": "", + "cobblemon.species.palpitoad.name": "", + "cobblemon.species.palpitoad.desc": "", + "cobblemon.species.seismitoad.name": "", + "cobblemon.species.seismitoad.desc": "", + "cobblemon.species.throh.name": "", + "cobblemon.species.throh.desc": "", + "cobblemon.species.sawk.name": "", + "cobblemon.species.sawk.desc": "", + "cobblemon.species.sewaddle.name": "", + "cobblemon.species.sewaddle.desc": "", + "cobblemon.species.swadloon.name": "", + "cobblemon.species.swadloon.desc": "", + "cobblemon.species.leavanny.name": "", + "cobblemon.species.leavanny.desc": "", + "cobblemon.species.venipede.name": "", + "cobblemon.species.venipede.desc": "", + "cobblemon.species.whirlipede.name": "", + "cobblemon.species.whirlipede.desc": "", + "cobblemon.species.scolipede.name": "", + "cobblemon.species.scolipede.desc": "", + "cobblemon.species.cottonee.name": "", + "cobblemon.species.cottonee.desc": "", + "cobblemon.species.whimsicott.name": "", + "cobblemon.species.whimsicott.desc": "", + "cobblemon.species.petilil.name": "", + "cobblemon.species.petilil.desc": "", + "cobblemon.species.lilligant.name": "", + "cobblemon.species.lilligant.desc": "", + "cobblemon.species.basculin.name": "", + "cobblemon.species.basculin.desc": "", + "cobblemon.species.sandile.name": "", + "cobblemon.species.sandile.desc": "", + "cobblemon.species.krokorok.name": "", + "cobblemon.species.krokorok.desc": "", + "cobblemon.species.krookodile.name": "", + "cobblemon.species.krookodile.desc": "", + "cobblemon.species.darumaka.name": "", + "cobblemon.species.darumaka.desc": "", + "cobblemon.species.darmanitan.name": "", + "cobblemon.species.darmanitan.desc": "", + "cobblemon.species.maractus.name": "", + "cobblemon.species.maractus.desc": "", + "cobblemon.species.dwebble.name": "", + "cobblemon.species.dwebble.desc": "", + "cobblemon.species.crustle.name": "", + "cobblemon.species.crustle.desc": "", + "cobblemon.species.scraggy.name": "", + "cobblemon.species.scraggy.desc": "", + "cobblemon.species.scrafty.name": "", + "cobblemon.species.scrafty.desc": "", + "cobblemon.species.sigilyph.name": "", + "cobblemon.species.sigilyph.desc": "", + "cobblemon.species.yamask.name": "", + "cobblemon.species.yamask.desc": "", + "cobblemon.species.cofagrigus.name": "", + "cobblemon.species.cofagrigus.desc": "", + "cobblemon.species.tirtouga.name": "", + "cobblemon.species.tirtouga.desc": "", + "cobblemon.species.carracosta.name": "", + "cobblemon.species.carracosta.desc": "", + "cobblemon.species.archen.name": "", + "cobblemon.species.archen.desc": "", + "cobblemon.species.archeops.name": "", + "cobblemon.species.archeops.desc": "", + "cobblemon.species.trubbish.name": "", + "cobblemon.species.trubbish.desc": "", + "cobblemon.species.garbodor.name": "", + "cobblemon.species.garbodor.desc": "", + "cobblemon.species.zorua.name": "", + "cobblemon.species.zorua.desc": "", + "cobblemon.species.zoroark.name": "", + "cobblemon.species.zoroark.desc": "", + "cobblemon.species.minccino.name": "", + "cobblemon.species.minccino.desc": "", + "cobblemon.species.cinccino.name": "", + "cobblemon.species.cinccino.desc": "", + "cobblemon.species.gothita.name": "", + "cobblemon.species.gothita.desc": "", + "cobblemon.species.gothorita.name": "", + "cobblemon.species.gothorita.desc": "", + "cobblemon.species.gothitelle.name": "", + "cobblemon.species.gothitelle.desc": "", + "cobblemon.species.solosis.name": "", + "cobblemon.species.solosis.desc": "", + "cobblemon.species.duosion.name": "", + "cobblemon.species.duosion.desc": "", + "cobblemon.species.reuniclus.name": "", + "cobblemon.species.reuniclus.desc": "", + "cobblemon.species.ducklett.name": "", + "cobblemon.species.ducklett.desc": "", + "cobblemon.species.swanna.name": "", + "cobblemon.species.swanna.desc": "", + "cobblemon.species.vanillite.name": "", + "cobblemon.species.vanillite.desc": "", + "cobblemon.species.vanillish.name": "", + "cobblemon.species.vanillish.desc": "", + "cobblemon.species.vanilluxe.name": "", + "cobblemon.species.vanilluxe.desc": "", + "cobblemon.species.deerling.name": "", + "cobblemon.species.deerling.desc": "", + "cobblemon.species.sawsbuck.name": "", + "cobblemon.species.sawsbuck.desc": "", + "cobblemon.species.emolga.name": "", + "cobblemon.species.emolga.desc": "", + "cobblemon.species.karrablast.name": "", + "cobblemon.species.karrablast.desc": "", + "cobblemon.species.escavalier.name": "", + "cobblemon.species.escavalier.desc": "", + "cobblemon.species.foongus.name": "", + "cobblemon.species.foongus.desc": "", + "cobblemon.species.amoonguss.name": "", + "cobblemon.species.amoonguss.desc": "", + "cobblemon.species.frillish.name": "", + "cobblemon.species.frillish.desc": "", + "cobblemon.species.jellicent.name": "", + "cobblemon.species.jellicent.desc": "", + "cobblemon.species.alomomola.name": "", + "cobblemon.species.alomomola.desc": "", + "cobblemon.species.joltik.name": "", + "cobblemon.species.joltik.desc": "", + "cobblemon.species.galvantula.name": "", + "cobblemon.species.galvantula.desc": "", + "cobblemon.species.ferroseed.name": "", + "cobblemon.species.ferroseed.desc": "", + "cobblemon.species.ferrothorn.name": "", + "cobblemon.species.ferrothorn.desc": "", + "cobblemon.species.klink.name": "", + "cobblemon.species.klink.desc": "", + "cobblemon.species.klang.name": "", + "cobblemon.species.klang.desc": "", + "cobblemon.species.klinklang.name": "", + "cobblemon.species.klinklang.desc": "", + "cobblemon.species.tynamo.name": "", + "cobblemon.species.tynamo.desc": "", + "cobblemon.species.eelektrik.name": "", + "cobblemon.species.eelektrik.desc": "", + "cobblemon.species.eelektross.name": "", + "cobblemon.species.eelektross.desc": "", + "cobblemon.species.elgyem.name": "", + "cobblemon.species.elgyem.desc": "", + "cobblemon.species.beheeyem.name": "", + "cobblemon.species.beheeyem.desc": "", + "cobblemon.species.litwick.name": "", + "cobblemon.species.litwick.desc": "", + "cobblemon.species.lampent.name": "", + "cobblemon.species.lampent.desc": "", + "cobblemon.species.chandelure.name": "", + "cobblemon.species.chandelure.desc": "", + "cobblemon.species.axew.name": "", + "cobblemon.species.axew.desc": "", + "cobblemon.species.fraxure.name": "", + "cobblemon.species.fraxure.desc": "", + "cobblemon.species.haxorus.name": "", + "cobblemon.species.haxorus.desc": "", + "cobblemon.species.cubchoo.name": "", + "cobblemon.species.cubchoo.desc": "", + "cobblemon.species.beartic.name": "", + "cobblemon.species.beartic.desc": "", + "cobblemon.species.cryogonal.name": "", + "cobblemon.species.cryogonal.desc": "", + "cobblemon.species.shelmet.name": "", + "cobblemon.species.shelmet.desc": "", + "cobblemon.species.accelgor.name": "", + "cobblemon.species.accelgor.desc": "", + "cobblemon.species.stunfisk.name": "", + "cobblemon.species.stunfisk.desc": "", + "cobblemon.species.mienfoo.name": "", + "cobblemon.species.mienfoo.desc": "", + "cobblemon.species.mienshao.name": "", + "cobblemon.species.mienshao.desc": "", + "cobblemon.species.druddigon.name": "", + "cobblemon.species.druddigon.desc": "", + "cobblemon.species.golett.name": "", + "cobblemon.species.golett.desc": "", + "cobblemon.species.golurk.name": "", + "cobblemon.species.golurk.desc": "", + "cobblemon.species.pawniard.name": "", + "cobblemon.species.pawniard.desc": "", + "cobblemon.species.bisharp.name": "", + "cobblemon.species.bisharp.desc": "", + "cobblemon.species.bouffalant.name": "", + "cobblemon.species.bouffalant.desc": "", + "cobblemon.species.rufflet.name": "", + "cobblemon.species.rufflet.desc": "", + "cobblemon.species.braviary.name": "", + "cobblemon.species.braviary.desc": "", + "cobblemon.species.vullaby.name": "", + "cobblemon.species.vullaby.desc": "", + "cobblemon.species.mandibuzz.name": "", + "cobblemon.species.mandibuzz.desc": "", + "cobblemon.species.heatmor.name": "", + "cobblemon.species.heatmor.desc": "", + "cobblemon.species.durant.name": "", + "cobblemon.species.durant.desc": "", + "cobblemon.species.deino.name": "", + "cobblemon.species.deino.desc": "", + "cobblemon.species.zweilous.name": "", + "cobblemon.species.zweilous.desc": "", + "cobblemon.species.hydreigon.name": "", + "cobblemon.species.hydreigon.desc": "", + "cobblemon.species.larvesta.name": "", + "cobblemon.species.larvesta.desc": "", + "cobblemon.species.volcarona.name": "", + "cobblemon.species.volcarona.desc": "", + "cobblemon.species.cobalion.name": "", + "cobblemon.species.cobalion.desc": "", + "cobblemon.species.terrakion.name": "", + "cobblemon.species.terrakion.desc": "", + "cobblemon.species.virizion.name": "", + "cobblemon.species.virizion.desc": "", + "cobblemon.species.tornadus.name": "", + "cobblemon.species.tornadus.desc": "", + "cobblemon.species.thundurus.name": "", + "cobblemon.species.thundurus.desc": "", + "cobblemon.species.reshiram.name": "", + "cobblemon.species.reshiram.desc": "", + "cobblemon.species.zekrom.name": "", + "cobblemon.species.zekrom.desc": "", + "cobblemon.species.landorus.name": "", + "cobblemon.species.landorus.desc": "", + "cobblemon.species.kyurem.name": "", + "cobblemon.species.kyurem.desc": "", + "cobblemon.species.keldeo.name": "", + "cobblemon.species.keldeo.desc": "", + "cobblemon.species.meloetta.name": "", + "cobblemon.species.meloetta.desc": "", + "cobblemon.species.genesect.name": "", + "cobblemon.species.genesect.desc": "", + "cobblemon.species.chespin.name": "", + "cobblemon.species.chespin.desc": "", + "cobblemon.species.quilladin.name": "", + "cobblemon.species.quilladin.desc": "", + "cobblemon.species.chesnaught.name": "", + "cobblemon.species.chesnaught.desc": "", + "cobblemon.species.fennekin.name": "", + "cobblemon.species.fennekin.desc": "", + "cobblemon.species.braixen.name": "", + "cobblemon.species.braixen.desc": "", + "cobblemon.species.delphox.name": "", + "cobblemon.species.delphox.desc": "", + "cobblemon.species.froakie.name": "", + "cobblemon.species.froakie.desc": "", + "cobblemon.species.frogadier.name": "", + "cobblemon.species.frogadier.desc": "", + "cobblemon.species.greninja.name": "", + "cobblemon.species.greninja.desc": "", + "cobblemon.species.bunnelby.name": "", + "cobblemon.species.bunnelby.desc": "", + "cobblemon.species.diggersby.name": "", + "cobblemon.species.diggersby.desc": "", + "cobblemon.species.fletchling.name": "", + "cobblemon.species.fletchling.desc": "", + "cobblemon.species.fletchinder.name": "", + "cobblemon.species.fletchinder.desc": "", + "cobblemon.species.talonflame.name": "", + "cobblemon.species.talonflame.desc": "", + "cobblemon.species.scatterbug.name": "", + "cobblemon.species.scatterbug.desc": "", + "cobblemon.species.spewpa.name": "", + "cobblemon.species.spewpa.desc": "", + "cobblemon.species.vivillon.name": "", + "cobblemon.species.vivillon.desc": "", + "cobblemon.species.litleo.name": "", + "cobblemon.species.litleo.desc": "", + "cobblemon.species.pyroar.name": "", + "cobblemon.species.pyroar.desc": "", + "cobblemon.species.flabebe.name": "", + "cobblemon.species.flabebe.desc": "", + "cobblemon.species.floette.name": "", + "cobblemon.species.floette.desc": "", + "cobblemon.species.florges.name": "", + "cobblemon.species.florges.desc": "", + "cobblemon.species.skiddo.name": "", + "cobblemon.species.skiddo.desc": "", + "cobblemon.species.gogoat.name": "", + "cobblemon.species.gogoat.desc": "", + "cobblemon.species.pancham.name": "", + "cobblemon.species.pancham.desc": "", + "cobblemon.species.pangoro.name": "", + "cobblemon.species.pangoro.desc": "", + "cobblemon.species.furfrou.name": "", + "cobblemon.species.furfrou.desc": "", + "cobblemon.species.espurr.name": "", + "cobblemon.species.espurr.desc": "", + "cobblemon.species.meowstic.name": "", + "cobblemon.species.meowstic.desc": "", + "cobblemon.species.honedge.name": "", + "cobblemon.species.honedge.desc": "", + "cobblemon.species.doublade.name": "", + "cobblemon.species.doublade.desc": "", + "cobblemon.species.aegislash.name": "", + "cobblemon.species.aegislash.desc": "", + "cobblemon.species.spritzee.name": "", + "cobblemon.species.spritzee.desc": "", + "cobblemon.species.aromatisse.name": "", + "cobblemon.species.aromatisse.desc": "", + "cobblemon.species.swirlix.name": "", + "cobblemon.species.swirlix.desc": "", + "cobblemon.species.slurpuff.name": "", + "cobblemon.species.slurpuff.desc": "", + "cobblemon.species.inkay.name": "", + "cobblemon.species.inkay.desc": "", + "cobblemon.species.malamar.name": "", + "cobblemon.species.malamar.desc": "", + "cobblemon.species.binacle.name": "", + "cobblemon.species.binacle.desc": "", + "cobblemon.species.barbaracle.name": "", + "cobblemon.species.barbaracle.desc": "", + "cobblemon.species.skrelp.name": "", + "cobblemon.species.skrelp.desc": "", + "cobblemon.species.dragalge.name": "", + "cobblemon.species.dragalge.desc": "", + "cobblemon.species.clauncher.name": "", + "cobblemon.species.clauncher.desc": "", + "cobblemon.species.clawitzer.name": "", + "cobblemon.species.clawitzer.desc": "", + "cobblemon.species.helioptile.name": "", + "cobblemon.species.helioptile.desc": "", + "cobblemon.species.heliolisk.name": "", + "cobblemon.species.heliolisk.desc": "", + "cobblemon.species.tyrunt.name": "", + "cobblemon.species.tyrunt.desc": "", + "cobblemon.species.tyrantrum.name": "", + "cobblemon.species.tyrantrum.desc": "", + "cobblemon.species.amaura.name": "", + "cobblemon.species.amaura.desc": "", + "cobblemon.species.aurorus.name": "", + "cobblemon.species.aurorus.desc": "", + "cobblemon.species.sylveon.name": "", + "cobblemon.species.sylveon.desc": "", + "cobblemon.species.hawlucha.name": "", + "cobblemon.species.hawlucha.desc": "", + "cobblemon.species.dedenne.name": "", + "cobblemon.species.dedenne.desc": "", + "cobblemon.species.carbink.name": "", + "cobblemon.species.carbink.desc": "", + "cobblemon.species.goomy.name": "", + "cobblemon.species.goomy.desc": "", + "cobblemon.species.sliggoo.name": "", + "cobblemon.species.sliggoo.desc": "", + "cobblemon.species.goodra.name": "", + "cobblemon.species.goodra.desc": "", + "cobblemon.species.klefki.name": "", + "cobblemon.species.klefki.desc": "", + "cobblemon.species.phantump.name": "", + "cobblemon.species.phantump.desc": "", + "cobblemon.species.trevenant.name": "", + "cobblemon.species.trevenant.desc": "", + "cobblemon.species.pumpkaboo.name": "", + "cobblemon.species.pumpkaboo.desc": "", + "cobblemon.species.gourgeist.name": "", + "cobblemon.species.gourgeist.desc": "", + "cobblemon.species.bergmite.name": "", + "cobblemon.species.bergmite.desc": "", + "cobblemon.species.avalugg.name": "", + "cobblemon.species.avalugg.desc": "", + "cobblemon.species.noibat.name": "", + "cobblemon.species.noibat.desc": "", + "cobblemon.species.noivern.name": "", + "cobblemon.species.noivern.desc": "", + "cobblemon.species.xerneas.name": "", + "cobblemon.species.xerneas.desc": "", + "cobblemon.species.yveltal.name": "", + "cobblemon.species.yveltal.desc": "", + "cobblemon.species.zygarde.name": "", + "cobblemon.species.zygarde.desc": "", + "cobblemon.species.diancie.name": "", + "cobblemon.species.diancie.desc": "", + "cobblemon.species.hoopa.name": "", + "cobblemon.species.hoopa.desc": "", + "cobblemon.species.volcanion.name": "", + "cobblemon.species.volcanion.desc": "", + "cobblemon.species.rowlet.name": "", + "cobblemon.species.rowlet.desc": "", + "cobblemon.species.dartrix.name": "", + "cobblemon.species.dartrix.desc": "", + "cobblemon.species.decidueye.name": "", + "cobblemon.species.decidueye.desc": "", + "cobblemon.species.litten.name": "", + "cobblemon.species.litten.desc": "", + "cobblemon.species.torracat.name": "", + "cobblemon.species.torracat.desc": "", + "cobblemon.species.incineroar.name": "", + "cobblemon.species.incineroar.desc": "", + "cobblemon.species.popplio.name": "", + "cobblemon.species.popplio.desc": "", + "cobblemon.species.brionne.name": "", + "cobblemon.species.brionne.desc": "", + "cobblemon.species.primarina.name": "", + "cobblemon.species.primarina.desc": "", + "cobblemon.species.pikipek.name": "", + "cobblemon.species.pikipek.desc": "", + "cobblemon.species.trumbeak.name": "", + "cobblemon.species.trumbeak.desc": "", + "cobblemon.species.toucannon.name": "", + "cobblemon.species.toucannon.desc": "", + "cobblemon.species.yungoos.name": "", + "cobblemon.species.yungoos.desc": "", + "cobblemon.species.gumshoos.name": "", + "cobblemon.species.gumshoos.desc": "", + "cobblemon.species.grubbin.name": "", + "cobblemon.species.grubbin.desc": "", + "cobblemon.species.charjabug.name": "", + "cobblemon.species.charjabug.desc": "", + "cobblemon.species.vikavolt.name": "", + "cobblemon.species.vikavolt.desc": "", + "cobblemon.species.crabrawler.name": "", + "cobblemon.species.crabrawler.desc": "", + "cobblemon.species.crabominable.name": "", + "cobblemon.species.crabominable.desc": "", + "cobblemon.species.oricorio.name": "", + "cobblemon.species.oricorio.desc": "", + "cobblemon.species.cutiefly.name": "", + "cobblemon.species.cutiefly.desc": "", + "cobblemon.species.ribombee.name": "", + "cobblemon.species.ribombee.desc": "", + "cobblemon.species.rockruff.name": "", + "cobblemon.species.rockruff.desc": "", + "cobblemon.species.lycanroc.name": "", + "cobblemon.species.lycanroc.desc": "", + "cobblemon.species.wishiwashi.name": "", + "cobblemon.species.wishiwashi.desc": "", + "cobblemon.species.mareanie.name": "", + "cobblemon.species.mareanie.desc": "", + "cobblemon.species.toxapex.name": "", + "cobblemon.species.toxapex.desc": "", + "cobblemon.species.mudbray.name": "", + "cobblemon.species.mudbray.desc": "", + "cobblemon.species.mudsdale.name": "", + "cobblemon.species.mudsdale.desc": "", + "cobblemon.species.dewpider.name": "", + "cobblemon.species.dewpider.desc": "", + "cobblemon.species.araquanid.name": "", + "cobblemon.species.araquanid.desc": "", + "cobblemon.species.fomantis.name": "", + "cobblemon.species.fomantis.desc": "", + "cobblemon.species.lurantis.name": "", + "cobblemon.species.lurantis.desc": "", + "cobblemon.species.morelull.name": "", + "cobblemon.species.morelull.desc": "", + "cobblemon.species.shiinotic.name": "", + "cobblemon.species.shiinotic.desc": "", + "cobblemon.species.salandit.name": "", + "cobblemon.species.salandit.desc": "", + "cobblemon.species.salazzle.name": "", + "cobblemon.species.salazzle.desc": "", + "cobblemon.species.stufful.name": "", + "cobblemon.species.stufful.desc": "", + "cobblemon.species.bewear.name": "", + "cobblemon.species.bewear.desc": "", + "cobblemon.species.bounsweet.name": "", + "cobblemon.species.bounsweet.desc": "", + "cobblemon.species.steenee.name": "", + "cobblemon.species.steenee.desc": "", + "cobblemon.species.tsareena.name": "", + "cobblemon.species.tsareena.desc": "", + "cobblemon.species.comfey.name": "", + "cobblemon.species.comfey.desc": "", + "cobblemon.species.oranguru.name": "", + "cobblemon.species.oranguru.desc": "", + "cobblemon.species.passimian.name": "", + "cobblemon.species.passimian.desc": "", + "cobblemon.species.wimpod.name": "", + "cobblemon.species.wimpod.desc": "", + "cobblemon.species.golisopod.name": "", + "cobblemon.species.golisopod.desc": "", + "cobblemon.species.sandygast.name": "", + "cobblemon.species.sandygast.desc": "", + "cobblemon.species.palossand.name": "", + "cobblemon.species.palossand.desc": "", + "cobblemon.species.pyukumuku.name": "", + "cobblemon.species.pyukumuku.desc": "", + "cobblemon.species.typenull.name": "", + "cobblemon.species.typenull.desc": "", + "cobblemon.species.silvally.name": "", + "cobblemon.species.silvally.desc": "", + "cobblemon.species.minior.name": "", + "cobblemon.species.minior.desc": "", + "cobblemon.species.komala.name": "", + "cobblemon.species.komala.desc": "", + "cobblemon.species.turtonator.name": "", + "cobblemon.species.turtonator.desc": "", + "cobblemon.species.togedemaru.name": "", + "cobblemon.species.togedemaru.desc": "", + "cobblemon.species.mimikyu.name": "", + "cobblemon.species.mimikyu.desc": "", + "cobblemon.species.bruxish.name": "", + "cobblemon.species.bruxish.desc": "", + "cobblemon.species.drampa.name": "", + "cobblemon.species.drampa.desc": "", + "cobblemon.species.dhelmise.name": "", + "cobblemon.species.dhelmise.desc": "", + "cobblemon.species.jangmoo.name": "", + "cobblemon.species.jangmoo.desc": "", + "cobblemon.species.hakamoo.name": "", + "cobblemon.species.hakamoo.desc": "", + "cobblemon.species.kommoo.name": "", + "cobblemon.species.kommoo.desc": "", + "cobblemon.species.tapukoko.name": "", + "cobblemon.species.tapukoko.desc": "", + "cobblemon.species.tapulele.name": "", + "cobblemon.species.tapulele.desc": "", + "cobblemon.species.tapubulu.name": "", + "cobblemon.species.tapubulu.desc": "", + "cobblemon.species.tapufini.name": "", + "cobblemon.species.tapufini.desc": "", + "cobblemon.species.cosmog.name": "", + "cobblemon.species.cosmog.desc": "", + "cobblemon.species.cosmoem.name": "", + "cobblemon.species.cosmoem.desc": "", + "cobblemon.species.solgaleo.name": "", + "cobblemon.species.solgaleo.desc": "", + "cobblemon.species.lunala.name": "", + "cobblemon.species.lunala.desc": "", + "cobblemon.species.nihilego.name": "", + "cobblemon.species.nihilego.desc": "", + "cobblemon.species.buzzwole.name": "", + "cobblemon.species.buzzwole.desc": "", + "cobblemon.species.pheromosa.name": "", + "cobblemon.species.pheromosa.desc": "", + "cobblemon.species.xurkitree.name": "", + "cobblemon.species.xurkitree.desc": "", + "cobblemon.species.celesteela.name": "", + "cobblemon.species.celesteela.desc": "", + "cobblemon.species.kartana.name": "", + "cobblemon.species.kartana.desc": "", + "cobblemon.species.guzzlord.name": "", + "cobblemon.species.guzzlord.desc": "", + "cobblemon.species.necrozma.name": "", + "cobblemon.species.necrozma.desc": "", + "cobblemon.species.magearna.name": "", + "cobblemon.species.magearna.desc": "", + "cobblemon.species.marshadow.name": "", + "cobblemon.species.marshadow.desc": "", + "cobblemon.species.poipole.name": "", + "cobblemon.species.poipole.desc": "", + "cobblemon.species.naganadel.name": "", + "cobblemon.species.naganadel.desc": "", + "cobblemon.species.stakataka.name": "", + "cobblemon.species.stakataka.desc": "", + "cobblemon.species.blacephalon.name": "", + "cobblemon.species.blacephalon.desc": "", + "cobblemon.species.zeraora.name": "", + "cobblemon.species.zeraora.desc": "", + "cobblemon.species.meltan.name": "", + "cobblemon.species.meltan.desc": "", + "cobblemon.species.melmetal.name": "", + "cobblemon.species.melmetal.desc": "", + "cobblemon.species.grookey.name": "", + "cobblemon.species.grookey.desc": "", + "cobblemon.species.thwackey.name": "", + "cobblemon.species.thwackey.desc": "", + "cobblemon.species.rillaboom.name": "", + "cobblemon.species.rillaboom.desc": "", + "cobblemon.species.scorbunny.name": "", + "cobblemon.species.scorbunny.desc": "", + "cobblemon.species.raboot.name": "", + "cobblemon.species.raboot.desc": "", + "cobblemon.species.cinderace.name": "", + "cobblemon.species.cinderace.desc": "", + "cobblemon.species.sobble.name": "", + "cobblemon.species.sobble.desc": "", + "cobblemon.species.drizzile.name": "", + "cobblemon.species.drizzile.desc": "", + "cobblemon.species.inteleon.name": "", + "cobblemon.species.inteleon.desc": "", + "cobblemon.species.skwovet.name": "", + "cobblemon.species.skwovet.desc": "", + "cobblemon.species.greedent.name": "", + "cobblemon.species.greedent.desc": "", + "cobblemon.species.rookidee.name": "", + "cobblemon.species.rookidee.desc": "", + "cobblemon.species.corvisquire.name": "", + "cobblemon.species.corvisquire.desc": "", + "cobblemon.species.corviknight.name": "", + "cobblemon.species.corviknight.desc": "", + "cobblemon.species.blipbug.name": "", + "cobblemon.species.blipbug.desc": "", + "cobblemon.species.dottler.name": "", + "cobblemon.species.dottler.desc": "", + "cobblemon.species.orbeetle.name": "", + "cobblemon.species.orbeetle.desc": "", + "cobblemon.species.nickit.name": "", + "cobblemon.species.nickit.desc": "", + "cobblemon.species.thievul.name": "", + "cobblemon.species.thievul.desc": "", + "cobblemon.species.gossifleur.name": "", + "cobblemon.species.gossifleur.desc": "", + "cobblemon.species.eldegoss.name": "", + "cobblemon.species.eldegoss.desc": "", + "cobblemon.species.wooloo.name": "", + "cobblemon.species.wooloo.desc": "", + "cobblemon.species.dubwool.name": "", + "cobblemon.species.dubwool.desc": "", + "cobblemon.species.chewtle.name": "", + "cobblemon.species.chewtle.desc": "", + "cobblemon.species.drednaw.name": "", + "cobblemon.species.drednaw.desc": "", + "cobblemon.species.yamper.name": "", + "cobblemon.species.yamper.desc": "", + "cobblemon.species.boltund.name": "", + "cobblemon.species.boltund.desc": "", + "cobblemon.species.rolycoly.name": "", + "cobblemon.species.rolycoly.desc": "", + "cobblemon.species.carkol.name": "", + "cobblemon.species.carkol.desc": "", + "cobblemon.species.coalossal.name": "", + "cobblemon.species.coalossal.desc": "", + "cobblemon.species.applin.name": "", + "cobblemon.species.applin.desc": "", + "cobblemon.species.flapple.name": "", + "cobblemon.species.flapple.desc": "", + "cobblemon.species.appletun.name": "", + "cobblemon.species.appletun.desc": "", + "cobblemon.species.silicobra.name": "", + "cobblemon.species.silicobra.desc": "", + "cobblemon.species.sandaconda.name": "", + "cobblemon.species.sandaconda.desc": "", + "cobblemon.species.cramorant.name": "", + "cobblemon.species.cramorant.desc": "", + "cobblemon.species.arrokuda.name": "", + "cobblemon.species.arrokuda.desc": "", + "cobblemon.species.barraskewda.name": "", + "cobblemon.species.barraskewda.desc": "", + "cobblemon.species.toxel.name": "", + "cobblemon.species.toxel.desc": "", + "cobblemon.species.toxtricity.name": "", + "cobblemon.species.toxtricity.desc": "", + "cobblemon.species.sizzlipede.name": "", + "cobblemon.species.sizzlipede.desc": "", + "cobblemon.species.centiskorch.name": "", + "cobblemon.species.centiskorch.desc": "", + "cobblemon.species.clobbopus.name": "", + "cobblemon.species.clobbopus.desc": "", + "cobblemon.species.grapploct.name": "", + "cobblemon.species.grapploct.desc": "", + "cobblemon.species.sinistea.name": "", + "cobblemon.species.sinistea.desc": "", + "cobblemon.species.polteageist.name": "", + "cobblemon.species.polteageist.desc": "", + "cobblemon.species.hatenna.name": "", + "cobblemon.species.hatenna.desc": "", + "cobblemon.species.hattrem.name": "", + "cobblemon.species.hattrem.desc": "", + "cobblemon.species.hatterene.name": "", + "cobblemon.species.hatterene.desc": "", + "cobblemon.species.impidimp.name": "", + "cobblemon.species.impidimp.desc": "", + "cobblemon.species.morgrem.name": "", + "cobblemon.species.morgrem.desc": "", + "cobblemon.species.grimmsnarl.name": "", + "cobblemon.species.grimmsnarl.desc": "", + "cobblemon.species.obstagoon.name": "", + "cobblemon.species.obstagoon.desc": "", + "cobblemon.species.perrserker.name": "", + "cobblemon.species.perrserker.desc": "", + "cobblemon.species.cursola.name": "", + "cobblemon.species.cursola.desc": "", + "cobblemon.species.sirfetchd.name": "", + "cobblemon.species.sirfetchd.desc": "", + "cobblemon.species.mrrime.name": "", + "cobblemon.species.mrrime.desc": "", + "cobblemon.species.runerigus.name": "", + "cobblemon.species.runerigus.desc": "", + "cobblemon.species.milcery.name": "", + "cobblemon.species.milcery.desc": "", + "cobblemon.species.alcremie.name": "", + "cobblemon.species.alcremie.desc": "", + "cobblemon.species.falinks.name": "", + "cobblemon.species.falinks.desc": "", + "cobblemon.species.pincurchin.name": "", + "cobblemon.species.pincurchin.desc": "", + "cobblemon.species.snom.name": "", + "cobblemon.species.snom.desc": "", + "cobblemon.species.frosmoth.name": "", + "cobblemon.species.frosmoth.desc": "", + "cobblemon.species.stonjourner.name": "", + "cobblemon.species.stonjourner.desc": "", + "cobblemon.species.eiscue.name": "", + "cobblemon.species.eiscue.desc": "", + "cobblemon.species.indeedee.name": "", + "cobblemon.species.indeedee.desc": "", + "cobblemon.species.morpeko.name": "", + "cobblemon.species.morpeko.desc": "", + "cobblemon.species.cufant.name": "", + "cobblemon.species.cufant.desc": "", + "cobblemon.species.copperajah.name": "", + "cobblemon.species.copperajah.desc": "", + "cobblemon.species.dracozolt.name": "", + "cobblemon.species.dracozolt.desc": "", + "cobblemon.species.arctozolt.name": "", + "cobblemon.species.arctozolt.desc": "", + "cobblemon.species.dracovish.name": "", + "cobblemon.species.dracovish.desc": "", + "cobblemon.species.arctovish.name": "", + "cobblemon.species.arctovish.desc": "", + "cobblemon.species.duraludon.name": "", + "cobblemon.species.duraludon.desc": "", + "cobblemon.species.dreepy.name": "", + "cobblemon.species.dreepy.desc": "", + "cobblemon.species.drakloak.name": "", + "cobblemon.species.drakloak.desc": "", + "cobblemon.species.dragapult.name": "", + "cobblemon.species.dragapult.desc": "", + "cobblemon.species.zacian.name": "", + "cobblemon.species.zacian.desc": "", + "cobblemon.species.zamazenta.name": "", + "cobblemon.species.zamazenta.desc": "", + "cobblemon.species.eternatus.name": "", + "cobblemon.species.eternatus.desc": "", + "cobblemon.species.kubfu.name": "", + "cobblemon.species.kubfu.desc": "", + "cobblemon.species.urshifu.name": "", + "cobblemon.species.urshifu.desc": "", + "cobblemon.species.zarude.name": "", + "cobblemon.species.zarude.desc": "", + "cobblemon.species.regieleki.name": "", + "cobblemon.species.regieleki.desc": "", + "cobblemon.species.regidrago.name": "", + "cobblemon.species.regidrago.desc": "", + "cobblemon.species.glastrier.name": "", + "cobblemon.species.glastrier.desc": "", + "cobblemon.species.spectrier.name": "", + "cobblemon.species.spectrier.desc": "", + "cobblemon.species.calyrex.name": "", + "cobblemon.species.calyrex.desc": "", + "cobblemon.species.wyrdeer.name": "", + "cobblemon.species.wyrdeer.desc": "", + "cobblemon.species.kleavor.name": "", + "cobblemon.species.kleavor.desc": "", + "cobblemon.species.ursaluna.name": "", + "cobblemon.species.ursaluna.desc": "", + "cobblemon.species.basculegion.name": "", + "cobblemon.species.basculegion.desc": "", + "cobblemon.species.sneasler.name": "", + "cobblemon.species.sneasler.desc": "", + "cobblemon.species.overqwil.name": "", + "cobblemon.species.overqwil.desc": "", + "cobblemon.species.enamorus.name": "", + "cobblemon.species.enamorus.desc": "", + "cobblemon.species.sprigatito.name": "", + "cobblemon.species.sprigatito.desc": "", + "cobblemon.species.floragato.name": "", + "cobblemon.species.floragato.desc": "", + "cobblemon.species.meowscarada.name": "", + "cobblemon.species.meowscarada.desc": "", + "cobblemon.species.fuecoco.name": "", + "cobblemon.species.fuecoco.desc": "", + "cobblemon.species.crocalor.name": "", + "cobblemon.species.crocalor.desc": "", + "cobblemon.species.skeledirge.name": "", + "cobblemon.species.skeledirge.desc": "", + "cobblemon.species.quaxly.name": "", + "cobblemon.species.quaxly.desc": "", + "cobblemon.species.quaxwell.name": "", + "cobblemon.species.quaxwell.desc": "", + "cobblemon.species.quaquaval.name": "", + "cobblemon.species.quaquaval.desc": "", + "cobblemon.species.lechonk.name": "", + "cobblemon.species.lechonk.desc": "", + "cobblemon.species.oinkologne.name": "", + "cobblemon.species.oinkologne.desc": "", + "cobblemon.species.tarountula.name": "", + "cobblemon.species.tarountula.desc": "", + "cobblemon.species.spidops.name": "", + "cobblemon.species.spidops.desc": "", + "cobblemon.species.nymble.name": "", + "cobblemon.species.nymble.desc": "", + "cobblemon.species.lokix.name": "", + "cobblemon.species.lokix.desc": "", + "cobblemon.species.pawmi.name": "", + "cobblemon.species.pawmi.desc": "", + "cobblemon.species.pawmo.name": "", + "cobblemon.species.pawmo.desc": "", + "cobblemon.species.pawmot.name": "", + "cobblemon.species.pawmot.desc": "", + "cobblemon.species.tandemaus.name": "", + "cobblemon.species.tandemaus.desc": "", + "cobblemon.species.maushold.name": "", + "cobblemon.species.maushold.desc": "", + "cobblemon.species.fidough.name": "", + "cobblemon.species.fidough.desc": "", + "cobblemon.species.dachsbun.name": "", + "cobblemon.species.dachsbun.desc": "", + "cobblemon.species.smoliv.name": "", + "cobblemon.species.smoliv.desc": "", + "cobblemon.species.dolliv.name": "", + "cobblemon.species.dolliv.desc": "", + "cobblemon.species.arboliva.name": "", + "cobblemon.species.arboliva.desc": "", + "cobblemon.species.squawkabilly.name": "", + "cobblemon.species.squawkabilly.desc": "", + "cobblemon.species.nacli.name": "", + "cobblemon.species.nacli.desc": "", + "cobblemon.species.naclstack.name": "", + "cobblemon.species.naclstack.desc": "", + "cobblemon.species.garganacl.name": "", + "cobblemon.species.garganacl.desc": "", + "cobblemon.species.charcadet.name": "", + "cobblemon.species.charcadet.desc": "", + "cobblemon.species.armarouge.name": "", + "cobblemon.species.armarouge.desc": "", + "cobblemon.species.ceruledge.name": "", + "cobblemon.species.ceruledge.desc": "", + "cobblemon.species.tadbulb.name": "", + "cobblemon.species.tadbulb.desc": "", + "cobblemon.species.bellibolt.name": "", + "cobblemon.species.bellibolt.desc": "", + "cobblemon.species.wattrel.name": "", + "cobblemon.species.wattrel.desc": "", + "cobblemon.species.kilowattrel.name": "", + "cobblemon.species.kilowattrel.desc": "", + "cobblemon.species.maschiff.name": "", + "cobblemon.species.maschiff.desc": "", + "cobblemon.species.mabosstiff.name": "", + "cobblemon.species.mabosstiff.desc": "", + "cobblemon.species.shroodle.name": "", + "cobblemon.species.shroodle.desc": "", + "cobblemon.species.grafaiai.name": "", + "cobblemon.species.grafaiai.desc": "", + "cobblemon.species.bramblin.name": "", + "cobblemon.species.bramblin.desc": "", + "cobblemon.species.brambleghast.name": "", + "cobblemon.species.brambleghast.desc": "", + "cobblemon.species.toedscool.name": "", + "cobblemon.species.toedscool.desc": "", + "cobblemon.species.toedscruel.name": "", + "cobblemon.species.toedscruel.desc": "", + "cobblemon.species.klawf.name": "", + "cobblemon.species.klawf.desc": "", + "cobblemon.species.capsakid.name": "", + "cobblemon.species.capsakid.desc": "", + "cobblemon.species.scovillain.name": "", + "cobblemon.species.scovillain.desc": "", + "cobblemon.species.rellor.name": "", + "cobblemon.species.rellor.desc": "", + "cobblemon.species.rabsca.name": "", + "cobblemon.species.rabsca.desc": "", + "cobblemon.species.flittle.name": "", + "cobblemon.species.flittle.desc": "", + "cobblemon.species.espathra.name": "", + "cobblemon.species.espathra.desc": "", + "cobblemon.species.tinkatink.name": "", + "cobblemon.species.tinkatink.desc": "", + "cobblemon.species.tinkatuff.name": "", + "cobblemon.species.tinkatuff.desc": "", + "cobblemon.species.tinkaton.name": "", + "cobblemon.species.tinkaton.desc": "", + "cobblemon.species.wiglett.name": "", + "cobblemon.species.wiglett.desc": "", + "cobblemon.species.wugtrio.name": "", + "cobblemon.species.wugtrio.desc": "", + "cobblemon.species.bombirdier.name": "", + "cobblemon.species.bombirdier.desc": "", + "cobblemon.species.finizen.name": "", + "cobblemon.species.finizen.desc": "", + "cobblemon.species.palafin.name": "", + "cobblemon.species.palafin.desc": "", + "cobblemon.species.varoom.name": "", + "cobblemon.species.varoom.desc": "", + "cobblemon.species.revavroom.name": "", + "cobblemon.species.revavroom.desc": "", + "cobblemon.species.cyclizar.name": "", + "cobblemon.species.cyclizar.desc": "", + "cobblemon.species.orthworm.name": "", + "cobblemon.species.orthworm.desc": "", + "cobblemon.species.glimmet.name": "", + "cobblemon.species.glimmet.desc": "", + "cobblemon.species.glimmora.name": "", + "cobblemon.species.glimmora.desc": "", + "cobblemon.species.greavard.name": "", + "cobblemon.species.greavard.desc": "", + "cobblemon.species.houndstone.name": "", + "cobblemon.species.houndstone.desc": "", + "cobblemon.species.flamigo.name": "", + "cobblemon.species.flamigo.desc": "", + "cobblemon.species.cetoddle.name": "", + "cobblemon.species.cetoddle.desc": "", + "cobblemon.species.cetitan.name": "", + "cobblemon.species.cetitan.desc": "", + "cobblemon.species.veluza.name": "", + "cobblemon.species.veluza.desc": "", + "cobblemon.species.dondozo.name": "", + "cobblemon.species.dondozo.desc": "", + "cobblemon.species.tatsugiri.name": "", + "cobblemon.species.tatsugiri.desc": "", + "cobblemon.species.annihilape.name": "", + "cobblemon.species.annihilape.desc": "", + "cobblemon.species.clodsire.name": "", + "cobblemon.species.clodsire.desc": "", + "cobblemon.species.farigiraf.name": "", + "cobblemon.species.farigiraf.desc": "", + "cobblemon.species.dudunsparce.name": "", + "cobblemon.species.dudunsparce.desc": "", + "cobblemon.species.kingambit.name": "", + "cobblemon.species.kingambit.desc": "", + "cobblemon.species.greattusk.name": "", + "cobblemon.species.greattusk.desc": "", + "cobblemon.species.screamtail.name": "", + "cobblemon.species.screamtail.desc": "", + "cobblemon.species.brutebonnet.name": "", + "cobblemon.species.brutebonnet.desc": "", + "cobblemon.species.fluttermane.name": "", + "cobblemon.species.fluttermane.desc": "", + "cobblemon.species.slitherwing.name": "", + "cobblemon.species.slitherwing.desc": "", + "cobblemon.species.sandyshocks.name": "", + "cobblemon.species.sandyshocks.desc": "", + "cobblemon.species.irontreads.name": "", + "cobblemon.species.irontreads.desc": "", + "cobblemon.species.ironbundle.name": "", + "cobblemon.species.ironbundle.desc": "", + "cobblemon.species.ironhands.name": "", + "cobblemon.species.ironhands.desc": "", + "cobblemon.species.ironjugulis.name": "", + "cobblemon.species.ironjugulis.desc": "", + "cobblemon.species.ironmoth.name": "", + "cobblemon.species.ironmoth.desc": "", + "cobblemon.species.ironthorns.name": "", + "cobblemon.species.ironthorns.desc": "", + "cobblemon.species.frigibax.name": "", + "cobblemon.species.frigibax.desc": "", + "cobblemon.species.arctibax.name": "", + "cobblemon.species.arctibax.desc": "", + "cobblemon.species.baxcalibur.name": "", + "cobblemon.species.baxcalibur.desc": "", + "cobblemon.species.gimmighoul.name": "", + "cobblemon.species.gimmighoul.desc": "", + "cobblemon.species.gholdengo.name": "", + "cobblemon.species.gholdengo.desc": "", + "cobblemon.species.wochien.name": "", + "cobblemon.species.wochien.desc": "", + "cobblemon.species.chienpao.name": "", + "cobblemon.species.chienpao.desc": "", + "cobblemon.species.tinglu.name": "", + "cobblemon.species.tinglu.desc": "", + "cobblemon.species.chiyu.name": "", + "cobblemon.species.chiyu.desc": "", + "cobblemon.species.roaringmoon.name": "", + "cobblemon.species.roaringmoon.desc": "", + "cobblemon.species.ironvaliant.name": "", + "cobblemon.species.ironvaliant.desc": "", + "cobblemon.species.koraidon.name": "", + "cobblemon.species.koraidon.desc": "", + "cobblemon.species.miraidon.name": "", + "cobblemon.species.miraidon.desc": "", + "cobblemon.species.walkingwake.name": "", + "cobblemon.species.walkingwake.desc": "", + "cobblemon.species.ironleaves.name": "", + "cobblemon.species.ironleaves.desc": "", + "cobblemon.species.dipplin.name": "", + "cobblemon.species.dipplin.desc": "", + "cobblemon.species.poltchageist.name": "", + "cobblemon.species.poltchageist.desc": "", + "cobblemon.species.sinistcha.name": "", + "cobblemon.species.sinistcha.desc": "", + "cobblemon.species.okidogi.name": "", + "cobblemon.species.okidogi.desc": "", + "cobblemon.species.munkidori.name": "", + "cobblemon.species.munkidori.desc": "", + "cobblemon.species.fezandipiti.name": "", + "cobblemon.species.fezandipiti.desc": "", + "cobblemon.species.ogerpon.name": "", + "cobblemon.species.ogerpon.desc": "", + "cobblemon.species.archaludon.name": "", + "cobblemon.species.archaludon.desc": "", + "cobblemon.species.hydrapple.name": "", + "cobblemon.species.hydrapple.desc": "", + "cobblemon.species.gougingfire.name": "", + "cobblemon.species.gougingfire.desc": "", + "cobblemon.species.ragingbolt.name": "", + "cobblemon.species.ragingbolt.desc": "", + "cobblemon.species.ironboulder.name": "", + "cobblemon.species.ironboulder.desc": "", + "cobblemon.species.ironcrown.name": "", + "cobblemon.species.ironcrown.desc": "", + "cobblemon.species.terapagos.name": "", + "cobblemon.species.terapagos.desc": "", + "cobblemon.species.pecharunt.name": "", + "cobblemon.species.pecharunt.desc": "", + "cobblemon.ability.adaptability": "", + "cobblemon.ability.adaptability.desc": "", + "cobblemon.ability.aerilate": "", + "cobblemon.ability.aerilate.desc": "", + "cobblemon.ability.aftermath": "", + "cobblemon.ability.aftermath.desc": "", + "cobblemon.ability.airlock": "", + "cobblemon.ability.airlock.desc": "", + "cobblemon.ability.analytic": "", + "cobblemon.ability.analytic.desc": "", + "cobblemon.ability.angerpoint": "", + "cobblemon.ability.angerpoint.desc": "", + "cobblemon.ability.angershell": "", + "cobblemon.ability.angershell.desc": "", + "cobblemon.ability.anticipation": "", + "cobblemon.ability.anticipation.desc": "", + "cobblemon.ability.arenatrap": "", + "cobblemon.ability.arenatrap.desc": "", + "cobblemon.ability.armortail": "", + "cobblemon.ability.armortail.desc": "", + "cobblemon.ability.aromaveil": "", + "cobblemon.ability.aromaveil.desc": "", + "cobblemon.ability.asoneglastrier": "", + "cobblemon.ability.asoneglastrier.desc": "", + "cobblemon.ability.asonespectrier": "", + "cobblemon.ability.asonespectrier.desc": "", + "cobblemon.ability.aurabreak": "", + "cobblemon.ability.aurabreak.desc": "", + "cobblemon.ability.baddreams": "", + "cobblemon.ability.baddreams.desc": "", + "cobblemon.ability.ballfetch": "", + "cobblemon.ability.ballfetch.desc": "", + "cobblemon.ability.battery": "", + "cobblemon.ability.battery.desc": "", + "cobblemon.ability.battlearmor": "", + "cobblemon.ability.battlearmor.desc": "", + "cobblemon.ability.battlebond": "", + "cobblemon.ability.battlebond.desc": "", + "cobblemon.ability.beadsofruin": "", + "cobblemon.ability.beadsofruin.desc": "", + "cobblemon.ability.beastboost": "", + "cobblemon.ability.beastboost.desc": "", + "cobblemon.ability.berserk": "", + "cobblemon.ability.berserk.desc": "", + "cobblemon.ability.bigpecks": "", + "cobblemon.ability.bigpecks.desc": "", + "cobblemon.ability.blaze": "", + "cobblemon.ability.blaze.desc": "", + "cobblemon.ability.bulletproof": "", + "cobblemon.ability.bulletproof.desc": "", + "cobblemon.ability.cheekpouch": "", + "cobblemon.ability.cheekpouch.desc": "", + "cobblemon.ability.chillingneigh": "", + "cobblemon.ability.chillingneigh.desc": "", + "cobblemon.ability.chlorophyll": "", + "cobblemon.ability.chlorophyll.desc": "", + "cobblemon.ability.clearbody": "", + "cobblemon.ability.clearbody.desc": "", + "cobblemon.ability.cloudnine": "", + "cobblemon.ability.cloudnine.desc": "", + "cobblemon.ability.colorchange": "", + "cobblemon.ability.colorchange.desc": "", + "cobblemon.ability.comatose": "", + "cobblemon.ability.comatose.desc": "", + "cobblemon.ability.commander": "", + "cobblemon.ability.commander.desc": "", + "cobblemon.ability.competitive": "", + "cobblemon.ability.competitive.desc": "", + "cobblemon.ability.compoundeyes": "", + "cobblemon.ability.compoundeyes.desc": "", + "cobblemon.ability.contrary": "", + "cobblemon.ability.contrary.desc": "", + "cobblemon.ability.corrosion": "", + "cobblemon.ability.corrosion.desc": "", + "cobblemon.ability.costar": "", + "cobblemon.ability.costar.desc": "", + "cobblemon.ability.cottondown": "", + "cobblemon.ability.cottondown.desc": "", + "cobblemon.ability.cudchew": "", + "cobblemon.ability.cudchew.desc": "", + "cobblemon.ability.curiousmedicine": "", + "cobblemon.ability.curiousmedicine.desc": "", + "cobblemon.ability.cursedbody": "", + "cobblemon.ability.cursedbody.desc": "", + "cobblemon.ability.cutecharm": "", + "cobblemon.ability.cutecharm.desc": "", + "cobblemon.ability.damp": "", + "cobblemon.ability.damp.desc": "", + "cobblemon.ability.dancer": "", + "cobblemon.ability.dancer.desc": "", + "cobblemon.ability.darkaura": "", + "cobblemon.ability.darkaura.desc": "", + "cobblemon.ability.dauntlessshield": "", + "cobblemon.ability.dauntlessshield.desc": "", + "cobblemon.ability.dazzling": "", + "cobblemon.ability.dazzling.desc": "", + "cobblemon.ability.defeatist": "", + "cobblemon.ability.defeatist.desc": "", + "cobblemon.ability.defiant": "", + "cobblemon.ability.defiant.desc": "", + "cobblemon.ability.deltastream": "", + "cobblemon.ability.deltastream.desc": "", + "cobblemon.ability.desolateland": "", + "cobblemon.ability.desolateland.desc": "", + "cobblemon.ability.disguise": "", + "cobblemon.ability.disguise.desc": "", + "cobblemon.ability.download": "", + "cobblemon.ability.download.desc": "", + "cobblemon.ability.dragonsmaw": "", + "cobblemon.ability.dragonsmaw.desc": "", + "cobblemon.ability.drizzle": "", + "cobblemon.ability.drizzle.desc": "", + "cobblemon.ability.drought": "", + "cobblemon.ability.drought.desc": "", + "cobblemon.ability.dryskin": "", + "cobblemon.ability.dryskin.desc": "", + "cobblemon.ability.earlybird": "", + "cobblemon.ability.earlybird.desc": "", + "cobblemon.ability.eartheater": "", + "cobblemon.ability.eartheater.desc": "", + "cobblemon.ability.effectspore": "", + "cobblemon.ability.effectspore.desc": "", + "cobblemon.ability.electricsurge": "", + "cobblemon.ability.electricsurge.desc": "", + "cobblemon.ability.electromorphosis": "", + "cobblemon.ability.electromorphosis.desc": "", + "cobblemon.ability.embodyaspectcornerstone": "", + "cobblemon.ability.embodyaspectcornerstone.desc": "", + "cobblemon.ability.embodyaspecthearthflame": "", + "cobblemon.ability.embodyaspecthearthflame.desc": "", + "cobblemon.ability.embodyaspectteal": "", + "cobblemon.ability.embodyaspectteal.desc": "", + "cobblemon.ability.embodyaspectwellspring": "", + "cobblemon.ability.embodyaspectwellspring.desc": "", + "cobblemon.ability.emergencyexit": "", + "cobblemon.ability.emergencyexit.desc": "", + "cobblemon.ability.fairyaura": "", + "cobblemon.ability.fairyaura.desc": "", + "cobblemon.ability.filter": "", + "cobblemon.ability.filter.desc": "", + "cobblemon.ability.flamebody": "", + "cobblemon.ability.flamebody.desc": "", + "cobblemon.ability.flareboost": "", + "cobblemon.ability.flareboost.desc": "", + "cobblemon.ability.flashfire": "", + "cobblemon.ability.flashfire.desc": "", + "cobblemon.ability.flowergift": "", + "cobblemon.ability.flowergift.desc": "", + "cobblemon.ability.flowerveil": "", + "cobblemon.ability.flowerveil.desc": "", + "cobblemon.ability.fluffy": "", + "cobblemon.ability.fluffy.desc": "", + "cobblemon.ability.forecast": "", + "cobblemon.ability.forecast.desc": "", + "cobblemon.ability.forewarn": "", + "cobblemon.ability.forewarn.desc": "", + "cobblemon.ability.friendguard": "", + "cobblemon.ability.friendguard.desc": "", + "cobblemon.ability.frisk": "", + "cobblemon.ability.frisk.desc": "", + "cobblemon.ability.fullmetalbody": "", + "cobblemon.ability.fullmetalbody.desc": "", + "cobblemon.ability.furcoat": "", + "cobblemon.ability.furcoat.desc": "", + "cobblemon.ability.galewings": "", + "cobblemon.ability.galewings.desc": "", + "cobblemon.ability.galvanize": "", + "cobblemon.ability.galvanize.desc": "", + "cobblemon.ability.gluttony": "", + "cobblemon.ability.gluttony.desc": "", + "cobblemon.ability.goodasgold": "", + "cobblemon.ability.goodasgold.desc": "", + "cobblemon.ability.gooey": "", + "cobblemon.ability.gooey.desc": "", + "cobblemon.ability.gorillatactics": "", + "cobblemon.ability.gorillatactics.desc": "", + "cobblemon.ability.grasspelt": "", + "cobblemon.ability.grasspelt.desc": "", + "cobblemon.ability.grassysurge": "", + "cobblemon.ability.grassysurge.desc": "", + "cobblemon.ability.grimneigh": "", + "cobblemon.ability.grimneigh.desc": "", + "cobblemon.ability.guarddog": "", + "cobblemon.ability.guarddog.desc": "", + "cobblemon.ability.gulpmissile": "", + "cobblemon.ability.gulpmissile.desc": "", + "cobblemon.ability.guts": "", + "cobblemon.ability.guts.desc": "", + "cobblemon.ability.hadronengine": "", + "cobblemon.ability.hadronengine.desc": "", + "cobblemon.ability.harvest": "", + "cobblemon.ability.harvest.desc": "", + "cobblemon.ability.healer": "", + "cobblemon.ability.healer.desc": "", + "cobblemon.ability.heatproof": "", + "cobblemon.ability.heatproof.desc": "", + "cobblemon.ability.heavymetal": "", + "cobblemon.ability.heavymetal.desc": "", + "cobblemon.ability.honeygather": "", + "cobblemon.ability.honeygather.desc": "", + "cobblemon.ability.hospitality": "", + "cobblemon.ability.hospitality.desc": "", + "cobblemon.ability.hugepower": "", + "cobblemon.ability.hugepower.desc": "", + "cobblemon.ability.hungerswitch": "", + "cobblemon.ability.hungerswitch.desc": "", + "cobblemon.ability.hustle": "", + "cobblemon.ability.hustle.desc": "", + "cobblemon.ability.hydration": "", + "cobblemon.ability.hydration.desc": "", + "cobblemon.ability.hypercutter": "", + "cobblemon.ability.hypercutter.desc": "", + "cobblemon.ability.icebody": "", + "cobblemon.ability.icebody.desc": "", + "cobblemon.ability.iceface": "", + "cobblemon.ability.iceface.desc": "", + "cobblemon.ability.icescales": "", + "cobblemon.ability.icescales.desc": "", + "cobblemon.ability.illuminate": "", + "cobblemon.ability.illuminate.desc": "", + "cobblemon.ability.illusion": "", + "cobblemon.ability.illusion.desc": "", + "cobblemon.ability.immunity": "", + "cobblemon.ability.immunity.desc": "", + "cobblemon.ability.imposter": "", + "cobblemon.ability.imposter.desc": "", + "cobblemon.ability.infiltrator": "", + "cobblemon.ability.infiltrator.desc": "", + "cobblemon.ability.innardsout": "", + "cobblemon.ability.innardsout.desc": "", + "cobblemon.ability.innerfocus": "", + "cobblemon.ability.innerfocus.desc": "", + "cobblemon.ability.insomnia": "", + "cobblemon.ability.insomnia.desc": "", + "cobblemon.ability.intimidate": "", + "cobblemon.ability.intimidate.desc": "", + "cobblemon.ability.intrepidsword": "", + "cobblemon.ability.intrepidsword.desc": "", + "cobblemon.ability.ironbarbs": "", + "cobblemon.ability.ironbarbs.desc": "", + "cobblemon.ability.ironfist": "", + "cobblemon.ability.ironfist.desc": "", + "cobblemon.ability.justified": "", + "cobblemon.ability.justified.desc": "", + "cobblemon.ability.keeneye": "", + "cobblemon.ability.keeneye.desc": "", + "cobblemon.ability.klutz": "", + "cobblemon.ability.klutz.desc": "", + "cobblemon.ability.leafguard": "", + "cobblemon.ability.leafguard.desc": "", + "cobblemon.ability.levitate": "", + "cobblemon.ability.levitate.desc": "", + "cobblemon.ability.libero": "", + "cobblemon.ability.libero.desc": "", + "cobblemon.ability.lightmetal": "", + "cobblemon.ability.lightmetal.desc": "", + "cobblemon.ability.lightningrod": "", + "cobblemon.ability.lightningrod.desc": "", + "cobblemon.ability.limber": "", + "cobblemon.ability.limber.desc": "", + "cobblemon.ability.lingeringaroma": "", + "cobblemon.ability.lingeringaroma.desc": "", + "cobblemon.ability.liquidooze": "", + "cobblemon.ability.liquidooze.desc": "", + "cobblemon.ability.liquidvoice": "", + "cobblemon.ability.liquidvoice.desc": "", + "cobblemon.ability.longreach": "", + "cobblemon.ability.longreach.desc": "", + "cobblemon.ability.magicbounce": "", + "cobblemon.ability.magicbounce.desc": "", + "cobblemon.ability.magicguard": "", + "cobblemon.ability.magicguard.desc": "", + "cobblemon.ability.magician": "", + "cobblemon.ability.magician.desc": "", + "cobblemon.ability.magmaarmor": "", + "cobblemon.ability.magmaarmor.desc": "", + "cobblemon.ability.magnetpull": "", + "cobblemon.ability.magnetpull.desc": "", + "cobblemon.ability.marvelscale": "", + "cobblemon.ability.marvelscale.desc": "", + "cobblemon.ability.megalauncher": "", + "cobblemon.ability.megalauncher.desc": "", + "cobblemon.ability.merciless": "", + "cobblemon.ability.merciless.desc": "", + "cobblemon.ability.mimicry": "", + "cobblemon.ability.mimicry.desc": "", + "cobblemon.ability.mindseye": "", + "cobblemon.ability.mindseye.desc": "", + "cobblemon.ability.minus": "", + "cobblemon.ability.minus.desc": "", + "cobblemon.ability.mirrorarmor": "", + "cobblemon.ability.mirrorarmor.desc": "", + "cobblemon.ability.mistysurge": "", + "cobblemon.ability.mistysurge.desc": "", + "cobblemon.ability.moldbreaker": "", + "cobblemon.ability.moldbreaker.desc": "", + "cobblemon.ability.moody": "", + "cobblemon.ability.moody.desc": "", + "cobblemon.ability.motordrive": "", + "cobblemon.ability.motordrive.desc": "", + "cobblemon.ability.moxie": "", + "cobblemon.ability.moxie.desc": "", + "cobblemon.ability.multiscale": "", + "cobblemon.ability.multiscale.desc": "", + "cobblemon.ability.multitype": "", + "cobblemon.ability.multitype.desc": "", + "cobblemon.ability.mummy": "", + "cobblemon.ability.mummy.desc": "", + "cobblemon.ability.myceliummight": "", + "cobblemon.ability.myceliummight.desc": "", + "cobblemon.ability.naturalcure": "", + "cobblemon.ability.naturalcure.desc": "", + "cobblemon.ability.neuroforce": "", + "cobblemon.ability.neuroforce.desc": "", + "cobblemon.ability.neutralizinggas": "", + "cobblemon.ability.neutralizinggas.desc": "", + "cobblemon.ability.noguard": "", + "cobblemon.ability.noguard.desc": "", + "cobblemon.ability.normalize": "", + "cobblemon.ability.normalize.desc": "", + "cobblemon.ability.oblivious": "", + "cobblemon.ability.oblivious.desc": "", + "cobblemon.ability.opportunist": "", + "cobblemon.ability.opportunist.desc": "", + "cobblemon.ability.orichalcumpulse": "", + "cobblemon.ability.orichalcumpulse.desc": "", + "cobblemon.ability.overcoat": "", + "cobblemon.ability.overcoat.desc": "", + "cobblemon.ability.overgrow": "", + "cobblemon.ability.overgrow.desc": "", + "cobblemon.ability.owntempo": "", + "cobblemon.ability.owntempo.desc": "", + "cobblemon.ability.parentalbond": "", + "cobblemon.ability.parentalbond.desc": "", + "cobblemon.ability.pastelveil": "", + "cobblemon.ability.pastelveil.desc": "", + "cobblemon.ability.perishbody": "", + "cobblemon.ability.perishbody.desc": "", + "cobblemon.ability.pickpocket": "", + "cobblemon.ability.pickpocket.desc": "", + "cobblemon.ability.pickup": "", + "cobblemon.ability.pickup.desc": "", + "cobblemon.ability.pixilate": "", + "cobblemon.ability.pixilate.desc": "", + "cobblemon.ability.plus": "", + "cobblemon.ability.plus.desc": "", + "cobblemon.ability.poisonheal": "", + "cobblemon.ability.poisonheal.desc": "", + "cobblemon.ability.poisonpoint": "", + "cobblemon.ability.poisonpoint.desc": "", + "cobblemon.ability.poisonpuppeteer": "", + "cobblemon.ability.poisonpuppeteer.desc": "", + "cobblemon.ability.poisontouch": "", + "cobblemon.ability.poisontouch.desc": "", + "cobblemon.ability.powerconstruct": "", + "cobblemon.ability.powerconstruct.desc": "", + "cobblemon.ability.powerofalchemy": "", + "cobblemon.ability.powerofalchemy.desc": "", + "cobblemon.ability.powerspot": "", + "cobblemon.ability.powerspot.desc": "", + "cobblemon.ability.prankster": "", + "cobblemon.ability.prankster.desc": "", + "cobblemon.ability.pressure": "", + "cobblemon.ability.pressure.desc": "", + "cobblemon.ability.primordialsea": "", + "cobblemon.ability.primordialsea.desc": "", + "cobblemon.ability.prismarmor": "", + "cobblemon.ability.prismarmor.desc": "", + "cobblemon.ability.propellertail": "", + "cobblemon.ability.propellertail.desc": "", + "cobblemon.ability.protean": "", + "cobblemon.ability.protean.desc": "", + "cobblemon.ability.protosynthesis": "", + "cobblemon.ability.protosynthesis.desc": "", + "cobblemon.ability.psychicsurge": "", + "cobblemon.ability.psychicsurge.desc": "", + "cobblemon.ability.punkrock": "", + "cobblemon.ability.punkrock.desc": "", + "cobblemon.ability.purepower": "", + "cobblemon.ability.purepower.desc": "", + "cobblemon.ability.purifyingsalt": "", + "cobblemon.ability.purifyingsalt.desc": "", + "cobblemon.ability.quarkdrive": "", + "cobblemon.ability.quarkdrive.desc": "", + "cobblemon.ability.queenlymajesty": "", + "cobblemon.ability.queenlymajesty.desc": "", + "cobblemon.ability.quickdraw": "", + "cobblemon.ability.quickdraw.desc": "", + "cobblemon.ability.quickfeet": "", + "cobblemon.ability.quickfeet.desc": "", + "cobblemon.ability.raindish": "", + "cobblemon.ability.raindish.desc": "", + "cobblemon.ability.rattled": "", + "cobblemon.ability.rattled.desc": "", + "cobblemon.ability.receiver": "", + "cobblemon.ability.receiver.desc": "", + "cobblemon.ability.reckless": "", + "cobblemon.ability.reckless.desc": "", + "cobblemon.ability.refrigerate": "", + "cobblemon.ability.refrigerate.desc": "", + "cobblemon.ability.regenerator": "", + "cobblemon.ability.regenerator.desc": "", + "cobblemon.ability.ripen": "", + "cobblemon.ability.ripen.desc": "", + "cobblemon.ability.rivalry": "", + "cobblemon.ability.rivalry.desc": "", + "cobblemon.ability.rkssystem": "", + "cobblemon.ability.rkssystem.desc": "", + "cobblemon.ability.rockhead": "", + "cobblemon.ability.rockhead.desc": "", + "cobblemon.ability.rockypayload": "", + "cobblemon.ability.rockypayload.desc": "", + "cobblemon.ability.roughskin": "", + "cobblemon.ability.roughskin.desc": "", + "cobblemon.ability.runaway": "", + "cobblemon.ability.runaway.desc": "", + "cobblemon.ability.sandforce": "", + "cobblemon.ability.sandforce.desc": "", + "cobblemon.ability.sandrush": "", + "cobblemon.ability.sandrush.desc": "", + "cobblemon.ability.sandspit": "", + "cobblemon.ability.sandspit.desc": "", + "cobblemon.ability.sandstream": "", + "cobblemon.ability.sandstream.desc": "", + "cobblemon.ability.sandveil": "", + "cobblemon.ability.sandveil.desc": "", + "cobblemon.ability.sapsipper": "", + "cobblemon.ability.sapsipper.desc": "", + "cobblemon.ability.schooling": "", + "cobblemon.ability.schooling.desc": "", + "cobblemon.ability.scrappy": "", + "cobblemon.ability.scrappy.desc": "", + "cobblemon.ability.screencleaner": "", + "cobblemon.ability.screencleaner.desc": "", + "cobblemon.ability.seedsower": "", + "cobblemon.ability.seedsower.desc": "", + "cobblemon.ability.serenegrace": "", + "cobblemon.ability.serenegrace.desc": "", + "cobblemon.ability.shadowshield": "", + "cobblemon.ability.shadowshield.desc": "", + "cobblemon.ability.shadowtag": "", + "cobblemon.ability.shadowtag.desc": "", + "cobblemon.ability.sharpness": "", + "cobblemon.ability.sharpness.desc": "", + "cobblemon.ability.shedskin": "", + "cobblemon.ability.shedskin.desc": "", + "cobblemon.ability.sheerforce": "", + "cobblemon.ability.sheerforce.desc": "", + "cobblemon.ability.shellarmor": "", + "cobblemon.ability.shellarmor.desc": "", + "cobblemon.ability.shielddust": "", + "cobblemon.ability.shielddust.desc": "", + "cobblemon.ability.shieldsdown": "", + "cobblemon.ability.shieldsdown.desc": "", + "cobblemon.ability.simple": "", + "cobblemon.ability.simple.desc": "", + "cobblemon.ability.skilllink": "", + "cobblemon.ability.skilllink.desc": "", + "cobblemon.ability.slowstart": "", + "cobblemon.ability.slowstart.desc": "", + "cobblemon.ability.slushrush": "", + "cobblemon.ability.slushrush.desc": "", + "cobblemon.ability.sniper": "", + "cobblemon.ability.sniper.desc": "", + "cobblemon.ability.snowcloak": "", + "cobblemon.ability.snowcloak.desc": "", + "cobblemon.ability.snowwarning": "", + "cobblemon.ability.snowwarning.desc": "", + "cobblemon.ability.solarpower": "", + "cobblemon.ability.solarpower.desc": "", + "cobblemon.ability.solidrock": "", + "cobblemon.ability.solidrock.desc": "", + "cobblemon.ability.soulheart": "", + "cobblemon.ability.soulheart.desc": "", + "cobblemon.ability.soundproof": "", + "cobblemon.ability.soundproof.desc": "", + "cobblemon.ability.speedboost": "", + "cobblemon.ability.speedboost.desc": "", + "cobblemon.ability.stakeout": "", + "cobblemon.ability.stakeout.desc": "", + "cobblemon.ability.stall": "", + "cobblemon.ability.stall.desc": "", + "cobblemon.ability.stalwart": "", + "cobblemon.ability.stalwart.desc": "", + "cobblemon.ability.stamina": "", + "cobblemon.ability.stamina.desc": "", + "cobblemon.ability.stancechange": "", + "cobblemon.ability.stancechange.desc": "", + "cobblemon.ability.static": "", + "cobblemon.ability.static.desc": "", + "cobblemon.ability.steadfast": "", + "cobblemon.ability.steadfast.desc": "", + "cobblemon.ability.steamengine": "", + "cobblemon.ability.steamengine.desc": "", + "cobblemon.ability.steelworker": "", + "cobblemon.ability.steelworker.desc": "", + "cobblemon.ability.steelyspirit": "", + "cobblemon.ability.steelyspirit.desc": "", + "cobblemon.ability.stench": "", + "cobblemon.ability.stench.desc": "", + "cobblemon.ability.stickyhold": "", + "cobblemon.ability.stickyhold.desc": "", + "cobblemon.ability.stormdrain": "", + "cobblemon.ability.stormdrain.desc": "", + "cobblemon.ability.strongjaw": "", + "cobblemon.ability.strongjaw.desc": "", + "cobblemon.ability.sturdy": "", + "cobblemon.ability.sturdy.desc": "", + "cobblemon.ability.suctioncups": "", + "cobblemon.ability.suctioncups.desc": "", + "cobblemon.ability.superluck": "", + "cobblemon.ability.superluck.desc": "", + "cobblemon.ability.supersweetsyrup": "", + "cobblemon.ability.supersweetsyrup.desc": "", + "cobblemon.ability.supremeoverlord": "", + "cobblemon.ability.supremeoverlord.desc": "", + "cobblemon.ability.surgesurfer": "", + "cobblemon.ability.surgesurfer.desc": "", + "cobblemon.ability.swarm": "", + "cobblemon.ability.swarm.desc": "", + "cobblemon.ability.sweetveil": "", + "cobblemon.ability.sweetveil.desc": "", + "cobblemon.ability.swiftswim": "", + "cobblemon.ability.swiftswim.desc": "", + "cobblemon.ability.swordofruin": "", + "cobblemon.ability.swordofruin.desc": "", + "cobblemon.ability.symbiosis": "", + "cobblemon.ability.symbiosis.desc": "", + "cobblemon.ability.synchronize": "", + "cobblemon.ability.synchronize.desc": "", + "cobblemon.ability.tabletsofruin": "", + "cobblemon.ability.tabletsofruin.desc": "", + "cobblemon.ability.tangledfeet": "", + "cobblemon.ability.tangledfeet.desc": "", + "cobblemon.ability.tanglinghair": "", + "cobblemon.ability.tanglinghair.desc": "", + "cobblemon.ability.technician": "", + "cobblemon.ability.technician.desc": "", + "cobblemon.ability.telepathy": "", + "cobblemon.ability.telepathy.desc": "", + "cobblemon.ability.teraformzero": "", + "cobblemon.ability.teraformzero.desc": "", + "cobblemon.ability.terashell": "", + "cobblemon.ability.terashell.desc": "", + "cobblemon.ability.terashift": "", + "cobblemon.ability.terashift.desc": "", + "cobblemon.ability.teravolt": "", + "cobblemon.ability.teravolt.desc": "", + "cobblemon.ability.thermalexchange": "", + "cobblemon.ability.thermalexchange.desc": "", + "cobblemon.ability.thickfat": "", + "cobblemon.ability.thickfat.desc": "", + "cobblemon.ability.tintedlens": "", + "cobblemon.ability.tintedlens.desc": "", + "cobblemon.ability.torrent": "", + "cobblemon.ability.torrent.desc": "", + "cobblemon.ability.toughclaws": "", + "cobblemon.ability.toughclaws.desc": "", + "cobblemon.ability.toxicboost": "", + "cobblemon.ability.toxicboost.desc": "", + "cobblemon.ability.toxicchain": "", + "cobblemon.ability.toxicchain.desc": "", + "cobblemon.ability.toxicdebris": "", + "cobblemon.ability.toxicdebris.desc": "", + "cobblemon.ability.trace": "", + "cobblemon.ability.trace.desc": "", + "cobblemon.ability.transistor": "", + "cobblemon.ability.transistor.desc": "", + "cobblemon.ability.triage": "", + "cobblemon.ability.triage.desc": "", + "cobblemon.ability.truant": "", + "cobblemon.ability.truant.desc": "", + "cobblemon.ability.turboblaze": "", + "cobblemon.ability.turboblaze.desc": "", + "cobblemon.ability.unaware": "", + "cobblemon.ability.unaware.desc": "", + "cobblemon.ability.unburden": "", + "cobblemon.ability.unburden.desc": "", + "cobblemon.ability.unnerve": "", + "cobblemon.ability.unnerve.desc": "", + "cobblemon.ability.unseenfist": "", + "cobblemon.ability.unseenfist.desc": "", + "cobblemon.ability.vesselofruin": "", + "cobblemon.ability.vesselofruin.desc": "", + "cobblemon.ability.victorystar": "", + "cobblemon.ability.victorystar.desc": "", + "cobblemon.ability.vitalspirit": "", + "cobblemon.ability.vitalspirit.desc": "", + "cobblemon.ability.voltabsorb": "", + "cobblemon.ability.voltabsorb.desc": "", + "cobblemon.ability.wanderingspirit": "", + "cobblemon.ability.wanderingspirit.desc": "", + "cobblemon.ability.waterabsorb": "", + "cobblemon.ability.waterabsorb.desc": "", + "cobblemon.ability.waterbubble": "", + "cobblemon.ability.waterbubble.desc": "", + "cobblemon.ability.watercompaction": "", + "cobblemon.ability.watercompaction.desc": "", + "cobblemon.ability.waterveil": "", + "cobblemon.ability.waterveil.desc": "", + "cobblemon.ability.weakarmor": "", + "cobblemon.ability.weakarmor.desc": "", + "cobblemon.ability.wellbakedbody": "", + "cobblemon.ability.wellbakedbody.desc": "", + "cobblemon.ability.whitesmoke": "", + "cobblemon.ability.whitesmoke.desc": "", + "cobblemon.ability.wimpout": "", + "cobblemon.ability.wimpout.desc": "", + "cobblemon.ability.windpower": "", + "cobblemon.ability.windpower.desc": "", + "cobblemon.ability.windrider": "", + "cobblemon.ability.windrider.desc": "", + "cobblemon.ability.wonderguard": "", + "cobblemon.ability.wonderguard.desc": "", + "cobblemon.ability.wonderskin": "", + "cobblemon.ability.wonderskin.desc": "", + "cobblemon.ability.zenmode": "", + "cobblemon.ability.zenmode.desc": "", + "cobblemon.ability.zerotohero": "", + "cobblemon.ability.zerotohero.desc": "" +} From 7200e87886aaa366f24eb713cd717f3c9f186dcd Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 27 Dec 2024 22:40:07 +0000 Subject: [PATCH 002/121] Update translation files Updated by "Remove blank strings" add-on in Weblate. Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ --- .../resources/assets/cobblemon/lang/vi.json | 6394 +---------------- 1 file changed, 1 insertion(+), 6393 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/vi.json b/common/src/main/resources/assets/cobblemon/lang/vi.json index ee17a89844..0967ef424b 100644 --- a/common/src/main/resources/assets/cobblemon/lang/vi.json +++ b/common/src/main/resources/assets/cobblemon/lang/vi.json @@ -1,6393 +1 @@ -{ - "item.cobblemon.poke_ball": "", - "item.cobblemon.slate_ball": "", - "item.cobblemon.azure_ball": "", - "item.cobblemon.verdant_ball": "", - "item.cobblemon.roseate_ball": "", - "item.cobblemon.citrine_ball": "", - "item.cobblemon.great_ball": "", - "item.cobblemon.ultra_ball": "", - "item.cobblemon.master_ball": "", - "item.cobblemon.safari_ball": "", - "item.cobblemon.fast_ball": "", - "item.cobblemon.level_ball": "", - "item.cobblemon.lure_ball": "", - "item.cobblemon.heavy_ball": "", - "item.cobblemon.love_ball": "", - "item.cobblemon.friend_ball": "", - "item.cobblemon.moon_ball": "", - "item.cobblemon.sport_ball": "", - "item.cobblemon.net_ball": "", - "item.cobblemon.dive_ball": "", - "item.cobblemon.nest_ball": "", - "item.cobblemon.repeat_ball": "", - "item.cobblemon.timer_ball": "", - "item.cobblemon.luxury_ball": "", - "item.cobblemon.premier_ball": "", - "item.cobblemon.dusk_ball": "", - "item.cobblemon.heal_ball": "", - "item.cobblemon.quick_ball": "", - "item.cobblemon.cherish_ball": "", - "item.cobblemon.park_ball": "", - "item.cobblemon.dream_ball": "", - "item.cobblemon.beast_ball": "", - "item.cobblemon.ancient_poke_ball": "", - "item.cobblemon.ancient_citrine_ball": "", - "item.cobblemon.ancient_verdant_ball": "", - "item.cobblemon.ancient_azure_ball": "", - "item.cobblemon.ancient_roseate_ball": "", - "item.cobblemon.ancient_slate_ball": "", - "item.cobblemon.ancient_ivory_ball": "", - "item.cobblemon.ancient_great_ball": "", - "item.cobblemon.ancient_ultra_ball": "", - "item.cobblemon.ancient_heavy_ball": "", - "item.cobblemon.ancient_leaden_ball": "", - "item.cobblemon.ancient_gigaton_ball": "", - "item.cobblemon.ancient_feather_ball": "", - "item.cobblemon.ancient_wing_ball": "", - "item.cobblemon.ancient_jet_ball": "", - "item.cobblemon.ancient_origin_ball": "", - "item.cobblemon.pokerod_smithing_template": "", - "item.cobblemon.smithing_template.pokerod.ingredients": "", - "item.cobblemon.smithing_template.pokerod.base_slot_description": "", - "item.cobblemon.smithing_template.pokerod.additions_slot_description": "", - "upgrade.cobblemon.pokerod": "", - "item.cobblemon.poke_rod": "", - "cobblemon.pokerod.bobber": "", - "cobblemon.pokerod.bait": "", - "item.cobblemon.black_apricorn_seed": "", - "item.cobblemon.blue_apricorn_seed": "", - "item.cobblemon.green_apricorn_seed": "", - "item.cobblemon.pink_apricorn_seed": "", - "item.cobblemon.red_apricorn_seed": "", - "item.cobblemon.white_apricorn_seed": "", - "item.cobblemon.yellow_apricorn_seed": "", - "item.cobblemon.black_apricorn": "", - "item.cobblemon.blue_apricorn": "", - "item.cobblemon.green_apricorn": "", - "item.cobblemon.pink_apricorn": "", - "item.cobblemon.red_apricorn": "", - "item.cobblemon.white_apricorn": "", - "item.cobblemon.yellow_apricorn": "", - "item.cobblemon.vivichoke_seeds": "", - "item.cobblemon.vivichoke": "", - "item.cobblemon.apricorn_boat": "", - "item.cobblemon.apricorn_chest_boat": "", - "item.cobblemon.pokedex_black": "", - "item.cobblemon.pokedex_blue": "", - "item.cobblemon.pokedex_green": "", - "item.cobblemon.pokedex_pink": "", - "item.cobblemon.pokedex_red": "", - "item.cobblemon.pokedex_white": "", - "item.cobblemon.pokedex_yellow": "", - "item.cobblemon.link_cable": "", - "item.cobblemon.dragon_scale": "", - "item.cobblemon.kings_rock": "", - "item.cobblemon.metal_coat": "", - "item.cobblemon.upgrade": "", - "item.cobblemon.dubious_disc": "", - "item.cobblemon.deep_sea_scale": "", - "item.cobblemon.deep_sea_tooth": "", - "item.cobblemon.electirizer": "", - "item.cobblemon.magmarizer": "", - "item.cobblemon.oval_stone": "", - "item.cobblemon.protector": "", - "item.cobblemon.reaper_cloth": "", - "item.cobblemon.prism_scale": "", - "item.cobblemon.sachet": "", - "item.cobblemon.whipped_dream": "", - "item.cobblemon.strawberry_sweet": "", - "item.cobblemon.love_sweet": "", - "item.cobblemon.berry_sweet": "", - "item.cobblemon.clover_sweet": "", - "item.cobblemon.flower_sweet": "", - "item.cobblemon.star_sweet": "", - "item.cobblemon.ribbon_sweet": "", - "item.cobblemon.chipped_pot": "", - "item.cobblemon.cracked_pot": "", - "item.cobblemon.masterpiece_teacup": "", - "item.cobblemon.unremarkable_teacup": "", - "item.cobblemon.sweet_apple": "", - "item.cobblemon.tart_apple": "", - "item.cobblemon.galarica_cuff": "", - "item.cobblemon.galarica_wreath": "", - "item.cobblemon.black_augurite": "", - "item.cobblemon.peat_block": "", - "item.cobblemon.dawn_stone": "", - "item.cobblemon.dusk_stone": "", - "item.cobblemon.fire_stone": "", - "item.cobblemon.ice_stone": "", - "item.cobblemon.leaf_stone": "", - "item.cobblemon.moon_stone": "", - "item.cobblemon.shiny_stone": "", - "item.cobblemon.sun_stone": "", - "item.cobblemon.thunder_stone": "", - "item.cobblemon.water_stone": "", - "item.cobblemon.rare_candy": "", - "item.cobblemon.exp_candy_xs": "", - "item.cobblemon.exp_candy_s": "", - "item.cobblemon.exp_candy_m": "", - "item.cobblemon.exp_candy_l": "", - "item.cobblemon.exp_candy_xl": "", - "item.cobblemon.calcium": "", - "item.cobblemon.carbos": "", - "item.cobblemon.hp_up": "", - "item.cobblemon.iron": "", - "item.cobblemon.protein": "", - "item.cobblemon.zinc": "", - "item.cobblemon.potion": "", - "item.cobblemon.super_potion": "", - "item.cobblemon.hyper_potion": "", - "item.cobblemon.max_potion": "", - "item.cobblemon.full_restore": "", - "item.cobblemon.health_feather": "", - "item.cobblemon.muscle_feather": "", - "item.cobblemon.resist_feather": "", - "item.cobblemon.genius_feather": "", - "item.cobblemon.clever_feather": "", - "item.cobblemon.swift_feather": "", - "item.cobblemon.ability_capsule": "", - "item.cobblemon.ability_patch": "", - "item.cobblemon.red_mint_leaf": "", - "item.cobblemon.red_mint_leaf.tooltip": "", - "item.cobblemon.blue_mint_leaf": "", - "item.cobblemon.blue_mint_leaf.tooltip": "", - "item.cobblemon.cyan_mint_leaf": "", - "item.cobblemon.cyan_mint_leaf.tooltip": "", - "item.cobblemon.pink_mint_leaf": "", - "item.cobblemon.pink_mint_leaf.tooltip": "", - "item.cobblemon.green_mint_leaf": "", - "item.cobblemon.green_mint_leaf.tooltip": "", - "item.cobblemon.white_mint_leaf": "", - "item.cobblemon.white_mint_leaf.tooltip": "", - "item.cobblemon.lonely_mint": "", - "item.cobblemon.adamant_mint": "", - "item.cobblemon.naughty_mint": "", - "item.cobblemon.brave_mint": "", - "item.cobblemon.bold_mint": "", - "item.cobblemon.impish_mint": "", - "item.cobblemon.lax_mint": "", - "item.cobblemon.relaxed_mint": "", - "item.cobblemon.modest_mint": "", - "item.cobblemon.mild_mint": "", - "item.cobblemon.rash_mint": "", - "item.cobblemon.quiet_mint": "", - "item.cobblemon.calm_mint": "", - "item.cobblemon.gentle_mint": "", - "item.cobblemon.careful_mint": "", - "item.cobblemon.sassy_mint": "", - "item.cobblemon.timid_mint": "", - "item.cobblemon.hasty_mint": "", - "item.cobblemon.jolly_mint": "", - "item.cobblemon.naive_mint": "", - "item.cobblemon.serious_mint": "", - "item.cobblemon.ability_shield": "", - "item.cobblemon.absorb_bulb": "", - "item.cobblemon.air_balloon": "", - "item.cobblemon.assault_vest": "", - "item.cobblemon.auspicious_armor": "", - "item.cobblemon.malicious_armor": "", - "item.cobblemon.binding_band": "", - "item.cobblemon.black_belt": "", - "item.cobblemon.black_glasses": "", - "item.cobblemon.black_sludge": "", - "item.cobblemon.blunder_policy": "", - "item.cobblemon.cell_battery": "", - "item.cobblemon.charcoal_stick": "", - "item.cobblemon.choice_band": "", - "item.cobblemon.choice_scarf": "", - "item.cobblemon.choice_specs": "", - "item.cobblemon.cleanse_tag": "", - "item.cobblemon.clear_amulet": "", - "item.cobblemon.covert_cloak": "", - "item.cobblemon.dragon_fang": "", - "item.cobblemon.eject_button": "", - "item.cobblemon.eject_pack": "", - "item.cobblemon.electric_seed": "", - "item.cobblemon.everstone": "", - "item.cobblemon.eviolite": "", - "item.cobblemon.exp_share": "", - "item.cobblemon.expert_belt": "", - "item.cobblemon.fairy_feather": "", - "item.cobblemon.float_stone": "", - "item.cobblemon.focus_band": "", - "item.cobblemon.focus_sash": "", - "item.cobblemon.grassy_seed": "", - "item.cobblemon.grip_claw": "", - "item.cobblemon.hard_stone": "", - "item.cobblemon.heavy_duty_boots": "", - "item.cobblemon.iron_ball": "", - "item.cobblemon.lagging_tail": "", - "item.cobblemon.leftovers": "", - "item.cobblemon.light_ball": "", - "item.cobblemon.light_clay": "", - "item.cobblemon.loaded_dice": "", - "item.cobblemon.lucky_egg": "", - "item.cobblemon.luminous_moss": "", - "item.cobblemon.magnet": "", - "item.cobblemon.metronome": "", - "item.cobblemon.miracle_seed": "", - "item.cobblemon.muscle_band": "", - "item.cobblemon.mystic_water": "", - "item.cobblemon.never_melt_ice": "", - "item.cobblemon.poison_barb": "", - "item.cobblemon.protective_pads": "", - "item.cobblemon.punching_glove": "", - "item.cobblemon.quick_claw": "", - "item.cobblemon.razor_claw": "", - "item.cobblemon.razor_fang": "", - "item.cobblemon.red_card": "", - "item.cobblemon.ring_target": "", - "item.cobblemon.rocky_helmet": "", - "item.cobblemon.room_service": "", - "item.cobblemon.safety_goggles": "", - "item.cobblemon.scope_lens": "", - "item.cobblemon.sharp_beak": "", - "item.cobblemon.shed_shell": "", - "item.cobblemon.shell_bell": "", - "item.cobblemon.silk_scarf": "", - "item.cobblemon.silver_powder": "", - "item.cobblemon.soft_sand": "", - "item.cobblemon.soothe_bell": "", - "item.cobblemon.spell_tag": "", - "item.cobblemon.sticky_barb": "", - "item.cobblemon.terrain_extender": "", - "item.cobblemon.throat_spray": "", - "item.cobblemon.twisted_spoon": "", - "item.cobblemon.utility_umbrella": "", - "item.cobblemon.weakness_policy": "", - "item.cobblemon.wide_lens": "", - "item.cobblemon.wise_glasses": "", - "item.cobblemon.zoom_lens": "", - "item.cobblemon.mental_herb": "", - "item.cobblemon.mirror_herb": "", - "item.cobblemon.misty_seed": "", - "item.cobblemon.power_herb": "", - "item.cobblemon.white_herb": "", - "item.cobblemon.bright_powder": "", - "item.cobblemon.metal_powder": "", - "item.cobblemon.quick_powder": "", - "item.cobblemon.destiny_knot": "", - "item.cobblemon.power_anklet": "", - "item.cobblemon.power_band": "", - "item.cobblemon.power_belt": "", - "item.cobblemon.power_bracer": "", - "item.cobblemon.power_lens": "", - "item.cobblemon.power_weight": "", - "item.cobblemon.psychic_seed": "", - "item.cobblemon.flame_orb": "", - "item.cobblemon.smoke_ball": "", - "item.cobblemon.toxic_orb": "", - "item.cobblemon.life_orb": "", - "item.cobblemon.damp_rock": "", - "item.cobblemon.heat_rock": "", - "item.cobblemon.smooth_rock": "", - "item.cobblemon.icy_rock": "", - "item.cobblemon.poke_ball.tooltip": "", - "item.cobblemon.slate_ball.tooltip": "", - "item.cobblemon.azure_ball.tooltip": "", - "item.cobblemon.verdant_ball.tooltip": "", - "item.cobblemon.roseate_ball.tooltip": "", - "item.cobblemon.citrine_ball.tooltip": "", - "item.cobblemon.great_ball.tooltip": "", - "item.cobblemon.ultra_ball.tooltip": "", - "item.cobblemon.master_ball.tooltip": "", - "item.cobblemon.safari_ball.tooltip": "", - "item.cobblemon.fast_ball.tooltip": "", - "item.cobblemon.level_ball.tooltip": "", - "item.cobblemon.lure_ball.tooltip": "", - "item.cobblemon.heavy_ball.tooltip": "", - "item.cobblemon.love_ball.tooltip": "", - "item.cobblemon.friend_ball.tooltip": "", - "item.cobblemon.moon_ball.tooltip": "", - "item.cobblemon.sport_ball.tooltip": "", - "item.cobblemon.net_ball.tooltip": "", - "item.cobblemon.dive_ball.tooltip": "", - "item.cobblemon.nest_ball.tooltip": "", - "item.cobblemon.repeat_ball.tooltip": "", - "item.cobblemon.timer_ball.tooltip": "", - "item.cobblemon.luxury_ball.tooltip": "", - "item.cobblemon.premier_ball.tooltip": "", - "item.cobblemon.dusk_ball.tooltip": "", - "item.cobblemon.heal_ball.tooltip": "", - "item.cobblemon.quick_ball.tooltip": "", - "item.cobblemon.cherish_ball.tooltip": "", - "item.cobblemon.park_ball.tooltip": "", - "item.cobblemon.dream_ball.tooltip": "", - "item.cobblemon.beast_ball.tooltip": "", - "item.cobblemon.ancient_poke_ball.tooltip": "", - "item.cobblemon.ancient_citrine_ball.tooltip": "", - "item.cobblemon.ancient_verdant_ball.tooltip": "", - "item.cobblemon.ancient_azure_ball.tooltip": "", - "item.cobblemon.ancient_roseate_ball.tooltip": "", - "item.cobblemon.ancient_slate_ball.tooltip": "", - "item.cobblemon.ancient_ivory_ball.tooltip": "", - "item.cobblemon.ancient_great_ball.tooltip": "", - "item.cobblemon.ancient_ultra_ball.tooltip": "", - "item.cobblemon.ancient_feather_ball.tooltip": "", - "item.cobblemon.ancient_wing_ball.tooltip": "", - "item.cobblemon.ancient_jet_ball.tooltip": "", - "item.cobblemon.ancient_heavy_ball.tooltip": "", - "item.cobblemon.ancient_leaden_ball.tooltip": "", - "item.cobblemon.ancient_gigaton_ball.tooltip": "", - "item.cobblemon.ancient_origin_ball.tooltip": "", - "item.cobblemon.mulch_base": "", - "item.cobblemon.coarse_mulch": "", - "item.cobblemon.growth_mulch": "", - "item.cobblemon.humid_mulch": "", - "item.cobblemon.loamy_mulch": "", - "item.cobblemon.peat_mulch": "", - "item.cobblemon.rich_mulch": "", - "item.cobblemon.sandy_mulch": "", - "item.cobblemon.surprise_mulch": "", - "item.cobblemon.medicinal_leek": "", - "item.cobblemon.energy_root": "", - "item.cobblemon.revival_herb": "", - "item.cobblemon.roasted_leek": "", - "item.cobblemon.leek_and_potato_stew": "", - "item.cobblemon.braised_vivichoke": "", - "item.cobblemon.vivichoke_dip": "", - "item.cobblemon.berry_juice": "", - "item.cobblemon.remedy": "", - "item.cobblemon.fine_remedy": "", - "item.cobblemon.superb_remedy": "", - "item.cobblemon.heal_powder": "", - "item.cobblemon.medicinal_brew": "", - "item.cobblemon.revive": "", - "item.cobblemon.max_revive": "", - "item.cobblemon.pp_up": "", - "item.cobblemon.pp_max": "", - "item.cobblemon.x_attack": "", - "item.cobblemon.x_defence": "", - "item.cobblemon.x_accuracy": "", - "item.cobblemon.x_speed": "", - "item.cobblemon.x_special_defence": "", - "item.cobblemon.x_special_attack": "", - "item.cobblemon.dire_hit": "", - "item.cobblemon.guard_spec": "", - "item.cobblemon.full_heal": "", - "item.cobblemon.antidote": "", - "item.cobblemon.awakening": "", - "item.cobblemon.burn_heal": "", - "item.cobblemon.ice_heal": "", - "item.cobblemon.paralyze_heal": "", - "item.cobblemon.ether": "", - "item.cobblemon.max_ether": "", - "item.cobblemon.elixir": "", - "item.cobblemon.max_elixir": "", - "item.cobblemon.normal_gem": "", - "item.cobblemon.water_gem": "", - "item.cobblemon.fire_gem": "", - "item.cobblemon.grass_gem": "", - "item.cobblemon.dragon_gem": "", - "item.cobblemon.ghost_gem": "", - "item.cobblemon.ground_gem": "", - "item.cobblemon.steel_gem": "", - "item.cobblemon.fairy_gem": "", - "item.cobblemon.rock_gem": "", - "item.cobblemon.psychic_gem": "", - "item.cobblemon.electric_gem": "", - "item.cobblemon.bug_gem": "", - "item.cobblemon.poison_gem": "", - "item.cobblemon.ice_gem": "", - "item.cobblemon.dark_gem": "", - "item.cobblemon.fighting_gem": "", - "item.cobblemon.flying_gem": "", - "item.cobblemon.armor_fossil": "", - "item.cobblemon.fossilized_bird": "", - "item.cobblemon.claw_fossil": "", - "item.cobblemon.cover_fossil": "", - "item.cobblemon.fossilized_dino": "", - "item.cobblemon.dome_fossil": "", - "item.cobblemon.fossilized_drake": "", - "item.cobblemon.fossilized_fish": "", - "item.cobblemon.helix_fossil": "", - "item.cobblemon.jaw_fossil": "", - "item.cobblemon.old_amber_fossil": "", - "item.cobblemon.plume_fossil": "", - "item.cobblemon.root_fossil": "", - "item.cobblemon.sail_fossil": "", - "item.cobblemon.skull_fossil": "", - "item.cobblemon.bygone_sherd": "", - "item.cobblemon.capture_sherd": "", - "item.cobblemon.dome_sherd": "", - "item.cobblemon.helix_sherd": "", - "item.cobblemon.nostalgic_sherd": "", - "item.cobblemon.suspicious_sherd": "", - "item.cobblemon.tumblestone": "", - "item.cobblemon.black_tumblestone": "", - "item.cobblemon.sky_tumblestone": "", - "item.cobblemon.relic_coin": "", - "block.cobblemon.relic_coin_pouch": "", - "block.cobblemon.relic_coin_sack": "", - "item.cobblemon.automaton_armor_trim_smithing_template": "", - "trim_pattern.cobblemon.automaton": "", - "cobblemon.tooltip.see_more_info": "", - "cobblemon.item_class.fishing_bait": "", - "cobblemon.fossil.armor": "", - "cobblemon.fossil.bird": "", - "cobblemon.fossil.claw": "", - "cobblemon.fossil.cover": "", - "cobblemon.fossil.dino": "", - "cobblemon.fossil.dome": "", - "cobblemon.fossil.drake": "", - "cobblemon.fossil.fish": "", - "cobblemon.fossil.helix": "", - "cobblemon.fossil.jaw": "", - "cobblemon.fossil.old_amber": "", - "cobblemon.fossil.plume": "", - "cobblemon.fossil.root": "", - "cobblemon.fossil.sail": "", - "cobblemon.fossil.skull": "", - "cobblemon.gender.female": "", - "cobblemon.gender.male": "", - "cobblemon.gender.genderless": "", - "cobblemon.fossilmachine.protected": "", - "itemGroup.cobblemon.blocks": "", - "itemGroup.cobblemon.utility_item": "", - "itemGroup.cobblemon.agriculture": "", - "itemGroup.cobblemon.consumables": "", - "itemGroup.cobblemon.held_item": "", - "itemGroup.cobblemon.evolution_item": "", - "itemGroup.cobblemon.archaeology": "", - "block.cobblemon.black_apricorn": "", - "block.cobblemon.blue_apricorn": "", - "block.cobblemon.green_apricorn": "", - "block.cobblemon.pink_apricorn": "", - "block.cobblemon.red_apricorn": "", - "block.cobblemon.white_apricorn": "", - "block.cobblemon.yellow_apricorn": "", - "block.cobblemon.apricorn_log": "", - "block.cobblemon.stripped_apricorn_log": "", - "block.cobblemon.apricorn_wood": "", - "block.cobblemon.stripped_apricorn_wood": "", - "block.cobblemon.apricorn_planks": "", - "block.cobblemon.apricorn_leaves": "", - "block.cobblemon.apricorn_fence": "", - "block.cobblemon.apricorn_sign": "", - "block.cobblemon.apricorn_hanging_sign": "", - "block.cobblemon.apricorn_stairs": "", - "block.cobblemon.apricorn_pressure_plate": "", - "block.cobblemon.apricorn_button": "", - "block.cobblemon.apricorn_slab": "", - "block.cobblemon.apricorn_fence_gate": "", - "block.cobblemon.big_root": "", - "block.cobblemon.black_apricorn_sapling": "", - "block.cobblemon.blue_apricorn_sapling": "", - "block.cobblemon.green_apricorn_sapling": "", - "block.cobblemon.pink_apricorn_sapling": "", - "block.cobblemon.red_apricorn_sapling": "", - "block.cobblemon.white_apricorn_sapling": "", - "block.cobblemon.yellow_apricorn_sapling": "", - "block.cobblemon.apricorn_door": "", - "block.cobblemon.apricorn_trapdoor": "", - "block.cobblemon.healing_machine": "", - "block.cobblemon.healing_machine.tooltip1": "", - "block.cobblemon.healing_machine.tooltip2": "", - "block.cobblemon.pc": "", - "block.cobblemon.lectern": "", - "block.cobblemon.restoration_tank": "", - "block.cobblemon.fossil_analyzer": "", - "block.cobblemon.monitor": "", - "block.cobblemon.red_mint": "", - "block.cobblemon.blue_mint": "", - "block.cobblemon.cyan_mint": "", - "block.cobblemon.pink_mint": "", - "block.cobblemon.green_mint": "", - "block.cobblemon.white_mint": "", - "block.cobblemon.vivichoke_seeds": "", - "block.cobblemon.pep_up_flower": "", - "block.cobblemon.potted_pep_up_flower": "", - "block.cobblemon.gilded_chest": "", - "block.cobblemon.gimmighoul_chest": "", - "block.cobblemon.blue_gilded_chest": "", - "block.cobblemon.yellow_gilded_chest": "", - "block.cobblemon.pink_gilded_chest": "", - "block.cobblemon.black_gilded_chest": "", - "block.cobblemon.green_gilded_chest": "", - "block.cobblemon.white_gilded_chest": "", - "block.cobblemon.display_case": "", - "block.cobblemon.small_budding_tumblestone": "", - "block.cobblemon.medium_budding_tumblestone": "", - "block.cobblemon.large_budding_tumblestone": "", - "block.cobblemon.tumblestone_cluster": "", - "block.cobblemon.tumblestone_block": "", - "block.cobblemon.polished_tumblestone": "", - "block.cobblemon.polished_tumblestone_slab": "", - "block.cobblemon.polished_tumblestone_stairs": "", - "block.cobblemon.polished_tumblestone_wall": "", - "block.cobblemon.chiseled_polished_tumblestone": "", - "block.cobblemon.tumblestone_bricks": "", - "block.cobblemon.tumblestone_brick_slab": "", - "block.cobblemon.tumblestone_brick_stairs": "", - "block.cobblemon.tumblestone_brick_wall": "", - "block.cobblemon.chiseled_tumblestone_bricks": "", - "block.cobblemon.smooth_tumblestone": "", - "block.cobblemon.smooth_tumblestone_slab": "", - "block.cobblemon.smooth_tumblestone_stairs": "", - "block.cobblemon.small_budding_sky_tumblestone": "", - "block.cobblemon.medium_budding_sky_tumblestone": "", - "block.cobblemon.large_budding_sky_tumblestone": "", - "block.cobblemon.sky_tumblestone_cluster": "", - "block.cobblemon.sky_tumblestone_block": "", - "block.cobblemon.polished_sky_tumblestone": "", - "block.cobblemon.polished_sky_tumblestone_slab": "", - "block.cobblemon.polished_sky_tumblestone_stairs": "", - "block.cobblemon.polished_sky_tumblestone_wall": "", - "block.cobblemon.chiseled_polished_sky_tumblestone": "", - "block.cobblemon.sky_tumblestone_bricks": "", - "block.cobblemon.sky_tumblestone_brick_slab": "", - "block.cobblemon.sky_tumblestone_brick_stairs": "", - "block.cobblemon.sky_tumblestone_brick_wall": "", - "block.cobblemon.chiseled_sky_tumblestone_bricks": "", - "block.cobblemon.smooth_sky_tumblestone": "", - "block.cobblemon.smooth_sky_tumblestone_slab": "", - "block.cobblemon.smooth_sky_tumblestone_stairs": "", - "block.cobblemon.small_budding_black_tumblestone": "", - "block.cobblemon.medium_budding_black_tumblestone": "", - "block.cobblemon.large_budding_black_tumblestone": "", - "block.cobblemon.black_tumblestone_cluster": "", - "block.cobblemon.black_tumblestone_block": "", - "block.cobblemon.polished_black_tumblestone": "", - "block.cobblemon.polished_black_tumblestone_slab": "", - "block.cobblemon.polished_black_tumblestone_stairs": "", - "block.cobblemon.polished_black_tumblestone_wall": "", - "block.cobblemon.chiseled_polished_black_tumblestone": "", - "block.cobblemon.black_tumblestone_bricks": "", - "block.cobblemon.black_tumblestone_brick_slab": "", - "block.cobblemon.black_tumblestone_brick_stairs": "", - "block.cobblemon.black_tumblestone_brick_wall": "", - "block.cobblemon.chiseled_black_tumblestone_bricks": "", - "block.cobblemon.smooth_black_tumblestone": "", - "block.cobblemon.smooth_black_tumblestone_slab": "", - "block.cobblemon.smooth_black_tumblestone_stairs": "", - "block.cobblemon.fire_stone_block": "", - "block.cobblemon.water_stone_block": "", - "block.cobblemon.thunder_stone_block": "", - "block.cobblemon.leaf_stone_block": "", - "block.cobblemon.ice_stone_block": "", - "block.cobblemon.sun_stone_block": "", - "block.cobblemon.moon_stone_block": "", - "block.cobblemon.shiny_stone_block": "", - "block.cobblemon.dawn_stone_block": "", - "block.cobblemon.dusk_stone_block": "", - "cobblemon.fishing_bait_effect_header": "", - "cobblemon.fishing_bait_effects.nature.tooltip": "", - "cobblemon.fishing_bait_effects.iv.tooltip": "", - "cobblemon.fishing_bait_effects.ev.tooltip": "", - "cobblemon.fishing_bait_effects.bite_time.tooltip": "", - "cobblemon.fishing_bait_effects.gender_chance.tooltip": "", - "cobblemon.fishing_bait_effects.level_raise.tooltip": "", - "cobblemon.fishing_bait_effects.tera.tooltip": "", - "cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "", - "cobblemon.fishing_bait_effects.ha_chance.tooltip": "", - "cobblemon.fishing_bait_effects.pokemon_chance.tooltip": "", - "cobblemon.fishing_bait_effects.friendship.tooltip": "", - "cobblemon.fishing_bait_effects.inert.tooltip": "", - "entity.minecraft.villager.nurse": "", - "entity.minecraft.villager.cobblemon.nurse": "", - "cobblemon.overflow_no_pc": "", - "cobblemon.overflow_no_space": "", - "cobblemon.overflow_to_pc": "", - "cobblemon.your_pc": "", - "cobblemon.command.pokespawn.invalid-pokemon": "", - "cobblemon.command.pokespawn.invalid-move": "", - "cobblemon.command.clearparty.nonethere": "", - "cobblemon.command.clearparty.cleared": "", - "cobblemon.command.clearpc.cleared": "", - "cobblemon.command.dialogue.invalid-dialogue": "", - "cobblemon.ui.generic.yes": "", - "cobblemon.ui.generic.no": "", - "cobblemon.ui.pokenav.title": "", - "cobblemon.ui.pokenav.narrator.backbutton": "", - "cobblemon.ui.summary.title": "", - "cobblemon.ui.starter.title": "", - "cobblemon.ui.starter.choosebutton": "", - "cobblemon.ui.starter.alreadyselected": "", - "cobblemon.ui.starter.cannotchoose": "", - "cobblemon.ui.starter.hasalreadychosen": "", - "cobblemon.ui.starter.skippedchoosing": "", - "cobblemon.ui.starter.choose_starter_title": "", - "cobblemon.ui.starter.narrator.backbutton": "", - "cobblemon.ui.starter.choose_starter_description": "", - "cobblemon.ui.starter.chooseyourstarter": "", - "cobblemon.ui.moves": "", - "cobblemon.ui.moves.switch": "", - "cobblemon.ui.moves.pp": "", - "cobblemon.ui.moves.forget": "", - "cobblemon.ui.stats": "", - "cobblemon.ui.stats.stat": "", - "cobblemon.ui.stats.base": "", - "cobblemon.ui.stats.ivs": "", - "cobblemon.ui.stats.evs": "", - "cobblemon.ui.stats.other": "", - "cobblemon.ui.stats.friendship": "", - "cobblemon.ui.stats.hp": "", - "cobblemon.ui.stats.atk": "", - "cobblemon.ui.stats.def": "", - "cobblemon.ui.stats.sp_atk": "", - "cobblemon.ui.stats.sp_def": "", - "cobblemon.ui.stats.speed": "", - "cobblemon.ui.stash.gold": "", - "cobblemon.ui.stash.netherite": "", - "cobblemon.ui.info": "", - "cobblemon.ui.info.pokedex_number": "", - "cobblemon.ui.info.species": "", - "cobblemon.ui.info.type": "", - "cobblemon.ui.info.original_trainer": "", - "cobblemon.ui.info.nature": "", - "cobblemon.ui.info.ability": "", - "cobblemon.ui.info.experience_points": "", - "cobblemon.ui.info.to_next_level": "", - "cobblemon.ui.trade": "", - "cobblemon.trade.occupied": "", - "cobblemon.trade.request_expired": "", - "cobblemon.trade.request_already_expired": "", - "cobblemon.trade.request_sent": "", - "cobblemon.trade.offer": "", - "cobblemon.ui.party": "", - "cobblemon.ui.power": "", - "cobblemon.ui.accuracy": "", - "cobblemon.ui.effect": "", - "cobblemon.ui.pokemon": "", - "cobblemon.ui.exit": "", - "cobblemon.ui.pc.box.title": "", - "cobblemon.ui.pc.release": "", - "cobblemon.ui.pasture": "", - "cobblemon.ui.pasture.recall_all": "", - "cobblemon.ui.pasture.owned_name": "", - "cobblemon.pasture.too_many_nearby": "", - "cobblemon.ui.interact.give.item": "", - "cobblemon.ui.interact.spectate": "", - "cobblemon.ui.interact.trade": "", - "cobblemon.ui.interact.battle": "", - "cobblemon.ui.interact.unavailable": "", - "cobblemon.ui.interact.accept": "", - "cobblemon.ui.interact.decline": "", - "cobblemon.ui.interact.failed": "", - "cobblemon.ui.interact.mount.shoulder": "", - "cobblemon.ui.interact.team_leave": "", - "cobblemon.ui.interact.team_request": "", - "cobblemon.ui.interact.too_far": "", - "cobblemon.ui.pokedex.scan.registered_suffix": "", - "cobblemon.ui.pokedex.scan.trainer_owned": "", - "cobblemon.ui.pokedex.region.national": "", - "cobblemon.ui.pokedex.region.alola": "", - "cobblemon.ui.pokedex.region.galar": "", - "cobblemon.ui.pokedex.region.hisui": "", - "cobblemon.ui.pokedex.region.hoenn": "", - "cobblemon.ui.pokedex.region.johto": "", - "cobblemon.ui.pokedex.region.kalos": "", - "cobblemon.ui.pokedex.region.kanto": "", - "cobblemon.ui.pokedex.region.paldea": "", - "cobblemon.ui.pokedex.region.sinnoh": "", - "cobblemon.ui.pokedex.region.unknown": "", - "cobblemon.ui.pokedex.region.unova": "", - "cobblemon.ui.pokedex.info.ability": "", - "cobblemon.ui.pokedex.info.entry": "", - "cobblemon.ui.pokedex.info.stats": "", - "cobblemon.ui.pokedex.info.drops": "", - "cobblemon.ui.pokedex.info.drops_display": "", - "cobblemon.ui.pokedex.info.drops_amount": "", - "cobblemon.ui.pokedex.info.drops_range": "", - "cobblemon.ui.pokedex.info.drops_percentage": "", - "cobblemon.ui.pokedex.info.drops_empty": "", - "cobblemon.ui.pokedex.info.variation": "", - "cobblemon.ui.pokedex.info.form": "", - "cobblemon.ui.pokedex.info.form.normal": "", - "cobblemon.ui.pokedex.info.form.alola": "", - "cobblemon.ui.pokedex.info.form.region-bias-alola": "", - "cobblemon.ui.pokedex.info.form.galar": "", - "cobblemon.ui.pokedex.info.form.region-bias-galar": "", - "cobblemon.ui.pokedex.info.form.hisui": "", - "cobblemon.ui.pokedex.info.form.region-bias-hisui": "", - "cobblemon.ui.pokedex.info.form.paldea": "", - "cobblemon.ui.pokedex.info.form.region-bias-paldea": "", - "cobblemon.ui.pokedex.info.form.netherite-coating-stage1": "", - "cobblemon.ui.pokedex.info.form.netherite-coating-stage2": "", - "cobblemon.ui.pokedex.info.form.netherite-coating-stage3": "", - "cobblemon.ui.pokedex.info.form.netherite-coating-stage4": "", - "cobblemon.ui.pokedex.info.form.netherite-coating-stage5": "", - "cobblemon.ui.pokedex.info.form.netherite-coating-stage6": "", - "cobblemon.ui.pokedex.info.form.netherite-coating-stage7": "", - "cobblemon.ui.pokedex.info.form.netherite-coating-full": "", - "cobblemon.ui.pokedex.info.form.roaming": "", - "cobblemon.ui.pokedex.info.form.minecraft": "", - "cobblemon.ui.pokedex.info.form.squawkabilly-color-blue": "", - "cobblemon.ui.pokedex.info.form.squawkabilly-color-gray": "", - "cobblemon.ui.pokedex.info.form.squawkabilly-color-green": "", - "cobblemon.ui.pokedex.info.form.squawkabilly-color-yellow": "", - "cobblemon.ui.pokedex.info.form.maushold-family-four": "", - "cobblemon.ui.pokedex.info.form.no_ice": "", - "cobblemon.ui.pokedex.info.form.color-light_gray": "", - "cobblemon.ui.pokedex.info.form.color-gray": "", - "cobblemon.ui.pokedex.info.form.color-black": "", - "cobblemon.ui.pokedex.info.form.color-brown": "", - "cobblemon.ui.pokedex.info.form.color-red": "", - "cobblemon.ui.pokedex.info.form.color-orange": "", - "cobblemon.ui.pokedex.info.form.color-yellow": "", - "cobblemon.ui.pokedex.info.form.color-lime": "", - "cobblemon.ui.pokedex.info.form.color-green": "", - "cobblemon.ui.pokedex.info.form.color-cyan": "", - "cobblemon.ui.pokedex.info.form.color-light_blue": "", - "cobblemon.ui.pokedex.info.form.color-blue": "", - "cobblemon.ui.pokedex.info.form.color-purple": "", - "cobblemon.ui.pokedex.info.form.color-magenta": "", - "cobblemon.ui.pokedex.info.form.color-pink": "", - "cobblemon.ui.pokedex.info.form.color-white": "", - "cobblemon.ui.pokedex.info.form.tree-oak": "", - "cobblemon.ui.pokedex.info.form.tree-spruce": "", - "cobblemon.ui.pokedex.info.form.tree-acacia": "", - "cobblemon.ui.pokedex.info.form.tree-birch": "", - "cobblemon.ui.pokedex.info.form.tree-darkoak": "", - "cobblemon.ui.pokedex.info.form.tree-jungle": "", - "cobblemon.ui.pokedex.info.form.tree-mangrove": "", - "cobblemon.ui.pokedex.info.form.tree-cherry": "", - "cobblemon.ui.pokedex.info.form.tree-crimson": "", - "cobblemon.ui.pokedex.info.form.tree-warped": "", - "cobblemon.ui.pokedex.info.form.tree-swamp": "", - "cobblemon.ui.pokedex.info.form.tree-azalea": "", - "cobblemon.ui.pokedex.info.form.schooling": "", - "cobblemon.ui.pokedex.info.form.flower-blue": "", - "cobblemon.ui.pokedex.info.form.flower-orange": "", - "cobblemon.ui.pokedex.info.form.flower-yellow": "", - "cobblemon.ui.pokedex.info.form.flower-white": "", - "cobblemon.ui.pokedex.info.form.flower-red": "", - "cobblemon.ui.pokedex.info.form.flower-pink": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-archipelago": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-continental": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-elegant": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-fancy": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-garden": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-high-plains": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-icy-snow": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-jungle": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-marine": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-meadow": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-modern": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-monsoon": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-ocean": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-poke-ball": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-polar": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-river": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-sandstorm": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-savanna": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-sun": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-tundra": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-inferno": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-void": "", - "cobblemon.ui.pokedex.info.form.vivillon-wings-forsaken": "", - "cobblemon.ui.pokedex.info.form.autumn": "", - "cobblemon.ui.pokedex.info.form.summer": "", - "cobblemon.ui.pokedex.info.form.winter": "", - "cobblemon.ui.pokedex.info.form.redstriped": "", - "cobblemon.ui.pokedex.info.form.bluestriped": "", - "cobblemon.ui.pokedex.info.form.whitestriped": "", - "cobblemon.ui.pokedex.info.form.metals-copper": "", - "cobblemon.ui.pokedex.info.form.metals-iron": "", - "cobblemon.ui.pokedex.info.form.metals-gold": "", - "cobblemon.ui.pokedex.info.form.metals-netherite": "", - "cobblemon.ui.pokedex.info.form.mooshtank-red": "", - "cobblemon.ui.pokedex.info.form.mooshtank-brown": "", - "cobblemon.ui.pokedex.info.form.snake-pattern-attack": "", - "cobblemon.ui.pokedex.info.form.snake-pattern-dark": "", - "cobblemon.ui.pokedex.info.form.snake-pattern-elusive": "", - "cobblemon.ui.pokedex.info.form.snake-pattern-heart": "", - "cobblemon.ui.pokedex.info.form.snake-pattern-legacy": "", - "cobblemon.ui.pokedex.info.form.snake-pattern-sound": "", - "cobblemon.ui.pokedex.info.form.snake-pattern-speed": "", - "cobblemon.ui.pokedex.info.form.shulker": "", - "cobblemon.ui.pokedex.info.form.zen_mode": "", - "cobblemon.ui.pokedex.info.form.valencian": "", - "cobblemon.ui.pokedex.info.unimplemented": "", - "cobblemon.ui.pokedex.search": "", - "cobblemon.ui.pokedex.unknown": "", - "cobblemon.ui.pokedex.weight": "", - "cobblemon.ui.pokedex.height": "", - "cobblemon.pokedex.variation.cream": "", - "cobblemon.pokedex.variation.decoration": "", - "cobblemon.pokedex.variation.flower": "", - "cobblemon.pokedex.variation.face_spot_1": "", - "cobblemon.pokedex.variation.face_spot_2": "", - "cobblemon.pokedex.variation.special_spot": "", - "cobblemon.pokedex.variation.left_ear_spot": "", - "cobblemon.pokedex.variation.right_ear_spot": "", - "cobblemon.pokedex.variation.color": "", - "cobblemon.pokedex.variation.pattern": "", - "cobblemon.pokedex.variation.metal": "", - "cobblemon.pokedex.variation.netherite_coating": "", - "cobblemon.pokedex.variation.ice": "", - "cobblemon.pokedex.variation.breed": "", - "cobblemon.pokedex.variation.size": "", - "cobblemon.pokedex.variation.wood": "", - "cobblemon.pokedex.variation.stripes": "", - "cobblemon.pokedex.variation.region_bias": "", - "cobblemon.pokedex.variation.variant": "", - "cobblemon.pokedex.variation.season": "", - "cobblemon.pokedex.variation.snake_pattern": "", - "key.cobblemon.upshiftparty": "", - "key.cobblemon.downshiftparty": "", - "key.cobblemon.hideparty": "", - "key.cobblemon.throwpartypokemon": "", - "key.cobblemon.pokenavigator": "", - "key.cobblemon.summary": "", - "key.cobblemon.pokedex": "", - "key.cobblemon.categories.cobblemon": "", - "key.cobblemon.scaleportraitup": "", - "key.cobblemon.scaleportraitdown": "", - "key.cobblemon.translateportraitup": "", - "key.cobblemon.translateportraitdown": "", - "key.cobblemon.translateportraitleft": "", - "key.cobblemon.translateportraitright": "", - "key.cobblemon.printmodelsettings": "", - "key.cobblemon.categories.cobblemon.debug": "", - "cobblemon.subtitle.poke_ball.capture_succeeded": "", - "cobblemon.subtitle.pokemon.shiny_shine": "", - "cobblemon.subtitle.pokemon.wild_shiny_shine": "", - "cobblemon.subtitle.pokemon.owned_shiny_ambient": "", - "cobblemon.subtitle.pokemon.shiny_ambient": "", - "cobblemon.subtitle.fossilmachine.activate": "", - "cobblemon.subtitle.fossilmachine.active_loop": "", - "cobblemon.subtitle.fossilmachine.dna_full": "", - "cobblemon.subtitle.fossilmachine.finished": "", - "cobblemon.subtitle.fossilmachine.insert_dna": "", - "cobblemon.subtitle.fossilmachine.insert_dna_small": "", - "cobblemon.subtitle.fossilmachine.insert_fossil": "", - "cobblemon.subtitle.fossilmachine.retrieve_fossil": "", - "cobblemon.subtitle.fossilmachine.retrieve_pokemon": "", - "cobblemon.subtitle.fossilmachine.unprotected": "", - "cobblemon.subtitle.fossilmachine.assemble": "", - "cobblemon.healingmachine.alreadyinuse": "", - "cobblemon.healingmachine.nopokemon": "", - "cobblemon.healingmachine.alreadyhealed": "", - "cobblemon.healingmachine.healing": "", - "cobblemon.healingmachine.healed": "", - "cobblemon.healingmachine.notenoughcharge": "", - "cobblemon.healingmachine.inbattle": "", - "cobblemon.healingmachine.alreadyhealing": "", - "cobblemon.pc.inbattle": "", - "cobblemon.held_item": "", - "cobblemon.held_item.give": "", - "cobblemon.held_item.replace": "", - "cobblemon.held_item.take": "", - "cobblemon.held_item.already_holding": "", - "cobblemon.ui.pokemonteam": "", - "cobblemon.ui.lv": "", - "cobblemon.ui.lv.number": "", - "cobblemon.ui.changemove": "", - "cobblemon.ui.status.brn": "", - "cobblemon.ui.status.fnt": "", - "cobblemon.ui.status.frz": "", - "cobblemon.ui.status.par": "", - "cobblemon.ui.status.psn": "", - "cobblemon.ui.status.slp": "", - "cobblemon.ui.status.tox": "", - "cobblemon.battle.ui.fight": "", - "cobblemon.battle.ui.switch": "", - "cobblemon.battle.ui.capture": "", - "cobblemon.battle.ui.run": "", - "cobblemon.battle.ui.forfeit": "", - "cobblemon.battle.ui.forfeit_confirmation": "", - "cobblemon.battle.ui.hide_label": "", - "cobblemon.battle.ui.actions_label": "", - "cobblemon.ui.evolve": "", - "cobblemon.ui.evolution": "", - "cobblemon.ui.evolve.hint": "", - "cobblemon.ui.evolve.into": "", - "cobblemon.label.lv": "", - "cobblemon.challenge_label": "", - "cobblemon.challenge.sender": "", - "cobblemon.challenge.pending": "", - "cobblemon.challenge.receiver": "", - "cobblemon.challenge.challenge": "", - "cobblemon.challenge.request_battle_title": "", - "cobblemon.challenge.rule.level": "", - "cobblemon.challenge.rule.anything_goes": "", - "cobblemon.challenge.request_team_join_title": "", - "cobblemon.challenge.request_team_leave_title": "", - "cobblemon.challenge.multi.team_request.sender": "", - "cobblemon.challenge.multi.team_request.receiver": "", - "cobblemon.challenge.multi.team_request.accept.sender": "", - "cobblemon.challenge.multi.team_request.accept.receiver": "", - "cobblemon.challenge.multi.team_request.decline.sender": "", - "cobblemon.challenge.multi.team_request.decline.receiver": "", - "cobblemon.challenge.multi.team_remove.receiver": "", - "cobblemon.challenge.multi.team_remove.sender": "", - "cobblemon.challenge.multi.team_disband": "", - "cobblemon.challenge.multi.team_reject.existing_team": "", - "cobblemon.challenge.multi.team_reject.max_team_size": "", - "cobblemon.challenge.multi.sender": "", - "cobblemon.challenge.multi.receiver": "", - "cobblemon.challenge.multi.invite": "", - "cobblemon.challenge.multi.leave": "", - "cobblemon.challenge.multi.decline.receiver": "", - "cobblemon.challenge.multi.decline.disband": "", - "cobblemon.challenge.multi.decline.sender": "", - "cobblemon.challenge.multi.decline.sender.personal": "", - "cobblemon.challenge.decline.sender": "", - "cobblemon.challenge.decline.receiver": "", - "cobblemon.drop.item.inventory": "", - "cobblemon.drop.item.full": "", - "cobblemon.mint.interact": "", - "cobblemon.mint.same_nature": "", - "cobblemon.ability_changer.changed": "", - "itemGroup.cobblemon.plants": "", - "item.cobblemon.aguav_berry": "", - "item.cobblemon.aguav_berry.tooltip": "", - "item.cobblemon.apicot_berry": "", - "item.cobblemon.apicot_berry.tooltip": "", - "item.cobblemon.aspear_berry": "", - "item.cobblemon.aspear_berry.tooltip": "", - "item.cobblemon.babiri_berry": "", - "item.cobblemon.babiri_berry.tooltip": "", - "item.cobblemon.belue_berry": "", - "item.cobblemon.belue_berry.tooltip": "", - "item.cobblemon.bluk_berry": "", - "item.cobblemon.bluk_berry.tooltip": "", - "item.cobblemon.charti_berry": "", - "item.cobblemon.charti_berry.tooltip": "", - "item.cobblemon.cheri_berry": "", - "item.cobblemon.cheri_berry.tooltip": "", - "item.cobblemon.chesto_berry": "", - "item.cobblemon.chesto_berry.tooltip": "", - "item.cobblemon.chilan_berry": "", - "item.cobblemon.chilan_berry.tooltip": "", - "item.cobblemon.chople_berry": "", - "item.cobblemon.chople_berry.tooltip": "", - "item.cobblemon.coba_berry": "", - "item.cobblemon.coba_berry.tooltip": "", - "item.cobblemon.colbur_berry": "", - "item.cobblemon.colbur_berry.tooltip": "", - "item.cobblemon.cornn_berry": "", - "item.cobblemon.cornn_berry.tooltip": "", - "item.cobblemon.custap_berry": "", - "item.cobblemon.custap_berry.tooltip": "", - "item.cobblemon.durin_berry": "", - "item.cobblemon.durin_berry.tooltip": "", - "item.cobblemon.enigma_berry": "", - "item.cobblemon.enigma_berry.tooltip": "", - "item.cobblemon.figy_berry": "", - "item.cobblemon.figy_berry.tooltip": "", - "item.cobblemon.ganlon_berry": "", - "item.cobblemon.ganlon_berry.tooltip": "", - "item.cobblemon.grepa_berry": "", - "item.cobblemon.grepa_berry.tooltip": "", - "item.cobblemon.haban_berry": "", - "item.cobblemon.haban_berry.tooltip": "", - "item.cobblemon.hondew_berry": "", - "item.cobblemon.hondew_berry.tooltip": "", - "item.cobblemon.hopo_berry": "", - "item.cobblemon.hopo_berry.tooltip": "", - "item.cobblemon.iapapa_berry": "", - "item.cobblemon.iapapa_berry.tooltip": "", - "item.cobblemon.jaboca_berry": "", - "item.cobblemon.jaboca_berry.tooltip": "", - "item.cobblemon.kasib_berry": "", - "item.cobblemon.kasib_berry.tooltip": "", - "item.cobblemon.kebia_berry": "", - "item.cobblemon.kebia_berry.tooltip": "", - "item.cobblemon.kee_berry": "", - "item.cobblemon.kee_berry.tooltip": "", - "item.cobblemon.kelpsy_berry": "", - "item.cobblemon.kelpsy_berry.tooltip": "", - "item.cobblemon.lansat_berry": "", - "item.cobblemon.lansat_berry.tooltip": "", - "item.cobblemon.leppa_berry": "", - "item.cobblemon.leppa_berry.tooltip": "", - "item.cobblemon.liechi_berry": "", - "item.cobblemon.liechi_berry.tooltip": "", - "item.cobblemon.lum_berry": "", - "item.cobblemon.lum_berry.tooltip": "", - "item.cobblemon.mago_berry": "", - "item.cobblemon.mago_berry.tooltip": "", - "item.cobblemon.magost_berry": "", - "item.cobblemon.magost_berry.tooltip": "", - "item.cobblemon.maranga_berry": "", - "item.cobblemon.maranga_berry.tooltip": "", - "item.cobblemon.micle_berry": "", - "item.cobblemon.micle_berry.tooltip": "", - "item.cobblemon.nanab_berry": "", - "item.cobblemon.nanab_berry.tooltip": "", - "item.cobblemon.touga_berry": "", - "item.cobblemon.touga_berry.tooltip": "", - "item.cobblemon.nomel_berry": "", - "item.cobblemon.nomel_berry.tooltip": "", - "item.cobblemon.occa_berry": "", - "item.cobblemon.occa_berry.tooltip": "", - "item.cobblemon.oran_berry": "", - "item.cobblemon.oran_berry.tooltip": "", - "item.cobblemon.pamtre_berry": "", - "item.cobblemon.pamtre_berry.tooltip": "", - "item.cobblemon.passho_berry": "", - "item.cobblemon.passho_berry.tooltip": "", - "item.cobblemon.payapa_berry": "", - "item.cobblemon.payapa_berry.tooltip": "", - "item.cobblemon.pecha_berry": "", - "item.cobblemon.pecha_berry.tooltip": "", - "item.cobblemon.persim_berry": "", - "item.cobblemon.persim_berry.tooltip": "", - "item.cobblemon.petaya_berry": "", - "item.cobblemon.petaya_berry.tooltip": "", - "item.cobblemon.pinap_berry": "", - "item.cobblemon.pinap_berry.tooltip": "", - "item.cobblemon.pomeg_berry": "", - "item.cobblemon.pomeg_berry.tooltip": "", - "item.cobblemon.qualot_berry": "", - "item.cobblemon.qualot_berry.tooltip": "", - "item.cobblemon.rabuta_berry": "", - "item.cobblemon.rabuta_berry.tooltip": "", - "item.cobblemon.rawst_berry": "", - "item.cobblemon.rawst_berry.tooltip": "", - "item.cobblemon.razz_berry": "", - "item.cobblemon.razz_berry.tooltip": "", - "item.cobblemon.rindo_berry": "", - "item.cobblemon.rindo_berry.tooltip": "", - "item.cobblemon.roseli_berry": "", - "item.cobblemon.roseli_berry.tooltip": "", - "item.cobblemon.rowap_berry": "", - "item.cobblemon.rowap_berry.tooltip": "", - "item.cobblemon.salac_berry": "", - "item.cobblemon.salac_berry.tooltip": "", - "item.cobblemon.shuca_berry": "", - "item.cobblemon.shuca_berry.tooltip": "", - "item.cobblemon.sitrus_berry": "", - "item.cobblemon.sitrus_berry.tooltip": "", - "item.cobblemon.spelon_berry": "", - "item.cobblemon.spelon_berry.tooltip": "", - "item.cobblemon.starf_berry": "", - "item.cobblemon.starf_berry.tooltip": "", - "item.cobblemon.tamato_berry": "", - "item.cobblemon.tamato_berry.tooltip": "", - "item.cobblemon.tanga_berry": "", - "item.cobblemon.tanga_berry.tooltip": "", - "item.cobblemon.wacan_berry": "", - "item.cobblemon.wacan_berry.tooltip": "", - "item.cobblemon.watmel_berry": "", - "item.cobblemon.watmel_berry.tooltip": "", - "item.cobblemon.wepear_berry": "", - "item.cobblemon.wepear_berry.tooltip": "", - "item.cobblemon.wiki_berry": "", - "item.cobblemon.wiki_berry.tooltip": "", - "item.cobblemon.yache_berry": "", - "item.cobblemon.yache_berry.tooltip": "", - "cobblemon.command.general.invalid-party-slot": "", - "cobblemon.command.givepokemon.give": "", - "cobblemon.command.pokemonedit": "", - "cobblemon.command.teach": "", - "cobblemon.command.teach.already_knows": "", - "cobblemon.command.healpokemon.heal": "", - "cobblemon.command.friendship": "", - "cobblemon.command.givepokemon.nospecies": "", - "cobblemon.command.spawnpokemon.nospecies": "", - "cobblemon.command.error.nonpc": "", - "cobblemon.command.held_item": "", - "cobblemon.command.pokeheal.in_battle": "", - "cobblemon.command.spawnpokemonfrompool": "", - "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "", - "cobblemon.command.pokebox.box_does_not_exist": "", - "cobblemon.command.pokebox.box_is_full": "", - "cobblemon.command.pokebox.storage_is_full": "", - "cobblemon.command.pokebox.last_pokemon": "", - "cobblemon.command.pokemonrestart": "", - "cobblemon.command.freezepokemon.non_pokemon": "", - "advancements.cobblemon.root": "", - "advancements.cobblemon.root.description": "", - "advancements.cobblemon.obtain_leftovers": "", - "advancements.cobblemon.obtain_leftovers.description": "", - "advancements.cobblemon.any_plant": "", - "advancements.cobblemon.any_plant.description": "", - "advancements.cobblemon.harvest_apricorn": "", - "advancements.cobblemon.harvest_apricorn.description": "", - "advancements.cobblemon.harvest_apricorn_seed": "", - "advancements.cobblemon.harvest_apricorn_seed.description": "", - "advancements.cobblemon.bone_meal_apricorn": "", - "advancements.cobblemon.bone_meal_apricorn.description": "", - "advancements.cobblemon.rainbow_apricorns": "", - "advancements.cobblemon.rainbow_apricorns.description": "", - "advancements.cobblemon.craft_poke_ball": "", - "advancements.cobblemon.craft_poke_ball.description": "", - "advancements.cobblemon.craft_base_balls": "", - "advancements.cobblemon.craft_base_balls.description": "", - "advancements.cobblemon.craft_apricorn_balls": "", - "advancements.cobblemon.craft_apricorn_balls.description": "", - "advancements.cobblemon.craft_all_balls": "", - "advancements.cobblemon.craft_all_balls.description": "", - "advancements.cobblemon.first_catch": "", - "advancements.cobblemon.first_catch.description": "", - "advancements.cobblemon.full_party": "", - "advancements.cobblemon.full_party.description": "", - "advancements.cobblemon.first_evolution": "", - "advancements.cobblemon.first_evolution.description": "", - "advancements.cobblemon.first_battle_victory": "", - "advancements.cobblemon.first_battle_victory.description": "", - "advancements.cobblemon.first_shiny_catch": "", - "advancements.cobblemon.first_shiny_catch.description": "", - "advancements.cobblemon.healing_machine": "", - "advancements.cobblemon.healing_machine.description": "", - "advancements.cobblemon.obtain_leek": "", - "advancements.cobblemon.obtain_leek.description": "", - "advancements.cobblemon.medicinal_brew": "", - "advancements.cobblemon.medicinal_brew.description": "", - "advancements.cobblemon.brew_potion": "", - "advancements.cobblemon.brew_potion.description": "", - "advancements.cobblemon.brew_full_restore": "", - "advancements.cobblemon.brew_full_restore.description": "", - "advancements.cobblemon.brew_all": "", - "advancements.cobblemon.brew_all.description": "", - "advancements.cobblemon.obtain_mint": "", - "advancements.cobblemon.obtain_mint.description": "", - "advancements.cobblemon.obtain_all_mints": "", - "advancements.cobblemon.obtain_all_mints.description": "", - "advancements.cobblemon.obtain_revival_herb": "", - "advancements.cobblemon.obtain_revival_herb.description": "", - "advancements.cobblemon.use_revive": "", - "advancements.cobblemon.use_revive.description": "", - "advancements.cobblemon.obtain_big_root": "", - "advancements.cobblemon.obtain_big_root.description": "", - "advancements.cobblemon.craft_remedy": "", - "advancements.cobblemon.craft_remedy.description": "", - "advancements.cobblemon.obtain_vivichoke": "", - "advancements.cobblemon.obtain_vivichoke.description": "", - "advancements.cobblemon.obtain_berry": "", - "advancements.cobblemon.obtain_berry.description": "", - "advancements.cobblemon.obtain_mutated_berry": "", - "advancements.cobblemon.obtain_mutated_berry.description": "", - "advancements.cobblemon.obtain_all_berries": "", - "advancements.cobblemon.obtain_all_berries.description": "", - "advancements.cobblemon.use_pasture": "", - "advancements.cobblemon.use_pasture.description": "", - "advancements.cobblemon.catch_all_vivillon": "", - "advancements.cobblemon.catch_all_vivillon.description": "", - "advancements.cobblemon.catch_all_vivillon_but_actually": "", - "advancements.cobblemon.catch_all_vivillon_but_actually.description": "", - "advancements.cobblemon.evolve_veevees": "", - "advancements.cobblemon.evolve_veevees.description": "", - "advancements.cobblemon.evolve_shedinja": "", - "advancements.cobblemon.evolve_shedinja.description": "", - "advancements.cobblemon.trade_pokemon": "", - "advancements.cobblemon.trade_pokemon.description": "", - "advancements.cobblemon.trade_shelmet_karrablast": "", - "advancements.cobblemon.trade_shelmet_karrablast.description": "", - "advancements.cobblemon.max_level_baby": "", - "advancements.cobblemon.max_level_baby.description": "", - "advancements.cobblemon.use_candy": "", - "advancements.cobblemon.use_candy.description": "", - "advancements.cobblemon.own_zangoose_seviper": "", - "advancements.cobblemon.own_zangoose_seviper.description": "", - "advancements.cobblemon.obtain_fossil": "", - "advancements.cobblemon.obtain_fossil.description": "", - "advancements.cobblemon.evolve_gholdengo_netherite": "", - "advancements.cobblemon.evolve_gholdengo_netherite.description": "", - "advancements.cobblemon.resurrect_pokemon": "", - "advancements.cobblemon.resurrect_pokemon.description": "", - "advancements.cobblemon.obtain_tumblestone": "", - "advancements.cobblemon.obtain_tumblestone.description": "", - "advancements.cobblemon.grow_tumblestone": "", - "advancements.cobblemon.grow_tumblestone.description": "", - "advancements.cobblemon.craft_ancient_balls": "", - "advancements.cobblemon.craft_ancient_balls.description": "", - "advancements.cobblemon.craft_rod": "", - "advancements.cobblemon.craft_rod.description": "", - "advancements.cobblemon.use_bait": "", - "advancements.cobblemon.use_bait.description": "", - "advancements.cobblemon.craft_master_rod": "", - "advancements.cobblemon.craft_master_rod.description": "", - "cobblemon.battle.crash": "", - "cobblemon.battle.damage_dealt": "", - "cobblemon.battle.used_move": "", - "cobblemon.battle.used_move_on": "", - "cobblemon.battle.choose_actions": "", - "cobblemon.battle.owned_pokemon": "", - "cobblemon.battle.fainted": "", - "cobblemon.battle.win": "", - "cobblemon.battle.lose": "", - "cobblemon.battle.forfeit": "", - "cobblemon.battle.flee": "", - "cobblemon.battle.switch_option": "", - "cobblemon.battle.your_team": "", - "cobblemon.battle.must_switch": "", - "cobblemon.battle.dragged_out": "", - "cobblemon.battle.shift": "", - "cobblemon.battle.center": "", - "cobblemon.battle.throw_pokeball_prompt": "", - "cobblemon.battle.run_prompt": "", - "cobblemon.battle.resisted": "", - "cobblemon.battle.resisted_spread": "", - "cobblemon.battle.superEffective": "", - "cobblemon.battle.superEffective_spread": "", - "cobblemon.battle.crit": "", - "cobblemon.battle.crit_spread": "", - "cobblemon.battle.nothing": "", - "cobblemon.battle.clearallboost": "", - "cobblemon.battle.clearallnegativeboost": "", - "cobblemon.battle.clearallnegativeboost.zeffect": "", - "cobblemon.battle.clearboost": "", - "cobblemon.battle.unboost.slight": "", - "cobblemon.battle.unboost.sharp": "", - "cobblemon.battle.unboost.severe": "", - "cobblemon.battle.unboost.cap.single": "", - "cobblemon.battle.unboost.cap.multiple": "", - "cobblemon.battle.boost.slight": "", - "cobblemon.battle.boost.slight.zeffect": "", - "cobblemon.battle.boost.sharp": "", - "cobblemon.battle.boost.sharp.zeffect": "", - "cobblemon.battle.boost.severe": "", - "cobblemon.battle.boost.severe.zeffect": "", - "cobblemon.battle.boost.cap.single": "", - "cobblemon.battle.boost.cap.multiple": "", - "cobblemon.battle.setboost.bellydrum": "", - "cobblemon.battle.setboost.angerpoint": "", - "cobblemon.battle.fail": "", - "cobblemon.battle.recharge": "", - "cobblemon.capture.broke_free": "", - "cobblemon.capture.not_your_turn": "", - "cobblemon.capture.attempted_capture": "", - "cobblemon.capture.succeeded": "", - "cobblemon.capture.not_wild": "", - "cobblemon.capture.in_battle": "", - "cobblemon.capture.busy": "", - "cobblemon.capture.you_in_battle": "", - "cobblemon.capture.not_single": "", - "cobblemon.capture.cannot_be_caught": "", - "cobblemon.you_in_battle": "", - "cobblemon.battle.turn": "", - "cobblemon.battle.types.singles": "", - "cobblemon.battle.types.doubles": "", - "cobblemon.battle.types.triples": "", - "cobblemon.battle.types.multi": "", - "cobblemon.battle.types.freeforall": "", - "cobblemon.battle.side_subject.ally": "", - "cobblemon.battle.side_subject.opponent": "", - "cobblemon.battle.transform": "", - "cobblemon.battle.endability": "", - "cobblemon.battle.select_target": "", - "cobblemon.battle.weather.raindance.start": "", - "cobblemon.battle.weather.raindance.upkeep": "", - "cobblemon.battle.weather.raindance.end": "", - "cobblemon.battle.weather.sandstorm.start": "", - "cobblemon.battle.weather.sandstorm.upkeep": "", - "cobblemon.battle.weather.sandstorm.end": "", - "cobblemon.battle.weather.sunnyday.start": "", - "cobblemon.battle.weather.sunnyday.upkeep": "", - "cobblemon.battle.weather.sunnyday.end": "", - "cobblemon.battle.weather.hail.start": "", - "cobblemon.battle.weather.hail.upkeep": "", - "cobblemon.battle.weather.hail.end": "", - "cobblemon.battle.weather.snow.start": "", - "cobblemon.battle.weather.snow.upkeep": "", - "cobblemon.battle.weather.snow.end": "", - "cobblemon.battle.start.bide": "", - "cobblemon.battle.start.magnetrise": "", - "cobblemon.battle.start.disable": "", - "cobblemon.battle.start.nightmare": "", - "cobblemon.battle.start.imprison": "", - "cobblemon.battle.start.snatch": "", - "cobblemon.battle.start.noretreat": "", - "cobblemon.battle.start.saltcure": "", - "cobblemon.battle.start.shedtail": "", - "cobblemon.battle.start.smackdown": "", - "cobblemon.battle.start.torment": "", - "cobblemon.battle.start.foresight": "", - "cobblemon.battle.start.telekinesis": "", - "cobblemon.battle.start.laserfocus": "", - "cobblemon.battle.start.lockon": "", - "cobblemon.battle.start.yawn": "", - "cobblemon.battle.start.perish": "", - "cobblemon.battle.start.leechseed": "", - "cobblemon.battle.start.aquaring": "", - "cobblemon.battle.start.charge": "", - "cobblemon.battle.start.taunt": "", - "cobblemon.battle.start.autotomize": "", - "cobblemon.battle.start.attract": "", - "cobblemon.battle.start.focusenergy": "", - "cobblemon.battle.start.uproar": "", - "cobblemon.battle.start.curse": "", - "cobblemon.battle.start.miracleeye": "", - "cobblemon.battle.start.dynamax": "", - "cobblemon.battle.start.gmax": "", - "cobblemon.battle.start.encore": "", - "cobblemon.battle.start.futuresight": "", - "cobblemon.battle.start.ingrain": "", - "cobblemon.battle.start.healblock": "", - "cobblemon.battle.start.mimic": "", - "cobblemon.battle.start.octolock": "", - "cobblemon.battle.start.burnup": "", - "cobblemon.battle.start.typechange": "", - "cobblemon.battle.start.doomdesire": "", - "cobblemon.battle.start.doubleshock": "", - "cobblemon.battle.start.stockpile": "", - "cobblemon.battle.start.powertrick": "", - "cobblemon.battle.start.powershift": "", - "cobblemon.battle.start.substitute": "", - "cobblemon.battle.start.embargo": "", - "cobblemon.battle.start.typeadd": "", - "cobblemon.battle.start.reflecttype": "", - "cobblemon.battle.start.tarshot": "", - "cobblemon.battle.start.confusion": "", - "cobblemon.battle.start.flashfire": "", - "cobblemon.battle.fieldstart.electricterrain": "", - "cobblemon.battle.fieldstart.grassyterrain": "", - "cobblemon.battle.fieldstart.gravity": "", - "cobblemon.battle.fieldstart.magicroom": "", - "cobblemon.battle.fieldstart.mistyterrain": "", - "cobblemon.battle.fieldstart.mudsport": "", - "cobblemon.battle.fieldstart.psychicterrain": "", - "cobblemon.battle.fieldstart.trickroom": "", - "cobblemon.battle.fieldstart.watersport": "", - "cobblemon.battle.fieldstart.wonderroom": "", - "cobblemon.battle.fieldend.electricterrain": "", - "cobblemon.battle.fieldend.grassyterrain": "", - "cobblemon.battle.fieldend.gravity": "", - "cobblemon.battle.fieldend.magicroom": "", - "cobblemon.battle.fieldend.mistyterrain": "", - "cobblemon.battle.fieldend.mudsport": "", - "cobblemon.battle.fieldend.psychicterrain": "", - "cobblemon.battle.fieldend.trickroom": "", - "cobblemon.battle.fieldend.watersport": "", - "cobblemon.battle.fieldend.wonderroom": "", - "cobblemon.battle.fieldactivate.perishsong": "", - "cobblemon.battle.fieldactivate.iondeluge": "", - "cobblemon.battle.fieldactivate.fairylock": "", - "cobblemon.battle.fieldactivate.teatime": "", - "cobblemon.battle.sidestart.stealthrock": "", - "cobblemon.battle.sidestart.spikes": "", - "cobblemon.battle.sidestart.toxicspikes": "", - "cobblemon.battle.sidestart.stickyweb": "", - "cobblemon.battle.sidestart.reflect": "", - "cobblemon.battle.sidestart.lightscreen": "", - "cobblemon.battle.sidestart.auroraveil": "", - "cobblemon.battle.sidestart.tailwind": "", - "cobblemon.battle.sidestart.safeguard": "", - "cobblemon.battle.sidestart.luckychant": "", - "cobblemon.battle.sidestart.mist": "", - "cobblemon.battle.sideend.stealthrock": "", - "cobblemon.battle.sideend.spikes": "", - "cobblemon.battle.sideend.toxicspikes": "", - "cobblemon.battle.sideend.stickyweb": "", - "cobblemon.battle.sideend.reflect": "", - "cobblemon.battle.sideend.lightscreen": "", - "cobblemon.battle.sideend.auroraveil": "", - "cobblemon.battle.sideend.tailwind": "", - "cobblemon.battle.sideend.safeguard": "", - "cobblemon.battle.sideend.luckychant": "", - "cobblemon.battle.sideend.mist": "", - "cobblemon.battle.cant.generic": "", - "cobblemon.battle.cant.truant": "", - "cobblemon.battle.cant.flinch": "", - "cobblemon.battle.cant.recharge": "", - "cobblemon.battle.cant.attract": "", - "cobblemon.battle.cant.disable": "", - "cobblemon.battle.cant.focuspunch": "", - "cobblemon.battle.cant.healblock": "", - "cobblemon.battle.cant.imprison": "", - "cobblemon.battle.cant.gravity": "", - "cobblemon.battle.cant.shelltrap": "", - "cobblemon.battle.cant.taunt": "", - "cobblemon.battle.cant.throatchop": "", - "cobblemon.battle.cant.nopp": "", - "cobblemon.battle.activate.confusion": "", - "cobblemon.battle.activate.happyhour": "", - "cobblemon.battle.activate.mindreader": "", - "cobblemon.battle.activate.magmastorm": "", - "cobblemon.battle.activate.powersplit": "", - "cobblemon.battle.activate.pursuit": "", - "cobblemon.battle.activate.gravity": "", - "cobblemon.battle.activate.mistyterrain": "", - "cobblemon.battle.activate.psychicterrain": "", - "cobblemon.battle.activate.healbell": "", - "cobblemon.battle.activate.aromatherapy": "", - "cobblemon.battle.activate.trapped": "", - "cobblemon.battle.activate.bind": "", - "cobblemon.battle.activate.wrap": "", - "cobblemon.battle.activate.snatch": "", - "cobblemon.battle.activate.sandtomb": "", - "cobblemon.battle.activate.struggle": "", - "cobblemon.battle.activate.stickyweb": "", - "cobblemon.battle.activate.courtchange": "", - "cobblemon.battle.activate.guardsplit": "", - "cobblemon.battle.activate.spite": "", - "cobblemon.battle.activate.lockon": "", - "cobblemon.battle.activate.protosynthesis": "", - "cobblemon.battle.activate.bide": "", - "cobblemon.battle.activate.protect": "", - "cobblemon.battle.activate.magnitude": "", - "cobblemon.battle.activate.destinybond": "", - "cobblemon.battle.activate.synchronize": "", - "cobblemon.battle.activate.endure": "", - "cobblemon.battle.activate.attract": "", - "cobblemon.battle.activate.firespin": "", - "cobblemon.battle.activate.trick": "", - "cobblemon.battle.activate.quickclaw": "", - "cobblemon.battle.activate.focusband": "", - "cobblemon.battle.activate.forewarn": "", - "cobblemon.battle.activate.disguise": "", - "cobblemon.battle.activate.liquidooze": "", - "cobblemon.battle.activate.whirlpool": "", - "cobblemon.battle.activate.clamp": "", - "cobblemon.battle.activate.afteryou": "", - "cobblemon.battle.activate.beatup": "", - "cobblemon.battle.activate.celebrate": "", - "cobblemon.battle.activate.substitute": "", - "cobblemon.battle.activate.infestation": "", - "cobblemon.battle.activate.phantomforce": "", - "cobblemon.battle.activate.matblock": "", - "cobblemon.battle.activate.electricterrain": "", - "cobblemon.battle.activate.ingrain": "", - "cobblemon.battle.activate.mist": "", - "cobblemon.battle.activate.poltergeist": "", - "cobblemon.battle.activate.powder": "", - "cobblemon.battle.activate.quash": "", - "cobblemon.battle.activate.quickguard": "", - "cobblemon.battle.activate.safeguard": "", - "cobblemon.battle.activate.sketch": "", - "cobblemon.battle.activate.grudge": "", - "cobblemon.battle.activate.speedswap": "", - "cobblemon.battle.activate.switcheroo": "", - "cobblemon.battle.activate.skillswap": "", - "cobblemon.battle.activate.wideguard": "", - "cobblemon.battle.activate.craftyshield": "", - "cobblemon.battle.activate.tidyup": "", - "cobblemon.battle.activate.mummy": "", - "cobblemon.battle.activate.allyswitch": "", - "cobblemon.battle.activate.custapberry": "", - "cobblemon.battle.prepare.bounce": "", - "cobblemon.battle.prepare.dig": "", - "cobblemon.battle.prepare.shelltrap": "", - "cobblemon.battle.prepare.dive": "", - "cobblemon.battle.prepare.fly": "", - "cobblemon.battle.prepare.freezeshock": "", - "cobblemon.battle.prepare.geomancy": "", - "cobblemon.battle.prepare.iceburn": "", - "cobblemon.battle.prepare.meteorbeam": "", - "cobblemon.battle.prepare.phantomforce": "", - "cobblemon.battle.prepare.razorwind": "", - "cobblemon.battle.prepare.skullbash": "", - "cobblemon.battle.prepare.skyattack": "", - "cobblemon.battle.prepare.skydrop": "", - "cobblemon.battle.prepare.solarbeam": "", - "cobblemon.battle.swapboost.generic": "", - "cobblemon.battle.swapboost.guardswap": "", - "cobblemon.battle.swapboost.powerswap": "", - "cobblemon.battle.swapboost.heartswap": "", - "cobblemon.battle.copyboost.generic": "", - "cobblemon.battle.singleturn.protect": "", - "cobblemon.battle.singleturn.endure": "", - "cobblemon.battle.singleturn.craftyshield": "", - "cobblemon.battle.singleturn.powder": "", - "cobblemon.battle.singleturn.followme": "", - "cobblemon.battle.singleturn.snatch": "", - "cobblemon.battle.singleturn.quickguard": "", - "cobblemon.battle.singleturn.wideguard": "", - "cobblemon.battle.singleturn.roost": "", - "cobblemon.battle.singleturn.matblock": "", - "cobblemon.battle.singleturn.maxguard": "", - "cobblemon.battle.singleturn.instruct": "", - "cobblemon.battle.singleturn.focuspunch": "", - "cobblemon.battle.singleturn.electrify": "", - "cobblemon.battle.singleturn.beakblast": "", - "cobblemon.battle.singleturn.helpinghand": "", - "cobblemon.battle.singleturn.magiccoat": "", - "cobblemon.battle.singleturn.ragepowder": "", - "cobblemon.battle.singleturn.shelltrap": "", - "cobblemon.battle.singleturn.spotlight": "", - "cobblemon.battle.singlemove.destinybond": "", - "cobblemon.battle.singlemove.glaiverush": "", - "cobblemon.battle.singlemove.grudge": "", - "cobblemon.battle.singlemove.rage": "", - "cobblemon.battle.damage.wrap": "", - "cobblemon.battle.damage.confusion": "", - "cobblemon.battle.damage.leechseed": "", - "cobblemon.battle.damage.sandstorm": "", - "cobblemon.battle.damage.hail": "", - "cobblemon.battle.damage.saltcure": "", - "cobblemon.battle.damage.nightmare": "", - "cobblemon.battle.damage.magmastorm": "", - "cobblemon.battle.damage.stealthrock": "", - "cobblemon.battle.damage.highjumpkick": "", - "cobblemon.battle.damage.spikes": "", - "cobblemon.battle.damage.recoil": "", - "cobblemon.battle.damage.item": "", - "cobblemon.battle.damage.lifeorb": "", - "cobblemon.battle.damage.rockyhelmet": "", - "cobblemon.battle.damage.generic": "", - "cobblemon.battle.damage.pokemonmimikyubusted": "", - "cobblemon.battle.damage.whirlpool": "", - "cobblemon.battle.damage.clamp": "", - "cobblemon.battle.damage.curse": "", - "cobblemon.battle.damage.firespin": "", - "cobblemon.battle.damage.axekick": "", - "cobblemon.battle.damage.bind": "", - "cobblemon.battle.damage.baddreams": "", - "cobblemon.battle.damage.mindblown": "", - "cobblemon.battle.damage.infestation": "", - "cobblemon.battle.damage.spikyshield": "", - "cobblemon.battle.damage.flameburst": "", - "cobblemon.battle.damage.dryskin": "", - "cobblemon.battle.damage.sandtomb": "", - "cobblemon.battle.damage.roughskin": "", - "cobblemon.battle.damage.ironbarbs": "", - "cobblemon.battle.end.bind": "", - "cobblemon.battle.end.wrap": "", - "cobblemon.battle.end.magnetrise": "", - "cobblemon.battle.end.doomdesire": "", - "cobblemon.battle.end.leechseed": "", - "cobblemon.battle.end.powershift": "", - "cobblemon.battle.end.torment": "", - "cobblemon.battle.end.disable": "", - "cobblemon.battle.end.protosynthesis": "", - "cobblemon.battle.end.taunt": "", - "cobblemon.battle.end.firespin": "", - "cobblemon.battle.end.bide": "", - "cobblemon.battle.end.confusion": "", - "cobblemon.battle.end.whirlpool": "", - "cobblemon.battle.end.clamp": "", - "cobblemon.battle.end.dynamax": "", - "cobblemon.battle.end.telekinesis": "", - "cobblemon.battle.end.encore": "", - "cobblemon.battle.end.attract": "", - "cobblemon.battle.end.futuresight": "", - "cobblemon.battle.end.embargo": "", - "cobblemon.battle.end.substitute": "", - "cobblemon.battle.end.uproar": "", - "cobblemon.battle.end.powertrick": "", - "cobblemon.battle.end.healblock": "", - "cobblemon.battle.end.skydrop": "", - "cobblemon.battle.end.illusion": "", - "cobblemon.battle.end.neutralizinggas": "", - "cobblemon.battle.block.uproar": "", - "cobblemon.battle.fail.substitute": "", - "cobblemon.battle.fail.healblock": "", - "cobblemon.battle.fail.darkvoid": "", - "cobblemon.battle.fail.teatime": "", - "cobblemon.battle.fail.slp": "", - "cobblemon.battle.fail.par": "", - "cobblemon.battle.fail.tox": "", - "cobblemon.battle.fail.psn": "", - "cobblemon.battle.fail.brn": "", - "cobblemon.battle.fail.frz": "", - "cobblemon.battle.fail.uproar": "", - "cobblemon.battle.fail.skydrop": "", - "cobblemon.battle.fail.heal": "", - "cobblemon.battle.fail.grassknot": "", - "cobblemon.battle.fail.unboost.single": "", - "cobblemon.battle.fail.unboost": "", - "cobblemon.battle.sethp.painsplit": "", - "cobblemon.battle.ability.sturdy": "", - "cobblemon.battle.ability.unnerve": "", - "cobblemon.battle.ability.anticipation": "", - "cobblemon.battle.ability.airlock": "", - "cobblemon.battle.ability.trace": "", - "cobblemon.battle.ability.receiver": "", - "cobblemon.battle.ability.generic": "", - "cobblemon.battle.ability.magicbounce": "", - "cobblemon.battle.errors.busy": "", - "cobblemon.battle.error.in_battle": "", - "cobblemon.battle.error.in_battle.personal": "", - "cobblemon.battle.error.no_pokemon": "", - "cobblemon.battle.error.no_pokemon_opponent": "", - "cobblemon.battle.error.insufficient_pokemon": "", - "cobblemon.battle.error.insufficient_pokemon.personal": "", - "cobblemon.battle.error.player_distance": "", - "cobblemon.battle.error.player_different_dimension": "", - "cobblemon.battle.error.incorrect_player_count": "", - "cobblemon.battle.error.pokemon_is_trapped": "", - "cobblemon.battle.error.canceled": "", - "cobblemon.battle.error.no_party": "", - "cobblemon.battle.immune": "", - "cobblemon.battle.invertboost": "", - "cobblemon.battle.missed": "", - "cobblemon.battle.hit_count": "", - "cobblemon.battle.hit_count_singular": "", - "cobblemon.battle.item.airballoon": "", - "cobblemon.battle.item.recycle": "", - "cobblemon.battle.item.frisk": "", - "cobblemon.battle.item.thief": "", - "cobblemon.battle.item.harvest": "", - "cobblemon.battle.item.bestow": "", - "cobblemon.battle.item.trick": "", - "cobblemon.battle.item.eat": "", - "cobblemon.battle.enditem.eat": "", - "cobblemon.battle.enditem.fling": "", - "cobblemon.battle.enditem.knockoff": "", - "cobblemon.battle.enditem.gem": "", - "cobblemon.battle.enditem.incinerate": "", - "cobblemon.battle.enditem.airballoon": "", - "cobblemon.battle.enditem.redcard": "", - "cobblemon.battle.enditem.berryjuice": "", - "cobblemon.battle.enditem.generic": "", - "cobblemon.battle.enditem.mentalherb": "", - "cobblemon.battle.enditem.powerherb": "", - "cobblemon.battle.enditem.mirrorherb": "", - "cobblemon.battle.enditem.whiteherb": "", - "cobblemon.battle.enditem.corrosivegas": "", - "cobblemon.battle.enditem.stealeat": "", - "cobblemon.battle.enditem.cellbattery": "", - "cobblemon.battle.enditem.ejectbutton": "", - "cobblemon.battle.enditem.snowball": "", - "cobblemon.battle.enditem.focusband": "", - "cobblemon.battle.enditem.ejectpack": "", - "cobblemon.battle.heal.zeffect": "", - "cobblemon.battle.heal.wish": "", - "cobblemon.battle.heal.drain": "", - "cobblemon.battle.heal.healingwish": "", - "cobblemon.battle.heal.revivalblessing": "", - "cobblemon.battle.heal.aquaring": "", - "cobblemon.battle.heal.ingrain": "", - "cobblemon.battle.heal.lunardance": "", - "cobblemon.battle.heal.grassyterrain": "", - "cobblemon.battle.heal.leftovers": "", - "cobblemon.battle.heal.item": "", - "cobblemon.battle.heal.raindish": "", - "cobblemon.battle.heal.generic": "", - "cobblemon.battle.heal.bagitempotion": "", - "cobblemon.battle.heal.bagitemrevive": "", - "cobblemon.battle.heal.poisonheal": "", - "cobblemon.battle.heal.cheekpouch": "", - "cobblemon.battle.heal.dryskin": "", - "cobblemon.battle.heal.eartheater": "", - "cobblemon.battle.heal.icybody": "", - "cobblemon.battle.heal.voltabsorb": "", - "cobblemon.battle.heal.waterabsorb": "", - "cobblemon.battle.curestatus.naturalcure": "", - "cobblemon.battle.bagitem.use": "", - "cobblemon.battle.bagitem.cannot": "", - "cobblemon.battle.bagitem.invalid": "", - "cobblemon.battle.zpower": "", - "cobblemon.battle.zbroken": "", - "cobblemon.battle.terastallize": "", - "cobblemon.battle.detailschange.mega": "", - "cobblemon.battle.detailschange.noice": "", - "cobblemon.battle.detailschange.eiscue": "", - "cobblemon.battle.mega": "", - "cobblemon.battle.switch.self": "", - "cobblemon.battle.switch.other": "", - "cobblemon.battle.switch.other.nickname": "", - "cobblemon.battle.withdraw.self": "", - "cobblemon.battle.withdraw.other": "", - "cobblemon.experience.gained": "", - "cobblemon.experience.level_up": "", - "cobblemon.experience.learned_move": "", - "cobblemon.party.faintRecover": "", - "cobblemon.type.suffix": "", - "cobblemon.type.fire": "", - "cobblemon.type.water": "", - "cobblemon.type.grass": "", - "cobblemon.type.electric": "", - "cobblemon.type.ice": "", - "cobblemon.type.normal": "", - "cobblemon.type.fighting": "", - "cobblemon.type.ghost": "", - "cobblemon.type.dark": "", - "cobblemon.type.fairy": "", - "cobblemon.type.bug": "", - "cobblemon.type.psychic": "", - "cobblemon.type.flying": "", - "cobblemon.type.steel": "", - "cobblemon.type.ground": "", - "cobblemon.type.rock": "", - "cobblemon.type.poison": "", - "cobblemon.type.dragon": "", - "cobblemon.terra_type.stellar": "", - "cobblemon.nature.hardy": "", - "cobblemon.nature.lonely": "", - "cobblemon.nature.brave": "", - "cobblemon.nature.adamant": "", - "cobblemon.nature.naughty": "", - "cobblemon.nature.docile": "", - "cobblemon.nature.relaxed": "", - "cobblemon.nature.impish": "", - "cobblemon.nature.lax": "", - "cobblemon.nature.timid": "", - "cobblemon.nature.hasty": "", - "cobblemon.nature.serious": "", - "cobblemon.nature.jolly": "", - "cobblemon.nature.naive": "", - "cobblemon.nature.modest": "", - "cobblemon.nature.mild": "", - "cobblemon.nature.bashful": "", - "cobblemon.nature.rash": "", - "cobblemon.nature.calm": "", - "cobblemon.nature.gentle": "", - "cobblemon.nature.sassy": "", - "cobblemon.nature.careful": "", - "cobblemon.nature.quirky": "", - "cobblemon.nature.bold": "", - "cobblemon.nature.quiet": "", - "cobblemon.species.random": "", - "cobblemon.species.unknown": "", - "cobblemon.a_pokemon": "", - "cobblemon.starterselection.category.kanto": "", - "cobblemon.starterselection.category.johto": "", - "cobblemon.starterselection.category.hoenn": "", - "cobblemon.starterselection.category.sinnoh": "", - "cobblemon.starterselection.category.unova": "", - "cobblemon.starterselection.category.kalos": "", - "cobblemon.starterselection.category.alola": "", - "cobblemon.starterselection.category.galar": "", - "cobblemon.starterselection.category.hisui_bias": "", - "cobblemon.starterselection.category.paldea": "", - "cobblemon.stat.hp.name": "", - "cobblemon.stat.attack.name": "", - "cobblemon.stat.defence.name": "", - "cobblemon.stat.special_attack.name": "", - "cobblemon.stat.special_defence.name": "", - "cobblemon.stat.speed.name": "", - "cobblemon.stat.accuracy.name": "", - "cobblemon.stat.evasion.name": "", - "cobblemon.move.category.physical": "", - "cobblemon.move.category.special": "", - "cobblemon.move.category.status": "", - "cobblemon.status.sleep.apply": "", - "cobblemon.status.sleep.is": "", - "cobblemon.status.sleep.cure": "", - "cobblemon.status.paralysis.apply": "", - "cobblemon.status.paralysis.is": "", - "cobblemon.status.paralysis.cure": "", - "cobblemon.status.poison.apply": "", - "cobblemon.status.poison.cure": "", - "cobblemon.status.poisonbadly.apply": "", - "cobblemon.status.poison.hurt": "", - "cobblemon.status.burn.apply": "", - "cobblemon.status.burn.hurt": "", - "cobblemon.status.burn.cure": "", - "cobblemon.status.frozen.apply": "", - "cobblemon.status.frozen.cure": "", - "cobblemon.status.frozen.is": "", - "block.cobblemon.dawn_stone_ore": "", - "block.cobblemon.dusk_stone_ore": "", - "block.cobblemon.fire_stone_ore": "", - "block.cobblemon.ice_stone_ore": "", - "block.cobblemon.leaf_stone_ore": "", - "block.cobblemon.moon_stone_ore": "", - "block.cobblemon.shiny_stone_ore": "", - "block.cobblemon.sun_stone_ore": "", - "block.cobblemon.thunder_stone_ore": "", - "block.cobblemon.water_stone_ore": "", - "block.cobblemon.deepslate_dawn_stone_ore": "", - "block.cobblemon.deepslate_dusk_stone_ore": "", - "block.cobblemon.deepslate_fire_stone_ore": "", - "block.cobblemon.deepslate_ice_stone_ore": "", - "block.cobblemon.deepslate_leaf_stone_ore": "", - "block.cobblemon.deepslate_moon_stone_ore": "", - "block.cobblemon.deepslate_shiny_stone_ore": "", - "block.cobblemon.deepslate_sun_stone_ore": "", - "block.cobblemon.deepslate_thunder_stone_ore": "", - "block.cobblemon.deepslate_water_stone_ore": "", - "block.cobblemon.dripstone_moon_stone_ore": "", - "block.cobblemon.nether_fire_stone_ore": "", - "block.cobblemon.terracotta_sun_stone_ore": "", - "block.cobblemon.pasture": "", - "gamerule.doPokemonSpawning": "", - "gamerule.doShinyStarters": "", - "gamerule.doPokemonLoot": "", - "gamerule.battleInvulnerability": "", - "gamerule.mobTargetInBattle": "", - "cobblemon.command.checkspawns.invalid-bucket": "", - "cobblemon.command.checkspawns.spawns": "", - "cobblemon.command.checkspawns.nothing": "", - "cobblemon.interaction.ev.add": "", - "cobblemon.interaction.ev.deduct": "", - "cobblemon.interaction.pp.restore": "", - "cobblemon.interaction.friendsip.add": "", - "cobblemon.interaction.status.cure": "", - "cobblemon.interaction.hp.heal": "", - "tag.item.cobblemon.apricorn_logs": "", - "tag.item.cobblemon.apricorn_sprouts": "", - "tag.item.cobblemon.apricorns": "", - "tag.item.cobblemon.azalea_tree": "", - "tag.item.cobblemon.berries": "", - "tag.item.cobblemon.cobblemon_seeds": "", - "tag.item.cobblemon.evolution_items": "", - "tag.item.cobblemon.evolution_stones": "", - "tag.item.cobblemon.experience_candies": "", - "tag.item.cobblemon.held.destiny_knot": "", - "tag.item.cobblemon.held.everstone": "", - "tag.item.cobblemon.held.experience_share": "", - "tag.item.cobblemon.held.consumed_in_npc_battle": "", - "tag.item.cobblemon.held.consumed_in_pvp_battle": "", - "tag.item.cobblemon.held.consumed_in_wild_battle": "", - "tag.item.cobblemon.held.is_held_item": "", - "tag.item.cobblemon.held.lucky_egg": "", - "tag.item.cobblemon.held.power_anklet": "", - "tag.item.cobblemon.held.power_band": "", - "tag.item.cobblemon.held.power_belt": "", - "tag.item.cobblemon.held.power_bracer": "", - "tag.item.cobblemon.held.power_lens": "", - "tag.item.cobblemon.held.power_weight": "", - "tag.item.cobblemon.held.terrain_seeds": "", - "tag.item.cobblemon.herbs": "", - "tag.item.cobblemon.mint_leaf": "", - "tag.item.cobblemon.mints": "", - "tag.item.cobblemon.mint_seeds": "", - "tag.item.cobblemon.mutated_berries": "", - "tag.item.cobblemon.plants": "", - "tag.item.cobblemon.protein_ingredients": "", - "tag.item.cobblemon.zinc_ingredients": "", - "tag.item.cobblemon.seeds": "", - "tag.item.cobblemon.boats": "", - "tag.item.cobblemon.hanging_signs": "", - "tag.item.cobblemon.signs": "", - "tag.item.cobblemon.dawn_stone_ores": "", - "tag.item.cobblemon.dusk_stone_ores": "", - "tag.item.cobblemon.fire_stone_ores": "", - "tag.item.cobblemon.ice_stone_ores": "", - "tag.item.cobblemon.leaf_stone_ores": "", - "tag.item.cobblemon.shiny_stone_ores": "", - "tag.item.cobblemon.moon_stone_ores": "", - "tag.item.cobblemon.sun_stone_ores": "", - "tag.item.cobblemon.thunder_stone_ores": "", - "tag.item.cobblemon.water_stone_ores": "", - "tag.item.cobblemon.fossil_machine_parts": "", - "tag.item.cobblemon.machines": "", - "tag.item.cobblemon.poke_balls": "", - "tag.item.cobblemon.apricorn_poke_balls": "", - "tag.item.cobblemon.ancient_poke_balls": "", - "tag.item.cobblemon.tier_1_poke_balls": "", - "tag.item.cobblemon.tier_2_poke_balls": "", - "tag.item.cobblemon.tier_3_poke_balls": "", - "tag.item.cobblemon.tier_4_poke_balls": "", - "tag.item.cobblemon.tier_5_poke_balls": "", - "tag.item.cobblemon.tier_1_poke_ball_materials": "", - "tag.item.cobblemon.tier_2_poke_ball_materials": "", - "tag.item.cobblemon.tier_3_poke_ball_materials": "", - "tag.item.cobblemon.tier_4_poke_ball_materials": "", - "tag.item.cobblemon.potions": "", - "tag.item.cobblemon.ethers": "", - "tag.item.cobblemon.remedies": "", - "tag.item.cobblemon.restores": "", - "tag.item.cobblemon.revives": "", - "tag.item.cobblemon.battle_items": "", - "tag.item.cobblemon.vitamins": "", - "tag.item.cobblemon.tumblestones": "", - "tag.item.cobblemon.red_tumblestones": "", - "tag.item.cobblemon.black_tumblestones": "", - "tag.item.cobblemon.sky_tumblestones": "", - "tag.item.cobblemon.tumblestone_bricks": "", - "tag.item.cobblemon.red_tumblestone_bricks": "", - "tag.item.cobblemon.black_tumblestone_bricks": "", - "tag.item.cobblemon.sky_tumblestone_bricks": "", - "tag.item.cobblemon.apples": "", - "tag.item.cobblemon.deep_seas": "", - "tag.item.cobblemon.sweets": "", - "tag.item.cobblemon.teapots": "", - "tag.item.cobblemon.teacups": "", - "tag.item.cobblemon.raw_meat": "", - "tag.item.cobblemon.cooked_meat": "", - "tag.item.cobblemon.fossils": "", - "tag.item.cobblemon.held.leaves_leftovers": "", - "tag.item.cobblemon.decorated_pot_sherds": "", - "tag.item.cobblemon.type_gems": "", - "tag.item.cobblemon.feathers": "", - "tag.item.cobblemon.ability_changers": "", - "tag.item.cobblemon.held.is_friendship_booster": "", - "tag.item.cobblemon.poke_rods": "", - "tag.item.cobblemon.evolution_stone_blocks": "", - "tag.item.cobblemon.pokedex": "", - "tag.item.cobblemon.pokedex_screen": "", - "npc.sacchi.name": "", - "cobblemon.move.10000000voltthunderbolt": "", - "cobblemon.move.10000000voltthunderbolt.desc": "", - "cobblemon.move.absorb": "", - "cobblemon.move.absorb.desc": "", - "cobblemon.move.accelerock": "", - "cobblemon.move.accelerock.desc": "", - "cobblemon.move.acid": "", - "cobblemon.move.acid.desc": "", - "cobblemon.move.acidarmor": "", - "cobblemon.move.acidarmor.desc": "", - "cobblemon.move.aciddownpour": "", - "cobblemon.move.aciddownpour.desc": "", - "cobblemon.move.acidspray": "", - "cobblemon.move.acidspray.desc": "", - "cobblemon.move.acrobatics": "", - "cobblemon.move.acrobatics.desc": "", - "cobblemon.move.acupressure": "", - "cobblemon.move.acupressure.desc": "", - "cobblemon.move.aerialace": "", - "cobblemon.move.aerialace.desc": "", - "cobblemon.move.aeroblast": "", - "cobblemon.move.aeroblast.desc": "", - "cobblemon.move.afteryou": "", - "cobblemon.move.afteryou.desc": "", - "cobblemon.move.agility": "", - "cobblemon.move.agility.desc": "", - "cobblemon.move.aircutter": "", - "cobblemon.move.aircutter.desc": "", - "cobblemon.move.airslash": "", - "cobblemon.move.airslash.desc": "", - "cobblemon.move.alloutpummeling": "", - "cobblemon.move.alloutpummeling.desc": "", - "cobblemon.move.allyswitch": "", - "cobblemon.move.allyswitch.desc": "", - "cobblemon.move.amnesia": "", - "cobblemon.move.amnesia.desc": "", - "cobblemon.move.anchorshot": "", - "cobblemon.move.anchorshot.desc": "", - "cobblemon.move.ancientpower": "", - "cobblemon.move.ancientpower.desc": "", - "cobblemon.move.appleacid": "", - "cobblemon.move.appleacid.desc": "", - "cobblemon.move.aquacutter": "", - "cobblemon.move.aquacutter.desc": "", - "cobblemon.move.aquajet": "", - "cobblemon.move.aquajet.desc": "", - "cobblemon.move.aquaring": "", - "cobblemon.move.aquaring.desc": "", - "cobblemon.move.aquastep": "", - "cobblemon.move.aquastep.desc": "", - "cobblemon.move.aquatail": "", - "cobblemon.move.aquatail.desc": "", - "cobblemon.move.armorcannon": "", - "cobblemon.move.armorcannon.desc": "", - "cobblemon.move.armthrust": "", - "cobblemon.move.armthrust.desc": "", - "cobblemon.move.aromatherapy": "", - "cobblemon.move.aromatherapy.desc": "", - "cobblemon.move.aromaticmist": "", - "cobblemon.move.aromaticmist.desc": "", - "cobblemon.move.assist": "", - "cobblemon.move.assist.desc": "", - "cobblemon.move.assurance": "", - "cobblemon.move.assurance.desc": "", - "cobblemon.move.astonish": "", - "cobblemon.move.astonish.desc": "", - "cobblemon.move.astralbarrage": "", - "cobblemon.move.astralbarrage.desc": "", - "cobblemon.move.attackorder": "", - "cobblemon.move.attackorder.desc": "", - "cobblemon.move.attract": "", - "cobblemon.move.attract.desc": "", - "cobblemon.move.aurasphere": "", - "cobblemon.move.aurasphere.desc": "", - "cobblemon.move.aurawheel": "", - "cobblemon.move.aurawheel.desc": "", - "cobblemon.move.aurorabeam": "", - "cobblemon.move.aurorabeam.desc": "", - "cobblemon.move.auroraveil": "", - "cobblemon.move.auroraveil.desc": "", - "cobblemon.move.autotomize": "", - "cobblemon.move.autotomize.desc": "", - "cobblemon.move.avalanche": "", - "cobblemon.move.avalanche.desc": "", - "cobblemon.move.axekick": "", - "cobblemon.move.axekick.desc": "", - "cobblemon.move.babydolleyes": "", - "cobblemon.move.babydolleyes.desc": "", - "cobblemon.move.baddybad": "", - "cobblemon.move.baddybad.desc": "", - "cobblemon.move.banefulbunker": "", - "cobblemon.move.banefulbunker.desc": "", - "cobblemon.move.barbbarrage": "", - "cobblemon.move.barbbarrage.desc": "", - "cobblemon.move.barrage": "", - "cobblemon.move.barrage.desc": "", - "cobblemon.move.barrier": "", - "cobblemon.move.barrier.desc": "", - "cobblemon.move.batonpass": "", - "cobblemon.move.batonpass.desc": "", - "cobblemon.move.beakblast": "", - "cobblemon.move.beakblast.desc": "", - "cobblemon.move.beatup": "", - "cobblemon.move.beatup.desc": "", - "cobblemon.move.behemothbash": "", - "cobblemon.move.behemothbash.desc": "", - "cobblemon.move.behemothblade": "", - "cobblemon.move.behemothblade.desc": "", - "cobblemon.move.belch": "", - "cobblemon.move.belch.desc": "", - "cobblemon.move.bellydrum": "", - "cobblemon.move.bellydrum.desc": "", - "cobblemon.move.bestow": "", - "cobblemon.move.bestow.desc": "", - "cobblemon.move.bide": "", - "cobblemon.move.bide.desc": "", - "cobblemon.move.bind": "", - "cobblemon.move.bind.desc": "", - "cobblemon.move.bite": "", - "cobblemon.move.bite.desc": "", - "cobblemon.move.bitterblade": "", - "cobblemon.move.bitterblade.desc": "", - "cobblemon.move.bittermalice": "", - "cobblemon.move.bittermalice.desc": "", - "cobblemon.move.blackholeeclipse": "", - "cobblemon.move.blackholeeclipse.desc": "", - "cobblemon.move.blastburn": "", - "cobblemon.move.blastburn.desc": "", - "cobblemon.move.blazekick": "", - "cobblemon.move.blazekick.desc": "", - "cobblemon.move.blazingtorque": "", - "cobblemon.move.blazingtorque.desc": "", - "cobblemon.move.bleakwindstorm": "", - "cobblemon.move.bleakwindstorm.desc": "", - "cobblemon.move.blizzard": "", - "cobblemon.move.blizzard.desc": "", - "cobblemon.move.block": "", - "cobblemon.move.block.desc": "", - "cobblemon.move.bloomdoom": "", - "cobblemon.move.bloomdoom.desc": "", - "cobblemon.move.blueflare": "", - "cobblemon.move.blueflare.desc": "", - "cobblemon.move.bodypress": "", - "cobblemon.move.bodypress.desc": "", - "cobblemon.move.bodyslam": "", - "cobblemon.move.bodyslam.desc": "", - "cobblemon.move.boltbeak": "", - "cobblemon.move.boltbeak.desc": "", - "cobblemon.move.boltstrike": "", - "cobblemon.move.boltstrike.desc": "", - "cobblemon.move.boneclub": "", - "cobblemon.move.boneclub.desc": "", - "cobblemon.move.bonemerang": "", - "cobblemon.move.bonemerang.desc": "", - "cobblemon.move.bonerush": "", - "cobblemon.move.bonerush.desc": "", - "cobblemon.move.boomburst": "", - "cobblemon.move.boomburst.desc": "", - "cobblemon.move.bounce": "", - "cobblemon.move.bounce.desc": "", - "cobblemon.move.bouncybubble": "", - "cobblemon.move.bouncybubble.desc": "", - "cobblemon.move.branchpoke": "", - "cobblemon.move.branchpoke.desc": "", - "cobblemon.move.bravebird": "", - "cobblemon.move.bravebird.desc": "", - "cobblemon.move.breakingswipe": "", - "cobblemon.move.breakingswipe.desc": "", - "cobblemon.move.breakneckblitz": "", - "cobblemon.move.breakneckblitz.desc": "", - "cobblemon.move.brickbreak": "", - "cobblemon.move.brickbreak.desc": "", - "cobblemon.move.brine": "", - "cobblemon.move.brine.desc": "", - "cobblemon.move.brutalswing": "", - "cobblemon.move.brutalswing.desc": "", - "cobblemon.move.bubble": "", - "cobblemon.move.bubble.desc": "", - "cobblemon.move.bubblebeam": "", - "cobblemon.move.bubblebeam.desc": "", - "cobblemon.move.bugbite": "", - "cobblemon.move.bugbite.desc": "", - "cobblemon.move.bugbuzz": "", - "cobblemon.move.bugbuzz.desc": "", - "cobblemon.move.bulkup": "", - "cobblemon.move.bulkup.desc": "", - "cobblemon.move.bulldoze": "", - "cobblemon.move.bulldoze.desc": "", - "cobblemon.move.bulletpunch": "", - "cobblemon.move.bulletpunch.desc": "", - "cobblemon.move.bulletseed": "", - "cobblemon.move.bulletseed.desc": "", - "cobblemon.move.burningjealousy": "", - "cobblemon.move.burningjealousy.desc": "", - "cobblemon.move.burnup": "", - "cobblemon.move.burnup.desc": "", - "cobblemon.move.buzzybuzz": "", - "cobblemon.move.buzzybuzz.desc": "", - "cobblemon.move.calmmind": "", - "cobblemon.move.calmmind.desc": "", - "cobblemon.move.camouflage": "", - "cobblemon.move.camouflage.desc": "", - "cobblemon.move.captivate": "", - "cobblemon.move.captivate.desc": "", - "cobblemon.move.catastropika": "", - "cobblemon.move.catastropika.desc": "", - "cobblemon.move.ceaselessedge": "", - "cobblemon.move.ceaselessedge.desc": "", - "cobblemon.move.celebrate": "", - "cobblemon.move.celebrate.desc": "", - "cobblemon.move.charge": "", - "cobblemon.move.charge.desc": "", - "cobblemon.move.chargebeam": "", - "cobblemon.move.chargebeam.desc": "", - "cobblemon.move.charm": "", - "cobblemon.move.charm.desc": "", - "cobblemon.move.chatter": "", - "cobblemon.move.chatter.desc": "", - "cobblemon.move.chillingwater": "", - "cobblemon.move.chillingwater.desc": "", - "cobblemon.move.chillyreception": "", - "cobblemon.move.chillyreception.desc": "", - "cobblemon.move.chipaway": "", - "cobblemon.move.chipaway.desc": "", - "cobblemon.move.chloroblast": "", - "cobblemon.move.chloroblast.desc": "", - "cobblemon.move.circlethrow": "", - "cobblemon.move.circlethrow.desc": "", - "cobblemon.move.clamp": "", - "cobblemon.move.clamp.desc": "", - "cobblemon.move.clangingscales": "", - "cobblemon.move.clangingscales.desc": "", - "cobblemon.move.clangoroussoul": "", - "cobblemon.move.clangoroussoul.desc": "", - "cobblemon.move.clangoroussoulblaze": "", - "cobblemon.move.clangoroussoulblaze.desc": "", - "cobblemon.move.clearsmog": "", - "cobblemon.move.clearsmog.desc": "", - "cobblemon.move.closecombat": "", - "cobblemon.move.closecombat.desc": "", - "cobblemon.move.coaching": "", - "cobblemon.move.coaching.desc": "", - "cobblemon.move.coil": "", - "cobblemon.move.coil.desc": "", - "cobblemon.move.collisioncourse": "", - "cobblemon.move.collisioncourse.desc": "", - "cobblemon.move.combattorque": "", - "cobblemon.move.combattorque.desc": "", - "cobblemon.move.cometpunch": "", - "cobblemon.move.cometpunch.desc": "", - "cobblemon.move.comeuppance": "", - "cobblemon.move.comeuppance.desc": "", - "cobblemon.move.confide": "", - "cobblemon.move.confide.desc": "", - "cobblemon.move.confuseray": "", - "cobblemon.move.confuseray.desc": "", - "cobblemon.move.confusion": "", - "cobblemon.move.confusion.desc": "", - "cobblemon.move.constrict": "", - "cobblemon.move.constrict.desc": "", - "cobblemon.move.continentalcrush": "", - "cobblemon.move.continentalcrush.desc": "", - "cobblemon.move.conversion": "", - "cobblemon.move.conversion.desc": "", - "cobblemon.move.conversion2": "", - "cobblemon.move.conversion2.desc": "", - "cobblemon.move.copycat": "", - "cobblemon.move.copycat.desc": "", - "cobblemon.move.coreenforcer": "", - "cobblemon.move.coreenforcer.desc": "", - "cobblemon.move.corkscrewcrash": "", - "cobblemon.move.corkscrewcrash.desc": "", - "cobblemon.move.corrosivegas": "", - "cobblemon.move.corrosivegas.desc": "", - "cobblemon.move.cosmicpower": "", - "cobblemon.move.cosmicpower.desc": "", - "cobblemon.move.cottonguard": "", - "cobblemon.move.cottonguard.desc": "", - "cobblemon.move.cottonspore": "", - "cobblemon.move.cottonspore.desc": "", - "cobblemon.move.counter": "", - "cobblemon.move.counter.desc": "", - "cobblemon.move.courtchange": "", - "cobblemon.move.courtchange.desc": "", - "cobblemon.move.covet": "", - "cobblemon.move.covet.desc": "", - "cobblemon.move.crabhammer": "", - "cobblemon.move.crabhammer.desc": "", - "cobblemon.move.craftyshield": "", - "cobblemon.move.craftyshield.desc": "", - "cobblemon.move.crosschop": "", - "cobblemon.move.crosschop.desc": "", - "cobblemon.move.crosspoison": "", - "cobblemon.move.crosspoison.desc": "", - "cobblemon.move.crunch": "", - "cobblemon.move.crunch.desc": "", - "cobblemon.move.crushclaw": "", - "cobblemon.move.crushclaw.desc": "", - "cobblemon.move.crushgrip": "", - "cobblemon.move.crushgrip.desc": "", - "cobblemon.move.curse": "", - "cobblemon.move.curse.desc": "", - "cobblemon.move.cut": "", - "cobblemon.move.cut.desc": "", - "cobblemon.move.darkestlariat": "", - "cobblemon.move.darkestlariat.desc": "", - "cobblemon.move.darkpulse": "", - "cobblemon.move.darkpulse.desc": "", - "cobblemon.move.darkvoid": "", - "cobblemon.move.darkvoid.desc": "", - "cobblemon.move.dazzlinggleam": "", - "cobblemon.move.dazzlinggleam.desc": "", - "cobblemon.move.decorate": "", - "cobblemon.move.decorate.desc": "", - "cobblemon.move.defendorder": "", - "cobblemon.move.defendorder.desc": "", - "cobblemon.move.defensecurl": "", - "cobblemon.move.defensecurl.desc": "", - "cobblemon.move.defog": "", - "cobblemon.move.defog.desc": "", - "cobblemon.move.destinybond": "", - "cobblemon.move.destinybond.desc": "", - "cobblemon.move.detect": "", - "cobblemon.move.detect.desc": "", - "cobblemon.move.devastatingdrake": "", - "cobblemon.move.devastatingdrake.desc": "", - "cobblemon.move.diamondstorm": "", - "cobblemon.move.diamondstorm.desc": "", - "cobblemon.move.dig": "", - "cobblemon.move.dig.desc": "", - "cobblemon.move.direclaw": "", - "cobblemon.move.direclaw.desc": "", - "cobblemon.move.disable": "", - "cobblemon.move.disable.desc": "", - "cobblemon.move.disarmingvoice": "", - "cobblemon.move.disarmingvoice.desc": "", - "cobblemon.move.discharge": "", - "cobblemon.move.discharge.desc": "", - "cobblemon.move.dive": "", - "cobblemon.move.dive.desc": "", - "cobblemon.move.dizzypunch": "", - "cobblemon.move.dizzypunch.desc": "", - "cobblemon.move.doodle": "", - "cobblemon.move.doodle.desc": "", - "cobblemon.move.doomdesire": "", - "cobblemon.move.doomdesire.desc": "", - "cobblemon.move.doubleedge": "", - "cobblemon.move.doubleedge.desc": "", - "cobblemon.move.doublehit": "", - "cobblemon.move.doublehit.desc": "", - "cobblemon.move.doubleironbash": "", - "cobblemon.move.doubleironbash.desc": "", - "cobblemon.move.doublekick": "", - "cobblemon.move.doublekick.desc": "", - "cobblemon.move.doubleshock": "", - "cobblemon.move.doubleshock.desc": "", - "cobblemon.move.doubleslap": "", - "cobblemon.move.doubleslap.desc": "", - "cobblemon.move.doubleteam": "", - "cobblemon.move.doubleteam.desc": "", - "cobblemon.move.dracometeor": "", - "cobblemon.move.dracometeor.desc": "", - "cobblemon.move.dragonascent": "", - "cobblemon.move.dragonascent.desc": "", - "cobblemon.move.dragonbreath": "", - "cobblemon.move.dragonbreath.desc": "", - "cobblemon.move.dragonclaw": "", - "cobblemon.move.dragonclaw.desc": "", - "cobblemon.move.dragondance": "", - "cobblemon.move.dragondance.desc": "", - "cobblemon.move.dragondarts": "", - "cobblemon.move.dragondarts.desc": "", - "cobblemon.move.dragonenergy": "", - "cobblemon.move.dragonenergy.desc": "", - "cobblemon.move.dragonhammer": "", - "cobblemon.move.dragonhammer.desc": "", - "cobblemon.move.dragonpulse": "", - "cobblemon.move.dragonpulse.desc": "", - "cobblemon.move.dragonrage": "", - "cobblemon.move.dragonrage.desc": "", - "cobblemon.move.dragonrush": "", - "cobblemon.move.dragonrush.desc": "", - "cobblemon.move.dragontail": "", - "cobblemon.move.dragontail.desc": "", - "cobblemon.move.drainingkiss": "", - "cobblemon.move.drainingkiss.desc": "", - "cobblemon.move.drainpunch": "", - "cobblemon.move.drainpunch.desc": "", - "cobblemon.move.dreameater": "", - "cobblemon.move.dreameater.desc": "", - "cobblemon.move.drillpeck": "", - "cobblemon.move.drillpeck.desc": "", - "cobblemon.move.drillrun": "", - "cobblemon.move.drillrun.desc": "", - "cobblemon.move.drumbeating": "", - "cobblemon.move.drumbeating.desc": "", - "cobblemon.move.dualchop": "", - "cobblemon.move.dualchop.desc": "", - "cobblemon.move.dualwingbeat": "", - "cobblemon.move.dualwingbeat.desc": "", - "cobblemon.move.dynamaxcannon": "", - "cobblemon.move.dynamaxcannon.desc": "", - "cobblemon.move.dynamicpunch": "", - "cobblemon.move.dynamicpunch.desc": "", - "cobblemon.move.earthpower": "", - "cobblemon.move.earthpower.desc": "", - "cobblemon.move.earthquake": "", - "cobblemon.move.earthquake.desc": "", - "cobblemon.move.echoedvoice": "", - "cobblemon.move.echoedvoice.desc": "", - "cobblemon.move.eerieimpulse": "", - "cobblemon.move.eerieimpulse.desc": "", - "cobblemon.move.eeriespell": "", - "cobblemon.move.eeriespell.desc": "", - "cobblemon.move.eggbomb": "", - "cobblemon.move.eggbomb.desc": "", - "cobblemon.move.electricterrain": "", - "cobblemon.move.electricterrain.desc": "", - "cobblemon.move.electrify": "", - "cobblemon.move.electrify.desc": "", - "cobblemon.move.electroball": "", - "cobblemon.move.electroball.desc": "", - "cobblemon.move.electrodrift": "", - "cobblemon.move.electrodrift.desc": "", - "cobblemon.move.electroweb": "", - "cobblemon.move.electroweb.desc": "", - "cobblemon.move.embargo": "", - "cobblemon.move.embargo.desc": "", - "cobblemon.move.ember": "", - "cobblemon.move.ember.desc": "", - "cobblemon.move.encore": "", - "cobblemon.move.encore.desc": "", - "cobblemon.move.endeavor": "", - "cobblemon.move.endeavor.desc": "", - "cobblemon.move.endure": "", - "cobblemon.move.endure.desc": "", - "cobblemon.move.energyball": "", - "cobblemon.move.energyball.desc": "", - "cobblemon.move.entrainment": "", - "cobblemon.move.entrainment.desc": "", - "cobblemon.move.eruption": "", - "cobblemon.move.eruption.desc": "", - "cobblemon.move.esperwing": "", - "cobblemon.move.esperwing.desc": "", - "cobblemon.move.eternabeam": "", - "cobblemon.move.eternabeam.desc": "", - "cobblemon.move.expandingforce": "", - "cobblemon.move.expandingforce.desc": "", - "cobblemon.move.explosion": "", - "cobblemon.move.explosion.desc": "", - "cobblemon.move.extrasensory": "", - "cobblemon.move.extrasensory.desc": "", - "cobblemon.move.extremeevoboost": "", - "cobblemon.move.extremeevoboost.desc": "", - "cobblemon.move.extremespeed": "", - "cobblemon.move.extremespeed.desc": "", - "cobblemon.move.facade": "", - "cobblemon.move.facade.desc": "", - "cobblemon.move.fairylock": "", - "cobblemon.move.fairylock.desc": "", - "cobblemon.move.fairywind": "", - "cobblemon.move.fairywind.desc": "", - "cobblemon.move.fakeout": "", - "cobblemon.move.fakeout.desc": "", - "cobblemon.move.faketears": "", - "cobblemon.move.faketears.desc": "", - "cobblemon.move.falsesurrender": "", - "cobblemon.move.falsesurrender.desc": "", - "cobblemon.move.falseswipe": "", - "cobblemon.move.falseswipe.desc": "", - "cobblemon.move.featherdance": "", - "cobblemon.move.featherdance.desc": "", - "cobblemon.move.feint": "", - "cobblemon.move.feint.desc": "", - "cobblemon.move.feintattack": "", - "cobblemon.move.feintattack.desc": "", - "cobblemon.move.fellstinger": "", - "cobblemon.move.fellstinger.desc": "", - "cobblemon.move.fierydance": "", - "cobblemon.move.fierydance.desc": "", - "cobblemon.move.fierywrath": "", - "cobblemon.move.fierywrath.desc": "", - "cobblemon.move.filletaway": "", - "cobblemon.move.filletaway.desc": "", - "cobblemon.move.finalgambit": "", - "cobblemon.move.finalgambit.desc": "", - "cobblemon.move.fireblast": "", - "cobblemon.move.fireblast.desc": "", - "cobblemon.move.firefang": "", - "cobblemon.move.firefang.desc": "", - "cobblemon.move.firelash": "", - "cobblemon.move.firelash.desc": "", - "cobblemon.move.firepledge": "", - "cobblemon.move.firepledge.desc": "", - "cobblemon.move.firepunch": "", - "cobblemon.move.firepunch.desc": "", - "cobblemon.move.firespin": "", - "cobblemon.move.firespin.desc": "", - "cobblemon.move.firstimpression": "", - "cobblemon.move.firstimpression.desc": "", - "cobblemon.move.fishiousrend": "", - "cobblemon.move.fishiousrend.desc": "", - "cobblemon.move.fissure": "", - "cobblemon.move.fissure.desc": "", - "cobblemon.move.flail": "", - "cobblemon.move.flail.desc": "", - "cobblemon.move.flameburst": "", - "cobblemon.move.flameburst.desc": "", - "cobblemon.move.flamecharge": "", - "cobblemon.move.flamecharge.desc": "", - "cobblemon.move.flamethrower": "", - "cobblemon.move.flamethrower.desc": "", - "cobblemon.move.flamewheel": "", - "cobblemon.move.flamewheel.desc": "", - "cobblemon.move.flareblitz": "", - "cobblemon.move.flareblitz.desc": "", - "cobblemon.move.flash": "", - "cobblemon.move.flash.desc": "", - "cobblemon.move.flashcannon": "", - "cobblemon.move.flashcannon.desc": "", - "cobblemon.move.flatter": "", - "cobblemon.move.flatter.desc": "", - "cobblemon.move.fleurcannon": "", - "cobblemon.move.fleurcannon.desc": "", - "cobblemon.move.fling": "", - "cobblemon.move.fling.desc": "", - "cobblemon.move.flipturn": "", - "cobblemon.move.flipturn.desc": "", - "cobblemon.move.floatyfall": "", - "cobblemon.move.floatyfall.desc": "", - "cobblemon.move.floralhealing": "", - "cobblemon.move.floralhealing.desc": "", - "cobblemon.move.flowershield": "", - "cobblemon.move.flowershield.desc": "", - "cobblemon.move.flowertrick": "", - "cobblemon.move.flowertrick.desc": "", - "cobblemon.move.fly": "", - "cobblemon.move.fly.desc": "", - "cobblemon.move.flyingpress": "", - "cobblemon.move.flyingpress.desc": "", - "cobblemon.move.focusblast": "", - "cobblemon.move.focusblast.desc": "", - "cobblemon.move.focusenergy": "", - "cobblemon.move.focusenergy.desc": "", - "cobblemon.move.focuspunch": "", - "cobblemon.move.focuspunch.desc": "", - "cobblemon.move.followme": "", - "cobblemon.move.followme.desc": "", - "cobblemon.move.forcepalm": "", - "cobblemon.move.forcepalm.desc": "", - "cobblemon.move.foresight": "", - "cobblemon.move.foresight.desc": "", - "cobblemon.move.forestscurse": "", - "cobblemon.move.forestscurse.desc": "", - "cobblemon.move.foulplay": "", - "cobblemon.move.foulplay.desc": "", - "cobblemon.move.freezedry": "", - "cobblemon.move.freezedry.desc": "", - "cobblemon.move.freezeshock": "", - "cobblemon.move.freezeshock.desc": "", - "cobblemon.move.freezingglare": "", - "cobblemon.move.freezingglare.desc": "", - "cobblemon.move.freezyfrost": "", - "cobblemon.move.freezyfrost.desc": "", - "cobblemon.move.frenzyplant": "", - "cobblemon.move.frenzyplant.desc": "", - "cobblemon.move.frostbreath": "", - "cobblemon.move.frostbreath.desc": "", - "cobblemon.move.frustration": "", - "cobblemon.move.frustration.desc": "", - "cobblemon.move.furyattack": "", - "cobblemon.move.furyattack.desc": "", - "cobblemon.move.furycutter": "", - "cobblemon.move.furycutter.desc": "", - "cobblemon.move.furyswipes": "", - "cobblemon.move.furyswipes.desc": "", - "cobblemon.move.fusionbolt": "", - "cobblemon.move.fusionbolt.desc": "", - "cobblemon.move.fusionflare": "", - "cobblemon.move.fusionflare.desc": "", - "cobblemon.move.futuresight": "", - "cobblemon.move.futuresight.desc": "", - "cobblemon.move.gastroacid": "", - "cobblemon.move.gastroacid.desc": "", - "cobblemon.move.geargrind": "", - "cobblemon.move.geargrind.desc": "", - "cobblemon.move.gearup": "", - "cobblemon.move.gearup.desc": "", - "cobblemon.move.genesissupernova": "", - "cobblemon.move.genesissupernova.desc": "", - "cobblemon.move.geomancy": "", - "cobblemon.move.geomancy.desc": "", - "cobblemon.move.gigadrain": "", - "cobblemon.move.gigadrain.desc": "", - "cobblemon.move.gigaimpact": "", - "cobblemon.move.gigaimpact.desc": "", - "cobblemon.move.gigatonhammer": "", - "cobblemon.move.gigatonhammer.desc": "", - "cobblemon.move.gigavolthavoc": "", - "cobblemon.move.gigavolthavoc.desc": "", - "cobblemon.move.glaciallance": "", - "cobblemon.move.glaciallance.desc": "", - "cobblemon.move.glaciate": "", - "cobblemon.move.glaciate.desc": "", - "cobblemon.move.glaiverush": "", - "cobblemon.move.glaiverush.desc": "", - "cobblemon.move.glare": "", - "cobblemon.move.glare.desc": "", - "cobblemon.move.glitzyglow": "", - "cobblemon.move.glitzyglow.desc": "", - "cobblemon.move.gmaxbefuddle": "", - "cobblemon.move.gmaxbefuddle.desc": "", - "cobblemon.move.gmaxcannonade": "", - "cobblemon.move.gmaxcannonade.desc": "", - "cobblemon.move.gmaxcentiferno": "", - "cobblemon.move.gmaxcentiferno.desc": "", - "cobblemon.move.gmaxchistrike": "", - "cobblemon.move.gmaxchistrike.desc": "", - "cobblemon.move.gmaxcuddle": "", - "cobblemon.move.gmaxcuddle.desc": "", - "cobblemon.move.gmaxdepletion": "", - "cobblemon.move.gmaxdepletion.desc": "", - "cobblemon.move.gmaxdrumsolo": "", - "cobblemon.move.gmaxdrumsolo.desc": "", - "cobblemon.move.gmaxfinale": "", - "cobblemon.move.gmaxfinale.desc": "", - "cobblemon.move.gmaxfireball": "", - "cobblemon.move.gmaxfireball.desc": "", - "cobblemon.move.gmaxfoamburst": "", - "cobblemon.move.gmaxfoamburst.desc": "", - "cobblemon.move.gmaxgoldrush": "", - "cobblemon.move.gmaxgoldrush.desc": "", - "cobblemon.move.gmaxgravitas": "", - "cobblemon.move.gmaxgravitas.desc": "", - "cobblemon.move.gmaxhydrosnipe": "", - "cobblemon.move.gmaxhydrosnipe.desc": "", - "cobblemon.move.gmaxmalodor": "", - "cobblemon.move.gmaxmalodor.desc": "", - "cobblemon.move.gmaxmeltdown": "", - "cobblemon.move.gmaxmeltdown.desc": "", - "cobblemon.move.gmaxoneblow": "", - "cobblemon.move.gmaxoneblow.desc": "", - "cobblemon.move.gmaxrapidflow": "", - "cobblemon.move.gmaxrapidflow.desc": "", - "cobblemon.move.gmaxreplenish": "", - "cobblemon.move.gmaxreplenish.desc": "", - "cobblemon.move.gmaxresonance": "", - "cobblemon.move.gmaxresonance.desc": "", - "cobblemon.move.gmaxsandblast": "", - "cobblemon.move.gmaxsandblast.desc": "", - "cobblemon.move.gmaxsmite": "", - "cobblemon.move.gmaxsmite.desc": "", - "cobblemon.move.gmaxsnooze": "", - "cobblemon.move.gmaxsnooze.desc": "", - "cobblemon.move.gmaxsteelsurge": "", - "cobblemon.move.gmaxsteelsurge.desc": "", - "cobblemon.move.gmaxstonesurge": "", - "cobblemon.move.gmaxstonesurge.desc": "", - "cobblemon.move.gmaxstunshock": "", - "cobblemon.move.gmaxstunshock.desc": "", - "cobblemon.move.gmaxsweetness": "", - "cobblemon.move.gmaxsweetness.desc": "", - "cobblemon.move.gmaxtartness": "", - "cobblemon.move.gmaxtartness.desc": "", - "cobblemon.move.gmaxterror": "", - "cobblemon.move.gmaxterror.desc": "", - "cobblemon.move.gmaxvinelash": "", - "cobblemon.move.gmaxvinelash.desc": "", - "cobblemon.move.gmaxvolcalith": "", - "cobblemon.move.gmaxvolcalith.desc": "", - "cobblemon.move.gmaxvoltcrash": "", - "cobblemon.move.gmaxvoltcrash.desc": "", - "cobblemon.move.gmaxwildfire": "", - "cobblemon.move.gmaxwildfire.desc": "", - "cobblemon.move.gmaxwindrage": "", - "cobblemon.move.gmaxwindrage.desc": "", - "cobblemon.move.grassknot": "", - "cobblemon.move.grassknot.desc": "", - "cobblemon.move.grasspledge": "", - "cobblemon.move.grasspledge.desc": "", - "cobblemon.move.grasswhistle": "", - "cobblemon.move.grasswhistle.desc": "", - "cobblemon.move.grassyglide": "", - "cobblemon.move.grassyglide.desc": "", - "cobblemon.move.grassyterrain": "", - "cobblemon.move.grassyterrain.desc": "", - "cobblemon.move.gravapple": "", - "cobblemon.move.gravapple.desc": "", - "cobblemon.move.gravity": "", - "cobblemon.move.gravity.desc": "", - "cobblemon.move.growl": "", - "cobblemon.move.growl.desc": "", - "cobblemon.move.growth": "", - "cobblemon.move.growth.desc": "", - "cobblemon.move.grudge": "", - "cobblemon.move.grudge.desc": "", - "cobblemon.move.guardianofalola": "", - "cobblemon.move.guardianofalola.desc": "", - "cobblemon.move.guardsplit": "", - "cobblemon.move.guardsplit.desc": "", - "cobblemon.move.guardswap": "", - "cobblemon.move.guardswap.desc": "", - "cobblemon.move.guillotine": "", - "cobblemon.move.guillotine.desc": "", - "cobblemon.move.gunkshot": "", - "cobblemon.move.gunkshot.desc": "", - "cobblemon.move.gust": "", - "cobblemon.move.gust.desc": "", - "cobblemon.move.gyroball": "", - "cobblemon.move.gyroball.desc": "", - "cobblemon.move.hail": "", - "cobblemon.move.hail.desc": "", - "cobblemon.move.hammerarm": "", - "cobblemon.move.hammerarm.desc": "", - "cobblemon.move.happyhour": "", - "cobblemon.move.happyhour.desc": "", - "cobblemon.move.harden": "", - "cobblemon.move.harden.desc": "", - "cobblemon.move.haze": "", - "cobblemon.move.haze.desc": "", - "cobblemon.move.headbutt": "", - "cobblemon.move.headbutt.desc": "", - "cobblemon.move.headcharge": "", - "cobblemon.move.headcharge.desc": "", - "cobblemon.move.headlongrush": "", - "cobblemon.move.headlongrush.desc": "", - "cobblemon.move.headsmash": "", - "cobblemon.move.headsmash.desc": "", - "cobblemon.move.healbell": "", - "cobblemon.move.healbell.desc": "", - "cobblemon.move.healblock": "", - "cobblemon.move.healblock.desc": "", - "cobblemon.move.healingwish": "", - "cobblemon.move.healingwish.desc": "", - "cobblemon.move.healorder": "", - "cobblemon.move.healorder.desc": "", - "cobblemon.move.healpulse": "", - "cobblemon.move.healpulse.desc": "", - "cobblemon.move.heartstamp": "", - "cobblemon.move.heartstamp.desc": "", - "cobblemon.move.heartswap": "", - "cobblemon.move.heartswap.desc": "", - "cobblemon.move.heatcrash": "", - "cobblemon.move.heatcrash.desc": "", - "cobblemon.move.heatwave": "", - "cobblemon.move.heatwave.desc": "", - "cobblemon.move.heavyslam": "", - "cobblemon.move.heavyslam.desc": "", - "cobblemon.move.helpinghand": "", - "cobblemon.move.helpinghand.desc": "", - "cobblemon.move.hex": "", - "cobblemon.move.hex.desc": "", - "cobblemon.move.hiddenpower": "", - "cobblemon.move.hiddenpower.desc": "", - "cobblemon.move.highhorsepower": "", - "cobblemon.move.highhorsepower.desc": "", - "cobblemon.move.highjumpkick": "", - "cobblemon.move.highjumpkick.desc": "", - "cobblemon.move.holdback": "", - "cobblemon.move.holdback.desc": "", - "cobblemon.move.holdhands": "", - "cobblemon.move.holdhands.desc": "", - "cobblemon.move.honeclaws": "", - "cobblemon.move.honeclaws.desc": "", - "cobblemon.move.hornattack": "", - "cobblemon.move.hornattack.desc": "", - "cobblemon.move.horndrill": "", - "cobblemon.move.horndrill.desc": "", - "cobblemon.move.hornleech": "", - "cobblemon.move.hornleech.desc": "", - "cobblemon.move.howl": "", - "cobblemon.move.howl.desc": "", - "cobblemon.move.hurricane": "", - "cobblemon.move.hurricane.desc": "", - "cobblemon.move.hydrocannon": "", - "cobblemon.move.hydrocannon.desc": "", - "cobblemon.move.hydropump": "", - "cobblemon.move.hydropump.desc": "", - "cobblemon.move.hydrosteam": "", - "cobblemon.move.hydrosteam.desc": "", - "cobblemon.move.hydrovortex": "", - "cobblemon.move.hydrovortex.desc": "", - "cobblemon.move.hyperbeam": "", - "cobblemon.move.hyperbeam.desc": "", - "cobblemon.move.hyperdrill": "", - "cobblemon.move.hyperdrill.desc": "", - "cobblemon.move.hyperfang": "", - "cobblemon.move.hyperfang.desc": "", - "cobblemon.move.hyperspacefury": "", - "cobblemon.move.hyperspacefury.desc": "", - "cobblemon.move.hyperspacehole": "", - "cobblemon.move.hyperspacehole.desc": "", - "cobblemon.move.hypervoice": "", - "cobblemon.move.hypervoice.desc": "", - "cobblemon.move.hypnosis": "", - "cobblemon.move.hypnosis.desc": "", - "cobblemon.move.iceball": "", - "cobblemon.move.iceball.desc": "", - "cobblemon.move.icebeam": "", - "cobblemon.move.icebeam.desc": "", - "cobblemon.move.iceburn": "", - "cobblemon.move.iceburn.desc": "", - "cobblemon.move.icefang": "", - "cobblemon.move.icefang.desc": "", - "cobblemon.move.icehammer": "", - "cobblemon.move.icehammer.desc": "", - "cobblemon.move.icepunch": "", - "cobblemon.move.icepunch.desc": "", - "cobblemon.move.iceshard": "", - "cobblemon.move.iceshard.desc": "", - "cobblemon.move.icespinner": "", - "cobblemon.move.icespinner.desc": "", - "cobblemon.move.iciclecrash": "", - "cobblemon.move.iciclecrash.desc": "", - "cobblemon.move.iciclespear": "", - "cobblemon.move.iciclespear.desc": "", - "cobblemon.move.icywind": "", - "cobblemon.move.icywind.desc": "", - "cobblemon.move.imprison": "", - "cobblemon.move.imprison.desc": "", - "cobblemon.move.incinerate": "", - "cobblemon.move.incinerate.desc": "", - "cobblemon.move.infernalparade": "", - "cobblemon.move.infernalparade.desc": "", - "cobblemon.move.inferno": "", - "cobblemon.move.inferno.desc": "", - "cobblemon.move.infernooverdrive": "", - "cobblemon.move.infernooverdrive.desc": "", - "cobblemon.move.infestation": "", - "cobblemon.move.infestation.desc": "", - "cobblemon.move.ingrain": "", - "cobblemon.move.ingrain.desc": "", - "cobblemon.move.instruct": "", - "cobblemon.move.instruct.desc": "", - "cobblemon.move.iondeluge": "", - "cobblemon.move.iondeluge.desc": "", - "cobblemon.move.irondefense": "", - "cobblemon.move.irondefense.desc": "", - "cobblemon.move.ironhead": "", - "cobblemon.move.ironhead.desc": "", - "cobblemon.move.irontail": "", - "cobblemon.move.irontail.desc": "", - "cobblemon.move.jawlock": "", - "cobblemon.move.jawlock.desc": "", - "cobblemon.move.jetpunch": "", - "cobblemon.move.jetpunch.desc": "", - "cobblemon.move.judgment": "", - "cobblemon.move.judgment.desc": "", - "cobblemon.move.jumpkick": "", - "cobblemon.move.jumpkick.desc": "", - "cobblemon.move.junglehealing": "", - "cobblemon.move.junglehealing.desc": "", - "cobblemon.move.karatechop": "", - "cobblemon.move.karatechop.desc": "", - "cobblemon.move.kinesis": "", - "cobblemon.move.kinesis.desc": "", - "cobblemon.move.kingsshield": "", - "cobblemon.move.kingsshield.desc": "", - "cobblemon.move.knockoff": "", - "cobblemon.move.knockoff.desc": "", - "cobblemon.move.kowtowcleave": "", - "cobblemon.move.kowtowcleave.desc": "", - "cobblemon.move.landswrath": "", - "cobblemon.move.landswrath.desc": "", - "cobblemon.move.laserfocus": "", - "cobblemon.move.laserfocus.desc": "", - "cobblemon.move.lashout": "", - "cobblemon.move.lashout.desc": "", - "cobblemon.move.lastresort": "", - "cobblemon.move.lastresort.desc": "", - "cobblemon.move.lastrespects": "", - "cobblemon.move.lastrespects.desc": "", - "cobblemon.move.lavaplume": "", - "cobblemon.move.lavaplume.desc": "", - "cobblemon.move.leafage": "", - "cobblemon.move.leafage.desc": "", - "cobblemon.move.leafblade": "", - "cobblemon.move.leafblade.desc": "", - "cobblemon.move.leafstorm": "", - "cobblemon.move.leafstorm.desc": "", - "cobblemon.move.leaftornado": "", - "cobblemon.move.leaftornado.desc": "", - "cobblemon.move.leechlife": "", - "cobblemon.move.leechlife.desc": "", - "cobblemon.move.leechseed": "", - "cobblemon.move.leechseed.desc": "", - "cobblemon.move.leer": "", - "cobblemon.move.leer.desc": "", - "cobblemon.move.letssnuggleforever": "", - "cobblemon.move.letssnuggleforever.desc": "", - "cobblemon.move.lick": "", - "cobblemon.move.lick.desc": "", - "cobblemon.move.lifedew": "", - "cobblemon.move.lifedew.desc": "", - "cobblemon.move.lightofruin": "", - "cobblemon.move.lightofruin.desc": "", - "cobblemon.move.lightscreen": "", - "cobblemon.move.lightscreen.desc": "", - "cobblemon.move.lightthatburnsthesky": "", - "cobblemon.move.lightthatburnsthesky.desc": "", - "cobblemon.move.liquidation": "", - "cobblemon.move.liquidation.desc": "", - "cobblemon.move.lockon": "", - "cobblemon.move.lockon.desc": "", - "cobblemon.move.lovelykiss": "", - "cobblemon.move.lovelykiss.desc": "", - "cobblemon.move.lowkick": "", - "cobblemon.move.lowkick.desc": "", - "cobblemon.move.lowsweep": "", - "cobblemon.move.lowsweep.desc": "", - "cobblemon.move.luckychant": "", - "cobblemon.move.luckychant.desc": "", - "cobblemon.move.luminacrash": "", - "cobblemon.move.luminacrash.desc": "", - "cobblemon.move.lunarblessing": "", - "cobblemon.move.lunarblessing.desc": "", - "cobblemon.move.lunardance": "", - "cobblemon.move.lunardance.desc": "", - "cobblemon.move.lunge": "", - "cobblemon.move.lunge.desc": "", - "cobblemon.move.lusterpurge": "", - "cobblemon.move.lusterpurge.desc": "", - "cobblemon.move.machpunch": "", - "cobblemon.move.machpunch.desc": "", - "cobblemon.move.magicalleaf": "", - "cobblemon.move.magicalleaf.desc": "", - "cobblemon.move.magicaltorque": "", - "cobblemon.move.magicaltorque.desc": "", - "cobblemon.move.magiccoat": "", - "cobblemon.move.magiccoat.desc": "", - "cobblemon.move.magicpowder": "", - "cobblemon.move.magicpowder.desc": "", - "cobblemon.move.magicroom": "", - "cobblemon.move.magicroom.desc": "", - "cobblemon.move.magmastorm": "", - "cobblemon.move.magmastorm.desc": "", - "cobblemon.move.magnetbomb": "", - "cobblemon.move.magnetbomb.desc": "", - "cobblemon.move.magneticflux": "", - "cobblemon.move.magneticflux.desc": "", - "cobblemon.move.magnetrise": "", - "cobblemon.move.magnetrise.desc": "", - "cobblemon.move.magnitude": "", - "cobblemon.move.magnitude.desc": "", - "cobblemon.move.makeitrain": "", - "cobblemon.move.makeitrain.desc": "", - "cobblemon.move.maliciousmoonsault": "", - "cobblemon.move.maliciousmoonsault.desc": "", - "cobblemon.move.malignantchain": "", - "cobblemon.move.malignantchain.desc": "", - "cobblemon.move.matblock": "", - "cobblemon.move.matblock.desc": "", - "cobblemon.move.maxairstream": "", - "cobblemon.move.maxairstream.desc": "", - "cobblemon.move.maxdarkness": "", - "cobblemon.move.maxdarkness.desc": "", - "cobblemon.move.maxflare": "", - "cobblemon.move.maxflare.desc": "", - "cobblemon.move.maxflutterby": "", - "cobblemon.move.maxflutterby.desc": "", - "cobblemon.move.maxgeyser": "", - "cobblemon.move.maxgeyser.desc": "", - "cobblemon.move.maxguard": "", - "cobblemon.move.maxguard.desc": "", - "cobblemon.move.maxhailstorm": "", - "cobblemon.move.maxhailstorm.desc": "", - "cobblemon.move.maxknuckle": "", - "cobblemon.move.maxknuckle.desc": "", - "cobblemon.move.maxlightning": "", - "cobblemon.move.maxlightning.desc": "", - "cobblemon.move.maxmindstorm": "", - "cobblemon.move.maxmindstorm.desc": "", - "cobblemon.move.maxooze": "", - "cobblemon.move.maxooze.desc": "", - "cobblemon.move.maxovergrowth": "", - "cobblemon.move.maxovergrowth.desc": "", - "cobblemon.move.maxphantasm": "", - "cobblemon.move.maxphantasm.desc": "", - "cobblemon.move.maxquake": "", - "cobblemon.move.maxquake.desc": "", - "cobblemon.move.maxrockfall": "", - "cobblemon.move.maxrockfall.desc": "", - "cobblemon.move.maxstarfall": "", - "cobblemon.move.maxstarfall.desc": "", - "cobblemon.move.maxsteelspike": "", - "cobblemon.move.maxsteelspike.desc": "", - "cobblemon.move.maxstrike": "", - "cobblemon.move.maxstrike.desc": "", - "cobblemon.move.maxwyrmwind": "", - "cobblemon.move.maxwyrmwind.desc": "", - "cobblemon.move.meanlook": "", - "cobblemon.move.meanlook.desc": "", - "cobblemon.move.meditate": "", - "cobblemon.move.meditate.desc": "", - "cobblemon.move.mefirst": "", - "cobblemon.move.mefirst.desc": "", - "cobblemon.move.megadrain": "", - "cobblemon.move.megadrain.desc": "", - "cobblemon.move.megahorn": "", - "cobblemon.move.megahorn.desc": "", - "cobblemon.move.megakick": "", - "cobblemon.move.megakick.desc": "", - "cobblemon.move.megapunch": "", - "cobblemon.move.megapunch.desc": "", - "cobblemon.move.memento": "", - "cobblemon.move.memento.desc": "", - "cobblemon.move.menacingmoonrazemaelstrom": "", - "cobblemon.move.menacingmoonrazemaelstrom.desc": "", - "cobblemon.move.metalburst": "", - "cobblemon.move.metalburst.desc": "", - "cobblemon.move.metalclaw": "", - "cobblemon.move.metalclaw.desc": "", - "cobblemon.move.metalsound": "", - "cobblemon.move.metalsound.desc": "", - "cobblemon.move.meteorassault": "", - "cobblemon.move.meteorassault.desc": "", - "cobblemon.move.meteorbeam": "", - "cobblemon.move.meteorbeam.desc": "", - "cobblemon.move.meteormash": "", - "cobblemon.move.meteormash.desc": "", - "cobblemon.move.metronome": "", - "cobblemon.move.metronome.desc": "", - "cobblemon.move.milkdrink": "", - "cobblemon.move.milkdrink.desc": "", - "cobblemon.move.mimic": "", - "cobblemon.move.mimic.desc": "", - "cobblemon.move.mindblown": "", - "cobblemon.move.mindblown.desc": "", - "cobblemon.move.mindreader": "", - "cobblemon.move.mindreader.desc": "", - "cobblemon.move.minimize": "", - "cobblemon.move.minimize.desc": "", - "cobblemon.move.miracleeye": "", - "cobblemon.move.miracleeye.desc": "", - "cobblemon.move.mirrorcoat": "", - "cobblemon.move.mirrorcoat.desc": "", - "cobblemon.move.mirrormove": "", - "cobblemon.move.mirrormove.desc": "", - "cobblemon.move.mirrorshot": "", - "cobblemon.move.mirrorshot.desc": "", - "cobblemon.move.mist": "", - "cobblemon.move.mist.desc": "", - "cobblemon.move.mistball": "", - "cobblemon.move.mistball.desc": "", - "cobblemon.move.mistyexplosion": "", - "cobblemon.move.mistyexplosion.desc": "", - "cobblemon.move.mistyterrain": "", - "cobblemon.move.mistyterrain.desc": "", - "cobblemon.move.moonblast": "", - "cobblemon.move.moonblast.desc": "", - "cobblemon.move.moongeistbeam": "", - "cobblemon.move.moongeistbeam.desc": "", - "cobblemon.move.moonlight": "", - "cobblemon.move.moonlight.desc": "", - "cobblemon.move.morningsun": "", - "cobblemon.move.morningsun.desc": "", - "cobblemon.move.mortalspin": "", - "cobblemon.move.mortalspin.desc": "", - "cobblemon.move.mountaingale": "", - "cobblemon.move.mountaingale.desc": "", - "cobblemon.move.mudbomb": "", - "cobblemon.move.mudbomb.desc": "", - "cobblemon.move.muddywater": "", - "cobblemon.move.muddywater.desc": "", - "cobblemon.move.mudshot": "", - "cobblemon.move.mudshot.desc": "", - "cobblemon.move.mudslap": "", - "cobblemon.move.mudslap.desc": "", - "cobblemon.move.mudsport": "", - "cobblemon.move.mudsport.desc": "", - "cobblemon.move.multiattack": "", - "cobblemon.move.multiattack.desc": "", - "cobblemon.move.mysticalfire": "", - "cobblemon.move.mysticalfire.desc": "", - "cobblemon.move.mysticalpower": "", - "cobblemon.move.mysticalpower.desc": "", - "cobblemon.move.nastyplot": "", - "cobblemon.move.nastyplot.desc": "", - "cobblemon.move.naturalgift": "", - "cobblemon.move.naturalgift.desc": "", - "cobblemon.move.naturepower": "", - "cobblemon.move.naturepower.desc": "", - "cobblemon.move.naturesmadness": "", - "cobblemon.move.naturesmadness.desc": "", - "cobblemon.move.needlearm": "", - "cobblemon.move.needlearm.desc": "", - "cobblemon.move.neverendingnightmare": "", - "cobblemon.move.neverendingnightmare.desc": "", - "cobblemon.move.nightdaze": "", - "cobblemon.move.nightdaze.desc": "", - "cobblemon.move.nightmare": "", - "cobblemon.move.nightmare.desc": "", - "cobblemon.move.nightshade": "", - "cobblemon.move.nightshade.desc": "", - "cobblemon.move.nightslash": "", - "cobblemon.move.nightslash.desc": "", - "cobblemon.move.nobleroar": "", - "cobblemon.move.nobleroar.desc": "", - "cobblemon.move.noretreat": "", - "cobblemon.move.noretreat.desc": "", - "cobblemon.move.noxioustorque": "", - "cobblemon.move.noxioustorque.desc": "", - "cobblemon.move.nuzzle": "", - "cobblemon.move.nuzzle.desc": "", - "cobblemon.move.oblivionwing": "", - "cobblemon.move.oblivionwing.desc": "", - "cobblemon.move.obstruct": "", - "cobblemon.move.obstruct.desc": "", - "cobblemon.move.oceanicoperetta": "", - "cobblemon.move.oceanicoperetta.desc": "", - "cobblemon.move.octazooka": "", - "cobblemon.move.octazooka.desc": "", - "cobblemon.move.octolock": "", - "cobblemon.move.octolock.desc": "", - "cobblemon.move.odorsleuth": "", - "cobblemon.move.odorsleuth.desc": "", - "cobblemon.move.ominouswind": "", - "cobblemon.move.ominouswind.desc": "", - "cobblemon.move.orderup": "", - "cobblemon.move.orderup.desc": "", - "cobblemon.move.originpulse": "", - "cobblemon.move.originpulse.desc": "", - "cobblemon.move.outrage": "", - "cobblemon.move.outrage.desc": "", - "cobblemon.move.overdrive": "", - "cobblemon.move.overdrive.desc": "", - "cobblemon.move.overheat": "", - "cobblemon.move.overheat.desc": "", - "cobblemon.move.painsplit": "", - "cobblemon.move.painsplit.desc": "", - "cobblemon.move.paraboliccharge": "", - "cobblemon.move.paraboliccharge.desc": "", - "cobblemon.move.partingshot": "", - "cobblemon.move.partingshot.desc": "", - "cobblemon.move.payback": "", - "cobblemon.move.payback.desc": "", - "cobblemon.move.payday": "", - "cobblemon.move.payday.desc": "", - "cobblemon.move.peck": "", - "cobblemon.move.peck.desc": "", - "cobblemon.move.perishsong": "", - "cobblemon.move.perishsong.desc": "", - "cobblemon.move.petalblizzard": "", - "cobblemon.move.petalblizzard.desc": "", - "cobblemon.move.petaldance": "", - "cobblemon.move.petaldance.desc": "", - "cobblemon.move.phantomforce": "", - "cobblemon.move.phantomforce.desc": "", - "cobblemon.move.photongeyser": "", - "cobblemon.move.photongeyser.desc": "", - "cobblemon.move.pikapapow": "", - "cobblemon.move.pikapapow.desc": "", - "cobblemon.move.pinmissile": "", - "cobblemon.move.pinmissile.desc": "", - "cobblemon.move.plasmafists": "", - "cobblemon.move.plasmafists.desc": "", - "cobblemon.move.playnice": "", - "cobblemon.move.playnice.desc": "", - "cobblemon.move.playrough": "", - "cobblemon.move.playrough.desc": "", - "cobblemon.move.pluck": "", - "cobblemon.move.pluck.desc": "", - "cobblemon.move.poisonfang": "", - "cobblemon.move.poisonfang.desc": "", - "cobblemon.move.poisongas": "", - "cobblemon.move.poisongas.desc": "", - "cobblemon.move.poisonjab": "", - "cobblemon.move.poisonjab.desc": "", - "cobblemon.move.poisonpowder": "", - "cobblemon.move.poisonpowder.desc": "", - "cobblemon.move.poisonsting": "", - "cobblemon.move.poisonsting.desc": "", - "cobblemon.move.poisontail": "", - "cobblemon.move.poisontail.desc": "", - "cobblemon.move.pollenpuff": "", - "cobblemon.move.pollenpuff.desc": "", - "cobblemon.move.poltergeist": "", - "cobblemon.move.poltergeist.desc": "", - "cobblemon.move.populationbomb": "", - "cobblemon.move.populationbomb.desc": "", - "cobblemon.move.pounce": "", - "cobblemon.move.pounce.desc": "", - "cobblemon.move.pound": "", - "cobblemon.move.pound.desc": "", - "cobblemon.move.powder": "", - "cobblemon.move.powder.desc": "", - "cobblemon.move.powdersnow": "", - "cobblemon.move.powdersnow.desc": "", - "cobblemon.move.powergem": "", - "cobblemon.move.powergem.desc": "", - "cobblemon.move.powershift": "", - "cobblemon.move.powershift.desc": "", - "cobblemon.move.powersplit": "", - "cobblemon.move.powersplit.desc": "", - "cobblemon.move.powerswap": "", - "cobblemon.move.powerswap.desc": "", - "cobblemon.move.powertrick": "", - "cobblemon.move.powertrick.desc": "", - "cobblemon.move.powertrip": "", - "cobblemon.move.powertrip.desc": "", - "cobblemon.move.poweruppunch": "", - "cobblemon.move.poweruppunch.desc": "", - "cobblemon.move.powerwhip": "", - "cobblemon.move.powerwhip.desc": "", - "cobblemon.move.precipiceblades": "", - "cobblemon.move.precipiceblades.desc": "", - "cobblemon.move.present": "", - "cobblemon.move.present.desc": "", - "cobblemon.move.prismaticlaser": "", - "cobblemon.move.prismaticlaser.desc": "", - "cobblemon.move.protect": "", - "cobblemon.move.protect.desc": "", - "cobblemon.move.psybeam": "", - "cobblemon.move.psybeam.desc": "", - "cobblemon.move.psychic": "", - "cobblemon.move.psychic.desc": "", - "cobblemon.move.psychicfangs": "", - "cobblemon.move.psychicfangs.desc": "", - "cobblemon.move.psychicterrain": "", - "cobblemon.move.psychicterrain.desc": "", - "cobblemon.move.psychoboost": "", - "cobblemon.move.psychoboost.desc": "", - "cobblemon.move.psychocut": "", - "cobblemon.move.psychocut.desc": "", - "cobblemon.move.psychoshift": "", - "cobblemon.move.psychoshift.desc": "", - "cobblemon.move.psychup": "", - "cobblemon.move.psychup.desc": "", - "cobblemon.move.psyshieldbash": "", - "cobblemon.move.psyshieldbash.desc": "", - "cobblemon.move.psyshock": "", - "cobblemon.move.psyshock.desc": "", - "cobblemon.move.psystrike": "", - "cobblemon.move.psystrike.desc": "", - "cobblemon.move.psywave": "", - "cobblemon.move.psywave.desc": "", - "cobblemon.move.pulverizingpancake": "", - "cobblemon.move.pulverizingpancake.desc": "", - "cobblemon.move.punishment": "", - "cobblemon.move.punishment.desc": "", - "cobblemon.move.purify": "", - "cobblemon.move.purify.desc": "", - "cobblemon.move.pursuit": "", - "cobblemon.move.pursuit.desc": "", - "cobblemon.move.pyroball": "", - "cobblemon.move.pyroball.desc": "", - "cobblemon.move.quash": "", - "cobblemon.move.quash.desc": "", - "cobblemon.move.quickattack": "", - "cobblemon.move.quickattack.desc": "", - "cobblemon.move.quickguard": "", - "cobblemon.move.quickguard.desc": "", - "cobblemon.move.quiverdance": "", - "cobblemon.move.quiverdance.desc": "", - "cobblemon.move.rage": "", - "cobblemon.move.rage.desc": "", - "cobblemon.move.ragefist": "", - "cobblemon.move.ragefist.desc": "", - "cobblemon.move.ragepowder": "", - "cobblemon.move.ragepowder.desc": "", - "cobblemon.move.ragingbull": "", - "cobblemon.move.ragingbull.desc": "", - "cobblemon.move.ragingfury": "", - "cobblemon.move.ragingfury.desc": "", - "cobblemon.move.raindance": "", - "cobblemon.move.raindance.desc": "", - "cobblemon.move.rapidspin": "", - "cobblemon.move.rapidspin.desc": "", - "cobblemon.move.razorleaf": "", - "cobblemon.move.razorleaf.desc": "", - "cobblemon.move.razorshell": "", - "cobblemon.move.razorshell.desc": "", - "cobblemon.move.razorwind": "", - "cobblemon.move.razorwind.desc": "", - "cobblemon.move.recharge": "", - "cobblemon.move.recover": "", - "cobblemon.move.recover.desc": "", - "cobblemon.move.recycle": "", - "cobblemon.move.recycle.desc": "", - "cobblemon.move.reflect": "", - "cobblemon.move.reflect.desc": "", - "cobblemon.move.reflecttype": "", - "cobblemon.move.reflecttype.desc": "", - "cobblemon.move.refresh": "", - "cobblemon.move.refresh.desc": "", - "cobblemon.move.relicsong": "", - "cobblemon.move.relicsong.desc": "", - "cobblemon.move.rest": "", - "cobblemon.move.rest.desc": "", - "cobblemon.move.retaliate": "", - "cobblemon.move.retaliate.desc": "", - "cobblemon.move.return": "", - "cobblemon.move.return.desc": "", - "cobblemon.move.revelationdance": "", - "cobblemon.move.revelationdance.desc": "", - "cobblemon.move.revenge": "", - "cobblemon.move.revenge.desc": "", - "cobblemon.move.reversal": "", - "cobblemon.move.reversal.desc": "", - "cobblemon.move.revivalblessing": "", - "cobblemon.move.revivalblessing.desc": "", - "cobblemon.move.risingvoltage": "", - "cobblemon.move.risingvoltage.desc": "", - "cobblemon.move.roar": "", - "cobblemon.move.roar.desc": "", - "cobblemon.move.roaroftime": "", - "cobblemon.move.roaroftime.desc": "", - "cobblemon.move.rockblast": "", - "cobblemon.move.rockblast.desc": "", - "cobblemon.move.rockclimb": "", - "cobblemon.move.rockclimb.desc": "", - "cobblemon.move.rockpolish": "", - "cobblemon.move.rockpolish.desc": "", - "cobblemon.move.rockslide": "", - "cobblemon.move.rockslide.desc": "", - "cobblemon.move.rocksmash": "", - "cobblemon.move.rocksmash.desc": "", - "cobblemon.move.rockthrow": "", - "cobblemon.move.rockthrow.desc": "", - "cobblemon.move.rocktomb": "", - "cobblemon.move.rocktomb.desc": "", - "cobblemon.move.rockwrecker": "", - "cobblemon.move.rockwrecker.desc": "", - "cobblemon.move.roleplay": "", - "cobblemon.move.roleplay.desc": "", - "cobblemon.move.rollingkick": "", - "cobblemon.move.rollingkick.desc": "", - "cobblemon.move.rollout": "", - "cobblemon.move.rollout.desc": "", - "cobblemon.move.roost": "", - "cobblemon.move.roost.desc": "", - "cobblemon.move.rototiller": "", - "cobblemon.move.rototiller.desc": "", - "cobblemon.move.round": "", - "cobblemon.move.round.desc": "", - "cobblemon.move.ruination": "", - "cobblemon.move.ruination.desc": "", - "cobblemon.move.sacredfire": "", - "cobblemon.move.sacredfire.desc": "", - "cobblemon.move.sacredsword": "", - "cobblemon.move.sacredsword.desc": "", - "cobblemon.move.safeguard": "", - "cobblemon.move.safeguard.desc": "", - "cobblemon.move.saltcure": "", - "cobblemon.move.saltcure.desc": "", - "cobblemon.move.sandattack": "", - "cobblemon.move.sandattack.desc": "", - "cobblemon.move.sandsearstorm": "", - "cobblemon.move.sandsearstorm.desc": "", - "cobblemon.move.sandstorm": "", - "cobblemon.move.sandstorm.desc": "", - "cobblemon.move.sandtomb": "", - "cobblemon.move.sandtomb.desc": "", - "cobblemon.move.sappyseed": "", - "cobblemon.move.sappyseed.desc": "", - "cobblemon.move.savagespinout": "", - "cobblemon.move.savagespinout.desc": "", - "cobblemon.move.scald": "", - "cobblemon.move.scald.desc": "", - "cobblemon.move.scaleshot": "", - "cobblemon.move.scaleshot.desc": "", - "cobblemon.move.scaryface": "", - "cobblemon.move.scaryface.desc": "", - "cobblemon.move.scorchingsands": "", - "cobblemon.move.scorchingsands.desc": "", - "cobblemon.move.scratch": "", - "cobblemon.move.scratch.desc": "", - "cobblemon.move.screech": "", - "cobblemon.move.screech.desc": "", - "cobblemon.move.searingshot": "", - "cobblemon.move.searingshot.desc": "", - "cobblemon.move.searingsunrazesmash": "", - "cobblemon.move.searingsunrazesmash.desc": "", - "cobblemon.move.secretpower": "", - "cobblemon.move.secretpower.desc": "", - "cobblemon.move.secretsword": "", - "cobblemon.move.secretsword.desc": "", - "cobblemon.move.seedbomb": "", - "cobblemon.move.seedbomb.desc": "", - "cobblemon.move.seedflare": "", - "cobblemon.move.seedflare.desc": "", - "cobblemon.move.seismictoss": "", - "cobblemon.move.seismictoss.desc": "", - "cobblemon.move.selfdestruct": "", - "cobblemon.move.selfdestruct.desc": "", - "cobblemon.move.shadowball": "", - "cobblemon.move.shadowball.desc": "", - "cobblemon.move.shadowbone": "", - "cobblemon.move.shadowbone.desc": "", - "cobblemon.move.shadowclaw": "", - "cobblemon.move.shadowclaw.desc": "", - "cobblemon.move.shadowforce": "", - "cobblemon.move.shadowforce.desc": "", - "cobblemon.move.shadowpunch": "", - "cobblemon.move.shadowpunch.desc": "", - "cobblemon.move.shadowsneak": "", - "cobblemon.move.shadowsneak.desc": "", - "cobblemon.move.sharpen": "", - "cobblemon.move.sharpen.desc": "", - "cobblemon.move.shatteredpsyche": "", - "cobblemon.move.shatteredpsyche.desc": "", - "cobblemon.move.shedtail": "", - "cobblemon.move.shedtail.desc": "", - "cobblemon.move.sheercold": "", - "cobblemon.move.sheercold.desc": "", - "cobblemon.move.shellsidearm": "", - "cobblemon.move.shellsidearm.desc": "", - "cobblemon.move.shellsmash": "", - "cobblemon.move.shellsmash.desc": "", - "cobblemon.move.shelltrap": "", - "cobblemon.move.shelltrap.desc": "", - "cobblemon.move.shelter": "", - "cobblemon.move.shelter.desc": "", - "cobblemon.move.shiftgear": "", - "cobblemon.move.shiftgear.desc": "", - "cobblemon.move.shockwave": "", - "cobblemon.move.shockwave.desc": "", - "cobblemon.move.shoreup": "", - "cobblemon.move.shoreup.desc": "", - "cobblemon.move.signalbeam": "", - "cobblemon.move.signalbeam.desc": "", - "cobblemon.move.silktrap": "", - "cobblemon.move.silktrap.desc": "", - "cobblemon.move.silverwind": "", - "cobblemon.move.silverwind.desc": "", - "cobblemon.move.simplebeam": "", - "cobblemon.move.simplebeam.desc": "", - "cobblemon.move.sing": "", - "cobblemon.move.sing.desc": "", - "cobblemon.move.sinisterarrowraid": "", - "cobblemon.move.sinisterarrowraid.desc": "", - "cobblemon.move.sizzlyslide": "", - "cobblemon.move.sizzlyslide.desc": "", - "cobblemon.move.sketch": "", - "cobblemon.move.sketch.desc": "", - "cobblemon.move.skillswap": "", - "cobblemon.move.skillswap.desc": "", - "cobblemon.move.skittersmack": "", - "cobblemon.move.skittersmack.desc": "", - "cobblemon.move.skullbash": "", - "cobblemon.move.skullbash.desc": "", - "cobblemon.move.skyattack": "", - "cobblemon.move.skyattack.desc": "", - "cobblemon.move.skydrop": "", - "cobblemon.move.skydrop.desc": "", - "cobblemon.move.skyuppercut": "", - "cobblemon.move.skyuppercut.desc": "", - "cobblemon.move.slackoff": "", - "cobblemon.move.slackoff.desc": "", - "cobblemon.move.slam": "", - "cobblemon.move.slam.desc": "", - "cobblemon.move.slash": "", - "cobblemon.move.slash.desc": "", - "cobblemon.move.sleeppowder": "", - "cobblemon.move.sleeppowder.desc": "", - "cobblemon.move.sleeptalk": "", - "cobblemon.move.sleeptalk.desc": "", - "cobblemon.move.sludge": "", - "cobblemon.move.sludge.desc": "", - "cobblemon.move.sludgebomb": "", - "cobblemon.move.sludgebomb.desc": "", - "cobblemon.move.sludgewave": "", - "cobblemon.move.sludgewave.desc": "", - "cobblemon.move.smackdown": "", - "cobblemon.move.smackdown.desc": "", - "cobblemon.move.smartstrike": "", - "cobblemon.move.smartstrike.desc": "", - "cobblemon.move.smellingsalts": "", - "cobblemon.move.smellingsalts.desc": "", - "cobblemon.move.smog": "", - "cobblemon.move.smog.desc": "", - "cobblemon.move.smokescreen": "", - "cobblemon.move.smokescreen.desc": "", - "cobblemon.move.snaptrap": "", - "cobblemon.move.snaptrap.desc": "", - "cobblemon.move.snarl": "", - "cobblemon.move.snarl.desc": "", - "cobblemon.move.snatch": "", - "cobblemon.move.snatch.desc": "", - "cobblemon.move.snipeshot": "", - "cobblemon.move.snipeshot.desc": "", - "cobblemon.move.snore": "", - "cobblemon.move.snore.desc": "", - "cobblemon.move.snowscape": "", - "cobblemon.move.snowscape.desc": "", - "cobblemon.move.soak": "", - "cobblemon.move.soak.desc": "", - "cobblemon.move.softboiled": "", - "cobblemon.move.softboiled.desc": "", - "cobblemon.move.solarbeam": "", - "cobblemon.move.solarbeam.desc": "", - "cobblemon.move.solarblade": "", - "cobblemon.move.solarblade.desc": "", - "cobblemon.move.sonicboom": "", - "cobblemon.move.sonicboom.desc": "", - "cobblemon.move.soulstealing7starstrike": "", - "cobblemon.move.soulstealing7starstrike.desc": "", - "cobblemon.move.spacialrend": "", - "cobblemon.move.spacialrend.desc": "", - "cobblemon.move.spark": "", - "cobblemon.move.spark.desc": "", - "cobblemon.move.sparklingaria": "", - "cobblemon.move.sparklingaria.desc": "", - "cobblemon.move.sparklyswirl": "", - "cobblemon.move.sparklyswirl.desc": "", - "cobblemon.move.spectralthief": "", - "cobblemon.move.spectralthief.desc": "", - "cobblemon.move.speedswap": "", - "cobblemon.move.speedswap.desc": "", - "cobblemon.move.spicyextract": "", - "cobblemon.move.spicyextract.desc": "", - "cobblemon.move.spiderweb": "", - "cobblemon.move.spiderweb.desc": "", - "cobblemon.move.spikecannon": "", - "cobblemon.move.spikecannon.desc": "", - "cobblemon.move.spikes": "", - "cobblemon.move.spikes.desc": "", - "cobblemon.move.spikyshield": "", - "cobblemon.move.spikyshield.desc": "", - "cobblemon.move.spinout": "", - "cobblemon.move.spinout.desc": "", - "cobblemon.move.spiritbreak": "", - "cobblemon.move.spiritbreak.desc": "", - "cobblemon.move.spiritshackle": "", - "cobblemon.move.spiritshackle.desc": "", - "cobblemon.move.spite": "", - "cobblemon.move.spite.desc": "", - "cobblemon.move.spitup": "", - "cobblemon.move.spitup.desc": "", - "cobblemon.move.splash": "", - "cobblemon.move.splash.desc": "", - "cobblemon.move.splinteredstormshards": "", - "cobblemon.move.splinteredstormshards.desc": "", - "cobblemon.move.splishysplash": "", - "cobblemon.move.splishysplash.desc": "", - "cobblemon.move.spore": "", - "cobblemon.move.spore.desc": "", - "cobblemon.move.spotlight": "", - "cobblemon.move.spotlight.desc": "", - "cobblemon.move.springtidestorm": "", - "cobblemon.move.springtidestorm.desc": "", - "cobblemon.move.stealthrock": "", - "cobblemon.move.stealthrock.desc": "", - "cobblemon.move.steameruption": "", - "cobblemon.move.steameruption.desc": "", - "cobblemon.move.steamroller": "", - "cobblemon.move.steamroller.desc": "", - "cobblemon.move.steelbeam": "", - "cobblemon.move.steelbeam.desc": "", - "cobblemon.move.steelroller": "", - "cobblemon.move.steelroller.desc": "", - "cobblemon.move.steelwing": "", - "cobblemon.move.steelwing.desc": "", - "cobblemon.move.stickyweb": "", - "cobblemon.move.stickyweb.desc": "", - "cobblemon.move.stockpile": "", - "cobblemon.move.stockpile.desc": "", - "cobblemon.move.stokedsparksurfer": "", - "cobblemon.move.stokedsparksurfer.desc": "", - "cobblemon.move.stomp": "", - "cobblemon.move.stomp.desc": "", - "cobblemon.move.stompingtantrum": "", - "cobblemon.move.stompingtantrum.desc": "", - "cobblemon.move.stoneaxe": "", - "cobblemon.move.stoneaxe.desc": "", - "cobblemon.move.stoneedge": "", - "cobblemon.move.stoneedge.desc": "", - "cobblemon.move.storedpower": "", - "cobblemon.move.storedpower.desc": "", - "cobblemon.move.stormthrow": "", - "cobblemon.move.stormthrow.desc": "", - "cobblemon.move.strangesteam": "", - "cobblemon.move.strangesteam.desc": "", - "cobblemon.move.strength": "", - "cobblemon.move.strength.desc": "", - "cobblemon.move.strengthsap": "", - "cobblemon.move.strengthsap.desc": "", - "cobblemon.move.stringshot": "", - "cobblemon.move.stringshot.desc": "", - "cobblemon.move.struggle": "", - "cobblemon.move.struggle.desc": "", - "cobblemon.move.strugglebug": "", - "cobblemon.move.strugglebug.desc": "", - "cobblemon.move.stuffcheeks": "", - "cobblemon.move.stuffcheeks.desc": "", - "cobblemon.move.stunspore": "", - "cobblemon.move.stunspore.desc": "", - "cobblemon.move.submission": "", - "cobblemon.move.submission.desc": "", - "cobblemon.move.substitute": "", - "cobblemon.move.substitute.desc": "", - "cobblemon.move.subzeroslammer": "", - "cobblemon.move.subzeroslammer.desc": "", - "cobblemon.move.suckerpunch": "", - "cobblemon.move.suckerpunch.desc": "", - "cobblemon.move.sunnyday": "", - "cobblemon.move.sunnyday.desc": "", - "cobblemon.move.sunsteelstrike": "", - "cobblemon.move.sunsteelstrike.desc": "", - "cobblemon.move.superfang": "", - "cobblemon.move.superfang.desc": "", - "cobblemon.move.superpower": "", - "cobblemon.move.superpower.desc": "", - "cobblemon.move.supersonic": "", - "cobblemon.move.supersonic.desc": "", - "cobblemon.move.supersonicskystrike": "", - "cobblemon.move.supersonicskystrike.desc": "", - "cobblemon.move.surf": "", - "cobblemon.move.surf.desc": "", - "cobblemon.move.surgingstrikes": "", - "cobblemon.move.surgingstrikes.desc": "", - "cobblemon.move.swagger": "", - "cobblemon.move.swagger.desc": "", - "cobblemon.move.swallow": "", - "cobblemon.move.swallow.desc": "", - "cobblemon.move.sweetkiss": "", - "cobblemon.move.sweetkiss.desc": "", - "cobblemon.move.sweetscent": "", - "cobblemon.move.sweetscent.desc": "", - "cobblemon.move.swift": "", - "cobblemon.move.swift.desc": "", - "cobblemon.move.switcheroo": "", - "cobblemon.move.switcheroo.desc": "", - "cobblemon.move.swordsdance": "", - "cobblemon.move.swordsdance.desc": "", - "cobblemon.move.synchronoise": "", - "cobblemon.move.synchronoise.desc": "", - "cobblemon.move.synthesis": "", - "cobblemon.move.synthesis.desc": "", - "cobblemon.move.tackle": "", - "cobblemon.move.tackle.desc": "", - "cobblemon.move.tailglow": "", - "cobblemon.move.tailglow.desc": "", - "cobblemon.move.tailslap": "", - "cobblemon.move.tailslap.desc": "", - "cobblemon.move.tailwhip": "", - "cobblemon.move.tailwhip.desc": "", - "cobblemon.move.tailwind": "", - "cobblemon.move.tailwind.desc": "", - "cobblemon.move.takedown": "", - "cobblemon.move.takedown.desc": "", - "cobblemon.move.takeheart": "", - "cobblemon.move.takeheart.desc": "", - "cobblemon.move.tarshot": "", - "cobblemon.move.tarshot.desc": "", - "cobblemon.move.taunt": "", - "cobblemon.move.taunt.desc": "", - "cobblemon.move.tearfullook": "", - "cobblemon.move.tearfullook.desc": "", - "cobblemon.move.teatime": "", - "cobblemon.move.teatime.desc": "", - "cobblemon.move.technoblast": "", - "cobblemon.move.technoblast.desc": "", - "cobblemon.move.tectonicrage": "", - "cobblemon.move.tectonicrage.desc": "", - "cobblemon.move.teeterdance": "", - "cobblemon.move.teeterdance.desc": "", - "cobblemon.move.telekinesis": "", - "cobblemon.move.telekinesis.desc": "", - "cobblemon.move.teleport": "", - "cobblemon.move.teleport.desc": "", - "cobblemon.move.terablast": "", - "cobblemon.move.terablast.desc": "", - "cobblemon.move.terrainpulse": "", - "cobblemon.move.terrainpulse.desc": "", - "cobblemon.move.thief": "", - "cobblemon.move.thief.desc": "", - "cobblemon.move.thousandarrows": "", - "cobblemon.move.thousandarrows.desc": "", - "cobblemon.move.thousandwaves": "", - "cobblemon.move.thousandwaves.desc": "", - "cobblemon.move.thrash": "", - "cobblemon.move.thrash.desc": "", - "cobblemon.move.throatchop": "", - "cobblemon.move.throatchop.desc": "", - "cobblemon.move.thunder": "", - "cobblemon.move.thunder.desc": "", - "cobblemon.move.thunderbolt": "", - "cobblemon.move.thunderbolt.desc": "", - "cobblemon.move.thundercage": "", - "cobblemon.move.thundercage.desc": "", - "cobblemon.move.thunderfang": "", - "cobblemon.move.thunderfang.desc": "", - "cobblemon.move.thunderouskick": "", - "cobblemon.move.thunderouskick.desc": "", - "cobblemon.move.thunderpunch": "", - "cobblemon.move.thunderpunch.desc": "", - "cobblemon.move.thundershock": "", - "cobblemon.move.thundershock.desc": "", - "cobblemon.move.thunderwave": "", - "cobblemon.move.thunderwave.desc": "", - "cobblemon.move.tickle": "", - "cobblemon.move.tickle.desc": "", - "cobblemon.move.tidyup": "", - "cobblemon.move.tidyup.desc": "", - "cobblemon.move.topsyturvy": "", - "cobblemon.move.topsyturvy.desc": "", - "cobblemon.move.torchsong": "", - "cobblemon.move.torchsong.desc": "", - "cobblemon.move.torment": "", - "cobblemon.move.torment.desc": "", - "cobblemon.move.toxic": "", - "cobblemon.move.toxic.desc": "", - "cobblemon.move.toxicspikes": "", - "cobblemon.move.toxicspikes.desc": "", - "cobblemon.move.toxicthread": "", - "cobblemon.move.toxicthread.desc": "", - "cobblemon.move.trailblaze": "", - "cobblemon.move.trailblaze.desc": "", - "cobblemon.move.transform": "", - "cobblemon.move.transform.desc": "", - "cobblemon.move.triattack": "", - "cobblemon.move.triattack.desc": "", - "cobblemon.move.trick": "", - "cobblemon.move.trick.desc": "", - "cobblemon.move.trickortreat": "", - "cobblemon.move.trickortreat.desc": "", - "cobblemon.move.trickroom": "", - "cobblemon.move.trickroom.desc": "", - "cobblemon.move.triplearrows": "", - "cobblemon.move.triplearrows.desc": "", - "cobblemon.move.tripleaxel": "", - "cobblemon.move.tripleaxel.desc": "", - "cobblemon.move.tripledive": "", - "cobblemon.move.tripledive.desc": "", - "cobblemon.move.triplekick": "", - "cobblemon.move.triplekick.desc": "", - "cobblemon.move.tropkick": "", - "cobblemon.move.tropkick.desc": "", - "cobblemon.move.trumpcard": "", - "cobblemon.move.trumpcard.desc": "", - "cobblemon.move.twinbeam": "", - "cobblemon.move.twinbeam.desc": "", - "cobblemon.move.twineedle": "", - "cobblemon.move.twineedle.desc": "", - "cobblemon.move.twinkletackle": "", - "cobblemon.move.twinkletackle.desc": "", - "cobblemon.move.twister": "", - "cobblemon.move.twister.desc": "", - "cobblemon.move.uproar": "", - "cobblemon.move.uproar.desc": "", - "cobblemon.move.upperhand": "", - "cobblemon.move.upperhand.desc": "", - "cobblemon.move.uturn": "", - "cobblemon.move.uturn.desc": "", - "cobblemon.move.vacuumwave": "", - "cobblemon.move.vacuumwave.desc": "", - "cobblemon.move.vcreate": "", - "cobblemon.move.vcreate.desc": "", - "cobblemon.move.veeveevolley": "", - "cobblemon.move.veeveevolley.desc": "", - "cobblemon.move.venomdrench": "", - "cobblemon.move.venomdrench.desc": "", - "cobblemon.move.venoshock": "", - "cobblemon.move.venoshock.desc": "", - "cobblemon.move.victorydance": "", - "cobblemon.move.victorydance.desc": "", - "cobblemon.move.vinewhip": "", - "cobblemon.move.vinewhip.desc": "", - "cobblemon.move.visegrip": "", - "cobblemon.move.visegrip.desc": "", - "cobblemon.move.vitalthrow": "", - "cobblemon.move.vitalthrow.desc": "", - "cobblemon.move.voltswitch": "", - "cobblemon.move.voltswitch.desc": "", - "cobblemon.move.volttackle": "", - "cobblemon.move.volttackle.desc": "", - "cobblemon.move.wakeupslap": "", - "cobblemon.move.wakeupslap.desc": "", - "cobblemon.move.waterfall": "", - "cobblemon.move.waterfall.desc": "", - "cobblemon.move.watergun": "", - "cobblemon.move.watergun.desc": "", - "cobblemon.move.waterpledge": "", - "cobblemon.move.waterpledge.desc": "", - "cobblemon.move.waterpulse": "", - "cobblemon.move.waterpulse.desc": "", - "cobblemon.move.watershuriken": "", - "cobblemon.move.watershuriken.desc": "", - "cobblemon.move.watersport": "", - "cobblemon.move.watersport.desc": "", - "cobblemon.move.waterspout": "", - "cobblemon.move.waterspout.desc": "", - "cobblemon.move.wavecrash": "", - "cobblemon.move.wavecrash.desc": "", - "cobblemon.move.weatherball": "", - "cobblemon.move.weatherball.desc": "", - "cobblemon.move.whirlpool": "", - "cobblemon.move.whirlpool.desc": "", - "cobblemon.move.whirlwind": "", - "cobblemon.move.whirlwind.desc": "", - "cobblemon.move.wickedblow": "", - "cobblemon.move.wickedblow.desc": "", - "cobblemon.move.wickedtorque": "", - "cobblemon.move.wickedtorque.desc": "", - "cobblemon.move.wideguard": "", - "cobblemon.move.wideguard.desc": "", - "cobblemon.move.wildboltstorm": "", - "cobblemon.move.wildboltstorm.desc": "", - "cobblemon.move.wildcharge": "", - "cobblemon.move.wildcharge.desc": "", - "cobblemon.move.willowisp": "", - "cobblemon.move.willowisp.desc": "", - "cobblemon.move.wingattack": "", - "cobblemon.move.wingattack.desc": "", - "cobblemon.move.wish": "", - "cobblemon.move.wish.desc": "", - "cobblemon.move.withdraw": "", - "cobblemon.move.withdraw.desc": "", - "cobblemon.move.wonderroom": "", - "cobblemon.move.wonderroom.desc": "", - "cobblemon.move.woodhammer": "", - "cobblemon.move.woodhammer.desc": "", - "cobblemon.move.workup": "", - "cobblemon.move.workup.desc": "", - "cobblemon.move.worryseed": "", - "cobblemon.move.worryseed.desc": "", - "cobblemon.move.wrap": "", - "cobblemon.move.wrap.desc": "", - "cobblemon.move.wringout": "", - "cobblemon.move.wringout.desc": "", - "cobblemon.move.xscissor": "", - "cobblemon.move.xscissor.desc": "", - "cobblemon.move.yawn": "", - "cobblemon.move.yawn.desc": "", - "cobblemon.move.zapcannon": "", - "cobblemon.move.zapcannon.desc": "", - "cobblemon.move.zenheadbutt": "", - "cobblemon.move.zenheadbutt.desc": "", - "cobblemon.move.zingzap": "", - "cobblemon.move.zingzap.desc": "", - "cobblemon.move.zippyzap": "", - "cobblemon.move.zippyzap.desc": "", - "cobblemon.entity.pokemon": "", - "entity.cobblemon.empty_pokeball": "", - "cobblemon.species.bulbasaur.name": "", - "cobblemon.species.bulbasaur.desc": "", - "cobblemon.species.ivysaur.name": "", - "cobblemon.species.ivysaur.desc": "", - "cobblemon.species.venusaur.name": "", - "cobblemon.species.venusaur.desc": "", - "cobblemon.species.charmander.name": "", - "cobblemon.species.charmander.desc": "", - "cobblemon.species.charmeleon.name": "", - "cobblemon.species.charmeleon.desc": "", - "cobblemon.species.charizard.name": "", - "cobblemon.species.charizard.desc": "", - "cobblemon.species.squirtle.name": "", - "cobblemon.species.squirtle.desc": "", - "cobblemon.species.wartortle.name": "", - "cobblemon.species.wartortle.desc": "", - "cobblemon.species.blastoise.name": "", - "cobblemon.species.blastoise.desc": "", - "cobblemon.species.caterpie.name": "", - "cobblemon.species.caterpie.desc": "", - "cobblemon.species.metapod.name": "", - "cobblemon.species.metapod.desc": "", - "cobblemon.species.butterfree.name": "", - "cobblemon.species.butterfree.desc": "", - "cobblemon.species.weedle.name": "", - "cobblemon.species.weedle.desc": "", - "cobblemon.species.kakuna.name": "", - "cobblemon.species.kakuna.desc": "", - "cobblemon.species.beedrill.name": "", - "cobblemon.species.beedrill.desc": "", - "cobblemon.species.pidgey.name": "", - "cobblemon.species.pidgey.desc": "", - "cobblemon.species.pidgeotto.name": "", - "cobblemon.species.pidgeotto.desc": "", - "cobblemon.species.pidgeot.name": "", - "cobblemon.species.pidgeot.desc": "", - "cobblemon.species.rattata.name": "", - "cobblemon.species.rattata.desc": "", - "cobblemon.species.raticate.name": "", - "cobblemon.species.raticate.desc": "", - "cobblemon.species.spearow.name": "", - "cobblemon.species.spearow.desc": "", - "cobblemon.species.fearow.name": "", - "cobblemon.species.fearow.desc": "", - "cobblemon.species.ekans.name": "", - "cobblemon.species.ekans.desc": "", - "cobblemon.species.arbok.name": "", - "cobblemon.species.arbok.desc": "", - "cobblemon.species.pikachu.name": "", - "cobblemon.species.pikachu.desc": "", - "cobblemon.species.raichu.name": "", - "cobblemon.species.raichu.desc": "", - "cobblemon.species.sandshrew.name": "", - "cobblemon.species.sandshrew.desc": "", - "cobblemon.species.sandslash.name": "", - "cobblemon.species.sandslash.desc": "", - "cobblemon.species.nidoranf.name": "", - "cobblemon.species.nidoranf.desc": "", - "cobblemon.species.nidorina.name": "", - "cobblemon.species.nidorina.desc": "", - "cobblemon.species.nidoqueen.name": "", - "cobblemon.species.nidoqueen.desc": "", - "cobblemon.species.nidoranm.name": "", - "cobblemon.species.nidoranm.desc": "", - "cobblemon.species.nidorino.name": "", - "cobblemon.species.nidorino.desc": "", - "cobblemon.species.nidoking.name": "", - "cobblemon.species.nidoking.desc": "", - "cobblemon.species.clefairy.name": "", - "cobblemon.species.clefairy.desc": "", - "cobblemon.species.clefable.name": "", - "cobblemon.species.clefable.desc": "", - "cobblemon.species.vulpix.name": "", - "cobblemon.species.vulpix.desc": "", - "cobblemon.species.ninetales.name": "", - "cobblemon.species.ninetales.desc": "", - "cobblemon.species.jigglypuff.name": "", - "cobblemon.species.jigglypuff.desc": "", - "cobblemon.species.wigglytuff.name": "", - "cobblemon.species.wigglytuff.desc": "", - "cobblemon.species.zubat.name": "", - "cobblemon.species.zubat.desc": "", - "cobblemon.species.golbat.name": "", - "cobblemon.species.golbat.desc": "", - "cobblemon.species.oddish.name": "", - "cobblemon.species.oddish.desc": "", - "cobblemon.species.gloom.name": "", - "cobblemon.species.gloom.desc": "", - "cobblemon.species.vileplume.name": "", - "cobblemon.species.vileplume.desc": "", - "cobblemon.species.paras.name": "", - "cobblemon.species.paras.desc": "", - "cobblemon.species.parasect.name": "", - "cobblemon.species.parasect.desc": "", - "cobblemon.species.venonat.name": "", - "cobblemon.species.venonat.desc": "", - "cobblemon.species.venomoth.name": "", - "cobblemon.species.venomoth.desc": "", - "cobblemon.species.diglett.name": "", - "cobblemon.species.diglett.desc": "", - "cobblemon.species.dugtrio.name": "", - "cobblemon.species.dugtrio.desc": "", - "cobblemon.species.meowth.name": "", - "cobblemon.species.meowth.desc": "", - "cobblemon.species.persian.name": "", - "cobblemon.species.persian.desc": "", - "cobblemon.species.psyduck.name": "", - "cobblemon.species.psyduck.desc": "", - "cobblemon.species.golduck.name": "", - "cobblemon.species.golduck.desc": "", - "cobblemon.species.mankey.name": "", - "cobblemon.species.mankey.desc": "", - "cobblemon.species.primeape.name": "", - "cobblemon.species.primeape.desc": "", - "cobblemon.species.growlithe.name": "", - "cobblemon.species.growlithe.desc": "", - "cobblemon.species.arcanine.name": "", - "cobblemon.species.arcanine.desc": "", - "cobblemon.species.poliwag.name": "", - "cobblemon.species.poliwag.desc": "", - "cobblemon.species.poliwhirl.name": "", - "cobblemon.species.poliwhirl.desc": "", - "cobblemon.species.poliwrath.name": "", - "cobblemon.species.poliwrath.desc": "", - "cobblemon.species.abra.name": "", - "cobblemon.species.abra.desc": "", - "cobblemon.species.kadabra.name": "", - "cobblemon.species.kadabra.desc": "", - "cobblemon.species.alakazam.name": "", - "cobblemon.species.alakazam.desc": "", - "cobblemon.species.machop.name": "", - "cobblemon.species.machop.desc": "", - "cobblemon.species.machoke.name": "", - "cobblemon.species.machoke.desc": "", - "cobblemon.species.machamp.name": "", - "cobblemon.species.machamp.desc": "", - "cobblemon.species.bellsprout.name": "", - "cobblemon.species.bellsprout.desc": "", - "cobblemon.species.weepinbell.name": "", - "cobblemon.species.weepinbell.desc": "", - "cobblemon.species.victreebel.name": "", - "cobblemon.species.victreebel.desc": "", - "cobblemon.species.tentacool.name": "", - "cobblemon.species.tentacool.desc": "", - "cobblemon.species.tentacruel.name": "", - "cobblemon.species.tentacruel.desc": "", - "cobblemon.species.geodude.name": "", - "cobblemon.species.geodude.desc": "", - "cobblemon.species.graveler.name": "", - "cobblemon.species.graveler.desc": "", - "cobblemon.species.golem.name": "", - "cobblemon.species.golem.desc": "", - "cobblemon.species.ponyta.name": "", - "cobblemon.species.ponyta.desc": "", - "cobblemon.species.rapidash.name": "", - "cobblemon.species.rapidash.desc": "", - "cobblemon.species.slowpoke.name": "", - "cobblemon.species.slowpoke.desc": "", - "cobblemon.species.slowbro.name": "", - "cobblemon.species.slowbro.desc": "", - "cobblemon.species.magnemite.name": "", - "cobblemon.species.magnemite.desc": "", - "cobblemon.species.magneton.name": "", - "cobblemon.species.magneton.desc": "", - "cobblemon.species.farfetchd.name": "", - "cobblemon.species.farfetchd.desc": "", - "cobblemon.species.doduo.name": "", - "cobblemon.species.doduo.desc": "", - "cobblemon.species.dodrio.name": "", - "cobblemon.species.dodrio.desc": "", - "cobblemon.species.seel.name": "", - "cobblemon.species.seel.desc": "", - "cobblemon.species.dewgong.name": "", - "cobblemon.species.dewgong.desc": "", - "cobblemon.species.grimer.name": "", - "cobblemon.species.grimer.desc": "", - "cobblemon.species.muk.name": "", - "cobblemon.species.muk.desc": "", - "cobblemon.species.shellder.name": "", - "cobblemon.species.shellder.desc": "", - "cobblemon.species.cloyster.name": "", - "cobblemon.species.cloyster.desc": "", - "cobblemon.species.gastly.name": "", - "cobblemon.species.gastly.desc": "", - "cobblemon.species.haunter.name": "", - "cobblemon.species.haunter.desc": "", - "cobblemon.species.gengar.name": "", - "cobblemon.species.gengar.desc": "", - "cobblemon.species.onix.name": "", - "cobblemon.species.onix.desc": "", - "cobblemon.species.drowzee.name": "", - "cobblemon.species.drowzee.desc": "", - "cobblemon.species.hypno.name": "", - "cobblemon.species.hypno.desc": "", - "cobblemon.species.krabby.name": "", - "cobblemon.species.krabby.desc": "", - "cobblemon.species.kingler.name": "", - "cobblemon.species.kingler.desc": "", - "cobblemon.species.voltorb.name": "", - "cobblemon.species.voltorb.desc": "", - "cobblemon.species.electrode.name": "", - "cobblemon.species.electrode.desc": "", - "cobblemon.species.exeggcute.name": "", - "cobblemon.species.exeggcute.desc": "", - "cobblemon.species.exeggutor.name": "", - "cobblemon.species.exeggutor.desc": "", - "cobblemon.species.cubone.name": "", - "cobblemon.species.cubone.desc": "", - "cobblemon.species.marowak.name": "", - "cobblemon.species.marowak.desc": "", - "cobblemon.species.hitmonlee.name": "", - "cobblemon.species.hitmonlee.desc": "", - "cobblemon.species.hitmonchan.name": "", - "cobblemon.species.hitmonchan.desc": "", - "cobblemon.species.lickitung.name": "", - "cobblemon.species.lickitung.desc": "", - "cobblemon.species.koffing.name": "", - "cobblemon.species.koffing.desc": "", - "cobblemon.species.weezing.name": "", - "cobblemon.species.weezing.desc": "", - "cobblemon.species.rhyhorn.name": "", - "cobblemon.species.rhyhorn.desc": "", - "cobblemon.species.rhydon.name": "", - "cobblemon.species.rhydon.desc": "", - "cobblemon.species.chansey.name": "", - "cobblemon.species.chansey.desc": "", - "cobblemon.species.tangela.name": "", - "cobblemon.species.tangela.desc": "", - "cobblemon.species.kangaskhan.name": "", - "cobblemon.species.kangaskhan.desc": "", - "cobblemon.species.horsea.name": "", - "cobblemon.species.horsea.desc": "", - "cobblemon.species.seadra.name": "", - "cobblemon.species.seadra.desc": "", - "cobblemon.species.goldeen.name": "", - "cobblemon.species.goldeen.desc": "", - "cobblemon.species.seaking.name": "", - "cobblemon.species.seaking.desc": "", - "cobblemon.species.staryu.name": "", - "cobblemon.species.staryu.desc": "", - "cobblemon.species.starmie.name": "", - "cobblemon.species.starmie.desc": "", - "cobblemon.species.mrmime.name": "", - "cobblemon.species.mrmime.desc": "", - "cobblemon.species.scyther.name": "", - "cobblemon.species.scyther.desc": "", - "cobblemon.species.jynx.name": "", - "cobblemon.species.jynx.desc": "", - "cobblemon.species.electabuzz.name": "", - "cobblemon.species.electabuzz.desc": "", - "cobblemon.species.magmar.name": "", - "cobblemon.species.magmar.desc": "", - "cobblemon.species.pinsir.name": "", - "cobblemon.species.pinsir.desc": "", - "cobblemon.species.tauros.name": "", - "cobblemon.species.tauros.desc": "", - "cobblemon.species.magikarp.name": "", - "cobblemon.species.magikarp.desc": "", - "cobblemon.species.gyarados.name": "", - "cobblemon.species.gyarados.desc": "", - "cobblemon.species.lapras.name": "", - "cobblemon.species.lapras.desc": "", - "cobblemon.species.ditto.name": "", - "cobblemon.species.ditto.desc": "", - "cobblemon.species.eevee.name": "", - "cobblemon.species.eevee.desc": "", - "cobblemon.species.vaporeon.name": "", - "cobblemon.species.vaporeon.desc": "", - "cobblemon.species.jolteon.name": "", - "cobblemon.species.jolteon.desc": "", - "cobblemon.species.flareon.name": "", - "cobblemon.species.flareon.desc": "", - "cobblemon.species.porygon.name": "", - "cobblemon.species.porygon.desc": "", - "cobblemon.species.omanyte.name": "", - "cobblemon.species.omanyte.desc": "", - "cobblemon.species.omastar.name": "", - "cobblemon.species.omastar.desc": "", - "cobblemon.species.kabuto.name": "", - "cobblemon.species.kabuto.desc": "", - "cobblemon.species.kabutops.name": "", - "cobblemon.species.kabutops.desc": "", - "cobblemon.species.aerodactyl.name": "", - "cobblemon.species.aerodactyl.desc": "", - "cobblemon.species.snorlax.name": "", - "cobblemon.species.snorlax.desc": "", - "cobblemon.species.articuno.name": "", - "cobblemon.species.articuno.desc": "", - "cobblemon.species.zapdos.name": "", - "cobblemon.species.zapdos.desc": "", - "cobblemon.species.moltres.name": "", - "cobblemon.species.moltres.desc": "", - "cobblemon.species.dratini.name": "", - "cobblemon.species.dratini.desc": "", - "cobblemon.species.dragonair.name": "", - "cobblemon.species.dragonair.desc": "", - "cobblemon.species.dragonite.name": "", - "cobblemon.species.dragonite.desc": "", - "cobblemon.species.mewtwo.name": "", - "cobblemon.species.mewtwo.desc": "", - "cobblemon.species.mew.name": "", - "cobblemon.species.mew.desc": "", - "cobblemon.species.chikorita.name": "", - "cobblemon.species.chikorita.desc": "", - "cobblemon.species.bayleef.name": "", - "cobblemon.species.bayleef.desc": "", - "cobblemon.species.meganium.name": "", - "cobblemon.species.meganium.desc": "", - "cobblemon.species.cyndaquil.name": "", - "cobblemon.species.cyndaquil.desc": "", - "cobblemon.species.quilava.name": "", - "cobblemon.species.quilava.desc": "", - "cobblemon.species.typhlosion.name": "", - "cobblemon.species.typhlosion.desc": "", - "cobblemon.species.totodile.name": "", - "cobblemon.species.totodile.desc": "", - "cobblemon.species.croconaw.name": "", - "cobblemon.species.croconaw.desc": "", - "cobblemon.species.feraligatr.name": "", - "cobblemon.species.feraligatr.desc": "", - "cobblemon.species.sentret.name": "", - "cobblemon.species.sentret.desc": "", - "cobblemon.species.furret.name": "", - "cobblemon.species.furret.desc": "", - "cobblemon.species.hoothoot.name": "", - "cobblemon.species.hoothoot.desc": "", - "cobblemon.species.noctowl.name": "", - "cobblemon.species.noctowl.desc": "", - "cobblemon.species.ledyba.name": "", - "cobblemon.species.ledyba.desc": "", - "cobblemon.species.ledian.name": "", - "cobblemon.species.ledian.desc": "", - "cobblemon.species.spinarak.name": "", - "cobblemon.species.spinarak.desc": "", - "cobblemon.species.ariados.name": "", - "cobblemon.species.ariados.desc": "", - "cobblemon.species.crobat.name": "", - "cobblemon.species.crobat.desc": "", - "cobblemon.species.chinchou.name": "", - "cobblemon.species.chinchou.desc": "", - "cobblemon.species.lanturn.name": "", - "cobblemon.species.lanturn.desc": "", - "cobblemon.species.pichu.name": "", - "cobblemon.species.pichu.desc": "", - "cobblemon.species.cleffa.name": "", - "cobblemon.species.cleffa.desc": "", - "cobblemon.species.igglybuff.name": "", - "cobblemon.species.igglybuff.desc": "", - "cobblemon.species.togepi.name": "", - "cobblemon.species.togepi.desc": "", - "cobblemon.species.togetic.name": "", - "cobblemon.species.togetic.desc": "", - "cobblemon.species.natu.name": "", - "cobblemon.species.natu.desc": "", - "cobblemon.species.xatu.name": "", - "cobblemon.species.xatu.desc": "", - "cobblemon.species.mareep.name": "", - "cobblemon.species.mareep.desc": "", - "cobblemon.species.flaaffy.name": "", - "cobblemon.species.flaaffy.desc": "", - "cobblemon.species.ampharos.name": "", - "cobblemon.species.ampharos.desc": "", - "cobblemon.species.bellossom.name": "", - "cobblemon.species.bellossom.desc": "", - "cobblemon.species.marill.name": "", - "cobblemon.species.marill.desc": "", - "cobblemon.species.azumarill.name": "", - "cobblemon.species.azumarill.desc": "", - "cobblemon.species.sudowoodo.name": "", - "cobblemon.species.sudowoodo.desc": "", - "cobblemon.species.politoed.name": "", - "cobblemon.species.politoed.desc": "", - "cobblemon.species.hoppip.name": "", - "cobblemon.species.hoppip.desc": "", - "cobblemon.species.skiploom.name": "", - "cobblemon.species.skiploom.desc": "", - "cobblemon.species.jumpluff.name": "", - "cobblemon.species.jumpluff.desc": "", - "cobblemon.species.aipom.name": "", - "cobblemon.species.aipom.desc": "", - "cobblemon.species.sunkern.name": "", - "cobblemon.species.sunkern.desc": "", - "cobblemon.species.sunflora.name": "", - "cobblemon.species.sunflora.desc": "", - "cobblemon.species.yanma.name": "", - "cobblemon.species.yanma.desc": "", - "cobblemon.species.wooper.name": "", - "cobblemon.species.wooper.desc": "", - "cobblemon.species.quagsire.name": "", - "cobblemon.species.quagsire.desc": "", - "cobblemon.species.espeon.name": "", - "cobblemon.species.espeon.desc": "", - "cobblemon.species.umbreon.name": "", - "cobblemon.species.umbreon.desc": "", - "cobblemon.species.murkrow.name": "", - "cobblemon.species.murkrow.desc": "", - "cobblemon.species.slowking.name": "", - "cobblemon.species.slowking.desc": "", - "cobblemon.species.misdreavus.name": "", - "cobblemon.species.misdreavus.desc": "", - "cobblemon.species.unown.name": "", - "cobblemon.species.unown.desc": "", - "cobblemon.species.wobbuffet.name": "", - "cobblemon.species.wobbuffet.desc": "", - "cobblemon.species.girafarig.name": "", - "cobblemon.species.girafarig.desc": "", - "cobblemon.species.pineco.name": "", - "cobblemon.species.pineco.desc": "", - "cobblemon.species.forretress.name": "", - "cobblemon.species.forretress.desc": "", - "cobblemon.species.dunsparce.name": "", - "cobblemon.species.dunsparce.desc": "", - "cobblemon.species.gligar.name": "", - "cobblemon.species.gligar.desc": "", - "cobblemon.species.steelix.name": "", - "cobblemon.species.steelix.desc": "", - "cobblemon.species.snubbull.name": "", - "cobblemon.species.snubbull.desc": "", - "cobblemon.species.granbull.name": "", - "cobblemon.species.granbull.desc": "", - "cobblemon.species.qwilfish.name": "", - "cobblemon.species.qwilfish.desc": "", - "cobblemon.species.scizor.name": "", - "cobblemon.species.scizor.desc": "", - "cobblemon.species.shuckle.name": "", - "cobblemon.species.shuckle.desc": "", - "cobblemon.species.heracross.name": "", - "cobblemon.species.heracross.desc": "", - "cobblemon.species.sneasel.name": "", - "cobblemon.species.sneasel.desc": "", - "cobblemon.species.teddiursa.name": "", - "cobblemon.species.teddiursa.desc": "", - "cobblemon.species.ursaring.name": "", - "cobblemon.species.ursaring.desc": "", - "cobblemon.species.slugma.name": "", - "cobblemon.species.slugma.desc": "", - "cobblemon.species.magcargo.name": "", - "cobblemon.species.magcargo.desc": "", - "cobblemon.species.swinub.name": "", - "cobblemon.species.swinub.desc": "", - "cobblemon.species.piloswine.name": "", - "cobblemon.species.piloswine.desc": "", - "cobblemon.species.corsola.name": "", - "cobblemon.species.corsola.desc": "", - "cobblemon.species.remoraid.name": "", - "cobblemon.species.remoraid.desc": "", - "cobblemon.species.octillery.name": "", - "cobblemon.species.octillery.desc": "", - "cobblemon.species.delibird.name": "", - "cobblemon.species.delibird.desc": "", - "cobblemon.species.mantine.name": "", - "cobblemon.species.mantine.desc": "", - "cobblemon.species.skarmory.name": "", - "cobblemon.species.skarmory.desc": "", - "cobblemon.species.houndour.name": "", - "cobblemon.species.houndour.desc": "", - "cobblemon.species.houndoom.name": "", - "cobblemon.species.houndoom.desc": "", - "cobblemon.species.kingdra.name": "", - "cobblemon.species.kingdra.desc": "", - "cobblemon.species.phanpy.name": "", - "cobblemon.species.phanpy.desc": "", - "cobblemon.species.donphan.name": "", - "cobblemon.species.donphan.desc": "", - "cobblemon.species.porygon2.name": "", - "cobblemon.species.porygon2.desc": "", - "cobblemon.species.stantler.name": "", - "cobblemon.species.stantler.desc": "", - "cobblemon.species.smeargle.name": "", - "cobblemon.species.smeargle.desc": "", - "cobblemon.species.tyrogue.name": "", - "cobblemon.species.tyrogue.desc": "", - "cobblemon.species.hitmontop.name": "", - "cobblemon.species.hitmontop.desc": "", - "cobblemon.species.smoochum.name": "", - "cobblemon.species.smoochum.desc": "", - "cobblemon.species.elekid.name": "", - "cobblemon.species.elekid.desc": "", - "cobblemon.species.magby.name": "", - "cobblemon.species.magby.desc": "", - "cobblemon.species.miltank.name": "", - "cobblemon.species.miltank.desc": "", - "cobblemon.species.blissey.name": "", - "cobblemon.species.blissey.desc": "", - "cobblemon.species.raikou.name": "", - "cobblemon.species.raikou.desc": "", - "cobblemon.species.entei.name": "", - "cobblemon.species.entei.desc": "", - "cobblemon.species.suicune.name": "", - "cobblemon.species.suicune.desc": "", - "cobblemon.species.larvitar.name": "", - "cobblemon.species.larvitar.desc": "", - "cobblemon.species.pupitar.name": "", - "cobblemon.species.pupitar.desc": "", - "cobblemon.species.tyranitar.name": "", - "cobblemon.species.tyranitar.desc": "", - "cobblemon.species.lugia.name": "", - "cobblemon.species.lugia.desc": "", - "cobblemon.species.hooh.name": "", - "cobblemon.species.hooh.desc": "", - "cobblemon.species.celebi.name": "", - "cobblemon.species.celebi.desc": "", - "cobblemon.species.treecko.name": "", - "cobblemon.species.treecko.desc": "", - "cobblemon.species.grovyle.name": "", - "cobblemon.species.grovyle.desc": "", - "cobblemon.species.sceptile.name": "", - "cobblemon.species.sceptile.desc": "", - "cobblemon.species.torchic.name": "", - "cobblemon.species.torchic.desc": "", - "cobblemon.species.combusken.name": "", - "cobblemon.species.combusken.desc": "", - "cobblemon.species.blaziken.name": "", - "cobblemon.species.blaziken.desc": "", - "cobblemon.species.mudkip.name": "", - "cobblemon.species.mudkip.desc": "", - "cobblemon.species.marshtomp.name": "", - "cobblemon.species.marshtomp.desc": "", - "cobblemon.species.swampert.name": "", - "cobblemon.species.swampert.desc": "", - "cobblemon.species.poochyena.name": "", - "cobblemon.species.poochyena.desc": "", - "cobblemon.species.mightyena.name": "", - "cobblemon.species.mightyena.desc": "", - "cobblemon.species.zigzagoon.name": "", - "cobblemon.species.zigzagoon.desc": "", - "cobblemon.species.linoone.name": "", - "cobblemon.species.linoone.desc": "", - "cobblemon.species.wurmple.name": "", - "cobblemon.species.wurmple.desc": "", - "cobblemon.species.silcoon.name": "", - "cobblemon.species.silcoon.desc": "", - "cobblemon.species.beautifly.name": "", - "cobblemon.species.beautifly.desc": "", - "cobblemon.species.cascoon.name": "", - "cobblemon.species.cascoon.desc": "", - "cobblemon.species.dustox.name": "", - "cobblemon.species.dustox.desc": "", - "cobblemon.species.lotad.name": "", - "cobblemon.species.lotad.desc": "", - "cobblemon.species.lombre.name": "", - "cobblemon.species.lombre.desc": "", - "cobblemon.species.ludicolo.name": "", - "cobblemon.species.ludicolo.desc": "", - "cobblemon.species.seedot.name": "", - "cobblemon.species.seedot.desc": "", - "cobblemon.species.nuzleaf.name": "", - "cobblemon.species.nuzleaf.desc": "", - "cobblemon.species.shiftry.name": "", - "cobblemon.species.shiftry.desc": "", - "cobblemon.species.taillow.name": "", - "cobblemon.species.taillow.desc": "", - "cobblemon.species.swellow.name": "", - "cobblemon.species.swellow.desc": "", - "cobblemon.species.wingull.name": "", - "cobblemon.species.wingull.desc": "", - "cobblemon.species.pelipper.name": "", - "cobblemon.species.pelipper.desc": "", - "cobblemon.species.ralts.name": "", - "cobblemon.species.ralts.desc": "", - "cobblemon.species.kirlia.name": "", - "cobblemon.species.kirlia.desc": "", - "cobblemon.species.gardevoir.name": "", - "cobblemon.species.gardevoir.desc": "", - "cobblemon.species.surskit.name": "", - "cobblemon.species.surskit.desc": "", - "cobblemon.species.masquerain.name": "", - "cobblemon.species.masquerain.desc": "", - "cobblemon.species.shroomish.name": "", - "cobblemon.species.shroomish.desc": "", - "cobblemon.species.breloom.name": "", - "cobblemon.species.breloom.desc": "", - "cobblemon.species.slakoth.name": "", - "cobblemon.species.slakoth.desc": "", - "cobblemon.species.vigoroth.name": "", - "cobblemon.species.vigoroth.desc": "", - "cobblemon.species.slaking.name": "", - "cobblemon.species.slaking.desc": "", - "cobblemon.species.nincada.name": "", - "cobblemon.species.nincada.desc": "", - "cobblemon.species.ninjask.name": "", - "cobblemon.species.ninjask.desc": "", - "cobblemon.species.shedinja.name": "", - "cobblemon.species.shedinja.desc": "", - "cobblemon.species.whismur.name": "", - "cobblemon.species.whismur.desc": "", - "cobblemon.species.loudred.name": "", - "cobblemon.species.loudred.desc": "", - "cobblemon.species.exploud.name": "", - "cobblemon.species.exploud.desc": "", - "cobblemon.species.makuhita.name": "", - "cobblemon.species.makuhita.desc": "", - "cobblemon.species.hariyama.name": "", - "cobblemon.species.hariyama.desc": "", - "cobblemon.species.azurill.name": "", - "cobblemon.species.azurill.desc": "", - "cobblemon.species.nosepass.name": "", - "cobblemon.species.nosepass.desc": "", - "cobblemon.species.skitty.name": "", - "cobblemon.species.skitty.desc": "", - "cobblemon.species.delcatty.name": "", - "cobblemon.species.delcatty.desc": "", - "cobblemon.species.sableye.name": "", - "cobblemon.species.sableye.desc": "", - "cobblemon.species.mawile.name": "", - "cobblemon.species.mawile.desc": "", - "cobblemon.species.aron.name": "", - "cobblemon.species.aron.desc": "", - "cobblemon.species.lairon.name": "", - "cobblemon.species.lairon.desc": "", - "cobblemon.species.aggron.name": "", - "cobblemon.species.aggron.desc": "", - "cobblemon.species.meditite.name": "", - "cobblemon.species.meditite.desc": "", - "cobblemon.species.medicham.name": "", - "cobblemon.species.medicham.desc": "", - "cobblemon.species.electrike.name": "", - "cobblemon.species.electrike.desc": "", - "cobblemon.species.manectric.name": "", - "cobblemon.species.manectric.desc": "", - "cobblemon.species.plusle.name": "", - "cobblemon.species.plusle.desc": "", - "cobblemon.species.minun.name": "", - "cobblemon.species.minun.desc": "", - "cobblemon.species.volbeat.name": "", - "cobblemon.species.volbeat.desc": "", - "cobblemon.species.illumise.name": "", - "cobblemon.species.illumise.desc": "", - "cobblemon.species.roselia.name": "", - "cobblemon.species.roselia.desc": "", - "cobblemon.species.gulpin.name": "", - "cobblemon.species.gulpin.desc": "", - "cobblemon.species.swalot.name": "", - "cobblemon.species.swalot.desc": "", - "cobblemon.species.carvanha.name": "", - "cobblemon.species.carvanha.desc": "", - "cobblemon.species.sharpedo.name": "", - "cobblemon.species.sharpedo.desc": "", - "cobblemon.species.wailmer.name": "", - "cobblemon.species.wailmer.desc": "", - "cobblemon.species.wailord.name": "", - "cobblemon.species.wailord.desc": "", - "cobblemon.species.numel.name": "", - "cobblemon.species.numel.desc": "", - "cobblemon.species.camerupt.name": "", - "cobblemon.species.camerupt.desc": "", - "cobblemon.species.torkoal.name": "", - "cobblemon.species.torkoal.desc": "", - "cobblemon.species.spoink.name": "", - "cobblemon.species.spoink.desc": "", - "cobblemon.species.grumpig.name": "", - "cobblemon.species.grumpig.desc": "", - "cobblemon.species.spinda.name": "", - "cobblemon.species.spinda.desc": "", - "cobblemon.species.trapinch.name": "", - "cobblemon.species.trapinch.desc": "", - "cobblemon.species.vibrava.name": "", - "cobblemon.species.vibrava.desc": "", - "cobblemon.species.flygon.name": "", - "cobblemon.species.flygon.desc": "", - "cobblemon.species.cacnea.name": "", - "cobblemon.species.cacnea.desc": "", - "cobblemon.species.cacturne.name": "", - "cobblemon.species.cacturne.desc": "", - "cobblemon.species.swablu.name": "", - "cobblemon.species.swablu.desc": "", - "cobblemon.species.altaria.name": "", - "cobblemon.species.altaria.desc": "", - "cobblemon.species.zangoose.name": "", - "cobblemon.species.zangoose.desc": "", - "cobblemon.species.seviper.name": "", - "cobblemon.species.seviper.desc": "", - "cobblemon.species.lunatone.name": "", - "cobblemon.species.lunatone.desc": "", - "cobblemon.species.solrock.name": "", - "cobblemon.species.solrock.desc": "", - "cobblemon.species.barboach.name": "", - "cobblemon.species.barboach.desc": "", - "cobblemon.species.whiscash.name": "", - "cobblemon.species.whiscash.desc": "", - "cobblemon.species.corphish.name": "", - "cobblemon.species.corphish.desc": "", - "cobblemon.species.crawdaunt.name": "", - "cobblemon.species.crawdaunt.desc": "", - "cobblemon.species.baltoy.name": "", - "cobblemon.species.baltoy.desc": "", - "cobblemon.species.claydol.name": "", - "cobblemon.species.claydol.desc": "", - "cobblemon.species.lileep.name": "", - "cobblemon.species.lileep.desc": "", - "cobblemon.species.cradily.name": "", - "cobblemon.species.cradily.desc": "", - "cobblemon.species.anorith.name": "", - "cobblemon.species.anorith.desc": "", - "cobblemon.species.armaldo.name": "", - "cobblemon.species.armaldo.desc": "", - "cobblemon.species.feebas.name": "", - "cobblemon.species.feebas.desc": "", - "cobblemon.species.milotic.name": "", - "cobblemon.species.milotic.desc": "", - "cobblemon.species.castform.name": "", - "cobblemon.species.castform.desc": "", - "cobblemon.species.kecleon.name": "", - "cobblemon.species.kecleon.desc": "", - "cobblemon.species.shuppet.name": "", - "cobblemon.species.shuppet.desc": "", - "cobblemon.species.banette.name": "", - "cobblemon.species.banette.desc": "", - "cobblemon.species.duskull.name": "", - "cobblemon.species.duskull.desc": "", - "cobblemon.species.dusclops.name": "", - "cobblemon.species.dusclops.desc": "", - "cobblemon.species.tropius.name": "", - "cobblemon.species.tropius.desc": "", - "cobblemon.species.chimecho.name": "", - "cobblemon.species.chimecho.desc": "", - "cobblemon.species.absol.name": "", - "cobblemon.species.absol.desc": "", - "cobblemon.species.wynaut.name": "", - "cobblemon.species.wynaut.desc": "", - "cobblemon.species.snorunt.name": "", - "cobblemon.species.snorunt.desc": "", - "cobblemon.species.glalie.name": "", - "cobblemon.species.glalie.desc": "", - "cobblemon.species.spheal.name": "", - "cobblemon.species.spheal.desc": "", - "cobblemon.species.sealeo.name": "", - "cobblemon.species.sealeo.desc": "", - "cobblemon.species.walrein.name": "", - "cobblemon.species.walrein.desc": "", - "cobblemon.species.clamperl.name": "", - "cobblemon.species.clamperl.desc": "", - "cobblemon.species.huntail.name": "", - "cobblemon.species.huntail.desc": "", - "cobblemon.species.gorebyss.name": "", - "cobblemon.species.gorebyss.desc": "", - "cobblemon.species.relicanth.name": "", - "cobblemon.species.relicanth.desc": "", - "cobblemon.species.luvdisc.name": "", - "cobblemon.species.luvdisc.desc": "", - "cobblemon.species.bagon.name": "", - "cobblemon.species.bagon.desc": "", - "cobblemon.species.shelgon.name": "", - "cobblemon.species.shelgon.desc": "", - "cobblemon.species.salamence.name": "", - "cobblemon.species.salamence.desc": "", - "cobblemon.species.beldum.name": "", - "cobblemon.species.beldum.desc": "", - "cobblemon.species.metang.name": "", - "cobblemon.species.metang.desc": "", - "cobblemon.species.metagross.name": "", - "cobblemon.species.metagross.desc": "", - "cobblemon.species.regirock.name": "", - "cobblemon.species.regirock.desc": "", - "cobblemon.species.regice.name": "", - "cobblemon.species.regice.desc": "", - "cobblemon.species.registeel.name": "", - "cobblemon.species.registeel.desc": "", - "cobblemon.species.latias.name": "", - "cobblemon.species.latias.desc": "", - "cobblemon.species.latios.name": "", - "cobblemon.species.latios.desc": "", - "cobblemon.species.kyogre.name": "", - "cobblemon.species.kyogre.desc": "", - "cobblemon.species.groudon.name": "", - "cobblemon.species.groudon.desc": "", - "cobblemon.species.rayquaza.name": "", - "cobblemon.species.rayquaza.desc": "", - "cobblemon.species.jirachi.name": "", - "cobblemon.species.jirachi.desc": "", - "cobblemon.species.deoxys.name": "", - "cobblemon.species.deoxys.desc": "", - "cobblemon.species.turtwig.name": "", - "cobblemon.species.turtwig.desc": "", - "cobblemon.species.grotle.name": "", - "cobblemon.species.grotle.desc": "", - "cobblemon.species.torterra.name": "", - "cobblemon.species.torterra.desc": "", - "cobblemon.species.chimchar.name": "", - "cobblemon.species.chimchar.desc": "", - "cobblemon.species.monferno.name": "", - "cobblemon.species.monferno.desc": "", - "cobblemon.species.infernape.name": "", - "cobblemon.species.infernape.desc": "", - "cobblemon.species.piplup.name": "", - "cobblemon.species.piplup.desc": "", - "cobblemon.species.prinplup.name": "", - "cobblemon.species.prinplup.desc": "", - "cobblemon.species.empoleon.name": "", - "cobblemon.species.empoleon.desc": "", - "cobblemon.species.starly.name": "", - "cobblemon.species.starly.desc": "", - "cobblemon.species.staravia.name": "", - "cobblemon.species.staravia.desc": "", - "cobblemon.species.staraptor.name": "", - "cobblemon.species.staraptor.desc": "", - "cobblemon.species.bidoof.name": "", - "cobblemon.species.bidoof.desc": "", - "cobblemon.species.bibarel.name": "", - "cobblemon.species.bibarel.desc": "", - "cobblemon.species.kricketot.name": "", - "cobblemon.species.kricketot.desc": "", - "cobblemon.species.kricketune.name": "", - "cobblemon.species.kricketune.desc": "", - "cobblemon.species.shinx.name": "", - "cobblemon.species.shinx.desc": "", - "cobblemon.species.luxio.name": "", - "cobblemon.species.luxio.desc": "", - "cobblemon.species.luxray.name": "", - "cobblemon.species.luxray.desc": "", - "cobblemon.species.budew.name": "", - "cobblemon.species.budew.desc": "", - "cobblemon.species.roserade.name": "", - "cobblemon.species.roserade.desc": "", - "cobblemon.species.cranidos.name": "", - "cobblemon.species.cranidos.desc": "", - "cobblemon.species.rampardos.name": "", - "cobblemon.species.rampardos.desc": "", - "cobblemon.species.shieldon.name": "", - "cobblemon.species.shieldon.desc": "", - "cobblemon.species.bastiodon.name": "", - "cobblemon.species.bastiodon.desc": "", - "cobblemon.species.burmy.name": "", - "cobblemon.species.burmy.desc": "", - "cobblemon.species.wormadam.name": "", - "cobblemon.species.wormadam.desc": "", - "cobblemon.species.mothim.name": "", - "cobblemon.species.mothim.desc": "", - "cobblemon.species.combee.name": "", - "cobblemon.species.combee.desc": "", - "cobblemon.species.vespiquen.name": "", - "cobblemon.species.vespiquen.desc": "", - "cobblemon.species.pachirisu.name": "", - "cobblemon.species.pachirisu.desc": "", - "cobblemon.species.buizel.name": "", - "cobblemon.species.buizel.desc": "", - "cobblemon.species.floatzel.name": "", - "cobblemon.species.floatzel.desc": "", - "cobblemon.species.cherubi.name": "", - "cobblemon.species.cherubi.desc": "", - "cobblemon.species.cherrim.name": "", - "cobblemon.species.cherrim.desc": "", - "cobblemon.species.shellos.name": "", - "cobblemon.species.shellos.desc": "", - "cobblemon.species.gastrodon.name": "", - "cobblemon.species.gastrodon.desc": "", - "cobblemon.species.ambipom.name": "", - "cobblemon.species.ambipom.desc": "", - "cobblemon.species.drifloon.name": "", - "cobblemon.species.drifloon.desc": "", - "cobblemon.species.drifblim.name": "", - "cobblemon.species.drifblim.desc": "", - "cobblemon.species.buneary.name": "", - "cobblemon.species.buneary.desc": "", - "cobblemon.species.lopunny.name": "", - "cobblemon.species.lopunny.desc": "", - "cobblemon.species.mismagius.name": "", - "cobblemon.species.mismagius.desc": "", - "cobblemon.species.honchkrow.name": "", - "cobblemon.species.honchkrow.desc": "", - "cobblemon.species.glameow.name": "", - "cobblemon.species.glameow.desc": "", - "cobblemon.species.purugly.name": "", - "cobblemon.species.purugly.desc": "", - "cobblemon.species.chingling.name": "", - "cobblemon.species.chingling.desc": "", - "cobblemon.species.stunky.name": "", - "cobblemon.species.stunky.desc": "", - "cobblemon.species.skuntank.name": "", - "cobblemon.species.skuntank.desc": "", - "cobblemon.species.bronzor.name": "", - "cobblemon.species.bronzor.desc": "", - "cobblemon.species.bronzong.name": "", - "cobblemon.species.bronzong.desc": "", - "cobblemon.species.bonsly.name": "", - "cobblemon.species.bonsly.desc": "", - "cobblemon.species.mimejr.name": "", - "cobblemon.species.mimejr.desc": "", - "cobblemon.species.happiny.name": "", - "cobblemon.species.happiny.desc": "", - "cobblemon.species.chatot.name": "", - "cobblemon.species.chatot.desc": "", - "cobblemon.species.spiritomb.name": "", - "cobblemon.species.spiritomb.desc": "", - "cobblemon.species.gible.name": "", - "cobblemon.species.gible.desc": "", - "cobblemon.species.gabite.name": "", - "cobblemon.species.gabite.desc": "", - "cobblemon.species.garchomp.name": "", - "cobblemon.species.garchomp.desc": "", - "cobblemon.species.munchlax.name": "", - "cobblemon.species.munchlax.desc": "", - "cobblemon.species.riolu.name": "", - "cobblemon.species.riolu.desc": "", - "cobblemon.species.lucario.name": "", - "cobblemon.species.lucario.desc": "", - "cobblemon.species.hippopotas.name": "", - "cobblemon.species.hippopotas.desc": "", - "cobblemon.species.hippowdon.name": "", - "cobblemon.species.hippowdon.desc": "", - "cobblemon.species.skorupi.name": "", - "cobblemon.species.skorupi.desc": "", - "cobblemon.species.drapion.name": "", - "cobblemon.species.drapion.desc": "", - "cobblemon.species.croagunk.name": "", - "cobblemon.species.croagunk.desc": "", - "cobblemon.species.toxicroak.name": "", - "cobblemon.species.toxicroak.desc": "", - "cobblemon.species.carnivine.name": "", - "cobblemon.species.carnivine.desc": "", - "cobblemon.species.finneon.name": "", - "cobblemon.species.finneon.desc": "", - "cobblemon.species.lumineon.name": "", - "cobblemon.species.lumineon.desc": "", - "cobblemon.species.mantyke.name": "", - "cobblemon.species.mantyke.desc": "", - "cobblemon.species.snover.name": "", - "cobblemon.species.snover.desc": "", - "cobblemon.species.abomasnow.name": "", - "cobblemon.species.abomasnow.desc": "", - "cobblemon.species.weavile.name": "", - "cobblemon.species.weavile.desc": "", - "cobblemon.species.magnezone.name": "", - "cobblemon.species.magnezone.desc": "", - "cobblemon.species.lickilicky.name": "", - "cobblemon.species.lickilicky.desc": "", - "cobblemon.species.rhyperior.name": "", - "cobblemon.species.rhyperior.desc": "", - "cobblemon.species.tangrowth.name": "", - "cobblemon.species.tangrowth.desc": "", - "cobblemon.species.electivire.name": "", - "cobblemon.species.electivire.desc": "", - "cobblemon.species.magmortar.name": "", - "cobblemon.species.magmortar.desc": "", - "cobblemon.species.togekiss.name": "", - "cobblemon.species.togekiss.desc": "", - "cobblemon.species.yanmega.name": "", - "cobblemon.species.yanmega.desc": "", - "cobblemon.species.leafeon.name": "", - "cobblemon.species.leafeon.desc": "", - "cobblemon.species.glaceon.name": "", - "cobblemon.species.glaceon.desc": "", - "cobblemon.species.gliscor.name": "", - "cobblemon.species.gliscor.desc": "", - "cobblemon.species.mamoswine.name": "", - "cobblemon.species.mamoswine.desc": "", - "cobblemon.species.porygonz.name": "", - "cobblemon.species.porygonz.desc": "", - "cobblemon.species.gallade.name": "", - "cobblemon.species.gallade.desc": "", - "cobblemon.species.probopass.name": "", - "cobblemon.species.probopass.desc": "", - "cobblemon.species.dusknoir.name": "", - "cobblemon.species.dusknoir.desc": "", - "cobblemon.species.froslass.name": "", - "cobblemon.species.froslass.desc": "", - "cobblemon.species.rotom.name": "", - "cobblemon.species.rotom.desc": "", - "cobblemon.species.uxie.name": "", - "cobblemon.species.uxie.desc": "", - "cobblemon.species.mesprit.name": "", - "cobblemon.species.mesprit.desc": "", - "cobblemon.species.azelf.name": "", - "cobblemon.species.azelf.desc": "", - "cobblemon.species.dialga.name": "", - "cobblemon.species.dialga.desc": "", - "cobblemon.species.palkia.name": "", - "cobblemon.species.palkia.desc": "", - "cobblemon.species.heatran.name": "", - "cobblemon.species.heatran.desc": "", - "cobblemon.species.regigigas.name": "", - "cobblemon.species.regigigas.desc": "", - "cobblemon.species.giratina.name": "", - "cobblemon.species.giratina.desc": "", - "cobblemon.species.cresselia.name": "", - "cobblemon.species.cresselia.desc": "", - "cobblemon.species.phione.name": "", - "cobblemon.species.phione.desc": "", - "cobblemon.species.manaphy.name": "", - "cobblemon.species.manaphy.desc": "", - "cobblemon.species.darkrai.name": "", - "cobblemon.species.darkrai.desc": "", - "cobblemon.species.shaymin.name": "", - "cobblemon.species.shaymin.desc": "", - "cobblemon.species.arceus.name": "", - "cobblemon.species.arceus.desc": "", - "cobblemon.species.victini.name": "", - "cobblemon.species.victini.desc": "", - "cobblemon.species.snivy.name": "", - "cobblemon.species.snivy.desc": "", - "cobblemon.species.servine.name": "", - "cobblemon.species.servine.desc": "", - "cobblemon.species.serperior.name": "", - "cobblemon.species.serperior.desc": "", - "cobblemon.species.tepig.name": "", - "cobblemon.species.tepig.desc": "", - "cobblemon.species.pignite.name": "", - "cobblemon.species.pignite.desc": "", - "cobblemon.species.emboar.name": "", - "cobblemon.species.emboar.desc": "", - "cobblemon.species.oshawott.name": "", - "cobblemon.species.oshawott.desc": "", - "cobblemon.species.dewott.name": "", - "cobblemon.species.dewott.desc": "", - "cobblemon.species.samurott.name": "", - "cobblemon.species.samurott.desc": "", - "cobblemon.species.patrat.name": "", - "cobblemon.species.patrat.desc": "", - "cobblemon.species.watchog.name": "", - "cobblemon.species.watchog.desc": "", - "cobblemon.species.lillipup.name": "", - "cobblemon.species.lillipup.desc": "", - "cobblemon.species.herdier.name": "", - "cobblemon.species.herdier.desc": "", - "cobblemon.species.stoutland.name": "", - "cobblemon.species.stoutland.desc": "", - "cobblemon.species.purrloin.name": "", - "cobblemon.species.purrloin.desc": "", - "cobblemon.species.liepard.name": "", - "cobblemon.species.liepard.desc": "", - "cobblemon.species.pansage.name": "", - "cobblemon.species.pansage.desc": "", - "cobblemon.species.simisage.name": "", - "cobblemon.species.simisage.desc": "", - "cobblemon.species.pansear.name": "", - "cobblemon.species.pansear.desc": "", - "cobblemon.species.simisear.name": "", - "cobblemon.species.simisear.desc": "", - "cobblemon.species.panpour.name": "", - "cobblemon.species.panpour.desc": "", - "cobblemon.species.simipour.name": "", - "cobblemon.species.simipour.desc": "", - "cobblemon.species.munna.name": "", - "cobblemon.species.munna.desc": "", - "cobblemon.species.musharna.name": "", - "cobblemon.species.musharna.desc": "", - "cobblemon.species.pidove.name": "", - "cobblemon.species.pidove.desc": "", - "cobblemon.species.tranquill.name": "", - "cobblemon.species.tranquill.desc": "", - "cobblemon.species.unfezant.name": "", - "cobblemon.species.unfezant.desc": "", - "cobblemon.species.blitzle.name": "", - "cobblemon.species.blitzle.desc": "", - "cobblemon.species.zebstrika.name": "", - "cobblemon.species.zebstrika.desc": "", - "cobblemon.species.roggenrola.name": "", - "cobblemon.species.roggenrola.desc": "", - "cobblemon.species.boldore.name": "", - "cobblemon.species.boldore.desc": "", - "cobblemon.species.gigalith.name": "", - "cobblemon.species.gigalith.desc": "", - "cobblemon.species.woobat.name": "", - "cobblemon.species.woobat.desc": "", - "cobblemon.species.swoobat.name": "", - "cobblemon.species.swoobat.desc": "", - "cobblemon.species.drilbur.name": "", - "cobblemon.species.drilbur.desc": "", - "cobblemon.species.excadrill.name": "", - "cobblemon.species.excadrill.desc": "", - "cobblemon.species.audino.name": "", - "cobblemon.species.audino.desc": "", - "cobblemon.species.timburr.name": "", - "cobblemon.species.timburr.desc": "", - "cobblemon.species.gurdurr.name": "", - "cobblemon.species.gurdurr.desc": "", - "cobblemon.species.conkeldurr.name": "", - "cobblemon.species.conkeldurr.desc": "", - "cobblemon.species.tympole.name": "", - "cobblemon.species.tympole.desc": "", - "cobblemon.species.palpitoad.name": "", - "cobblemon.species.palpitoad.desc": "", - "cobblemon.species.seismitoad.name": "", - "cobblemon.species.seismitoad.desc": "", - "cobblemon.species.throh.name": "", - "cobblemon.species.throh.desc": "", - "cobblemon.species.sawk.name": "", - "cobblemon.species.sawk.desc": "", - "cobblemon.species.sewaddle.name": "", - "cobblemon.species.sewaddle.desc": "", - "cobblemon.species.swadloon.name": "", - "cobblemon.species.swadloon.desc": "", - "cobblemon.species.leavanny.name": "", - "cobblemon.species.leavanny.desc": "", - "cobblemon.species.venipede.name": "", - "cobblemon.species.venipede.desc": "", - "cobblemon.species.whirlipede.name": "", - "cobblemon.species.whirlipede.desc": "", - "cobblemon.species.scolipede.name": "", - "cobblemon.species.scolipede.desc": "", - "cobblemon.species.cottonee.name": "", - "cobblemon.species.cottonee.desc": "", - "cobblemon.species.whimsicott.name": "", - "cobblemon.species.whimsicott.desc": "", - "cobblemon.species.petilil.name": "", - "cobblemon.species.petilil.desc": "", - "cobblemon.species.lilligant.name": "", - "cobblemon.species.lilligant.desc": "", - "cobblemon.species.basculin.name": "", - "cobblemon.species.basculin.desc": "", - "cobblemon.species.sandile.name": "", - "cobblemon.species.sandile.desc": "", - "cobblemon.species.krokorok.name": "", - "cobblemon.species.krokorok.desc": "", - "cobblemon.species.krookodile.name": "", - "cobblemon.species.krookodile.desc": "", - "cobblemon.species.darumaka.name": "", - "cobblemon.species.darumaka.desc": "", - "cobblemon.species.darmanitan.name": "", - "cobblemon.species.darmanitan.desc": "", - "cobblemon.species.maractus.name": "", - "cobblemon.species.maractus.desc": "", - "cobblemon.species.dwebble.name": "", - "cobblemon.species.dwebble.desc": "", - "cobblemon.species.crustle.name": "", - "cobblemon.species.crustle.desc": "", - "cobblemon.species.scraggy.name": "", - "cobblemon.species.scraggy.desc": "", - "cobblemon.species.scrafty.name": "", - "cobblemon.species.scrafty.desc": "", - "cobblemon.species.sigilyph.name": "", - "cobblemon.species.sigilyph.desc": "", - "cobblemon.species.yamask.name": "", - "cobblemon.species.yamask.desc": "", - "cobblemon.species.cofagrigus.name": "", - "cobblemon.species.cofagrigus.desc": "", - "cobblemon.species.tirtouga.name": "", - "cobblemon.species.tirtouga.desc": "", - "cobblemon.species.carracosta.name": "", - "cobblemon.species.carracosta.desc": "", - "cobblemon.species.archen.name": "", - "cobblemon.species.archen.desc": "", - "cobblemon.species.archeops.name": "", - "cobblemon.species.archeops.desc": "", - "cobblemon.species.trubbish.name": "", - "cobblemon.species.trubbish.desc": "", - "cobblemon.species.garbodor.name": "", - "cobblemon.species.garbodor.desc": "", - "cobblemon.species.zorua.name": "", - "cobblemon.species.zorua.desc": "", - "cobblemon.species.zoroark.name": "", - "cobblemon.species.zoroark.desc": "", - "cobblemon.species.minccino.name": "", - "cobblemon.species.minccino.desc": "", - "cobblemon.species.cinccino.name": "", - "cobblemon.species.cinccino.desc": "", - "cobblemon.species.gothita.name": "", - "cobblemon.species.gothita.desc": "", - "cobblemon.species.gothorita.name": "", - "cobblemon.species.gothorita.desc": "", - "cobblemon.species.gothitelle.name": "", - "cobblemon.species.gothitelle.desc": "", - "cobblemon.species.solosis.name": "", - "cobblemon.species.solosis.desc": "", - "cobblemon.species.duosion.name": "", - "cobblemon.species.duosion.desc": "", - "cobblemon.species.reuniclus.name": "", - "cobblemon.species.reuniclus.desc": "", - "cobblemon.species.ducklett.name": "", - "cobblemon.species.ducklett.desc": "", - "cobblemon.species.swanna.name": "", - "cobblemon.species.swanna.desc": "", - "cobblemon.species.vanillite.name": "", - "cobblemon.species.vanillite.desc": "", - "cobblemon.species.vanillish.name": "", - "cobblemon.species.vanillish.desc": "", - "cobblemon.species.vanilluxe.name": "", - "cobblemon.species.vanilluxe.desc": "", - "cobblemon.species.deerling.name": "", - "cobblemon.species.deerling.desc": "", - "cobblemon.species.sawsbuck.name": "", - "cobblemon.species.sawsbuck.desc": "", - "cobblemon.species.emolga.name": "", - "cobblemon.species.emolga.desc": "", - "cobblemon.species.karrablast.name": "", - "cobblemon.species.karrablast.desc": "", - "cobblemon.species.escavalier.name": "", - "cobblemon.species.escavalier.desc": "", - "cobblemon.species.foongus.name": "", - "cobblemon.species.foongus.desc": "", - "cobblemon.species.amoonguss.name": "", - "cobblemon.species.amoonguss.desc": "", - "cobblemon.species.frillish.name": "", - "cobblemon.species.frillish.desc": "", - "cobblemon.species.jellicent.name": "", - "cobblemon.species.jellicent.desc": "", - "cobblemon.species.alomomola.name": "", - "cobblemon.species.alomomola.desc": "", - "cobblemon.species.joltik.name": "", - "cobblemon.species.joltik.desc": "", - "cobblemon.species.galvantula.name": "", - "cobblemon.species.galvantula.desc": "", - "cobblemon.species.ferroseed.name": "", - "cobblemon.species.ferroseed.desc": "", - "cobblemon.species.ferrothorn.name": "", - "cobblemon.species.ferrothorn.desc": "", - "cobblemon.species.klink.name": "", - "cobblemon.species.klink.desc": "", - "cobblemon.species.klang.name": "", - "cobblemon.species.klang.desc": "", - "cobblemon.species.klinklang.name": "", - "cobblemon.species.klinklang.desc": "", - "cobblemon.species.tynamo.name": "", - "cobblemon.species.tynamo.desc": "", - "cobblemon.species.eelektrik.name": "", - "cobblemon.species.eelektrik.desc": "", - "cobblemon.species.eelektross.name": "", - "cobblemon.species.eelektross.desc": "", - "cobblemon.species.elgyem.name": "", - "cobblemon.species.elgyem.desc": "", - "cobblemon.species.beheeyem.name": "", - "cobblemon.species.beheeyem.desc": "", - "cobblemon.species.litwick.name": "", - "cobblemon.species.litwick.desc": "", - "cobblemon.species.lampent.name": "", - "cobblemon.species.lampent.desc": "", - "cobblemon.species.chandelure.name": "", - "cobblemon.species.chandelure.desc": "", - "cobblemon.species.axew.name": "", - "cobblemon.species.axew.desc": "", - "cobblemon.species.fraxure.name": "", - "cobblemon.species.fraxure.desc": "", - "cobblemon.species.haxorus.name": "", - "cobblemon.species.haxorus.desc": "", - "cobblemon.species.cubchoo.name": "", - "cobblemon.species.cubchoo.desc": "", - "cobblemon.species.beartic.name": "", - "cobblemon.species.beartic.desc": "", - "cobblemon.species.cryogonal.name": "", - "cobblemon.species.cryogonal.desc": "", - "cobblemon.species.shelmet.name": "", - "cobblemon.species.shelmet.desc": "", - "cobblemon.species.accelgor.name": "", - "cobblemon.species.accelgor.desc": "", - "cobblemon.species.stunfisk.name": "", - "cobblemon.species.stunfisk.desc": "", - "cobblemon.species.mienfoo.name": "", - "cobblemon.species.mienfoo.desc": "", - "cobblemon.species.mienshao.name": "", - "cobblemon.species.mienshao.desc": "", - "cobblemon.species.druddigon.name": "", - "cobblemon.species.druddigon.desc": "", - "cobblemon.species.golett.name": "", - "cobblemon.species.golett.desc": "", - "cobblemon.species.golurk.name": "", - "cobblemon.species.golurk.desc": "", - "cobblemon.species.pawniard.name": "", - "cobblemon.species.pawniard.desc": "", - "cobblemon.species.bisharp.name": "", - "cobblemon.species.bisharp.desc": "", - "cobblemon.species.bouffalant.name": "", - "cobblemon.species.bouffalant.desc": "", - "cobblemon.species.rufflet.name": "", - "cobblemon.species.rufflet.desc": "", - "cobblemon.species.braviary.name": "", - "cobblemon.species.braviary.desc": "", - "cobblemon.species.vullaby.name": "", - "cobblemon.species.vullaby.desc": "", - "cobblemon.species.mandibuzz.name": "", - "cobblemon.species.mandibuzz.desc": "", - "cobblemon.species.heatmor.name": "", - "cobblemon.species.heatmor.desc": "", - "cobblemon.species.durant.name": "", - "cobblemon.species.durant.desc": "", - "cobblemon.species.deino.name": "", - "cobblemon.species.deino.desc": "", - "cobblemon.species.zweilous.name": "", - "cobblemon.species.zweilous.desc": "", - "cobblemon.species.hydreigon.name": "", - "cobblemon.species.hydreigon.desc": "", - "cobblemon.species.larvesta.name": "", - "cobblemon.species.larvesta.desc": "", - "cobblemon.species.volcarona.name": "", - "cobblemon.species.volcarona.desc": "", - "cobblemon.species.cobalion.name": "", - "cobblemon.species.cobalion.desc": "", - "cobblemon.species.terrakion.name": "", - "cobblemon.species.terrakion.desc": "", - "cobblemon.species.virizion.name": "", - "cobblemon.species.virizion.desc": "", - "cobblemon.species.tornadus.name": "", - "cobblemon.species.tornadus.desc": "", - "cobblemon.species.thundurus.name": "", - "cobblemon.species.thundurus.desc": "", - "cobblemon.species.reshiram.name": "", - "cobblemon.species.reshiram.desc": "", - "cobblemon.species.zekrom.name": "", - "cobblemon.species.zekrom.desc": "", - "cobblemon.species.landorus.name": "", - "cobblemon.species.landorus.desc": "", - "cobblemon.species.kyurem.name": "", - "cobblemon.species.kyurem.desc": "", - "cobblemon.species.keldeo.name": "", - "cobblemon.species.keldeo.desc": "", - "cobblemon.species.meloetta.name": "", - "cobblemon.species.meloetta.desc": "", - "cobblemon.species.genesect.name": "", - "cobblemon.species.genesect.desc": "", - "cobblemon.species.chespin.name": "", - "cobblemon.species.chespin.desc": "", - "cobblemon.species.quilladin.name": "", - "cobblemon.species.quilladin.desc": "", - "cobblemon.species.chesnaught.name": "", - "cobblemon.species.chesnaught.desc": "", - "cobblemon.species.fennekin.name": "", - "cobblemon.species.fennekin.desc": "", - "cobblemon.species.braixen.name": "", - "cobblemon.species.braixen.desc": "", - "cobblemon.species.delphox.name": "", - "cobblemon.species.delphox.desc": "", - "cobblemon.species.froakie.name": "", - "cobblemon.species.froakie.desc": "", - "cobblemon.species.frogadier.name": "", - "cobblemon.species.frogadier.desc": "", - "cobblemon.species.greninja.name": "", - "cobblemon.species.greninja.desc": "", - "cobblemon.species.bunnelby.name": "", - "cobblemon.species.bunnelby.desc": "", - "cobblemon.species.diggersby.name": "", - "cobblemon.species.diggersby.desc": "", - "cobblemon.species.fletchling.name": "", - "cobblemon.species.fletchling.desc": "", - "cobblemon.species.fletchinder.name": "", - "cobblemon.species.fletchinder.desc": "", - "cobblemon.species.talonflame.name": "", - "cobblemon.species.talonflame.desc": "", - "cobblemon.species.scatterbug.name": "", - "cobblemon.species.scatterbug.desc": "", - "cobblemon.species.spewpa.name": "", - "cobblemon.species.spewpa.desc": "", - "cobblemon.species.vivillon.name": "", - "cobblemon.species.vivillon.desc": "", - "cobblemon.species.litleo.name": "", - "cobblemon.species.litleo.desc": "", - "cobblemon.species.pyroar.name": "", - "cobblemon.species.pyroar.desc": "", - "cobblemon.species.flabebe.name": "", - "cobblemon.species.flabebe.desc": "", - "cobblemon.species.floette.name": "", - "cobblemon.species.floette.desc": "", - "cobblemon.species.florges.name": "", - "cobblemon.species.florges.desc": "", - "cobblemon.species.skiddo.name": "", - "cobblemon.species.skiddo.desc": "", - "cobblemon.species.gogoat.name": "", - "cobblemon.species.gogoat.desc": "", - "cobblemon.species.pancham.name": "", - "cobblemon.species.pancham.desc": "", - "cobblemon.species.pangoro.name": "", - "cobblemon.species.pangoro.desc": "", - "cobblemon.species.furfrou.name": "", - "cobblemon.species.furfrou.desc": "", - "cobblemon.species.espurr.name": "", - "cobblemon.species.espurr.desc": "", - "cobblemon.species.meowstic.name": "", - "cobblemon.species.meowstic.desc": "", - "cobblemon.species.honedge.name": "", - "cobblemon.species.honedge.desc": "", - "cobblemon.species.doublade.name": "", - "cobblemon.species.doublade.desc": "", - "cobblemon.species.aegislash.name": "", - "cobblemon.species.aegislash.desc": "", - "cobblemon.species.spritzee.name": "", - "cobblemon.species.spritzee.desc": "", - "cobblemon.species.aromatisse.name": "", - "cobblemon.species.aromatisse.desc": "", - "cobblemon.species.swirlix.name": "", - "cobblemon.species.swirlix.desc": "", - "cobblemon.species.slurpuff.name": "", - "cobblemon.species.slurpuff.desc": "", - "cobblemon.species.inkay.name": "", - "cobblemon.species.inkay.desc": "", - "cobblemon.species.malamar.name": "", - "cobblemon.species.malamar.desc": "", - "cobblemon.species.binacle.name": "", - "cobblemon.species.binacle.desc": "", - "cobblemon.species.barbaracle.name": "", - "cobblemon.species.barbaracle.desc": "", - "cobblemon.species.skrelp.name": "", - "cobblemon.species.skrelp.desc": "", - "cobblemon.species.dragalge.name": "", - "cobblemon.species.dragalge.desc": "", - "cobblemon.species.clauncher.name": "", - "cobblemon.species.clauncher.desc": "", - "cobblemon.species.clawitzer.name": "", - "cobblemon.species.clawitzer.desc": "", - "cobblemon.species.helioptile.name": "", - "cobblemon.species.helioptile.desc": "", - "cobblemon.species.heliolisk.name": "", - "cobblemon.species.heliolisk.desc": "", - "cobblemon.species.tyrunt.name": "", - "cobblemon.species.tyrunt.desc": "", - "cobblemon.species.tyrantrum.name": "", - "cobblemon.species.tyrantrum.desc": "", - "cobblemon.species.amaura.name": "", - "cobblemon.species.amaura.desc": "", - "cobblemon.species.aurorus.name": "", - "cobblemon.species.aurorus.desc": "", - "cobblemon.species.sylveon.name": "", - "cobblemon.species.sylveon.desc": "", - "cobblemon.species.hawlucha.name": "", - "cobblemon.species.hawlucha.desc": "", - "cobblemon.species.dedenne.name": "", - "cobblemon.species.dedenne.desc": "", - "cobblemon.species.carbink.name": "", - "cobblemon.species.carbink.desc": "", - "cobblemon.species.goomy.name": "", - "cobblemon.species.goomy.desc": "", - "cobblemon.species.sliggoo.name": "", - "cobblemon.species.sliggoo.desc": "", - "cobblemon.species.goodra.name": "", - "cobblemon.species.goodra.desc": "", - "cobblemon.species.klefki.name": "", - "cobblemon.species.klefki.desc": "", - "cobblemon.species.phantump.name": "", - "cobblemon.species.phantump.desc": "", - "cobblemon.species.trevenant.name": "", - "cobblemon.species.trevenant.desc": "", - "cobblemon.species.pumpkaboo.name": "", - "cobblemon.species.pumpkaboo.desc": "", - "cobblemon.species.gourgeist.name": "", - "cobblemon.species.gourgeist.desc": "", - "cobblemon.species.bergmite.name": "", - "cobblemon.species.bergmite.desc": "", - "cobblemon.species.avalugg.name": "", - "cobblemon.species.avalugg.desc": "", - "cobblemon.species.noibat.name": "", - "cobblemon.species.noibat.desc": "", - "cobblemon.species.noivern.name": "", - "cobblemon.species.noivern.desc": "", - "cobblemon.species.xerneas.name": "", - "cobblemon.species.xerneas.desc": "", - "cobblemon.species.yveltal.name": "", - "cobblemon.species.yveltal.desc": "", - "cobblemon.species.zygarde.name": "", - "cobblemon.species.zygarde.desc": "", - "cobblemon.species.diancie.name": "", - "cobblemon.species.diancie.desc": "", - "cobblemon.species.hoopa.name": "", - "cobblemon.species.hoopa.desc": "", - "cobblemon.species.volcanion.name": "", - "cobblemon.species.volcanion.desc": "", - "cobblemon.species.rowlet.name": "", - "cobblemon.species.rowlet.desc": "", - "cobblemon.species.dartrix.name": "", - "cobblemon.species.dartrix.desc": "", - "cobblemon.species.decidueye.name": "", - "cobblemon.species.decidueye.desc": "", - "cobblemon.species.litten.name": "", - "cobblemon.species.litten.desc": "", - "cobblemon.species.torracat.name": "", - "cobblemon.species.torracat.desc": "", - "cobblemon.species.incineroar.name": "", - "cobblemon.species.incineroar.desc": "", - "cobblemon.species.popplio.name": "", - "cobblemon.species.popplio.desc": "", - "cobblemon.species.brionne.name": "", - "cobblemon.species.brionne.desc": "", - "cobblemon.species.primarina.name": "", - "cobblemon.species.primarina.desc": "", - "cobblemon.species.pikipek.name": "", - "cobblemon.species.pikipek.desc": "", - "cobblemon.species.trumbeak.name": "", - "cobblemon.species.trumbeak.desc": "", - "cobblemon.species.toucannon.name": "", - "cobblemon.species.toucannon.desc": "", - "cobblemon.species.yungoos.name": "", - "cobblemon.species.yungoos.desc": "", - "cobblemon.species.gumshoos.name": "", - "cobblemon.species.gumshoos.desc": "", - "cobblemon.species.grubbin.name": "", - "cobblemon.species.grubbin.desc": "", - "cobblemon.species.charjabug.name": "", - "cobblemon.species.charjabug.desc": "", - "cobblemon.species.vikavolt.name": "", - "cobblemon.species.vikavolt.desc": "", - "cobblemon.species.crabrawler.name": "", - "cobblemon.species.crabrawler.desc": "", - "cobblemon.species.crabominable.name": "", - "cobblemon.species.crabominable.desc": "", - "cobblemon.species.oricorio.name": "", - "cobblemon.species.oricorio.desc": "", - "cobblemon.species.cutiefly.name": "", - "cobblemon.species.cutiefly.desc": "", - "cobblemon.species.ribombee.name": "", - "cobblemon.species.ribombee.desc": "", - "cobblemon.species.rockruff.name": "", - "cobblemon.species.rockruff.desc": "", - "cobblemon.species.lycanroc.name": "", - "cobblemon.species.lycanroc.desc": "", - "cobblemon.species.wishiwashi.name": "", - "cobblemon.species.wishiwashi.desc": "", - "cobblemon.species.mareanie.name": "", - "cobblemon.species.mareanie.desc": "", - "cobblemon.species.toxapex.name": "", - "cobblemon.species.toxapex.desc": "", - "cobblemon.species.mudbray.name": "", - "cobblemon.species.mudbray.desc": "", - "cobblemon.species.mudsdale.name": "", - "cobblemon.species.mudsdale.desc": "", - "cobblemon.species.dewpider.name": "", - "cobblemon.species.dewpider.desc": "", - "cobblemon.species.araquanid.name": "", - "cobblemon.species.araquanid.desc": "", - "cobblemon.species.fomantis.name": "", - "cobblemon.species.fomantis.desc": "", - "cobblemon.species.lurantis.name": "", - "cobblemon.species.lurantis.desc": "", - "cobblemon.species.morelull.name": "", - "cobblemon.species.morelull.desc": "", - "cobblemon.species.shiinotic.name": "", - "cobblemon.species.shiinotic.desc": "", - "cobblemon.species.salandit.name": "", - "cobblemon.species.salandit.desc": "", - "cobblemon.species.salazzle.name": "", - "cobblemon.species.salazzle.desc": "", - "cobblemon.species.stufful.name": "", - "cobblemon.species.stufful.desc": "", - "cobblemon.species.bewear.name": "", - "cobblemon.species.bewear.desc": "", - "cobblemon.species.bounsweet.name": "", - "cobblemon.species.bounsweet.desc": "", - "cobblemon.species.steenee.name": "", - "cobblemon.species.steenee.desc": "", - "cobblemon.species.tsareena.name": "", - "cobblemon.species.tsareena.desc": "", - "cobblemon.species.comfey.name": "", - "cobblemon.species.comfey.desc": "", - "cobblemon.species.oranguru.name": "", - "cobblemon.species.oranguru.desc": "", - "cobblemon.species.passimian.name": "", - "cobblemon.species.passimian.desc": "", - "cobblemon.species.wimpod.name": "", - "cobblemon.species.wimpod.desc": "", - "cobblemon.species.golisopod.name": "", - "cobblemon.species.golisopod.desc": "", - "cobblemon.species.sandygast.name": "", - "cobblemon.species.sandygast.desc": "", - "cobblemon.species.palossand.name": "", - "cobblemon.species.palossand.desc": "", - "cobblemon.species.pyukumuku.name": "", - "cobblemon.species.pyukumuku.desc": "", - "cobblemon.species.typenull.name": "", - "cobblemon.species.typenull.desc": "", - "cobblemon.species.silvally.name": "", - "cobblemon.species.silvally.desc": "", - "cobblemon.species.minior.name": "", - "cobblemon.species.minior.desc": "", - "cobblemon.species.komala.name": "", - "cobblemon.species.komala.desc": "", - "cobblemon.species.turtonator.name": "", - "cobblemon.species.turtonator.desc": "", - "cobblemon.species.togedemaru.name": "", - "cobblemon.species.togedemaru.desc": "", - "cobblemon.species.mimikyu.name": "", - "cobblemon.species.mimikyu.desc": "", - "cobblemon.species.bruxish.name": "", - "cobblemon.species.bruxish.desc": "", - "cobblemon.species.drampa.name": "", - "cobblemon.species.drampa.desc": "", - "cobblemon.species.dhelmise.name": "", - "cobblemon.species.dhelmise.desc": "", - "cobblemon.species.jangmoo.name": "", - "cobblemon.species.jangmoo.desc": "", - "cobblemon.species.hakamoo.name": "", - "cobblemon.species.hakamoo.desc": "", - "cobblemon.species.kommoo.name": "", - "cobblemon.species.kommoo.desc": "", - "cobblemon.species.tapukoko.name": "", - "cobblemon.species.tapukoko.desc": "", - "cobblemon.species.tapulele.name": "", - "cobblemon.species.tapulele.desc": "", - "cobblemon.species.tapubulu.name": "", - "cobblemon.species.tapubulu.desc": "", - "cobblemon.species.tapufini.name": "", - "cobblemon.species.tapufini.desc": "", - "cobblemon.species.cosmog.name": "", - "cobblemon.species.cosmog.desc": "", - "cobblemon.species.cosmoem.name": "", - "cobblemon.species.cosmoem.desc": "", - "cobblemon.species.solgaleo.name": "", - "cobblemon.species.solgaleo.desc": "", - "cobblemon.species.lunala.name": "", - "cobblemon.species.lunala.desc": "", - "cobblemon.species.nihilego.name": "", - "cobblemon.species.nihilego.desc": "", - "cobblemon.species.buzzwole.name": "", - "cobblemon.species.buzzwole.desc": "", - "cobblemon.species.pheromosa.name": "", - "cobblemon.species.pheromosa.desc": "", - "cobblemon.species.xurkitree.name": "", - "cobblemon.species.xurkitree.desc": "", - "cobblemon.species.celesteela.name": "", - "cobblemon.species.celesteela.desc": "", - "cobblemon.species.kartana.name": "", - "cobblemon.species.kartana.desc": "", - "cobblemon.species.guzzlord.name": "", - "cobblemon.species.guzzlord.desc": "", - "cobblemon.species.necrozma.name": "", - "cobblemon.species.necrozma.desc": "", - "cobblemon.species.magearna.name": "", - "cobblemon.species.magearna.desc": "", - "cobblemon.species.marshadow.name": "", - "cobblemon.species.marshadow.desc": "", - "cobblemon.species.poipole.name": "", - "cobblemon.species.poipole.desc": "", - "cobblemon.species.naganadel.name": "", - "cobblemon.species.naganadel.desc": "", - "cobblemon.species.stakataka.name": "", - "cobblemon.species.stakataka.desc": "", - "cobblemon.species.blacephalon.name": "", - "cobblemon.species.blacephalon.desc": "", - "cobblemon.species.zeraora.name": "", - "cobblemon.species.zeraora.desc": "", - "cobblemon.species.meltan.name": "", - "cobblemon.species.meltan.desc": "", - "cobblemon.species.melmetal.name": "", - "cobblemon.species.melmetal.desc": "", - "cobblemon.species.grookey.name": "", - "cobblemon.species.grookey.desc": "", - "cobblemon.species.thwackey.name": "", - "cobblemon.species.thwackey.desc": "", - "cobblemon.species.rillaboom.name": "", - "cobblemon.species.rillaboom.desc": "", - "cobblemon.species.scorbunny.name": "", - "cobblemon.species.scorbunny.desc": "", - "cobblemon.species.raboot.name": "", - "cobblemon.species.raboot.desc": "", - "cobblemon.species.cinderace.name": "", - "cobblemon.species.cinderace.desc": "", - "cobblemon.species.sobble.name": "", - "cobblemon.species.sobble.desc": "", - "cobblemon.species.drizzile.name": "", - "cobblemon.species.drizzile.desc": "", - "cobblemon.species.inteleon.name": "", - "cobblemon.species.inteleon.desc": "", - "cobblemon.species.skwovet.name": "", - "cobblemon.species.skwovet.desc": "", - "cobblemon.species.greedent.name": "", - "cobblemon.species.greedent.desc": "", - "cobblemon.species.rookidee.name": "", - "cobblemon.species.rookidee.desc": "", - "cobblemon.species.corvisquire.name": "", - "cobblemon.species.corvisquire.desc": "", - "cobblemon.species.corviknight.name": "", - "cobblemon.species.corviknight.desc": "", - "cobblemon.species.blipbug.name": "", - "cobblemon.species.blipbug.desc": "", - "cobblemon.species.dottler.name": "", - "cobblemon.species.dottler.desc": "", - "cobblemon.species.orbeetle.name": "", - "cobblemon.species.orbeetle.desc": "", - "cobblemon.species.nickit.name": "", - "cobblemon.species.nickit.desc": "", - "cobblemon.species.thievul.name": "", - "cobblemon.species.thievul.desc": "", - "cobblemon.species.gossifleur.name": "", - "cobblemon.species.gossifleur.desc": "", - "cobblemon.species.eldegoss.name": "", - "cobblemon.species.eldegoss.desc": "", - "cobblemon.species.wooloo.name": "", - "cobblemon.species.wooloo.desc": "", - "cobblemon.species.dubwool.name": "", - "cobblemon.species.dubwool.desc": "", - "cobblemon.species.chewtle.name": "", - "cobblemon.species.chewtle.desc": "", - "cobblemon.species.drednaw.name": "", - "cobblemon.species.drednaw.desc": "", - "cobblemon.species.yamper.name": "", - "cobblemon.species.yamper.desc": "", - "cobblemon.species.boltund.name": "", - "cobblemon.species.boltund.desc": "", - "cobblemon.species.rolycoly.name": "", - "cobblemon.species.rolycoly.desc": "", - "cobblemon.species.carkol.name": "", - "cobblemon.species.carkol.desc": "", - "cobblemon.species.coalossal.name": "", - "cobblemon.species.coalossal.desc": "", - "cobblemon.species.applin.name": "", - "cobblemon.species.applin.desc": "", - "cobblemon.species.flapple.name": "", - "cobblemon.species.flapple.desc": "", - "cobblemon.species.appletun.name": "", - "cobblemon.species.appletun.desc": "", - "cobblemon.species.silicobra.name": "", - "cobblemon.species.silicobra.desc": "", - "cobblemon.species.sandaconda.name": "", - "cobblemon.species.sandaconda.desc": "", - "cobblemon.species.cramorant.name": "", - "cobblemon.species.cramorant.desc": "", - "cobblemon.species.arrokuda.name": "", - "cobblemon.species.arrokuda.desc": "", - "cobblemon.species.barraskewda.name": "", - "cobblemon.species.barraskewda.desc": "", - "cobblemon.species.toxel.name": "", - "cobblemon.species.toxel.desc": "", - "cobblemon.species.toxtricity.name": "", - "cobblemon.species.toxtricity.desc": "", - "cobblemon.species.sizzlipede.name": "", - "cobblemon.species.sizzlipede.desc": "", - "cobblemon.species.centiskorch.name": "", - "cobblemon.species.centiskorch.desc": "", - "cobblemon.species.clobbopus.name": "", - "cobblemon.species.clobbopus.desc": "", - "cobblemon.species.grapploct.name": "", - "cobblemon.species.grapploct.desc": "", - "cobblemon.species.sinistea.name": "", - "cobblemon.species.sinistea.desc": "", - "cobblemon.species.polteageist.name": "", - "cobblemon.species.polteageist.desc": "", - "cobblemon.species.hatenna.name": "", - "cobblemon.species.hatenna.desc": "", - "cobblemon.species.hattrem.name": "", - "cobblemon.species.hattrem.desc": "", - "cobblemon.species.hatterene.name": "", - "cobblemon.species.hatterene.desc": "", - "cobblemon.species.impidimp.name": "", - "cobblemon.species.impidimp.desc": "", - "cobblemon.species.morgrem.name": "", - "cobblemon.species.morgrem.desc": "", - "cobblemon.species.grimmsnarl.name": "", - "cobblemon.species.grimmsnarl.desc": "", - "cobblemon.species.obstagoon.name": "", - "cobblemon.species.obstagoon.desc": "", - "cobblemon.species.perrserker.name": "", - "cobblemon.species.perrserker.desc": "", - "cobblemon.species.cursola.name": "", - "cobblemon.species.cursola.desc": "", - "cobblemon.species.sirfetchd.name": "", - "cobblemon.species.sirfetchd.desc": "", - "cobblemon.species.mrrime.name": "", - "cobblemon.species.mrrime.desc": "", - "cobblemon.species.runerigus.name": "", - "cobblemon.species.runerigus.desc": "", - "cobblemon.species.milcery.name": "", - "cobblemon.species.milcery.desc": "", - "cobblemon.species.alcremie.name": "", - "cobblemon.species.alcremie.desc": "", - "cobblemon.species.falinks.name": "", - "cobblemon.species.falinks.desc": "", - "cobblemon.species.pincurchin.name": "", - "cobblemon.species.pincurchin.desc": "", - "cobblemon.species.snom.name": "", - "cobblemon.species.snom.desc": "", - "cobblemon.species.frosmoth.name": "", - "cobblemon.species.frosmoth.desc": "", - "cobblemon.species.stonjourner.name": "", - "cobblemon.species.stonjourner.desc": "", - "cobblemon.species.eiscue.name": "", - "cobblemon.species.eiscue.desc": "", - "cobblemon.species.indeedee.name": "", - "cobblemon.species.indeedee.desc": "", - "cobblemon.species.morpeko.name": "", - "cobblemon.species.morpeko.desc": "", - "cobblemon.species.cufant.name": "", - "cobblemon.species.cufant.desc": "", - "cobblemon.species.copperajah.name": "", - "cobblemon.species.copperajah.desc": "", - "cobblemon.species.dracozolt.name": "", - "cobblemon.species.dracozolt.desc": "", - "cobblemon.species.arctozolt.name": "", - "cobblemon.species.arctozolt.desc": "", - "cobblemon.species.dracovish.name": "", - "cobblemon.species.dracovish.desc": "", - "cobblemon.species.arctovish.name": "", - "cobblemon.species.arctovish.desc": "", - "cobblemon.species.duraludon.name": "", - "cobblemon.species.duraludon.desc": "", - "cobblemon.species.dreepy.name": "", - "cobblemon.species.dreepy.desc": "", - "cobblemon.species.drakloak.name": "", - "cobblemon.species.drakloak.desc": "", - "cobblemon.species.dragapult.name": "", - "cobblemon.species.dragapult.desc": "", - "cobblemon.species.zacian.name": "", - "cobblemon.species.zacian.desc": "", - "cobblemon.species.zamazenta.name": "", - "cobblemon.species.zamazenta.desc": "", - "cobblemon.species.eternatus.name": "", - "cobblemon.species.eternatus.desc": "", - "cobblemon.species.kubfu.name": "", - "cobblemon.species.kubfu.desc": "", - "cobblemon.species.urshifu.name": "", - "cobblemon.species.urshifu.desc": "", - "cobblemon.species.zarude.name": "", - "cobblemon.species.zarude.desc": "", - "cobblemon.species.regieleki.name": "", - "cobblemon.species.regieleki.desc": "", - "cobblemon.species.regidrago.name": "", - "cobblemon.species.regidrago.desc": "", - "cobblemon.species.glastrier.name": "", - "cobblemon.species.glastrier.desc": "", - "cobblemon.species.spectrier.name": "", - "cobblemon.species.spectrier.desc": "", - "cobblemon.species.calyrex.name": "", - "cobblemon.species.calyrex.desc": "", - "cobblemon.species.wyrdeer.name": "", - "cobblemon.species.wyrdeer.desc": "", - "cobblemon.species.kleavor.name": "", - "cobblemon.species.kleavor.desc": "", - "cobblemon.species.ursaluna.name": "", - "cobblemon.species.ursaluna.desc": "", - "cobblemon.species.basculegion.name": "", - "cobblemon.species.basculegion.desc": "", - "cobblemon.species.sneasler.name": "", - "cobblemon.species.sneasler.desc": "", - "cobblemon.species.overqwil.name": "", - "cobblemon.species.overqwil.desc": "", - "cobblemon.species.enamorus.name": "", - "cobblemon.species.enamorus.desc": "", - "cobblemon.species.sprigatito.name": "", - "cobblemon.species.sprigatito.desc": "", - "cobblemon.species.floragato.name": "", - "cobblemon.species.floragato.desc": "", - "cobblemon.species.meowscarada.name": "", - "cobblemon.species.meowscarada.desc": "", - "cobblemon.species.fuecoco.name": "", - "cobblemon.species.fuecoco.desc": "", - "cobblemon.species.crocalor.name": "", - "cobblemon.species.crocalor.desc": "", - "cobblemon.species.skeledirge.name": "", - "cobblemon.species.skeledirge.desc": "", - "cobblemon.species.quaxly.name": "", - "cobblemon.species.quaxly.desc": "", - "cobblemon.species.quaxwell.name": "", - "cobblemon.species.quaxwell.desc": "", - "cobblemon.species.quaquaval.name": "", - "cobblemon.species.quaquaval.desc": "", - "cobblemon.species.lechonk.name": "", - "cobblemon.species.lechonk.desc": "", - "cobblemon.species.oinkologne.name": "", - "cobblemon.species.oinkologne.desc": "", - "cobblemon.species.tarountula.name": "", - "cobblemon.species.tarountula.desc": "", - "cobblemon.species.spidops.name": "", - "cobblemon.species.spidops.desc": "", - "cobblemon.species.nymble.name": "", - "cobblemon.species.nymble.desc": "", - "cobblemon.species.lokix.name": "", - "cobblemon.species.lokix.desc": "", - "cobblemon.species.pawmi.name": "", - "cobblemon.species.pawmi.desc": "", - "cobblemon.species.pawmo.name": "", - "cobblemon.species.pawmo.desc": "", - "cobblemon.species.pawmot.name": "", - "cobblemon.species.pawmot.desc": "", - "cobblemon.species.tandemaus.name": "", - "cobblemon.species.tandemaus.desc": "", - "cobblemon.species.maushold.name": "", - "cobblemon.species.maushold.desc": "", - "cobblemon.species.fidough.name": "", - "cobblemon.species.fidough.desc": "", - "cobblemon.species.dachsbun.name": "", - "cobblemon.species.dachsbun.desc": "", - "cobblemon.species.smoliv.name": "", - "cobblemon.species.smoliv.desc": "", - "cobblemon.species.dolliv.name": "", - "cobblemon.species.dolliv.desc": "", - "cobblemon.species.arboliva.name": "", - "cobblemon.species.arboliva.desc": "", - "cobblemon.species.squawkabilly.name": "", - "cobblemon.species.squawkabilly.desc": "", - "cobblemon.species.nacli.name": "", - "cobblemon.species.nacli.desc": "", - "cobblemon.species.naclstack.name": "", - "cobblemon.species.naclstack.desc": "", - "cobblemon.species.garganacl.name": "", - "cobblemon.species.garganacl.desc": "", - "cobblemon.species.charcadet.name": "", - "cobblemon.species.charcadet.desc": "", - "cobblemon.species.armarouge.name": "", - "cobblemon.species.armarouge.desc": "", - "cobblemon.species.ceruledge.name": "", - "cobblemon.species.ceruledge.desc": "", - "cobblemon.species.tadbulb.name": "", - "cobblemon.species.tadbulb.desc": "", - "cobblemon.species.bellibolt.name": "", - "cobblemon.species.bellibolt.desc": "", - "cobblemon.species.wattrel.name": "", - "cobblemon.species.wattrel.desc": "", - "cobblemon.species.kilowattrel.name": "", - "cobblemon.species.kilowattrel.desc": "", - "cobblemon.species.maschiff.name": "", - "cobblemon.species.maschiff.desc": "", - "cobblemon.species.mabosstiff.name": "", - "cobblemon.species.mabosstiff.desc": "", - "cobblemon.species.shroodle.name": "", - "cobblemon.species.shroodle.desc": "", - "cobblemon.species.grafaiai.name": "", - "cobblemon.species.grafaiai.desc": "", - "cobblemon.species.bramblin.name": "", - "cobblemon.species.bramblin.desc": "", - "cobblemon.species.brambleghast.name": "", - "cobblemon.species.brambleghast.desc": "", - "cobblemon.species.toedscool.name": "", - "cobblemon.species.toedscool.desc": "", - "cobblemon.species.toedscruel.name": "", - "cobblemon.species.toedscruel.desc": "", - "cobblemon.species.klawf.name": "", - "cobblemon.species.klawf.desc": "", - "cobblemon.species.capsakid.name": "", - "cobblemon.species.capsakid.desc": "", - "cobblemon.species.scovillain.name": "", - "cobblemon.species.scovillain.desc": "", - "cobblemon.species.rellor.name": "", - "cobblemon.species.rellor.desc": "", - "cobblemon.species.rabsca.name": "", - "cobblemon.species.rabsca.desc": "", - "cobblemon.species.flittle.name": "", - "cobblemon.species.flittle.desc": "", - "cobblemon.species.espathra.name": "", - "cobblemon.species.espathra.desc": "", - "cobblemon.species.tinkatink.name": "", - "cobblemon.species.tinkatink.desc": "", - "cobblemon.species.tinkatuff.name": "", - "cobblemon.species.tinkatuff.desc": "", - "cobblemon.species.tinkaton.name": "", - "cobblemon.species.tinkaton.desc": "", - "cobblemon.species.wiglett.name": "", - "cobblemon.species.wiglett.desc": "", - "cobblemon.species.wugtrio.name": "", - "cobblemon.species.wugtrio.desc": "", - "cobblemon.species.bombirdier.name": "", - "cobblemon.species.bombirdier.desc": "", - "cobblemon.species.finizen.name": "", - "cobblemon.species.finizen.desc": "", - "cobblemon.species.palafin.name": "", - "cobblemon.species.palafin.desc": "", - "cobblemon.species.varoom.name": "", - "cobblemon.species.varoom.desc": "", - "cobblemon.species.revavroom.name": "", - "cobblemon.species.revavroom.desc": "", - "cobblemon.species.cyclizar.name": "", - "cobblemon.species.cyclizar.desc": "", - "cobblemon.species.orthworm.name": "", - "cobblemon.species.orthworm.desc": "", - "cobblemon.species.glimmet.name": "", - "cobblemon.species.glimmet.desc": "", - "cobblemon.species.glimmora.name": "", - "cobblemon.species.glimmora.desc": "", - "cobblemon.species.greavard.name": "", - "cobblemon.species.greavard.desc": "", - "cobblemon.species.houndstone.name": "", - "cobblemon.species.houndstone.desc": "", - "cobblemon.species.flamigo.name": "", - "cobblemon.species.flamigo.desc": "", - "cobblemon.species.cetoddle.name": "", - "cobblemon.species.cetoddle.desc": "", - "cobblemon.species.cetitan.name": "", - "cobblemon.species.cetitan.desc": "", - "cobblemon.species.veluza.name": "", - "cobblemon.species.veluza.desc": "", - "cobblemon.species.dondozo.name": "", - "cobblemon.species.dondozo.desc": "", - "cobblemon.species.tatsugiri.name": "", - "cobblemon.species.tatsugiri.desc": "", - "cobblemon.species.annihilape.name": "", - "cobblemon.species.annihilape.desc": "", - "cobblemon.species.clodsire.name": "", - "cobblemon.species.clodsire.desc": "", - "cobblemon.species.farigiraf.name": "", - "cobblemon.species.farigiraf.desc": "", - "cobblemon.species.dudunsparce.name": "", - "cobblemon.species.dudunsparce.desc": "", - "cobblemon.species.kingambit.name": "", - "cobblemon.species.kingambit.desc": "", - "cobblemon.species.greattusk.name": "", - "cobblemon.species.greattusk.desc": "", - "cobblemon.species.screamtail.name": "", - "cobblemon.species.screamtail.desc": "", - "cobblemon.species.brutebonnet.name": "", - "cobblemon.species.brutebonnet.desc": "", - "cobblemon.species.fluttermane.name": "", - "cobblemon.species.fluttermane.desc": "", - "cobblemon.species.slitherwing.name": "", - "cobblemon.species.slitherwing.desc": "", - "cobblemon.species.sandyshocks.name": "", - "cobblemon.species.sandyshocks.desc": "", - "cobblemon.species.irontreads.name": "", - "cobblemon.species.irontreads.desc": "", - "cobblemon.species.ironbundle.name": "", - "cobblemon.species.ironbundle.desc": "", - "cobblemon.species.ironhands.name": "", - "cobblemon.species.ironhands.desc": "", - "cobblemon.species.ironjugulis.name": "", - "cobblemon.species.ironjugulis.desc": "", - "cobblemon.species.ironmoth.name": "", - "cobblemon.species.ironmoth.desc": "", - "cobblemon.species.ironthorns.name": "", - "cobblemon.species.ironthorns.desc": "", - "cobblemon.species.frigibax.name": "", - "cobblemon.species.frigibax.desc": "", - "cobblemon.species.arctibax.name": "", - "cobblemon.species.arctibax.desc": "", - "cobblemon.species.baxcalibur.name": "", - "cobblemon.species.baxcalibur.desc": "", - "cobblemon.species.gimmighoul.name": "", - "cobblemon.species.gimmighoul.desc": "", - "cobblemon.species.gholdengo.name": "", - "cobblemon.species.gholdengo.desc": "", - "cobblemon.species.wochien.name": "", - "cobblemon.species.wochien.desc": "", - "cobblemon.species.chienpao.name": "", - "cobblemon.species.chienpao.desc": "", - "cobblemon.species.tinglu.name": "", - "cobblemon.species.tinglu.desc": "", - "cobblemon.species.chiyu.name": "", - "cobblemon.species.chiyu.desc": "", - "cobblemon.species.roaringmoon.name": "", - "cobblemon.species.roaringmoon.desc": "", - "cobblemon.species.ironvaliant.name": "", - "cobblemon.species.ironvaliant.desc": "", - "cobblemon.species.koraidon.name": "", - "cobblemon.species.koraidon.desc": "", - "cobblemon.species.miraidon.name": "", - "cobblemon.species.miraidon.desc": "", - "cobblemon.species.walkingwake.name": "", - "cobblemon.species.walkingwake.desc": "", - "cobblemon.species.ironleaves.name": "", - "cobblemon.species.ironleaves.desc": "", - "cobblemon.species.dipplin.name": "", - "cobblemon.species.dipplin.desc": "", - "cobblemon.species.poltchageist.name": "", - "cobblemon.species.poltchageist.desc": "", - "cobblemon.species.sinistcha.name": "", - "cobblemon.species.sinistcha.desc": "", - "cobblemon.species.okidogi.name": "", - "cobblemon.species.okidogi.desc": "", - "cobblemon.species.munkidori.name": "", - "cobblemon.species.munkidori.desc": "", - "cobblemon.species.fezandipiti.name": "", - "cobblemon.species.fezandipiti.desc": "", - "cobblemon.species.ogerpon.name": "", - "cobblemon.species.ogerpon.desc": "", - "cobblemon.species.archaludon.name": "", - "cobblemon.species.archaludon.desc": "", - "cobblemon.species.hydrapple.name": "", - "cobblemon.species.hydrapple.desc": "", - "cobblemon.species.gougingfire.name": "", - "cobblemon.species.gougingfire.desc": "", - "cobblemon.species.ragingbolt.name": "", - "cobblemon.species.ragingbolt.desc": "", - "cobblemon.species.ironboulder.name": "", - "cobblemon.species.ironboulder.desc": "", - "cobblemon.species.ironcrown.name": "", - "cobblemon.species.ironcrown.desc": "", - "cobblemon.species.terapagos.name": "", - "cobblemon.species.terapagos.desc": "", - "cobblemon.species.pecharunt.name": "", - "cobblemon.species.pecharunt.desc": "", - "cobblemon.ability.adaptability": "", - "cobblemon.ability.adaptability.desc": "", - "cobblemon.ability.aerilate": "", - "cobblemon.ability.aerilate.desc": "", - "cobblemon.ability.aftermath": "", - "cobblemon.ability.aftermath.desc": "", - "cobblemon.ability.airlock": "", - "cobblemon.ability.airlock.desc": "", - "cobblemon.ability.analytic": "", - "cobblemon.ability.analytic.desc": "", - "cobblemon.ability.angerpoint": "", - "cobblemon.ability.angerpoint.desc": "", - "cobblemon.ability.angershell": "", - "cobblemon.ability.angershell.desc": "", - "cobblemon.ability.anticipation": "", - "cobblemon.ability.anticipation.desc": "", - "cobblemon.ability.arenatrap": "", - "cobblemon.ability.arenatrap.desc": "", - "cobblemon.ability.armortail": "", - "cobblemon.ability.armortail.desc": "", - "cobblemon.ability.aromaveil": "", - "cobblemon.ability.aromaveil.desc": "", - "cobblemon.ability.asoneglastrier": "", - "cobblemon.ability.asoneglastrier.desc": "", - "cobblemon.ability.asonespectrier": "", - "cobblemon.ability.asonespectrier.desc": "", - "cobblemon.ability.aurabreak": "", - "cobblemon.ability.aurabreak.desc": "", - "cobblemon.ability.baddreams": "", - "cobblemon.ability.baddreams.desc": "", - "cobblemon.ability.ballfetch": "", - "cobblemon.ability.ballfetch.desc": "", - "cobblemon.ability.battery": "", - "cobblemon.ability.battery.desc": "", - "cobblemon.ability.battlearmor": "", - "cobblemon.ability.battlearmor.desc": "", - "cobblemon.ability.battlebond": "", - "cobblemon.ability.battlebond.desc": "", - "cobblemon.ability.beadsofruin": "", - "cobblemon.ability.beadsofruin.desc": "", - "cobblemon.ability.beastboost": "", - "cobblemon.ability.beastboost.desc": "", - "cobblemon.ability.berserk": "", - "cobblemon.ability.berserk.desc": "", - "cobblemon.ability.bigpecks": "", - "cobblemon.ability.bigpecks.desc": "", - "cobblemon.ability.blaze": "", - "cobblemon.ability.blaze.desc": "", - "cobblemon.ability.bulletproof": "", - "cobblemon.ability.bulletproof.desc": "", - "cobblemon.ability.cheekpouch": "", - "cobblemon.ability.cheekpouch.desc": "", - "cobblemon.ability.chillingneigh": "", - "cobblemon.ability.chillingneigh.desc": "", - "cobblemon.ability.chlorophyll": "", - "cobblemon.ability.chlorophyll.desc": "", - "cobblemon.ability.clearbody": "", - "cobblemon.ability.clearbody.desc": "", - "cobblemon.ability.cloudnine": "", - "cobblemon.ability.cloudnine.desc": "", - "cobblemon.ability.colorchange": "", - "cobblemon.ability.colorchange.desc": "", - "cobblemon.ability.comatose": "", - "cobblemon.ability.comatose.desc": "", - "cobblemon.ability.commander": "", - "cobblemon.ability.commander.desc": "", - "cobblemon.ability.competitive": "", - "cobblemon.ability.competitive.desc": "", - "cobblemon.ability.compoundeyes": "", - "cobblemon.ability.compoundeyes.desc": "", - "cobblemon.ability.contrary": "", - "cobblemon.ability.contrary.desc": "", - "cobblemon.ability.corrosion": "", - "cobblemon.ability.corrosion.desc": "", - "cobblemon.ability.costar": "", - "cobblemon.ability.costar.desc": "", - "cobblemon.ability.cottondown": "", - "cobblemon.ability.cottondown.desc": "", - "cobblemon.ability.cudchew": "", - "cobblemon.ability.cudchew.desc": "", - "cobblemon.ability.curiousmedicine": "", - "cobblemon.ability.curiousmedicine.desc": "", - "cobblemon.ability.cursedbody": "", - "cobblemon.ability.cursedbody.desc": "", - "cobblemon.ability.cutecharm": "", - "cobblemon.ability.cutecharm.desc": "", - "cobblemon.ability.damp": "", - "cobblemon.ability.damp.desc": "", - "cobblemon.ability.dancer": "", - "cobblemon.ability.dancer.desc": "", - "cobblemon.ability.darkaura": "", - "cobblemon.ability.darkaura.desc": "", - "cobblemon.ability.dauntlessshield": "", - "cobblemon.ability.dauntlessshield.desc": "", - "cobblemon.ability.dazzling": "", - "cobblemon.ability.dazzling.desc": "", - "cobblemon.ability.defeatist": "", - "cobblemon.ability.defeatist.desc": "", - "cobblemon.ability.defiant": "", - "cobblemon.ability.defiant.desc": "", - "cobblemon.ability.deltastream": "", - "cobblemon.ability.deltastream.desc": "", - "cobblemon.ability.desolateland": "", - "cobblemon.ability.desolateland.desc": "", - "cobblemon.ability.disguise": "", - "cobblemon.ability.disguise.desc": "", - "cobblemon.ability.download": "", - "cobblemon.ability.download.desc": "", - "cobblemon.ability.dragonsmaw": "", - "cobblemon.ability.dragonsmaw.desc": "", - "cobblemon.ability.drizzle": "", - "cobblemon.ability.drizzle.desc": "", - "cobblemon.ability.drought": "", - "cobblemon.ability.drought.desc": "", - "cobblemon.ability.dryskin": "", - "cobblemon.ability.dryskin.desc": "", - "cobblemon.ability.earlybird": "", - "cobblemon.ability.earlybird.desc": "", - "cobblemon.ability.eartheater": "", - "cobblemon.ability.eartheater.desc": "", - "cobblemon.ability.effectspore": "", - "cobblemon.ability.effectspore.desc": "", - "cobblemon.ability.electricsurge": "", - "cobblemon.ability.electricsurge.desc": "", - "cobblemon.ability.electromorphosis": "", - "cobblemon.ability.electromorphosis.desc": "", - "cobblemon.ability.embodyaspectcornerstone": "", - "cobblemon.ability.embodyaspectcornerstone.desc": "", - "cobblemon.ability.embodyaspecthearthflame": "", - "cobblemon.ability.embodyaspecthearthflame.desc": "", - "cobblemon.ability.embodyaspectteal": "", - "cobblemon.ability.embodyaspectteal.desc": "", - "cobblemon.ability.embodyaspectwellspring": "", - "cobblemon.ability.embodyaspectwellspring.desc": "", - "cobblemon.ability.emergencyexit": "", - "cobblemon.ability.emergencyexit.desc": "", - "cobblemon.ability.fairyaura": "", - "cobblemon.ability.fairyaura.desc": "", - "cobblemon.ability.filter": "", - "cobblemon.ability.filter.desc": "", - "cobblemon.ability.flamebody": "", - "cobblemon.ability.flamebody.desc": "", - "cobblemon.ability.flareboost": "", - "cobblemon.ability.flareboost.desc": "", - "cobblemon.ability.flashfire": "", - "cobblemon.ability.flashfire.desc": "", - "cobblemon.ability.flowergift": "", - "cobblemon.ability.flowergift.desc": "", - "cobblemon.ability.flowerveil": "", - "cobblemon.ability.flowerveil.desc": "", - "cobblemon.ability.fluffy": "", - "cobblemon.ability.fluffy.desc": "", - "cobblemon.ability.forecast": "", - "cobblemon.ability.forecast.desc": "", - "cobblemon.ability.forewarn": "", - "cobblemon.ability.forewarn.desc": "", - "cobblemon.ability.friendguard": "", - "cobblemon.ability.friendguard.desc": "", - "cobblemon.ability.frisk": "", - "cobblemon.ability.frisk.desc": "", - "cobblemon.ability.fullmetalbody": "", - "cobblemon.ability.fullmetalbody.desc": "", - "cobblemon.ability.furcoat": "", - "cobblemon.ability.furcoat.desc": "", - "cobblemon.ability.galewings": "", - "cobblemon.ability.galewings.desc": "", - "cobblemon.ability.galvanize": "", - "cobblemon.ability.galvanize.desc": "", - "cobblemon.ability.gluttony": "", - "cobblemon.ability.gluttony.desc": "", - "cobblemon.ability.goodasgold": "", - "cobblemon.ability.goodasgold.desc": "", - "cobblemon.ability.gooey": "", - "cobblemon.ability.gooey.desc": "", - "cobblemon.ability.gorillatactics": "", - "cobblemon.ability.gorillatactics.desc": "", - "cobblemon.ability.grasspelt": "", - "cobblemon.ability.grasspelt.desc": "", - "cobblemon.ability.grassysurge": "", - "cobblemon.ability.grassysurge.desc": "", - "cobblemon.ability.grimneigh": "", - "cobblemon.ability.grimneigh.desc": "", - "cobblemon.ability.guarddog": "", - "cobblemon.ability.guarddog.desc": "", - "cobblemon.ability.gulpmissile": "", - "cobblemon.ability.gulpmissile.desc": "", - "cobblemon.ability.guts": "", - "cobblemon.ability.guts.desc": "", - "cobblemon.ability.hadronengine": "", - "cobblemon.ability.hadronengine.desc": "", - "cobblemon.ability.harvest": "", - "cobblemon.ability.harvest.desc": "", - "cobblemon.ability.healer": "", - "cobblemon.ability.healer.desc": "", - "cobblemon.ability.heatproof": "", - "cobblemon.ability.heatproof.desc": "", - "cobblemon.ability.heavymetal": "", - "cobblemon.ability.heavymetal.desc": "", - "cobblemon.ability.honeygather": "", - "cobblemon.ability.honeygather.desc": "", - "cobblemon.ability.hospitality": "", - "cobblemon.ability.hospitality.desc": "", - "cobblemon.ability.hugepower": "", - "cobblemon.ability.hugepower.desc": "", - "cobblemon.ability.hungerswitch": "", - "cobblemon.ability.hungerswitch.desc": "", - "cobblemon.ability.hustle": "", - "cobblemon.ability.hustle.desc": "", - "cobblemon.ability.hydration": "", - "cobblemon.ability.hydration.desc": "", - "cobblemon.ability.hypercutter": "", - "cobblemon.ability.hypercutter.desc": "", - "cobblemon.ability.icebody": "", - "cobblemon.ability.icebody.desc": "", - "cobblemon.ability.iceface": "", - "cobblemon.ability.iceface.desc": "", - "cobblemon.ability.icescales": "", - "cobblemon.ability.icescales.desc": "", - "cobblemon.ability.illuminate": "", - "cobblemon.ability.illuminate.desc": "", - "cobblemon.ability.illusion": "", - "cobblemon.ability.illusion.desc": "", - "cobblemon.ability.immunity": "", - "cobblemon.ability.immunity.desc": "", - "cobblemon.ability.imposter": "", - "cobblemon.ability.imposter.desc": "", - "cobblemon.ability.infiltrator": "", - "cobblemon.ability.infiltrator.desc": "", - "cobblemon.ability.innardsout": "", - "cobblemon.ability.innardsout.desc": "", - "cobblemon.ability.innerfocus": "", - "cobblemon.ability.innerfocus.desc": "", - "cobblemon.ability.insomnia": "", - "cobblemon.ability.insomnia.desc": "", - "cobblemon.ability.intimidate": "", - "cobblemon.ability.intimidate.desc": "", - "cobblemon.ability.intrepidsword": "", - "cobblemon.ability.intrepidsword.desc": "", - "cobblemon.ability.ironbarbs": "", - "cobblemon.ability.ironbarbs.desc": "", - "cobblemon.ability.ironfist": "", - "cobblemon.ability.ironfist.desc": "", - "cobblemon.ability.justified": "", - "cobblemon.ability.justified.desc": "", - "cobblemon.ability.keeneye": "", - "cobblemon.ability.keeneye.desc": "", - "cobblemon.ability.klutz": "", - "cobblemon.ability.klutz.desc": "", - "cobblemon.ability.leafguard": "", - "cobblemon.ability.leafguard.desc": "", - "cobblemon.ability.levitate": "", - "cobblemon.ability.levitate.desc": "", - "cobblemon.ability.libero": "", - "cobblemon.ability.libero.desc": "", - "cobblemon.ability.lightmetal": "", - "cobblemon.ability.lightmetal.desc": "", - "cobblemon.ability.lightningrod": "", - "cobblemon.ability.lightningrod.desc": "", - "cobblemon.ability.limber": "", - "cobblemon.ability.limber.desc": "", - "cobblemon.ability.lingeringaroma": "", - "cobblemon.ability.lingeringaroma.desc": "", - "cobblemon.ability.liquidooze": "", - "cobblemon.ability.liquidooze.desc": "", - "cobblemon.ability.liquidvoice": "", - "cobblemon.ability.liquidvoice.desc": "", - "cobblemon.ability.longreach": "", - "cobblemon.ability.longreach.desc": "", - "cobblemon.ability.magicbounce": "", - "cobblemon.ability.magicbounce.desc": "", - "cobblemon.ability.magicguard": "", - "cobblemon.ability.magicguard.desc": "", - "cobblemon.ability.magician": "", - "cobblemon.ability.magician.desc": "", - "cobblemon.ability.magmaarmor": "", - "cobblemon.ability.magmaarmor.desc": "", - "cobblemon.ability.magnetpull": "", - "cobblemon.ability.magnetpull.desc": "", - "cobblemon.ability.marvelscale": "", - "cobblemon.ability.marvelscale.desc": "", - "cobblemon.ability.megalauncher": "", - "cobblemon.ability.megalauncher.desc": "", - "cobblemon.ability.merciless": "", - "cobblemon.ability.merciless.desc": "", - "cobblemon.ability.mimicry": "", - "cobblemon.ability.mimicry.desc": "", - "cobblemon.ability.mindseye": "", - "cobblemon.ability.mindseye.desc": "", - "cobblemon.ability.minus": "", - "cobblemon.ability.minus.desc": "", - "cobblemon.ability.mirrorarmor": "", - "cobblemon.ability.mirrorarmor.desc": "", - "cobblemon.ability.mistysurge": "", - "cobblemon.ability.mistysurge.desc": "", - "cobblemon.ability.moldbreaker": "", - "cobblemon.ability.moldbreaker.desc": "", - "cobblemon.ability.moody": "", - "cobblemon.ability.moody.desc": "", - "cobblemon.ability.motordrive": "", - "cobblemon.ability.motordrive.desc": "", - "cobblemon.ability.moxie": "", - "cobblemon.ability.moxie.desc": "", - "cobblemon.ability.multiscale": "", - "cobblemon.ability.multiscale.desc": "", - "cobblemon.ability.multitype": "", - "cobblemon.ability.multitype.desc": "", - "cobblemon.ability.mummy": "", - "cobblemon.ability.mummy.desc": "", - "cobblemon.ability.myceliummight": "", - "cobblemon.ability.myceliummight.desc": "", - "cobblemon.ability.naturalcure": "", - "cobblemon.ability.naturalcure.desc": "", - "cobblemon.ability.neuroforce": "", - "cobblemon.ability.neuroforce.desc": "", - "cobblemon.ability.neutralizinggas": "", - "cobblemon.ability.neutralizinggas.desc": "", - "cobblemon.ability.noguard": "", - "cobblemon.ability.noguard.desc": "", - "cobblemon.ability.normalize": "", - "cobblemon.ability.normalize.desc": "", - "cobblemon.ability.oblivious": "", - "cobblemon.ability.oblivious.desc": "", - "cobblemon.ability.opportunist": "", - "cobblemon.ability.opportunist.desc": "", - "cobblemon.ability.orichalcumpulse": "", - "cobblemon.ability.orichalcumpulse.desc": "", - "cobblemon.ability.overcoat": "", - "cobblemon.ability.overcoat.desc": "", - "cobblemon.ability.overgrow": "", - "cobblemon.ability.overgrow.desc": "", - "cobblemon.ability.owntempo": "", - "cobblemon.ability.owntempo.desc": "", - "cobblemon.ability.parentalbond": "", - "cobblemon.ability.parentalbond.desc": "", - "cobblemon.ability.pastelveil": "", - "cobblemon.ability.pastelveil.desc": "", - "cobblemon.ability.perishbody": "", - "cobblemon.ability.perishbody.desc": "", - "cobblemon.ability.pickpocket": "", - "cobblemon.ability.pickpocket.desc": "", - "cobblemon.ability.pickup": "", - "cobblemon.ability.pickup.desc": "", - "cobblemon.ability.pixilate": "", - "cobblemon.ability.pixilate.desc": "", - "cobblemon.ability.plus": "", - "cobblemon.ability.plus.desc": "", - "cobblemon.ability.poisonheal": "", - "cobblemon.ability.poisonheal.desc": "", - "cobblemon.ability.poisonpoint": "", - "cobblemon.ability.poisonpoint.desc": "", - "cobblemon.ability.poisonpuppeteer": "", - "cobblemon.ability.poisonpuppeteer.desc": "", - "cobblemon.ability.poisontouch": "", - "cobblemon.ability.poisontouch.desc": "", - "cobblemon.ability.powerconstruct": "", - "cobblemon.ability.powerconstruct.desc": "", - "cobblemon.ability.powerofalchemy": "", - "cobblemon.ability.powerofalchemy.desc": "", - "cobblemon.ability.powerspot": "", - "cobblemon.ability.powerspot.desc": "", - "cobblemon.ability.prankster": "", - "cobblemon.ability.prankster.desc": "", - "cobblemon.ability.pressure": "", - "cobblemon.ability.pressure.desc": "", - "cobblemon.ability.primordialsea": "", - "cobblemon.ability.primordialsea.desc": "", - "cobblemon.ability.prismarmor": "", - "cobblemon.ability.prismarmor.desc": "", - "cobblemon.ability.propellertail": "", - "cobblemon.ability.propellertail.desc": "", - "cobblemon.ability.protean": "", - "cobblemon.ability.protean.desc": "", - "cobblemon.ability.protosynthesis": "", - "cobblemon.ability.protosynthesis.desc": "", - "cobblemon.ability.psychicsurge": "", - "cobblemon.ability.psychicsurge.desc": "", - "cobblemon.ability.punkrock": "", - "cobblemon.ability.punkrock.desc": "", - "cobblemon.ability.purepower": "", - "cobblemon.ability.purepower.desc": "", - "cobblemon.ability.purifyingsalt": "", - "cobblemon.ability.purifyingsalt.desc": "", - "cobblemon.ability.quarkdrive": "", - "cobblemon.ability.quarkdrive.desc": "", - "cobblemon.ability.queenlymajesty": "", - "cobblemon.ability.queenlymajesty.desc": "", - "cobblemon.ability.quickdraw": "", - "cobblemon.ability.quickdraw.desc": "", - "cobblemon.ability.quickfeet": "", - "cobblemon.ability.quickfeet.desc": "", - "cobblemon.ability.raindish": "", - "cobblemon.ability.raindish.desc": "", - "cobblemon.ability.rattled": "", - "cobblemon.ability.rattled.desc": "", - "cobblemon.ability.receiver": "", - "cobblemon.ability.receiver.desc": "", - "cobblemon.ability.reckless": "", - "cobblemon.ability.reckless.desc": "", - "cobblemon.ability.refrigerate": "", - "cobblemon.ability.refrigerate.desc": "", - "cobblemon.ability.regenerator": "", - "cobblemon.ability.regenerator.desc": "", - "cobblemon.ability.ripen": "", - "cobblemon.ability.ripen.desc": "", - "cobblemon.ability.rivalry": "", - "cobblemon.ability.rivalry.desc": "", - "cobblemon.ability.rkssystem": "", - "cobblemon.ability.rkssystem.desc": "", - "cobblemon.ability.rockhead": "", - "cobblemon.ability.rockhead.desc": "", - "cobblemon.ability.rockypayload": "", - "cobblemon.ability.rockypayload.desc": "", - "cobblemon.ability.roughskin": "", - "cobblemon.ability.roughskin.desc": "", - "cobblemon.ability.runaway": "", - "cobblemon.ability.runaway.desc": "", - "cobblemon.ability.sandforce": "", - "cobblemon.ability.sandforce.desc": "", - "cobblemon.ability.sandrush": "", - "cobblemon.ability.sandrush.desc": "", - "cobblemon.ability.sandspit": "", - "cobblemon.ability.sandspit.desc": "", - "cobblemon.ability.sandstream": "", - "cobblemon.ability.sandstream.desc": "", - "cobblemon.ability.sandveil": "", - "cobblemon.ability.sandveil.desc": "", - "cobblemon.ability.sapsipper": "", - "cobblemon.ability.sapsipper.desc": "", - "cobblemon.ability.schooling": "", - "cobblemon.ability.schooling.desc": "", - "cobblemon.ability.scrappy": "", - "cobblemon.ability.scrappy.desc": "", - "cobblemon.ability.screencleaner": "", - "cobblemon.ability.screencleaner.desc": "", - "cobblemon.ability.seedsower": "", - "cobblemon.ability.seedsower.desc": "", - "cobblemon.ability.serenegrace": "", - "cobblemon.ability.serenegrace.desc": "", - "cobblemon.ability.shadowshield": "", - "cobblemon.ability.shadowshield.desc": "", - "cobblemon.ability.shadowtag": "", - "cobblemon.ability.shadowtag.desc": "", - "cobblemon.ability.sharpness": "", - "cobblemon.ability.sharpness.desc": "", - "cobblemon.ability.shedskin": "", - "cobblemon.ability.shedskin.desc": "", - "cobblemon.ability.sheerforce": "", - "cobblemon.ability.sheerforce.desc": "", - "cobblemon.ability.shellarmor": "", - "cobblemon.ability.shellarmor.desc": "", - "cobblemon.ability.shielddust": "", - "cobblemon.ability.shielddust.desc": "", - "cobblemon.ability.shieldsdown": "", - "cobblemon.ability.shieldsdown.desc": "", - "cobblemon.ability.simple": "", - "cobblemon.ability.simple.desc": "", - "cobblemon.ability.skilllink": "", - "cobblemon.ability.skilllink.desc": "", - "cobblemon.ability.slowstart": "", - "cobblemon.ability.slowstart.desc": "", - "cobblemon.ability.slushrush": "", - "cobblemon.ability.slushrush.desc": "", - "cobblemon.ability.sniper": "", - "cobblemon.ability.sniper.desc": "", - "cobblemon.ability.snowcloak": "", - "cobblemon.ability.snowcloak.desc": "", - "cobblemon.ability.snowwarning": "", - "cobblemon.ability.snowwarning.desc": "", - "cobblemon.ability.solarpower": "", - "cobblemon.ability.solarpower.desc": "", - "cobblemon.ability.solidrock": "", - "cobblemon.ability.solidrock.desc": "", - "cobblemon.ability.soulheart": "", - "cobblemon.ability.soulheart.desc": "", - "cobblemon.ability.soundproof": "", - "cobblemon.ability.soundproof.desc": "", - "cobblemon.ability.speedboost": "", - "cobblemon.ability.speedboost.desc": "", - "cobblemon.ability.stakeout": "", - "cobblemon.ability.stakeout.desc": "", - "cobblemon.ability.stall": "", - "cobblemon.ability.stall.desc": "", - "cobblemon.ability.stalwart": "", - "cobblemon.ability.stalwart.desc": "", - "cobblemon.ability.stamina": "", - "cobblemon.ability.stamina.desc": "", - "cobblemon.ability.stancechange": "", - "cobblemon.ability.stancechange.desc": "", - "cobblemon.ability.static": "", - "cobblemon.ability.static.desc": "", - "cobblemon.ability.steadfast": "", - "cobblemon.ability.steadfast.desc": "", - "cobblemon.ability.steamengine": "", - "cobblemon.ability.steamengine.desc": "", - "cobblemon.ability.steelworker": "", - "cobblemon.ability.steelworker.desc": "", - "cobblemon.ability.steelyspirit": "", - "cobblemon.ability.steelyspirit.desc": "", - "cobblemon.ability.stench": "", - "cobblemon.ability.stench.desc": "", - "cobblemon.ability.stickyhold": "", - "cobblemon.ability.stickyhold.desc": "", - "cobblemon.ability.stormdrain": "", - "cobblemon.ability.stormdrain.desc": "", - "cobblemon.ability.strongjaw": "", - "cobblemon.ability.strongjaw.desc": "", - "cobblemon.ability.sturdy": "", - "cobblemon.ability.sturdy.desc": "", - "cobblemon.ability.suctioncups": "", - "cobblemon.ability.suctioncups.desc": "", - "cobblemon.ability.superluck": "", - "cobblemon.ability.superluck.desc": "", - "cobblemon.ability.supersweetsyrup": "", - "cobblemon.ability.supersweetsyrup.desc": "", - "cobblemon.ability.supremeoverlord": "", - "cobblemon.ability.supremeoverlord.desc": "", - "cobblemon.ability.surgesurfer": "", - "cobblemon.ability.surgesurfer.desc": "", - "cobblemon.ability.swarm": "", - "cobblemon.ability.swarm.desc": "", - "cobblemon.ability.sweetveil": "", - "cobblemon.ability.sweetveil.desc": "", - "cobblemon.ability.swiftswim": "", - "cobblemon.ability.swiftswim.desc": "", - "cobblemon.ability.swordofruin": "", - "cobblemon.ability.swordofruin.desc": "", - "cobblemon.ability.symbiosis": "", - "cobblemon.ability.symbiosis.desc": "", - "cobblemon.ability.synchronize": "", - "cobblemon.ability.synchronize.desc": "", - "cobblemon.ability.tabletsofruin": "", - "cobblemon.ability.tabletsofruin.desc": "", - "cobblemon.ability.tangledfeet": "", - "cobblemon.ability.tangledfeet.desc": "", - "cobblemon.ability.tanglinghair": "", - "cobblemon.ability.tanglinghair.desc": "", - "cobblemon.ability.technician": "", - "cobblemon.ability.technician.desc": "", - "cobblemon.ability.telepathy": "", - "cobblemon.ability.telepathy.desc": "", - "cobblemon.ability.teraformzero": "", - "cobblemon.ability.teraformzero.desc": "", - "cobblemon.ability.terashell": "", - "cobblemon.ability.terashell.desc": "", - "cobblemon.ability.terashift": "", - "cobblemon.ability.terashift.desc": "", - "cobblemon.ability.teravolt": "", - "cobblemon.ability.teravolt.desc": "", - "cobblemon.ability.thermalexchange": "", - "cobblemon.ability.thermalexchange.desc": "", - "cobblemon.ability.thickfat": "", - "cobblemon.ability.thickfat.desc": "", - "cobblemon.ability.tintedlens": "", - "cobblemon.ability.tintedlens.desc": "", - "cobblemon.ability.torrent": "", - "cobblemon.ability.torrent.desc": "", - "cobblemon.ability.toughclaws": "", - "cobblemon.ability.toughclaws.desc": "", - "cobblemon.ability.toxicboost": "", - "cobblemon.ability.toxicboost.desc": "", - "cobblemon.ability.toxicchain": "", - "cobblemon.ability.toxicchain.desc": "", - "cobblemon.ability.toxicdebris": "", - "cobblemon.ability.toxicdebris.desc": "", - "cobblemon.ability.trace": "", - "cobblemon.ability.trace.desc": "", - "cobblemon.ability.transistor": "", - "cobblemon.ability.transistor.desc": "", - "cobblemon.ability.triage": "", - "cobblemon.ability.triage.desc": "", - "cobblemon.ability.truant": "", - "cobblemon.ability.truant.desc": "", - "cobblemon.ability.turboblaze": "", - "cobblemon.ability.turboblaze.desc": "", - "cobblemon.ability.unaware": "", - "cobblemon.ability.unaware.desc": "", - "cobblemon.ability.unburden": "", - "cobblemon.ability.unburden.desc": "", - "cobblemon.ability.unnerve": "", - "cobblemon.ability.unnerve.desc": "", - "cobblemon.ability.unseenfist": "", - "cobblemon.ability.unseenfist.desc": "", - "cobblemon.ability.vesselofruin": "", - "cobblemon.ability.vesselofruin.desc": "", - "cobblemon.ability.victorystar": "", - "cobblemon.ability.victorystar.desc": "", - "cobblemon.ability.vitalspirit": "", - "cobblemon.ability.vitalspirit.desc": "", - "cobblemon.ability.voltabsorb": "", - "cobblemon.ability.voltabsorb.desc": "", - "cobblemon.ability.wanderingspirit": "", - "cobblemon.ability.wanderingspirit.desc": "", - "cobblemon.ability.waterabsorb": "", - "cobblemon.ability.waterabsorb.desc": "", - "cobblemon.ability.waterbubble": "", - "cobblemon.ability.waterbubble.desc": "", - "cobblemon.ability.watercompaction": "", - "cobblemon.ability.watercompaction.desc": "", - "cobblemon.ability.waterveil": "", - "cobblemon.ability.waterveil.desc": "", - "cobblemon.ability.weakarmor": "", - "cobblemon.ability.weakarmor.desc": "", - "cobblemon.ability.wellbakedbody": "", - "cobblemon.ability.wellbakedbody.desc": "", - "cobblemon.ability.whitesmoke": "", - "cobblemon.ability.whitesmoke.desc": "", - "cobblemon.ability.wimpout": "", - "cobblemon.ability.wimpout.desc": "", - "cobblemon.ability.windpower": "", - "cobblemon.ability.windpower.desc": "", - "cobblemon.ability.windrider": "", - "cobblemon.ability.windrider.desc": "", - "cobblemon.ability.wonderguard": "", - "cobblemon.ability.wonderguard.desc": "", - "cobblemon.ability.wonderskin": "", - "cobblemon.ability.wonderskin.desc": "", - "cobblemon.ability.zenmode": "", - "cobblemon.ability.zenmode.desc": "", - "cobblemon.ability.zerotohero": "", - "cobblemon.ability.zerotohero.desc": "" -} +{} From 793f059f3cd8a06b113bc43088bc60194bd639f4 Mon Sep 17 00:00:00 2001 From: Patch Notes Guy Date: Fri, 27 Dec 2024 22:42:29 +0000 Subject: [PATCH 003/121] Deleted translation using Weblate (Vietnamese) --- common/src/main/resources/assets/cobblemon/lang/vi.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 common/src/main/resources/assets/cobblemon/lang/vi.json diff --git a/common/src/main/resources/assets/cobblemon/lang/vi.json b/common/src/main/resources/assets/cobblemon/lang/vi.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/common/src/main/resources/assets/cobblemon/lang/vi.json +++ /dev/null @@ -1 +0,0 @@ -{} From eaec3612aaac83a783ab392e4423d23ba6f1b227 Mon Sep 17 00:00:00 2001 From: Polymeta Date: Sun, 29 Dec 2024 22:34:12 +0000 Subject: [PATCH 004/121] Translated using Weblate (German) Currently translated at 98.6% (6306 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/de/ --- .../assets/cobblemon/lang/de_de.json | 84 ++++++++++++++++++- 1 file changed, 80 insertions(+), 4 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/de_de.json b/common/src/main/resources/assets/cobblemon/lang/de_de.json index 1a4200828e..9e9282c4eb 100644 --- a/common/src/main/resources/assets/cobblemon/lang/de_de.json +++ b/common/src/main/resources/assets/cobblemon/lang/de_de.json @@ -553,7 +553,7 @@ "cobblemon.ui.pokemon": "Pokémon", "cobblemon.ui.exit": "Verlassen", "cobblemon.ui.pc.box.title": "Box %1$s", - "cobblemon.ui.pc.release": "Version", + "cobblemon.ui.pc.release": "Freilassen", "cobblemon.ui.pasture": "Weide", "cobblemon.ui.pasture.recall_all": "Alle Zurückrufen", "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)", @@ -5588,7 +5588,7 @@ "block.cobblemon.smooth_tumblestone": "Glatter Glanzstein", "item.cobblemon.smithing_template.pokerod.base_slot_description": "Angel hinzufügen", "item.cobblemon.smithing_template.pokerod.additions_slot_description": "Pokéball hinzufügen", - "upgrade.cobblemon.pokerod": "Schmiedevorlage", + "upgrade.cobblemon.pokerod": "Poké Angel Upgrade", "item.cobblemon.pokerod_smithing_template": "Schmiedevorlage", "item.cobblemon.pokedex_blue": "Pokédex", "item.cobblemon.pokedex_pink": "Pokédex", @@ -5819,7 +5819,7 @@ "cobblemon.move.gmaxvoltcrash": "Giga-Blitzhagel", "cobblemon.move.headlongrush": "Schmetterramme", "cobblemon.move.headlongrush.desc": "Der Anwender rammt das Ziel mit dem ganzen Körper. Dadurch sinken die Verteidigung und Spezial-Verteidigung des Anwenders.", - "cobblemon.move.hydrosteam": "Hydro Steam", + "cobblemon.move.hydrosteam": "Hydrodampf", "cobblemon.move.hydrosteam.desc": "Das Ziel wird kraftvoll mit brodelndem Wasser übergossen. Wider Erwarten sinkt die Stärke der Attacke bei starkem Sonnenlicht nicht, sondern steigt um 50 %.", "cobblemon.move.hydrovortex": "Super-Wassertornado", "cobblemon.move.hydrovortex.desc": "Der Anwender kreiert mit Z-Kraft einen riesigen Wasserstrudel, der das Ziel verschluckt. Die Stärke variiert je nach zugrunde liegender Attacke.", @@ -6233,5 +6233,81 @@ "cobblemon.ability.embodyaspectcornerstone": "Erinnerungskraft - Fundamentmaske", "cobblemon.ability.embodyaspecthearthflame": "Erinnerungskraft - Ofenmaske", "cobblemon.ability.embodyaspectteal": "Erinnerungskraft - Türkisgrüne Maske", - "cobblemon.ability.embodyaspectwellspring": "Erinnerungskraft - Brunnenmaske" + "cobblemon.ability.embodyaspectwellspring": "Erinnerungskraft - Brunnenmaske", + "cobblemon.challenge.multi.team_request.accept.sender": "Du hast %1$ss Einladung angenommen!", + "key.cobblemon.pokedex": "Öffne Pokédex", + "cobblemon.challenge.multi.team_reject.existing_team": "Du bist schon teil eines Teams!", + "cobblemon.challenge.multi.decline.receiver": "%1$s hat die Herausforderung abgelehnt...", + "cobblemon.challenge.decline.sender": "Du hast %1$s's Herausforderung abgelehnt...", + "cobblemon.ui.pokenav.narrator.backbutton": "PokéNav Knopf gedrückt", + "cobblemon.fishing_bait_effect_header": "Fisch Köder Effekte:", + "cobblemon.fishing_bait_effects.iv.tooltip": "%1$s%% - %2$s IV +%3$s", + "cobblemon.fishing_bait_effects.pokemon_chance.tooltip": "%1$s%% - Ziehe das Pokémon ran", + "cobblemon.ui.interact.team_leave": "Team verlassen", + "cobblemon.ui.pokedex.region.national": "National", + "cobblemon.ui.pokedex.info.drops": "Beute", + "cobblemon.ui.pokedex.info.drops_range": "%1$s-%2$s×", + "cobblemon.ui.pokedex.info.drops_percentage": "%1$s%%", + "cobblemon.ui.pokedex.info.drops_empty": "Keine Beute verfügbar.", + "cobblemon.ui.pokedex.info.variation": "Arten", + "cobblemon.ui.pokedex.info.form.maushold-family-four": "Familie", + "cobblemon.ui.starter.narrator.backbutton": "Zurück-Knopf gedrückt", + "cobblemon.pokerod.bobber": "Schimmer: %1$s", + "cobblemon.pokerod.bait": "Köder: %1$s x%2$s", + "block.cobblemon.lectern": "Pult", + "cobblemon.fishing_bait_effects.level_raise.tooltip": "%1$s%% - Erhöhe Level +%3$s", + "cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "%1$sx - %3$sx Shiny Chance", + "entity.minecraft.villager.cobblemon.nurse": "Schwester", + "cobblemon.fishing_bait_effects.friendship.tooltip": "%1$s%% - Erhöht Freundschaft +%3$s", + "cobblemon.ui.stash.gold": "Münzlager", + "cobblemon.ui.interact.accept": "Akzeptieren", + "cobblemon.ui.interact.decline": "Ablehnen", + "cobblemon.ui.interact.team_request": "Zusammenschließen", + "cobblemon.ui.interact.too_far": "Das Ziel ist zu weit entfernt", + "cobblemon.ui.pokedex.scan.registered_suffix": "%1$s registriert", + "cobblemon.ui.pokedex.scan.trainer_owned": "Trainerbesitz", + "cobblemon.ui.pokedex.info.drops_display": "%1$s %2$s", + "cobblemon.ui.pokedex.info.drops_amount": "%1$s×", + "cobblemon.ui.pokedex.info.form.mooshtank-red": "Rotes Pilztank", + "cobblemon.ui.pokedex.info.form.mooshtank-brown": "Braunes Pilztank", + "cobblemon.ui.pokedex.info.unimplemented": "(Noch) Nicht in Cobblemon", + "cobblemon.ui.pokedex.search": "Suche", + "cobblemon.pokedex.variation.size": "Größe", + "cobblemon.pokedex.variation.wood": "Holz", + "cobblemon.battle.ui.forfeit_confirmation": "Wenn du aufgibst, verlierst du den Kampf. Bist du dir sicher?", + "cobblemon.challenge.pending": "Du hast eine ausstehende Herausforderung von %1$s!", + "cobblemon.challenge.rule.anything_goes": "Alles ist erlaubt", + "cobblemon.challenge.request_team_join_title": "Einladung", + "cobblemon.challenge.request_team_leave_title": "Verlasse das Team", + "cobblemon.challenge.multi.team_request.sender": "Du hast %1$s dazu eingeladen mit dir einen Multikampf zu bestreiten!", + "cobblemon.challenge.multi.team_request.receiver": "%1$s hat dich zu einen Multikampf Team eingeladen!", + "cobblemon.challenge.multi.team_request.accept.receiver": "%1$s hat deine Einladung akzeptiert!", + "cobblemon.challenge.multi.team_request.decline.sender": "Du hast %1$ss Einladung abgelehnt!", + "cobblemon.challenge.multi.team_request.decline.receiver": "%1$s hat deine Einladung abgelehnt!", + "cobblemon.challenge.multi.team_remove.receiver": "%1$s hat das Team verlassen!", + "cobblemon.challenge.multi.team_remove.sender": "Du hast das Team verlassen!", + "cobblemon.challenge.multi.team_disband": "Das Team wurde aufgelöst.", + "cobblemon.challenge.multi.team_reject.max_team_size": "Das Team ist bereits voll", + "cobblemon.challenge.multi.sender": "Du hast %1$s (%2$s Mitglieder) zu einen Multikampf herausgefordert!", + "cobblemon.challenge.multi.receiver": "%1$s (%2$s Mitglieder) hat dich zu einen Multikampf herausgefordert!", + "cobblemon.challenge.multi.decline.disband": "Das generische Team wurde aufgelöst, Multikampf abgebrochen...", + "cobblemon.challenge.multi.decline.sender": "%1$s hat %2$s's Multikampf Herausforderung abgelehnt...", + "cobblemon.challenge.multi.decline.sender.personal": "Du hast %1$s's Multikampf Herausforderung abgelehnt...", + "cobblemon.challenge.decline.receiver": "%1$s hat deine Herausforderung abgelehnt...", + "cobblemon.command.freezepokemon.non_pokemon": "Du musst auf ein Pokémon zielen.", + "advancements.cobblemon.craft_rod": "Angeln geh'n", + "cobblemon.battle.types.singles": "Einzelkampf", + "cobblemon.battle.types.doubles": "Doppelkampf", + "cobblemon.battle.types.triples": "Dreierkampf", + "cobblemon.battle.types.multi": "Multikampf", + "cobblemon.battle.select_target": "Ziel auswählen", + "cobblemon.battle.error.player_distance": "%1$s ist zu weit weg von der Gruppe um den Kampf zu beginnen!", + "cobblemon.battle.error.player_different_dimension": "Nicht alle Teilnehmer sind in der gleichen Dimension.", + "cobblemon.battle.error.incorrect_player_count": "Es sind %1$s Spieler anwesend wenn %2%s benötigt werden.", + "cobblemon.battle.switch.self": "Los! %1$s!", + "cobblemon.battle.withdraw.self": "%1$s, komm zurück!", + "cobblemon.type.suffix": "%1$s Typ", + "gamerule.battleInvulnerability": "Kampf Unverwundbarkeit", + "tag.item.cobblemon.poke_rods": "Poké Angeln", + "entity.cobblemon.empty_pokeball": "Leerer Pokéball" } From 2b26e47876aa49b46fd72a368ddeaab550004a22 Mon Sep 17 00:00:00 2001 From: Polymeta Date: Mon, 30 Dec 2024 16:33:34 +0000 Subject: [PATCH 005/121] Translated using Weblate (German) Currently translated at 98.7% (6313 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/de/ --- .../main/resources/assets/cobblemon/lang/de_de.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/de_de.json b/common/src/main/resources/assets/cobblemon/lang/de_de.json index 9e9282c4eb..90464106e6 100644 --- a/common/src/main/resources/assets/cobblemon/lang/de_de.json +++ b/common/src/main/resources/assets/cobblemon/lang/de_de.json @@ -6252,7 +6252,7 @@ "cobblemon.ui.pokedex.info.variation": "Arten", "cobblemon.ui.pokedex.info.form.maushold-family-four": "Familie", "cobblemon.ui.starter.narrator.backbutton": "Zurück-Knopf gedrückt", - "cobblemon.pokerod.bobber": "Schimmer: %1$s", + "cobblemon.pokerod.bobber": "Schwimmer: %1$s", "cobblemon.pokerod.bait": "Köder: %1$s x%2$s", "block.cobblemon.lectern": "Pult", "cobblemon.fishing_bait_effects.level_raise.tooltip": "%1$s%% - Erhöhe Level +%3$s", @@ -6309,5 +6309,12 @@ "cobblemon.type.suffix": "%1$s Typ", "gamerule.battleInvulnerability": "Kampf Unverwundbarkeit", "tag.item.cobblemon.poke_rods": "Poké Angeln", - "entity.cobblemon.empty_pokeball": "Leerer Pokéball" + "entity.cobblemon.empty_pokeball": "Leerer Pokéball", + "cobblemon.ui.pokedex.info.form.galar": "Galar", + "cobblemon.ui.pokedex.info.form.region-bias-galar": "Galar-Einfluss", + "cobblemon.ui.pokedex.info.form.region-bias-alola": "Alola-Einfluss", + "cobblemon.ui.pokedex.info.form.hisui": "Hisui", + "cobblemon.ui.pokedex.info.form.region-bias-hisui": "Hisui-Einfluss", + "cobblemon.ui.pokedex.info.form.region-bias-paldea": "Paldea-Einfluss", + "cobblemon.ui.pokedex.info.form.no_ice": "Wohlfühlkopf" } From 38e699aa443175b2bbd42aa122b895e24bd41c8d Mon Sep 17 00:00:00 2001 From: Ezequiel Neri Ferreira Date: Tue, 31 Dec 2024 23:21:33 +0000 Subject: [PATCH 006/121] Translated using Weblate (Portuguese (Brazil)) Currently translated at 35.0% (2241 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/ --- .../assets/cobblemon/lang/pt_br.json | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/pt_br.json b/common/src/main/resources/assets/cobblemon/lang/pt_br.json index 10d7b549d1..70b4bf1ea7 100644 --- a/common/src/main/resources/assets/cobblemon/lang/pt_br.json +++ b/common/src/main/resources/assets/cobblemon/lang/pt_br.json @@ -1571,16 +1571,16 @@ "block.cobblemon.red_apricorn": "Apricorn Vermelha", "block.cobblemon.white_apricorn": "Apricorn Branca", "block.cobblemon.yellow_apricorn": "Apricorn Amarela", - "block.cobblemon.polished_tumblestone_slab": "Laje de Tumblestone Polida", - "block.cobblemon.polished_tumblestone_stairs": "Escadas de Tumblestone Polidas", - "block.cobblemon.polished_tumblestone_wall": "Muro de Tumblestone Polida", - "block.cobblemon.tumblestone_bricks": "Tijolos de Tumblestone", - "block.cobblemon.tumblestone_brick_slab": "Laje de Tijolos de Tumblestone", - "block.cobblemon.tumblestone_brick_wall": "Muro de Tijolos de Tumblestone", - "block.cobblemon.chiseled_tumblestone_bricks": "Tijolos de Tumblestone Talhados", - "block.cobblemon.smooth_tumblestone": "Tumblestone Lisa", - "block.cobblemon.smooth_tumblestone_slab": "Laje de Tumblestone Lisa", - "block.cobblemon.smooth_tumblestone_stairs": "Escadas de Tumblestone Lisa", + "block.cobblemon.polished_tumblestone_slab": "Laje de Jaspe Polida", + "block.cobblemon.polished_tumblestone_stairs": "Escadas de Jaspe Polida", + "block.cobblemon.polished_tumblestone_wall": "Muro de Jaspe Polida", + "block.cobblemon.tumblestone_bricks": "Tijolos de Jaspe", + "block.cobblemon.tumblestone_brick_slab": "Laje de Tijolos de Jaspe", + "block.cobblemon.tumblestone_brick_wall": "Muro de Tijolos de Jaspe", + "block.cobblemon.chiseled_tumblestone_bricks": "Tijolos de Jaspe Talhados", + "block.cobblemon.smooth_tumblestone": "Jaspe Lisa", + "block.cobblemon.smooth_tumblestone_slab": "Laje de Jaspe Lisa", + "block.cobblemon.smooth_tumblestone_stairs": "Escadas de Jaspe Lisa", "block.cobblemon.polished_sky_tumblestone_stairs": "Escadas de Tumblestone Celeste Polidas", "block.cobblemon.polished_sky_tumblestone_wall": "Muro de Tumblestone Celeste Polida", "block.cobblemon.chiseled_polished_sky_tumblestone": "Tumblestone Celeste Polida Talhada", @@ -1889,7 +1889,7 @@ "cobblemon.species.persian.desc": "Seu comportamento elegante e refinado entra em conflito com o comportamento barbárico de Perrserker. A relação entre os dois é de desprezo mútuo.", "cobblemon.species.weepinbell.name": "Weepinbell", "item.cobblemon.grassy_seed": "Semente Gramínea", - "block.cobblemon.tumblestone_brick_stairs": "Escadas de Tijolos de Tumblestone", + "block.cobblemon.tumblestone_brick_stairs": "Escadas de Tijolos de Jaspe", "block.cobblemon.polished_sky_tumblestone_slab": "Laje de Tumblestone Celeste Polida", "block.cobblemon.sun_stone_block": "Bloco de Pedra do Sol", "cobblemon.ui.pokedex.info.form.netherite-coating-stage4": "4/8 de Revestimento de Netherita", @@ -1897,8 +1897,8 @@ "item.cobblemon.pokedex_blue": "Pokédex", "cobblemon.ui.interact.decline": "Negar", "block.cobblemon.blue_apricorn": "Apricorn Azul", - "block.cobblemon.chiseled_polished_tumblestone": "Tumblestone Polida Talhada", - "block.cobblemon.polished_tumblestone": "Tumblestone Polida", + "block.cobblemon.chiseled_polished_tumblestone": "Jaspe Polida Talhada", + "block.cobblemon.polished_tumblestone": "Jaspe Polida", "cobblemon.ui.interact.accept": "Aceitar", "cobblemon.ui.interact.failed": "Alvo está obstruído ou longe demais.", "cobblemon.ui.pokedex.region.sinnoh": "Sinnoh", @@ -2543,5 +2543,18 @@ "cobblemon.species.nosepass.desc": "Quando as pessoas de Hisui descobriram que seu grande nariz sempre aponta para o norte, aproveitaram muito Nosepass em suas viagens. O nariz parece funcionar de forma parecida com bússolas antigas.", "cobblemon.species.silcoon.name": "Silcoon", "cobblemon.species.skitty.name": "Skitty", - "cobblemon.species.roselia.desc": "Apesar de linda, tem espinhos muito venenosos. Há uma antiga tradição em minha terra natal onde alguém pode enviar esses espinhos para um oponente para desafiá-los para um duelo." + "cobblemon.species.roselia.desc": "Apesar de linda, tem espinhos muito venenosos. Há uma antiga tradição em minha terra natal onde alguém pode enviar esses espinhos para um oponente para desafiá-los para um duelo.", + "block.cobblemon.polished_black_tumblestone": "Jaspe Escura Polida", + "block.cobblemon.polished_black_tumblestone_slab": "Laje de Jaspe Escura Polida", + "block.cobblemon.polished_black_tumblestone_stairs": "Escadas de Jaspe Escura Polida", + "block.cobblemon.polished_black_tumblestone_wall": "Muro de Jaspe Escura Polida", + "block.cobblemon.chiseled_polished_black_tumblestone": "Jaspe Escura Polida Talhada", + "block.cobblemon.black_tumblestone_bricks": "Tijolos de Jaspe Escura", + "block.cobblemon.black_tumblestone_brick_slab": "Laje de Tijolos de Jaspe Escura", + "block.cobblemon.black_tumblestone_brick_stairs": "Escadas de Tijolos de Jaspe Escura", + "block.cobblemon.black_tumblestone_brick_wall": "Muro de Tijolos de Jaspe Escura", + "block.cobblemon.chiseled_black_tumblestone_bricks": "Tijolos de Jaspe Escura Talhados", + "block.cobblemon.smooth_black_tumblestone": "Jaspe Escura Lisa", + "block.cobblemon.smooth_black_tumblestone_slab": "Laje de Jaspe Escura Lisa", + "block.cobblemon.smooth_black_tumblestone_stairs": "Escadas de Jaspe Escura Lisa" } From 47e49993ad1cf3007173692fd96122ae2916cd52 Mon Sep 17 00:00:00 2001 From: Nico Merenq Date: Wed, 1 Jan 2025 22:24:04 +0000 Subject: [PATCH 007/121] Translated using Weblate (Russian) Currently translated at 82.3% (5262 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ru/ --- .../assets/cobblemon/lang/ru_ru.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json index 2e758247ac..f221e38bd7 100644 --- a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json +++ b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json @@ -6000,35 +6000,35 @@ "cobblemon.ability.voltabsorb": "Поглощение вольт", "cobblemon.ability.voltabsorb.desc": "Restores HP if hit by an Electric-type move instead of taking damage.", "cobblemon.ability.wanderingspirit": "Блуждающий дух", - "cobblemon.ability.wanderingspirit.desc": "The Pokémon exchanges Abilities with a Pokémon that hits it with a move that makes direct contact.", + "cobblemon.ability.wanderingspirit.desc": "Покемон обменивается способностями с врагом, который наносит ему удар, создающий прямой контакт.", "cobblemon.ability.waterabsorb": "Поглощение воды", - "cobblemon.ability.waterabsorb.desc": "Restores HP if hit by a Water-type move instead of taking damage.", + "cobblemon.ability.waterabsorb.desc": "Заместо получения урона, Покемон восстанавливает ОЗ, если его ударяют атакой Водного типа.", "cobblemon.ability.waterbubble": "Водяной пузырь", - "cobblemon.ability.waterbubble.desc": "Lowers the power of Fire-type moves done to the Pokémon and prevents the Pokémon from getting a burn.", + "cobblemon.ability.waterbubble.desc": "Снижает получаемый урон от атак Огненного типа и предотвращает ожоги.", "cobblemon.ability.watercompaction": "Уплотнение водой", - "cobblemon.ability.watercompaction.desc": "Boosts the Pokémon’s Defense stat sharply when hit by a Water-type move.", + "cobblemon.ability.watercompaction.desc": "Резко увеличивает Защиту, когда Покемона ударяют атакой Водного типа.", "cobblemon.ability.waterveil": "Водяное покрытие", - "cobblemon.ability.waterveil.desc": "The Pokémon is covered with a water veil, which prevents the Pokémon from getting a burn.", + "cobblemon.ability.waterveil.desc": "Водяное покрытие Покемона не даёт ему обжечься.", "cobblemon.ability.weakarmor": "Хрупкая броня", - "cobblemon.ability.weakarmor.desc": "Physical attacks to the Pokémon lower its Defense stat but sharply raise its Speed stat.", + "cobblemon.ability.weakarmor.desc": "Защита Покемона понижается, когда он получает урон от физических атак, но взамен его Скорость резко повышается.", "cobblemon.ability.wellbakedbody": "Пропечённое тело", - "cobblemon.ability.wellbakedbody.desc": "This Pokemon is immune to Fire-type moves and raises its Defense by 2 stages when hit by a Fire-type move.", + "cobblemon.ability.wellbakedbody.desc": "Покемон не получает урона от атак Огненного типа. Вместо этого его Защита резко повышается.", "cobblemon.ability.whitesmoke": "Белый дым", - "cobblemon.ability.whitesmoke.desc": "The Pokémon is protected by its white smoke, which prevents other Pokémon from lowering its stats.", + "cobblemon.ability.whitesmoke.desc": "Покемон защищён белым дымом, который не позволяет другим Покемонам понижать его характеристики.", "cobblemon.ability.wimpout": "Трус", - "cobblemon.ability.wimpout.desc": "The Pokémon cowardly switches out when its HP becomes half or less.", + "cobblemon.ability.wimpout.desc": "Покемон трусливо отступает, когда его ОЗ равно 1/2 или меньше.", "cobblemon.ability.windpower": "Сила ветра", - "cobblemon.ability.windpower.desc": "This Pokemon gains the Charge effect when it takes a hit from a wind move or when Tailwind begins on this Pokemon's side.", + "cobblemon.ability.windpower.desc": "Покемон становится заряженным, когда его атакуют ветряной атакой. Это увеличивает силу следующей атаки Электрического типа, которую использует Покемон.", "cobblemon.ability.windrider": "Ветряной наездник", - "cobblemon.ability.windrider.desc": "This Pokemon is immune to wind moves and raises its Attack by 1 stage when hit by a wind move or when Tailwind begins on this Pokemon's side.", + "cobblemon.ability.windrider.desc": "Повышает Атаку Покемона, если срабатывает Попутный ветер, или если Покемона атакуют ветряной атакой. Покемон также не получает урон от ветра.", "cobblemon.ability.wonderguard": "Причудливая защита", - "cobblemon.ability.wonderguard.desc": "Its mysterious power only lets supereffective moves hit the Pokémon.", + "cobblemon.ability.wonderguard.desc": "Её таинственная сила позволяет получать урон только от суперэффективных атак.", "cobblemon.ability.wonderskin": "Причудливая кожа", - "cobblemon.ability.wonderskin.desc": "Makes status moves more likely to miss.", + "cobblemon.ability.wonderskin.desc": "Увеличивает шанс того, что вражеские статусные атаки промахнутся.", "cobblemon.ability.zenmode": "Режим дзен", - "cobblemon.ability.zenmode.desc": "Changes the Pokémon’s shape when HP is half or less.", + "cobblemon.ability.zenmode.desc": "Изменяет форму Покемона, когда его ОЗ равно 1/2 или меньше.", "cobblemon.ability.zerotohero": "Стать героем", - "cobblemon.ability.zerotohero.desc": "If this Pokemon is a Palafin in Zero Form, switching out has it change to Hero Form.", + "cobblemon.ability.zerotohero.desc": "При смене Покемон трансформируется в форму героя.", "item.cobblemon.smithing_template.pokerod.additions_slot_description": "Добавить покеболл", "item.cobblemon.smithing_template.pokerod.ingredients": "Покеболлы", "item.cobblemon.smithing_template.pokerod.base_slot_description": "Добавить удочку" From ba17f0d35f30825d1b43f081a5d6109090c96d59 Mon Sep 17 00:00:00 2001 From: Nico Merenq Date: Thu, 2 Jan 2025 23:29:37 +0000 Subject: [PATCH 008/121] Translated using Weblate (Russian) Currently translated at 82.3% (5262 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ru/ --- .../assets/cobblemon/lang/ru_ru.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json index f221e38bd7..ad8c1f58a6 100644 --- a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json +++ b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json @@ -1,15 +1,15 @@ { - "item.cobblemon.poke_ball": "Покеболл", - "item.cobblemon.slate_ball": "Слейтболл", - "item.cobblemon.azure_ball": "Азурболл", - "item.cobblemon.verdant_ball": "Вердантболл", - "item.cobblemon.roseate_ball": "Розеатболл", - "item.cobblemon.citrine_ball": "Цитринболл", - "item.cobblemon.great_ball": "Грейтболл", - "item.cobblemon.ultra_ball": "Ультраболл", - "item.cobblemon.master_ball": "Мастерболл", - "item.cobblemon.safari_ball": "Сафариболл", - "item.cobblemon.fast_ball": "Фастболл", + "item.cobblemon.poke_ball": "Покебол", + "item.cobblemon.slate_ball": "Слейтбол", + "item.cobblemon.azure_ball": "Азурбол", + "item.cobblemon.verdant_ball": "Вердантбол", + "item.cobblemon.roseate_ball": "Розеатбол", + "item.cobblemon.citrine_ball": "Цитринбол", + "item.cobblemon.great_ball": "Грейтбол", + "item.cobblemon.ultra_ball": "Ультрабол", + "item.cobblemon.master_ball": "Мастербол", + "item.cobblemon.safari_ball": "Сафарибол", + "item.cobblemon.fast_ball": "Фастбол", "item.cobblemon.level_ball": "Левелболл", "item.cobblemon.lure_ball": "Люрболл", "item.cobblemon.heavy_ball": "Хевиболл", From 995ad493364a43858786386a96bbc5a3cf70e535 Mon Sep 17 00:00:00 2001 From: Nico Merenq Date: Fri, 3 Jan 2025 11:35:47 +0000 Subject: [PATCH 009/121] Translated using Weblate (Russian) Currently translated at 82.3% (5262 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ru/ --- .../resources/assets/cobblemon/lang/ru_ru.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json index ad8c1f58a6..96c340d290 100644 --- a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json +++ b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json @@ -10,14 +10,14 @@ "item.cobblemon.master_ball": "Мастербол", "item.cobblemon.safari_ball": "Сафарибол", "item.cobblemon.fast_ball": "Фастбол", - "item.cobblemon.level_ball": "Левелболл", - "item.cobblemon.lure_ball": "Люрболл", - "item.cobblemon.heavy_ball": "Хевиболл", - "item.cobblemon.love_ball": "Лавболл", - "item.cobblemon.friend_ball": "Френдболл", - "item.cobblemon.moon_ball": "Мунболл", - "item.cobblemon.sport_ball": "Спортболл", - "item.cobblemon.net_ball": "Нетболл", + "item.cobblemon.level_ball": "Левелбол", + "item.cobblemon.lure_ball": "Люрбол", + "item.cobblemon.heavy_ball": "Хевибол", + "item.cobblemon.love_ball": "Лавбол", + "item.cobblemon.friend_ball": "Френдбол", + "item.cobblemon.moon_ball": "Мунбол", + "item.cobblemon.sport_ball": "Спортбол", + "item.cobblemon.net_ball": "Нетбол", "item.cobblemon.dive_ball": "Дайвболл", "item.cobblemon.nest_ball": "Нестболл", "item.cobblemon.repeat_ball": "Рипитболл", From bc49537e16c61b717e03261287f1cd92eae0c9ef Mon Sep 17 00:00:00 2001 From: Teggy Date: Fri, 3 Jan 2025 13:12:20 +0000 Subject: [PATCH 010/121] Translated using Weblate (Spanish) Currently translated at 98.7% (6309 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/es/ --- .../assets/cobblemon/lang/es_es.json | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/es_es.json b/common/src/main/resources/assets/cobblemon/lang/es_es.json index d6c7fe4268..c93a2d18a9 100644 --- a/common/src/main/resources/assets/cobblemon/lang/es_es.json +++ b/common/src/main/resources/assets/cobblemon/lang/es_es.json @@ -5482,7 +5482,7 @@ "item.cobblemon.smithing_template.pokerod.additions_slot_description": "Añadir Poké Ball", "item.cobblemon.poke_rod": "Poké Caña", "item.cobblemon.pokerod_smithing_template": "Molde de herrería", - "item.cobblemon.smithing_template.pokerod.base_slot_description": "Añadir Poké Caña", + "item.cobblemon.smithing_template.pokerod.base_slot_description": "Añadir caña de pescar", "upgrade.cobblemon.pokerod": "Mejora de Poke Caña", "cobblemon.pokerod.bobber": "Corcho: %1$s", "cobblemon.pokerod.bait": "Cebo: %1$s x%2$s", @@ -6269,5 +6269,47 @@ "cobblemon.battle.end.neutralizinggas": "El gas reactivo se ha disipado.", "cobblemon.battle.cant.nopp": "¡A %1$s no le quedan más PP para ejecutar %2$s!", "cobblemon.battle.enditem.ejectpack": "¡%1$s regresa gracias a la Mochila Escape!", - "cobblemon.battle.start.flashfire": "¡La potencia de los movimientos de tipo Fuego de %1$s ha aumentado!" + "cobblemon.battle.start.flashfire": "¡La potencia de los movimientos de tipo Fuego de %1$s ha aumentado!", + "cobblemon.fishing_bait_effects.friendship.tooltip": "%1$s%% - Aumenta amistad +%3$s", + "cobblemon.ui.pokenav.narrator.backbutton": "Botón del PokéNav pulsado", + "cobblemon.tooltip.see_more_info": "Mantén mayús para más información", + "cobblemon.item_class.fishing_bait": "Cebo de pesca", + "cobblemon.fishing_bait_effects.ha_chance.tooltip": "%1$s%% - Atrae habilidad oculta", + "cobblemon.fishing_bait_effects.iv.tooltip": "%1$s%% - IV %2$s +%3$s", + "cobblemon.fishing_bait_effects.pokemon_chance.tooltip": "%1$s%% - Saca un Pokémon del agua", + "cobblemon.fishing_bait_effects.ev.tooltip": "%1$s%% - Atrae ganar EV %2$s", + "cobblemon.fishing_bait_effects.nature.tooltip": "%1$s%% - Atrae naturaleza %2$s", + "cobblemon.fishing_bait_effects.bite_time.tooltip": "%1$s%% - Reduce tiempo de mordida %3$s%%", + "cobblemon.fishing_bait_effects.gender_chance.tooltip": "%1$s%% - Atrae género %2$s", + "cobblemon.fishing_bait_effects.level_raise.tooltip": "%1$s%% - Aumenta nivel +%3$s", + "cobblemon.fishing_bait_effects.tera.tooltip": "%1$s%% - Atrae teratipo %2$s", + "cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "%1$sx - Probabilidad variocolor %3$sx", + "cobblemon.fishing_bait_effects.inert.tooltip": "Sin efecto conocido", + "cobblemon.ui.starter.narrator.backbutton": "Botón volver presionado", + "cobblemon.ui.moves.forget": "Olvidar movimiento", + "cobblemon.ui.pokedex.scan.registered_suffix": "%1$s registrado", + "cobblemon.ui.pokedex.scan.trainer_owned": "Propiedad de un Entrenador", + "cobblemon.ui.interact.unavailable": "El objetivo no está disponible para esa acción.", + "cobblemon.ui.interact.accept": "Aceptar", + "cobblemon.ui.interact.decline": "Rechazar", + "cobblemon.ui.interact.too_far": "El objetivo está demasiado lejos", + "cobblemon.ui.interact.failed": "El objetivo no es accesible o está demasiado lejos.", + "cobblemon.ui.interact.team_request": "Formar equipo", + "cobblemon.ui.interact.team_leave": "Abandonar equipo", + "cobblemon.ui.pokedex.info.form.no_ice": "Deshielo", + "cobblemon.ui.pokedex.info.form.roaming": "Andante", + "cobblemon.ui.pokedex.unknown": "(?)", + "cobblemon.ui.pokedex.search": "Buscar", + "cobblemon.ui.pokedex.info.unimplemented": "No implementado", + "cobblemon.ui.pokedex.info.form.vivillon-wings-void": "Abismal", + "cobblemon.ui.pokedex.info.form.valencian": "Regional de Isla Valencia", + "cobblemon.ui.pokedex.info.form.snake-pattern-dark": "Oscuro", + "cobblemon.ui.pokedex.info.form.snake-pattern-attack": "Ataque", + "cobblemon.ui.pokedex.info.form.snake-pattern-speed": "Velocidad", + "cobblemon.ui.pokedex.info.form.snake-pattern-legacy": "Legado", + "cobblemon.ui.pokedex.info.form.snake-pattern-sound": "Sonido", + "cobblemon.ui.pokedex.info.form.snake-pattern-heart": "Corazón", + "cobblemon.ui.pokedex.info.form.snake-pattern-elusive": "Evasión", + "cobblemon.ui.pokedex.info.form.shulker": "Shulker", + "cobblemon.battle.select_target": "Selecciona el objetivo" } From b2d56c339c0bfaafa267e907b902f31334a1135e Mon Sep 17 00:00:00 2001 From: Nico Merenq Date: Fri, 3 Jan 2025 12:59:58 +0000 Subject: [PATCH 011/121] Translated using Weblate (Russian) Currently translated at 82.5% (5273 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ru/ --- .../assets/cobblemon/lang/ru_ru.json | 104 ++++++++++-------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json index 96c340d290..86fcd99788 100644 --- a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json +++ b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json @@ -18,35 +18,35 @@ "item.cobblemon.moon_ball": "Мунбол", "item.cobblemon.sport_ball": "Спортбол", "item.cobblemon.net_ball": "Нетбол", - "item.cobblemon.dive_ball": "Дайвболл", - "item.cobblemon.nest_ball": "Нестболл", - "item.cobblemon.repeat_ball": "Рипитболл", - "item.cobblemon.timer_ball": "Таймерболл", - "item.cobblemon.luxury_ball": "Лакшериболл", - "item.cobblemon.premier_ball": "Премьерболл", - "item.cobblemon.dusk_ball": "Даскболл", - "item.cobblemon.heal_ball": "Хилболл", - "item.cobblemon.quick_ball": "Квикболл", - "item.cobblemon.cherish_ball": "Черишболл", - "item.cobblemon.park_ball": "Паркболл", - "item.cobblemon.dream_ball": "Дримболл", - "item.cobblemon.beast_ball": "Бистболл", - "item.cobblemon.ancient_poke_ball": "Древний покеболл", - "item.cobblemon.ancient_citrine_ball": "Древний цитринболл", - "item.cobblemon.ancient_verdant_ball": "Древний вердантболл", - "item.cobblemon.ancient_azure_ball": "Древний азурболл", - "item.cobblemon.ancient_roseate_ball": "Древний розеатболл", - "item.cobblemon.ancient_slate_ball": "Древний слейтболл", - "item.cobblemon.ancient_ivory_ball": "Древний айвориболл", - "item.cobblemon.ancient_great_ball": "Древний грейтболл", - "item.cobblemon.ancient_ultra_ball": "Древний ультраболл", - "item.cobblemon.ancient_heavy_ball": "Древний хевиболл", - "item.cobblemon.ancient_leaden_ball": "Древний лиденболл", - "item.cobblemon.ancient_gigaton_ball": "Древний гигатонболл", - "item.cobblemon.ancient_feather_ball": "Древний фезерболл", - "item.cobblemon.ancient_wing_ball": "Древний вингболл", - "item.cobblemon.ancient_jet_ball": "Древний джетболл", - "item.cobblemon.ancient_origin_ball": "Древний ориджинболл", + "item.cobblemon.dive_ball": "Дайвбол", + "item.cobblemon.nest_ball": "Нестбол", + "item.cobblemon.repeat_ball": "Рипитбол", + "item.cobblemon.timer_ball": "Таймербол", + "item.cobblemon.luxury_ball": "Лакшерибол", + "item.cobblemon.premier_ball": "Премьербол", + "item.cobblemon.dusk_ball": "Даскбол", + "item.cobblemon.heal_ball": "Хилбол", + "item.cobblemon.quick_ball": "Квикбол", + "item.cobblemon.cherish_ball": "Черишбол", + "item.cobblemon.park_ball": "Паркбол", + "item.cobblemon.dream_ball": "Дримбол", + "item.cobblemon.beast_ball": "Бистбол", + "item.cobblemon.ancient_poke_ball": "Древний покебол", + "item.cobblemon.ancient_citrine_ball": "Древний цитринбол", + "item.cobblemon.ancient_verdant_ball": "Древний вердантбол", + "item.cobblemon.ancient_azure_ball": "Древний азурбол", + "item.cobblemon.ancient_roseate_ball": "Древний розеатбол", + "item.cobblemon.ancient_slate_ball": "Древний слейтбол", + "item.cobblemon.ancient_ivory_ball": "Древний айворибол", + "item.cobblemon.ancient_great_ball": "Древний грейтбол", + "item.cobblemon.ancient_ultra_ball": "Древний ультрабол", + "item.cobblemon.ancient_heavy_ball": "Древний хевибол", + "item.cobblemon.ancient_leaden_ball": "Древний лиденбол", + "item.cobblemon.ancient_gigaton_ball": "Древний гигатонбол", + "item.cobblemon.ancient_feather_ball": "Древний фезербол", + "item.cobblemon.ancient_wing_ball": "Древний вингбол", + "item.cobblemon.ancient_jet_ball": "Древний джетбол", + "item.cobblemon.ancient_origin_ball": "Древний ориджинбол", "item.cobblemon.black_apricorn_seed": "Росток чёрного априкорна", "item.cobblemon.blue_apricorn_seed": "Росток синего априкорна", "item.cobblemon.green_apricorn_seed": "Росток зелёного априкорна", @@ -76,7 +76,7 @@ "item.cobblemon.electirizer": "Электиризатор", "item.cobblemon.magmarizer": "Магмаризатор", "item.cobblemon.oval_stone": "Овальный камень", - "item.cobblemon.protector": "Защита", + "item.cobblemon.protector": "Защитная пластина", "item.cobblemon.reaper_cloth": "Ткань жнеца", "item.cobblemon.prism_scale": "Призменная чешуя", "item.cobblemon.sachet": "Мешочек", @@ -126,11 +126,11 @@ "item.cobblemon.max_potion": "Макс. зелье", "item.cobblemon.full_restore": "Полное восстановление", "item.cobblemon.health_feather": "Перо здоровья", - "item.cobblemon.muscle_feather": "Мускульное перо", + "item.cobblemon.muscle_feather": "Перо мускулов", "item.cobblemon.resist_feather": "Перо сопротивления", "item.cobblemon.genius_feather": "Перо гения", - "item.cobblemon.clever_feather": "Умное перо", - "item.cobblemon.swift_feather": "Быстрое перо", + "item.cobblemon.clever_feather": "Перо ума", + "item.cobblemon.swift_feather": "Перо скорости", "item.cobblemon.ability_capsule": "Капсула способности", "item.cobblemon.ability_patch": "Пластырь способности", "item.cobblemon.red_mint_leaf": "Лист красной мяты", @@ -144,7 +144,7 @@ "item.cobblemon.green_mint_leaf": "Лист зелёной мяты", "item.cobblemon.green_mint_leaf.tooltip": "Может повлиять на Скорость Покемона", "item.cobblemon.white_mint_leaf": "Лист белой мяты", - "item.cobblemon.white_mint_leaf.tooltip": "Может нейтрализировать характер Покемона", + "item.cobblemon.white_mint_leaf.tooltip": "Может нейтрализовать характер Покемона", "item.cobblemon.lonely_mint": "Одинокая мята", "item.cobblemon.adamant_mint": "Упёртая мята", "item.cobblemon.naughty_mint": "Непослушная мята", @@ -176,7 +176,7 @@ "item.cobblemon.black_belt": "Чёрный пояс", "item.cobblemon.black_glasses": "Чёрные очки", "item.cobblemon.black_sludge": "Чёрная слизь", - "item.cobblemon.blunder_policy": "Страховка от ошибки", + "item.cobblemon.blunder_policy": "Страховка скорости", "item.cobblemon.cell_battery": "Батарейка", "item.cobblemon.charcoal_stick": "Палочка угля", "item.cobblemon.choice_band": "Повязка выбора", @@ -209,7 +209,7 @@ "item.cobblemon.luminous_moss": "Светящийся мох", "item.cobblemon.magnet": "Магнит", "item.cobblemon.metronome": "Метроном", - "item.cobblemon.miracle_seed": "Чудо-семя", + "item.cobblemon.miracle_seed": "Чудо-семечко", "item.cobblemon.muscle_band": "Мускульная повязка", "item.cobblemon.mystic_water": "Таинственная вода", "item.cobblemon.never_melt_ice": "Нетающий лёд", @@ -238,7 +238,7 @@ "item.cobblemon.throat_spray": "Спрей для горла", "item.cobblemon.twisted_spoon": "Изогнутая ложка", "item.cobblemon.utility_umbrella": "Прочный зонт", - "item.cobblemon.weakness_policy": "Страховка от слабости", + "item.cobblemon.weakness_policy": "Страховка слабости", "item.cobblemon.wide_lens": "Широкая лупа", "item.cobblemon.wise_glasses": "Очки мудрости", "item.cobblemon.zoom_lens": "Увеличивающая лупа", @@ -283,11 +283,11 @@ "item.cobblemon.friend_ball.tooltip": "Шанс поимки 1×. Пойманный Покемон начинает с дружбой, равной 150", "item.cobblemon.moon_ball.tooltip": "Шанс поимки от 1× до 4× в зависимости от того, насколько фаза луны близка к полнолунию", "item.cobblemon.sport_ball.tooltip": "Шанс поимки 1.5×", - "item.cobblemon.net_ball.tooltip": "Шанс поимки 3× на Покемонах Водяного или Насекомого типа", + "item.cobblemon.net_ball.tooltip": "Шанс поимки 3× на Покемонах Водного или Насекомого типа", "item.cobblemon.dive_ball.tooltip": "Шанс поимки 3.5× на Покемонах, которые погружены в воду", "item.cobblemon.nest_ball.tooltip": "Шанс поимки от 1× до 4× в зависимости от того, насколько уровень цели ниже 30", - "item.cobblemon.repeat_ball.tooltip": "Шанс поимки 1× (Пока не добавили Покедекс)", - "item.cobblemon.timer_ball.tooltip": "Шанс поимки от 1× до 4× в зависимости от количества прошедших ходов (Максимум 10)", + "item.cobblemon.repeat_ball.tooltip": "Шанс поимки 1× на Покемонах, которые зарегистрированы в Покедексе как \"пойманный\"", + "item.cobblemon.timer_ball.tooltip": "Шанс поимки от 1× до 4× в зависимости от количества прошедших ходов (максимум 10)", "item.cobblemon.luxury_ball.tooltip": "Шанс поимки 1×. Пойманные Покемоны получают дружбу в два раза быстрее", "item.cobblemon.premier_ball.tooltip": "Шанс поимки 1×", "item.cobblemon.dusk_ball.tooltip": "Шанс поимки 3×, если уровень света равен 0. Шанс поимки 1.5×, если уровень света равен 1-7", @@ -296,7 +296,7 @@ "item.cobblemon.cherish_ball.tooltip": "Шанс поимки 1×", "item.cobblemon.park_ball.tooltip": "Шанс поимки 2.5× во всех лесных или равнинных биомах", "item.cobblemon.dream_ball.tooltip": "Шанс поимки 4× на спящих Покемонах", - "item.cobblemon.beast_ball.tooltip": "Шанс поимки 5× на Ультра зверях. В ином случае шанс равен 0,1×", + "item.cobblemon.beast_ball.tooltip": "Шанс поимки 5× на Ультра зверях. В ином случае шанс равен 0.1×", "item.cobblemon.ancient_poke_ball.tooltip": "Шанс поимки 1×", "item.cobblemon.ancient_citrine_ball.tooltip": "Шанс поимки 1×", "item.cobblemon.ancient_verdant_ball.tooltip": "Шанс поимки 1×", @@ -6029,7 +6029,23 @@ "cobblemon.ability.zenmode.desc": "Изменяет форму Покемона, когда его ОЗ равно 1/2 или меньше.", "cobblemon.ability.zerotohero": "Стать героем", "cobblemon.ability.zerotohero.desc": "При смене Покемон трансформируется в форму героя.", - "item.cobblemon.smithing_template.pokerod.additions_slot_description": "Добавить покеболл", - "item.cobblemon.smithing_template.pokerod.ingredients": "Покеболлы", - "item.cobblemon.smithing_template.pokerod.base_slot_description": "Добавить удочку" + "item.cobblemon.smithing_template.pokerod.additions_slot_description": "Добавить покебол", + "item.cobblemon.smithing_template.pokerod.ingredients": "Покеболы", + "item.cobblemon.smithing_template.pokerod.base_slot_description": "Добавить удочку", + "item.cobblemon.pokerod_smithing_template": "Кузнечный шаблон", + "upgrade.cobblemon.pokerod": "Улучшение для покеудочки", + "item.cobblemon.poke_rod": "Покеудочка", + "item.cobblemon.grassy_seed": "Травяное семечко", + "cobblemon.pokerod.bobber": "Поплавок: %1$s", + "cobblemon.pokerod.bait": "Насадка: %1$s", + "item.cobblemon.pokedex_black": "Покедекс", + "item.cobblemon.pokedex_blue": "Покедекс", + "item.cobblemon.pokedex_green": "Покедекс", + "item.cobblemon.pokedex_pink": "Покедекс", + "item.cobblemon.pokedex_red": "Покедекс", + "item.cobblemon.pokedex_white": "Покедекс", + "item.cobblemon.pokedex_yellow": "Покедекс", + "item.cobblemon.electric_seed": "Электрическое семечко", + "item.cobblemon.misty_seed": "Туманное семечко", + "item.cobblemon.psychic_seed": "Психическое семечко" } From 8dc3eaafc74964994ded7e610b5e68c3b47d26d8 Mon Sep 17 00:00:00 2001 From: Teggy Date: Fri, 3 Jan 2025 19:10:14 +0000 Subject: [PATCH 012/121] Translated using Weblate (Spanish) Currently translated at 98.8% (6317 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/es/ --- .../main/resources/assets/cobblemon/lang/es_es.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/es_es.json b/common/src/main/resources/assets/cobblemon/lang/es_es.json index c93a2d18a9..a705d8638c 100644 --- a/common/src/main/resources/assets/cobblemon/lang/es_es.json +++ b/common/src/main/resources/assets/cobblemon/lang/es_es.json @@ -6311,5 +6311,13 @@ "cobblemon.ui.pokedex.info.form.snake-pattern-heart": "Corazón", "cobblemon.ui.pokedex.info.form.snake-pattern-elusive": "Evasión", "cobblemon.ui.pokedex.info.form.shulker": "Shulker", - "cobblemon.battle.select_target": "Selecciona el objetivo" + "cobblemon.battle.select_target": "Selecciona el objetivo", + "cobblemon.ui.pokedex.info.ability": "Habilidad: %1$s", + "cobblemon.ui.pokedex.info.drops_empty": "No suelta recursos.", + "cobblemon.ui.pokedex.info.drops": "Recursos", + "cobblemon.ui.pokedex.info.drops_display": "%1$s %2$s", + "cobblemon.ui.pokedex.info.drops_percentage": "%1$s%%", + "cobblemon.ui.pokedex.info.drops_range": "%1$s-%2$s×", + "cobblemon.ui.pokedex.info.variation": "Variante", + "cobblemon.ui.pokedex.info.drops_amount": "%1$s×" } From 7e11497c647517f8da399768317232408cd63cef Mon Sep 17 00:00:00 2001 From: Teggy Date: Fri, 3 Jan 2025 19:26:41 +0000 Subject: [PATCH 013/121] Translated using Weblate (Spanish) Currently translated at 99.1% (6339 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/es/ --- .../assets/cobblemon/lang/es_es.json | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/es_es.json b/common/src/main/resources/assets/cobblemon/lang/es_es.json index a705d8638c..6b89319aa9 100644 --- a/common/src/main/resources/assets/cobblemon/lang/es_es.json +++ b/common/src/main/resources/assets/cobblemon/lang/es_es.json @@ -6319,5 +6319,27 @@ "cobblemon.ui.pokedex.info.drops_percentage": "%1$s%%", "cobblemon.ui.pokedex.info.drops_range": "%1$s-%2$s×", "cobblemon.ui.pokedex.info.variation": "Variante", - "cobblemon.ui.pokedex.info.drops_amount": "%1$s×" + "cobblemon.ui.pokedex.info.drops_amount": "%1$s×", + "cobblemon.pokedex.variation.flower": "Flor", + "cobblemon.ui.pokedex.info.entry": "Entrada", + "cobblemon.ui.pokedex.info.stats": "Características base", + "cobblemon.ui.pokedex.info.form.maushold-family-four": "Familia", + "cobblemon.ui.pokedex.info.form.zen_mode": "Modo daruma", + "cobblemon.pokedex.variation.cream": "Crema", + "cobblemon.pokedex.variation.decoration": "Confite", + "cobblemon.pokedex.variation.face_spot_1": "Primera mancha de la cara", + "cobblemon.pokedex.variation.face_spot_2": "Segunda mancha de la cara", + "cobblemon.pokedex.variation.special_spot": "Mancha especial", + "cobblemon.pokedex.variation.left_ear_spot": "Mancha de la oreja izquierda", + "cobblemon.pokedex.variation.right_ear_spot": "Mancha de la oreja derecha", + "cobblemon.pokedex.variation.ice": "Hielo", + "cobblemon.pokedex.variation.netherite_coating": "Capa de netherita", + "cobblemon.pokedex.variation.color": "Color", + "cobblemon.pokedex.variation.season": "Estación", + "key.cobblemon.pokedex": "Abrir Pokédex", + "cobblemon.pokedex.variation.stripes": "Rayas", + "cobblemon.pokedex.variation.wood": "Madera", + "cobblemon.pokedex.variation.variant": "Variante", + "cobblemon.pokedex.variation.size": "Tamaño", + "cobblemon.pokedex.variation.snake_pattern": "Patrón de serpiente" } From 7dc76fdeb371f0502660b2cf8d70ed70878b10e2 Mon Sep 17 00:00:00 2001 From: Nico Merenq Date: Sat, 4 Jan 2025 17:07:24 +0000 Subject: [PATCH 014/121] Translated using Weblate (Russian) Currently translated at 83.5% (5342 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ru/ --- .../assets/cobblemon/lang/ru_ru.json | 148 ++++++++++++++---- 1 file changed, 115 insertions(+), 33 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json index 86fcd99788..50a26f4630 100644 --- a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json +++ b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json @@ -358,7 +358,7 @@ "item.cobblemon.elixir": "Эликсир", "item.cobblemon.max_elixir": "Макс. эликсир", "item.cobblemon.normal_gem": "Нормальный самоцвет", - "item.cobblemon.water_gem": "Водяной самоцвет", + "item.cobblemon.water_gem": "Водный самоцвет", "item.cobblemon.fire_gem": "Огненный самоцвет", "item.cobblemon.grass_gem": "Травяной самоцвет", "item.cobblemon.dragon_gem": "Драконий самоцвет", @@ -396,9 +396,9 @@ "item.cobblemon.helix_sherd": "Глиняный черепок «Спираль»", "item.cobblemon.nostalgic_sherd": "Глиняный черепок «Ностальгия»", "item.cobblemon.suspicious_sherd": "Глиняный черепок «Подозрительный»", - "item.cobblemon.tumblestone": "Галька", - "item.cobblemon.black_tumblestone": "Чёрная галька", - "item.cobblemon.sky_tumblestone": "Небесная галька", + "item.cobblemon.tumblestone": "Кувыркамень", + "item.cobblemon.black_tumblestone": "Чёрный кувыркамень", + "item.cobblemon.sky_tumblestone": "Небесный кувыркамень", "item.cobblemon.relic_coin": "Древняя монета", "block.cobblemon.relic_coin_pouch": "Мешочек с древними монетами", "block.cobblemon.relic_coin_sack": "Мешок с древними монетами", @@ -451,8 +451,8 @@ "block.cobblemon.apricorn_door": "Априкорновая дверь", "block.cobblemon.apricorn_trapdoor": "Априкорновый люк", "block.cobblemon.healing_machine": "Лечебная машина", - "block.cobblemon.healing_machine.tooltip1": "Должна зарядиться после размещения", - "block.cobblemon.healing_machine.tooltip2": "Заряжается через время", + "block.cobblemon.healing_machine.tooltip1": "Должна зарядиться после размещения.", + "block.cobblemon.healing_machine.tooltip2": "Заряжается с течением времени.", "block.cobblemon.pc": "ПК", "block.cobblemon.restoration_tank": "Восстанавливающий резервуар", "block.cobblemon.fossil_analyzer": "Анализатор окаменелостей", @@ -463,7 +463,7 @@ "block.cobblemon.pink_mint": "Семена розовой мяты", "block.cobblemon.green_mint": "Семена зелёной мяты", "block.cobblemon.white_mint": "Семена белой мяты", - "block.cobblemon.vivichoke_seeds": "Семена вивичока", + "block.cobblemon.vivichoke_seeds": "Семена вивишока", "block.cobblemon.pep_up_flower": "Цветок ОС", "block.cobblemon.potted_pep_up_flower": "Цветок ОС в горшке", "block.cobblemon.gilded_chest": "Позолоченный сундук", @@ -475,30 +475,30 @@ "block.cobblemon.green_gilded_chest": "Зелёный позолоченный сундук", "block.cobblemon.white_gilded_chest": "Белый позолоченный сундук", "block.cobblemon.display_case": "Витрина", - "block.cobblemon.small_budding_tumblestone": "Маленький гальковый бутон", - "block.cobblemon.medium_budding_tumblestone": "Средний гальковый бутон", - "block.cobblemon.large_budding_tumblestone": "Большой гальковый бутон", - "block.cobblemon.tumblestone_cluster": "Гальковая друза", - "block.cobblemon.tumblestone_block": "Гальковый блок", - "block.cobblemon.small_budding_sky_tumblestone": "Маленький небесный гальковый бутон", - "block.cobblemon.medium_budding_sky_tumblestone": "Средний небесный гальковый бутон", - "block.cobblemon.large_budding_sky_tumblestone": "Большой небесный гальковый бутон", - "block.cobblemon.sky_tumblestone_cluster": "Небесная гальковая друза", - "block.cobblemon.sky_tumblestone_block": "Небесный гальковый блок", - "block.cobblemon.small_budding_black_tumblestone": "Маленький чёрный гальковый бутон", - "block.cobblemon.medium_budding_black_tumblestone": "Средний чёрный гальковый бутон", - "block.cobblemon.large_budding_black_tumblestone": "Большой чёрный гальковый бутон", - "block.cobblemon.black_tumblestone_cluster": "Чёрная гальковая друза", - "block.cobblemon.black_tumblestone_block": "Чёрный гальковый блок", + "block.cobblemon.small_budding_tumblestone": "Маленький кувыркаменный бутон", + "block.cobblemon.medium_budding_tumblestone": "Средний кувыркаменный бутон", + "block.cobblemon.large_budding_tumblestone": "Большой кувыркамневый бутон", + "block.cobblemon.tumblestone_cluster": "Кувыркаменная друза", + "block.cobblemon.tumblestone_block": "Кувыркаменный блок", + "block.cobblemon.small_budding_sky_tumblestone": "Маленький небесный кувыркаменный бутон", + "block.cobblemon.medium_budding_sky_tumblestone": "Средний небесный кувыркаменный бутон", + "block.cobblemon.large_budding_sky_tumblestone": "Большой небесный кувыркамневый бутон", + "block.cobblemon.sky_tumblestone_cluster": "Небесная кувыркаменная друза", + "block.cobblemon.sky_tumblestone_block": "Блок небесного кувыркамня", + "block.cobblemon.small_budding_black_tumblestone": "Маленький чёрный кувыркаменный бутон", + "block.cobblemon.medium_budding_black_tumblestone": "Средний чёрный кувыркаменный бутон", + "block.cobblemon.large_budding_black_tumblestone": "Большой чёрный кувыркамневый бутон", + "block.cobblemon.black_tumblestone_cluster": "Чёрная кувыркаменная друза", + "block.cobblemon.black_tumblestone_block": "Блок чёрного кувыркамня", "cobblemon.overflow_no_pc": "Ваша команда переполнена, и у вас нет ПК!", - "cobblemon.overflow_no_space": "Ваша команда переполнена как и %1$s", + "cobblemon.overflow_no_space": "Ваша команда переполнена как и %1$s!", "cobblemon.overflow_to_pc": "Ваша команда переполнена! %1$s отправляется в %2$s.", "cobblemon.your_pc": "Ваш ПК", "cobblemon.command.pokespawn.invalid-pokemon": "Неправильное название Покемона", - "cobblemon.command.pokespawn.invalid-move": "Неправильное название атаки", - "cobblemon.command.clearparty.nonethere": "В команде %1$s нет Покемонов.", - "cobblemon.command.clearparty.cleared": "Команда %1$s очищена.", - "cobblemon.command.clearpc.cleared": "ПК %1$s очищен.", + "cobblemon.command.pokespawn.invalid-move": "Неправильное название приёма", + "cobblemon.command.clearparty.nonethere": "В команде игрока %1$s нет Покемонов.", + "cobblemon.command.clearparty.cleared": "Команда игрока %1$s очищена.", + "cobblemon.command.clearpc.cleared": "ПК игрока %1$s очищен.", "cobblemon.command.dialogue.invalid-dialogue": "Неправильный идентификатор диалога", "cobblemon.ui.generic.yes": "Да", "cobblemon.ui.generic.no": "Нет", @@ -508,13 +508,13 @@ "cobblemon.ui.starter.choosebutton": "Я выбираю тебя!", "cobblemon.ui.starter.alreadyselected": "Вы уже выбрали начального Покемона!", "cobblemon.ui.starter.cannotchoose": "Вы не можете выбрать начального Покемона сейчас.", - "cobblemon.ui.starter.hasalreadychosen": "%1$s уже выбрал своего начального Покемона.", - "cobblemon.ui.starter.skippedchoosing": "Вы ещё не выбрали начального Покемона, но уже получили Покемона. Чтобы выбрать начального Покемона, переместите всех своих Покемонов в ПК и затем нажмите \"%1$s\"", + "cobblemon.ui.starter.hasalreadychosen": "Игрок %1$s уже выбрал своего начального Покемона.", + "cobblemon.ui.starter.skippedchoosing": "Вы ещё не выбрали начального Покемона, но уже получили Покемона. Чтобы выбрать начального Покемона, переместите всех своих Покемонов в ПК и затем нажмите \"%1$s\".", "cobblemon.ui.starter.choose_starter_title": "Взгляните на Покемонов!", "cobblemon.ui.starter.choose_starter_description": "Нажмите \"%1$s\"", "cobblemon.ui.starter.chooseyourstarter": "Нажмите %1$s, чтобы выбрать Покемона и начать своё приключение!", - "cobblemon.ui.moves": "Атаки", - "cobblemon.ui.moves.switch": "Смена атаки", + "cobblemon.ui.moves": "Приёмы", + "cobblemon.ui.moves.switch": "Заменить приём", "cobblemon.ui.moves.pp": "%1$sОС", "cobblemon.ui.stats": "Показ.", "cobblemon.ui.stats.stat": "Показ.", @@ -6037,7 +6037,7 @@ "item.cobblemon.poke_rod": "Покеудочка", "item.cobblemon.grassy_seed": "Травяное семечко", "cobblemon.pokerod.bobber": "Поплавок: %1$s", - "cobblemon.pokerod.bait": "Насадка: %1$s", + "cobblemon.pokerod.bait": "Приманка: %1$s", "item.cobblemon.pokedex_black": "Покедекс", "item.cobblemon.pokedex_blue": "Покедекс", "item.cobblemon.pokedex_green": "Покедекс", @@ -6047,5 +6047,87 @@ "item.cobblemon.pokedex_yellow": "Покедекс", "item.cobblemon.electric_seed": "Электрическое семечко", "item.cobblemon.misty_seed": "Туманное семечко", - "item.cobblemon.psychic_seed": "Психическое семечко" + "item.cobblemon.psychic_seed": "Психическое семечко", + "block.cobblemon.pink_apricorn": "Розовый априкорн", + "block.cobblemon.smooth_black_tumblestone_slab": "Плита из гладкого чёрного кувыркамня", + "block.cobblemon.shiny_stone_block": "Блок блестящего камня", + "block.cobblemon.white_apricorn": "Белый априкорн", + "block.cobblemon.polished_black_tumblestone_slab": "Плита из чёрного полированного кувыркамня", + "block.cobblemon.ice_stone_block": "Блок ледяного камня", + "block.cobblemon.smooth_black_tumblestone_stairs": "Ступени из гладкого чёрного кувыркамня", + "cobblemon.fishing_bait_effects.ha_chance.tooltip": "%1$s%% - Привлекает Покемонов с скрытой способностью", + "cobblemon.fishing_bait_effects.ev.tooltip": "%1$s%% - Привлекает Покемонов с тренировочными очками (ТО/EV) для показателя %2$s", + "itemGroup.cobblemon.utility_item": "Полезные предметы", + "block.cobblemon.blue_apricorn": "Синий априкорн", + "block.cobblemon.dusk_stone_block": "Блок сумеречного камня", + "cobblemon.fishing_bait_effect_header": "Эффекты приманки:", + "cobblemon.fishing_bait_effects.nature.tooltip": "%1$s%% - Привлекает %2$s характер", + "cobblemon.fishing_bait_effects.iv.tooltip": "%1$s%% - Индивидуальные очки (ИО/IV) %2$s +%3$s", + "cobblemon.ui.starter.narrator.backbutton": "Нажата кнопка назад", + "cobblemon.ui.moves.forget": "Забыть атаку", + "item.cobblemon.automaton_armor_trim_smithing_template": "Кузнечный шаблон", + "cobblemon.tooltip.see_more_info": "Удерживайте Shift, чтобы увидеть описание", + "cobblemon.item_class.fishing_bait": "Приманка", + "cobblemon.gender.female": "Женский", + "cobblemon.gender.male": "Мужской", + "cobblemon.gender.genderless": "Бесполый", + "block.cobblemon.black_apricorn": "Чёрный априкорн", + "block.cobblemon.green_apricorn": "Зелёный априкорн", + "block.cobblemon.red_apricorn": "Красный априкорн", + "block.cobblemon.yellow_apricorn": "Жёлтый априкорн", + "block.cobblemon.lectern": "Кафедра", + "block.cobblemon.polished_tumblestone": "Полированный кувыркамень", + "block.cobblemon.polished_tumblestone_slab": "Плита из полированного кувыркамня", + "block.cobblemon.polished_tumblestone_stairs": "Ступени из полированного кувыркамня", + "block.cobblemon.polished_tumblestone_wall": "Стена из полированного кувыркамня", + "block.cobblemon.chiseled_polished_tumblestone": "Резной полированный кувыркамень", + "block.cobblemon.tumblestone_bricks": "Кувыркаменные кирпичи", + "block.cobblemon.tumblestone_brick_slab": "Плита из кувыркаменных кирпичей", + "block.cobblemon.tumblestone_brick_stairs": "Ступени из кувыркаменных кирпичей", + "block.cobblemon.tumblestone_brick_wall": "Стена из кувыркаменных кирпичей", + "block.cobblemon.chiseled_tumblestone_bricks": "Резные кувыркаменные кирпичи", + "block.cobblemon.smooth_tumblestone": "Гладкий кувыркамень", + "block.cobblemon.smooth_tumblestone_slab": "Плита из гладкого кувыркамня", + "block.cobblemon.smooth_tumblestone_stairs": "Ступени из гладкого кувыркамня", + "block.cobblemon.polished_sky_tumblestone": "Полированный небесный кувыркамень", + "block.cobblemon.polished_sky_tumblestone_slab": "Плита из полированного небесного кувыркамня", + "block.cobblemon.polished_sky_tumblestone_stairs": "Ступени из полированного небесного кувыркамня", + "block.cobblemon.polished_sky_tumblestone_wall": "Стена из полированного небесного кувыркамня", + "block.cobblemon.chiseled_polished_sky_tumblestone": "Резной полированный небесный кувыркамень", + "block.cobblemon.sky_tumblestone_bricks": "Небесные кувыркаменные кирпичи", + "block.cobblemon.sky_tumblestone_brick_slab": "Плита из небесных кувыркаменных кирпичей", + "block.cobblemon.sky_tumblestone_brick_stairs": "Ступени из небесных кувыркаменных кирпичей", + "block.cobblemon.sky_tumblestone_brick_wall": "Стена из небесных кувыркаменных кирпичей", + "block.cobblemon.chiseled_sky_tumblestone_bricks": "Резные небесные кувыркаменные кирпичи", + "block.cobblemon.smooth_sky_tumblestone": "Гладкий небесный кувыркамень", + "block.cobblemon.smooth_sky_tumblestone_slab": "Плита из гладкого небесного кувыркамня", + "block.cobblemon.smooth_sky_tumblestone_stairs": "Ступени из гладкого небесного кувыркамня", + "block.cobblemon.polished_black_tumblestone": "Полированный чёрный кувыркамень", + "block.cobblemon.polished_black_tumblestone_stairs": "Ступени из полированного чёрного кувыркамня", + "block.cobblemon.polished_black_tumblestone_wall": "Стена из полированного чёрного кувыркамня", + "block.cobblemon.chiseled_polished_black_tumblestone": "Резной полированный чёрный кувыркамень", + "block.cobblemon.black_tumblestone_bricks": "Чёрные кувыркаменные кирпичи", + "block.cobblemon.black_tumblestone_brick_slab": "Плита из чёрных кувыркаменных кирпичей", + "block.cobblemon.black_tumblestone_brick_stairs": "Ступени из чёрных кувыркаменных кирпичей", + "block.cobblemon.black_tumblestone_brick_wall": "Стена из чёрных кувыркаменных кирпичей", + "block.cobblemon.chiseled_black_tumblestone_bricks": "Резные чёрные кувыркаменные кирпичи", + "block.cobblemon.smooth_black_tumblestone": "Гладкий чёрный кувыркамень", + "block.cobblemon.fire_stone_block": "Блок огненного камня", + "block.cobblemon.water_stone_block": "Блок водного камня", + "block.cobblemon.thunder_stone_block": "Блок громового камня", + "block.cobblemon.leaf_stone_block": "Блок лиственного камня", + "block.cobblemon.sun_stone_block": "Блок солнечного камня", + "block.cobblemon.moon_stone_block": "Блок лунного камня", + "block.cobblemon.dawn_stone_block": "Блок рассветного камня", + "cobblemon.fishing_bait_effects.bite_time.tooltip": "%1$s%% - Ускоряет поклёвку на %3$s%%", + "cobblemon.fishing_bait_effects.gender_chance.tooltip": "%1$s%% - Привлекает %2$s пол", + "cobblemon.fishing_bait_effects.level_raise.tooltip": "%1$s%% - Повышает уровень на +%3$s", + "cobblemon.fishing_bait_effects.tera.tooltip": "%1$s%% - Привлекает Покемонов с Тера типом %2$s", + "cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "%1$s× - %3$s× шанс появления шайни", + "cobblemon.fishing_bait_effects.pokemon_chance.tooltip": "%1$s%% - Привлекает Покемонов", + "cobblemon.fishing_bait_effects.friendship.tooltip": "%1$s%% - Повышает дружбу на +%3$", + "cobblemon.fishing_bait_effects.inert.tooltip": "Нет известных эффектов", + "entity.minecraft.villager.nurse": "Медсестра", + "entity.minecraft.villager.cobblemon.nurse": "Медсестра", + "cobblemon.ui.pokenav.narrator.backbutton": "Нажата кнопка ПокеНава" } From a89d428699d9194d06daff94bce033ff0192eaa6 Mon Sep 17 00:00:00 2001 From: Nico Merenq Date: Sat, 4 Jan 2025 22:18:53 +0000 Subject: [PATCH 015/121] Translated using Weblate (Russian) Currently translated at 83.4% (5333 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ru/ --- .../assets/cobblemon/lang/ru_ru.json | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json index 50a26f4630..4dd1ab843b 100644 --- a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json +++ b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json @@ -519,19 +519,19 @@ "cobblemon.ui.stats": "Показ.", "cobblemon.ui.stats.stat": "Показ.", "cobblemon.ui.stats.base": "Баз.", - "cobblemon.ui.stats.ivs": "ИО", - "cobblemon.ui.stats.evs": "ТО", + "cobblemon.ui.stats.ivs": "ИО (IV)", + "cobblemon.ui.stats.evs": "ТО (EV)", "cobblemon.ui.stats.other": "Прочее", "cobblemon.ui.stats.friendship": "Дружба", "cobblemon.ui.stats.hp": "ОЗ", - "cobblemon.ui.stats.atk": "Атк.", - "cobblemon.ui.stats.def": "Защ.", - "cobblemon.ui.stats.sp_atk": "Сп.Атк.", - "cobblemon.ui.stats.sp_def": "Сп.Защ.", + "cobblemon.ui.stats.atk": "Атака", + "cobblemon.ui.stats.def": "Защита", + "cobblemon.ui.stats.sp_atk": "Спец. Атака", + "cobblemon.ui.stats.sp_def": "Спец. Защита", "cobblemon.ui.stats.speed": "Скорость", "cobblemon.ui.gold_hoard": "Склад монет", "cobblemon.ui.netherite_hoard": "Склад лома", - "cobblemon.ui.info": "Инфо", + "cobblemon.ui.info": "Информация", "cobblemon.ui.info.pokedex_number": "Номер", "cobblemon.ui.info.species": "Вид", "cobblemon.ui.info.type": "Тип", @@ -541,9 +541,9 @@ "cobblemon.ui.info.experience_points": "Очки опыта", "cobblemon.ui.info.to_next_level": "До след. ур.", "cobblemon.ui.trade": "Обмен", - "cobblemon.trade.occupied": "%1$s сейчас занят.", - "cobblemon.trade.request_expired": "Время запроса на обмен с %1$s истекло.", - "cobblemon.trade.request_already_expired": "Время запроса на обмен уже истек.", + "cobblemon.trade.occupied": "Игрок %1$s сейчас занят.", + "cobblemon.trade.request_expired": "Время запроса на обмен с игроком %1$s истекло.", + "cobblemon.trade.request_already_expired": "Время запроса на обмен уже истекло.", "cobblemon.trade.request_sent": "Предлагает обменяться с %1$s.", "cobblemon.trade.offer": "%1$s предлагает обменяться Покемонами с вами.", "cobblemon.ui.party": "Команда", @@ -6004,27 +6004,27 @@ "cobblemon.ability.waterabsorb": "Поглощение воды", "cobblemon.ability.waterabsorb.desc": "Заместо получения урона, Покемон восстанавливает ОЗ, если его ударяют атакой Водного типа.", "cobblemon.ability.waterbubble": "Водяной пузырь", - "cobblemon.ability.waterbubble.desc": "Снижает получаемый урон от атак Огненного типа и предотвращает ожоги.", + "cobblemon.ability.waterbubble.desc": "Снижает получаемый урон от приёмов Огненного типа и предотвращает ожоги.", "cobblemon.ability.watercompaction": "Уплотнение водой", - "cobblemon.ability.watercompaction.desc": "Резко увеличивает Защиту, когда Покемона ударяют атакой Водного типа.", + "cobblemon.ability.watercompaction.desc": "Резко увеличивает Защиту, когда Покемона ударяют приёмом Водного типа.", "cobblemon.ability.waterveil": "Водяное покрытие", "cobblemon.ability.waterveil.desc": "Водяное покрытие Покемона не даёт ему обжечься.", "cobblemon.ability.weakarmor": "Хрупкая броня", - "cobblemon.ability.weakarmor.desc": "Защита Покемона понижается, когда он получает урон от физических атак, но взамен его Скорость резко повышается.", + "cobblemon.ability.weakarmor.desc": "Защита Покемона понижается, когда он получает урон от физических приёмов, но взамен его Скорость резко повышается.", "cobblemon.ability.wellbakedbody": "Пропечённое тело", - "cobblemon.ability.wellbakedbody.desc": "Покемон не получает урона от атак Огненного типа. Вместо этого его Защита резко повышается.", + "cobblemon.ability.wellbakedbody.desc": "Покемон не получает урона от приёмов Огненного типа. Вместо этого его Защита резко повышается.", "cobblemon.ability.whitesmoke": "Белый дым", "cobblemon.ability.whitesmoke.desc": "Покемон защищён белым дымом, который не позволяет другим Покемонам понижать его характеристики.", "cobblemon.ability.wimpout": "Трус", "cobblemon.ability.wimpout.desc": "Покемон трусливо отступает, когда его ОЗ равно 1/2 или меньше.", "cobblemon.ability.windpower": "Сила ветра", - "cobblemon.ability.windpower.desc": "Покемон становится заряженным, когда его атакуют ветряной атакой. Это увеличивает силу следующей атаки Электрического типа, которую использует Покемон.", + "cobblemon.ability.windpower.desc": "Покемон становится заряженным, когда его атакуют ветряным приёмом. Это увеличивает силу следующего приёма Электрического типа, который использует Покемон.", "cobblemon.ability.windrider": "Ветряной наездник", - "cobblemon.ability.windrider.desc": "Повышает Атаку Покемона, если срабатывает Попутный ветер, или если Покемона атакуют ветряной атакой. Покемон также не получает урон от ветра.", + "cobblemon.ability.windrider.desc": "Повышает Атаку Покемона, если срабатывает Попутный ветер, или если Покемона атакуют ветряным приёмом. Покемон также не получает урон от ветра.", "cobblemon.ability.wonderguard": "Причудливая защита", - "cobblemon.ability.wonderguard.desc": "Её таинственная сила позволяет получать урон только от суперэффективных атак.", + "cobblemon.ability.wonderguard.desc": "Её таинственная сила позволяет получать урон только от суперэффективных приёмов.", "cobblemon.ability.wonderskin": "Причудливая кожа", - "cobblemon.ability.wonderskin.desc": "Увеличивает шанс того, что вражеские статусные атаки промахнутся.", + "cobblemon.ability.wonderskin.desc": "Увеличивает шанс того, что вражеские статусные приёмы промахнутся.", "cobblemon.ability.zenmode": "Режим дзен", "cobblemon.ability.zenmode.desc": "Изменяет форму Покемона, когда его ОЗ равно 1/2 или меньше.", "cobblemon.ability.zerotohero": "Стать героем", @@ -6129,5 +6129,7 @@ "cobblemon.fishing_bait_effects.inert.tooltip": "Нет известных эффектов", "entity.minecraft.villager.nurse": "Медсестра", "entity.minecraft.villager.cobblemon.nurse": "Медсестра", - "cobblemon.ui.pokenav.narrator.backbutton": "Нажата кнопка ПокеНава" + "cobblemon.ui.pokenav.narrator.backbutton": "Нажата кнопка ПокеНава", + "cobblemon.ui.stash.gold": "Склад монет", + "cobblemon.ui.stash.netherite": "Склад лома" } From 9fd2b3f1d6787450b59fdde074005b1eec7dc582 Mon Sep 17 00:00:00 2001 From: Gustavo Puerari Date: Mon, 6 Jan 2025 17:51:50 +0000 Subject: [PATCH 016/121] Translated using Weblate (Portuguese (Brazil)) Currently translated at 40.2% (2575 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/ --- .../assets/cobblemon/lang/pt_br.json | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/pt_br.json b/common/src/main/resources/assets/cobblemon/lang/pt_br.json index 70b4bf1ea7..dac6c9ade8 100644 --- a/common/src/main/resources/assets/cobblemon/lang/pt_br.json +++ b/common/src/main/resources/assets/cobblemon/lang/pt_br.json @@ -2556,5 +2556,47 @@ "block.cobblemon.chiseled_black_tumblestone_bricks": "Tijolos de Jaspe Escura Talhados", "block.cobblemon.smooth_black_tumblestone": "Jaspe Escura Lisa", "block.cobblemon.smooth_black_tumblestone_slab": "Laje de Jaspe Escura Lisa", - "block.cobblemon.smooth_black_tumblestone_stairs": "Escadas de Jaspe Escura Lisa" + "block.cobblemon.smooth_black_tumblestone_stairs": "Escadas de Jaspe Escura Lisa", + "cobblemon.species.camerupt.desc": "As corcovas nas costas de Camerupt são formadas por uma transformação de seus ossos. Elas as vezes disparam magma derretido. Esse Pokémon costuma entrar em erupção quando fica irritado.", + "cobblemon.species.grumpig.desc": "Grumpig usa pérolas negras em seu corpo para canalizar seus poderes fantásticos. Quando o faz, dança de forma bizarra. As pérolas negras desse Pokémon são tão valiosas quanto obras de arte.", + "cobblemon.species.vibrava.desc": "Para facilitar o crescimento de suas asas, todos os dias Vibrava se alimenta de suas presas, dissolvendo-as com seus fluidos digestivos.", + "cobblemon.species.cacnea.desc": "Quanto mais árido e inóspito o ambiente, mais bela e cheirosa é a flor de Cacnea. Esse Pokémon luta balançando seus braços repletos de espinhos.", + "cobblemon.species.zangoose.desc": "Zangoose normalmente fica sob quatro patas, mas quando se irrita, fica de pé e estende suas garras. Esse Pokémon compartilha uma terrível rivalidade com Seviper que se prolonga há muitas gerações.", + "cobblemon.species.cacturne.desc": "Se um viajante atravessa um deserto fundo na noite, Cacturne o seguirá em grupo. Esses Pokémon esperam o momento que o viajante se canse e não possa mais se mover.", + "cobblemon.species.carvanha.name": "Carvanha", + "cobblemon.species.carvanha.desc": "Esses Pokémon têm presas afiadas e mandíbulas poderosas. Viajantes evitam o habitat de Carvanha a todo custo.", + "cobblemon.species.sharpedo.name": "Sharpedo", + "cobblemon.species.sharpedo.desc": "Esse Pokémon é conhecido como o Valentão do Mar. Qualquer navio que entre nas águas que Sharpedo chama de lar será atacado — sem exceções.", + "cobblemon.species.wailmer.name": "Wailmer", + "cobblemon.species.wailmer.desc": "Quando engole um grande volume de água marinha, Wailmer se torna uma enorme bola saltitante. Come toneladas de comida diariamente.", + "cobblemon.species.wailord.name": "Wailord", + "cobblemon.species.wailord.desc": "Seu tamanho imenso é a razão de sua popularidade. Observação de Wailord é um dos passeios turísticos mais adorados em várias partes do mundo.", + "cobblemon.species.numel.name": "Numel", + "cobblemon.species.numel.desc": "Numel armazena magma de quase 1.200 graus Celsius em seu corpo. Caso se molhe, o magma esfria e endurece. Nesse caso, o corpo desse Pokémon fica muito pesado e seus movimentos ficam lentos.", + "cobblemon.species.camerupt.name": "Camerupt", + "cobblemon.species.torkoal.name": "Torkoal", + "cobblemon.species.torkoal.desc": "É possível encontrar minas de carvão abandonadas cheias de Torkoal. Esse Pokémon cava incessantemente em busca de carvão.", + "cobblemon.species.spoink.name": "Spoink", + "cobblemon.species.spoink.desc": "Spoink carrega uma pérola no topo de sua cabeça. A pérola serve para amplificar os poderes psicocinéticos desse Pokémon. Por conta disso, está sempre a procura de uma pérola maior.", + "cobblemon.species.grumpig.name": "Grumpig", + "cobblemon.species.spinda.name": "Spinda", + "cobblemon.species.spinda.desc": "O padrão de pintas de cada Spinda é diferente. Evita brilhantemente os ataques de seus oponentes com seus movimentos titubeantes!", + "cobblemon.species.trapinch.name": "Trapinch", + "cobblemon.species.trapinch.desc": "Trapinch caça suas presas usando poços em formato de cone de onde suas vítimas não podem escapar.", + "cobblemon.species.vibrava.name": "Vibrava", + "cobblemon.species.flygon.name": "Flygon", + "cobblemon.species.flygon.desc": "Seu apelido é Espírito do Deserto pois o bater de suas asas soa como a cantoria de uma mulher.", + "cobblemon.species.cacnea.name": "Cacnea", + "cobblemon.species.cacturne.name": "Cacturne", + "cobblemon.species.swablu.name": "Swablu", + "cobblemon.species.swablu.desc": "Por Swablu se parecer com uma nuvem, seus oponentes têm dificuldade em encontrá-lo. Aparentemente, suas asas tornaram-se brancas ao longo de muitas gerações.", + "cobblemon.species.altaria.name": "Altaria", + "cobblemon.species.altaria.desc": "Esse Pokémon tem um comportamento gentil, mas quando provocado ameaçará seus oponentes com gritos estridentes antes de atacá-los sem misericórdia.", + "cobblemon.species.zangoose.name": "Zangoose", + "cobblemon.species.seviper.name": "Seviper", + "cobblemon.species.seviper.desc": "A cauda em formato de lâmina de Seviper têm dois propósitos — cortar seus oponentes e envenená-los com seu veneno. Esse Pokémon não desiste de sua rixa geracional com Zangoose.", + "cobblemon.species.lunatone.name": "Lunatone", + "cobblemon.species.lunatone.desc": "Foi descoberto no local onde um meteoro caiu há 40 anos. Seu olhar pode colocar seus inimigos para dormir.", + "cobblemon.species.solrock.name": "Solrock", + "cobblemon.species.solrock.desc": "Energia solar é a fonte de seu poder, por isso é mais forte durante o dia. Quando gira, seu corpo brilha." } From 5621326c43db03baa52a750a3d3c06277624b528 Mon Sep 17 00:00:00 2001 From: washashu0905 Date: Mon, 6 Jan 2025 21:00:29 +0000 Subject: [PATCH 017/121] Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 65.8% (4208 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/zh_Hant/ --- common/src/main/resources/assets/cobblemon/lang/zh_tw.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json index d01c2e1d29..e183c92a35 100644 --- a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json +++ b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json @@ -5529,5 +5529,7 @@ "cobblemon.ability.wonderskin": "奇跡皮膚", "cobblemon.ability.wonderskin.desc": "不易受到變化類招式攻擊的身體。", "cobblemon.ability.zenmode": "達摩模式", - "cobblemon.ability.zenmode.desc": "ＨＰ變為一半以下時，樣子會改變。" + "cobblemon.ability.zenmode.desc": "ＨＰ變為一半以下時，樣子會改變。", + "item.cobblemon.pokerod_smithing_template": "鍛造模板", + "item.cobblemon.smithing_template.pokerod.ingredients": "精靈球" } From 882a5921e84b9436f7b5be71a8e89bf2c4acb4a6 Mon Sep 17 00:00:00 2001 From: Gustavo Puerari Date: Mon, 6 Jan 2025 22:08:39 +0000 Subject: [PATCH 018/121] Translated using Weblate (Portuguese (Brazil)) Currently translated at 40.4% (2587 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/ --- .../assets/cobblemon/lang/pt_br.json | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/pt_br.json b/common/src/main/resources/assets/cobblemon/lang/pt_br.json index dac6c9ade8..2c33912af5 100644 --- a/common/src/main/resources/assets/cobblemon/lang/pt_br.json +++ b/common/src/main/resources/assets/cobblemon/lang/pt_br.json @@ -2598,5 +2598,29 @@ "cobblemon.species.lunatone.name": "Lunatone", "cobblemon.species.lunatone.desc": "Foi descoberto no local onde um meteoro caiu há 40 anos. Seu olhar pode colocar seus inimigos para dormir.", "cobblemon.species.solrock.name": "Solrock", - "cobblemon.species.solrock.desc": "Energia solar é a fonte de seu poder, por isso é mais forte durante o dia. Quando gira, seu corpo brilha." + "cobblemon.species.solrock.desc": "Energia solar é a fonte de seu poder, por isso é mais forte durante o dia. Quando gira, seu corpo brilha.", + "cobblemon.species.whiscash.name": "Whiscash", + "cobblemon.species.whiscash.desc": "Bate com sua cauda contra o chão do pântano para fazer o chão tremer e confundir suas presas, as quais engole por inteiro. As pessoas costumavam confundir esse comportamento com a causa de terremotos.", + "cobblemon.species.corphish.name": "Corphish", + "cobblemon.species.corphish.desc": "É um Pokémon originário de uma região muito distante que escapou para a natureza. Pode se adaptar até mesmo ao mais sujo dos rios.", + "cobblemon.species.crawdaunt.name": "Crawdaunt", + "cobblemon.species.crawdaunt.desc": "Um Pokémon bruto que ama batalhar. Crawdaunt avançará contra qualquer um que se aproximar de seu ninho.", + "cobblemon.species.baltoy.name": "Baltoy", + "cobblemon.species.baltoy.desc": "Foi descoberto em ruínas antigas. Enquanto se move, gira constantemente. Fica em um pé só mesmo quando dorme.", + "cobblemon.species.claydol.name": "Claydol", + "cobblemon.species.claydol.desc": "Parece ter nascido de bonecas de barro feitas por povos antigos. Claydol usa telecinese para flutuar e mover-se.", + "cobblemon.species.lileep.name": "Lileep", + "cobblemon.species.lileep.desc": "Lileep se pendura em rochas no fundo do mar. Quando uma presa se aproxima, esse Pokémon a agarra com seus tentáculos semelhantes a pétalas.", + "cobblemon.species.cradily.name": "Cradily", + "cobblemon.species.barboach.name": "Barboach", + "cobblemon.species.barboach.desc": "Vive em pântanos de água turva. A baixa visibilidade esconde esse Pokémon de predadores e o limo em seu corpo faz com que seja difícil de ser agarrado.", + "cobblemon.species.anorith.name": "Anorith", + "cobblemon.species.anorith.desc": "Anorith pode nadar rapidamente usando suas oito asas como remos em um bote. Esse Pokémon é o antecessor dos Pokémon inseto modernos.", + "cobblemon.species.armaldo.name": "Armaldo", + "cobblemon.species.cradily.desc": "Quando Cradily captura uma presa com seus tentáculos, a digere inteira e absorve seus nutrientes.", + "cobblemon.species.armaldo.desc": "Apesar de viver na terra, também nada muito bem. Armaldo mergulha no oceano em busca de comida e usa suas garras afiadas para capturar suas presas.", + "cobblemon.species.milotic.desc": "Dizem que o simples vislumbre de Milotic e sua beleza acalma quaisquer emoções hostis que possa estar sentindo.", + "cobblemon.species.feebas.name": "Feebas", + "cobblemon.species.feebas.desc": "É um Pokémon feio e repulsivo. Entretanto, é muito resistente e pode sobreviver em lugares com pouca água.", + "cobblemon.species.milotic.name": "Milotic" } From 51c2a418cee5667c5091ef40ba0fda53613e2244 Mon Sep 17 00:00:00 2001 From: washashu0905 Date: Wed, 8 Jan 2025 18:51:47 +0000 Subject: [PATCH 019/121] Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 69.0% (4415 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/zh_Hant/ --- .../assets/cobblemon/lang/zh_tw.json | 209 +++++++++++++++++- 1 file changed, 208 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json index e183c92a35..d366191b85 100644 --- a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json +++ b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json @@ -5531,5 +5531,212 @@ "cobblemon.ability.zenmode": "達摩模式", "cobblemon.ability.zenmode.desc": "ＨＰ變為一半以下時，樣子會改變。", "item.cobblemon.pokerod_smithing_template": "鍛造模板", - "item.cobblemon.smithing_template.pokerod.ingredients": "精靈球" + "item.cobblemon.smithing_template.pokerod.ingredients": "精靈球", + "block.cobblemon.polished_black_tumblestone": "磨製黑玉石", + "block.cobblemon.black_tumblestone_brick_stairs": "黑玉石磚樓梯", + "block.cobblemon.shiny_stone_block": "光之石塊", + "block.cobblemon.sky_tumblestone_bricks": "天藍玉石磚", + "cobblemon.ui.pokedex.info.form.color-lime": "黃綠色", + "cobblemon.fishing_bait_effects.bite_time.tooltip": "%1$s%% - 減少 %3$s%% 上鉤時間", + "cobblemon.ui.interact.unavailable": "目標當前不可執行此操作。", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage1": "獄髓錠塗層（1/8）", + "cobblemon.ui.pokedex.info.form.netherite-coating-full": "獄髓錠塗層（8/8）", + "block.cobblemon.sky_tumblestone_brick_stairs": "天藍玉石磚樓梯", + "cobblemon.fishing_bait_effects.friendship.tooltip": "%1$s%% - 提升 %3$s 親密度", + "cobblemon.ui.pokedex.info.form.region-bias-alola": "阿羅拉地區", + "cobblemon.ui.pokedex.info.form.tree-crimson": "緋紅蕈柄", + "cobblemon.ui.pokedex.info.ability": "特性： %1$s", + "cobblemon.ui.pokedex.info.drops_display": "%1$s %2$s", + "cobblemon.ui.pokedex.info.form.region-bias-paldea": "帕迪亞地區", + "cobblemon.ui.pokenav.narrator.backbutton": "按下寶可夢導航按鈕", + "cobblemon.ui.stash.netherite": "獄髓碎片儲值", + "cobblemon.ui.pokedex.info.form.tree-cherry": "櫻花木", + "itemGroup.cobblemon.utility_item": "功能道具", + "cobblemon.ui.starter.narrator.backbutton": "按下返回鍵", + "item.cobblemon.smithing_template.pokerod.base_slot_description": "添加釣魚竿", + "item.cobblemon.smithing_template.pokerod.additions_slot_description": "添加精靈球", + "upgrade.cobblemon.pokerod": "寶可夢釣竿升級", + "item.cobblemon.poke_rod": "寶可夢釣竿", + "item.cobblemon.pokedex_black": "寶可夢圖鑑（黑）", + "item.cobblemon.pokedex_blue": "寶可夢圖鑑（藍）", + "item.cobblemon.pokedex_green": "寶可夢圖鑑（綠）", + "item.cobblemon.pokedex_pink": "寶可夢圖鑑（粉）", + "item.cobblemon.pokedex_red": "寶可夢圖鑑（紅）", + "item.cobblemon.pokedex_white": "寶可夢圖鑑（白）", + "item.cobblemon.pokedex_yellow": "寶可夢圖鑑（黃）", + "item.cobblemon.grassy_seed": "青草種子", + "item.cobblemon.electric_seed": "電氣種子", + "item.cobblemon.misty_seed": "薄霧種子", + "item.cobblemon.psychic_seed": "精神種子", + "item.cobblemon.automaton_armor_trim_smithing_template": "鍛造模板", + "cobblemon.tooltip.see_more_info": "按住 shift 鍵查看訊息", + "cobblemon.item_class.fishing_bait": "魚餌", + "cobblemon.gender.female": "雌性", + "cobblemon.gender.male": "雄性", + "cobblemon.gender.genderless": "無性", + "block.cobblemon.black_apricorn": "黑球果", + "block.cobblemon.blue_apricorn": "藍球果", + "block.cobblemon.green_apricorn": "綠球果", + "block.cobblemon.pink_apricorn": "粉球果", + "block.cobblemon.red_apricorn": "紅球果", + "block.cobblemon.white_apricorn": "白球果", + "block.cobblemon.yellow_apricorn": "黃球果", + "block.cobblemon.lectern": "講台", + "block.cobblemon.polished_tumblestone": "磨製玉石", + "block.cobblemon.polished_tumblestone_slab": "磨製玉石台階", + "block.cobblemon.polished_tumblestone_stairs": "磨製玉石樓梯", + "block.cobblemon.polished_tumblestone_wall": "磨製玉石牆", + "block.cobblemon.chiseled_polished_tumblestone": "雕紋玉石磚", + "block.cobblemon.tumblestone_bricks": "玉石磚", + "block.cobblemon.tumblestone_brick_slab": "玉石磚台階", + "block.cobblemon.tumblestone_brick_stairs": "玉石磚樓梯", + "block.cobblemon.tumblestone_brick_wall": "玉石磚牆", + "block.cobblemon.chiseled_tumblestone_bricks": "雕紋玉石磚", + "block.cobblemon.smooth_tumblestone": "平滑玉石", + "block.cobblemon.smooth_tumblestone_slab": "平滑玉石台階", + "block.cobblemon.smooth_tumblestone_stairs": "平滑玉石樓梯", + "block.cobblemon.polished_sky_tumblestone": "磨製天藍玉石", + "block.cobblemon.polished_sky_tumblestone_slab": "磨製天藍玉石台階", + "block.cobblemon.polished_sky_tumblestone_stairs": "磨製天藍玉石樓梯", + "block.cobblemon.polished_sky_tumblestone_wall": "磨製天藍玉石牆", + "block.cobblemon.chiseled_polished_sky_tumblestone": "磨製天藍玉石磚", + "block.cobblemon.chiseled_sky_tumblestone_bricks": "雕紋天藍玉石磚", + "block.cobblemon.smooth_sky_tumblestone": "平滑天藍玉石", + "block.cobblemon.smooth_sky_tumblestone_slab": "平滑天藍玉石台階", + "block.cobblemon.smooth_sky_tumblestone_stairs": "平滑天藍玉石樓梯", + "cobblemon.ui.pokedex.region.national": "全國圖鑑", + "cobblemon.pokedex.variation.color": "顏色", + "cobblemon.pokedex.variation.pattern": "圖案", + "cobblemon.pokedex.variation.metal": "金屬", + "cobblemon.pokedex.variation.netherite_coating": "獄髓錠塗層", + "cobblemon.pokedex.variation.ice": "冰", + "cobblemon.pokedex.variation.breed": "品種", + "cobblemon.pokedex.variation.size": "尺寸", + "cobblemon.pokedex.variation.stripes": "條紋", + "cobblemon.pokerod.bobber": "浮標： %1$s", + "cobblemon.pokerod.bait": "魚餌： %1$s x%2$s", + "block.cobblemon.sky_tumblestone_brick_slab": "天藍玉石磚台階", + "block.cobblemon.sky_tumblestone_brick_wall": "天藍玉石磚牆", + "block.cobblemon.polished_black_tumblestone_slab": "磨製黑玉石台階", + "block.cobblemon.polished_black_tumblestone_stairs": "磨製黑玉石樓梯", + "block.cobblemon.polished_black_tumblestone_wall": "磨製黑玉石牆", + "block.cobblemon.chiseled_polished_black_tumblestone": "雕紋黑玉石磚", + "block.cobblemon.black_tumblestone_bricks": "黑玉石磚", + "block.cobblemon.black_tumblestone_brick_slab": "黑玉石磚台階", + "block.cobblemon.black_tumblestone_brick_wall": "黑玉石磚牆", + "block.cobblemon.chiseled_black_tumblestone_bricks": "雕紋黑玉石磚", + "block.cobblemon.smooth_black_tumblestone": "平滑黑玉石", + "block.cobblemon.smooth_black_tumblestone_slab": "平滑黑玉石台階", + "block.cobblemon.smooth_black_tumblestone_stairs": "平滑黑玉石樓梯", + "block.cobblemon.fire_stone_block": "火之石塊", + "block.cobblemon.water_stone_block": "水之石塊", + "block.cobblemon.thunder_stone_block": "雷之石塊", + "block.cobblemon.leaf_stone_block": "葉之石塊", + "block.cobblemon.ice_stone_block": "冰之石塊", + "block.cobblemon.sun_stone_block": "日之石塊", + "block.cobblemon.moon_stone_block": "月之石塊", + "block.cobblemon.dawn_stone_block": "覺醒之石塊", + "block.cobblemon.dusk_stone_block": "暗之石塊", + "cobblemon.fishing_bait_effect_header": "魚餌效果：", + "cobblemon.fishing_bait_effects.nature.tooltip": "%1$s%% - 吸引 %2$s 性格", + "cobblemon.fishing_bait_effects.iv.tooltip": "%1$s%% - %2$s 個體值 +%3$s", + "cobblemon.fishing_bait_effects.ev.tooltip": "%1$s%% - 吸引 %2$s 基礎點數", + "cobblemon.fishing_bait_effects.gender_chance.tooltip": "%1$s%% - 吸引 %2$s 性別", + "cobblemon.fishing_bait_effects.level_raise.tooltip": "%1$s%% - 提升 %3$s 等級", + "cobblemon.fishing_bait_effects.tera.tooltip": "%1$s%% - 吸引 %2$s 太晶屬性", + "cobblemon.fishing_bait_effects.shiny_reroll.tooltip": "%1$sx - %3$sx 閃光機率", + "cobblemon.fishing_bait_effects.ha_chance.tooltip": "%1$s%% - 吸引隱藏屬性", + "cobblemon.fishing_bait_effects.pokemon_chance.tooltip": "%1$s%% - 上鉤一隻寶可夢", + "cobblemon.fishing_bait_effects.inert.tooltip": "無已知影響", + "entity.minecraft.villager.nurse": "護士", + "entity.minecraft.villager.cobblemon.nurse": "護士", + "cobblemon.ui.moves.forget": "遺忘招式", + "cobblemon.ui.stash.gold": "遺跡硬幣儲值", + "cobblemon.ui.pokedex.info.entry": "概述", + "cobblemon.ui.pokedex.info.stats": "種族值", + "cobblemon.ui.pokedex.info.drops": "掉落物", + "cobblemon.ui.pokedex.info.drops_amount": "%1$s×", + "cobblemon.ui.pokedex.info.drops_range": "%1$s-%2$s×", + "cobblemon.ui.pokedex.info.drops_percentage": "%1$s%%", + "cobblemon.ui.pokedex.info.drops_empty": "沒有可掉落的物品。", + "cobblemon.ui.pokedex.info.variation": "變體", + "cobblemon.ui.pokedex.info.form": "型態", + "cobblemon.ui.pokedex.info.form.normal": "標準", + "cobblemon.ui.pokedex.info.form.alola": "阿羅拉", + "cobblemon.ui.interact.accept": "接受", + "cobblemon.ui.interact.decline": "拒絕", + "cobblemon.ui.interact.failed": "目標被遮擋或距離太遠。", + "cobblemon.ui.interact.team_leave": "解散隊伍", + "cobblemon.ui.interact.team_request": "組隊", + "cobblemon.ui.interact.too_far": "目標距離太遠", + "cobblemon.ui.pokedex.scan.registered_suffix": "%1$s 已註冊", + "cobblemon.ui.pokedex.scan.trainer_owned": "已擁有訓練師", + "cobblemon.ui.pokedex.region.alola": "阿羅拉", + "cobblemon.ui.pokedex.region.galar": "伽勒爾", + "cobblemon.ui.pokedex.region.hisui": "洗翠", + "cobblemon.ui.pokedex.region.hoenn": "豐緣", + "cobblemon.ui.pokedex.region.johto": "城都", + "cobblemon.ui.pokedex.region.kalos": "卡洛斯", + "cobblemon.ui.pokedex.region.kanto": "關都", + "cobblemon.ui.pokedex.region.paldea": "帕迪亞", + "cobblemon.ui.pokedex.region.sinnoh": "神奧", + "cobblemon.ui.pokedex.region.unknown": "未知", + "cobblemon.ui.pokedex.region.unova": "合眾", + "cobblemon.ui.pokedex.info.form.galar": "伽勒爾", + "cobblemon.ui.pokedex.info.form.region-bias-galar": "伽勒爾地區", + "cobblemon.ui.pokedex.info.form.hisui": "洗翠", + "cobblemon.ui.pokedex.info.form.region-bias-hisui": "洗翠地區", + "cobblemon.ui.pokedex.info.form.paldea": "帕迪亞", + "cobblemon.ui.pokedex.info.form.roaming": "徒步", + "cobblemon.ui.pokedex.info.form.minecraft": "我的世界", + "cobblemon.ui.pokedex.info.form.squawkabilly-color-blue": "藍羽毛", + "cobblemon.ui.pokedex.info.form.squawkabilly-color-gray": "灰羽毛", + "cobblemon.ui.pokedex.info.form.squawkabilly-color-green": "綠羽毛", + "cobblemon.ui.pokedex.info.form.squawkabilly-color-yellow": "黃羽毛", + "cobblemon.ui.pokedex.info.form.maushold-family-four": "四隻家庭", + "cobblemon.ui.pokedex.info.form.no_ice": "解凍頭", + "cobblemon.ui.pokedex.info.form.color-light_gray": "淺灰色", + "cobblemon.ui.pokedex.info.form.color-gray": "灰色", + "cobblemon.ui.pokedex.info.form.color-black": "黑色", + "cobblemon.ui.pokedex.info.form.color-brown": "棕色", + "cobblemon.ui.pokedex.info.form.color-red": "紅色", + "cobblemon.ui.pokedex.info.form.color-orange": "橙色", + "cobblemon.ui.pokedex.info.form.color-yellow": "黃色", + "cobblemon.ui.pokedex.info.form.color-green": "綠色", + "cobblemon.ui.pokedex.info.form.color-cyan": "青色", + "cobblemon.ui.pokedex.info.form.color-light_blue": "淺藍色", + "cobblemon.ui.pokedex.info.form.color-blue": "藍色", + "cobblemon.ui.pokedex.info.form.color-purple": "紫色", + "cobblemon.ui.pokedex.info.form.color-magenta": "洋紅色", + "cobblemon.ui.pokedex.info.form.color-pink": "粉色", + "cobblemon.ui.pokedex.info.form.color-white": "白色", + "cobblemon.ui.pokedex.info.form.tree-oak": "橡木", + "cobblemon.ui.pokedex.info.form.tree-spruce": "杉木", + "cobblemon.ui.pokedex.info.form.tree-acacia": "相思木", + "cobblemon.ui.pokedex.info.form.tree-birch": "樺木", + "cobblemon.ui.pokedex.info.form.tree-darkoak": "黑橡木", + "cobblemon.ui.pokedex.info.form.tree-jungle": "叢林木", + "cobblemon.ui.pokedex.info.form.tree-mangrove": "紅樹林木", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage2": "獄髓錠塗層（2/8）", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage3": "獄髓錠塗層（3/8）", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage4": "獄髓錠塗層（4/8）", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage5": "獄髓錠塗層（5/8）", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage6": "獄髓錠塗層（6/8）", + "cobblemon.ui.pokedex.info.form.netherite-coating-stage7": "獄髓錠塗層（7/8）", + "cobblemon.ui.pokedex.info.form.tree-swamp": "沼澤", + "cobblemon.ui.pokedex.info.form.tree-azalea": "杜鵑叢", + "cobblemon.ui.pokedex.info.form.tree-warped": "扭曲蕈柄", + "cobblemon.ui.pokedex.info.form.redstriped": "紅條紋", + "cobblemon.ui.pokedex.info.form.bluestriped": "藍條紋", + "cobblemon.ui.pokedex.info.form.whitestriped": "白條紋", + "cobblemon.ui.pokedex.info.form.metals-copper": "銅", + "cobblemon.ui.pokedex.info.form.metals-iron": "鐵", + "cobblemon.ui.pokedex.info.form.metals-gold": "金", + "cobblemon.ui.pokedex.info.form.metals-netherite": "獄髓錠", + "cobblemon.ui.pokedex.info.unimplemented": "未實現", + "cobblemon.ui.pokedex.search": "搜尋", + "cobblemon.ui.pokedex.unknown": "???", + "cobblemon.ui.pokedex.weight": "體重： %1$skg", + "cobblemon.ui.pokedex.height": "身高： %1$skg", + "cobblemon.pokedex.variation.cream": "奶油" } From d7242d2895311ecd38b79fafd726f3d537699c8f Mon Sep 17 00:00:00 2001 From: washashu0905 Date: Wed, 8 Jan 2025 21:09:00 +0000 Subject: [PATCH 020/121] Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 70.2% (4491 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/zh_Hant/ --- .../assets/cobblemon/lang/zh_tw.json | 79 ++++++++++++++++++- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json index d366191b85..9ef82409b0 100644 --- a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json +++ b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json @@ -1223,7 +1223,7 @@ "cobblemon.battle.end.encore": "%1$s的再來一次狀態解除了！", "cobblemon.battle.end.attract": "%1$s不再迷戀對方了！", "cobblemon.battle.end.futuresight": "%1$s受到了預知未來的攻擊！", - "cobblemon.battle.end.embargo": "%1$s再次可以使用道具了！", + "cobblemon.battle.end.embargo": "%1$s 可以再次使用道具了！", "cobblemon.battle.end.substitute": "%1$s的替身消失了！", "cobblemon.battle.end.uproar": "%1$s冷靜下來了。", "cobblemon.battle.end.powertrick": "%1$s互換了攻擊和防禦！", @@ -5738,5 +5738,80 @@ "cobblemon.ui.pokedex.unknown": "???", "cobblemon.ui.pokedex.weight": "體重： %1$skg", "cobblemon.ui.pokedex.height": "身高： %1$skg", - "cobblemon.pokedex.variation.cream": "奶油" + "cobblemon.pokedex.variation.cream": "奶油", + "cobblemon.battle.error.player_distance": "%1$s 距離太遠了，無法開啟多人對戰！", + "cobblemon.challenge.multi.team_reject.existing_team": "你已經在一個隊伍了！", + "cobblemon.battle.types.singles": "單人對戰", + "cobblemon.battle.activate.mummy": "%1$s 的能力變成了木乃伊！", + "cobblemon.battle.enditem.focusband": "%1$s 用氣勢頭帶撑住了！", + "cobblemon.battle.detailschange.noice": "%1$s 的樣子發生了變化！", + "cobblemon.challenge.multi.team_request.receiver": "%1$s 想要與你組隊參加多人對戰！", + "cobblemon.battle.switch.other": "%1$s 派出了 %2$s！", + "tag.item.cobblemon.tumblestone_bricks": "玉石磚", + "cobblemon.challenge.pending": "你有一個來自 %1$s 的未回覆挑戰！", + "cobblemon.command.error.nonpc": "錯誤：你需要包含一個有效的 NPC 標籤。", + "cobblemon.command.freezepokemon.non_pokemon": "你並沒有看著一隻寶可夢。", + "cobblemon.challenge.multi.decline.disband": "對方的隊伍解散了，多人對戰被取消了...", + "advancements.cobblemon.craft_rod": "去釣魚了", + "cobblemon.battle.damage.ironbarbs": "%1$s 受傷了！", + "advancements.cobblemon.craft_rod.description": "使用寶可夢釣竿鍛造模板製作一個寶可夢釣竿", + "cobblemon.battle.superEffective_spread": "這對 %1$s 效果絕佳！", + "cobblemon.battle.types.freeforall": "皇家對戰", + "cobblemon.battle.start.flashfire": "%1$s 的火焰招式威力提升了！", + "cobblemon.battle.cant.nopp": "%1$s 因 PP 耗盡了，無法使出 %2$s！", + "cobblemon.battle.enditem.ejectpack": "%1$s 用避難背包回去了！", + "gamerule.mobTargetInBattle": "對戰時不會成為怪物目標（如若已被鎖定則無法移除）", + "cobblemon.battle.damage.roughskin": "%1$s 受傷了！", + "cobblemon.battle.error.player_different_dimension": "有不屬於同一維度的參與者。", + "tag.item.cobblemon.held.terrain_seeds": "場地種子", + "cobblemon.challenge.multi.leave": "離開", + "key.cobblemon.pokedex": "打開寶可夢圖鑑", + "cobblemon.challenge.challenge": "挑戰", + "cobblemon.challenge.request_battle_title": "請求對戰", + "cobblemon.challenge.rule.level": "等級調至 %1$s", + "cobblemon.challenge.rule.anything_goes": "無限制", + "cobblemon.challenge.request_team_join_title": "邀請請求", + "cobblemon.challenge.request_team_leave_title": "離開隊伍", + "cobblemon.challenge.multi.team_request.sender": "你邀請了 %1$s 組隊參加多人對戰！", + "cobblemon.challenge.multi.team_request.accept.sender": "你接受了 %1$s 的組隊邀請！", + "cobblemon.challenge.multi.team_request.accept.receiver": "%1$s 接受了你的組隊邀請！", + "cobblemon.challenge.multi.team_request.decline.sender": "你拒絕了 %1$s 的組隊邀請！", + "cobblemon.challenge.multi.team_request.decline.receiver": "%1$s 拒絕了你的組隊邀請！", + "cobblemon.challenge.multi.team_remove.receiver": "%1$s 離開了隊伍！", + "cobblemon.challenge.multi.team_remove.sender": "你離開了隊伍！", + "cobblemon.challenge.multi.team_disband": "隊伍解散了。", + "cobblemon.challenge.multi.team_reject.max_team_size": "無法加入，這個已經滿了", + "cobblemon.challenge.multi.sender": "你向 %1$s 和 %2$s 發起了多人對戰！", + "cobblemon.challenge.multi.receiver": "%1$s 和 %2$s 向你發起了多人對戰！", + "cobblemon.challenge.multi.invite": "邀請", + "cobblemon.challenge.multi.decline.receiver": "%1$s 拒絕了你的多人對戰...", + "cobblemon.challenge.multi.decline.sender": "%1$s 拒絕了 %2$s 的多人對戰...", + "cobblemon.challenge.multi.decline.sender.personal": "你拒絕了 %1$s 的多人對戰...", + "cobblemon.challenge.decline.sender": "你拒絕了 %1$s 的挑戰...", + "cobblemon.challenge.decline.receiver": "%1$s 拒絕了你的挑戰...", + "advancements.cobblemon.use_bait.description": "使用莓果作為寶可夢釣竿的誘餌", + "advancements.cobblemon.craft_master_rod.description": "使用大師球製作一個寶可夢釣竿", + "cobblemon.battle.shift": "%1$s 移動到了中心", + "cobblemon.battle.center": "自動居中！", + "cobblemon.battle.resisted_spread": "這對 %1$s 效果不好。", + "cobblemon.battle.crit_spread": "擊中了 %1$s 的要害！", + "cobblemon.battle.types.doubles": "雙人對戰", + "cobblemon.battle.types.triples": "三人對戰", + "cobblemon.battle.types.multi": "多人對戰", + "cobblemon.battle.select_target": "選擇目標", + "cobblemon.battle.start.confusion": "%1$s 陷入混亂了！", + "cobblemon.battle.activate.allyswitch": "%1$s 和 %2$s 互換了場地！", + "cobblemon.battle.activate.custapberry": "%1$s 使用了釋陀果後，行動變快了！", + "cobblemon.battle.end.neutralizinggas": "化學變化氣體的效果消失了！", + "cobblemon.battle.error.incorrect_player_count": "需要 %1$s 名玩家，目前只有 %2%s 名。", + "cobblemon.battle.error.no_party": "%1$s 沒有寶可夢可以用於戰鬥。", + "cobblemon.battle.heal.bagitemrevive": "%1$s 從昏厥中恢復過來！", + "cobblemon.battle.detailschange.eiscue": "%1$s 的樣子發生了變化！", + "cobblemon.battle.switch.self": "去吧！ %1$s！", + "cobblemon.battle.switch.other.nickname": "%1$s 派出了 %2$s（%3$s）！", + "cobblemon.battle.withdraw.self": "%1$s，回来！", + "cobblemon.battle.withdraw.other": "%1$s 撤回了 %2$s！", + "cobblemon.type.suffix": "%1$s 屬性", + "gamerule.battleInvulnerability": "戰鬥時無敵", + "tag.item.cobblemon.red_tumblestone_bricks": "玉石磚" } From 655a467193e0bcae47ec5615847c0a7a490c8b53 Mon Sep 17 00:00:00 2001 From: Gustavo Puerari Date: Fri, 10 Jan 2025 18:40:41 +0000 Subject: [PATCH 021/121] Translated using Weblate (Portuguese (Brazil)) Currently translated at 41.0% (2623 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/ --- .../assets/cobblemon/lang/pt_br.json | 74 ++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/pt_br.json b/common/src/main/resources/assets/cobblemon/lang/pt_br.json index 2c33912af5..a3fbf2e5ff 100644 --- a/common/src/main/resources/assets/cobblemon/lang/pt_br.json +++ b/common/src/main/resources/assets/cobblemon/lang/pt_br.json @@ -2622,5 +2622,77 @@ "cobblemon.species.milotic.desc": "Dizem que o simples vislumbre de Milotic e sua beleza acalma quaisquer emoções hostis que possa estar sentindo.", "cobblemon.species.feebas.name": "Feebas", "cobblemon.species.feebas.desc": "É um Pokémon feio e repulsivo. Entretanto, é muito resistente e pode sobreviver em lugares com pouca água.", - "cobblemon.species.milotic.name": "Milotic" + "cobblemon.species.milotic.name": "Milotic", + "cobblemon.species.wynaut.desc": "Tende a viajar em grupo. Eles se aglomeram em pequenos grupos para dormirem em cavernas.", + "cobblemon.species.spheal.desc": "Na temporada em que gelo à deriva chega nas costas, Spheal prefere viver no gelo por ter menos predadores em comparação à terra firme. Seu pelo retém calor com excelência e pode resistir a frios extremos.", + "cobblemon.species.clamperl.desc": "A pérola de Clamperl são extremamente preciosas. Podem custar mais de 10 vezes o valor de uma pérola de Shellder.", + "cobblemon.species.regirock.desc": "Tecnologia de ponta foi utilizada para estudar a parte interna do corpo rochoso desse Pokémon, mas nada foi encontrado — nem mesmo um cérebro ou coração.", + "cobblemon.species.registeel.desc": "É teorizado que esse Pokémon nasceu muito abaixo do manto do planeta e que emergiu para a superfície 10,000 anos atrás.", + "cobblemon.species.snorunt.desc": "Chega junto da primeira nevasca. Acredita-se que as casas que Snorunt visita prosperarão por muitas gerações. Segundo a tradição, pode ser que um deles ofereça um bloco de gelo feito de água pura na porta da casa de alguém.", + "cobblemon.species.relicanth.desc": "Esse Pokémon foi descoberto durante uma exploração de mar profundo. Sua aparência permaneceu a mesma por 100.000.000 anos, por isso é chamado de fóssil vivo.", + "cobblemon.species.bagon.desc": "Bagon é um Pokémon solitário que não forma grupos com outros de sua espécie. Também tem uma cabeça forte o suficiente para partir uma rocha ao meio em um único golpe.", + "cobblemon.species.metang.desc": "Usando magnetismo para se manter no ar, esse Pokémon voa em altas velocidades, explorando terrenos montanhosos em busca de presas.", + "cobblemon.species.latios.desc": "Latios abre seu coração apenas para um Treinador com um espírito empático. Esse Pokémon pode voar mais rápido do que um avião a jato ao dobrar seus braços para minimizar a resistência do ar.", + "cobblemon.species.deoxys.desc": "Deoxys surgiu de um vírus que veio do espaço. É altamente inteligente e possui poderes psicocinéticos. Esse Pokémon dispara lasers do órgão cristalino em seu peito.", + "cobblemon.species.rayquaza.desc": "Rayquaza voa eternamente na camada de ozônio, consumindo meteoritos como parte de sua alimentação. Os muitos meteoritos em seu corpo o fornecem a energia que precisa para Mega Evoluir.", + "cobblemon.species.dusclops.name": "Dusclops", + "cobblemon.species.dusclops.desc": "Há rumores de que olhar dentro de seu corpo mumificado faz com que você seja puxado pelas frestas, não retornando jamais. Tenho medo demais para verificar.", + "cobblemon.species.tropius.desc": "Cachos de frutas deliciosas crescem em seu pescoço. Em áreas quentes, muitos ranchos criam Tropius.", + "cobblemon.species.chimecho.name": "Chimecho", + "cobblemon.species.chimecho.desc": "Pode produzir ventos fortes o suficiente para derrubar presas mais altas do que si mesmo. Eu teorizo que Chimecho amplifica o suave som do vento dentro de seu corpo.", + "cobblemon.species.absol.name": "Absol", + "cobblemon.species.absol.desc": "Por conta de sua habilidade de prever acidentes, as pessoas confundem Absol com um símbolo de mau agouro.", + "cobblemon.species.wynaut.name": "Wynaut", + "cobblemon.species.snorunt.name": "Snorunt", + "cobblemon.species.glalie.desc": "Cobre seu corpo com uma armadura de gelo mais dura que metal. Glalie usa seu sopro para congelar presas, as quais então devora como se fossem um petisco gelado.", + "cobblemon.species.spheal.name": "Spheal", + "cobblemon.species.sealeo.name": "Sealeo", + "cobblemon.species.sealeo.desc": "Seus bigodes brancos são muito sensíveis. Sealeo equilibra Spheal na ponta de seu nariz, analisando seu cheiro e sua forma para garantir que esteja saudável.", + "cobblemon.species.walrein.name": "Walrein", + "cobblemon.species.walrein.desc": "Suas grandes presas são fortes o suficiente para partir gelo à deriva. Seus dentes costumam quebrar, mas crescem dentro de um ano, apenas. A região de Hisui é famosa por conta dessas presas quebradas.", + "cobblemon.species.clamperl.name": "Clamperl", + "cobblemon.species.huntail.name": "Huntail", + "cobblemon.species.huntail.desc": "Fazem dos oceanos profundos seu habitat. De acordo com a tradição, quando Huntail aparece na costa, algo ruim há de acontecer.", + "cobblemon.species.gorebyss.name": "Gorebyss", + "cobblemon.species.gorebyss.desc": "Gorebyss suga os fluidos corporais de sua presa. A massa restante afunda até o fundo do mar, onde acaba se tornando comida para outros Pokémon.", + "cobblemon.species.relicanth.name": "Relicanth", + "cobblemon.species.luvdisc.name": "Luvdisc", + "cobblemon.species.luvdisc.desc": "Luvdisc vive em recifes de corais em mares quentes. Gosta especialmente de dormir no espaço entre os galhos de Corsola.", + "cobblemon.species.bagon.name": "Bagon", + "cobblemon.species.shelgon.name": "Shelgon", + "cobblemon.species.shelgon.desc": "Shelgon ignora completamente sua fome, sem nunca comer nada. Aparentemente, Shelgon evolui quando todas as suas reservas de energia se esgotam.", + "cobblemon.species.salamence.name": "Salamence", + "cobblemon.species.salamence.desc": "Apesar da alegria de voar manter esse Pokémon contente, Salamence pode se tornar uma ameaça caso algo o irrite.", + "cobblemon.species.beldum.name": "Beldum", + "cobblemon.species.beldum.desc": "As células no corpo desse Pokémon são compostas de material magnético. Ao invés de sangue, forças magnéticas fluem pelo corpo de Beldum.", + "cobblemon.species.metang.name": "Metang", + "cobblemon.species.metagross.name": "Metagross", + "cobblemon.species.metagross.desc": "Metagross é o resultado da fusão de dois Metang. Esse Pokémon derrota seus oponentes usando sua inteligência aquém à de um supercomputador.", + "cobblemon.species.regirock.name": "Regirock", + "cobblemon.species.regice.name": "Regice", + "cobblemon.species.regice.desc": "O corpo desse Pokémon é feito de gelo maciço. Acredita-se que Regice nasceu sob o gelo espesso da era do gelo.", + "cobblemon.species.registeel.name": "Registeel", + "cobblemon.species.latias.name": "Latias", + "cobblemon.species.latias.desc": "Latias é muito inteligente e capaz de compreender a fala humana. Seu corpo é coberto por uma penugem semelhante a vidro com a qual reflete a luz para alterar sua aparência.", + "cobblemon.species.latios.name": "Latios", + "cobblemon.species.kyogre.name": "Kyogre", + "cobblemon.species.kyogre.desc": "Acredita-se que Kyogre seja a personificação do próprio mar. As lendas contam sobre seus vários conflitos com Groudon com o objetivo de adquirir o poder da natureza.", + "cobblemon.species.groudon.name": "Groudon", + "cobblemon.species.groudon.desc": "Através da Reversão Primal e com o poder completo da natureza, recuperará sua verdadeira forma. Groudon pode usar magma para entrar em erupção e expandir a massa terrestre do mundo.", + "cobblemon.species.rayquaza.name": "Rayquaza", + "cobblemon.species.jirachi.name": "Jirachi", + "cobblemon.species.jirachi.desc": "Acredita-se que quando esse Pokémon acorda de seu sono milenar vai realizar quaisquer desejos escritos em anotações presas em sua cabeça.", + "cobblemon.species.deoxys.name": "Deoxys", + "cobblemon.species.banette.desc": "O ressentimento por ter sido rejeitado fez esse Pokémon ganhar vida. Alguns dizem que tratá-lo bem o deixará satisfeito, e por fim voltará a ser uma boneca de pano outra vez.", + "cobblemon.species.duskull.name": "Duskull", + "cobblemon.species.duskull.desc": "Ouvi dizer que as crianças de Hisui só se comportam quando ouvem a história desse Pokémon vagando por aí na calada da noite esperando para consumir crianças malcriadas.", + "cobblemon.species.castform.name": "Castform", + "cobblemon.species.kecleon.desc": "Kecleon muda sua cor para se camuflar, e também para expressar suas emoções e seu estado de saúde. Quanto mais escura a cor, mais saudável está.", + "cobblemon.species.castform.desc": "Sua forma muda de acordo com o clima. Quanto mais extremas ficam as condições climáticas, mas extrema é a atitude de Castform!", + "cobblemon.species.kecleon.name": "Kecleon", + "cobblemon.species.shuppet.name": "Shuppet", + "cobblemon.species.shuppet.desc": "Há um provérbio que diz, \"Fuja do lar onde Shuppet se encontram na crescente escuridão.\"", + "cobblemon.species.banette.name": "Banette", + "cobblemon.species.tropius.name": "Tropius", + "cobblemon.species.glalie.name": "Glalie" } From 9d50dae3d12ff09f9063dd4c30daa3bd08465b0a Mon Sep 17 00:00:00 2001 From: washashu0905 Date: Fri, 10 Jan 2025 13:04:55 +0000 Subject: [PATCH 022/121] Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 71.8% (4591 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/zh_Hant/ --- .../assets/cobblemon/lang/zh_tw.json | 102 +++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json index 9ef82409b0..89863bb091 100644 --- a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json +++ b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json @@ -5813,5 +5813,105 @@ "cobblemon.battle.withdraw.other": "%1$s 撤回了 %2$s！", "cobblemon.type.suffix": "%1$s 屬性", "gamerule.battleInvulnerability": "戰鬥時無敵", - "tag.item.cobblemon.red_tumblestone_bricks": "玉石磚" + "tag.item.cobblemon.red_tumblestone_bricks": "玉石磚", + "cobblemon.move.glaiverush.desc": "豁出己身的魯莽突擊。使出招式後對手的攻擊必定會命中，且傷害會變成２倍。", + "cobblemon.battle.clearboost": "%1$s 的能力變化消失了！", + "cobblemon.move.devastatingdrake": "究極巨龍震天地", + "cobblemon.move.direclaw": "剋命爪", + "cobblemon.move.esperwing.desc": "用經過氣場強化的翅膀撕裂對手。容易擊中要害。自己的速度會提高。", + "cobblemon.move.esperwing": "氣場之翼", + "cobblemon.move.gigatonhammer": "巨力錘", + "cobblemon.move.gigavolthavoc": "終極伏特狂雷閃", + "cobblemon.move.glaiverush": "巨劍突擊", + "cobblemon.move.gmaxbefuddle": "超極巨蝶影蠱惑", + "cobblemon.move.gmaxcentiferno.desc": "超極巨蜈蚣所使用的火屬性攻擊。此招式可以將非火屬性的對手困住４～５回合。", + "cobblemon.move.gmaxchistrike": "超極巨會心一擊", + "cobblemon.move.gmaxcuddle": "超極巨熱情擁抱", + "cobblemon.move.gmaxcuddle.desc": "超極巨依布所使用的一般屬性攻擊。使用此招式會讓對手陷入昏迷狀態。", + "cobblemon.move.gmaxbefuddle.desc": "超極巨蝶影蠱惑會使對手全體寶可夢陷入中毒狀態、麻痺狀態或睡眠狀態。", + "cobblemon.move.gmaxcannonade": "超極巨水砲轟滅", + "cobblemon.move.gmaxcannonade.desc": "超極巨水箭龜所使用的水屬性攻擊。此招式可以將非水屬性的對手困住４回合。", + "cobblemon.move.gmaxcentiferno": "超極巨百火焚野", + "cobblemon.move.gmaxchistrike.desc": "超極巨怪力所使用的格鬥屬性攻擊。使用此招式會變得更容易擊中要害。", + "cobblemon.move.gmaxdepletion.desc": "超極巨鋁鋼龍所使用的龍屬性攻擊。使用此招式可減少對手最後使用的招式ＰＰ。", + "cobblemon.move.gmaxdrumsolo": "超極巨狂擂亂打", + "cobblemon.move.gmaxdepletion": "超極巨劣化衰變", + "cobblemon.move.gmaxdrumsolo.desc": "超極巨金剛猩所使用的草屬性攻擊。使用此招式不會受到對手特性的干擾。", + "cobblemon.subtitle.pokemon.shiny_ambient": "野生的異色寶可夢閃閃發光！", + "cobblemon.move.devastatingdrake.desc": "透過Ｚ力量將氣場實體化，向對手全力發動襲擊。威力會隨原本的招式而改變。", + "cobblemon.move.direclaw.desc": "剋命爪有50%的機率使目標陷入中毒狀態、麻痺狀態或睡眠狀態。", + "cobblemon.move.doodle.desc": "掌握對手的本質，予以描繪，使自己和同伴的特性變得和對手相同。", + "cobblemon.move.blazingtorque": "灼熱暴衝", + "cobblemon.move.axekick": "下壓踢", + "cobblemon.move.barbbarrage": "毒千針", + "cobblemon.move.ceaselessedge": "秘劍・千重濤", + "cobblemon.move.gigatonhammer.desc": "將大錘連同身體一起揮舞進行攻擊。這個招式無法連續２次使用。", + "cobblemon.pokedex.variation.season": "季節", + "cobblemon.pokedex.variation.left_ear_spot": "左耳斑點", + "cobblemon.pokedex.variation.right_ear_spot": "右耳斑點", + "cobblemon.pokedex.variation.region_bias": "地區形態", + "cobblemon.pokedex.variation.variant": "型態", + "cobblemon.ui.pokedex.info.form.snake-pattern-attack": "攻擊", + "cobblemon.ui.pokedex.info.form.snake-pattern-dark": "惡", + "cobblemon.ui.pokedex.info.form.snake-pattern-heart": "心", + "cobblemon.ui.pokedex.info.form.snake-pattern-speed": "速度", + "cobblemon.ui.pokedex.info.form.zen_mode": "達摩模式", + "cobblemon.ui.pokedex.info.form.valencian": "岱柑島", + "cobblemon.pokedex.variation.decoration": "糖飾", + "cobblemon.pokedex.variation.face_spot_1": "左臉斑點", + "cobblemon.pokedex.variation.face_spot_2": "右臉斑點", + "cobblemon.pokedex.variation.special_spot": "特殊斑點", + "cobblemon.pokedex.variation.wood": "木頭", + "cobblemon.pokedex.variation.snake_pattern": "蛇紋", + "cobblemon.subtitle.pokemon.shiny_shine": "擁有的異色寶可夢", + "cobblemon.subtitle.pokemon.wild_shiny_shine": "野生的異色寶可夢！", + "cobblemon.subtitle.pokemon.owned_shiny_ambient": "周圍的異色寶可夢閃閃發光", + "tag.item.cobblemon.black_tumblestone_bricks": "黑玉石磚", + "tag.item.cobblemon.sky_tumblestone_bricks": "天藍玉石磚", + "tag.item.cobblemon.poke_rods": "寶可夢釣竿", + "tag.item.cobblemon.evolution_stone_blocks": "進化石塊", + "tag.item.cobblemon.pokedex": "寶可夢圖鑑", + "tag.item.cobblemon.pokedex_screen": "圖鑑螢幕", + "npc.sacchi.name": "薩基教授", + "cobblemon.move.aciddownpour": "強酸劇毒滅絕雨", + "cobblemon.move.aciddownpour.desc": "透過Ｚ力量湧起毒沼，全力使對手下沉。威力會隨原本的招式而改變。", + "cobblemon.move.alloutpummeling": "全力無雙激烈拳", + "cobblemon.move.alloutpummeling.desc": "將透過Ｚ力量製造的能量彈全力撞向對手。威力會隨原本的招式而改變。", + "cobblemon.move.aquacutter": "水波刀", + "cobblemon.move.aquacutter.desc": "噴射出經過加壓的水，如刀刃似地劈開對手。容易擊中要害。", + "cobblemon.move.aquastep": "流水旋舞", + "cobblemon.move.aquastep.desc": "以盈盈欲滴的輕巧步伐戲弄對手，給予傷害。會提高自己的速度。", + "cobblemon.move.armorcannon": "鎧農炮", + "cobblemon.move.armorcannon.desc": "將自身的鎧甲做成熊熊燃燒的砲彈擊發進行攻擊。自己的防禦和特防會降低。", + "cobblemon.move.axekick.desc": "劈下踢起的腳跟攻擊對手。有時會使對手混亂。沒命中對手時自己會受到傷害。", + "cobblemon.move.barbbarrage.desc": "用無數的毒針進行攻擊。有時還會讓對手陷入中毒狀態。攻擊處於異常狀態的對手時，威力會變成２倍。", + "cobblemon.move.bitterblade": "悔念劍", + "cobblemon.move.bitterblade.desc": "將對這個世界的牽掛注入劍尖進行劈斬。可以回復給予對手傷害的一半ＨＰ。", + "cobblemon.move.bittermalice": "冤冤相報", + "cobblemon.move.bittermalice.desc": "用令人毛骨悚然的怨念進行攻擊，降低對手的攻擊。", + "cobblemon.move.blackholeeclipse": "黑洞吞噬萬物滅", + "cobblemon.move.blackholeeclipse.desc": "透過Ｚ力量收集惡能量，全力將對手吸入。威力會隨原本的招式而改變。", + "cobblemon.move.blazingtorque.desc": "灼熱暴衝有30%的機率使目標陷入灼傷狀態。", + "cobblemon.move.bleakwindstorm": "枯葉風暴", + "cobblemon.move.bleakwindstorm.desc": "用足以讓身心都止不住顫抖的冰冷狂風進行攻擊。有時還會讓對手陷入凍傷狀態。", + "cobblemon.move.bloomdoom": "絢爛繽紛花怒放", + "cobblemon.move.bloomdoom.desc": "透過Ｚ力量借助花草的能量，全力攻擊對手。威力會隨原本的招式而改變。", + "cobblemon.move.breakneckblitz": "究極無敵大衝撞", + "cobblemon.move.breakneckblitz.desc": "透過Ｚ力量氣勢猛烈地全力撞擊對手。威力會隨原本的招式而改變。", + "cobblemon.move.ceaselessedge.desc": "用貝殼之劍進行攻擊。碎裂開的貝殼碎片會變成撒菱散落在對手腳下。", + "cobblemon.move.collisioncourse": "全開猛撞", + "cobblemon.move.collisioncourse.desc": "一邊變形，一邊氣勢洶洶地落下，引發古代的大爆炸。打到弱點時威力會更為增加。", + "cobblemon.move.combattorque": "格鬥暴衝", + "cobblemon.move.combattorque.desc": "格鬥暴衝有30%的機率使目標陷入麻痺狀態。", + "cobblemon.move.comeuppance": "復仇", + "cobblemon.move.comeuppance.desc": "將發動攻擊前最後受到的招式傷害放大，向對手進行報復。", + "cobblemon.move.continentalcrush": "毀天滅地巨岩墜", + "cobblemon.move.continentalcrush.desc": "透過Ｚ力量召喚大大的岩山，全力撞向對手。威力會隨原本的招式而改變。", + "cobblemon.move.corkscrewcrash": "超絕螺旋連擊", + "cobblemon.move.corkscrewcrash.desc": "透過Ｚ力量進行高速旋轉，全力撞擊對手。威力會隨原本的招式而改變。", + "cobblemon.move.doodle": "描繪", + "cobblemon.move.filletaway": "甩肉", + "cobblemon.move.filletaway.desc": "削減自己的ＨＰ，大幅提高自己的攻擊、特攻和速度。", + "cobblemon.move.flowertrick": "千變萬花", + "cobblemon.move.flowertrick.desc": "將動過手腳的花束投向對手進行攻擊。必定會命中並擊中要害。" } From 6f5a298a5cb8835b0d6b131b8ab63073b1723d6d Mon Sep 17 00:00:00 2001 From: Nico Merenq Date: Sat, 11 Jan 2025 22:42:10 +0000 Subject: [PATCH 023/121] Translated using Weblate (Russian) Currently translated at 83.4% (5332 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/ru/ --- common/src/main/resources/assets/cobblemon/lang/ru_ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json index 4dd1ab843b..fd007a68cd 100644 --- a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json +++ b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json @@ -4648,7 +4648,7 @@ "cobblemon.species.thundurus.name": "Тандорус", "cobblemon.species.thundurus.desc": "They say this wielder of electricity has waged war with its nemesis, Tornadus, since time immemorial. The lightning bolts it hurls pierce the very earth and enrich the soil.", "cobblemon.species.reshiram.name": "Реширам", - "cobblemon.species.reshiram.desc": "According to myth, if people ignore truth and let themselves become consumed by greed, Reshiram will arrive to burn their kingdoms down.", + "cobblemon.species.reshiram.desc": "Этот Покемон упоминается в легендах. Он выпускает пламя из своего хвоста, сжигая всё вокруг. (Black)\nКогда хвост Реширама вспыхивает, его жар меняет атмосферу и погоду в мире. (White)\nЭтот легендарный Покемон может испепелить мир своим огнём. Он помогает тем, кто хочет построить мир правды. (Black 2/White2)", "cobblemon.species.zekrom.name": "Зекром", "cobblemon.species.zekrom.desc": "Mythology tells us that if people lose the righteousness in their hearts, their kingdoms will be razed by Zekrom’s lightning.", "cobblemon.species.landorus.name": "Ландорус", From df852ace9b80c688e0b40cce1dcb9b4742355c74 Mon Sep 17 00:00:00 2001 From: Gustavo Puerari Date: Mon, 13 Jan 2025 18:29:41 +0000 Subject: [PATCH 024/121] Translated using Weblate (Portuguese (Brazil)) Currently translated at 41.2% (2634 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/ --- .../assets/cobblemon/lang/pt_br.json | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/pt_br.json b/common/src/main/resources/assets/cobblemon/lang/pt_br.json index a3fbf2e5ff..fe840e1241 100644 --- a/common/src/main/resources/assets/cobblemon/lang/pt_br.json +++ b/common/src/main/resources/assets/cobblemon/lang/pt_br.json @@ -2694,5 +2694,28 @@ "cobblemon.species.shuppet.desc": "Há um provérbio que diz, \"Fuja do lar onde Shuppet se encontram na crescente escuridão.\"", "cobblemon.species.banette.name": "Banette", "cobblemon.species.tropius.name": "Tropius", - "cobblemon.species.glalie.name": "Glalie" + "cobblemon.species.glalie.name": "Glalie", + "cobblemon.species.piplup.desc": "Prefere climas frios e vive em costas. É um pequenino adorável — fofo como um bebê — mas também é orgulhoso e não tolera qualquer tipo de agrado.", + "cobblemon.species.prinplup.desc": "Nada graciosamente pelos mares gelados e canta com uma voz potente como as marés. Tem asas poderosas e resistentes, e uma honra para acompanhar.", + "cobblemon.species.starly.desc": "Vivem em campos e montanhas, se reunindo em grandes grupos. Seu canto é bem desagradável. Apesar de pequeno, suas asas são fortes —a dor de um golpe delas pode durar por uma semana.", + "cobblemon.species.turtwig.name": "Turtwig", + "cobblemon.species.turtwig.desc": "Quanto mais ensolarado o dia, mais animado fica esse Pokémon. A parte que se parece com um casco é similar a lama é levemente úmida e morna ao toque.", + "cobblemon.species.grotle.name": "Grotle", + "cobblemon.species.grotle.desc": "Aparece onde há água limpa para beber. A fruta que cresce nos arbustos em seu casco é doce, nutritiva e muito deliciosa.", + "cobblemon.species.torterra.name": "Torterra", + "cobblemon.species.torterra.desc": "Esse Pokémon grande e imponente carrega em suas costas um belo jardim e sua força é incomparável. Torterra vaga pela natureza em busca de água limpa para beber.", + "cobblemon.species.chimchar.name": "Chimchar", + "cobblemon.species.chimchar.desc": "Cheio de vigor e sempre animado. Antigamente era chamado de \"Cauda de Lanterna\" e temido tal qual uma aparição.", + "cobblemon.species.monferno.name": "Monferno", + "cobblemon.species.monferno.desc": "Quando mais escuro o azul em sua face, mais poderoso se tornará. Pula de todas as formas e golpeia seus oponentes com a chama em sua cauda.", + "cobblemon.species.infernape.name": "Infernape", + "cobblemon.species.infernape.desc": "Um Pokémon resistente e alto com uma aparência encantadora. Se reveste de chamas e batalha como se estivesse em uma dança — é algo realmente incrível de se ver.", + "cobblemon.species.piplup.name": "Piplup", + "cobblemon.species.prinplup.name": "Prinplup", + "cobblemon.species.empoleon.name": "Empoleon", + "cobblemon.species.empoleon.desc": "Desde antigamente é reverenciado pelo povo de Hisui, que chama-o de Mestre das Ondas. Suas asas são tão afiadas quanto as lâminas produzidas pelos mestres da forja.", + "cobblemon.species.starly.name": "Starly", + "cobblemon.species.staravia.name": "Staravia", + "cobblemon.species.staravia.desc": "Formam revoadas surpreendentemente grandes e constantemente brigam entre si. Suspeito que aqueles com plumas magníficas em suas cabeças são os mais fortes.", + "cobblemon.species.staraptor.name": "Staraptor" } From a453199eae93f00c55590666e30494c4ca53daac Mon Sep 17 00:00:00 2001 From: Konoha Date: Fri, 17 Jan 2025 23:00:52 -0500 Subject: [PATCH 025/121] It was new, sorry! Reimplements the new Shelmet/Karrablast evo method. --- .../species/generation5/karrablast.json | 9 ++++++ .../species/generation5/shelmet.json | 32 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json index c8fcc61b77..9b8c2be23e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json @@ -129,6 +129,15 @@ "learnableMoves": [], "requirements": [], "requiredContext": "shelmet" + }, + { + "id": "karrablast_escavalier_item", + "variant": "item_interact", + "result": "escavalier", + "consumeHeldItem": true, + "learnableMoves": [], + "requirements": [], + "requiredContext": "cobblemon:shell_helmet" } ], "baseScale": 0.5, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json index ea046078c7..1a5b3c49b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json @@ -126,6 +126,38 @@ "learnableMoves": [], "requirements": [], "requiredContext": "karrablast" + }, + { + "id": "shelmet_accelgor_item", + "variant": "item_interact", + "result": "accelgor", + "consumeHeldItem": false, + "learnableMoves": [], + "requirements": [ + { + "variant": "party_member", + "target": "karrablast", + "contains": true + } + ], + "requiredContext": "cobblemon:link_cable", + "drops": { + "amount": 1, + "entries": [ + { + "type": "evolution", + "item": "cobblemon:shell_helmet", + "percentage": 100, + "requirements": [ + { + "variant": "party_member", + "target": "karrablast", + "contains": true + } + ] + } + ] + } } ], "baseScale": 0.7, From b9fb970ec4f598e234fff766bd799763c7e55570 Mon Sep 17 00:00:00 2001 From: Sterrezo Date: Sat, 18 Jan 2025 05:43:52 +0100 Subject: [PATCH 026/121] Added trailer cries, updated Sceptile's cry --- CHANGELOG.md | 8 ++++++++ .../0236_tyrogue/tyrogue.animation.json | 2 +- .../0237_hitmontop/hitmontop.animation.json | 2 +- .../sounds/pokemon/cloyster/cloyster_cry.ogg | Bin 3574 -> 27444 bytes .../pokemon/hitmontop/hitmontop_cry.ogg | Bin 3574 -> 16225 bytes .../sounds/pokemon/sceptile/sceptile_cry.ogg | Bin 25326 -> 25286 bytes .../sounds/pokemon/shellder/shellder_cry.ogg | Bin 3574 -> 23676 bytes .../sounds/pokemon/spinda/spinda_cry.ogg | Bin 3574 -> 14584 bytes .../sounds/pokemon/tyrogue/tyrogue_cry.ogg | Bin 3574 -> 18472 bytes 9 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d0673c4d5..f0ed08d291 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,11 @@ #### Gen 9 - Paldean Tauros's +### Added cries to the following Pokémon +- Shellder, Cloyster +- Tyrogue, Hitmontop +- Spinda + ### Animation updates for the following Pokémon - Primeape - Munchlax @@ -87,6 +92,9 @@ - Graveler - Golem +### Cry updates for the following Pokémon +- Sceptile + ### Fixes - Fixed Pokédex sometimes crashing when switching forms. - Fixed Pokédex interface not transitioning out when closed. diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0236_tyrogue/tyrogue.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0236_tyrogue/tyrogue.animation.json index a9f6ac130f..8ae17ec611 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0236_tyrogue/tyrogue.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0236_tyrogue/tyrogue.animation.json @@ -1802,7 +1802,7 @@ }, "sound_effects": { "0.0": { - "effect": "tyrogue_ambient" + "effect": "pokemon.tyrogue.cry" } } }, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0237_hitmontop/hitmontop.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0237_hitmontop/hitmontop.animation.json index def8337e7a..4588059228 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0237_hitmontop/hitmontop.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0237_hitmontop/hitmontop.animation.json @@ -1600,7 +1600,7 @@ }, "sound_effects": { "0.4167": { - "effect": "hitmontop_ambient" + "effect": "pokemon.hitmontop.cry" } } }, diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/cloyster/cloyster_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/cloyster/cloyster_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..621b0ab7c99d05a6d67d59237c75201a3a6338c6 100644 GIT binary patch literal 27444 zcmb4q1ymf(*5Kd-4;DfOOG0pWw-6kHTYv-!?(PsQxVw9BcMmeSyZhkI;LJ|)z4!m` z{CjryY;|>=n!a84*0riz)inyn#>xPAz`v3tdpW|NYAW*w3^-CaCu=)>Q~N&;;69eZ z$}714x*OpX{yKz&x=^FTU=gD;iI^c zz`vd%{qr7;sF)fY02KyjktOf-8IMv00B`_+ukUHFV!un#Kx6GE_mgGa&x@7k z-T##v!FxbmJ1&aOP&+9t%QB;8P~L{D<6%F_15W!_@!~HZuj{wGaA zk{t}yKWvc$d|+$>B%<-9s_=)ZfFl#{6)xx%@i->f#FbU#RAI?cN8QP2&dG7k$x|~a zK)caXvoSz>K0xOt;2Tlkzw)i;+RdN*mvwSDK-N2+ge{t!x5PP{JUIydfu-;O!#^S+ ze-ZPRCMH*^;JaD5X==SmNxkJzHT_UE#@|-}aIjbYq%6~vg8wal*Gw?_e`jHnep-Mq zOqL*9AjtN;xYB!&9X-ll3HJkFIu%x;@3mu>uxAI^^TV=)!^eR**^w(*?0+lakJ~1J+h^JZ1M+6F#gK9G6N}*QD|f zzJHlTk#5>(7taQ)Met&(dD9CWSnbX*?PTP|pJ)Hme1u_o`!-M1m;Qs?GXhy3pQ3;w zmee5jRzpC*qqJmQmdk>6*f*HrlqKmKw~4gmP${I%kL7k^FpA1ls_385XNt{G+> zqW@Erc8~HNR(9ivVX(lgn4SY>#o=|k8TREolIHn!vs!fdaZ1uO`TuwnOsV9CQ6k8% z|2j!vlHDLpA&<5EL_&b;H= zoafqHxZbP4|7lqNyy%O66#Q?`vBd{P0|%nt%T&LYo1`DP zU{||nsG8(s5jDX@YJmTm&5$yHfwW^|KT}* zT;wfJ#Fk_X;(vQi7InlXcf>oXnD?47A6yfRgHwuPhb@ffG~Pc(N?Jf;RHP^BlAHpBZy;?-$6z!~)FljFw%x%& zgbjO$07U@6hb54uhsbVJY9R09C<{$`TtAOQe(aTAr#hpexwb*`R6(LqO1)ksrC zRa4Dqfly6z)>8%sRhC;IP*qJ(UAVSXP4HZE(9uyhTDVcwgg7p}3fzHs=Kds zTudKYOgmJ3bl*-p)XY#^Tn58(SU~sCe)2G1ee$NT_@J3~sl95jy5g|CqSkTcMqnxq z<`kYQDyn*kj%(CQ&CFrN#fQc84}G*l?UfIL&F6TZRA(GjodR^?E%oNZ(<>j^tA?9L z8a?%Rtn}0q)-)~x8tWM_YOL9;^tkT(DlkB-+sOr%q2zSOSmZ^1 zEupAXnLdW-PLlsH4^6gzf+!7xBaRXp3?OaFP)BGk&CrJ>DxDn%1C-?_=*yP%YOo+v z*vm@yrNw=gmdTErg`sl5QaT{dQ&BQ2i<{Q(O^UsIRx(L>ShNc(RD-!=W zUR0WR6@5CII#{pDU;yg;UPA3MnmRSHzo_VGdgt{^>Uz}-U<`hiHiywrGUq6m)yIGl zSNcmlwCdl)X{+L6v}CJh=Cw*W>Ie4a(XI|Mm(7;F+B@DC4;K%lV(~ z=FghJI4Ax?99NsV=nrw2ApR29`ZsY6b2Em%zrE5hC>H>!87P#&dR1Cir)FNt0oE|6 zfJIFh+_3p6=`%7KrsfO4M>qhEKXq?f95MwcEjNz5C&@347DOI5snrXNQ_?z2i=9*o zOZQXy!@#swSY1M#7K{s6@QDV5#a|ZVaT>s^KV#58elHp(ViKh|$buR!A`R1!QV0t; z@1r!!Zd%+h3;2Cr919p27bl9EpEs$5njIIXLP92!T@Kq`r+W&~o`Zp68qSAkYWJ#L8k#gRj3AHcjPeEia|2KN( z0TCI%M4R>}n1)3ne*my>1Qu5RiAlm>0N76$vwuRA{{s^^Z~p`grg?v(2KGOp!{6Hf zPeBP25^T=LK?B&f+5oPS|C5QLKXVEi4^q0n3UPj#UzD^o4Tm%j6$Ok+$sb9XSM_S} zP*LX3YL!;Oeumb~rr1+a!d#-P4mNp&)$K0Yk5l9mnvcMQBx7C$(jY<__0)%nivVDB3 z&mt-N3ppfYAMn-Imx2ty%Fa2-$e1+*c;#R_=Zo_L$Df=K<+Ct6mVDzzFc<#@GSwb_ zJnugdI3mCW0FdPL`T5gimz$SgP+0WiCrN2p`Op8X6;T0#06+{r`P;WCJP}xt*iksq zFJo|H@#0`n_CJZ7ocwPEwsHfIlmD|=6lVGd_Ghv92hYI7+m1KdU%x@kp!85W*sTgx zf~r9kp{`J8s6Eta8MQZg9(pv=wV(8KczotY7pd;}L|p#q&_+*3Tra$|fnRsVv2_jN z#rOU|5nzqi|sT4!QJN7$q4)#`QUO zaA?O7iv=>qcv$r5TK`MM3H*AE#J$t~Ny+{G3JPuA2fcdnKq$m|cNd9u$D~O-b6^q# zR?AYw>A;RD?5plQS`}EHP8~aWl-_#JuJ|f)=@buPUI*_cJ z!s~hKSdJIvh|cII-w;_GZ!0e-Ez9p6T-GErj-rb#vc+Rx|0Uel8ba-=j_sCV^>+OZ zzM(vsCnQ>Ohr_^8@cH1Z zaSzf%n9ed0Pl{c0BvjNc!sg9p=-xfoQEndzKgzuJS!+`cA$z3y=x z6s>4zOGV{-h;+u>VJSLrCsASNT1i{8_`{ZAtSn5?X-fgt;c}D&=kp!`86bO2^Wnp$xKt4g*rd`S@zo z+ZU8#3a_-pnK6e#Nml3#M~)Ay+GXg_x5MIsI|4|N+Cgtrn3HCc-$$M13CyTj?Csph zlN2I!4g+3yhHCRh@e20~W&0{iVF3E$kp(ywIn6PYv^YA3?C+jANF5_1jnuu=Q;;r5 zN*WR$CiD0!8bNK>JymZjUk~!C1$0{ZqWl`&XgDS>{O+IX-@ILPwfyU{HA)l%&(gT^ z!XhFRUUet`-uwl@ARU#qcY4~L!?CnTsJN6{Y#h1(IV4L$rjVVToI9SbR(B97{bHOf zGP?Zttb8P+t@cqoBK3m^2mJe5LF?bVf-kg!idjrug@ms~z}zwziX+_v7YS3?v+MDy zM&Eea>K4oLp5o&9I#Y{9(SdKlS%Oi$d_UZBvg_XBr<5La=|#&o<+sR1^9ga@TQWp9PuHb#k}J8{F9FlKl#< zi!Aq0A!HkC+REo~N%NKKDRm!}#|cL(TQ-38gw@ zxC2s5pHOty3{jry!%Uwe5L!CUM&8Fp`ba z4l6CU6*yh0Q79(1>q$M@_*r;)Jn5KR zHhJEbkurkb-U0_6D#i5j*N3O`1P{l+o%`uY=F2kz6*9)7Ve5}~Q^}%*+Jo^dL(?mx zKQ?TdxXGm31TbuYKP;Xa4qvB;@#?ZoSdAzY4_10N-dsU24sL`_ZB$KYz@gW7M+%y= z9z~RE1`$ZtAYht(t3ox0yz73JuQ0~|@4)QXkbO$u3pm9up;DJ^u31!*BYKDriv%kQ zA2cMXO7<677ZjBq&j(DkSP#E#4-n>D%4KWWybSaw1RPD^zb!ck15(!McOM;}iz4y8 zv0kJW{jkwTL*m&V$}p1l4BY<}vb!~yc7?ygNLrR6aZomjl*87Z$!s%Lh@z_jtR`|? zfaikq2tB(l(?{yRJVMP`z(iOFpfLk10sRR3q_m_yT)Zgx+Kh_Ap?CNB7}gO1hJ|zd z&Mvn+t*NLN*d>xRPP<8xML}DA^);#rL6+JA+Pvo9fYK1&#Pv~+ZzoVm!r4pPd8I^L zwWt`c*z%zL8faV*PT zq5hSu#b2M73p&w02~NpZ%M_iBW*|H#0_%MNdjPcC(R(@15{ai+SQMlXC2N8#-22i8 z&c?^b*3FmzXI5@ZU$~VXx1{`0YRrwx(rzVEFePk^^F39hz|-x1t_%p=%0c4IG^pbj zey5vU=6s!{RK8IhlpA$(*c?9FwJ2mr5~zJ4qwq%76o~ZA#D50*Fq(HM6eTOJ^Kz%b zDz)avx0$+9?>1731B<##T5Aujqk-H#tGmYb3MfHF2b7GMlvPvlE5ag+cC3)?qp|Bz zhF8hmVnO@oY#KhShe=Ic8I)G%L%sq`+|zeFno4>{v{#2gs%`s0nC?4mk2-6j@HN$g zRq(Y84hYDKUb;n;svz-CQTvH{LsZt+%D1=j%&4}==>^+d)L7q`ytCg)TS&=z%)0nq z4Ka~Wf9Ph@v5)cZCLAs)3a!(M9bG~4oz8Lj!uoFHCD>t;rO8t-KLrAP^uYqO2QAwW z6~r)MaNZJz3OPF+l1`!_Fbo@Y!qU@#8=umLV#q@sMJ6Bv*b4H0f3N$@;RnhD-O ze)hQ&J?Ie~>XfJHo;H$zm8XFpA@DZ4?dJ-Y;n69DNuk2O-N?qZ6SzSP69TisxVc^L2YrBJE z(3UF=--l!5>t9gC4iO%xoZ)`-qsqvGiiRQXx1lrO*`Z8@0#P)a{96ZQJZWj^BBwbp z`3n|7VrI)A0o!MwMWRXd^3qaVX(m1*!0YF*F$+r%ywBWH!*eKogG97hawSCm^=AQq zBo=@ffZPcn0vH_@*yDF{n&xvmj`T{bHAH&9PJY_+jRXazTz>iL47CBj?+ey_X`Zs6 z{_det3>vQ6)T9HRTXz3;CP)LHec&|jGH18ms`ewu{w-apGkqDsQRT2mAexLJc@>+U z2lACyoE~e>0Z8I(q5(H;be6bNepyG{fyy*VKa{S0mDan^b&~RFsbfq z-qh+NZ4K0@$XMELSu!LOn(s)>e0GLdFSt)#Iq@yqJD(@(vzGD`9Sl9~b0w}eJw2Xw zI5ludwd)|a$dgr(q}ra{4)gI&MV{b3e*2zpD6`}LN)lA!T~^-i$YifcH+){XqgK0n z)KOJ4;?A!LJ=yTBC5(Wu3(@p$h42B-;E?sSXJUh1MY@}n2t4_pa}K@YZgfmue-ksT zri~*i$#}lGaP!GIAwm=I=y_sF5CdXJq|RtNJx}z3U%}qm+k7;0yXS7ZQkrs|XWG4G zArlpdJC9xK6meLgN^yR~s9u;OWzKzmvY4fWh==FpPPUUTt_fV2iG)mtOY1EC)=`o) zN%aez#W;UJDvOUD9Zomg9vZc~T&=)$A3o8Gr;9cU5}^ANIEbFb0JtTri$4rQx-csfAwqs3?;{a}(0Rn)LB}EwHw{}LcKXg4 z`oKk5@KK^kK0+#H?5%E7a0_&RmcCw>Ud3@0aHaVjeJ|3KAo#mC8acp5}LiSS-W>FInbRR@Dz6a$`-L|)SMzwY22}WBlXA> zarI(EaA)@6?ttnVtoj=4jXmT!Qu21#vYvM*siEt_WH6$|kjp@#+%j*9_Q>?rSBhe$ zE|BzT?fe$?=HRbjEi{2h%5n4;LQd@Z(s-V*SQ7ht zR1H~P2$*uelm38tdaRE$mCT}Fllc76>aY(8FY2E(% zda%dX^={J7F&#WtyDOEfpdcjq8yB9NwdXv`zEwjk$^v^MWsK2;_)kg8X)9`EI~j8s zYl*)H_DprtHWSsFyu^0yt3lg-4Vn{!3G9saV|IRXlX|)fzqDQ&-OCRO_2x7Y#L8Ji ztecO0ukyBCe;su^&q~KO>6B@a%eqDMR7Uhy5b~%jKK#tr122vei$V(w;N<36%`ryT zkxe}rWN=Xkgv{;AI3iNDu<9jOn>!0$v zAg(!bk_jaBSP|UbMKe11Q)deDEF*nP!tq)1QJ~tgp7(t_H&! zWgW{H6?MJF{S4p-Kwz)|_{hQ$a3|uT5NU$d+9nPcH_ENdpUI3f4Fib1U7J*+$Mjmv zGsgr^F7@_#LWT~U!6Q1y8^yudCl*?9WbE>Ki7N$j5jWN10wfW(trc|Uq#3$rog{pY zptU8C9l^DGEw|H^((i4)f%Tg+*Nv40w;jlwgWGFxWsLq==AFIg>9-+hV0S@Nx9&sg&3A1Q|b9vBKPp`sJgahM!i)+Dx>Vn)kMIH^AmZj!71eW z8@{d*pR-l#YsEbGX$vd2uSH7~8VH@=p^hVj&y7(U!jS;}wX>rA-#aURzTmfd+~yEM ztzerd)=(#?8#Eo749$kdKx3gvs}0Lv#ZbzuRD7%_UQUc*2n>JE#Q|9PzzeSo$$Z$g zaA9%*^aD^H;R1s{ar)Y2pi`kGwZ(GouIEA{DX}*LvCSKJ&?9!-7RO?d;6Bu}Ms+xa zy3pz9kwjP~x{3?ny#T$Eu{zdF^ow}fZ_<9?Y)G>#T+?X6GebO|_4X~eijihHABs&+ zTfz18zPFyIcfKQUQ=3iY$NKPNDTC*f$!tZ_H2EUk9nPtlX>F6kwfj*Z6K@7uC%Shh z8DR%98zjDM`yCbcyRv_2VZ+kJOSxFCh4CmyELG_=I>U#}X2e)OGeZxH#V1 zf7QUw%=iwKbJ;|!K5U4}e6wVKS3_5h}(XO~!m6>};x5d8xv8Fm3%BLwCXKz_h z`zdkg8IemsE^k_}%3Y_5O!rhZu7)VL!LS0LOAX}w3P1y#lxgW38FczQ?D=s6&|0|w z>`z!`N#sJEaO)eSSUw^M^3Fvu@XG>C-jIsIF+x5D=%t}TQ!I8qso>PuN9>!AYggd& za`5yh$jV`iRElBkzE&#Dvg+jNjH3=!8Ay6 ze!go{!zBMilXQ#>cXru?cyE*VH z%5v}&KXLjAnZ&tdqE!1-R6Fg#AwchD>gZv!vBvMx!%iHV(&Q%i>?xFKH@|5&NyC)C z7jC1LCq-Xw-F<1YQoU)m*vI+dM5_XUMw@>1BTncrMm5WX+n)V}&`(DU6NVqeUx(XT z4~#wE1gZngUGak)j!oLiyBT^c$%d)@X;45;KUFe_NsJ~4G*^X?YMyR6&yfR1JNuYL z=SWPLWKP(xTurW&a!1O{-UT`NzswNxgJ(8)O%3oO0#>tIpyEgUY|&u7@H87?4DyXP z>nwsNc9}u=fOa!314qQoy$lB%^5Jk$M$0QPe99Be>ImD7iV#{ks6scyz}poGwrS6d z)xI&Wjaxy*gKuwi#OF7) zwU<`!bskpse2ViW9%%1a<7vATp0yv>EYinK^6ItE#p2?dH@z>~HE>YnW2%On| z7AR`I1<%0k4rA6n*W;N{m7A|z za3qPgGbXLLxvonS*NOQ(q9YP>jxj>ehpGCJZEPCx!Sif#1(zdLr}5++j>1>0^Tzdt zs&8fsdpTQYpWiWMYma<$=~PhTe`?Qvbk)MS$D`z~s}!(4o&1^xw<qs)q^(B^+z<6dZrunejE}@=rTTMxe(}m$KG~_}f;ER1k?<{s+gc#g8EmAea% zoxrlBkiYTxZiYX=BW3Ko5QQ|81^+|6Pg7kqCpNha%tuZ;Au z6H;&8j87(Vc77atf_kAO>FNB9hoG(O!iAQ_nVWh@CYq{6E1Bx(o#Mn{+*snYyshia z>9X31cbFTNc0ljY5fNnVFyZ4^OI>sxwB(&de8DqVe1;Ix$zuB}Mo18YB>Qdl#l|Av z#n?6HtM+SskU_4_H5z^bnr#NWULNiK+DuOPT*oRK=t=URj#+wY)1*DDNSH{e{dbbU zggWLAg_11%t9djL1X=WB`elI|?Kje~B&Dye*Y{%IUXqm14(m6$Z;ex3g09c4V2%qy` zLI#Hby>L;bVjo9FG%MnRb0ccIcC`0&LRk%|WM6Q&pLc`O+wEAFZdy;4WGme#9~iW~ z-50?V90(&3cb<+ZPZJ?w`%F|4OV3Up;!pk3_cj7cRjjJBxNXlLq?D8671kC%>B+D6 z9N}{YBCQ$k+^h*?lo>Sh$x_Kjxp30lFGsDanJEgCFDB=)ULSW%)+9ty1%U;(Xy%_Y zEaPA8FNRD*MZ(9v!58X`1r6+9vl%~Fp0KsR^A!<;;P{Qzbdf)F;I$^7{CICcc23A87^>98L&J2PWmCsHb8r=DiUGhhy}>Eb#>50VutzVM`l@7=VNMAIoOXKy%S3*bdYd6B`jtTEg937-hF zRqu^g=z&6js%0t%*w}4nN`7wVxw?DJ+(x%5dl^v;e$^LF5C02-Pc#Am*axtbQbX@zvGh89*|-n4HHUYl3gl3hh=b%0K-)UW%5t4_ZRGw7aPKtP^uj}3bF zl3rJ_;>OQanNuo>&^GAa%zQBP$691y>e{8?<3*2q4*xYYx+4t4bbc5T&yzG=(J>V; zX={{Q_QbO*Iki@(yOEPNO?J>@ts7{LCExGhbRnT2B;>g(RzqiTL>B41vr$Da80X1A z)@a9S?45ApO4{5T6L9iTcNUWAptpUqe$@&W_vrH_uB+>*WH+VF&&q%_ho$I7tLuw>`m({*LD*N&xIu)Yg$7< zN0kNF)!x71GBxWGc|*;t87av!@UOxPtGc#q+O!Zem2_&p#Uh|*j(BP%4D(-_edV!T zmi1KAS0kbuO{EAuj5nLPtiV=rJ2m%xo8?Lo6^__T4PM2Um~Y6igcEcDDsgP9Gu=Lijef$t08`J=kAVk>t3S=L3RViej=m?jQGGm3- zBHNNaN41hS`YsHsc!`g@6sr6<|U$GIEGMze9_+YXd7hf62T zWCMbn649}92X;%-J9jMQjV{fcd=okMqsNQcn(!^%Q*0@2KYUy2*_M9nx|wAk?&2D>v?bB5m3 zm>;nmETYiOV+W%s9G;;crger{piG9TOFV$e8z9*i8ENI299S#-I$l%MgIEkEX!V@J zp($MHC5-2XrkbIjdL+|Z4;;sH*a9OdMnO5j6g(q%5l-gkZ@;k|JgdZ)St>uwwy)EC ziCtk!dPk`KiST9fd2MSvSN#qIL%^IpCh@gy((n?zYY`q`QJmgg$Je4L+MKldJ3rKb z+I6~l;q0XkX6!q^g*|5Sx}A6DK4&Pf#hU6y@p}Ye%XVub46+YcR&(iRqg`q@v@0p8 zVHGY#zdP6FoiAgrO7XBykv$)pCLIJ@RF1*A9bX)~yK_;XipJvn_Z^_}6GJs#koQxr z1et)>=G9}zUD6cf!5U{dBg3u4P3=nWapHo{L^+&0qfA9AJo8wsRX)DWT8-=XX>xVp zO~H-P%EE__;JLHLzP9+h>Vv+MHsKui%gx_I%5S`?S>ISb-L=sa9`lQzvQ+Urd?RHo z^y}+L4pSm^LMMhQKmY#C7TKn1y~xc(o8hsVcz8PP;^7s_7(rAtuFv783i`YpZx(Og ze^~_?cPV^-l*F=KIwtwjoZgK6cj_y1nX=hzqnSgW!sMT=l@dDy5XT&L_B6_>9%35a z>N^8cB6jevKs%$ZvA*+3?hDOtxN5Qs7#2C<>}8@T1D&@?g*g~yroA5WOhTv#u?MpS z?U*U1wmUrdh2Bb)AK`ROfP^MQIYbMH&#NGxNZ{ElpMeyH7+DYr8Ia!MB@hz@GePl- zJL1dEaN93$ZPJlpd#E3%$0av9(GxL*?QNddEEU|8T8d6@60qG5#PSqZ>f6&4cPJ;E ziCrYZqkpqT%y`oQF=t(lzGCVzfd#ejQhZ?Ua@1T$gKkczK zu68={6kX2hoG@8n6!kmhjH_N*rpz&3(y8RUh6nSa_=CRaW=saN3$`l59KW9hhUfj>UV6X;VwzAzgbJm*nr-8S9dfY&SUD*^L)|aPfxs+y(b;? ztbH#;2p*JHk7As&yFjsjT9d!Eb4vemZS8f!-xRCa8Wwppmf85hF;G{qNt2%cla%#> zQB4IpbPqU_kkcOhUZT8d^7`|e@4DsA%|-7=IE$G1XsQ%*Tc}?Ca2+CIz$L>fVcG=i zm6px6qrUU9RN}vP<5BwR0%Zxu5}p2VgE& zixz&{hc5*Ab>A;zclF~+>QZ01TlLRhUp+T*UM8jzoIct(aLnbij&>DXUF+0xG>sLF zF}`sMz0+^@@L#=Ar;N?bJ)H5(xN?&iV~YCahtokeZ4tI$QQvOaCB8rpl18T^EeI%~ zF7co{-q@Wu_Mh-pJ}*L8u`W39{cu-D)o~BPo8WscCz5ZYmfhLNTaXd-DVVtUtfSay zw!QCMM5HIMKU!6ia3V{L^^!ujT3UTB{9L}G7$AI_6xEgx}Ljt zoj$7$*K7MW{O0MASgw)@0Nj%6++MPP8P*Qgl4+0A2?-$3) z#(cZl(ovv%ZdjK5MN!wcXPA{|(#-q4zaNi7D00Y1P3s9!u3Uz$|iEaFN z4j3rY0DJ@a?+fB^j|aQdp6Vu{9!$tsz~QZHWuZB!Wof3j%J40*qQ-N=>Av}!VkXxz)u+^y2sF#C}$ zp`GfdHp}_>vXv1giU*Ak)?Vz24DQBakY9VVP}0&0mR`G5<~rW0Q=PcW>YTiExlg$} z)?A`XC?Gd?s+0=(GQQGPw~!#?hwnG;R%U1`D@Tt{8*`69%zpE7cLKcy28P#fZ{EiE zcbpFTZCk%PJok84U?+P%J2|EAD?cvu}QWz-Ou#ecrB zKxw*;tx`@TMA_^NIDvoyK}*MK1B3i0Pq=F7&D)^V#T`2;TcIz?Q==gUZNHkFu|lnM zEt?DMmw=P!Mq7OICprb`5XO$a%WQD9+VWLfgb@K6+Pbw-rJ}tu^=Lcmrn(HvZPaYY zb0O<1(_W%acoOgV5`^G6N&=23hFYwQuBp+3&byU5;@*+8c0Kcw#TU5qo{@9G`*pU< zn-4E|W7T9Q3sxh!sD=|Nn`_qks`UTvGhS(A$9$iLa&8;{pbu?RKR6aqv9U2b3j5zz}RM5I>TrK4?o$)dR@GGy^%k+Qlc4;*k;{6)>`QW94_th5U&HY1+;aKq+eJf+SNe5miOdzo9P#TafsW%kKC@*v*Er|nE)`BsUiY(; zf$p6z70e%b#&%nsIL*P0qZQFTU8rnr(=8V|uZv$X$LH|nj0R04dkYDLBdB%hIS|eq zcK5ztE!D}$+Z(7$nVI;>@Y&M>o5IjNTwH5u(AHaSq}AC!yP3e17I%VqiJBtlA;5|^ z3a60*p=J^iO{ZRAl^Bm=Tb^tupBnEk*wgQhsQ9$&w;0giqK|6ku;!2iUe%DzUYb|N z-eG5X`BAWoJ!PD0X_R#Vb+)E6GCgOJ6FRMDcaOJmwVr}ke>L7_aW`oC79@z`C=2_8W_Q^%Tn9nEGLr?`6Iw~yQLY=eoMiD zw;puT$UX~}OdbEsmgQLrG+TU$C3hy{+g2)f`atd6J(EhcH( z(vcOkY=#6iyjvz=2vG&!8`fAKnm#>{rN;@}YTIk;3d$*ro-U6WX5{OVZQK_?#;WgY zBC!<&n-i#^@2+*^l-GYRK8rLHx$vit)UoL(yqsc|jRp zcC1fKiln7ReX>t};C0_rRXK3^8!@lEqT4Jg@duIGq@6d=b^N==DniS?P#*gF$(zY0_k zC?IuP_qHW<%VP22>M<8R*{5mE%|wV7|Dg|WWA4BkC!eaXSWb}boLi05f%kWCP2x=C zE7`FThbj-J3HzlbKFxWK)Cj4B7}92U!JR`<*Jn1cM;h&@OQYV@P?%#I?{eGWU=<^z ztDvb{@qkC$Rp^+Po}_`wSgclt$UtQds_;CzDB-9nuhX?+d7gPnzT3esKkk?auCdR0 zW4Mons)_;{!o^;#x}p<`C>zZnp$q`qG>CGNnnX!!f%+P2@1N(@>tt|uMqwDPEguoz zeta^uh~}W-+N;~L!9q_RgZES7!jRu}(Nkgdb+E%C`9K`{rZ+{2%d4FMb+GqNX`|H+ z)Ft;t%qP$6aAAdA#mww-_PxF5xKrY(06rmLm23Iu&iW5w_(tWS8S!-U?;G{S&rtRU z1SEbN7o*LITl6T*GmJJDBwW?ko%W-yQgE%JIajL|-rv8`GzdQ0y1RN*-rsSM>D6ep z@N2#%)q4m+H0WEfgv3Qm9DdYWb2|<~Js`kZde@@!R<=0BKV`@meT)v;yygvhHiaAr zFx{uCcF?O0l+rygyo1_#iN-w<&$5na+E%5d{Ss~_kZC`$ca2^*0LwI)3qhSmF0OA3 z6ZoA{dreor*H3c|1_>tg#;E1>4PyJ&FNK$~xOIRcX}fv7pLu7Md-?^hj@^14wQ1}c zzYH}ufhY+e*hI|}#`8OpN;8;0I0)ht^hCG{8d=>JGCrnhKHL{G;yrfZ-xeV)+5=uH zUt4{;R3fDG;JpqBl*KZ;HxL=F%PRl+8hedv!6nt^%lQHo23;cd?2J?Ef{cWab#0Pf zNg1C-xpRD2T!N9ak0!)e-D>BYbF%qVe&4cZl!GGr%FIpZ4dR(93Sc#HIcYNL6+RmE zIm2SH4l=veY-pdB5ij}Ipe9&^~C8UJB@Ck0h?Mg@f zPag)O#~dh)IZ702apl2WN;47}m(N4b$7NiM*KW0m5a=kFzgfGl!1~bW)UP74jMTB{ zMX-%`sWaF|khz9oiaNZ=GDZF; zHrSDYo=J<SE0)8ph%dDhw9kM>?hXlT0iC+=hMZhBf62zpN?Wa)VRMUT$E7=#

2&&8f;m1 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

EBykS@KX>3F7zGl)*g)vulU$w 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 hv|u1#UjX>2FtPT8PbXZ_f1>J!vr=NC4#No@)RA literal 3574 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 diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/hitmontop/hitmontop_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/hitmontop/hitmontop_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..0e7837e0f51e9808815e0a66ce50d956be6a1f64 100644 GIT binary patch literal 16225 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 BRLB4T literal 3574 zcmd5k@$g%E-~Ad3;G#vMwjq6WVyL`+eUA#sdVryt-*XLj!k+K<_GJ3IT&-nqFs z_uO-T@0@ebx$nHRl9CMI2A;Ne(pCt)EtE@miBP?}sz4~gSp@m1m6d1zCkScy&L0}S zlK^KS-t@TNCH(WJEn?LQ4g)S{3oA=Q)2d3y<-&qpE_5=791#`~7Pd8vL8c;tB3YrZ zqJ*4SQ7x?6T_F}!NNM;p2<|Hwe`Iaj1s_8Iq{2+v_EzK?cW;116~4W-pqab3OX1IA zACdTG^f0a3vc8i;WCd|U#!i}hE22b%0fkLCMNH;wlKR91A1Nf}az2|rRJJdEI8d=p zgQU<-tB?kkXFx_H?TiZHvOG3P*T>icGn8Cv{0Xh3cSx-++}9&*<~o9kQdn$ST{G9C zD`N+X9jTs1XfH|-L==A)K9V&|R;>HzN)r#)b2N^)!Q=&Y0zho&AT_ut_Vl@d2mn^M zQfXb|YWzhb~^i> z5;OR)WIWoTl{8cphnGS*t;DCcn6^T-owmo9VK{G`*} zRyUdbx6ThqiS@#BdXL%8&x1<6tGs%WIy(;__sFWuaSrXsishaFP!zrhn^O05sHf~9 z6`Z4WYd`V|>Cx*NA}sXd7a}I`!8vgJQq29Z)5LAw{ewQqsY6rQh5aWT+OqZ6a)kXu z(_C5?JY|~8e{y&{o&iNo@!N6adWu0?WuYBycXPQDF5(FidtQ=|B>l0UmBc2g5;(9A zrc8X1lIF*oYC&_S1+$Cd{O7A@mt?n=Wb@X#e7;)nv%X?Fv_wv1d9E1JMJl`y?r1-_ zll9C@GJN1@df=J2f|9C&&NtIJ2N}u7V=qp|rhc1{?wdN9nV2O_oE=P@QKed?sWVa@ ze+cCdi)W_Ad1~>krJA2~*^4d{*#O*SEA{LKJzF^+-5f;dp!5O|fJYOxp)*=J&u$Ll zsP&w-1-`CWWGHzLJL={ViNi(kM%CP*8Sc<@cbK}DxjI3P&LA>U51X83<8Sp)SAaJG zaOFVY`2&G4z&Vg0xV#HAe|i7_gav($(32z#jw&;G zC^K~^Gue-q#`~=nnL5cxg^t|>vkr_F?Eh?mOxd();U;m6c(5(}70S>Xl+_2CZ-zhT zSKAh$^RBwdnkUx21fBMKkN_C*_@gVJ`l~@Y0E%!nP48RK$n4f`Yos|2N%n->10_nP zqg{%GIJD9o+|wjD?bb?=nBW%44sLJnWe}{DLTm$%t+ChYC+Z~D1WhLQdW1XMUa;z;FGG+rMg^e%Yqc0%@Sm7-33>3 zt#xzLvi#QAG#*4oFEh|A8Jd@cTBjo?RXFlYCd#jd$Y|EI>@ovKwnd>?Y8*LBEt{1> zVFCX!FKbc8x32=$qTk=zaE~e%UfPB`$2O zndKMfy{()h#eDi`z6bmJVdG}+Zu;6!zjBTrUmh_v8lB4+oQBxOjyXrZ`F>=8-g*DY zm}p{b;Kp$Hmm?MQPb&i_%AA&P=Scdn?ESoVygvU%Dns8bM$azFr1MG9A6Veg67Zw_ zgC(wmve``@O#mMU?bQ|WbyU8Z+F-bA)|Hx#dZD35*e1-;lxPe>%tX@|=|YV#r>$6{ z>25WYYK&zXLtle|HenE1OhS$6zS$%`Wh}Spgsy41#y~%1>a`i~-!tp^hMsrZgrYVG z9do(oqscY6%M4Ul8#*I*$N2JD7Ohz*xxnD`WS|A|TL zG(%0qm|@FdOoStw=r;48pjJ4t#?fkkYLsiR&ADye8XVca*8sukhYgrT?P$dy^1Z!n zWiDjV4NR!Pk+&Q+giIL4%Og&UsRF~wA+i%!vV3CXp#^*3GSH=lX^YMDaKhBL>@pBn z0}GuniC;KgzHBblJk=`1X4AnPhaoXg|oMx{;-3t$MsD>a{yIs>z4I(2GL%vX!^hXr#` z_!B|yqRiSN%d^(ZTLrUrv+1h|Q~xs7`(*gR@>r$Q_{a+YQY8SMVIAJS8%#c+9^ML# z`HkV8`;kjbkB)Q;(?Kq}6z@rCxxn9rHXKnRn3Seq;l3$R4Sy*9RS~GcyC>A zryYyNqlF;P1fX_48~Rfxx?w8hv_Y@-V8dUr)sDS7Av~#E$T9R_MyFG=!g1b%{&8{4 z=1`5U2g96ZlMx;YX54(rbl(XH%xN*wm&Y)(aWizOb8G-^heu!=-u)%K-A5iSj~(cD znnS-I3-?YUfZJ=zqq64KSBNCj{ge&|3J9q*Io6$*yjbB8Y)54 zd(R@14TG#Pol6_n))K?*q{1s4Dy`rGb371+;zFQ;hzPfQVu3NL{{j)WN|2m=Q0P^M zUhkWGk@;5y*>}vYDSMzF+*M|bbmZjpMq0I!izf&D%Z#uJmrR7i0oHw_r^TN;xXp+L z@|Ug;#EfySX21C?q}>9#aFM%2q><@>58YUYPdzD__*6<{9VJQdJW({cR$<{JSs&vn zwmn{i6*tTnJe3qgE)@=NRY8ow2N#782-h`T)1lf4z?&bg0&((ny)SEh_q+S!$q7pk zd7!!-xul3!#(%sn-je?6I#vqvYHPs`(W`zLO-$kusZW3?e&&scwea>P1M=u%}I-oR+P_l7__VRTi3A^|iVYGk=PPGW50)p3_)&IX9AQm# z^xU4{n~xMPXxlR~?~(D!3V4CrFs<6b#*LcZffJ+Wu3W!;_Yo`+VeHGUSDqy zp@)V=FruPkVt@Exlgs5UsW>>w<*rY%)!)NU1iay&WVqn9!f%Wogp~%o*5mD8DHipg diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/sceptile/sceptile_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/sceptile/sceptile_cry.ogg index 40f819cf90eea75385f4170d889120f1f9658e52..d31744050eeddb1f5eb7fa1a6be31193391e2c90 100644 GIT binary patch delta 21817 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 E08G!PdjJ3c delta 21857 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ⅆGw-A9fy})mk62G)axuBtJ9J zqZ+Ep(Ceh>t6x7#UY1nO-nHny##gO#WcDUD}8F86E+xDd(>1Fv&VsLf1+zw&g z0JdX+w?yEoEWtgHiH;irVF}*Yl2#oNHXGx_uD z)r-!<@u0K6@bG_qy++nk-SuV8x8J8Ps|e>j%e`LAkuab4E_I`MM1@~E2`-&v;L zdB5$OEoE<-KPlX$=t)uiw>CFj%yLg~=k%Pp{P<$4&sn)Ozck)T9J|z(3xABT;Odv( zhl8(SI>-&?d%Yj-Jcad*ruo$)EAEF2r^A>2@RhySN~MS=O^(f7x9HOxEkur{NNUDu z%zaNy-YrL3chR_h`ZemK%{T zZxOf=ln40tRK8UPufs((^B3P4wT(U$V{ z@6SQta4vnWI)2K3@%-F2nU$)u6J3GEucPkgm0{wsclUCAdCuE>$^SgM@LqK$DdooZ zSuJR~;8PCWu#>6xPUh6ge?j)Pa&qm{x;D?zpTVp*e8YpW|c-WVk!_`gotAB3(yq`SEoG&m3Xl~*E?*U zy1sdIc~MkhS|jN;8d)nO)p{)=@y{LkeYqC$*X~%0y{cjA;eQ76Iz&1j$aQ=$S%)V} zviNcFgyA3C1A8xWsVz9%(?X>?(P--t@(kWlKY>MscA=v(69FcbW1QYJjb*;fGY4M9 zTR=_MiH4$t^t-Az+-`~QPlD}L`5O+f-HWT*{ot1HhO>a9cmZI*cDUUVumnJ5fC1n+ zM**yBCh|{&VSk%_d{#AHbI{*j{(nK!+x;-N|98_1wBqyb-?=oMYrOj>PyRbmB=h&5 z|Be6uRsDT*(;H|1-TZ%hr12P8yYcydANRJRuQ@$!uKoD>b?M=WIYOfG->K#QH+%WP z$NxWhQqkeqTuLKd{p_>PZi)})nl6w3o(UV*KI&^3x_`0x>SzD`yU}YADe2Y!KJM*y zyDqdl{ChS>ZSUq|$DW)hnvG9ebDB;GXs`FOT27=KhyOjBK3#-K=IlwcT+`!ko`!s^ ztk>(fs*ct5`pf@U>mzDeRqHQbRtd+KqB%sBEfzjM4UzvS^%?NA=siPt ze0*6KfGcDD<;&{2Sc82=*7)l`IX1{lfBo{Rz76|SHC%C(NaCdii3zl$!yEpmX`~P?T zJ-d6hZ%?1TQ{7!%)>YjzqiA8F3P1z@N|?-*Fn_9bzmW=|h@jjZoQHvTN07m3AXbI-hGzE#d)Sjt{Qh#dw%;Bkt;r+NK zkt_rME{NGp-v9tC5I~I-op&H@J;7svOBL;$!(*kuT||uVRe6gC>Bk+ViG5*xp^g0n z4F%#WZ8!kJ17RtW5Nwq{g>e{3C@!S zKV%UD0T40)$vAB38tl;;g7Il`#h>)bSRB)A5~^zQ>X787ujy{K=|qTB4N z-5jF36r%qS@)0-mU-_5s=EI--mvmw%Acu@6d6(upDgO5zp6@Whq2?d@mo3ce+%J{*a1M8g`nSw zU>L#;6^2=74ow$)Bj4)b^>n~B1@W)Z~ZynrqWy{q*2of z{;7FlrXy68%s}qp9cG{n;C+O&vzkdmC|TBm^wpk9J1B0!hSb6n)2SL-)czUoUusce zkTKE2vkmDHzLIX!f}{_r{Wi_G7)SbZ?|-U~Fhp)2mv9F%1Brd3;f=9L3P}=(Tw~A@ za#)6F@`<9NKgg5>DXHL56}SferJNW5f-(MT@xP0|s{D@@=f{7g9igrpV;!acQ6aDMWwCZFA9gb1};B zZRr10tpBnc0Ae)3e{C|+IFe;BBS=9M=^p|A+j5++2jd8anG0$A7Xb-mp(& zNhq_+tG>~ne&aTaW2VZfKg(e@t8O;$ZnoTLrrYGJ-S{tq`NwQF7v28Da{ibIDNppS zR6Oi|TTTvj^bU74nRGn4c08qLvPF1W$+xWIlJCg>!*VRY7NveI3j2B(7EK+VY!#kX z+Vb6Yr1G@&|C#^GawMI}AsJ#h63*oRVL9C_1Y!_ts->5|`G-b??VIouxM!!@UU3|Ppr2MZ_z zKmbc9OCPTDg!FK}_yh}0X5tW!WI@7=Gz~*CE*lL+Bc{n-M&69{NPZ%&Yy@Eerb&1O zq!WMuxlnSaV&6asV*`LOstPhqNTSLF%|Wcn2+KZ!iVRO-hUx?lB4O|d3w&k}22BBh z>IBUpLGYN!en!xg2sHo@cSAugQEGNm2>^o%*oq~XOkkJArjW&wP{cM{#FE!cW*^7q zP*zhP#ZsSFQ(wiAS8t?{$C8l0Ra3{3P=BL7n=G&1U^mHbx2&eWj-#&LWVU+mtJxT` z$tJIjqdvbNKi}ZCnCxrV=%$~_KF>f6x$d*8g`(nkA{%Br&3Gf<=b zjol`fOqzLG8g*+a<=0Z1(o*~MQk&Ie>eABU(%Q3crF3Pr^k=1XtE~_yU1=$OL@DiP z>Dgl^?Px1QX=w#yl+!{wQ0E0`srKSsQRzu5?P_PuNNv?=XH~u1`h&o1BE%?s*VWVw zQ`|PGS6i7QOG{5n=|Kauqn*_t!PaZ659;%7>h2->Np^-yQJK}C&YH2-@n&B`9(zO0 zTyJ+D~wS^ z_fvz%cxZBilSOG5+%Qy-ApjXGh6WrP8HNEgQJLIC2%w@M*;uZkUyB8v#6?bKAR|#p zMm9Hb0Wy>;n#u`rzM6`4MdF-se`+EsFKuQ}ybLW%Qlbt@LA{2|*P486T^p8#1>*`x z56DnSiNkLI{!wlWn;}S@OM^PCY1t%8YYSrkXe;CG-%kAa~x`!R6(L9RBniW zN>zeKex;2Bh(iGw!PNa3iSQ(Y8F`7seW^i-w1dQnGdleQi7Gm$83{8gk(og%e+Zb< ziEKzt)PYa|2|ketAn}*&RH7C^&Yv~tAG;Tg6tRp|9$`U@5|M#ONaZWbVZOKw%Rxrs z7|S7fej>{uL1LmPVnP0l3Sw?zq6!@(aQSQZ@bcmPP>>0|{xcz9fOr7I1d$hkBmt9W zD9058ACV+ULFPk2qK3|BeqyqW&Ff$V87Z1P6&<<~vv?Vsf+T358;t;R(Fa3TGHAdP z5-G6!!RrD~Qa}Ll&_S^(V-PoO44DvduoBHcstbnb5P=IC#8;V)@gR@{WAOd~h$3b} z0Ei@skhO{gqFRs@3PY5p05VJHKTF&@2~H|pBwBV;3Lq8%qT+dpE-EV4i4g6ft&l)w zfzQofpdH9ah*ybxV=^Hv{YPtQAo^j00HIZhC_yjiUfkC><_1GYWlT!s3-~+bjoWW ze?$x|0A^S~ggOlh2ta~tV4yUr>FVmO^O{Q% z+K+;|sa*TaO@|89#`eUg$T;SVDVB2ItZl&=<&w}r0jv;1u^wv})FOkJg_;iI8x>@k z@D4Q@8id^aG>C_DPL>^nh(o!Y!c__nwjy|nCM4{8vJPFY*pT!H%fJE+Wcw6A40H?GcQB5+vX697nY z284xK9&q#W3kr*he~^-qQ&9S6uZRc;0zf=AF)3*pPc&K#dMrlV>v+rrtVBqZ{ZAq$ zCjMK2?A!oi;(s=a!c70b{%jWijDzFZ^^uBznT45|m7U%6<45Cmsf)@^8H{GB-2{(_UoSEDNuh9<$u2@CetAZi_!>w#jP+cd!OjI=RQA zbZS-j7-+s%PA}@>aB=bM6y&oMo^&ib>_4XHL$(9hw_WSaMd>&$rkNK_ZL0%)YCgTI z6CfG`$sAxlI+bvLQC+Uz8!CD8DT#Ak&&eAKcK@lKP@V~@3;BaADG+tA{L*!NR9<-w z-}jCGqJ_KktC+2fOIV(i)6s&DCu2Pn`?3s4syL2oNcYX1HDX!Kf?bhRu^{b6rc8OF ze&%ExwUu_JPa{;&{h=%B4*&He71Y{XC8@iFPRRtl!A83^26T_U7&)(mR;@f;hO?9| z;mJEe=A+|DlDhTC>=Y&$8^%QY27q8*h9>XT?sXV7&+Ts~LnQbf4f64!{0diHe!0i( zACgoip2`*rTYR^}R%&B+eraN}*ns%&M9aLXr)eE)P!c$@jIiih70=VxQy|89kE8XY znc1{cOCJxx;bYxLjfeUeJbPmI$d=2{wTkCTR*a5IWcx4XdCj*EU~jOsxJcFiK~;l)tQXX)ZeY9!4lXmk)+6n3 z;nm30N>Vty4h}lCC<#rbUQ{j zvFd3Dtw$uCf|+BF>hEW$=|6sIL3?7H(tEw)Ra9BjRHgjeZ^*}6%k4FYLlDH>wLqkY z7xrA0)#emcwh7Ao)^Iwjro%htK=sz;z279yWMcuL-NWQVHgd!BInf5_x5MwQXk(Z} zMmvNL7jFvJnO|&oJpIa=U*uSPy|uoS`g%t4k8<~2Ot%q+YR@kepbPjq@m4XC)or2) z>79Llp8I)C*f6Wc*lwLRdFQb$e_mFas@_yjZk=O`gP(rGN`4Gpi&>O~*2721hw9CY z9nK?&dc&4TDC)c(lKl3b=Gqj~Fvq;gkB%qI$Uku{dHAkP{q-;AVl=xi^)k?|_`ad2 zhkHgtZZ9Ia*E#Q`MDrx1t;Ru<-}S8ZTYJD}aDr8q+oY?(Y8R&9@Dx2~YWro99Liril{=m;JAo(RZ45>%CTc*vK}vA-l8R0SUw+GFB7-Q09Mfo?A`aB4UFz3E?2 zo5YH}g1}ycXe?<9d9p+iJEbdmV(3DhRAH?X*3yEKU-+Z5#FWR@Ltwlum~@{)HM}mJ z40;{xZh9xd?vK;eLSDpRklWYP=WrsgF!1SNrSdtCh40&u2)Pk2gmvcP*!du$#G`Wn zNFogfX)!gsT|w#b!9qRlPC=oLYz-NG=9gk6V8s@9B#wdpNf28E^A7m#0DLqw#m^Gk zFrdCvDA2u^^7Fs89JSqz)g)TbK5V3v54THFyZEJ}*K&?yRm)$$Khfnd{f#Mk@xJz9 zij-lwb*^1MZ86u+$e71`T9JTjbvhmHZ6-sgT46WCvHXM4e9w=cStRgx)^)@7y9A^Ej@^U5e?WN=+E88J z&*9B`80m6Ojdm5YNUCz|3=2Z#c0z}-3UbVfb!oPDrE$!kK&wc@n83^1b>?j0g{Umi zyXMLHp_j#RggJiGsY60XETCQtIyLU|4?0i4dCznoh$VTCv={Jpyo_Mp@Eu&zCzg_? zh_@e$FW9mz@zCRKqXI?33*2 zavK!{vb`nk92Y$^`|11uk4>gg>D=hgqIJ*f6bQ5{D?@dr0n?!Mf<1*mYOEjku9ctj zJftd`B*6e>zq|y+G%^ak#=O^avTZP7Fw*+j|G5ZRV8 zz(0qciI=m84oGbr3I%OiQzCek`u_3v##8jz}pIx_R zI}TRO9{BjDJg*X+#*L~+sa4Q`KAk+i36^eBbjgrUm5OQlYGu|;5&g{a@iRAC7rThz8w{k^m-g_ zQiks9fDP}$yF!J{$LqLU(&2udfJ-C**g#m9+6c1aLK42gEbn}>U}#M)oBM1Llq3d4 z3lmHSy>-1eG(55gbs;*rKLILQJDhyBw4m%g=_k!)q(EQOEB=@n;S7}2M z_FPJ9V;y>MoumR&bP8Q|UT&1PG&g1BdLE2+JKOTUJbO4TmOt#1wLOb0)+~IJ#pvFb z#@~SU_l*AF<|}+IrIh2Hl^ppz-xZzok2}5E+vA6y){_tYBS?}Ghu^HSFguM%ZrIir z2I6rK@luMne!u3=8JVgNuVg1zJ*wP*O)U@KIsjarQZn6*270ibWf+rQ&K-5fn zHI*9h!nz?}Sp9RQLx(EUO|SLwk5R)qqac;RAfXN=d`fmTrqZ+;M>ColTDkI_+xVGo z5cp75<~7M`S>maoUyMs(co^~a)gT6c(J+gYSuv$u);$#|{A~{(RG2WpEy7uU_hGOJ zv5G8$A`Vu|E^)D~bst6#=C9ALK`J~n5`|dQr`zbXc*?xQ5AEceXd{h zUCl8L>yKzPSO+>!5BdY?z4_xMd+K`GM%If zx`ZNMX>9xQ?xQu-(BeZDGw%BdK`n<%(=3f;rDGwO4~96hx#>-4oImGJQz->0^ih(pnjo#0#7cf9Sc zwE6v)D|o{cvzCP?lf&G1g%#k(q{225f*5IBeAkSnHzA*Vwq@X{E7CV_Zg9T#L6`BF zDYi0Bomx}cTVxHBr)a->5H)L@I*CHc_41nuwr3b)>HRU*ijkad6-O#WmN4TlU^K9* zFG5CX-J8C>pduM?fclyusKOj{kFJ%cYS|X;6ThG`yNV~YiIw^u^EV6>4-GfrImn6P zIlOqgX<6k)Q1d6Ew5m|CT{@yYLM63(XiCo|NRikSpXPI4O!cYFj(MzjrsD}4YErW99-*b|7gSjSQ@aOyz3G>{P~>o`;olnlEHLfELhWQ-6+AqX@AwwUq3H)xr_q09$U@fB%|Ov36dpK zoLXOqmV0P{Q#4bDdQhVwlYE_?m3%=es!kV3ib$B38oqD+oL>H|XY3BHO3APLPZxOi ztB1NUCQEtz*k00_jMJ}2Zv@~4iy4=FSi8C>?OKZtmBuVdqUSytg7}JT-!p4@4UFUD zxv?a?>=s(UxmYZ$2i=%gpEn?MkvC?=MI4lduf`#mE!Iqbmz{syuLale?agtv(&t3G z2{)HssiP?+d@C1QaF{uiKN?@8w+J9D06jav5M55D;K~57mnACY4XHM&_B65K9B%7g zU=z?wXri<^p|E~=%E0P8l;08o5xxoGezO%6AVSAGUF@Bz>X_?b~c z2d`_7d>i><6Tg&+U1TPTis>^~U+isFgEd=( z)+Hf)#LMC=&KKlb#HY-{dX+AygBI4*AYXxwb0gyIr@}9bMaGT-QrAvO~Wd zd>-GZ1{Y&gk(&aI^9VYthg3XG@Lc8;NBc)WK-t=-gBeb0_Mxl@N#TD8Hml zgvW;!v?YMGzZB3oP#=r8_xqOb^wX6MO|mFO zor{_AOz{*v7(-wZ{2G@ok1F`MOtO*=&bE{;YVd5uPkMypl}Qp#g6FO3?-pi9)oxxi zmt%vHRzY!>DXm&Ne_vFq9NQz-myJC35uCITO~We~j-l7RqI7PWzj@%$OcnT6ueq2> zXM{PekLZx%r_lKb6_R6;1iP4y$1;9ubGiUzc6;R0cK&qAA_>-u7Kpnj*U3OMJON#*p8h{376?B7GY2 zx z`4n*_ax`Dk?bCzuHvo6tk!G0DJRdggy=A($U$A(lNVr-Y%c(Ta1I78GUbS;5y-sj` zCh<(gMEuwJiQ#{rpZs}F&uyWKh6`2&D}mL(9^g;lKyVN^08;w`_5(W@46Vg7#cCp8 z!lb>m8lJqo5^tIK9Pkm&e!=5aF>!P-5^i-b@D){Q-*fn_I06uP>GvG{V`XPwxP`ca4nO{HrlLXAHAW?Qa;`BRwv(;U_8F1Ke!^j>Comul#EZ%+Sp z;A|?n;6*}8HL9fQ9;U0@%|Z`!ijVnl2#q9A<=y=F zJmV!ifhQbxqiF3HGt|6@Wsc{!kLO@xqy2^cumFx-TirBh+U8LB zEy7Pgtq3uUS^>6M3$7N|FO++%l#-UhcaFNIc;l^MRb{u7*F-pKio zx-8wSg2D(Mld5#*S?hE!gF(s-Z>sT|>u^7F#K9LPZNJ))vO(wQehuCXwjYN92>MZl z-}pUjg}yEmpRA%T7?OHPrKDJwu0AX8_Uw|3^J&d|N*~)|+}X9oys`6Ze z3yC1lo0q}7wWA#y{strUHgFC~(zDT>;sZ}=9I=6FXc5|FUma~2>oydSm9o|+2VF0W zo6{5)xnQ`q7apd5NhQ%ukg>QaSG~E56%agfhRKRpx|2x$O&MGCmy-Faskg^z@3dqgRaQVhlIYd5z(s#*q|}e&s^4uTs3o zuh0goNNr7FzjG>k`RZZ%fN65n({AL|_f@ucja>_~kwMseWkR3Iq#cnqZL3+tERp0Q z7j`Zb$@^te>gL(f6dt82Dr%s7tP(;-$|aJ=>3FNj)sJ-aQL)kX zorur7gbifV{1EdB=(*{kPisw5pb*Ymw-bsty`hXa)>3P4U|*zKvkN$l2c@Nr8aJ<8 zy)bn7m^?dm*hH*wi#bhiyj#(L4av1;Iam<@?g?d`@Q|@`iqrRG0k=G6_CvwsWI$Qt zTSgUYDKx+ls{12=8c-_pIfWY4TI7td4|UN*C|ga}SlhDexS&*VyLb0do{!k(0cg_27R{02<>E46wE=01LA=v!IzC@Q}Au6xdzo%4X-RPuXt%@XM^fC&B z32NSD5eR-EDVJ~Bx0vxlR#X4zHxSQ86Nc2I!kyeEt;)1mOhDt-@xeoIv1pR8_QZT4 z4u1ApQ;Sc|^9Gi2R;5%ojWcy&D13L7dbhx@(TDxb98DY-dJtQxQVnMd_v(ASXMQ)) z?aycj+pdilKLnPENnuSRya&FYTEd0@4yW$Sy>Eo_(^?BtAugE>41ivdE+?F}c~tyC zC5y^yP|*v*Uaf-5_VZT3#EsSHGJ+bRC>in-fZW9D(%xto!O_M!(p2_c|pDEnh3Bq5kM;zY# zuBQ;WvR+#qVv7$um(A7>b}-z1BiLg;61p3 zpQ$Qhvt7A$VC_ta>5gt!o3rGW@RvaSq6;IFM+l=&A5!y(ijLHI@QlV3Y<$yjCZnx% znrHA~P86J;q;?xx30{Pq-AjoM=P}&ADc5LP_|7Qypu7`RSJKD%3(d=iNeek{VKyzL zknqQL5t6_}BHf4k?B;Wj3Nt;&47|q@`{lf4@A(RiGxOqyaxsDIy0;XbS&M7IInZ(# z5C^B}arhnd0GbiusT-kzHNQm@t~5DMgIg1VGW|vrhJ*=^zZakYkBfxcjeV~p7mHAB z+6~$z>)aXc5t()sv^HBkY76#n)UlQt5cAA_S9jw{63N)woU;zY^=zVC*I@W?Ka*X` z<6*eDoaLFj>SA?)iRGZDOY?N~{pS}u_wy^|!_JioJcX8Q2C2lgDFW?i3a#w^0? z$&6Heqn!rj4~`z+KT|!s;89)Ll|iYvon+>P!*%%=?sGiy)u?Ub=hJwe{=N$#MAY}3 zPq6l23nG4MiykYMI7&UwzSOTao4yd`>a7<%XMg=ksm;0bNY!wZmFrl{D$sZbJN3it zK=SuzPVTC2We1IqaDZU*8h0m2J|_nBm#_`eCdZ@)^ zYMg2xn4#kJ3L6hVQ}Y$qWq2M>RYY74egWr$yQ22J0^`i%h)<4x7DHMNhiX z6)B}pV?R9oZIApJy-%~5`e!s72X87IOVhFJ=NH_%tO+AmO#X?p^gMruj-vrlYMmP`>;k7Dw)UbsPXbtH_Au! zjAGq;r91aHsF`;9ala|3uH)>aqSR!qoxvsFiSX^0CXYtGvgpmg$U@#EFO3ymQ|n(@ z=eC!gf;v;}JBB)OKR(sETT|@ereF{t2vQkD;RiOmF=TFNw8`Kp@`V`DW6h9-w1koM zuY0!XMSJe1FExE?73?ZFa`{FY+R29ResrE#ekArCsAvJn0tTsTh}uRNaL`ljLr@yp zngzIltcN&kuYNZbnEDI7JJhh+H}D2{2T>9!jR1lGsGL%`M8`FNI8W?5HJjPj6%k&y zHPvr&T?M^XnlafoT!J)S;VZPm-3478gKL5+`aF)6g4T`aUhXJGV0XnPemSq%-w)fy z>wOC*<7Ox8p2#d?F{0z{$A#<8OHVaVzZ+i_c`z=!I{Ij@5+t=rgBidnRSj%yS?R0s zDVdw-2Pf&WP9YG<;ln8%L&f8 zqDIWPw?uYyX#(9&5I+xQsgOrbr}D>&{MuFfa26e+7J6+)XN~4F8+LbUgjZq{W&8Nx zmV9}!ywtV9S1DogE7isK{?d=}PDJD#X=VD`%UjwPgDb*U_G^N7lQ7&o8gzLx$O~)38Vn1t6+Fxd+cJ7 z02rxml*nPIu=xzdAsg9-fQYC>tg zlhX3#AP)6&dmRrmCVjU!2b4yG(eGpBxvfvvcln;j18XB^_uCVzMDlurN!Xx?oeH8f zFhN*gDWx476A97Euk>rXbNShkZK5V6I-ibiYsGBT-S5sl##t#q0xAS( zc?l2XDnSNp?Q@(Uw<+o;lP@O;iA{|(x!#jOy}swJJ7h!iZh7x<1Q{7OQOB_uL1J|< zaftQfG^2)l8|q&O?Y#Y)u=a9o zo+$Qn?mp0o3#2@QhEdLqwBU$b8->+ue&#L~EE;2;i(XECcETgaF08gwH2Fk|7jJb% zhTHP|xc5eKi4Wh-dY90CZt-=1dKHoC?P>22w#bO6NzVs<^A-%4pyYkYccVlnm$enJ z=G5&q1fuSK3?N1ncr30lrB{%6GP0c?yds&jS^OH6e9aL44BO(&^^F~A*z3vL^|8yc z*1tE%-+lfyU)0umR)t-Iw%uUf2P1#FW{jlqv!n6DU#(tJNv(F;0G?8&I@N1!pC~cM zk+?Z2&b!~4jCalaM&ZD~w ze2**}?ge$a>B8J%MY;B70hILAd~hiwvXVyOxc8w~4$lGOHs1uTgH0>9D6-&2>0SGa zU$q2p2^Y<=U|uw?Urjwm@O&IQmKQX_OHe_b? zhE(xkuA6D{B(!8I6fqnpsaxW2|7=U|qtiRt)_xb;ev>#Hh|L1lx2i{zkbM-;q#xU~ zkUlXg<84w17Z9U=tJ;si6P|zdQ8`UUxR7$j&7k_0A6)bOIaAV#vnIJ$jdhH%m7vIl z<22{knL#fY{sH*c;Y-ASAHG1|9tTvv1Zm-by})jeBNrcV2-p=;4}ko00o!$Yto`!& zjNMO8-rVTo#?0N$Sd|mCuJNV5|I4DC#|?xo$zr;BB^&#Fgeh(|0FqG`e5$DK7sF-&`#)0zT)lt6VZ7=X6)>Ec0umtv6clEsS%-B_+~is1l9TWW9#qTu}MoBAw+> z?=1S4H$hhbQ8Q#G_EDEmJW_le4Y-;TfFbb4iQ~N!y~i+OJd_Pgfg5uHe0TsUcwsZ_ zV$(6tXlNq}>XAneL-d8T3_`meSyA?N>vGGDMYG-DIS(#gLS2KvzUA}P-=(L|`MVDb zS)Os&ZX7()&sBoo{4O%r6l{HC)$V$qPIY3`O^F7xbqy9NhQ-1LK5Q$L#<=+Wl=6rT z^F%$qZSLZ1>kV&D`-+)6>LD5N6tQn#srWwH<6*Y>) zxA9(g>1(34!#mIo;&ro9Ytv)}@p*TTg4E%MM1)68BP?zROnZjLHyTHzB8t49jicUq zl>7v@Hxcw{*^5wop<2NMvLL5owg|hg;<~ZB*G1j6{MF)mz79ojEp7l;SkpiziMlqE+*v$6@_th!8AF!PU{}>W#cMjH{K3$ol-;94 z@S@MA4@>aNXob*jei`O;$KeLqaDj=TqT;V-9Xm!1M$b>&8?56sUOp%ObT(0g`o9~G z#!k--CPw+RBTZ24*V$XH%aiOnK_d)R0@p^GT+BV#}e9 ze){fxY}+!YJtHse^$n~SzVpt0HL8cU{ zp1?$}n$$%TJQ|yYpyA~Uf~aY4TsS7a{UBC^dS)xf#AM4>J~t&yox*;qMJl^^x^oUk zR+Y8EfVBkOu4KUkyjZrB1?9xEkQu;M5JzdaS~*@!B2EMKGPpK%kt**B8*o4f1ej30 zx|?w0gvBO8=vET*d-V&7nFNN*=BPU$5OwSISOl6dR4N;kwu*M_==!C!G!xsEBjYPh zQLhR;qD3n7_ZjQ*Di>2sRt|J}-W^42tuC4-cgwxUMlx+Pmk$}-deVWhOyf9yu{|P9 zSRJ~Jon>jVBOuTNneE}oPWHrvMMLJ*8mvyw#&d6yyq{ptn~ytPZ|Mdt6Lv*S z1wU|QaG!42UyUsU>F+j>D!wi`dh*CdCmiVGd789A9U|)+_$t1tFtg!k&TOWkJEhT~ zO`=@XuXlR7?=r@5LL`7a>jm=77#3qV6!S*`e^>xdaO3QWoYualW;6C6V&CkIHJ^WG z0)IeEPQ&9;7sXFavRkx52a~SuA89%^<;ky%0kEzcf!tOHXZ53Ut(^wj{@`}16u1f& zdmLB?ijK}$s8CM-0gW~QW@1VNgU+U7!&;Hlkh-K6olMvQ9>G=q+3;&gmt^dQ%_;D* zxE415v6xUQrwIl)@|G5U51;jz0XH-uLTLY!!0}bAHu{hek7>Z`fF4*FHHa_X;~_?; zCC3AlpiDNMJG)*zQD`HgN_Oju#Sc$c-9;51pbVsld#ueV&U;rESE-OZwLH;ZSnIX!JM z+y0s7IMtJ+TR{wW6>lvfNp>O}?0sT65yyZT_uYxvdsm-|XE+Q#Hjw$a+`zi{sG2Uy z)}s;obK!VjNsD`H`&mq520{Y#v?*@PrQn45VuNEd)axn?EaEKu#f4s*9;7L+U=EDc zqAs!nG_h(Y+N3Cn1y;_4Y=Ju8eVvFsZ+`XLnb+#U<&3VMwH6&%W$%8sV9ts_`+ajy z;AMVp@rfE8^+RuXnGtVuz3riTya{JVSz%XuXW_JBfX1L!uz&=NQAyhU5+RX`jI?t1 zq}{0b<|ad?h8pddS~2mZqwoB5zJvxaXeKCRU+RN}wlo;}?6zBKRLR9d8m|U#0Xm93 z{L}*{g$p2HWCx+b;eBEiMo|jqXHrg7-1ve&pLZb7k7(b&#QGXF&T^7Q9N=wo<^e;I8t`ek$qIFi4JuF6{T|lJNtE&9t?U={%P)+{F{ogvoLf}m7cR{{bP1I_ zZ+M7iuilKe?T_+#cGB4$BJ(Mb@m=r#w9H#M-)9s0&Sx#-Y)|m0M5>PW24yxSiHus2 zCzkMT`2*e)1w9Vxs}EXKt_QclGPR1mabJnwDr~)1w{H2Gcv80s0xeuv4g}bXD#6{W z6izZLgH8^smPMecRp}!e&3D4hEzEbhSzgb)?I1z|1V0fFkuQlO1PU+ME0?tx#uyQ` z3I^k$IwEZKP`%Fq5HP!;xPaK_&oIDHkQ=Koo(-%e6nqX$=E=)Rb*~WqJ#0y`M(ECS zfyk*zPB}dqrQp4m`^ZB~S>}^>`s7o=-okO`wFatyp5mhDGh&&CMQ1w}XXaE)$LS&4 z9;i#O?Tgr=-HCZ)H(`06oS9kgHLk;Mn!Nf;?~xU!nkzlt{uLPp9OL>zz@b(HB zgCDK`Jkxxyp{;1Q97r)b-Nr{~9o_AKK#nfqgBqyqWE z?<|R1KN?26JSNZKF^sGO0*t5@pSlqf`zN+e>&jR;b!)|esMg1;^W6MPax~95B!s0S zZ@e1+vK@@soBjIVGV)kafkHmSP5s$-8ecoN5MYL33aVdUQ)m_DKy&pqh`aFZx}~Oh zMavHEl%0;A+f0pzH=kIjk%q;9p3i6l zK+d7$IqlApjZ{aKQb?`Pb@TIO4YNs$ zl~eld5rNyi-ixNO-K@OdCjCz#V+9N;nt{(%jE6OEGgAF77ZO9hYkT7Ok`>LozdOM= zo%BxAw~k(bAGotrUVj*rs>=Au&v#q#YiZo(L`!htB7PK`?M$eD&3^s@n-r;R*43H> zrEDfnE6Psh3roI{K^#+jmy`cv*m>fCuq{$9E@eGm8g>cuPW2Jo_il#bo~Zxh!(lRgG!Zm2ZK0=^F>^3L(Hy^BAn zSWY-Peo^;`FFz^`M-WU|v+OkHqR&yc+<*ce(>TQ7*I@OGd9et#5CB|0YE%pYetgK& zKb}C(3Rr5u8|bv2S8|IZhj!Wa?6`wBBo9|})_+#szQ1!%k%MK- zx4ziUekhvp@=NM1=|EwEgEaR_gHAS!wD9A@Ey{?V6XU`8uW`MfuK?VGH}Ge&?`9DWBf{*if?dBBNIAc69$-o z1_%fNYsixBbPh89kiZX57@DkQwA_^NpEZs5_kx~*Cze%1QF9rc}j z)zqszqp-G=(zG68BFgKu{GKiX=Qcy98&tAr(eN;G5bY+w_(EwlUh|t&;LP3k%RJj* zSIlCi^KY92bq1I5&t2Bjzd$T@&L?)hCjBP9jup&x+a#n8(d&#KP8&+G%7@<8u9KK5 zrfCT!=kdPndkGx8c$ix5-d4|c!WLY1*|Vn&nJ#Qq*0tmPq08{hUp@%~+Rb)ZHK_?J zC-Zp^{zfsjTJFS5Q#d*4AxA_dnMb+VqxGKcg+T60=Ze+(;4@3U!m+gg@5wV__TdJd zwHq*Oc~}p=N`9}3(_rQ(z=2Vy_{LpNXbpFJ7c^Y~d!4SBreSLuTz@$py4JBsFOzw{`glo4~%>=A%pw4tUFFign2 z-5uS~0Z`2BTL2&iQ%ZZE!h*cz1C?4U0WYD3L8u+~-GGX@^F7s}q8VL_b#eKCYPj#! zM^TF)46y=Sq6Xb;0$cU;;756$Z{96Q*9(e1f=-JAdopC12<) ze&a(V?%=V`a37*3#jrPCze9W0k{E%pBf`Wa_&CkZ7(8N(mhF7?JhW&2I)bhC)xP59 zwbQfb?R&G4(i;D_5yuk~L-U^~9#1Ni#@)r9$evopleCzHZMKy90x92*!!l+03}+`f zdx)(Hjz->ldg++84gDT?MUxeYb6JXaaIsBtw(xK$v)bFC%p7nbHhU(KMVFY#&H(!H z4&bynqMhMY3adLZN2k~OZI*QZ`9t#>9C11Cb> z=x_kLLk<+2!C~N7a1=Noi)##>F1B4YjDqRIdSASu0;>3!*zyDlzd^SaF&?1_lKy@VqMdtpq zlB4gy>F6J9IlUoYH4OUvTw5dVdEC_sXt-Vc$k!Nk%#Dj9(YLE+18%y6?AWBu=pM)N1u~ws}!5G zsD|F+(V2bV)g8TD_G}vgH$-!3Q9Jdd?1mc5XQ1)n(|aaKh+c;(-86FFdaRF#C z>5eVyJ#<$&@WLp}W|s>lVpSTwBtEy@fh7(~!ENteV)b*< z%gQPRHkw)ws}$+b<%+lmz+8))hY#68>sM9-CX^YTWKz8_Tk>3jsO#4kCz6^HgPG8| zF@)bH>3*WWJeQpi%1r0^bfuislX=ZbuYHHT>LoT|;vF5`7Ha;gpokKCPC;i(cVx z2RK^-{*?>W5wdy#6}pKguSe)$|HEnwy>}$w5&i9ej-dSjK=%UxTmT)3$^exCt!&!} zfIYJ*-QQbyzIyOWIz)5JM{@Q?(|hE1KX^P3iLiHfoh?;wjXzBNb3dIOt7^r*k1vtg zd{A2zi(ihF|BFZd$PY8e(S17INH}V z^~H##@tolCItx$5jP+sZIabv&Jet(oZrVJ#Xx*e=0!;-o{eSX~^1ThJ`$A*{%Y< z;YiOz_0eV-u-0B2M{hlZhqYm9x-T2~8ahQv)I4w3)kYE^C7nr5(h}3s2VOmie?Rfe z7@W&Jt&@(Zg7UiDVj%#&lp7jcu=oSWA?T(W?r+tG1X0=fLfp`c1Z!;Of4AhV#;!0XT{(Cd2}o3SRpL(C^jv+S!McB`K$K#!J=$` zh<69x?H@4PKd6@$N;~P{a4v?(v(9te6`kxgALQV8{pCAY z3bLs@MlX~0?g1R~I^&8&{EhaC@%rCmwg1w~xj>ItyuOtxRL(w&TD|pd)_IeQpY{FG z)p!RVo#px}esKQ}run5WwaC4A5B1iZHf!d4_*KwZg&tK<94&r6Xcg5}2(?Fgn_8KS zT?@6*iM09rqVz3yb#18(riLXNd7L5r`>nqQ?qUlrH=lwX^DCsvI*W2_JNZLr^OFQ; z`fMt^pV}?cTYt4WLWyk20{)Z>gApJ30TupU-}~$Kd9RGsK|`872Y`6jVR_7?;Q#+~@nTv{kwO9@d2zs6rto9|X*D*A)6{K9(i zy}pVyVwR?+nkHpF^Ixlq*2ON0 zA0sX}v1vIOvy?hTe{J z>E0(dIyXMU{XV-#VkIcNtgY8|_|1_He@WQwf9v|CZ@*?M2c zyvo`l-gxm!-p7v?OdRH9pG;>cvU2?*5v7w4*Hj!~vf^!9nYQY7mb!8eoZY1Z@7>99QU&4buyV=7APO&H z)h4eoIkiN3Rvw`Eu=`QjqWthRT=VAf|BF3QyV9>R)0J7dZ0>cU#o@+P-|22=7p8qq z3%usem96(N%cGfpDp&rlYkxd*S{W#fa~^hIUaUB-`-`T_H(_}p(pV4m7`wgP!boUx zBv(n7zg$C4UMzn6r*heksIB-tSpF%RlTsyz_os_<+jIXP;!e0IGQW`Fwy$y-mN(<# zyT^HO7pUA61|g|imtj$Z_b`w4%scBtNzohMY<48IC`?RFPV>mTN4XNTKn5&K-m;xZ zYuRNwQ8adXtS_s6fe7#x%!o4iO9F5Jo|FqS>y}^@EFrkl+9a1?QMWZ# z-YYz1a466Y+75UeIzV&>0Fw-M-2p)10BF%jRnAc$8EiB+Hyg(H5+xN3@xzPL&Xb9B z(XW5zcOROH|2glp=1N}7r}{|lj{khudi!DZI_AbFe#+^5rEtbHlU6&u8~SGbvWK1G6OD8^7U%%Hu;lCEl4qrj7M7 z7v1O5mAtY!tt6?O=iNq4E?2y<_sBSQ{{C59JHPahd84`SihvLfmOJyL;id4|Dqybs zK6_Z6jk@TPIk35uHtqy^QWy+lFz=%O?B&$Ps%e~mp1aoHzbo}i#T@w;7yZ&_&zS*$ zG^bT{PyZ`y%5!^sIlPzGVe3*%ePo~{wT!K4aYl&rLppyuFZ#OUv_)>6m7?9*a0b$j zBx*)EpP!z*L#DFR8`xFJXzRs|s?oLsfHbdTU$$Cwr0#5a9$s_{vwKAuL`(3*U9h4j z>o7o5%9#$jF%M))dWlXlVEz*gCb)U%9e^j}&^nM80IOL<&p>eiJV%`X0CD*!5W5Sz zBvn>+AJvMiOY~1CBSYsa?-kv*C65b*_5(742fA@T^1h1ee@8sKi)it`{pT#-_YEr# z#`7%;8=3oeAGPJ2hfoo%{H5~nXTeOT*De^U|4u%hUhi%ArcAEfyz{HujfG`}MDOPB<+%xoJEK_w2K|*y%*g*0$@;%1?zGR3kGjqI|HasCp7T0!3xS#Sn56NJ z3Q3=KmTg0^+*~-Zi0H=DX$BvD)ZefUVo=4Z;mQu`2wFSqMoT@0UXO^O?<{Xekt#j- ztVj=ba=%B;TI~Bhesl}M6c0FU=c zmI=_@dT0RMstW+%I`9B>0KlTkq=25WO%yq`?%gUxmU1n6^Zfo$^Wnkv%Ue%x`S4aR zCg$gD@xiw^$1i_7(oc{7TiyMRjzqB%!`>hPmYwnKSe=?K#ZBo9S z+D(_Lo=mz&57xIub>(2gUH06s?^bSGJf&S_erP^jepciAuuOhUr<@37 zG44+3!m9cy(t64F0#1ypED`4$SDr|mZ^IRuGg<5XXu9&N$wy*&H|gV33Z5a(aye-h z$LgU|lF=$AB@7ZUIE9-B4OHh`_T317@sr$YR^fxy5489Y2#AUl+}ywX>yjNxpne%vPDKZ zJU4YS%VkxXdv-i=nIUccKirhP3`geJqTMl(_LCYW^75M8$#ol(qWA#S)w4eP`k^S{mSsgdzYu@6!BtctP<4C;2)`JI@ zt9^anze>y1^rv5*s7qD&-&l0<>W`AaZzCjaz0=3etU;!U6d!W-mCobIz@me(D~4!6 zS{}1Im*B~SPWyOm<}moZd=hm4YrJUY=5+ubbPF=a$#hT%UNcO{{@n`NCU z^IVzgCjUqM#kadfvhQj)PrB3Bi+1%+qt`6xw{rMrbpE`z&#!!+-1g2MGkp&hdl>F{ zJ^j7;Kk2_y7iWjw>B`}?!shG!&(;e!Nw+zp;@aM!!MyCNvtZZ9EsliMt#XW&itKZl zD61a-D?Y_D;b0KXcFopXx-BQO@sc#+JKxeVYMoSD4CdfKnBAvM7mYn8=TDOyq~oSj z^&_EiwESB_Q`0u}1`hQQ8d=|Fr7os}_y72%26e%X5;*dV#CAN5toJGHt&qS zOFbUT<-8+QH3JH#IKSM-f5Z+lcD55bEBZFuQJJwKzSwb%sToyuBPi_}G#>z^L_B^z zi%hiRMCrqQ_TzdoZHGBr|3J0BO~6`fHl!eFt5i+G@>%otZBjPsz~o_-0sv2EXHx(K zPSF4W000005-_d<1^@s6=0fkP4*!tc>7l4~i05lok0Cy&GEywHG_oA!ijmL-AT71JCXKrC7O_ zt=y=U?|Xdf^x1s%iRg)*`uw80#JBorx=7-?;PZuiUwv@qX`?G%=3#WHxD*I4~ zm7140Wm415inx3EOsHQpGeCCpPF#7N)|-0w_(kRg>6bHD#=Ycl>K?7H_ljQc^IE;S z$d{jPd0jH~PLRxQY-P^p)iPCfr(y&kxI5=2_JW?|%>YMIX# z^QziYfU{7EaOp_vU~5BIIskrzL;P`?mMRb-IJO&J>%-#aE~=i@gD4Fp+b>ORK|$C5 zF!SNjD*o6DjVYUZz=THz_yj;oHL8Fb5>No(Z6r~SH{79Nj9oG&ofbHBv*l>-dZ+x~r? zexF%`+H0Ci-iMd|7Y>is>a!}`N#63JQYJbi)18QwkGxNdbeUe?dVfEby+TtXR4$9t z^E;+I#ng z4k|{-T#SUEbyV!yU3={cPd&6sm>d2}S3AcZw2+G3qun(d4nvN~o6VAg3^M*r_OtBE zoO{c%^N*jhEI)5#?Im`LGD2cc0~a3e_Nxl*?`9h(<0j9X)J zi!+0d158*Fd$5*zUWEJ6bjwVzTpzgrPyk+(W6H5x5+E#?7P4IPOp3M5jpU|&Pm9LA z;T_C>;;RAhLjx$B2avSPK*|8QV;l|uFs9iNDZ~Kq^Y;%M49k|!L$E|2z!YH=~ko*E_DZ|uaIhUbE(L_ z6SG_6*pXb4&Eu}&MHf@vAMBUYFfZ0wt_vYqW64yfddGd-K3^=OoA1A|y4fSo4J*>+ z=pSDzX~0!E*EXJ)eVcyfu)DDqd@N^a&xzM2FA@fB$og0weQ>vvbF<&j14O4ES@R>? zXW5lmtJVlZ)wEK&=^)*e?{tEd*|^zu&f&Hm*VKFMM|#>;rh935E!hZmUieP^?%5R8 zC{SL`Q>EYZ()IZq@weT>AJsb~4r?;XttltUGXKM$!w^0ZaqIr#!NLfftpY=FC!`l& zZsi;>|2S%Y2f-8O#H4;dBXI$T1qdU zH_821{oh|YT?VOceg5EvEw=0!7R$2X-^%2+^7WH0T-1odO z4-dpX+qaZ5E0XTVay9?%V+-Hz=kD7b>UWZigNaM^2jfGri*k|wz5iC+V|RH%`3Cl zoy@0UGeV?oPI~}*xA&O{^+{j<8t-K4Q}Jl0H;!$&=2Y**%k^zsOfNJtdHg!4W1vX_ z1#E>NERG2OeZ)o26g0?9@Ws?=kGQxns`RY4OZQg|tD`EHxN# zQ;#qdu{U8LaFpT?VkZ&!oc$fZ$vS!W90AY)zM})y?GdyN049WZ%?O=K=YVU&HBXKK z`%VhV-vK~z0DuD?P#ok0J~#ltnV=wh$^gd$KqN;2z~nVR-TLgUV^<<{Zben^ukH7_ zclF?-)&3_xl7IJ7K!(0DV<34(XD4b3Nsy^#Rq>l7=K`BWgVloW- z^(DFv@Nz?iEV=eq_zL&M;*AAlwekA?s&BcZo}Raob}SE5)z9VoZaEove3NP2a(}lV zm1L_lxs&sDp5_jV^0gJ6iRbT1T`tDMK~M=C^H(C0I{a?s*zD6b>0zaxI$$4L-P$}> zjHxUe$*%5iw@#II+)T?R=iRzd3gGrqmfu)DF_b`4&Dibve`1z8*H;#k4IoYHKU<}K z+Wx)IqbRfmTB<#a&xRZwq`JG0wb20{gpialv#vGc6>C%_d)$_@l{{%m1okG=)9fydU=OSt(;K!H&?<} zrir8Uaw6Zj{`bU(oqOhbF5`Z??E3D>PyLvF)T7z)wbee$>_1A2S)C;>N0p}O?_cnF zPkrE6`6~A>TfW~(yL0@jZ}(tG!$@3~CmOGn9u{A-&2*S#j3`~>0ZUWm(j^C07y3vW zuhKzcc!kC%)ur2WMEcXeE3P=;D(1m4I{Q$&F>f6U1#icc>C*2d0d`^RE6yx(wgf^^ z1iOtK?zH^(vDWR4FN+Pg;;d%h`93TwCy3f(Wlj{3P{P>gL4R_l+Y?rXBZf|=_ zIM@zAo?QaGpM}?k6*t%dAs0reVcvm{*!Ec z`mgVBjoY41eG+Z_|KEQn4*&i4@%3xX=hFw<^P{2WlOgqiX%}+pmS@ zi^b#9r%#_QhwKXnkOjE={B+sffu8TjowZhjzpTmK8K|mbyN|zbP2_$JVa}_=WFzEdp1Ok@$g%E-~Ad3;G#vMwjq6WVyL`+eUA#sdVryt-*XLj!k+K<_GJ3IT&-nqFs z_uO-T@0@ebx$nHRl9CMI2A;Ne(pCt)EtE@miBP?}sz4~gSp@m1m6d1zCkScy&L0}S zlK^KS-t@TNCH(WJEn?LQ4g)S{3oA=Q)2d3y<-&qpE_5=791#`~7Pd8vL8c;tB3YrZ zqJ*4SQ7x?6T_F}!NNM;p2<|Hwe`Iaj1s_8Iq{2+v_EzK?cW;116~4W-pqab3OX1IA zACdTG^f0a3vc8i;WCd|U#!i}hE22b%0fkLCMNH;wlKR91A1Nf}az2|rRJJdEI8d=p zgQU<-tB?kkXFx_H?TiZHvOG3P*T>icGn8Cv{0Xh3cSx-++}9&*<~o9kQdn$ST{G9C zD`N+X9jTs1XfH|-L==A)K9V&|R;>HzN)r#)b2N^)!Q=&Y0zho&AT_ut_Vl@d2mn^M zQfXb|YWzhb~^i> z5;OR)WIWoTl{8cphnGS*t;DCcn6^T-owmo9VK{G`*} zRyUdbx6ThqiS@#BdXL%8&x1<6tGs%WIy(;__sFWuaSrXsishaFP!zrhn^O05sHf~9 z6`Z4WYd`V|>Cx*NA}sXd7a}I`!8vgJQq29Z)5LAw{ewQqsY6rQh5aWT+OqZ6a)kXu z(_C5?JY|~8e{y&{o&iNo@!N6adWu0?WuYBycXPQDF5(FidtQ=|B>l0UmBc2g5;(9A zrc8X1lIF*oYC&_S1+$Cd{O7A@mt?n=Wb@X#e7;)nv%X?Fv_wv1d9E1JMJl`y?r1-_ zll9C@GJN1@df=J2f|9C&&NtIJ2N}u7V=qp|rhc1{?wdN9nV2O_oE=P@QKed?sWVa@ ze+cCdi)W_Ad1~>krJA2~*^4d{*#O*SEA{LKJzF^+-5f;dp!5O|fJYOxp)*=J&u$Ll zsP&w-1-`CWWGHzLJL={ViNi(kM%CP*8Sc<@cbK}DxjI3P&LA>U51X83<8Sp)SAaJG zaOFVY`2&G4z&Vg0xV#HAe|i7_gav($(32z#jw&;G zC^K~^Gue-q#`~=nnL5cxg^t|>vkr_F?Eh?mOxd();U;m6c(5(}70S>Xl+_2CZ-zhT zSKAh$^RBwdnkUx21fBMKkN_C*_@gVJ`l~@Y0E%!nP48RK$n4f`Yos|2N%n->10_nP zqg{%GIJD9o+|wjD?bb?=nBW%44sLJnWe}{DLTm$%t+ChYC+Z~D1WhLQdW1XMUa;z;FGG+rMg^e%Yqc0%@Sm7-33>3 zt#xzLvi#QAG#*4oFEh|A8Jd@cTBjo?RXFlYCd#jd$Y|EI>@ovKwnd>?Y8*LBEt{1> zVFCX!FKbc8x32=$qTk=zaE~e%UfPB`$2O zndKMfy{()h#eDi`z6bmJVdG}+Zu;6!zjBTrUmh_v8lB4+oQBxOjyXrZ`F>=8-g*DY zm}p{b;Kp$Hmm?MQPb&i_%AA&P=Scdn?ESoVygvU%Dns8bM$azFr1MG9A6Veg67Zw_ zgC(wmve``@O#mMU?bQ|WbyU8Z+F-bA)|Hx#dZD35*e1-;lxPe>%tX@|=|YV#r>$6{ z>25WYYK&zXLtle|HenE1OhS$6zS$%`Wh}Spgsy41#y~%1>a`i~-!tp^hMsrZgrYVG z9do(oqscY6%M4Ul8#*I*$N2JD7Ohz*xxnD`WS|A|TL zG(%0qm|@FdOoStw=r;48pjJ4t#?fkkYLsiR&ADye8XVca*8sukhYgrT?P$dy^1Z!n zWiDjV4NR!Pk+&Q+giIL4%Og&UsRF~wA+i%!vV3CXp#^*3GSH=lX^YMDaKhBL>@pBn z0}GuniC;KgzHBblJk=`1X4AnPhaoXg|oMx{;-3t$MsD>a{yIs>z4I(2GL%vX!^hXr#` z_!B|yqRiSN%d^(ZTLrUrv+1h|Q~xs7`(*gR@>r$Q_{a+YQY8SMVIAJS8%#c+9^ML# z`HkV8`;kjbkB)Q;(?Kq}6z@rCxxn9rHXKnRn3Seq;l3$R4Sy*9RS~GcyC>A zryYyNqlF;P1fX_48~Rfxx?w8hv_Y@-V8dUr)sDS7Av~#E$T9R_MyFG=!g1b%{&8{4 z=1`5U2g96ZlMx;YX54(rbl(XH%xN*wm&Y)(aWizOb8G-^heu!=-u)%K-A5iSj~(cD znnS-I3-?YUfZJ=zqq64KSBNCj{ge&|3J9q*Io6$*yjbB8Y)54 zd(R@14TG#Pol6_n))K?*q{1s4Dy`rGb371+;zFQ;hzPfQVu3NL{{j)WN|2m=Q0P^M zUhkWGk@;5y*>}vYDSMzF+*M|bbmZjpMq0I!izf&D%Z#uJmrR7i0oHw_r^TN;xXp+L z@|Ug;#EfySX21C?q}>9#aFM%2q><@>58YUYPdzD__*6<{9VJQdJW({cR$<{JSs&vn zwmn{i6*tTnJe3qgE)@=NRY8ow2N#782-h`T)1lf4z?&bg0&((ny)SEh_q+S!$q7pk zd7!!-xul3!#(%sn-je?6I#vqvYHPs`(W`zLO-$kusZW3?e&&scwea>P1M=u%}I-oR+P_l7__VRTi3A^|iVYGk=PPGW50)p3_)&IX9AQm# z^xU4{n~xMPXxlR~?~(D!3V4CrFs<6b#*LcZffJ+Wu3W!;_Yo`+VeHGUSDqy zp@)V=FruPkVt@Exlgs5UsW>>w<*rY%)!)NU1iay&WVqn9!f%Wogp~%o*5mD8DHipg diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/spinda/spinda_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/spinda/spinda_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..591cf97ccdc30825da1944b3b265d739b17779e7 100644 GIT binary patch literal 14584 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 diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/tyrogue/tyrogue_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/tyrogue/tyrogue_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..0052575ea682d28190a6d9ec17cbda33265d9c59 100644 GIT binary patch literal 18472 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 literal 3574 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 From 5036ed0db1dedaf1c96f8f75144fa6e6998d4a42 Mon Sep 17 00:00:00 2001 From: Wi2tert <1763457574@qq.com> Date: Sat, 18 Jan 2025 16:08:58 +0800 Subject: [PATCH 027/121] fixes Karrablast shelmet Line Missing texture --- .../0588_karrablast/0_karrablast_base.json | 17 +++++++++++++++++ .../0589_escavalier/0_escavalier_base.json | 17 +++++++++++++++++ .../pokemon}/0588_karrablast/karrablast.png | Bin .../0588_karrablast/karrablast_shiny.png | Bin .../pokemon}/0589_escavalier/escavalier.png | Bin .../0589_escavalier/escavalier_shiny.png | Bin .../textures/pokemon/0616_shelmet/shelmet.png | Bin 0 -> 2185 bytes .../pokemon/0616_shelmet/shelmet_shiny.png | Bin 0 -> 2157 bytes .../pokemon/0617_accelgor/accelgor.png | Bin 0 -> 3444 bytes .../pokemon/0617_accelgor/accelgor_shiny.png | Bin 0 -> 3408 bytes 10 files changed, 34 insertions(+) create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0588_karrablast/0_karrablast_base.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0589_escavalier/0_escavalier_base.json rename common/src/main/resources/assets/cobblemon/{bedrock/pokemon/resolvers => textures/pokemon}/0588_karrablast/karrablast.png (100%) rename common/src/main/resources/assets/cobblemon/{bedrock/pokemon/resolvers => textures/pokemon}/0588_karrablast/karrablast_shiny.png (100%) rename common/src/main/resources/assets/cobblemon/{bedrock/pokemon/resolvers => textures/pokemon}/0589_escavalier/escavalier.png (100%) rename common/src/main/resources/assets/cobblemon/{bedrock/pokemon/resolvers => textures/pokemon}/0589_escavalier/escavalier_shiny.png (100%) create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0616_shelmet/shelmet.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0616_shelmet/shelmet_shiny.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0617_accelgor/accelgor.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0617_accelgor/accelgor_shiny.png diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0588_karrablast/0_karrablast_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0588_karrablast/0_karrablast_base.json new file mode 100644 index 0000000000..4e1029ae64 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0588_karrablast/0_karrablast_base.json @@ -0,0 +1,17 @@ +{ + "species": "cobblemon:karrablast", + "order": 0, + "variations": [ + { + "aspects": [], + "poser": "cobblemon:karrablast", + "model": "cobblemon:karrablast.geo", + "texture": "cobblemon:textures/pokemon/0588_karrablast/karrablast.png", + "layers": [] + }, + { + "aspects": ["shiny"], + "texture": "cobblemon:textures/pokemon/0588_karrablast/karrablast_shiny.png" + } + ] +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0589_escavalier/0_escavalier_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0589_escavalier/0_escavalier_base.json new file mode 100644 index 0000000000..f2d1c0a9dd --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0589_escavalier/0_escavalier_base.json @@ -0,0 +1,17 @@ +{ + "species": "cobblemon:escavalier", + "order": 0, + "variations": [ + { + "aspects": [], + "poser": "cobblemon:escavalier", + "model": "cobblemon:escavalier.geo", + "texture": "cobblemon:textures/pokemon/0589_escavalier/escavalier.png", + "layers": [] + }, + { + "aspects": ["shiny"], + "texture": "cobblemon:textures/pokemon/0589_escavalier/escavalier_shiny.png" + } + ] +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0588_karrablast/karrablast.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0588_karrablast/karrablast.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0588_karrablast/karrablast.png rename to common/src/main/resources/assets/cobblemon/textures/pokemon/0588_karrablast/karrablast.png diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0588_karrablast/karrablast_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0588_karrablast/karrablast_shiny.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0588_karrablast/karrablast_shiny.png rename to common/src/main/resources/assets/cobblemon/textures/pokemon/0588_karrablast/karrablast_shiny.png diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0589_escavalier/escavalier.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0589_escavalier/escavalier.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0589_escavalier/escavalier.png rename to common/src/main/resources/assets/cobblemon/textures/pokemon/0589_escavalier/escavalier.png diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0589_escavalier/escavalier_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0589_escavalier/escavalier_shiny.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0589_escavalier/escavalier_shiny.png rename to common/src/main/resources/assets/cobblemon/textures/pokemon/0589_escavalier/escavalier_shiny.png diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0616_shelmet/shelmet.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0616_shelmet/shelmet.png new file mode 100644 index 0000000000000000000000000000000000000000..a6e4313552df9114b48ceabd59809e9255fb4400 GIT binary patch literal 2185 zcmV;42zK|0P)Px-LrFwIRCt{2TVIG&RT%%xx@@a^y)$=rQ^QOYsug@#OBNM-DJTkiNkkH%?ZMjq zJPG2ukPjQ^hPV*qVi{x*g+#t6NDBqgq9G+x`>+*RyRu}kGxyH*?m8HHd)WETe)qfQ z+?m-wI%ED`=KP=Yedjyh`JF#E_0U6)gkbpl@3B!nyf z>aDs^TbP8WFew2=;dN+iZ3F-mCJL~f1^`gM1UGj*%s5sg&2s}d%}b3+B7rS?aU>0Z zN+$)Roph{zl5*;sWQFmo5#eY4aC*eK@MHy7c6Nsudr3qQ833L?1pv7G?B39J8nE_M zU&`}*001e$a|2MC2~v2c#RdSlSzjrK3x054rwaETIjL2OQo!Zm;j+zBH}aI``BTUg zg)dALl<>ZLGxD3s*x(i*tw9H!@G_sK#KC=?ph2B<^EkM#6TL@H8r!bdB@Uk3HZ2@8 zX|NHM@ZFor)Tu0(&>XX|04}tf_2IPG>X&2h>pLUyCMT_w(Es5nZQH4~lbb_s@`LBL zDZwQQ69qi`{8<$b{6!JR$U%;=Qk*$^UO6QxpquqoIuGm0$Tr-puci`DQx*{Ti`3jN zOcY{D;3Lb+CgIA??hpW;ergD)P${}mHiZe?I(QmiF#`Wa#HZAo1mXfq$W>uJL7k;e zk}zc6+-Xl1y*oGWtAGB(`Z?npc}PY0SHMq@6VKZXS6zk2(^BM%DADVghIEB`Td1RZ94|fOinZktAU` zCfz)moU}4$sw0;@$pd&i;sdx)(gFyT2tLwzp<+jqZ>c^hYb}P#6uC6gPC8-%6mD|T%35ZN2oGp%ZG`PN zXbWcSC1`AI#I-BA7`+AK44GMXB^e|zK~4!1+bgA<6pfsT^w2br`C!w;v}Ahz6xN>V zo6|-J0NU5DSKPp|rwLTx2P%Jm&-=!?pLWuCdDk<>KGa3#w-DZUZ^D$XOV_nAU$AUT z39pMojCQ%xqJBO`XrW=*mKt#`bl?Xno@T273|nR$>SV&k(;cDJy-B}EE+c=TAV-@E z53ylNN|VrThVBNw`23rYkDBcKdx!RF>+SF9kHmR>3LigqT03BACmmP7;JIxW8}-nR zAGCj1Du1@%#7D;hrJw|zne(IhLJNJMB#<boL z2g*4MSO~~b2Rj3BTI`7Mk|)H@K8uJs!LjTM7(4Ev9T&9~O64ykcD!-`nWm*UG0=k@ zuN(jXeEI2N?0NGLyvgfW-Vk3db;>19Y3KRaA zco4vY_~7VaZJTb^4#<~r=!V?2M*z@Kg004y_`1faRd3h0(=maU9%)OM8yc<~7+!_lnYi>opcsR^= zk~$|2iIeIadi!-ajdxX?F1E@1wChMK|l$ zo&pGTP^x2n@AiFUtoP!!E#_6AmOz3pX)+&s$!m2TV!OdwfllzL$r~zN_ohIHnzaCE zlpuvy8>MCkUe47jp=Nvlod$6sbgKa03y|5r)BPHtIZ{V0DS%FmQB(qrDpvxyN$Gwa@LWQ?(nYn5|{>fKB(HU*sygp^hN0F++a0}FT^y8R$ z(>Y+J<&BWfRAe51$1lP2bme&4<>YfENt`)*KI9)*S6co){?GUivxB3%R0Qu000000 LNkvXXu0mjf@#P{N literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0616_shelmet/shelmet_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0616_shelmet/shelmet_shiny.png new file mode 100644 index 0000000000000000000000000000000000000000..7f463141e63cd23bf95d1d8a4147cfd7fb9093e1 GIT binary patch literal 2157 zcmV-z2$J`SP)Px-CrLy>RCt{2TU%@tRT%!ZwqUn=nE@oB)q)oiHJXrkLt+dPMJ*4+$VFcCsfiCh zsU$x5V2lsO+k?hLHL@T{r|Z%wQ5y=0ER#RJexYb^O*nutXvuZ;8rIA099v3^~>2y z)bqMeUrPbNg^>X@R&l6|TwfN|f`_Yi9ZO*z`1!kip>NEuuuwVghWdDpD_@J?j)BJ` z-_e=r2(+C^cq)?;P#0c@E;|nZm~|@1^<`^)>%Ro2>;;yc3Dvod4|`eGs3a0NzrqUD z0Z{d%fUIpr-j7pGXHWg36$)b^;R#kQjjA&f5}v%E^3{F8(v@985fx0In*{)j?Oh+_ z`m)I1{aMO&tF`g!N^l(?RA+(|K4UEh0Qhc6DTfQbb=z)LK6LP9tx}W%hJX60Y4_Aw zp6Y7CR?ubVG3#6uzFP1?zm}B)_WV#9l)@{3S=-|u7u{(8@ z>8FkX!leP=vbsom;B`D=RL;90PU$oW#08d+ zQDGrLA4?xe!jOA&(w?Y)BX{q@sb5u@bAyZ$G=3*ByHvvTxmggi^D+#1fexiNZ-JFd zqklD;Rv7+b7~R8b6j|iiw+WmtU7&eHX`uSm0hZy6xB%h`G9{Q z>Xsy7IVPM6dhEP%XL?75J(&ma=MV=}of*)~k{&>4Meu7rc(G+7)MabOKYlCV!t?Um zFFk=jMt=|Wmjdg?By{pLwiiHgs1~|p`bva$^|L2YEqGWb+9?fI%KEfPiJL&y4toHV zd+faOmboI72Xxtaj zS(2uKYzLbrrjR*(ZWj5wKbzM=2msdIbkoJ$AXiJE{Hm|o_q_A0aqeer3pd{Ri18ab z`23c_R|_6Y?Yes17z>3=E~A9kJwsT#*=f@=Y!$RPwLmmO|&l-q_w&55DTWbItlG!=u+V4@Ad`UYVzZEKK7jUy${|C*Yo$O zeEj3Lv0 z2~DH+g#g8MQi9z1;ox;V=Wiu92q~aARIZoGD4kgq>D;J&K8VZK2y&^+SAO{wR%F3M zxdY`3qlK}^--uL{2cHklo^g#!*Wt}i2044lf?B;#N(bv%1Evlp-!kX8rV1ISp*L&D2E!K9c-6uAENk(#UPcaR#kFD4$mcMGg#Y3$v9 z01w`~1px5L=ZCRt$9A~oNdPM&;Zm15au`W)c=Lv!f3;;K!Qsst)O?)l_E)R0meoA3 zJKGy7Q(MP$CXydOlQVD_Nw9zQ4LExy%%rk?v37+3pi(@c6in78OnKwjyZ?YH6aJbw zjr3)};Y06g$MoG&ghL{hYeaI5NOGaT6#!=G+i$%e(75*ZKO6;wLZI0smC$B_aU|Ca zNiGEF!?$mHRLy&WTon0LUkOfpaNywkwRS<892skQax%fWV&I-N!QTA`uxrP5005Q8 zi~2b)4}xMzkm}{(r->vl1=9IUq@2!YfMTtVuOxMdB|%AYjY#rRV9&mznDWMz@ZH&7 z?Adn|x8HidnksRjFcEG%AIw}RXjgihHa)EE|IN4IsoQo67`SImfcjjg$Y8>hHy+{! z-LYBQDPZP8A(-;UmGH#=anIe^UKGbpM$Qy{x72Jt-6p+^B!qamrr$KVO#6$rZ=6Dz*c#exJ*RBcOA@to+ts9rxwmM#7IDiXC7bGj^qjQ!cZpXLT@e(ry5VN}jLzah_tgsm@xx6ox zs40NDpmJ{?Y(Zms$Fwdmy+cT(2NcInsydp-eb-$Jh+E(C_BY)V=9%CXSKX}2GKWZ{ z2N3AQ*L3&Cl=6~7bR?b|ixAuYLk)ZB>flR{7XWmZ=FPF%zESdkuzZw4s2i&z`y-IPv z_~JvL&cyjEZcCZkQBPE0I0ZU<=#7Yb(>`FU{f&^%6qQl*v8<;ua900000NkvXXu0mjfkt8Mh literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0617_accelgor/accelgor.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0617_accelgor/accelgor.png new file mode 100644 index 0000000000000000000000000000000000000000..328738a7b9fa58e277dd0821841497b20061f52c GIT binary patch literal 3444 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 Date: Sat, 18 Jan 2025 03:32:57 -0500 Subject: [PATCH 028/121] Updated spawn files. Added Aether and space mod compat. Fixed errors with some conditions. Updated tags. --- .../spawn_pool_world/0010_caterpie.json | 37 +- .../spawn_pool_world/0011_metapod.json | 37 +- .../spawn_pool_world/0012_butterfree.json | 23 +- .../spawn_pool_world/0013_weedle.json | 4 +- .../spawn_pool_world/0014_kakuna.json | 4 +- .../spawn_pool_world/0015_beedrill.json | 4 +- .../spawn_pool_world/0016_pidgey.json | 21 ++ .../spawn_pool_world/0017_pidgeotto.json | 21 ++ .../spawn_pool_world/0018_pidgeot.json | 21 ++ .../spawn_pool_world/0025_pikachu.json | 2 + .../spawn_pool_world/0026_raichu.json | 2 + .../spawn_pool_world/0035_clefairy.json | 39 ++ .../spawn_pool_world/0036_clefable.json | 39 ++ .../spawn_pool_world/0039_jigglypuff.json | 20 + .../spawn_pool_world/0040_wigglytuff.json | 20 + .../spawn_pool_world/0041_zubat.json | 19 + .../spawn_pool_world/0042_golbat.json | 19 + .../spawn_pool_world/0054_psyduck.json | 6 +- .../spawn_pool_world/0055_golduck.json | 6 +- .../spawn_pool_world/0060_poliwag.json | 8 +- .../spawn_pool_world/0061_poliwhirl.json | 8 +- .../spawn_pool_world/0062_poliwrath.json | 8 +- .../spawn_pool_world/0072_tentacool.json | 4 +- .../spawn_pool_world/0073_tentacruel.json | 4 +- .../spawn_pool_world/0074_geodude.json | 20 + .../spawn_pool_world/0075_graveler.json | 20 + .../spawn_pool_world/0076_golem.json | 20 + .../spawn_pool_world/0077_ponyta.json | 19 + .../spawn_pool_world/0078_rapidash.json | 19 + .../spawn_pool_world/0079_slowpoke.json | 123 +++++-- .../spawn_pool_world/0080_slowbro.json | 109 +++++- .../spawn_pool_world/0084_doduo.json | 20 + .../spawn_pool_world/0085_dodrio.json | 20 + .../cobblemon/spawn_pool_world/0086_seel.json | 8 +- .../spawn_pool_world/0087_dewgong.json | 8 +- .../spawn_pool_world/0088_grimer.json | 36 +- .../cobblemon/spawn_pool_world/0089_muk.json | 36 +- .../spawn_pool_world/0090_shellder.json | 24 +- .../spawn_pool_world/0091_cloyster.json | 24 +- .../spawn_pool_world/0092_gastly.json | 1 + .../spawn_pool_world/0093_haunter.json | 1 + .../spawn_pool_world/0094_gengar.json | 1 + .../spawn_pool_world/0098_krabby.json | 12 +- .../spawn_pool_world/0099_kingler.json | 12 +- .../spawn_pool_world/0113_chansey.json | 19 + .../spawn_pool_world/0116_horsea.json | 18 +- .../spawn_pool_world/0117_seadra.json | 18 +- .../spawn_pool_world/0118_goldeen.json | 2 + .../spawn_pool_world/0119_seaking.json | 2 + .../spawn_pool_world/0120_staryu.json | 6 +- .../spawn_pool_world/0121_starmie.json | 6 +- .../spawn_pool_world/0123_scyther.json | 20 + .../spawn_pool_world/0127_pinsir.json | 20 + .../spawn_pool_world/0128_tauros.json | 80 ++++ .../spawn_pool_world/0129_magikarp.json | 45 ++- .../spawn_pool_world/0130_gyarados.json | 2 + .../spawn_pool_world/0131_lapras.json | 4 +- .../spawn_pool_world/0133_eevee.json | 1 + .../spawn_pool_world/0143_snorlax.json | 2 + .../spawn_pool_world/0147_dratini.json | 3 + .../spawn_pool_world/0148_dragonair.json | 3 + .../spawn_pool_world/0149_dragonite.json | 3 + .../spawn_pool_world/0152_chikorita.json | 1 + .../spawn_pool_world/0153_bayleef.json | 1 + .../spawn_pool_world/0154_meganium.json | 1 + .../spawn_pool_world/0161_sentret.json | 1 + .../spawn_pool_world/0162_furret.json | 1 + .../spawn_pool_world/0165_ledyba.json | 20 + .../spawn_pool_world/0166_ledian.json | 20 + .../spawn_pool_world/0169_crobat.json | 19 + .../spawn_pool_world/0170_chinchou.json | 12 +- .../spawn_pool_world/0171_lanturn.json | 12 +- .../spawn_pool_world/0173_cleffa.json | 39 ++ .../spawn_pool_world/0174_igglybuff.json | 20 + .../spawn_pool_world/0186_politoed.json | 8 +- .../spawn_pool_world/0191_sunkern.json | 56 +++ .../spawn_pool_world/0192_sunflora.json | 56 +++ .../spawn_pool_world/0193_yanma.json | 19 + .../spawn_pool_world/0194_wooper.json | 346 ++++++++++-------- .../spawn_pool_world/0195_quagsire.json | 54 ++- .../spawn_pool_world/0199_slowking.json | 109 +++++- .../spawn_pool_world/0211_qwilfish.json | 40 +- .../spawn_pool_world/0213_shuckle.json | 4 +- .../spawn_pool_world/0214_heracross.json | 21 ++ .../spawn_pool_world/0216_teddiursa.json | 18 + .../spawn_pool_world/0217_ursaring.json | 18 + .../spawn_pool_world/0218_slugma.json | 48 ++- .../spawn_pool_world/0219_magcargo.json | 43 ++- .../spawn_pool_world/0222_corsola.json | 8 +- .../spawn_pool_world/0225_delibird.json | 22 ++ .../spawn_pool_world/0226_mantine.json | 8 +- .../spawn_pool_world/0230_kingdra.json | 18 +- .../spawn_pool_world/0234_stantler.json | 23 ++ .../spawn_pool_world/0242_blissey.json | 19 + .../spawn_pool_world/0252_treecko.json | 4 +- .../spawn_pool_world/0253_grovyle.json | 4 +- .../spawn_pool_world/0254_sceptile.json | 4 +- .../spawn_pool_world/0255_torchic.json | 4 +- .../spawn_pool_world/0256_combusken.json | 4 +- .../spawn_pool_world/0257_blaziken.json | 4 +- .../spawn_pool_world/0263_zigzagoon.json | 22 +- .../spawn_pool_world/0264_linoone.json | 22 +- .../spawn_pool_world/0270_lotad.json | 8 +- .../spawn_pool_world/0271_lombre.json | 8 +- .../spawn_pool_world/0272_ludicolo.json | 8 +- .../spawn_pool_world/0273_seedot.json | 4 +- .../spawn_pool_world/0274_nuzleaf.json | 4 +- .../spawn_pool_world/0275_shiftry.json | 4 +- .../spawn_pool_world/0276_taillow.json | 20 + .../spawn_pool_world/0277_swellow.json | 20 + .../spawn_pool_world/0280_ralts.json | 2 + .../spawn_pool_world/0281_kirlia.json | 2 + .../spawn_pool_world/0282_gardevoir.json | 2 + .../spawn_pool_world/0285_shroomish.json | 4 +- .../spawn_pool_world/0286_breloom.json | 4 +- .../spawn_pool_world/0290_nincada.json | 20 + .../spawn_pool_world/0291_ninjask.json | 20 + .../spawn_pool_world/0292_shedinja.json | 20 + .../spawn_pool_world/0302_sableye.json | 1 + .../spawn_pool_world/0315_roselia.json | 1 + .../spawn_pool_world/0318_carvanha.json | 30 +- .../spawn_pool_world/0319_sharpedo.json | 18 +- .../spawn_pool_world/0320_wailmer.json | 4 +- .../spawn_pool_world/0321_wailord.json | 4 +- .../spawn_pool_world/0337_lunatone.json | 17 + .../spawn_pool_world/0338_solrock.json | 20 + .../spawn_pool_world/0340_whiscash.json | 2 +- .../spawn_pool_world/0341_corphish.json | 12 +- .../spawn_pool_world/0342_crawdaunt.json | 12 +- .../spawn_pool_world/0343_baltoy.json | 22 ++ .../spawn_pool_world/0344_claydol.json | 22 ++ .../spawn_pool_world/0349_feebas.json | 6 +- .../spawn_pool_world/0350_milotic.json | 6 +- .../spawn_pool_world/0357_tropius.json | 21 +- .../spawn_pool_world/0363_spheal.json | 12 +- .../spawn_pool_world/0364_sealeo.json | 12 +- .../spawn_pool_world/0365_walrein.json | 12 +- .../spawn_pool_world/0369_relicanth.json | 6 +- .../spawn_pool_world/0371_bagon.json | 1 + .../spawn_pool_world/0372_shelgon.json | 1 + .../spawn_pool_world/0373_salamence.json | 1 + .../spawn_pool_world/0374_beldum.json | 38 ++ .../spawn_pool_world/0375_metang.json | 38 ++ .../spawn_pool_world/0376_metagross.json | 38 ++ .../spawn_pool_world/0399_bidoof.json | 8 +- .../spawn_pool_world/0400_bibarel.json | 8 +- .../spawn_pool_world/0406_budew.json | 1 + .../spawn_pool_world/0407_roserade.json | 1 + .../spawn_pool_world/0415_combee.json | 27 ++ .../spawn_pool_world/0416_vespiquen.json | 27 ++ .../spawn_pool_world/0417_pachirisu.json | 4 +- .../spawn_pool_world/0418_buizel.json | 6 +- .../spawn_pool_world/0419_floatzel.json | 6 +- .../spawn_pool_world/0422_shellos.json | 16 +- .../spawn_pool_world/0423_gastrodon.json | 16 +- .../spawn_pool_world/0440_happiny.json | 19 + .../spawn_pool_world/0441_chatot.json | 21 ++ .../spawn_pool_world/0443_gible.json | 19 + .../spawn_pool_world/0444_gabite.json | 19 + .../spawn_pool_world/0445_garchomp.json | 19 + .../spawn_pool_world/0446_munchlax.json | 2 + .../spawn_pool_world/0447_riolu.json | 19 + .../spawn_pool_world/0448_lucario.json | 19 + .../spawn_pool_world/0455_carnivine.json | 2 + .../spawn_pool_world/0458_mantyke.json | 8 +- .../spawn_pool_world/0469_yanmega.json | 19 + .../spawn_pool_world/0470_leafeon.json | 4 +- .../spawn_pool_world/0475_gallade.json | 2 + .../spawn_pool_world/0546_cottonee.json | 20 + .../spawn_pool_world/0547_whimsicott.json | 20 + .../spawn_pool_world/0548_petilil.json | 19 + .../spawn_pool_world/0549_lilligant.json | 19 + .../spawn_pool_world/0561_sigilyph.json | 41 +++ .../spawn_pool_world/0570_zorua.json | 4 +- .../spawn_pool_world/0571_zoroark.json | 4 +- .../spawn_pool_world/0580_ducklett.json | 148 ++++++++ .../spawn_pool_world/0581_swanna.json | 145 ++++++++ .../spawn_pool_world/0585_deerling.json | 19 + .../spawn_pool_world/0586_sawsbuck.json | 19 + .../spawn_pool_world/0588_karrablast.json | 26 ++ .../spawn_pool_world/0589_escavalier.json | 26 ++ .../spawn_pool_world/0590_foongus.json | 51 +++ .../spawn_pool_world/0591_amoongus.json | 51 +++ .../spawn_pool_world/0592_frillish.json | 8 +- .../spawn_pool_world/0593_jellicent.json | 8 +- .../spawn_pool_world/0594_alomomola.json | 4 +- .../spawn_pool_world/0605_elgyem.json | 38 ++ .../spawn_pool_world/0606_beheeyem.json | 38 ++ .../spawn_pool_world/0616_shelmet.json | 32 ++ .../spawn_pool_world/0617_accelgor.json | 32 ++ .../spawn_pool_world/0627_rufflet.json | 52 +++ .../spawn_pool_world/0628_braviary.json | 52 +++ .../spawn_pool_world/0633_deino.json | 19 + .../spawn_pool_world/0634_zweilous.json | 19 + .../spawn_pool_world/0635_hydreigon.json | 19 + .../spawn_pool_world/0636_larvesta.json | 19 + .../spawn_pool_world/0637_volcarona.json | 19 + .../spawn_pool_world/0661_fletchling.json | 21 ++ .../spawn_pool_world/0662_fletchinder.json | 21 ++ .../spawn_pool_world/0663_talonflame.json | 21 ++ .../spawn_pool_world/0664_scatterbug.json | 1 + .../spawn_pool_world/0665_spewpa.json | 1 + .../spawn_pool_world/0666_vivillon.json | 22 ++ .../spawn_pool_world/0669_flabebe.json | 34 +- .../spawn_pool_world/0670_floette.json | 34 +- .../spawn_pool_world/0671_florges.json | 34 +- .../spawn_pool_world/0679_honedge.json | 19 + .../spawn_pool_world/0680_doublade.json | 19 + .../spawn_pool_world/0681_aegislash.json | 19 + .../spawn_pool_world/0688_binacle.json | 78 ++++ .../spawn_pool_world/0689_barbaracle.json | 78 ++++ .../spawn_pool_world/0690_skrelp.json | 18 +- .../spawn_pool_world/0691_dragalge.json | 18 +- .../spawn_pool_world/0692_clauncher.json | 12 +- .../spawn_pool_world/0693_clawitzer.json | 12 +- .../spawn_pool_world/0700_sylveon.json | 4 +- .../spawn_pool_world/0704_goomy.json | 4 +- .../spawn_pool_world/0705_sliggoo.json | 4 +- .../spawn_pool_world/0706_goodra.json | 4 +- .../spawn_pool_world/0712_bergmite.json | 27 +- .../spawn_pool_world/0713_avalugg.json | 27 +- .../spawn_pool_world/0722_rowlet.json | 2 + .../spawn_pool_world/0723_dartrix.json | 2 + .../spawn_pool_world/0724_decidueye.json | 2 + .../spawn_pool_world/0742_cutiefly.json | 22 ++ .../spawn_pool_world/0743_ribombee.json | 22 ++ .../spawn_pool_world/0747_mareanie.json | 8 +- .../spawn_pool_world/0748_toxapex.json | 8 +- .../spawn_pool_world/0751_dewpider.json | 163 +++++++++ .../spawn_pool_world/0752_araquanid.json | 163 +++++++++ .../spawn_pool_world/0755_morelull.json | 1 + .../spawn_pool_world/0756_shiinotic.json | 1 + .../spawn_pool_world/0764_comfey.json | 1 + .../spawn_pool_world/0767_wimpod.json | 12 +- .../spawn_pool_world/0768_golisopod.json | 12 +- .../spawn_pool_world/0771_pyukumuku.json | 12 +- .../spawn_pool_world/0775_komala.json | 2 + .../spawn_pool_world/0779_bruxish.json | 8 +- .../spawn_pool_world/0813_scorbunny.json | 2 + .../spawn_pool_world/0814_raboot.json | 2 + .../spawn_pool_world/0815_cinderace.json | 2 + .../spawn_pool_world/0816_sobble.json | 2 +- .../spawn_pool_world/0817_drizzile.json | 2 +- .../spawn_pool_world/0818_inteleon.json | 2 +- .../spawn_pool_world/0829_gossifleur.json | 20 + .../spawn_pool_world/0830_eldegoss.json | 20 + .../spawn_pool_world/0831_wooloo.json | 20 + .../spawn_pool_world/0832_dubwool.json | 20 + .../spawn_pool_world/0845_cramorant.json | 82 ++++- .../spawn_pool_world/0846_arrokuda.json | 10 +- .../spawn_pool_world/0847_barraskewda.json | 10 +- .../spawn_pool_world/0856_hatenna.json | 4 +- .../spawn_pool_world/0857_hattrem.json | 4 +- .../spawn_pool_world/0858_hatterene.json | 4 +- .../spawn_pool_world/0868_milcery.json | 2 + .../spawn_pool_world/0869_alcremie.json | 2 + .../spawn_pool_world/0871_pincurchin.json | 6 +- .../spawn_pool_world/0875_eiscue.json | 6 +- .../spawn_pool_world/0878_cufant.json | 5 + .../spawn_pool_world/0879_copperajah.json | 5 + .../spawn_pool_world/0900_kleavor.json | 20 + .../spawn_pool_world/0901_ursaluna.json | 18 + .../spawn_pool_world/0904_overqwil.json | 20 +- .../spawn_pool_world/0924_tandemaus.json | 19 + .../spawn_pool_world/0925_maushold.json | 19 + .../spawn_pool_world/0935_charcadet.json | 19 + .../spawn_pool_world/0936_armarouge.json | 19 + .../spawn_pool_world/0937_ceruledge.json | 19 + .../spawn_pool_world/0940_wattrel.json | 8 +- .../spawn_pool_world/0941_kilowattrel.json | 8 +- .../spawn_pool_world/0957_tinkatink.json | 19 + .../spawn_pool_world/0958_tinkatuff.json | 19 + .../spawn_pool_world/0959_tinkaton.json | 19 + .../spawn_pool_world/0963_finizen.json | 4 +- .../spawn_pool_world/0964_palafin.json | 4 +- .../spawn_pool_world/0973_flamigo.json | 22 ++ .../spawn_pool_world/0976_veluza.json | 6 +- .../spawn_pool_world/0980_clodsire.json | 8 +- .../spawn_pool_world/0999_gimmighoul.json | 42 ++- .../data/cobblemon/tags/block/berry_soil.json | 4 + .../worldgen/biome/has_season/spring.json | 4 + .../tags/worldgen/biome/space/is_fiery.json | 41 +++ .../tags/worldgen/biome/space/is_icy.json | 13 + .../tags/worldgen/biome/space/is_mars.json | 41 +++ .../tags/worldgen/biome/space/is_mercury.json | 21 ++ .../tags/worldgen/biome/space/is_moon.json | 33 ++ .../tags/worldgen/biome/space/is_space.json | 113 ++++++ .../tags/worldgen/biome/space/is_venus.json | 37 ++ utilityscripts/cobblemon_spawn_csv_to_json.py | 46 ++- 289 files changed, 5194 insertions(+), 762 deletions(-) create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0580_ducklett.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0581_swanna.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0588_karrablast.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0589_escavalier.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0590_foongus.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0616_shelmet.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0617_accelgor.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0627_rufflet.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0628_braviary.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0688_binacle.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0689_barbaracle.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0751_dewpider.json create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0752_araquanid.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_fiery.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_icy.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_mars.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_mercury.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_moon.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_space.json create mode 100644 common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_venus.json diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0010_caterpie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0010_caterpie.json index 221507c1e4..f2bfba5a21 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0010_caterpie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0010_caterpie.json @@ -6,32 +6,6 @@ { "id": "caterpie-1", "pokemon": "caterpie", - "presets": [ - "natural", - "treetop" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "1-20", - "weight": 7.0, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:is_forest" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_freezing", - "#cobblemon:is_spooky" - ] - } - }, - { - "id": "caterpie-2", - "pokemon": "caterpie", "presets": [ "natural", "foliage", @@ -46,7 +20,16 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_forest", + "#cobblemon:is_plains", + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0011_metapod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0011_metapod.json index 8dc7910ba4..59a48af4c9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0011_metapod.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0011_metapod.json @@ -6,32 +6,6 @@ { "id": "metapod-1", "pokemon": "metapod", - "presets": [ - "natural", - "treetop" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "7-21", - "weight": 2.0, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:is_forest" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_freezing", - "#cobblemon:is_spooky" - ] - } - }, - { - "id": "metapod-2", - "pokemon": "metapod", "presets": [ "natural", "foliage", @@ -46,7 +20,16 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_forest", + "#cobblemon:is_plains", + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing", + "#cobblemon:is_spooky" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0012_butterfree.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0012_butterfree.json index be90db5ba4..8a11ae433a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0012_butterfree.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0012_butterfree.json @@ -53,7 +53,26 @@ } }, { - "id": "butterfree-valencian-3", + "id": "butterfree-3", + "pokemon": "butterfree", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "10-40", + "weight": 1.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "butterfree-valencian-4", "pokemon": "butterfree valencian", "presets": [ "natural" @@ -75,7 +94,7 @@ } }, { - "id": "butterfree-valencian-4", + "id": "butterfree-valencian-5", "pokemon": "butterfree valencian", "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0013_weedle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0013_weedle.json index 8fc78c0339..eba9743022 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0013_weedle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0013_weedle.json @@ -20,7 +20,9 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_forest", - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0014_kakuna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0014_kakuna.json index 15e9caf89d..246c71d436 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0014_kakuna.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0014_kakuna.json @@ -20,7 +20,9 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_forest", - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0015_beedrill.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0015_beedrill.json index 1dc92f6561..80a57700e1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0015_beedrill.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0015_beedrill.json @@ -19,7 +19,9 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_forest", - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "aether:skyroot_forest", + "aether:skyroot_woodland" ], "timeRange": "day", "isRaining": false diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json index 68374fcb73..627eabe37e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0016_pidgey.json @@ -29,6 +29,27 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "pidgey-3", + "pokemon": "pidgey", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json index b41e451445..6b7d3fefa2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0017_pidgeotto.json @@ -29,6 +29,27 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "pidgeotto-3", + "pokemon": "pidgeotto", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-35", + "weight": 0.9, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json index 4e7bf77028..49759be336 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0018_pidgeot.json @@ -29,6 +29,27 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "pidgeot-3", + "pokemon": "pidgeot", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "36-48", + "weight": 0.1, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json index 4dfb5298ac..7bdf8d89c0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0025_pikachu.json @@ -55,6 +55,8 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_beach", + "aether:skyroot_forest", + "aether:skyroot_woodland", "#cobblemon:is_tropical_island" ] }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json index 1a826fd829..84f937b2f7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0026_raichu.json @@ -55,6 +55,8 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_beach", + "aether:skyroot_forest", + "aether:skyroot_woodland", "#cobblemon:is_tropical_island" ] }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json index e41b98f430..6a36c69368 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json @@ -38,6 +38,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_dripstone" ] } @@ -87,6 +88,44 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "clefairy-5", + "pokemon": "clefairy", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "17-32", + "weight": 1.52, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#cobblemon:space/is_moon" + ] + } + }, + { + "id": "clefairy-6", + "pokemon": "clefairy", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "17-32", + "weight": 2.375, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_moon" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json index 0fddcc1dd7..4dd707073f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json @@ -38,6 +38,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_dripstone" ] } @@ -87,6 +88,44 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "clefable-5", + "pokemon": "clefable", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "27-48", + "weight": 0.08, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#cobblemon:space/is_moon" + ] + } + }, + { + "id": "clefable-6", + "pokemon": "clefable", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "27-48", + "weight": 0.125, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_moon" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json index 1612c3ef22..e8992aa053 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0039_jigglypuff.json @@ -57,6 +57,26 @@ "#cobblemon:is_floral" ] } + }, + { + "id": "jigglypuff-3", + "pokemon": "jigglypuff", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "16-27", + "weight": 0.95, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json index d081440517..dddf6745ce 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0040_wigglytuff.json @@ -57,6 +57,26 @@ "#cobblemon:is_floral" ] } + }, + { + "id": "wigglytuff-3", + "pokemon": "wigglytuff", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-44", + "weight": 0.05, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json index df865e185e..171f2d0057 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0041_zubat.json @@ -170,6 +170,25 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "zubat-9", + "pokemon": "zubat", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json index b8a9cb4caf..79fedcc36d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0042_golbat.json @@ -170,6 +170,25 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "golbat-9", + "pokemon": "golbat", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-46", + "weight": 0.9, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0054_psyduck.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0054_psyduck.json index 6ded56ee5b..09fa2e412a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0054_psyduck.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0054_psyduck.json @@ -95,14 +95,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0055_golduck.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0055_golduck.json index a488a36313..59fa8e04b5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0055_golduck.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0055_golduck.json @@ -95,14 +95,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0060_poliwag.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0060_poliwag.json index 6a9385d8d9..e012740a6f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0060_poliwag.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0060_poliwag.json @@ -195,8 +195,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -364,8 +364,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0061_poliwhirl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0061_poliwhirl.json index c1768cd83a..070509c724 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0061_poliwhirl.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0061_poliwhirl.json @@ -195,8 +195,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -364,8 +364,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0062_poliwrath.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0062_poliwrath.json index 4c4b66b33e..db6b7a646c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0062_poliwrath.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0062_poliwrath.json @@ -195,8 +195,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -364,8 +364,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json index 6d3c5b921e..2cfcfa01c5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0072_tentacool.json @@ -123,8 +123,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json index bf58b73e80..cb048c7b80 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0073_tentacruel.json @@ -123,8 +123,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json index 5b906773c1..af3262da57 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0074_geodude.json @@ -46,6 +46,26 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "geodude-alolan-3", + "pokemon": "geodude alolan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 9.0, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "#minecraft:iron_ores" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json index 99b831fd7f..aca1de46bf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0075_graveler.json @@ -46,6 +46,26 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "graveler-alolan-3", + "pokemon": "graveler alolan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-39", + "weight": 0.95, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "#minecraft:iron_ores" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json index 29bb99e845..c9c85cd712 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0076_golem.json @@ -46,6 +46,26 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "golem-alolan-3", + "pokemon": "golem alolan", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "34-50", + "weight": 0.05, + "condition": { + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "#minecraft:iron_ores" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json index 9d89abcb48..71d1efa5c4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0077_ponyta.json @@ -90,6 +90,25 @@ "#cobblemon:is_magical" ] } + }, + { + "id": "ponyta-galarian-4", + "pokemon": "ponyta galarian", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "16-41", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json index 38377fca32..7bdb7e6621 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0078_rapidash.json @@ -90,6 +90,25 @@ "#cobblemon:is_magical" ] } + }, + { + "id": "rapidash-galarian-4", + "pokemon": "rapidash galarian", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "40-50", + "weight": 1.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json index 08ebd635c9..9b10e33f6a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0079_slowpoke.json @@ -18,11 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_beach", - "#cobblemon:is_tropical_island" - ], - "neededNearbyBlocks": [ - "#minecraft:water" + "#cobblemon:is_beach" ] } }, @@ -62,22 +58,21 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_beach", - "#cobblemon:is_tropical_island" + "#cobblemon:is_beach" ] } }, @@ -93,14 +88,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -128,14 +123,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -144,8 +139,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_beach", - "#cobblemon:is_tropical_island" + "#cobblemon:is_beach" ] } }, @@ -161,14 +155,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -185,6 +179,93 @@ "#cobblemon:is_freezing" ] } + }, + { + "id": "slowpoke-galarian-7", + "pokemon": "slowpoke galarian", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "7-32", + "weight": 5.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "minecraft:mushroom_fields", + "#cobblemon:is_tropical_island" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + }, + { + "id": "slowpoke-galarian-8", + "pokemon": "slowpoke galarian", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "7-32", + "weight": 1.8, + "weightMultipliers": [ + { + "multiplier": 3.0, + "condition": { + "minLureLevel": 2, + "maxLureLevel": 2 + } + }, + { + "multiplier": 5.0, + "condition": { + "minLureLevel": 3 + } + } + ], + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:mushroom_fields", + "#cobblemon:is_tropical_island" + ] + } + }, + { + "id": "slowpoke-galarian-9", + "pokemon": "slowpoke galarian", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "7-32", + "weight": 1.8, + "weightMultipliers": [ + { + "multiplier": 3.0, + "condition": { + "minLureLevel": 2, + "maxLureLevel": 2 + } + }, + { + "multiplier": 5.0, + "condition": { + "minLureLevel": 3 + } + } + ], + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "minecraft:mushroom_fields", + "#cobblemon:is_tropical_island" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0080_slowbro.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0080_slowbro.json index 8911b732a9..fc04e6afa1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0080_slowbro.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0080_slowbro.json @@ -18,11 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_beach", - "#cobblemon:is_tropical_island" - ], - "neededNearbyBlocks": [ - "#minecraft:water" + "#cobblemon:is_beach" ] } }, @@ -38,22 +34,21 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_beach", - "#cobblemon:is_tropical_island" + "#cobblemon:is_beach" ] } }, @@ -69,14 +64,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -85,7 +80,93 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_beach", + "#cobblemon:is_beach" + ] + } + }, + { + "id": "slowbro-galarian-4", + "pokemon": "slowbro galarian", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "37-49", + "weight": 0.45, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "minecraft:mushroom_fields", + "#cobblemon:is_tropical_island" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + }, + { + "id": "slowbro-galarian-5", + "pokemon": "slowbro galarian", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "37-49", + "weight": 0.15, + "weightMultipliers": [ + { + "multiplier": 3.0, + "condition": { + "minLureLevel": 2, + "maxLureLevel": 2 + } + }, + { + "multiplier": 5.0, + "condition": { + "minLureLevel": 3 + } + } + ], + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:mushroom_fields", + "#cobblemon:is_tropical_island" + ] + } + }, + { + "id": "slowbro-galarian-6", + "pokemon": "slowbro galarian", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "37-49", + "weight": 0.15, + "weightMultipliers": [ + { + "multiplier": 3.0, + "condition": { + "minLureLevel": 2, + "maxLureLevel": 2 + } + }, + { + "multiplier": 5.0, + "condition": { + "minLureLevel": 3 + } + } + ], + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "minecraft:mushroom_fields", "#cobblemon:is_tropical_island" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json index 938497102c..7890e632e8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0084_doduo.json @@ -27,6 +27,26 @@ "#cobblemon:is_savanna" ] } + }, + { + "id": "doduo-2", + "pokemon": "doduo", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json index d70dcea4d2..0875f87031 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0085_dodrio.json @@ -27,6 +27,26 @@ "#cobblemon:is_savanna" ] } + }, + { + "id": "dodrio-2", + "pokemon": "dodrio", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "31-47", + "weight": 1.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json index 8b9b97b159..b48e9d6736 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0086_seel.json @@ -71,8 +71,8 @@ { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } } ], @@ -128,8 +128,8 @@ { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json index cf3fbe6189..c60084da79 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0087_dewgong.json @@ -71,8 +71,8 @@ { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } } ], @@ -128,8 +128,8 @@ { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json index be81677028..ae4125ab51 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0088_grimer.json @@ -107,14 +107,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -141,14 +141,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -179,14 +179,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -237,14 +237,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -273,14 +273,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -313,14 +313,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json index a6f5f3634c..0224e228ac 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0089_muk.json @@ -107,14 +107,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -141,14 +141,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -179,14 +179,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -237,14 +237,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -273,14 +273,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -313,14 +313,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json index 991a5dcb60..c0f64013e1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0090_shellder.json @@ -57,8 +57,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -81,14 +81,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -117,8 +117,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -143,14 +143,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -204,8 +204,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json index 95b84ee5c9..3dceb1b7a5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0091_cloyster.json @@ -57,8 +57,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -81,14 +81,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -117,8 +117,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -143,14 +143,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -204,8 +204,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json index 82aafed165..ca4a079775 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0092_gastly.json @@ -18,6 +18,7 @@ "minSkyLight": 0, "maxSkyLight": 0, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "maxLight": 0 diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json index 1d9ec2af4c..0e4df2ce36 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0093_haunter.json @@ -18,6 +18,7 @@ "minSkyLight": 0, "maxSkyLight": 0, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "maxLight": 0 diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json index e864e29caf..b65000e746 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0094_gengar.json @@ -18,6 +18,7 @@ "minSkyLight": 0, "maxSkyLight": 0, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "maxLight": 0 diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0098_krabby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0098_krabby.json index f78d6ca05a..881282407f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0098_krabby.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0098_krabby.json @@ -52,8 +52,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -75,8 +75,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -123,8 +123,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0099_kingler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0099_kingler.json index cbbe248c2a..9b610715eb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0099_kingler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0099_kingler.json @@ -52,8 +52,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -75,8 +75,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -123,8 +123,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json index 3b24636ecc..940f7a3b75 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0113_chansey.json @@ -56,6 +56,25 @@ "#minecraft:village" ] } + }, + { + "id": "chansey-3", + "pokemon": "chansey", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "17-45", + "weight": 1.125, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0116_horsea.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0116_horsea.json index e50e97ad00..b1752fc47d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0116_horsea.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0116_horsea.json @@ -34,14 +34,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -91,14 +91,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -152,14 +152,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0117_seadra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0117_seadra.json index 696ce2de84..65a822dff8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0117_seadra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0117_seadra.json @@ -34,14 +34,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -91,14 +91,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -152,14 +152,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0118_goldeen.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0118_goldeen.json index 138e09b4ce..84fcb33f55 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0118_goldeen.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0118_goldeen.json @@ -32,6 +32,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_bamboo", "#cobblemon:is_floral", "#cobblemon:is_freezing", @@ -77,6 +78,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_bamboo", "#cobblemon:is_floral", "#cobblemon:is_freezing", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0119_seaking.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0119_seaking.json index 6c94522aee..d6ab78ce92 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0119_seaking.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0119_seaking.json @@ -32,6 +32,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_bamboo", "#cobblemon:is_floral", "#cobblemon:is_freezing", @@ -77,6 +78,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_bamboo", "#cobblemon:is_floral", "#cobblemon:is_freezing", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json index 9ac92514aa..51fb87adb5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0120_staryu.json @@ -91,7 +91,7 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -177,7 +177,7 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -250,7 +250,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json index ac515c835e..48c4e5490a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0121_starmie.json @@ -91,7 +91,7 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -177,7 +177,7 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -250,7 +250,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json index c7c48b0c2c..6f8252f4f8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0123_scyther.json @@ -51,6 +51,26 @@ ], "timeRange": "day" } + }, + { + "id": "scyther-3", + "pokemon": "scyther", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "25-50", + "weight": 1.75, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json index bb8f90ee90..d184a80498 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0127_pinsir.json @@ -24,6 +24,26 @@ ], "timeRange": "night" } + }, + { + "id": "pinsir-2", + "pokemon": "pinsir", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "25-50", + "weight": 10.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json index 4a42297fee..c592c0fe2d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json @@ -26,6 +26,86 @@ "biomes": [ "#cobblemon:is_grassland" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_hills" + ] + } + }, + { + "id": "tauros-paldean-2", + "pokemon": "tauros paldean", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-49", + "weight": 2.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_highlands" + ] + } + }, + { + "id": "tauros-paldean-3", + "pokemon": "tauros paldean", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-49", + "weight": 2.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_highlands" + ] + } + }, + { + "id": "tauros-paldean-4", + "pokemon": "tauros paldean", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-49", + "weight": 2.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_highlands" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json index 927ad51aa8..763a702d5d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0129_magikarp.json @@ -53,6 +53,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ] } @@ -91,6 +92,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ] } @@ -114,6 +116,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -131,6 +134,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -157,6 +161,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -192,6 +197,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -227,6 +233,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -262,6 +269,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -295,6 +303,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -332,6 +341,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -369,6 +379,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -406,6 +417,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -442,6 +454,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -478,6 +491,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -514,6 +528,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -550,6 +565,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -586,6 +602,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -622,6 +639,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -658,6 +676,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -694,6 +713,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -730,6 +750,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -766,6 +787,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -802,6 +824,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -838,6 +861,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -874,6 +898,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -910,6 +935,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -946,6 +972,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -973,6 +1000,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1000,6 +1028,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1017,6 +1046,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1034,6 +1064,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1063,6 +1094,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1092,6 +1124,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1127,6 +1160,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1162,6 +1196,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1179,6 +1214,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1196,6 +1232,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1233,6 +1270,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1270,6 +1308,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1305,6 +1344,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1340,6 +1380,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1374,6 +1415,7 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 @@ -1408,10 +1450,11 @@ ], "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "minLureLevel": 1 } } ] -} +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json index 340a92a89e..c99e589ec7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0130_gyarados.json @@ -53,6 +53,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ] } @@ -91,6 +92,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json index b3eeb53879..ea6832474c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0131_lapras.json @@ -75,7 +75,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -137,7 +137,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json index c054c94672..241c0bfc92 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0133_eevee.json @@ -43,6 +43,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_temperate" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0143_snorlax.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0143_snorlax.json index 0136fc2f0a..365363f3a6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0143_snorlax.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0143_snorlax.json @@ -18,6 +18,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland", "#cobblemon:is_snowy_forest", "#cobblemon:is_forest", "#cobblemon:is_hills" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json index f7f857f0c2..3186f9d14e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0147_dratini.json @@ -74,6 +74,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "maxY": 32 @@ -90,6 +91,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_magical", "#cobblemon:is_ocean" ] @@ -134,6 +136,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_magical", "#cobblemon:is_ocean" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0148_dragonair.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0148_dragonair.json index 7fc0b4584e..d980015ea5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0148_dragonair.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0148_dragonair.json @@ -74,6 +74,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "maxY": 32 @@ -90,6 +91,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_magical", "#cobblemon:is_ocean" ] @@ -134,6 +136,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_magical", "#cobblemon:is_ocean" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json index 23fa9f0bc9..9146a9dbee 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0149_dragonite.json @@ -77,6 +77,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "maxY": 32 @@ -93,6 +94,7 @@ "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_magical", "#cobblemon:is_ocean" ] @@ -137,6 +139,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_magical", "#cobblemon:is_ocean" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json index 39cac9872b..0214ff9d65 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0152_chikorita.json @@ -18,6 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_floral" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json index 1645562c49..c26470b619 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0153_bayleef.json @@ -18,6 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_floral" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json index 58c115f3a8..7fa7dd93de 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0154_meganium.json @@ -18,6 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_floral" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0161_sentret.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0161_sentret.json index 2774271ead..5699c32064 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0161_sentret.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0161_sentret.json @@ -18,6 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_taiga", "#cobblemon:is_temperate", "#cobblemon:is_tundra" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0162_furret.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0162_furret.json index dc6bd3d09e..9ad0e8ec7a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0162_furret.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0162_furret.json @@ -18,6 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_taiga", "#cobblemon:is_temperate", "#cobblemon:is_tundra" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0165_ledyba.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0165_ledyba.json index 981cb6a959..34f9dcda87 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0165_ledyba.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0165_ledyba.json @@ -48,6 +48,26 @@ "#the_bumblezone:sempiternal_sanctums" ] } + }, + { + "id": "ledyba-3", + "pokemon": "ledyba", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 7.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0166_ledian.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0166_ledian.json index 135a30c83f..e1faf08015 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0166_ledian.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0166_ledian.json @@ -48,6 +48,26 @@ "#the_bumblezone:sempiternal_sanctums" ] } + }, + { + "id": "ledian-3", + "pokemon": "ledian", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "18-39", + "weight": 3.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json index d4a4da7d31..126a38521e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0169_crobat.json @@ -170,6 +170,25 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "crobat-9", + "pokemon": "crobat", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "41-54", + "weight": 0.1, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json index 6367705604..70705fc865 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0170_chinchou.json @@ -33,8 +33,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -76,8 +76,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -123,8 +123,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json index 4cc798ffcb..3d5195bcac 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0171_lanturn.json @@ -33,8 +33,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -76,8 +76,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -123,8 +123,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json index 415e182873..3f9ce69d7a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json @@ -38,6 +38,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_dripstone" ] } @@ -86,6 +87,44 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "cleffa-5", + "pokemon": "cleffa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-22", + "weight": 8.4, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#cobblemon:space/is_moon" + ] + } + }, + { + "id": "cleffa-6", + "pokemon": "cleffa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "1-22", + "weight": 7.5, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_moon" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json index 04118e8f6b..c125e56ebc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0174_igglybuff.json @@ -57,6 +57,26 @@ "#cobblemon:is_floral" ] } + }, + { + "id": "igglybuff-3", + "pokemon": "igglybuff", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-21", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0186_politoed.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0186_politoed.json index 527ec8414a..042de4d7fe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0186_politoed.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0186_politoed.json @@ -195,8 +195,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -364,8 +364,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0191_sunkern.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0191_sunkern.json index f076fd5c96..81bea86d93 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0191_sunkern.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0191_sunkern.json @@ -25,12 +25,68 @@ "maxSkyLight": 15, "biomes": [ "minecraft:sunflower_plains" + ], + "neededNearbyBlocks": [ + "minecraft:sunflower" ] } }, { "id": "sunkern-2", "pokemon": "sunkern", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-18", + "weight": 9.5, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:sunflower" + ] + }, + "anticondition": { + "biomes": [ + "minecraft:sunflower_plains" + ] + } + }, + { + "id": "sunkern-3", + "pokemon": "sunkern", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-18", + "weight": 5.7, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } + }, + { + "id": "sunkern-4", + "pokemon": "sunkern", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0192_sunflora.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0192_sunflora.json index 4076b5b893..6f856af41c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0192_sunflora.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0192_sunflora.json @@ -25,12 +25,68 @@ "maxSkyLight": 15, "biomes": [ "minecraft:sunflower_plains" + ], + "neededNearbyBlocks": [ + "minecraft:sunflower" ] } }, { "id": "sunflora-2", "pokemon": "sunflora", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "13-43", + "weight": 0.5, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_overworld" + ], + "neededNearbyBlocks": [ + "minecraft:sunflower" + ] + }, + "anticondition": { + "biomes": [ + "minecraft:sunflower_plains" + ] + } + }, + { + "id": "sunflora-3", + "pokemon": "sunflora", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "13-43", + "weight": 0.3, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } + }, + { + "id": "sunflora-4", + "pokemon": "sunflora", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json index 13e4c208c9..bb433f1610 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0193_yanma.json @@ -105,6 +105,25 @@ "#cobblemon:is_lush" ] } + }, + { + "id": "yanma-5", + "pokemon": "yanma", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "14-39", + "weight": 5.04, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json index 05398f1e7e..6b18a8a077 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0194_wooper.json @@ -193,6 +193,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ] } @@ -209,14 +210,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -245,14 +246,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -330,7 +331,48 @@ } }, { - "id": "wooper-heart-13", + "id": "wooper-13", + "pokemon": "wooper", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-21", + "weight": 8.4, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + }, + { + "id": "wooper-14", + "pokemon": "wooper", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "1-21", + "weight": 8.4, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "wooper-heart-15", "pokemon": "wooper wooper_pattern=heart", "type": "pokemon", "context": "fishing", @@ -341,13 +383,14 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "bobber": "cobblemon:love_ball" } }, { - "id": "wooper-heart-14", + "id": "wooper-heart-16", "pokemon": "wooper wooper_pattern=heart", "type": "pokemon", "context": "fishing", @@ -358,14 +401,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -375,61 +418,7 @@ "#cobblemon:is_mushroom", "#cobblemon:is_swamp" ], - "bobber": "cobblemon:love_ball" - }, - "anticondition": { - "biomes": [ - "#cobblemon:has_block/mud" - ] - } - }, - { - "id": "wooper-heart-15", - "pokemon": "wooper wooper_pattern=heart", - "type": "pokemon", - "context": "fishing", - "bucket": "common", - "level": "1-21", - "weight": 20.0, - "condition": { - "minSkyLight": 0, - "maxSkyLight": 7, - "biomes": [ - "#cobblemon:is_overworld" - ], - "bait": "cobblemon:love_sweet" - } - }, - { - "id": "wooper-heart-16", - "pokemon": "wooper wooper_pattern=heart", - "type": "pokemon", - "context": "fishing", - "bucket": "common", - "level": "1-21", - "weight": 20.0, - "weightMultipliers": [ - { - "multiplier": 3.0, - "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" - } - }, - { - "multiplier": 5.0, - "condition": { - "minLureLevel": "3" - } - } - ], - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mushroom", - "#cobblemon:is_swamp" - ], - "bait": "cobblemon:love_sweet" + "bobber": "cobblemon:love_ball" }, "anticondition": { "biomes": [ @@ -442,38 +431,17 @@ "pokemon": "wooper wooper_pattern=heart", "type": "pokemon", "context": "fishing", - "bucket": "uncommon", + "bucket": "common", "level": "1-21", - "weight": 2.0, - "weightMultipliers": [ - { - "multiplier": 3.0, - "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" - } - }, - { - "multiplier": 5.0, - "condition": { - "minLureLevel": "3" - } - } - ], + "weight": 20.0, "condition": { - "canSeeSky": false, - "minSkyLight": 8, - "maxSkyLight": 15, + "minSkyLight": 0, + "maxSkyLight": 7, "biomes": [ - "#cobblemon:is_mushroom", - "#cobblemon:is_swamp" + "#aether:is_aether", + "#cobblemon:is_overworld" ], - "bobber": "cobblemon:love_ball" - }, - "anticondition": { - "biomes": [ - "#cobblemon:has_block/mud" - ] + "bait": "cobblemon:love_sweet" } }, { @@ -488,14 +456,90 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 + } + } + ], + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_mushroom", + "#cobblemon:is_swamp" + ], + "bait": "cobblemon:love_sweet" + }, + "anticondition": { + "biomes": [ + "#cobblemon:has_block/mud" + ] + } + }, + { + "id": "wooper-heart-19", + "pokemon": "wooper wooper_pattern=heart", + "type": "pokemon", + "context": "fishing", + "bucket": "uncommon", + "level": "1-21", + "weight": 2.0, + "weightMultipliers": [ + { + "multiplier": 3.0, + "condition": { + "minLureLevel": 2, + "maxLureLevel": 2 + } + }, + { + "multiplier": 5.0, + "condition": { + "minLureLevel": 3 + } + } + ], + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_mushroom", + "#cobblemon:is_swamp" + ], + "bobber": "cobblemon:love_ball" + }, + "anticondition": { + "biomes": [ + "#cobblemon:has_block/mud" + ] + } + }, + { + "id": "wooper-heart-20", + "pokemon": "wooper wooper_pattern=heart", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "1-21", + "weight": 20.0, + "weightMultipliers": [ + { + "multiplier": 3.0, + "condition": { + "minLureLevel": 2, + "maxLureLevel": 2 + } + }, + { + "multiplier": 5.0, + "condition": { + "minLureLevel": 3 } } ], @@ -516,7 +560,7 @@ } }, { - "id": "wooper-paldean-19", + "id": "wooper-paldean-21", "pokemon": "wooper paldean", "presets": [ "natural" @@ -535,7 +579,7 @@ } }, { - "id": "wooper-paldean-20", + "id": "wooper-paldean-22", "pokemon": "wooper paldean", "presets": [ "water" @@ -553,7 +597,7 @@ } }, { - "id": "wooper-paldean-21", + "id": "wooper-paldean-23", "pokemon": "wooper paldean", "presets": [ "natural" @@ -575,7 +619,7 @@ } }, { - "id": "wooper-paldean-22", + "id": "wooper-paldean-24", "pokemon": "wooper paldean", "presets": [ "water" @@ -593,7 +637,7 @@ } }, { - "id": "wooper-paldean-23", + "id": "wooper-paldean-25", "pokemon": "wooper paldean", "type": "pokemon", "context": "fishing", @@ -608,7 +652,7 @@ } }, { - "id": "wooper-paldean-24", + "id": "wooper-paldean-26", "pokemon": "wooper paldean", "type": "pokemon", "context": "fishing", @@ -626,7 +670,7 @@ } }, { - "id": "wooper-paldean-25", + "id": "wooper-paldean-27", "pokemon": "wooper paldean", "type": "pokemon", "context": "fishing", @@ -636,8 +680,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -648,51 +692,14 @@ "minLureLevel": 1 } }, - { - "id": "wooper-paldean-26", - "pokemon": "wooper paldean", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "common", - "level": "1-21", - "weight": 9.0, - "condition": { - "canSeeSky": false, - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:has_block/mud" - ] - } - }, - { - "id": "wooper-paldean-27", - "pokemon": "wooper paldean", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "1-21", - "weight": 8.4, - "condition": { - "canSeeSky": false, - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - }, { "id": "wooper-paldean-28", "pokemon": "wooper paldean", + "presets": [ + "water" + ], "type": "pokemon", - "context": "fishing", + "context": "submerged", "bucket": "common", "level": "1-21", "weight": 9.0, @@ -708,6 +715,43 @@ { "id": "wooper-paldean-29", "pokemon": "wooper paldean", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "1-21", + "weight": 8.4, + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_savanna" + ] + } + }, + { + "id": "wooper-paldean-30", + "pokemon": "wooper paldean", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "1-21", + "weight": 9.0, + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:has_block/mud" + ] + } + }, + { + "id": "wooper-paldean-31", + "pokemon": "wooper paldean", "type": "pokemon", "context": "fishing", "bucket": "uncommon", @@ -726,7 +770,7 @@ } }, { - "id": "wooper-paldean-30", + "id": "wooper-paldean-32", "pokemon": "wooper paldean", "type": "pokemon", "context": "fishing", @@ -736,8 +780,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -751,4 +795,4 @@ } } ] -} +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json index c598853388..dd2b753895 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0195_quagsire.json @@ -168,6 +168,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ] }, @@ -189,14 +190,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -250,14 +251,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -333,6 +334,47 @@ "#cobblemon:is_lush" ] } + }, + { + "id": "quagsire-13", + "pokemon": "quagsire", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "20-43", + "weight": 1.6, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + }, + { + "id": "quagsire-14", + "pokemon": "quagsire", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "submerged", + "bucket": "uncommon", + "level": "20-43", + "weight": 1.6, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0199_slowking.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0199_slowking.json index 71a26a3905..6cb33b1e5d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0199_slowking.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0199_slowking.json @@ -18,11 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_beach", - "#cobblemon:is_tropical_island" - ], - "neededNearbyBlocks": [ - "#minecraft:water" + "#cobblemon:is_beach" ] } }, @@ -38,22 +34,21 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], "condition": { "canSeeSky": true, "biomes": [ - "#cobblemon:is_beach", - "#cobblemon:is_tropical_island" + "#cobblemon:is_beach" ] } }, @@ -69,14 +64,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -85,7 +80,93 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_beach", + "#cobblemon:is_beach" + ] + } + }, + { + "id": "slowking-galarian-4", + "pokemon": "slowking galarian", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "37-49", + "weight": 0.15, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "minecraft:mushroom_fields", + "#cobblemon:is_tropical_island" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + }, + { + "id": "slowking-galarian-5", + "pokemon": "slowking galarian", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "37-49", + "weight": 0.05, + "weightMultipliers": [ + { + "multiplier": 3.0, + "condition": { + "minLureLevel": 2, + "maxLureLevel": 2 + } + }, + { + "multiplier": 5.0, + "condition": { + "minLureLevel": 3 + } + } + ], + "condition": { + "canSeeSky": true, + "biomes": [ + "minecraft:mushroom_fields", + "#cobblemon:is_tropical_island" + ] + } + }, + { + "id": "slowking-galarian-6", + "pokemon": "slowking galarian", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "37-49", + "weight": 0.05, + "weightMultipliers": [ + { + "multiplier": 3.0, + "condition": { + "minLureLevel": 2, + "maxLureLevel": 2 + } + }, + { + "multiplier": 5.0, + "condition": { + "minLureLevel": 3 + } + } + ], + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "minecraft:mushroom_fields", "#cobblemon:is_tropical_island" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0211_qwilfish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0211_qwilfish.json index a6c77ad50a..d233bd45b2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0211_qwilfish.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0211_qwilfish.json @@ -85,8 +85,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -114,8 +114,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -222,8 +222,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -253,8 +253,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -340,8 +340,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -437,8 +437,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -465,8 +465,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -561,8 +561,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -591,8 +591,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -665,8 +665,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json index 37be425657..cee6dd0564 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0213_shuckle.json @@ -64,7 +64,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -150,7 +150,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0214_heracross.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0214_heracross.json index 2f7c192716..5a4afab383 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0214_heracross.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0214_heracross.json @@ -67,6 +67,27 @@ { "id": "heracross-3", "pokemon": "heracross", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "25-50", + "weight": 2.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } + }, + { + "id": "heracross-4", + "pokemon": "heracross", "type": "pokemon", "context": "grounded", "bucket": "uncommon", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json index a473fa33a5..f6b27208a2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0216_teddiursa.json @@ -27,6 +27,24 @@ { "id": "teddiursa-2", "pokemon": "teddiursa", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "weight": 1.8, + "condition": { + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } + }, + { + "id": "teddiursa-3", + "pokemon": "teddiursa", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json index fa016343e0..ca59556dc8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0217_ursaring.json @@ -27,6 +27,24 @@ { "id": "ursaring-2", "pokemon": "ursaring", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "30-50", + "weight": 0.19, + "condition": { + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } + }, + { + "id": "ursaring-3", + "pokemon": "ursaring", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json index d3763f602d..2b7c76fde5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "slugma-1", + "id": "slugma-3", "pokemon": "slugma", "presets": [ "natural" @@ -22,7 +22,7 @@ } }, { - "id": "slugma-2", + "id": "slugma-4", "pokemon": "slugma", "presets": [ "lava" @@ -40,7 +40,7 @@ } }, { - "id": "slugma-3", + "id": "slugma-1", "pokemon": "slugma", "presets": [ "lava" @@ -62,7 +62,7 @@ } }, { - "id": "slugma-4", + "id": "slugma-2", "pokemon": "slugma", "presets": [ "natural" @@ -80,6 +80,46 @@ "#minecraft:lava" ] } + }, + { + "id": "slugma-5", + "pokemon": "slugma", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-25", + "weight": 8.4, + "condition": { + "biomes": [ + "#cobblemon:space/is_fiery" + ], + "neededNearbyBlocks": [ + "#minecraft:lava" + ] + } + }, + { + "id": "slugma-6", + "pokemon": "slugma", + "presets": [ + "lava" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "1-25", + "weight": 8.4, + "condition": { + "biomes": [ + "#cobblemon:space/is_fiery" + ], + "neededNearbyBlocks": [ + "#minecraft:lava" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json index da8c5580f7..4f362def1c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json @@ -4,7 +4,7 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "magcargo-1", + "id": "magcargo-3", "pokemon": "magcargo", "presets": [ "natural" @@ -16,12 +16,13 @@ "weight": 0.6, "condition": { "biomes": [ - "#cobblemon:nether/is_basalt" + "#cobblemon:nether/is_basalt", + "#cobblemon:nether/is_wasteland" ] } }, { - "id": "magcargo-2", + "id": "magcargo-4", "pokemon": "magcargo", "presets": [ "lava" @@ -33,12 +34,13 @@ "weight": 1.0, "condition": { "biomes": [ - "#minecraft:is_nether" + "#minecraft:is_nether", + "#cobblemon:is_volcanic" ] } }, { - "id": "magcargo-3", + "id": "magcargo-1", "pokemon": "magcargo", "presets": [ "lava" @@ -60,7 +62,7 @@ } }, { - "id": "magcargo-4", + "id": "magcargo-2", "pokemon": "magcargo", "presets": [ "natural" @@ -82,17 +84,40 @@ { "id": "magcargo-5", "pokemon": "magcargo", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "38-43", + "weight": 1.6, + "condition": { + "biomes": [ + "#cobblemon:space/is_fiery" + ], + "neededNearbyBlocks": [ + "#minecraft:lava" + ] + } + }, + { + "id": "magcargo-6", + "pokemon": "magcargo", "presets": [ "lava" ], "type": "pokemon", "context": "surface", - "bucket": "common", + "bucket": "uncommon", "level": "38-43", - "weight": 1.0, + "weight": 1.6, "condition": { "biomes": [ - "#cobblemon:is_volcanic" + "#cobblemon:space/is_fiery" + ], + "neededNearbyBlocks": [ + "#minecraft:lava" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0222_corsola.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0222_corsola.json index 0de0d08058..0c5d2318c1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0222_corsola.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0222_corsola.json @@ -50,8 +50,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -93,8 +93,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0225_delibird.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0225_delibird.json index 242958e621..88cecd7fc2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0225_delibird.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0225_delibird.json @@ -27,6 +27,28 @@ "#cobblemon:is_peak" ] } + }, + { + "id": "delibird-2", + "pokemon": "delibird", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "8-33", + "weight": 100.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "aether:present" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0226_mantine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0226_mantine.json index 2abe32865f..a13728e1d4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0226_mantine.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0226_mantine.json @@ -56,8 +56,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -131,8 +131,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0230_kingdra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0230_kingdra.json index 96a7fb2079..a58332db05 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0230_kingdra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0230_kingdra.json @@ -34,14 +34,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -91,14 +91,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -152,14 +152,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json index e76327d5ce..01cc7d587d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0234_stantler.json @@ -30,6 +30,29 @@ "#cobblemon:is_tundra" ] } + }, + { + "id": "stantler-2", + "pokemon": "stantler", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-47", + "weight": 100.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "aether:holiday_leaves", + "aether:decorated_holiday_leaves" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json index ecb3fa37ed..462ab40f14 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0242_blissey.json @@ -56,6 +56,25 @@ "#minecraft:village" ] } + }, + { + "id": "blissey-3", + "pokemon": "blissey", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "40-54", + "weight": 0.125, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0252_treecko.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0252_treecko.json index c3c3682ab0..6c0608bb48 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0252_treecko.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0252_treecko.json @@ -19,7 +19,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0253_grovyle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0253_grovyle.json index 4f20279978..c696a737e6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0253_grovyle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0253_grovyle.json @@ -19,7 +19,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0254_sceptile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0254_sceptile.json index 08f3b1f77c..6c70e002cd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0254_sceptile.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0254_sceptile.json @@ -19,7 +19,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0255_torchic.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0255_torchic.json index cdc225f771..ac5b05f270 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0255_torchic.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0255_torchic.json @@ -18,7 +18,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_plains", + "aether:skyroot_grove", + "aether:skyroot_meadow" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0256_combusken.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0256_combusken.json index eecbf478bf..bd66c54350 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0256_combusken.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0256_combusken.json @@ -18,7 +18,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_plains", + "aether:skyroot_grove", + "aether:skyroot_meadow" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0257_blaziken.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0257_blaziken.json index b1c8b9542b..a7b76220e6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0257_blaziken.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0257_blaziken.json @@ -18,7 +18,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_plains" + "#cobblemon:is_plains", + "aether:skyroot_grove", + "aether:skyroot_meadow" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json index 7d1dc97ca7..2138ab93e2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0263_zigzagoon.json @@ -29,7 +29,27 @@ } }, { - "id": "zigzagoon-galarian-2", + "id": "zigzagoon-2", + "pokemon": "zigzagoon", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-24", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } + }, + { + "id": "zigzagoon-galarian-3", "pokemon": "zigzagoon galarian", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json index 12f1235fad..f1b1cd55d9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0264_linoone.json @@ -29,7 +29,27 @@ } }, { - "id": "linoone-galarian-2", + "id": "linoone-2", + "pokemon": "linoone", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-42", + "weight": 1.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } + }, + { + "id": "linoone-galarian-3", "pokemon": "linoone galarian", "presets": [ "natural", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json index f5bed4ba39..0492db47a1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0270_lotad.json @@ -53,8 +53,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -78,8 +78,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0271_lombre.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0271_lombre.json index b312e696d9..1d50962e61 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0271_lombre.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0271_lombre.json @@ -53,8 +53,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -78,8 +78,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json index 633051e08d..4b8c2d8a45 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0272_ludicolo.json @@ -53,8 +53,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -78,8 +78,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0273_seedot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0273_seedot.json index 52ecc11e10..fb3532b7cd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0273_seedot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0273_seedot.json @@ -19,7 +19,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_forest" + "#cobblemon:is_forest", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0274_nuzleaf.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0274_nuzleaf.json index f86d7d6d3c..7faac26faf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0274_nuzleaf.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0274_nuzleaf.json @@ -19,7 +19,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_forest" + "#cobblemon:is_forest", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0275_shiftry.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0275_shiftry.json index 9197a5dfaa..68dc8f3510 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0275_shiftry.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0275_shiftry.json @@ -19,7 +19,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_forest" + "#cobblemon:is_forest", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json index c1a8ae108b..ac5d607bd5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0276_taillow.json @@ -29,6 +29,26 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "taillow-3", + "pokemon": "taillow", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json index 8f5f1bdfdb..cbe222551c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0277_swellow.json @@ -29,6 +29,26 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "swellow-3", + "pokemon": "swellow", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "22-46", + "weight": 1.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json index 87deef7dde..e5ed16e039 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0280_ralts.json @@ -20,6 +20,8 @@ "biomes": [ "#cobblemon:is_floral", "#cobblemon:is_magical", + "aether:skyroot_grove", + "aether:skyroot_meadow", "#cobblemon:is_snowy_forest" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json index 9c1e921622..966c118a2a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0281_kirlia.json @@ -20,6 +20,8 @@ "biomes": [ "#cobblemon:is_floral", "#cobblemon:is_magical", + "aether:skyroot_grove", + "aether:skyroot_meadow", "#cobblemon:is_snowy_forest" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json index 6b53580322..bed88c9a9a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0282_gardevoir.json @@ -20,6 +20,8 @@ "biomes": [ "#cobblemon:is_floral", "#cobblemon:is_magical", + "aether:skyroot_grove", + "aether:skyroot_meadow", "#cobblemon:is_snowy_forest" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0285_shroomish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0285_shroomish.json index f8650b6a93..818f1fddd9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0285_shroomish.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0285_shroomish.json @@ -18,7 +18,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_forest" + "#cobblemon:is_forest", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0286_breloom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0286_breloom.json index 096ad0f387..3bcdcf30f4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0286_breloom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0286_breloom.json @@ -18,7 +18,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_forest" + "#cobblemon:is_forest", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json index d3e3450627..acd4365ad3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0290_nincada.json @@ -29,6 +29,26 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "nincada-2", + "pokemon": "nincada", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 5.7, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json index 65381cf12b..8cd8d9b471 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0291_ninjask.json @@ -29,6 +29,26 @@ "#cobblemon:is_freezing" ] } + }, + { + "id": "ninjask-2", + "pokemon": "ninjask", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-46", + "weight": 2.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json index fedc655c6a..ca94948535 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0292_shedinja.json @@ -29,6 +29,26 @@ "#cobblemon:is_freezing" ] } + }, + { + "id": "shedinja-2", + "pokemon": "shedinja", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-24", + "weight": 0.3, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0302_sableye.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0302_sableye.json index 33fc0dc4f5..7ff516d991 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0302_sableye.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0302_sableye.json @@ -18,6 +18,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0315_roselia.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0315_roselia.json index e1c2f2e1ee..cc6c426752 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0315_roselia.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0315_roselia.json @@ -18,6 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_floral" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json index bdf33d6952..b9bb34b6b8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0318_carvanha.json @@ -34,14 +34,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -64,14 +64,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -116,14 +116,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -148,14 +148,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -204,14 +204,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0319_sharpedo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0319_sharpedo.json index 2e04bb1855..d2f9609790 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0319_sharpedo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0319_sharpedo.json @@ -33,14 +33,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -83,14 +83,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -138,14 +138,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0320_wailmer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0320_wailmer.json index a93e00bda9..906d97314c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0320_wailmer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0320_wailmer.json @@ -50,7 +50,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -112,7 +112,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0321_wailord.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0321_wailord.json index 0405579fdd..f5e3ee796b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0321_wailord.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0321_wailord.json @@ -50,7 +50,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -112,7 +112,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0337_lunatone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0337_lunatone.json index b98d3bda0c..def875613d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0337_lunatone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0337_lunatone.json @@ -95,6 +95,23 @@ "cobblemon:ruins/luna_henge_ruins" ] } + }, + { + "id": "lunatone-5", + "pokemon": "lunatone", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "21-46", + "weight": 6.0, + "condition": { + "biomes": [ + "#cobblemon:space/is_moon" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0338_solrock.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0338_solrock.json index 3f8658b8d6..e906528da4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0338_solrock.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0338_solrock.json @@ -95,6 +95,26 @@ "cobblemon:ruins/sol_henge_ruins" ] } + }, + { + "id": "solrock-5", + "pokemon": "solrock", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "21-46", + "weight": 6.0, + "condition": { + "biomes": [ + "#cobblemon:space/is_mercury", + "aether:skyroot_grove", + "aether:skyroot_meadow", + "#cobblemon:space/is_venus" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json index 4d3dc95dfd..aafbea3aa1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0340_whiscash.json @@ -200,4 +200,4 @@ } } ] -} +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0341_corphish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0341_corphish.json index 086874d2fa..9ad11d44ec 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0341_corphish.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0341_corphish.json @@ -62,14 +62,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -101,14 +101,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0342_crawdaunt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0342_crawdaunt.json index 5d9194e3b2..8c934d1402 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0342_crawdaunt.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0342_crawdaunt.json @@ -62,14 +62,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -101,14 +101,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json index bc7ce8b94e..f362e795e4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json @@ -51,6 +51,28 @@ { "id": "baltoy-3", "pokemon": "baltoy", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 5.04, + "condition": { + "biomes": [ + "#cobblemon:space/is_mars" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:space/is_icy" + ] + } + }, + { + "id": "baltoy-4", + "pokemon": "baltoy", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json index 607bf03b2b..4d181148c3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json @@ -51,6 +51,28 @@ { "id": "claydol-3", "pokemon": "claydol", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "36-50", + "weight": 0.96, + "condition": { + "biomes": [ + "#cobblemon:space/is_mars" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:space/is_icy" + ] + } + }, + { + "id": "claydol-4", + "pokemon": "claydol", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0349_feebas.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0349_feebas.json index 620b7c74b0..0a3170d159 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0349_feebas.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0349_feebas.json @@ -37,14 +37,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0350_milotic.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0350_milotic.json index e7c62af391..8476445beb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0350_milotic.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0350_milotic.json @@ -37,14 +37,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0357_tropius.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0357_tropius.json index a5d62382bc..62279a5d24 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0357_tropius.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0357_tropius.json @@ -14,7 +14,7 @@ "context": "grounded", "bucket": "uncommon", "level": "21-46", - "weight": 2.0, + "weight": 6.0, "weightMultiplier": { "multiplier": 0.25, "condition": { @@ -28,6 +28,25 @@ "#cobblemon:is_jungle" ] } + }, + { + "id": "tropius-3", + "pokemon": "tropius", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "21-46", + "weight": 6.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0363_spheal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0363_spheal.json index b4c34566ca..1090ac203d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0363_spheal.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0363_spheal.json @@ -52,14 +52,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -103,14 +103,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0364_sealeo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0364_sealeo.json index 5892d60ded..48151f691a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0364_sealeo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0364_sealeo.json @@ -52,14 +52,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -103,14 +103,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0365_walrein.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0365_walrein.json index 10997775ec..aae049419e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0365_walrein.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0365_walrein.json @@ -52,14 +52,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -103,14 +103,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json index 2ca077e9f5..d37c341716 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0369_relicanth.json @@ -94,7 +94,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -159,7 +159,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -278,7 +278,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0371_bagon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0371_bagon.json index 6ce622c1cf..1e0614c6e5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0371_bagon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0371_bagon.json @@ -63,6 +63,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_dripstone" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0372_shelgon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0372_shelgon.json index ddafd57604..3e69d3d90e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0372_shelgon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0372_shelgon.json @@ -38,6 +38,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_dripstone" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0373_salamence.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0373_salamence.json index 68e65c00e7..cfaa4d8921 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0373_salamence.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0373_salamence.json @@ -64,6 +64,7 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ + "#aether:is_aether", "#cobblemon:is_dripstone" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0374_beldum.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0374_beldum.json index 44c58a51fe..e8795f2ebe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0374_beldum.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0374_beldum.json @@ -41,6 +41,44 @@ { "id": "beldum-3", "pokemon": "beldum", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "5-30", + "weight": 7.5, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "beldum-4", + "pokemon": "beldum", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 1.68, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } + }, + { + "id": "beldum-5", + "pokemon": "beldum", "type": "pokemon", "context": "grounded", "bucket": "rare", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0375_metang.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0375_metang.json index 3985fdefa3..7b9056e22d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0375_metang.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0375_metang.json @@ -41,6 +41,44 @@ { "id": "metang-3", "pokemon": "metang", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "20-44", + "weight": 2.25, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "metang-4", + "pokemon": "metang", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "20-44", + "weight": 0.288, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } + }, + { + "id": "metang-5", + "pokemon": "metang", "type": "pokemon", "context": "grounded", "bucket": "rare", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0376_metagross.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0376_metagross.json index b031c27b90..0d08f3e0b6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0376_metagross.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0376_metagross.json @@ -41,6 +41,44 @@ { "id": "metagross-3", "pokemon": "metagross", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "45-60", + "weight": 0.25, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "metagross-4", + "pokemon": "metagross", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "45-60", + "weight": 0.032, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } + }, + { + "id": "metagross-5", + "pokemon": "metagross", "type": "pokemon", "context": "grounded", "bucket": "rare", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0399_bidoof.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0399_bidoof.json index f31d9b913b..63897bde6b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0399_bidoof.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0399_bidoof.json @@ -77,8 +77,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -102,8 +102,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0400_bibarel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0400_bibarel.json index 321d24b36d..b3b36479c7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0400_bibarel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0400_bibarel.json @@ -77,8 +77,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -102,8 +102,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0406_budew.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0406_budew.json index 8ce508c9cb..2eea70f941 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0406_budew.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0406_budew.json @@ -18,6 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_floral" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0407_roserade.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0407_roserade.json index 561f20f10f..5cac271105 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0407_roserade.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0407_roserade.json @@ -18,6 +18,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_floral" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json index f017ece059..18938fd8e9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0415_combee.json @@ -41,6 +41,33 @@ { "id": "combee-2", "pokemon": "combee", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-24", + "weight": 9.9, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:beehives" + ] + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "combee-3", + "pokemon": "combee", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json index ba669bea09..f113b24fcc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0416_vespiquen.json @@ -41,6 +41,33 @@ { "id": "vespiquen-2", "pokemon": "vespiquen", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "21-47", + "weight": 0.1, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:beehives" + ] + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "vespiquen-3", + "pokemon": "vespiquen", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json index 513067e224..bd501da2a9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0417_pachirisu.json @@ -25,7 +25,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_forest" + "#cobblemon:is_forest", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json index 6136d6d667..d7c6017200 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0418_buizel.json @@ -87,14 +87,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json index 3a2f4c0efc..a691bc54be 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0419_floatzel.json @@ -87,14 +87,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0422_shellos.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0422_shellos.json index 14195a8762..353309e326 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0422_shellos.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0422_shellos.json @@ -55,8 +55,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -125,8 +125,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -149,8 +149,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -175,8 +175,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0423_gastrodon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0423_gastrodon.json index 578c6203a5..a7968277e7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0423_gastrodon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0423_gastrodon.json @@ -55,8 +55,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -125,8 +125,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -149,8 +149,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -175,8 +175,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json index 9d05cb7f38..89b5617fff 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0440_happiny.json @@ -56,6 +56,25 @@ "#minecraft:village" ] } + }, + { + "id": "happiny-3", + "pokemon": "happiny", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "1-22", + "weight": 8.75, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0441_chatot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0441_chatot.json index f7bbf34c6c..2920b16924 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0441_chatot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0441_chatot.json @@ -86,6 +86,27 @@ "minY": -41, "maxY": 9 } + }, + { + "id": "chatot-8", + "pokemon": "chatot", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "16-41", + "weight": 10.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json index 5ec29a2c51..61f0bd67d9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0443_gible.json @@ -72,6 +72,25 @@ "#cobblemon:is_mountain" ] } + }, + { + "id": "gible-4", + "pokemon": "gible", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "5-30", + "weight": 7.5, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json index af17390fc8..33f0a6f2be 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0444_gabite.json @@ -72,6 +72,25 @@ "#cobblemon:is_mountain" ] } + }, + { + "id": "gabite-4", + "pokemon": "gabite", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "24-47", + "weight": 2.25, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json index 63ed38eae6..4d23f44e70 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0445_garchomp.json @@ -72,6 +72,25 @@ "#cobblemon:is_mountain" ] } + }, + { + "id": "garchomp-4", + "pokemon": "garchomp", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "48-60", + "weight": 0.25, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0446_munchlax.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0446_munchlax.json index e2438d5d5c..8b3a25a31a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0446_munchlax.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0446_munchlax.json @@ -18,6 +18,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland", "#cobblemon:is_snowy_forest", "#cobblemon:is_forest", "#cobblemon:is_hills" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json index e85f2a2986..38dca46f2c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0447_riolu.json @@ -28,6 +28,25 @@ "#cobblemon:is_mountain" ] } + }, + { + "id": "riolu-2", + "pokemon": "riolu", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "4-29", + "weight": 7.5, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json index 5b70ea00f8..723938df7a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0448_lucario.json @@ -28,6 +28,25 @@ "#cobblemon:is_mountain" ] } + }, + { + "id": "lucario-2", + "pokemon": "lucario", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "24-53", + "weight": 2.5, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0455_carnivine.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0455_carnivine.json index 21a397b735..22a8d6285a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0455_carnivine.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0455_carnivine.json @@ -20,6 +20,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland", "#cobblemon:is_swamp" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0458_mantyke.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0458_mantyke.json index 7789114171..32db191129 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0458_mantyke.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0458_mantyke.json @@ -56,8 +56,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -131,8 +131,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json index f4b8e38d60..4af608dda3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0469_yanmega.json @@ -105,6 +105,25 @@ "#cobblemon:is_lush" ] } + }, + { + "id": "yanmega-5", + "pokemon": "yanmega", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "33-52", + "weight": 0.96, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json index 39ffd4bcd8..3c66e9ea7b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0470_leafeon.json @@ -19,7 +19,9 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_forest", - "#cobblemon:is_jungle" + "#cobblemon:is_jungle", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json index 1dc929e7cb..7800551cb1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0475_gallade.json @@ -20,6 +20,8 @@ "biomes": [ "#cobblemon:is_floral", "#cobblemon:is_magical", + "aether:skyroot_grove", + "aether:skyroot_meadow", "#cobblemon:is_snowy_forest" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json index e91b211333..2b7b7fdb9e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0546_cottonee.json @@ -28,6 +28,26 @@ ], "isRaining": false } + }, + { + "id": "cottonee-3", + "pokemon": "cottonee", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 9.5, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json index 7e2e17c838..1876fb5df8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0547_whimsicott.json @@ -28,6 +28,26 @@ ], "isRaining": false } + }, + { + "id": "whimsicott-3", + "pokemon": "whimsicott", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "23-48", + "weight": 0.5, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0548_petilil.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0548_petilil.json index 91a81436db..f7248fbf70 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0548_petilil.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0548_petilil.json @@ -119,6 +119,25 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "petilil-hisui-5", + "pokemon": "petilil region_bias=hisui", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 5.7, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0549_lilligant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0549_lilligant.json index ba69abda3c..f3e51a5ff3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0549_lilligant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0549_lilligant.json @@ -119,6 +119,25 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "lilligant-hisuian-5", + "pokemon": "lilligant hisuian", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "23-48", + "weight": 0.3, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json index 7da45f4310..753e2d026c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json @@ -108,6 +108,47 @@ { "id": "sigilyph-6", "pokemon": "sigilyph", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "24-49", + "weight": 10.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_mars" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:space/is_icy" + ] + } + }, + { + "id": "sigilyph-7", + "pokemon": "sigilyph", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "24-49", + "weight": 10.0, + "condition": { + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } + }, + { + "id": "sigilyph-8", + "pokemon": "sigilyph", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0570_zorua.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0570_zorua.json index 4227799a84..78d491a17f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0570_zorua.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0570_zorua.json @@ -18,7 +18,7 @@ "weightMultiplier": { "multiplier": 5.0, "condition": { - "moonPhase": "4" + "moonPhase": 4 } }, "condition": { @@ -50,7 +50,7 @@ "weightMultiplier": { "multiplier": 5.0, "condition": { - "moonPhase": "4" + "moonPhase": 4 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0571_zoroark.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0571_zoroark.json index d3787ddfc7..e041e0e76e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0571_zoroark.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0571_zoroark.json @@ -18,7 +18,7 @@ "weightMultiplier": { "multiplier": 5.0, "condition": { - "moonPhase": "4" + "moonPhase": 4 } }, "condition": { @@ -50,7 +50,7 @@ "weightMultiplier": { "multiplier": 5.0, "condition": { - "moonPhase": "4" + "moonPhase": 4 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0580_ducklett.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0580_ducklett.json new file mode 100644 index 0000000000..c9e1c4a3b2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0580_ducklett.json @@ -0,0 +1,148 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "ducklett-3", + "pokemon": "ducklett", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "6-31", + "weight": 8.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "ducklett-1", + "pokemon": "ducklett", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "ducklett-4", + "pokemon": "ducklett", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "6-31", + "weight": 8.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + }, + { + "id": "ducklett-2", + "pokemon": "ducklett", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_sky" + ] + } + }, + { + "id": "ducklett-7", + "pokemon": "ducklett", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + }, + { + "id": "ducklett-8", + "pokemon": "ducklett", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "6-31", + "weight": 8.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0581_swanna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0581_swanna.json new file mode 100644 index 0000000000..03829d999c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0581_swanna.json @@ -0,0 +1,145 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "swanna-3", + "pokemon": "swanna", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "35-47", + "weight": 1.6, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ], + "timeRange": "day" + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "swanna-1", + "pokemon": "swanna", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-47", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "swanna-4", + "pokemon": "swanna", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "35-47", + "weight": 1.6, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + }, + { + "id": "swanna-2", + "pokemon": "swanna", + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-47", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_sky" + ] + } + }, + { + "id": "swanna-7", + "pokemon": "swanna", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-47", + "weight": 1.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + }, + { + "id": "swanna-8", + "pokemon": "swanna", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "35-47", + "weight": 1.6, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json index 417233844f..19646d33fe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0585_deerling.json @@ -42,6 +42,25 @@ { "id": "deerling-2", "pokemon": "deerling", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "9-34", + "weight": 1.8, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "deerling-3", + "pokemon": "deerling", "type": "pokemon", "context": "grounded", "bucket": "uncommon", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json index bc649a1052..231e442ac4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0586_sawsbuck.json @@ -42,6 +42,25 @@ { "id": "sawsbuck-2", "pokemon": "sawsbuck", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "34-48", + "weight": 0.2, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "sawsbuck-3", + "pokemon": "sawsbuck", "type": "pokemon", "context": "grounded", "bucket": "uncommon", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0588_karrablast.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0588_karrablast.json new file mode 100644 index 0000000000..4f4bd5ce0b --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0588_karrablast.json @@ -0,0 +1,26 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "karrablast-1", + "pokemon": "karrablast", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "7-32", + "weight": 5.7, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_swamp" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0589_escavalier.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0589_escavalier.json new file mode 100644 index 0000000000..b4c278876f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0589_escavalier.json @@ -0,0 +1,26 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "escavalier-1", + "pokemon": "escavalier", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "27-50", + "weight": 0.3, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_swamp" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0590_foongus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0590_foongus.json new file mode 100644 index 0000000000..bb70c7f7fe --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0590_foongus.json @@ -0,0 +1,51 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "foongus-1", + "pokemon": "foongus", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "4-29", + "weight": 9.0, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#cobblemon:is_mushroom" + ] + } + }, + { + "id": "foongus-2", + "pokemon": "foongus", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "4-29", + "weight": 9.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_mushroom" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json new file mode 100644 index 0000000000..920d8e5203 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json @@ -0,0 +1,51 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "amoongus-1", + "pokemon": "amoongus", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "39-46", + "weight": 1.0, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#cobblemon:is_mushroom" + ] + } + }, + { + "id": "amoongus-2", + "pokemon": "amoongus", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "39-46", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_mushroom" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0592_frillish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0592_frillish.json index 88bcbeaf03..0d0e74eb12 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0592_frillish.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0592_frillish.json @@ -113,8 +113,8 @@ { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } } ], @@ -173,8 +173,8 @@ { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0593_jellicent.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0593_jellicent.json index 56dc8d433e..616c082a1c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0593_jellicent.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0593_jellicent.json @@ -113,8 +113,8 @@ { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } } ], @@ -173,8 +173,8 @@ { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0594_alomomola.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0594_alomomola.json index f26716ab7e..9f9cba5982 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0594_alomomola.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0594_alomomola.json @@ -55,7 +55,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -122,7 +122,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json index 94211fa0d3..51e1002347 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json @@ -67,6 +67,44 @@ { "id": "elgyem-3", "pokemon": "elgyem", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "9-34", + "weight": 8.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_space" + ] + } + }, + { + "id": "elgyem-4", + "pokemon": "elgyem", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "9-34", + "weight": 25.614, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_space" + ] + } + }, + { + "id": "elgyem-5", + "pokemon": "elgyem", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json index 8ff7ffd047..dd57b8d5e7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json @@ -67,6 +67,44 @@ { "id": "beheeyem-3", "pokemon": "beheeyem", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "42-49", + "weight": 1.6, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_space" + ] + } + }, + { + "id": "beheeyem-4", + "pokemon": "beheeyem", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "ultra-rare", + "level": "42-49", + "weight": 17.076, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_space" + ] + } + }, + { + "id": "beheeyem-5", + "pokemon": "beheeyem", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0616_shelmet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0616_shelmet.json new file mode 100644 index 0000000000..882299f085 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0616_shelmet.json @@ -0,0 +1,32 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "shelmet-1", + "pokemon": "shelmet", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 1.9, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isRaining": true + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_swamp" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0617_accelgor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0617_accelgor.json new file mode 100644 index 0000000000..2a25adbd37 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0617_accelgor.json @@ -0,0 +1,32 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "accelgor-1", + "pokemon": "accelgor", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "26-50", + "weight": 0.1, + "weightMultiplier": { + "multiplier": 5.0, + "condition": { + "isRaining": true + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_swamp" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0627_rufflet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0627_rufflet.json new file mode 100644 index 0000000000..b658aa1fe8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0627_rufflet.json @@ -0,0 +1,52 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "rufflet-1", + "pokemon": "rufflet", + "presets": [ + "natural", + "treetop", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "10-35", + "weight": 1.8, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_hills" + ], + "timeRange": "day" + } + }, + { + "id": "rufflet-2", + "pokemon": "rufflet", + "presets": [ + "natural", + "treetop", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "10-35", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0628_braviary.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0628_braviary.json new file mode 100644 index 0000000000..aa5f0d75c3 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0628_braviary.json @@ -0,0 +1,52 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "braviary-1", + "pokemon": "braviary", + "presets": [ + "natural", + "treetop", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "54-59", + "weight": 0.2, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_badlands", + "#cobblemon:is_hills" + ], + "timeRange": "day" + } + }, + { + "id": "braviary-2", + "pokemon": "braviary", + "presets": [ + "natural", + "treetop", + "wild" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "54-59", + "weight": 1.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_sky" + ], + "timeRange": "day" + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0633_deino.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0633_deino.json index 23c5d43c65..85fef60be7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0633_deino.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0633_deino.json @@ -46,6 +46,25 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "deino-3", + "pokemon": "deino", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "5-30", + "weight": 7.5, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0634_zweilous.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0634_zweilous.json index d08928a351..2e47763105 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0634_zweilous.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0634_zweilous.json @@ -46,6 +46,25 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "zweilous-3", + "pokemon": "zweilous", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "50-55", + "weight": 2.25, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0635_hydreigon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0635_hydreigon.json index e089730763..a02ce08425 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0635_hydreigon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0635_hydreigon.json @@ -46,6 +46,25 @@ "#cobblemon:is_deep_dark" ] } + }, + { + "id": "hydreigon-3", + "pokemon": "hydreigon", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "64-69", + "weight": 0.25, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0636_larvesta.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0636_larvesta.json index ae56935fd4..372337b5bd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0636_larvesta.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0636_larvesta.json @@ -82,6 +82,25 @@ } ] } + }, + { + "id": "larvesta-4", + "pokemon": "larvesta", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "11-36", + "weight": 9.0, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0637_volcarona.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0637_volcarona.json index 1ccb0df1b7..fb2e9fd3c3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0637_volcarona.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0637_volcarona.json @@ -78,6 +78,25 @@ } ] } + }, + { + "id": "volcarona-4", + "pokemon": "volcarona", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "59-64", + "weight": 1.0, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json index 3e5629f996..e6796a1299 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0661_fletchling.json @@ -49,6 +49,27 @@ "#cobblemon:nether/is_warped" ] } + }, + { + "id": "fletchling-4", + "pokemon": "fletchling", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "3-28", + "weight": 5.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json index e4180af785..53ed9ba520 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0662_fletchinder.json @@ -49,6 +49,27 @@ "#cobblemon:nether/is_warped" ] } + }, + { + "id": "fletchinder-4", + "pokemon": "fletchinder", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "17-38", + "weight": 0.54, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json index 25297446d1..d73758ae64 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0663_talonflame.json @@ -49,6 +49,27 @@ "#cobblemon:nether/is_warped" ] } + }, + { + "id": "talonflame-4", + "pokemon": "talonflame", + "presets": [ + "natural", + "treetop" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "35-50", + "weight": 0.06, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json index a26f12ec31..b38f08d497 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0664_scatterbug.json @@ -19,6 +19,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_floral", "#cobblemon:is_plains", "#cobblemon:is_savanna" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json index 61697ec4f8..0e8d9cdd0d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0665_spewpa.json @@ -19,6 +19,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_floral", "#cobblemon:is_plains", "#cobblemon:is_savanna" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json index 4df6cf7149..8aba1dde09 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0666_vivillon.json @@ -660,6 +660,28 @@ "#cobblemon:is_mountain" ] } + }, + { + "id": "vivillon-fancy-21", + "pokemon": "vivillon vivillon_wings=fancy", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "12-41", + "weight": 2.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#cobblemon:flowers" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0669_flabebe.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0669_flabebe.json index 3a7cf9b3dc..670a2130fb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0669_flabebe.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0669_flabebe.json @@ -172,7 +172,29 @@ } }, { - "id": "flabebe-red-7", + "id": "flabebe-white-7", + "pokemon": "flabebe flower=white", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#cobblemon:white_flowers" + ] + } + }, + { + "id": "flabebe-red-8", "pokemon": "flabebe flower=red", "type": "pokemon", "context": "grounded", @@ -197,7 +219,7 @@ } }, { - "id": "flabebe-yellow-7", + "id": "flabebe-yellow-8", "pokemon": "flabebe flower=yellow", "type": "pokemon", "context": "grounded", @@ -222,7 +244,7 @@ } }, { - "id": "flabebe-orange-7", + "id": "flabebe-orange-8", "pokemon": "flabebe flower=orange", "type": "pokemon", "context": "grounded", @@ -247,7 +269,7 @@ } }, { - "id": "flabebe-blue-7", + "id": "flabebe-blue-8", "pokemon": "flabebe flower=blue", "type": "pokemon", "context": "grounded", @@ -272,7 +294,7 @@ } }, { - "id": "flabebe-white-7", + "id": "flabebe-white-8", "pokemon": "flabebe flower=white", "type": "pokemon", "context": "grounded", @@ -297,7 +319,7 @@ } }, { - "id": "flabebe-pink-7", + "id": "flabebe-pink-8", "pokemon": "flabebe flower=pink", "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0670_floette.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0670_floette.json index f45aeb6129..56973584e6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0670_floette.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0670_floette.json @@ -172,7 +172,29 @@ } }, { - "id": "floette-red-7", + "id": "floette-white-7", + "pokemon": "floette flower=white", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "19-37", + "weight": 0.95, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#cobblemon:white_flowers" + ] + } + }, + { + "id": "floette-red-8", "pokemon": "floette flower=red", "type": "pokemon", "context": "grounded", @@ -197,7 +219,7 @@ } }, { - "id": "floette-yellow-7", + "id": "floette-yellow-8", "pokemon": "floette flower=yellow", "type": "pokemon", "context": "grounded", @@ -222,7 +244,7 @@ } }, { - "id": "floette-orange-7", + "id": "floette-orange-8", "pokemon": "floette flower=orange", "type": "pokemon", "context": "grounded", @@ -247,7 +269,7 @@ } }, { - "id": "floette-blue-7", + "id": "floette-blue-8", "pokemon": "floette flower=blue", "type": "pokemon", "context": "grounded", @@ -272,7 +294,7 @@ } }, { - "id": "floette-white-7", + "id": "floette-white-8", "pokemon": "floette flower=white", "type": "pokemon", "context": "grounded", @@ -297,7 +319,7 @@ } }, { - "id": "floette-pink-7", + "id": "floette-pink-8", "pokemon": "floette flower=pink", "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0671_florges.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0671_florges.json index ff1a676941..ff31f04780 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0671_florges.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0671_florges.json @@ -172,7 +172,29 @@ } }, { - "id": "florges-red-7", + "id": "florges-white-7", + "pokemon": "florges flower=white", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "32-55", + "weight": 0.05, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#cobblemon:white_flowers" + ] + } + }, + { + "id": "florges-red-8", "pokemon": "florges flower=red", "type": "pokemon", "context": "grounded", @@ -197,7 +219,7 @@ } }, { - "id": "florges-yellow-7", + "id": "florges-yellow-8", "pokemon": "florges flower=yellow", "type": "pokemon", "context": "grounded", @@ -222,7 +244,7 @@ } }, { - "id": "florges-orange-7", + "id": "florges-orange-8", "pokemon": "florges flower=orange", "type": "pokemon", "context": "grounded", @@ -247,7 +269,7 @@ } }, { - "id": "florges-blue-7", + "id": "florges-blue-8", "pokemon": "florges flower=blue", "type": "pokemon", "context": "grounded", @@ -272,7 +294,7 @@ } }, { - "id": "florges-white-7", + "id": "florges-white-8", "pokemon": "florges flower=white", "type": "pokemon", "context": "grounded", @@ -297,7 +319,7 @@ } }, { - "id": "florges-pink-7", + "id": "florges-pink-8", "pokemon": "florges flower=pink", "type": "pokemon", "context": "grounded", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0679_honedge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0679_honedge.json index 590daf567a..e0ffff63fd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0679_honedge.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0679_honedge.json @@ -58,6 +58,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "honedge-4", + "pokemon": "honedge", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "8-33", + "weight": 5.04, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0680_doublade.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0680_doublade.json index cdaacf1e98..546d121a41 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0680_doublade.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0680_doublade.json @@ -58,6 +58,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "doublade-4", + "pokemon": "doublade", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "35-45", + "weight": 0.712, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0681_aegislash.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0681_aegislash.json index e37a1ba887..b0527fdfd0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0681_aegislash.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0681_aegislash.json @@ -58,6 +58,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "aegislash-4", + "pokemon": "aegislash", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "40-50", + "weight": 0.048, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0688_binacle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0688_binacle.json new file mode 100644 index 0000000000..e6e56e26bb --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0688_binacle.json @@ -0,0 +1,78 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "binacle-3", + "pokemon": "binacle", + "type": "pokemon", + "context": "fishing", + "bucket": "uncommon", + "level": "6-31", + "weight": 5.04, + "condition": { + "biomes": [ + "#cobblemon:is_coast", + "#cobblemon:is_ocean" + ] + }, + "anticondition": { + "minLureLevel": 1 + } + }, + { + "id": "binacle-4", + "pokemon": "binacle", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "6-31", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 3.0, + "condition": { + "minLureLevel": 3 + } + }, + "condition": { + "biomes": [ + "#cobblemon:is_coast", + "#cobblemon:is_ocean" + ], + "minLureLevel": 1 + } + }, + { + "id": "binacle-1", + "pokemon": "binacle", + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 1.8, + "condition": { + "biomes": [ + "#cobblemon:is_coast" + ] + } + }, + { + "id": "binacle-2", + "pokemon": "binacle", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "uncommon", + "level": "6-31", + "weight": 8.4, + "condition": { + "biomes": [ + "#cobblemon:is_ocean" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0689_barbaracle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0689_barbaracle.json new file mode 100644 index 0000000000..7d1d84da65 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0689_barbaracle.json @@ -0,0 +1,78 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "barbaracle-3", + "pokemon": "barbaracle", + "type": "pokemon", + "context": "fishing", + "bucket": "uncommon", + "level": "39-50", + "weight": 0.96, + "condition": { + "biomes": [ + "#cobblemon:is_coast", + "#cobblemon:is_ocean" + ] + }, + "anticondition": { + "minLureLevel": 1 + } + }, + { + "id": "barbaracle-4", + "pokemon": "barbaracle", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "39-50", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 3.0, + "condition": { + "minLureLevel": 3 + } + }, + "condition": { + "biomes": [ + "#cobblemon:is_coast", + "#cobblemon:is_ocean" + ], + "minLureLevel": 1 + } + }, + { + "id": "barbaracle-1", + "pokemon": "barbaracle", + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "39-50", + "weight": 0.2, + "condition": { + "biomes": [ + "#cobblemon:is_coast" + ] + } + }, + { + "id": "barbaracle-2", + "pokemon": "barbaracle", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "uncommon", + "level": "39-50", + "weight": 1.6, + "condition": { + "biomes": [ + "#cobblemon:is_ocean" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json index 6dd3ea62a1..bbffd1d74e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0690_skrelp.json @@ -36,14 +36,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -93,14 +93,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -152,14 +152,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json index efa89ff765..0bed42f0d4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0691_dragalge.json @@ -36,14 +36,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -93,14 +93,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -152,14 +152,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0692_clauncher.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0692_clauncher.json index d101147439..8325b98858 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0692_clauncher.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0692_clauncher.json @@ -33,14 +33,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -64,14 +64,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0693_clawitzer.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0693_clawitzer.json index 70f2e42401..2c2c22f07c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0693_clawitzer.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0693_clawitzer.json @@ -33,14 +33,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -84,14 +84,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json index 3f7f31d592..629db287c8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0700_sylveon.json @@ -19,7 +19,9 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_floral", - "#cobblemon:is_magical" + "#cobblemon:is_magical", + "aether:skyroot_grove", + "aether:skyroot_meadow" ] }, "anticondition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0704_goomy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0704_goomy.json index 964f9d028f..75d41a6fae 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0704_goomy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0704_goomy.json @@ -244,7 +244,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -380,7 +380,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0705_sliggoo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0705_sliggoo.json index f1a0a93f57..df21269f9c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0705_sliggoo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0705_sliggoo.json @@ -244,7 +244,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -380,7 +380,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0706_goodra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0706_goodra.json index ce63ee028a..72c1069392 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0706_goodra.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0706_goodra.json @@ -244,7 +244,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -380,7 +380,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json index 06f7f69156..fea6c76a90 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json @@ -52,8 +52,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -91,8 +91,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -103,6 +103,25 @@ "#cobblemon:is_frozen_ocean" ] } + }, + { + "id": "bergmite-6", + "pokemon": "bergmite", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 8.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_icy" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json index 9cf2b7baa1..e537b5406b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json @@ -52,8 +52,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -91,8 +91,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -103,6 +103,25 @@ "#cobblemon:is_frozen_ocean" ] } + }, + { + "id": "avalugg-6", + "pokemon": "avalugg", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "37-51", + "weight": 1.6, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:space/is_icy" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0722_rowlet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0722_rowlet.json index c77feea832..8c37bc5f73 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0722_rowlet.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0722_rowlet.json @@ -20,6 +20,8 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_forest", + "aether:skyroot_forest", + "aether:skyroot_woodland", "#cobblemon:is_taiga" ] }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0723_dartrix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0723_dartrix.json index 08ede86d17..f115772a2c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0723_dartrix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0723_dartrix.json @@ -20,6 +20,8 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_forest", + "aether:skyroot_forest", + "aether:skyroot_woodland", "#cobblemon:is_taiga" ] }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0724_decidueye.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0724_decidueye.json index bd01420fac..1960c4f283 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0724_decidueye.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0724_decidueye.json @@ -20,6 +20,8 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_forest", + "aether:skyroot_forest", + "aether:skyroot_woodland", "#cobblemon:is_taiga" ] }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0742_cutiefly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0742_cutiefly.json index c79c0374e2..5fa17707a8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0742_cutiefly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0742_cutiefly.json @@ -56,6 +56,28 @@ { "id": "cutiefly-3", "pokemon": "cutiefly", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "5-30", + "weight": 1.8, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#cobblemon:flowers" + ] + } + }, + { + "id": "cutiefly-4", + "pokemon": "cutiefly", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0743_ribombee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0743_ribombee.json index e881de451e..53058542c2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0743_ribombee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0743_ribombee.json @@ -56,6 +56,28 @@ { "id": "ribombee-3", "pokemon": "ribombee", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-46", + "weight": 0.2, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#cobblemon:flowers" + ] + } + }, + { + "id": "ribombee-4", + "pokemon": "ribombee", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0747_mareanie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0747_mareanie.json index 436de63cc9..8bc55643cc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0747_mareanie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0747_mareanie.json @@ -77,8 +77,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -120,8 +120,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0748_toxapex.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0748_toxapex.json index 78e39b773a..f374f0c1c2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0748_toxapex.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0748_toxapex.json @@ -77,8 +77,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -120,8 +120,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0751_dewpider.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0751_dewpider.json new file mode 100644 index 0000000000..0958c3bf5a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0751_dewpider.json @@ -0,0 +1,163 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "dewpider-3", + "pokemon": "dewpider", + "type": "pokemon", + "context": "fishing", + "bucket": "uncommon", + "level": "2-27", + "weight": 5.04, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_freshwater", + "#cobblemon:is_grassland", + "#cobblemon:is_jungle" + ] + }, + "anticondition": { + "minLureLevel": 1, + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "dewpider-4", + "pokemon": "dewpider", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "2-27", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 3.0, + "condition": { + "minLureLevel": 3 + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_freshwater", + "#cobblemon:is_grassland", + "#cobblemon:is_jungle" + ], + "minLureLevel": 1 + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "dewpider-5", + "pokemon": "dewpider", + "type": "pokemon", + "context": "fishing", + "bucket": "uncommon", + "level": "2-27", + "weight": 5.04, + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_freshwater", + "#cobblemon:is_grassland", + "#cobblemon:is_jungle" + ] + }, + "anticondition": { + "minLureLevel": 1, + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "dewpider-6", + "pokemon": "dewpider", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "2-27", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 3.0, + "condition": { + "minLureLevel": 3 + } + }, + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_freshwater", + "#cobblemon:is_grassland", + "#cobblemon:is_jungle" + ], + "minLureLevel": 1 + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "dewpider-1", + "pokemon": "dewpider", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "2-27", + "weight": 8.4, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "dewpider-2", + "pokemon": "dewpider", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "common", + "level": "2-27", + "weight": 1.8, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_freshwater" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0752_araquanid.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0752_araquanid.json new file mode 100644 index 0000000000..2760f18f7a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0752_araquanid.json @@ -0,0 +1,163 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "araquanid-3", + "pokemon": "araquanid", + "type": "pokemon", + "context": "fishing", + "bucket": "uncommon", + "level": "22-45", + "weight": 0.96, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_freshwater", + "#cobblemon:is_grassland", + "#cobblemon:is_jungle" + ] + }, + "anticondition": { + "minLureLevel": 1, + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "araquanid-4", + "pokemon": "araquanid", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "22-45", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 3.0, + "condition": { + "minLureLevel": 3 + } + }, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_freshwater", + "#cobblemon:is_grassland", + "#cobblemon:is_jungle" + ], + "minLureLevel": 1 + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "araquanid-5", + "pokemon": "araquanid", + "type": "pokemon", + "context": "fishing", + "bucket": "uncommon", + "level": "22-45", + "weight": 0.96, + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_freshwater", + "#cobblemon:is_grassland", + "#cobblemon:is_jungle" + ] + }, + "anticondition": { + "minLureLevel": 1, + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "araquanid-6", + "pokemon": "araquanid", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "22-45", + "weight": 0.2, + "weightMultiplier": { + "multiplier": 3.0, + "condition": { + "minLureLevel": 3 + } + }, + "condition": { + "canSeeSky": false, + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_forest", + "#cobblemon:is_freshwater", + "#cobblemon:is_grassland", + "#cobblemon:is_jungle" + ], + "minLureLevel": 1 + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "araquanid-1", + "pokemon": "araquanid", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "22-45", + "weight": 1.6, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_freshwater" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + }, + { + "id": "araquanid-2", + "pokemon": "araquanid", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "seafloor", + "bucket": "common", + "level": "22-45", + "weight": 0.2, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_freshwater" + ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json index 8392aefd14..04c88b7daf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0755_morelull.json @@ -16,6 +16,7 @@ "weight": 1.8, "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_jungle", "#cobblemon:is_magical", "#cobblemon:is_mushroom" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json index 8b6bae8306..03bfa554af 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0756_shiinotic.json @@ -16,6 +16,7 @@ "weight": 0.2, "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_jungle", "#cobblemon:is_magical", "#cobblemon:is_mushroom" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0764_comfey.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0764_comfey.json index bf7c508488..373bac49fa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0764_comfey.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0764_comfey.json @@ -39,6 +39,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "isRaining": false, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json index 6620e24ce6..37be6bb517 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0767_wimpod.json @@ -129,8 +129,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -153,8 +153,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -202,8 +202,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json index a2f4b7860c..87ca6a914b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0768_golisopod.json @@ -129,8 +129,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -153,8 +153,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -202,8 +202,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json index fbcba15b19..7caf9b0c36 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0771_pyukumuku.json @@ -77,14 +77,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], @@ -129,14 +129,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json index 2b13fb6ec9..771ba7a194 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0775_komala.json @@ -21,6 +21,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland", "#cobblemon:is_savanna" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0779_bruxish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0779_bruxish.json index 88d52ddb80..9b28b490e2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0779_bruxish.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0779_bruxish.json @@ -50,8 +50,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -113,8 +113,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0813_scorbunny.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0813_scorbunny.json index e1dc05461f..72934c5f1b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0813_scorbunny.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0813_scorbunny.json @@ -19,6 +19,8 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_grassland", + "aether:skyroot_grove", + "aether:skyroot_meadow", "#cobblemon:is_tundra" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0814_raboot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0814_raboot.json index 2fb7b0dc57..4c63e1b0a1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0814_raboot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0814_raboot.json @@ -19,6 +19,8 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_grassland", + "aether:skyroot_grove", + "aether:skyroot_meadow", "#cobblemon:is_tundra" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0815_cinderace.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0815_cinderace.json index 16f6979047..631893b3c4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0815_cinderace.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0815_cinderace.json @@ -19,6 +19,8 @@ "maxSkyLight": 15, "biomes": [ "#cobblemon:is_grassland", + "aether:skyroot_grove", + "aether:skyroot_meadow", "#cobblemon:is_tundra" ] } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0816_sobble.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0816_sobble.json index 9927f1204b..20aff59a3c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0816_sobble.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0816_sobble.json @@ -81,4 +81,4 @@ } } ] -} +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0817_drizzile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0817_drizzile.json index 6a333850eb..bc9767608b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0817_drizzile.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0817_drizzile.json @@ -81,4 +81,4 @@ } } ] -} +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0818_inteleon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0818_inteleon.json index 4bfa0ba15a..bbc9f8cbff 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0818_inteleon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0818_inteleon.json @@ -81,4 +81,4 @@ } } ] -} +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0829_gossifleur.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0829_gossifleur.json index a3aaf99d93..cc9e7b2ae0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0829_gossifleur.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0829_gossifleur.json @@ -32,6 +32,26 @@ { "id": "gossifleur-2", "pokemon": "gossifleur", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "1-25", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } + }, + { + "id": "gossifleur-3", + "pokemon": "gossifleur", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0830_eldegoss.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0830_eldegoss.json index 5f1b4d315b..03b13022ca 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0830_eldegoss.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0830_eldegoss.json @@ -32,6 +32,26 @@ { "id": "eldegoss-2", "pokemon": "eldegoss", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "20-46", + "weight": 1.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } + }, + { + "id": "eldegoss-3", + "pokemon": "eldegoss", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json index acf1bb1d32..fd9ebc215e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0831_wooloo.json @@ -28,6 +28,26 @@ "#cobblemon:is_plains" ] } + }, + { + "id": "wooloo-2", + "pokemon": "wooloo", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "2-27", + "weight": 9.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0832_dubwool.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0832_dubwool.json index c7f320ffca..ce90466bfd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0832_dubwool.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0832_dubwool.json @@ -28,6 +28,26 @@ "#cobblemon:is_plains" ] } + }, + { + "id": "dubwool-2", + "pokemon": "dubwool", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-49", + "weight": 1.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0845_cramorant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0845_cramorant.json index aa8fa1dd06..b82d02b6a6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0845_cramorant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0845_cramorant.json @@ -94,7 +94,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -112,6 +112,86 @@ "#cobblemon:is_freezing" ] } + }, + { + "id": "cramorant-6", + "pokemon": "cramorant", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "23-48", + "weight": 10.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + }, + { + "id": "cramorant-7", + "pokemon": "cramorant", + "presets": [ + "water" + ], + "type": "pokemon", + "context": "surface", + "bucket": "uncommon", + "level": "23-48", + "weight": 10.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } + }, + { + "id": "cramorant-8", + "pokemon": "cramorant", + "type": "pokemon", + "context": "fishing", + "bucket": "uncommon", + "level": "23-48", + "weight": 6.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + }, + "anticondition": { + "minLureLevel": 1 + } + }, + { + "id": "cramorant-9", + "pokemon": "cramorant", + "type": "pokemon", + "context": "fishing", + "bucket": "common", + "level": "23-48", + "weight": 2.0, + "weightMultiplier": { + "multiplier": 3.0, + "condition": { + "minLureLevel": 3 + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "minLureLevel": 1 + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json index 4b116ff50d..96acd98fc3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0846_arrokuda.json @@ -38,13 +38,14 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_coast", "#cobblemon:is_ocean", "#cobblemon:is_swamp" @@ -93,8 +94,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -102,6 +103,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_coast", "#cobblemon:is_ocean", "#cobblemon:is_swamp" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json index 63f2152b15..f9c7c73e96 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0847_barraskewda.json @@ -38,13 +38,14 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { "canSeeSky": true, "biomes": [ + "#aether:is_aether", "#cobblemon:is_coast", "#cobblemon:is_ocean", "#cobblemon:is_swamp" @@ -93,8 +94,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -102,6 +103,7 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ + "#aether:is_aether", "#cobblemon:is_coast", "#cobblemon:is_ocean", "#cobblemon:is_swamp" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0856_hatenna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0856_hatenna.json index 181b890b93..edca0df51c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0856_hatenna.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0856_hatenna.json @@ -19,7 +19,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_magical" + "#cobblemon:is_magical", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0857_hattrem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0857_hattrem.json index cadd8d7928..d4e2dcdfbb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0857_hattrem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0857_hattrem.json @@ -19,7 +19,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_magical" + "#cobblemon:is_magical", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0858_hatterene.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0858_hatterene.json index 2cca2e8126..a405509e63 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0858_hatterene.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0858_hatterene.json @@ -19,7 +19,9 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_magical" + "#cobblemon:is_magical", + "aether:skyroot_forest", + "aether:skyroot_woodland" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json index 41a9d1989a..985bed14e3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0868_milcery.json @@ -13,6 +13,7 @@ "weight": 9.5, "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "neededNearbyBlocks": [ @@ -30,6 +31,7 @@ "weight": 1.84, "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json index 6b48043bcb..045109e757 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0869_alcremie.json @@ -13,6 +13,7 @@ "weight": 0.5, "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "neededNearbyBlocks": [ @@ -30,6 +31,7 @@ "weight": 0.16, "condition": { "biomes": [ + "#aether:is_aether", "#cobblemon:is_overworld" ], "neededNearbyBlocks": [ diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0871_pincurchin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0871_pincurchin.json index 736d9d20e5..9afac2ed0a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0871_pincurchin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0871_pincurchin.json @@ -56,7 +56,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -100,7 +100,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -171,7 +171,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json index e877f97892..c575eee807 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0875_eiscue.json @@ -53,14 +53,14 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "2", - "maxLureLevel": "2" + "minLureLevel": 2, + "maxLureLevel": 2 } }, { "multiplier": 5.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0878_cufant.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0878_cufant.json index f78b4f800a..76d62ec594 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0878_cufant.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0878_cufant.json @@ -29,6 +29,11 @@ "#cobblemon:is_hills", "#cobblemon:is_savanna" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0879_copperajah.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0879_copperajah.json index 48cab7dd86..0aa15d2f68 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0879_copperajah.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0879_copperajah.json @@ -29,6 +29,11 @@ "#cobblemon:is_hills", "#cobblemon:is_savanna" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_freezing" + ] } } ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json index 71691379b7..d145ebadb9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0900_kleavor.json @@ -30,6 +30,26 @@ "#cobblemon:is_spooky" ] } + }, + { + "id": "kleavor-2", + "pokemon": "kleavor", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "45-50", + "weight": 0.25, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json index e20e0d96ab..3cac6545d5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0901_ursaluna.json @@ -27,6 +27,24 @@ { "id": "ursaluna-2", "pokemon": "ursaluna", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "45-55", + "weight": 0.01, + "condition": { + "biomes": [ + "aether:skyroot_forest", + "aether:skyroot_woodland" + ] + } + }, + { + "id": "ursaluna-3", + "pokemon": "ursaluna", "type": "pokemon", "context": "grounded", "bucket": "common", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0904_overqwil.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0904_overqwil.json index 3cd3a67615..7033ab3044 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0904_overqwil.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0904_overqwil.json @@ -78,8 +78,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -106,8 +106,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -202,8 +202,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -232,8 +232,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "0", - "maxLureLevel": "1" + "minLureLevel": 0, + "maxLureLevel": 1 } }, "condition": { @@ -306,8 +306,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json index 2a1cf19159..6af704d665 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0924_tandemaus.json @@ -112,6 +112,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "tandemaus-5", + "pokemon": "tandemaus", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "6-31", + "weight": 1.8, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json index 6804c40bca..0a8d2d1460 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0925_maushold.json @@ -112,6 +112,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "maushold-5", + "pokemon": "maushold", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "25-47", + "weight": 0.2, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0935_charcadet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0935_charcadet.json index f5d07eda1e..68d5d7982e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0935_charcadet.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0935_charcadet.json @@ -54,6 +54,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "charcadet-3", + "pokemon": "charcadet", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "1-26", + "weight": 9.2, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0936_armarouge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0936_armarouge.json index 1b9db844b6..7be34d262a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0936_armarouge.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0936_armarouge.json @@ -58,6 +58,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "armarouge-3", + "pokemon": "armarouge", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "21-53", + "weight": 0.4, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0937_ceruledge.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0937_ceruledge.json index 33df211fdf..276094f3e3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0937_ceruledge.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0937_ceruledge.json @@ -58,6 +58,25 @@ "#cobblemon:is_overworld" ] } + }, + { + "id": "ceruledge-3", + "pokemon": "ceruledge", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "21-53", + "weight": 0.4, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0940_wattrel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0940_wattrel.json index 8b1e184994..458a9f9a86 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0940_wattrel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0940_wattrel.json @@ -6,6 +6,9 @@ { "id": "wattrel-1", "pokemon": "wattrel", + "presets": [ + "natural" + ], "type": "pokemon", "context": "grounded", "bucket": "common", @@ -35,6 +38,9 @@ { "id": "wattrel-2", "pokemon": "wattrel", + "presets": [ + "natural" + ], "type": "pokemon", "context": "grounded", "bucket": "common", @@ -143,7 +149,7 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0941_kilowattrel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0941_kilowattrel.json index d20b02db0b..6503381709 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0941_kilowattrel.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0941_kilowattrel.json @@ -6,6 +6,9 @@ { "id": "kilowattrel-1", "pokemon": "kilowattrel", + "presets": [ + "natural" + ], "type": "pokemon", "context": "grounded", "bucket": "common", @@ -35,6 +38,9 @@ { "id": "kilowattrel-2", "pokemon": "kilowattrel", + "presets": [ + "natural" + ], "type": "pokemon", "context": "grounded", "bucket": "common", @@ -143,7 +149,7 @@ { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } } ], diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json index d2cdd577b7..9738ad0ae3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0957_tinkatink.json @@ -25,6 +25,25 @@ "#cobblemon:ruin" ] } + }, + { + "id": "tinkatink-2", + "pokemon": "tinkatink", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 8.4, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json index 13d127b082..3542c66a11 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0958_tinkatuff.json @@ -25,6 +25,25 @@ "#cobblemon:ruin" ] } + }, + { + "id": "tinkatuff-2", + "pokemon": "tinkatuff", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "24-38", + "weight": 1.44, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json index f4a90228ca..d9ad48971d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0959_tinkaton.json @@ -25,6 +25,25 @@ "#cobblemon:ruin" ] } + }, + { + "id": "tinkaton-2", + "pokemon": "tinkaton", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "38-51", + "weight": 0.16, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0963_finizen.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0963_finizen.json index 5b6253e09b..03ac99ac86 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0963_finizen.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0963_finizen.json @@ -50,7 +50,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -112,7 +112,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0964_palafin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0964_palafin.json index d78cbecd32..af71100f93 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0964_palafin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0964_palafin.json @@ -50,7 +50,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -112,7 +112,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0973_flamigo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0973_flamigo.json index 9f40640493..2f086d8d9c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0973_flamigo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0973_flamigo.json @@ -56,6 +56,28 @@ ], "timeRange": "day" } + }, + { + "id": "flamigo-4", + "pokemon": "flamigo", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "25-50", + "weight": 6.0, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#aether:is_aether" + ], + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0976_veluza.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0976_veluza.json index bb25d50cd9..638e92310d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0976_veluza.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0976_veluza.json @@ -50,7 +50,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -112,7 +112,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { @@ -182,7 +182,7 @@ "weightMultiplier": { "multiplier": 3.0, "condition": { - "minLureLevel": "3" + "minLureLevel": 3 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json index cf8ae529db..83940237b2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0980_clodsire.json @@ -124,8 +124,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { @@ -224,8 +224,8 @@ "weightMultiplier": { "multiplier": 0.6, "condition": { - "minLureLevel": "1", - "maxLureLevel": "2" + "minLureLevel": 1, + "maxLureLevel": 2 } }, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0999_gimmighoul.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0999_gimmighoul.json index 8a0d9378a8..3ff3482462 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0999_gimmighoul.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0999_gimmighoul.json @@ -41,7 +41,26 @@ } }, { - "id": "gimmighoul-chest-3", + "id": "gimmighoul-roaming-3", + "pokemon": "gimmighoul roaming", + "type": "pokemon", + "context": "grounded", + "bucket": "uncommon", + "level": "5-30", + "weight": 10.0, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } + }, + { + "id": "gimmighoul-chest-4", "pokemon": "gimmighoul chest", "type": "pokemon", "context": "grounded", @@ -59,7 +78,7 @@ } }, { - "id": "gimmighoul-chest-4", + "id": "gimmighoul-chest-5", "pokemon": "gimmighoul chest", "type": "pokemon", "context": "grounded", @@ -76,6 +95,25 @@ "minY": -37, "maxY": 10 } + }, + { + "id": "gimmighoul-chest-6", + "pokemon": "gimmighoul chest", + "type": "pokemon", + "context": "grounded", + "bucket": "rare", + "level": "5-30", + "weight": 10.0, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#aether:is_aether" + ], + "structures": [ + "#aether:dungeons" + ] + } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/block/berry_soil.json b/common/src/main/resources/data/cobblemon/tags/block/berry_soil.json index 3be0737aec..ec680ee74a 100644 --- a/common/src/main/resources/data/cobblemon/tags/block/berry_soil.json +++ b/common/src/main/resources/data/cobblemon/tags/block/berry_soil.json @@ -8,6 +8,10 @@ { "id": "#c:farmlands", "required": false + }, + { + "id": "aether:aether_farmland", + "required": false } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_season/spring.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_season/spring.json index 26ec5963b4..ac193aeb6b 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_season/spring.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/has_season/spring.json @@ -6,6 +6,10 @@ "#cobblemon:is_magical", "#cobblemon:is_plains", { + "id": "#aether:is_aether", + "required": false + }, + { "id": "terralith:skylands_spring", "required": false }, diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_fiery.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_fiery.json new file mode 100644 index 0000000000..befef44b47 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_fiery.json @@ -0,0 +1,41 @@ +{ + "replace": false, + "values": [ + { + "id": "#stellaris:mercury_biomes", + "required": false + }, + { + "id": "space:mercury_hotspot", + "required": false + }, + { + "id": "space:mercury_plains", + "required": false + }, + { + "id": "space:venus_highlands", + "required": false + }, + { + "id": "space:venus_lava_caves", + "required": false + }, + { + "id": "space:venus_lowlands", + "required": false + }, + { + "id": "space:venus_midlands", + "required": false + }, + { + "id": "space:venus_volcanic_plains", + "required": false + }, + { + "id": "stellaris:infernal_venus_barrens", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_icy.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_icy.json new file mode 100644 index 0000000000..03bb1f6eea --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_icy.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#space:ice_craters", + "required": false + }, + { + "id": "stellaris:mars_ice_spikes", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_mars.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_mars.json new file mode 100644 index 0000000000..b4a79b3cc4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_mars.json @@ -0,0 +1,41 @@ +{ + "replace": false, + "values": [ + { + "id": "#stellaris:mars_biomes", + "required": false + }, + { + "id": "#stellaris:mars_biomes", + "required": false + }, + { + "id": "#stellaris:mars_biomes", + "required": false + }, + { + "id": "space:mars_dripstone", + "required": false + }, + { + "id": "space:mars_highlands", + "required": false + }, + { + "id": "space:mars_ice", + "required": false + }, + { + "id": "space:mars_lowlands", + "required": false + }, + { + "id": "space:mars_lush_caves", + "required": false + }, + { + "id": "space:mars_midlands", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_mercury.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_mercury.json new file mode 100644 index 0000000000..2d22eaa40a --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_mercury.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + { + "id": "#stellaris:mercury_biomes", + "required": false + }, + { + "id": "space:mercury_hotspot", + "required": false + }, + { + "id": "space:mercury_ice", + "required": false + }, + { + "id": "space:mercury_plains", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_moon.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_moon.json new file mode 100644 index 0000000000..e6c5c3ae53 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_moon.json @@ -0,0 +1,33 @@ +{ + "replace": false, + "values": [ + { + "id": "#stellaris:moon_biomes", + "required": false + }, + { + "id": "space:moon_highlands", + "required": false + }, + { + "id": "space:moon_ice", + "required": false + }, + { + "id": "space:moon_lowlands", + "required": false + }, + { + "id": "space:moon_midlands", + "required": false + }, + { + "id": "space:moon_rocks", + "required": false + }, + { + "id": "swe:moon", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_space.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_space.json new file mode 100644 index 0000000000..de740737a8 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_space.json @@ -0,0 +1,113 @@ +{ + "replace": false, + "values": [ + { + "id": "#stellaris:mars_biomes", + "required": false + }, + { + "id": "#stellaris:mercury_biomes", + "required": false + }, + { + "id": "#stellaris:moon_biomes", + "required": false + }, + { + "id": "#stellaris:venus_biomes", + "required": false + }, + { + "id": "space:mars_dripstone", + "required": false + }, + { + "id": "space:mars_highlands", + "required": false + }, + { + "id": "space:mars_ice", + "required": false + }, + { + "id": "space:mars_lowlands", + "required": false + }, + { + "id": "space:mars_lush_caves", + "required": false + }, + { + "id": "space:mars_midlands", + "required": false + }, + { + "id": "space:mercury_hotspot", + "required": false + }, + { + "id": "space:mercury_ice", + "required": false + }, + { + "id": "space:mercury_plains", + "required": false + }, + { + "id": "space:moon_highlands", + "required": false + }, + { + "id": "space:moon_ice", + "required": false + }, + { + "id": "space:moon_lowlands", + "required": false + }, + { + "id": "space:moon_midlands", + "required": false + }, + { + "id": "space:moon_rocks", + "required": false + }, + { + "id": "swe:moon", + "required": false + }, + { + "id": "space:space", + "required": false + }, + { + "id": "space:venus_highlands", + "required": false + }, + { + "id": "space:venus_lava_caves", + "required": false + }, + { + "id": "space:venus_lowlands", + "required": false + }, + { + "id": "space:venus_midlands", + "required": false + }, + { + "id": "space:venus_plankton_bloom", + "required": false + }, + { + "id": "space:venus_sky", + "required": false + }, + { + "id": "space:venus_volcanic_plains", + "required": false + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_venus.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_venus.json new file mode 100644 index 0000000000..a3da08fafa --- /dev/null +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/space/is_venus.json @@ -0,0 +1,37 @@ +{ + "replace": false, + "values": [ + { + "id": "#stellaris:venus_biomes", + "required": false + }, + { + "id": "space:venus_highlands", + "required": false + }, + { + "id": "space:venus_lava_caves", + "required": false + }, + { + "id": "space:venus_lowlands", + "required": false + }, + { + "id": "space:venus_midlands", + "required": false + }, + { + "id": "space:venus_plankton_bloom", + "required": false + }, + { + "id": "space:venus_sky", + "required": false + }, + { + "id": "space:venus_volcanic_plains", + "required": false + } + ] +} diff --git a/utilityscripts/cobblemon_spawn_csv_to_json.py b/utilityscripts/cobblemon_spawn_csv_to_json.py index 0c92884381..6e7f0801a4 100644 --- a/utilityscripts/cobblemon_spawn_csv_to_json.py +++ b/utilityscripts/cobblemon_spawn_csv_to_json.py @@ -46,6 +46,7 @@ def ui_init_filters(pokemon_nrs_min, pokemon_nrs_max, included_grps, known_cntxt excluded_forms = [] # Biome mapping, used to convert the Biome column to the format used in the spawn json biome_mapping = { + 'aether': '#aether:is_aether', 'arid': '#cobblemon:is_arid', 'badlands': '#cobblemon:is_badlands', 'bamboo': '#cobblemon:is_bamboo', @@ -82,6 +83,9 @@ biome_mapping = { 'lush': '#cobblemon:is_lush', 'magical': '#cobblemon:is_magical', 'mangrove swamp': 'minecraft:mangrove_swamp', + 'mars': '#cobblemon:space/is_mars', + 'mercury': '#cobblemon:space/is_mercury', + 'moon': '#cobblemon:space/is_moon', 'mountain': '#cobblemon:is_mountain', 'muddy': '#cobblemon:has_block/mud', 'mushroom': '#cobblemon:is_mushroom', @@ -116,10 +120,17 @@ biome_mapping = { 'skylands spring': 'terralith:skylands_spring', 'skylands summer': 'terralith:skylands_summer', 'skylands winter': 'terralith:skylands_winter', + 'skyroot forest': 'aether:skyroot_forest', + 'skyroot grove': 'aether:skyroot_grove', + 'skyroot meadow': 'aether:skyroot_meadow', + 'skyroot woodland': 'aether:skyroot_woodland', 'snowy': '#cobblemon:is_snowy', 'snowy beach': 'minecraft:snowy_beach', 'snowy forest': '#cobblemon:is_snowy_forest', 'snowy taiga': '#cobblemon:is_snowy_taiga', + 'space': '#cobblemon:space/is_space', + 'space fiery': '#cobblemon:space/is_fiery', + 'space icy': '#cobblemon:space/is_icy', 'spooky': '#cobblemon:is_spooky', 'sunflower plains': 'minecraft:sunflower_plains', 'swamp': '#cobblemon:is_swamp', @@ -129,6 +140,7 @@ biome_mapping = { 'thermal': '#cobblemon:is_thermal', 'tropical island': '#cobblemon:is_tropical_island', 'tundra': '#cobblemon:is_tundra', + 'venus': '#cobblemon:space/is_venus', 'volcanic': '#cobblemon:is_volcanic', 'warm ocean': '#cobblemon:is_warm_ocean', 'warped desert': 'byg:warped_desert' @@ -403,25 +415,25 @@ def transform_pokemon_to_json(pokemon_rows, invalid_biome_tags, drops_df): case "Beehive": multiplier_condition["neededNearbyBlocks"] = ["#minecraft:beehives"] case "Full Moon": - multiplier_condition["moonPhase"] = "0" + multiplier_condition["moonPhase"] = 0 case "New Moon": - multiplier_condition["moonPhase"] = "4" + multiplier_condition["moonPhase"] = 4 case "Wreck": multiplier_condition["structures"] = ["#minecraft:shipwreck"] case "Lure0": - multiplier_condition["minLureLevel"] = "0" - multiplier_condition["maxLureLevel"] = "0" + multiplier_condition["minLureLevel"] = 0 + multiplier_condition["maxLureLevel"] = 0 case "Lure0/1": - multiplier_condition["minLureLevel"] = "0" - multiplier_condition["maxLureLevel"] = "1" + multiplier_condition["minLureLevel"] = 0 + multiplier_condition["maxLureLevel"] = 1 case "Lure1/2": - multiplier_condition["minLureLevel"] = "1" - multiplier_condition["maxLureLevel"] = "2" + multiplier_condition["minLureLevel"] = 1 + multiplier_condition["maxLureLevel"] = 2 case "Lure2": - multiplier_condition["minLureLevel"] = "2" - multiplier_condition["maxLureLevel"] = "2" + multiplier_condition["minLureLevel"] = 2 + multiplier_condition["maxLureLevel"] = 2 case "Lure3": - multiplier_condition["minLureLevel"] = "3" + multiplier_condition["minLureLevel"] = 3 case "MJ-Skel": multiplier_condition["biomes"] = ["#cobblemon:is_spooky"] case "MJ-Cal1": @@ -693,14 +705,14 @@ def special_condtions_anticonditions(condition, column_name, currentID, invalid_ # if the string contains "maxLureLevel = " then split it and add it to the condition dictionary elif "maxLureLevel" in string: condition['maxLureLevel'] = int(string.split('=')[1].strip()) - # if the string contains "bobber = master ball" then add it to the condition dictionary - elif "bobber = master ball" in string: + # if the string contains "bobber = master_ball" then add it to the condition dictionary + elif "bobber = master_ball" in string: condition['bobber'] = "cobblemon:master_ball" - # if the string contains "bobber = love ball" then add it to the condition dictionary - elif "bobber = love ball" in string: + # if the string contains "bobber = love_ball" then add it to the condition dictionary + elif "bobber = love_ball" in string: condition['bobber'] = "cobblemon:love_ball" - # if the string contains "bait = love sweet" then add it to the condition dictionary - elif "bait = love sweet" in string: + # if the string contains "bait = love_sweet" then add it to the condition dictionary + elif "bait = love_sweet" in string: condition['bait'] = "cobblemon:love_sweet" # if the string is a digit, pass (was already hanlded by other conditions) elif string.strip().isdigit(): From 1fb09e27fc472eec6c03107822cc17c4ccfa64f5 Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 18 Jan 2025 21:04:06 +1000 Subject: [PATCH 029/121] Rework pokedex events to actually be useful (always have a Pokemon instance) --- CHANGELOG.md | 3 + .../mod/common/mixin/PlayerMixin.java | 37 +++++---- .../pokedex/scanning/PokemonScannedEvent.kt | 10 +-- .../events/pokemon/PokedexDataChangedEvent.kt | 12 ++- .../api/pokedex/AbstractPokedexManager.kt | 12 ++- .../mod/common/api/pokedex/FormDexRecord.kt | 76 ++++--------------- .../mod/common/api/pokedex/PokedexManager.kt | 8 +- .../common/api/pokedex/SpeciesDexRecord.kt | 4 +- .../client/pokedex/PokedexScannerRenderer.kt | 14 ++-- .../common/entity/pokemon/PokemonEntity.kt | 20 +++-- .../pokedex/scanner/FinishScanningHandler.kt | 4 +- .../pokedex/scanner/PokedexEntityData.kt | 32 ++++---- .../pokedex/scanner/PokedexUsageContext.kt | 12 +-- 13 files changed, 102 insertions(+), 142 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a3961283f..4248f6910a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -137,6 +137,9 @@ - Fix "learned new move" messages appearing for already known moves on Pokémon evolutions. - Fix Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames. +### Developer +- Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. + ### Molang & Datapacks - Added flows for: - `forme_change`: Triggered when a Pokémon changes form in battle. diff --git a/common/src/main/java/com/cobblemon/mod/common/mixin/PlayerMixin.java b/common/src/main/java/com/cobblemon/mod/common/mixin/PlayerMixin.java index 124d4c65d4..5802a5d4c2 100644 --- a/common/src/main/java/com/cobblemon/mod/common/mixin/PlayerMixin.java +++ b/common/src/main/java/com/cobblemon/mod/common/mixin/PlayerMixin.java @@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents; import com.cobblemon.mod.common.api.events.item.LeftoversCreatedEvent; import com.cobblemon.mod.common.api.pokemon.PokemonSpecies; import com.cobblemon.mod.common.api.storage.party.PartyStore; +import com.cobblemon.mod.common.api.storage.party.PlayerPartyStore; import com.cobblemon.mod.common.api.tags.CobblemonItemTags; import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData; import com.cobblemon.mod.common.pokedex.scanner.ScannableEntity; @@ -178,10 +179,10 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit @Override @Nullable public PokedexEntityData resolvePokemonScan() { - if(CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())){ + if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityRight())){ return getDataFromShoulderPokemon(this.getShoulderEntityRight()); } - if(CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())){ + if (CompoundTagUtilities.isShoulderPokemon(this.getShoulderEntityLeft())){ return getDataFromShoulderPokemon(this.getShoulderEntityLeft()); } return null; @@ -190,30 +191,34 @@ public abstract class PlayerMixin extends LivingEntity implements ScannableEntit @Nullable @Unique private PokedexEntityData getDataFromShoulderPokemon(CompoundTag shoulderTag) { CompoundTag pokemonTag = shoulderTag.getCompound(DataKeys.POKEMON); - if(pokemonTag.isEmpty()) return null; + if (pokemonTag.isEmpty()) return null; Species species = PokemonSpecies.INSTANCE.getByIdentifier(ResourceLocation.parse(pokemonTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER))); - if(species == null) return null; + if (species == null) return null; String formId = pokemonTag.getString(DataKeys.POKEMON_FORM_ID); FormData form = species.getStandardForm(); List formList = species.getForms().stream().filter(it -> it.formOnlyShowdownId().equals(formId)).toList(); - if(!formList.isEmpty()) form = formList.getFirst(); - if(form == null) return null; + if (!formList.isEmpty()) form = formList.getFirst(); + if (form == null) return null; String genderString = pokemonTag.getString(DataKeys.POKEMON_GENDER); - if(genderString.isEmpty()) return null; + if (genderString.isEmpty()) return null; Gender gender = Gender.valueOf(genderString); boolean shiny = pokemonTag.getBoolean(DataKeys.POKEMON_SHINY); int level = pokemonTag.getInt(DataKeys.POKEMON_LEVEL); Set aspects = shoulderTag.getList(DataKeys.SHOULDER_ASPECTS, Tag.TAG_STRING).stream().map(Tag::getAsString).collect(Collectors.toSet()); - return new PokedexEntityData( - species, - form, - gender, - aspects, - shiny, - level, - this.getUUID() - ); + Pokemon pokemon = new Pokemon(); + if (level().isClientSide) { + pokemon.setSpecies(species); + pokemon.setForm(form); + pokemon.setGender(gender); + pokemon.setShiny(shiny); + pokemon.setLevel(level); + pokemon.setForcedAspects(aspects); + } else { + PlayerPartyStore party = Cobblemon.INSTANCE.getStorage().getParty(this.getUUID(), this.registryAccess()); + pokemon = party.get(shoulderTag.getUUID(DataKeys.SHOULDER_UUID)); + } + return new PokedexEntityData(pokemon, null); } @Override diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokedex/scanning/PokemonScannedEvent.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokedex/scanning/PokemonScannedEvent.kt index 77fc244429..fa59a5a32a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokedex/scanning/PokemonScannedEvent.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokedex/scanning/PokemonScannedEvent.kt @@ -18,19 +18,17 @@ import net.minecraft.server.level.ServerPlayer import net.minecraft.world.entity.LivingEntity data class PokemonScannedEvent(val player: ServerPlayer, val scannedPokemonEntityData: PokedexEntityData, val scannedEntity: ScannableEntity) { - val pokedexEntityData: PokedexEntityData - get() = scannedPokemonEntityData - val isOwned: Boolean - get() = scannedPokemonEntityData.ownerUUID == player.uuid + get() = scannedPokemonEntityData.pokemon.getOwnerUUID() == player.uuid val context = mutableMapOf( "player" to player.asMoLangValue(), - "pokemon" to scannedPokemonEntityData.struct, + "pokemon" to scannedPokemonEntityData.pokemon.struct, + "disguise" to (scannedPokemonEntityData.disguise?.struct ?: DoubleValue.ZERO), "entity" to { when (scannedEntity) { is LivingEntity -> scannedEntity.asMostSpecificMoLangValue() - else -> DoubleValue(0.0) + else -> DoubleValue.ZERO } }, ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/PokedexDataChangedEvent.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/PokedexDataChangedEvent.kt index e544742c08..3d6df7b114 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/PokedexDataChangedEvent.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/PokedexDataChangedEvent.kt @@ -17,16 +17,14 @@ import com.cobblemon.mod.common.api.pokedex.AbstractPokedexManager import com.cobblemon.mod.common.api.pokedex.FormDexRecord import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress import com.cobblemon.mod.common.pokedex.scanner.PokedexEntityData -import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.util.getPlayer -import com.mojang.datafixers.util.Either import java.util.UUID /** * Event that fires when a Pokémon's information is gained or updated in the Pokédex. */ sealed interface PokedexDataChangedEvent { - val dataSource: Either + val dataSource: PokedexEntityData val knowledge: PokedexEntryProgress val playerUUID: UUID val record: FormDexRecord @@ -37,22 +35,22 @@ sealed interface PokedexDataChangedEvent { fun getContext(): MutableMap { return mutableMapOf( "player" to (playerUUID.getPlayer()?.asMoLangValue() ?: DoubleValue.ZERO), - "pokemon" to dataSource.map({ DoubleValue.ZERO }, { it.struct }), - "data" to dataSource.map({ it.struct }, { DoubleValue.ZERO }), + "pokemon" to dataSource.pokemon.struct, + "disguise" to (dataSource.disguise?.struct ?: DoubleValue.ZERO), "knowledge" to StringValue(knowledge.name.lowercase()), "pokedex" to pokedexManager.struct ) } class Pre( - override val dataSource: Either, + override val dataSource: PokedexEntityData, override val knowledge: PokedexEntryProgress, override val playerUUID: UUID, override val record: FormDexRecord ) : PokedexDataChangedEvent, Cancelable() class Post( - override val dataSource: Either, + override val dataSource: PokedexEntityData, override val knowledge: PokedexEntryProgress, override val playerUUID: UUID, override val record: FormDexRecord diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/AbstractPokedexManager.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/AbstractPokedexManager.kt index 65b08b11fe..0b5bfe46d7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/AbstractPokedexManager.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/AbstractPokedexManager.kt @@ -96,15 +96,21 @@ abstract class AbstractPokedexManager { } fun getNewInformation(pokedexEntityData: PokedexEntityData): PokedexLearnedInformation { - val speciesRecord = getSpeciesRecord(pokedexEntityData.species.resourceIdentifier) + val speciesRecord = getSpeciesRecord(pokedexEntityData.getApparentSpecies().resourceIdentifier) if (speciesRecord == null || speciesRecord.getKnowledge() == PokedexEntryProgress.NONE) { return PokedexLearnedInformation.SPECIES } - val formRecord = speciesRecord.getFormRecord(pokedexEntityData.form.name) + val formRecord = speciesRecord.getFormRecord(pokedexEntityData.getApparentForm().name) if (formRecord == null || formRecord.knowledge == PokedexEntryProgress.NONE) { return PokedexLearnedInformation.FORM } - if (pokedexEntityData.aspects.any{ !speciesRecord.hasAspect(it) } || pokedexEntityData.gender !in formRecord.getGenders() || !formRecord.hasSeenShinyState(pokedexEntityData.shiny)) { + + // Can't update aspects on a disguise + if (pokedexEntityData.disguise != null) { + return PokedexLearnedInformation.NONE + } + + if (pokedexEntityData.pokemon.aspects.any { !speciesRecord.hasAspect(it) } || pokedexEntityData.pokemon.gender !in formRecord.getGenders() || !formRecord.hasSeenShinyState(pokedexEntityData.pokemon.shiny)) { return PokedexLearnedInformation.VARIATION } return PokedexLearnedInformation.NONE diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/FormDexRecord.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/FormDexRecord.kt index bd392e5f6f..31bbe3a199 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/FormDexRecord.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/FormDexRecord.kt @@ -89,21 +89,15 @@ class FormDexRecord { it.knowledge = knowledge } - fun encountered(pokemon: Pokemon) { - if (wouldBeDifferent(pokemon, PokedexEntryProgress.ENCOUNTERED)) { - addInformation(pokemon, PokedexEntryProgress.ENCOUNTERED) - } - } - fun encountered(pokedexEntityData: PokedexEntityData) { if (wouldBeDifferent(pokedexEntityData, PokedexEntryProgress.ENCOUNTERED)) { addInformation(pokedexEntityData, PokedexEntryProgress.ENCOUNTERED) } } - fun caught(pokemon: Pokemon) { - if (wouldBeDifferent(pokemon, PokedexEntryProgress.CAUGHT)) { - addInformation(pokemon, PokedexEntryProgress.CAUGHT) + fun caught(pokedexEntityData: PokedexEntityData) { + if (wouldBeDifferent(pokedexEntityData, PokedexEntryProgress.CAUGHT)) { + addInformation(pokedexEntityData, PokedexEntryProgress.CAUGHT) } } @@ -125,47 +119,18 @@ class FormDexRecord { speciesDexRecord.onFormRecordUpdated(this) } - private fun addInformation(pokemon: Pokemon, knowledge: PokedexEntryProgress) { - (speciesDexRecord.pokedexManager as? PokedexManager)?.let { pokedexManager -> - CobblemonEvents.POKEDEX_DATA_CHANGED_PRE.postThen( - PokedexDataChangedEvent.Pre( - Either.right(pokemon), - knowledge, - pokedexManager.uuid, - this - ), - ifSucceeded = { - genders.add(pokemon.gender) - seenShinyStates.add(if (pokemon.shiny) "shiny" else "normal") - if (knowledge.ordinal > this.knowledge.ordinal) { - this.knowledge = knowledge - } - speciesDexRecord.addInformation(pokemon, knowledge) - speciesDexRecord.onFormRecordUpdated(this) - CobblemonEvents.POKEDEX_DATA_CHANGED_POST.post( - PokedexDataChangedEvent.Post( - Either.right(pokemon), - knowledge, - pokedexManager.uuid, - this - ) - ) - }) - } - } - private fun addInformation(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress) { (speciesDexRecord.pokedexManager as? PokedexManager)?.let { pokedexManager -> CobblemonEvents.POKEDEX_DATA_CHANGED_PRE.postThen( PokedexDataChangedEvent.Pre( - Either.left(pokedexEntityData), - knowledge, - pokedexManager.uuid, - this + pokedexEntityData, + knowledge, + pokedexManager.uuid, + this ), ifSucceeded = { - genders.add(pokedexEntityData.gender) - seenShinyStates.add(if (pokedexEntityData.shiny) "shiny" else "normal") + genders.add(pokedexEntityData.pokemon.gender) + seenShinyStates.add(if (pokedexEntityData.pokemon.shiny) "shiny" else "normal") if (knowledge.ordinal > this.knowledge.ordinal) { this.knowledge = knowledge } @@ -173,10 +138,10 @@ class FormDexRecord { speciesDexRecord.onFormRecordUpdated(this) CobblemonEvents.POKEDEX_DATA_CHANGED_POST.post( PokedexDataChangedEvent.Post( - Either.left(pokedexEntityData), - knowledge, - pokedexManager.uuid, - this + pokedexEntityData, + knowledge, + pokedexManager.uuid, + this ) ) } @@ -184,19 +149,10 @@ class FormDexRecord { } } - /** Returns whether the given [Pokemon] and [knowledge] would add new information to the Pokédex.*/ - fun wouldBeDifferent(pokemon: Pokemon, knowledge: PokedexEntryProgress): Boolean { - return pokemon.gender !in genders - || (pokemon.shiny && "shiny" !in seenShinyStates) - || (!pokemon.shiny && "normal" !in seenShinyStates) - || knowledge.ordinal > this.knowledge.ordinal - || speciesDexRecord.wouldBeDifferent(pokemon) - } - fun wouldBeDifferent(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress): Boolean { - return pokedexEntityData.gender !in genders - || (pokedexEntityData.shiny && "shiny" !in seenShinyStates) - || (!pokedexEntityData.shiny && "normal" !in seenShinyStates) + return pokedexEntityData.pokemon.gender !in genders + || (pokedexEntityData.pokemon.shiny && "shiny" !in seenShinyStates) + || (!pokedexEntityData.pokemon.shiny && "normal" !in seenShinyStates) || knowledge.ordinal > this.knowledge.ordinal || speciesDexRecord.wouldBeDifferent(pokedexEntityData) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexManager.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexManager.kt index 2fe49ccf12..6d76ecb828 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexManager.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexManager.kt @@ -30,19 +30,19 @@ class PokedexManager( fun encounter(pokemon: Pokemon) { val speciesId = pokemon.species.resourceIdentifier val formName = pokemon.form.name - getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).encountered(pokemon) + getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).encountered(PokedexEntityData(pokemon = pokemon, disguise = null)) } fun encounter(pokedexEntityData: PokedexEntityData) { - val speciesId = pokedexEntityData.species.resourceIdentifier - val formName = pokedexEntityData.form.name + val speciesId = pokedexEntityData.getApparentSpecies().resourceIdentifier + val formName = pokedexEntityData.getApparentForm().name getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).encountered(pokedexEntityData) } fun catch(pokemon: Pokemon) { val speciesId = pokemon.species.resourceIdentifier val formName = pokemon.form.name - getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).caught(pokemon) + getOrCreateSpeciesRecord(speciesId).getOrCreateFormRecord(formName).caught(PokedexEntityData(pokemon = pokemon, disguise = null)) } override fun markDirty() { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/SpeciesDexRecord.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/SpeciesDexRecord.kt index a2a36c196f..639c98391f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/SpeciesDexRecord.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/SpeciesDexRecord.kt @@ -97,7 +97,7 @@ class SpeciesDexRecord { } fun addInformation(pokedexEntityData: PokedexEntityData, knowledge: PokedexEntryProgress) { - aspects.addAll(pokedexEntityData.aspects) + aspects.addAll(pokedexEntityData.pokemon.aspects) } fun addAspects(addedAspects: Set) { @@ -107,7 +107,7 @@ class SpeciesDexRecord { /** Returns true if the given Pokémon contains new information. Internal because it's only to be called from [FormDexRecord.wouldBeDifferent]. */ internal fun wouldBeDifferent(pokemon: Pokemon) = pokemon.aspects.any { it !in aspects } - internal fun wouldBeDifferent(pokedexEntityData: PokedexEntityData) = pokedexEntityData.aspects.any { it !in aspects } + internal fun wouldBeDifferent(pokedexEntityData: PokedexEntityData) = pokedexEntityData.pokemon.aspects.any { it !in aspects } fun getOrCreateFormRecord(formName: String): FormDexRecord { return formRecords.getOrPut(formName.lowercase()) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt index 5d46417369..efff174e32 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt @@ -116,7 +116,7 @@ class PokedexScannerRenderer { drawScaledText( context = graphics, font = CobblemonResources.DEFAULT_LARGE, - text = lang("ui.lv.number", pokedexEntityData.level).bold(), + text = lang("ui.lv.number", pokedexEntityData.pokemon.level).bold(), x = centerX + xOffset + xOffsetText, y = centerY + yOffset + yOffsetText, shadow = true, @@ -126,7 +126,7 @@ class PokedexScannerRenderer { if (infoDisplayedCounter == 2) { val hasTrainer = (usageContext.scannableEntityInFocus?.resolveEntityScan() as? PokemonEntity)?.ownerUUID !== null - val speciesName = pokedexEntityData.species.translatedName.bold() + val speciesName = pokedexEntityData.getApparentSpecies().translatedName.bold() var yOffsetName = if (hasTrainer) 2 else 0 if (hasTrainer) { drawScaledText( @@ -149,7 +149,7 @@ class PokedexScannerRenderer { centered = true ) - val gender = pokedexEntityData.gender + val gender = pokedexEntityData.pokemon.gender val speciesNameWidth = Minecraft.getInstance().font.width(speciesName.font(CobblemonResources.DEFAULT_LARGE)) if (gender != Gender.GENDERLESS) { val isMale = gender == Gender.MALE @@ -179,14 +179,14 @@ class PokedexScannerRenderer { } if (infoDisplayedCounter == 3) { - val typeText = lang("type.suffix", pokedexEntityData.form.types.map { it.displayName.copy() }.reduce { acc, next -> acc.plus("/").plus(next) }).bold() + val typeText = lang("type.suffix", pokedexEntityData.getApparentForm().types.map { it.displayName.copy() }.reduce { acc, next -> acc.plus("/").plus(next) }).bold() val typeWidth = Minecraft.getInstance().font.width(typeText.font(CobblemonResources.DEFAULT_LARGE)) // Split into 2 lines if text width is too long - if (typeWidth > (OUTER_INFO_FRAME_WIDTH - 8) && pokedexEntityData.form.secondaryType !== null) { + if (typeWidth > (OUTER_INFO_FRAME_WIDTH - 8) && pokedexEntityData.getApparentForm().secondaryType !== null) { drawScaledText( context = graphics, font = CobblemonResources.DEFAULT_LARGE, - text = lang("type.suffix", pokedexEntityData.form.primaryType.displayName).bold(), + text = lang("type.suffix", pokedexEntityData.getApparentForm().primaryType.displayName).bold(), x = centerX + xOffset + xOffsetText, y = centerY + yOffset + yOffsetText - 4, shadow = true, @@ -196,7 +196,7 @@ class PokedexScannerRenderer { drawScaledText( context = graphics, font = CobblemonResources.DEFAULT_LARGE, - text = lang("type.suffix", pokedexEntityData.form.secondaryType!!.displayName).bold(), + text = lang("type.suffix", pokedexEntityData.getApparentForm().secondaryType!!.displayName).bold(), x = centerX + xOffset + xOffsetText, y = centerY + yOffset + yOffsetText + 3, shadow = true, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt index e8006802c9..d59b98c87e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt @@ -1583,17 +1583,15 @@ open class PokemonEntity( private fun sidedCodec(): Codec = if (this.level().isClientSide) Pokemon.CLIENT_CODEC else Pokemon.CODEC override fun resolvePokemonScan(): PokedexEntityData? { - return PokemonSpecies.getByIdentifier(this.exposedSpecies.resourceIdentifier)?.let { species -> - PokedexEntityData( - species = species, - form = this.form, - gender = this.pokemon.gender, - aspects = this.aspects, - shiny = this.pokemon.shiny, - level = this.labelLevel(), - ownerUUID = this.ownerUUID - ) - } + return PokedexEntityData( + pokemon = pokemon, + disguise = this.effects.mockEffect?.let { + PokedexEntityData.DisguiseData( + species = it.exposedSpecies ?: pokemon.species, + form = it.exposedForm ?: pokemon.form, + ) + } + ) } override fun resolveEntityScan(): LivingEntity { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/pokedex/scanner/FinishScanningHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/pokedex/scanner/FinishScanningHandler.kt index 2deaee7e10..1b1c49dc5d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/pokedex/scanner/FinishScanningHandler.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/pokedex/scanner/FinishScanningHandler.kt @@ -43,7 +43,7 @@ object FinishScanningHandler : ServerNetworkPacketHandler val scannableEntity = targetEntity as? ScannableEntity ?: return val dex = Cobblemon.playerDataManager.getPokedexData(player) val pokedexEntityData = scannableEntity.resolvePokemonScan() - if(pokedexEntityData != null){ + if (pokedexEntityData != null){ val newInformation = dex.getNewInformation(pokedexEntityData) if ((scannableEntity as? PokemonEntity)?.owner === player) { dex.catch(scannableEntity.pokemon) @@ -52,7 +52,7 @@ object FinishScanningHandler : ServerNetworkPacketHandler } POKEMON_SCANNED.post(PokemonScannedEvent(player, pokedexEntityData, scannableEntity)) - ServerConfirmedRegisterPacket(pokedexEntityData.species.resourceIdentifier, newInformation).sendToPlayer(player) + ServerConfirmedRegisterPacket((pokedexEntityData.getApparentSpecies()).resourceIdentifier, newInformation).sendToPlayer(player) } } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexEntityData.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexEntityData.kt index 180c221e7c..709c23e625 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexEntityData.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexEntityData.kt @@ -9,28 +9,24 @@ package com.cobblemon.mod.common.pokedex.scanner import com.bedrockk.molang.runtime.struct.QueryStruct -import com.bedrockk.molang.runtime.value.DoubleValue import com.bedrockk.molang.runtime.value.StringValue import com.cobblemon.mod.common.pokemon.FormData -import com.cobblemon.mod.common.pokemon.Gender +import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.pokemon.Species -import com.cobblemon.mod.common.util.asArrayValue -import java.util.UUID data class PokedexEntityData( - val species: Species, - val form: FormData, - val gender: Gender, - val aspects: Set, - val shiny: Boolean, - val level: Int, - val ownerUUID: UUID? + val pokemon: Pokemon, + val disguise: DisguiseData? ) { - val struct = QueryStruct(hashMapOf()) - .addFunction("species") { species.struct } - .addFunction("gender") { StringValue(gender.name.lowercase()) } - .addFunction("aspects") { aspects.asArrayValue(::StringValue) } - .addFunction("shiny") { DoubleValue(shiny) } - .addFunction("level") { DoubleValue(level.toDouble()) } - .addFunction("has_owner") { DoubleValue(ownerUUID != null) } + class DisguiseData( + val species: Species, + val form: FormData, + ) { + val struct = QueryStruct(hashMapOf()) + .addFunction("species") { species.struct } + .addFunction("form") { StringValue(form.name) } + } + + fun getApparentSpecies() = disguise?.species ?: pokemon.species + fun getApparentForm() = disguise?.form ?: pokemon.form } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexUsageContext.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexUsageContext.kt index 9dbea76bfa..380228f3d9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexUsageContext.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokedex/scanner/PokedexUsageContext.kt @@ -18,6 +18,9 @@ import com.cobblemon.mod.common.client.pokedex.PokedexType import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.StartScanningPacket +import kotlin.math.max +import kotlin.math.min +import kotlin.random.Random import net.minecraft.client.DeltaTracker import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiGraphics @@ -26,9 +29,6 @@ import net.minecraft.client.resources.sounds.SimpleSoundInstance import net.minecraft.resources.ResourceLocation import net.minecraft.sounds.SoundEvent import net.minecraft.util.Mth.clamp -import kotlin.math.max -import kotlin.math.min -import kotlin.random.Random class PokedexUsageContext { companion object { @@ -85,7 +85,7 @@ class PokedexUsageContext { if (transitionIntervals == TRANSITION_INTERVALS) playSound(CobblemonSounds.POKEDEX_SCAN_CLOSE) transitionIntervals = max(transitionIntervals - updateInterval, 0F) if (transitionIntervals <= 0) { - if (viewInfoTicks >= VIEW_INFO_BUFFER_TICKS) openPokedexGUI(type, scannableEntityInFocus!!.resolvePokemonScan()?.species?.resourceIdentifier) + if (viewInfoTicks >= VIEW_INFO_BUFFER_TICKS) openPokedexGUI(type, scannableEntityInFocus!!.resolvePokemonScan()?.getApparentSpecies()?.resourceIdentifier) resetState() } } @@ -155,7 +155,7 @@ class PokedexUsageContext { } // Check if Pokémon in focus is owned - isPokemonInFocusOwned = CobblemonClient.clientPokedexData.getHighestKnowledgeForSpecies(resolvedPokemon.species.resourceIdentifier) == PokedexEntryProgress.CAUGHT + isPokemonInFocusOwned = CobblemonClient.clientPokedexData.getHighestKnowledgeForSpecies(resolvedPokemon.getApparentSpecies().resourceIdentifier) == PokedexEntryProgress.CAUGHT // Randomize info frames for render if (focusIntervals == 0F) { @@ -170,7 +170,7 @@ class PokedexUsageContext { // Check if Pokémon in focus is new or has new data newPokemonInfo = CobblemonClient.clientPokedexData.getNewInformation(resolvedPokemon) if (newPokemonInfo == PokedexLearnedInformation.NONE) playSound(CobblemonSounds.POKEDEX_SCAN_DETAIL) - else scannedSpecies = resolvedPokemon.species.resourceIdentifier + else scannedSpecies = resolvedPokemon.getApparentSpecies().resourceIdentifier } } else { resetFocusedPokemonState() From 0171ed97479fe54b69cd62cd5db21532cdf7279e Mon Sep 17 00:00:00 2001 From: Wi2tert <1763457574@qq.com> Date: Sat, 18 Jan 2025 21:30:59 +0800 Subject: [PATCH 030/121] add "implemented": true --- .../resources/data/cobblemon/species/generation5/accelgor.json | 1 + .../data/cobblemon/species/generation5/escavalier.json | 1 + .../data/cobblemon/species/generation5/karrablast.json | 3 ++- .../resources/data/cobblemon/species/generation5/shelmet.json | 1 + .../data/cobblemon/species/generation6/barbaracle.json | 1 + .../resources/data/cobblemon/species/generation6/binacle.json | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json b/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json index bdb68611fd..c8832e0a4a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 617, "name": "Accelgor", "primaryType": "bug", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json index cc9d194eb9..33be07336c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 589, "name": "Escavalier", "primaryType": "bug", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json index 307f65b857..99671392a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json @@ -1,6 +1,7 @@ { - "nationalPokedexNumber": 588, + "implemented": true, "name": "Karrablast", + "nationalPokedexNumber": 588, "primaryType": "bug", "maleRatio": 0.5, "height": 5, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json index ece3622f59..c397eafccb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 616, "name": "Shelmet", "primaryType": "bug", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json b/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json index 08bbf10e51..4a5a097cb2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 689, "name": "Barbaracle", "primaryType": "rock", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/binacle.json b/common/src/main/resources/data/cobblemon/species/generation6/binacle.json index cc8981ad61..94ef4e74bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/binacle.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/binacle.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 688, "name": "Binacle", "primaryType": "rock", From 28f2caff58879350ee9c2919147d73c3441874a7 Mon Sep 17 00:00:00 2001 From: Konoha Date: Sat, 18 Jan 2025 10:15:25 -0500 Subject: [PATCH 031/121] "Permanent" evo tag implementation. It was new, sorry! Incorporates the "permanent" evo tag onto scraper gen, resolving an issue with the 3 species that required it aside from Milcery and fixing an oversight where Milcery's evos would be cut off. Alcremie evolutions now work "as intended" and no longer require 1 sweet per cream, but rather 1 sweet being consumed for the "under 5 seconds" spin and an additional sweet consumed for the "over 5 seconds" spin. Any more than two sweets was excessive. --- .../cobblemon/species/generation2/gligar.json | 3 +- .../cobblemon/species/generation2/pineco.json | 23 +++ .../species/generation2/sneasel.json | 6 +- .../cobblemon/species/generation4/grotle.json | 10 + .../species/generation4/happiny.json | 3 +- .../species/generation8/milcery.json | 176 +++++++++++++++--- 6 files changed, 189 insertions(+), 32 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json index 9383ed1c78..e5f2ca5258 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json @@ -209,7 +209,8 @@ "variant": "time_range", "range": "night" } - ] + ], + "permanent": true } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json index 47fba62bd5..3d85e46fad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json @@ -173,6 +173,29 @@ "minLevel": 31 } ] + }, + { + "id": "pineco_forretressshulker", + "variant": "level_up", + "result": "forretress shulker", + "consumeHeldItem": true, + "permanent": true, + "learnableMoves": [ + "mirrorshot", + "autotomize", + "heavyslam" + ], + "requirements": [ + { + "variant": "level", + "minLevel": 31 + }, + { + "variant": "held_item", + "itemCondition": "minecraft:shulker_shell" + } + ] } + ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json index 1b8970f106..e45dea9ce5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json @@ -208,7 +208,8 @@ "variant": "time_range", "range": "night" } - ] + ], + "permanent": true } ], "forms": [ @@ -388,7 +389,8 @@ "variant": "time_range", "range": "day" } - ] + ], + "permanent": true } ], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json index cbe039d59e..c3b098b0e2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json @@ -184,6 +184,7 @@ "variant": "level_up", "result": "torterra tree=oak", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -203,6 +204,7 @@ "variant": "level_up", "result": "torterra tree=swamp", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -226,6 +228,7 @@ "variant": "level_up", "result": "torterra tree=birch", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -245,6 +248,7 @@ "variant": "level_up", "result": "torterra tree=darkoak", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -264,6 +268,7 @@ "variant": "level_up", "result": "torterra tree=acacia", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -283,6 +288,7 @@ "variant": "level_up", "result": "torterra tree=azalea", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -302,6 +308,7 @@ "variant": "level_up", "result": "torterra tree=jungle", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -321,6 +328,7 @@ "variant": "level_up", "result": "torterra tree=spruce", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -340,6 +348,7 @@ "variant": "level_up", "result": "torterra tree=mangrove", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -359,6 +368,7 @@ "variant": "level_up", "result": "torterra tree=cherry", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], diff --git a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json index 11c0d2d612..2bf314266b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json @@ -159,7 +159,8 @@ "variant": "time_range", "range": "day" } - ] + ], + "permanent": true } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json index 220fab0d2d..d26af4cfd1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json @@ -110,7 +110,7 @@ "id": "milcery_alcremiestrawberryvanillacream", "variant": "level_up", "result": "alcremie decoration=strawberry cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -130,7 +130,7 @@ "id": "milcery_alcremielovevanillacream", "variant": "level_up", "result": "alcremie decoration=love cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -150,7 +150,7 @@ "id": "milcery_alcremieberryvanillacream", "variant": "level_up", "result": "alcremie decoration=berry cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -170,7 +170,7 @@ "id": "milcery_alcremieclovervanillacream", "variant": "level_up", "result": "alcremie decoration=clover cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -190,7 +190,7 @@ "id": "milcery_alcremieflowervanillacream", "variant": "level_up", "result": "alcremie decoration=flower cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -210,7 +210,7 @@ "id": "milcery_alcremiestarvanillacream", "variant": "level_up", "result": "alcremie decoration=star cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -230,7 +230,7 @@ "id": "milcery_alcremieribbonvanillacream", "variant": "level_up", "result": "alcremie decoration=ribbon cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -390,7 +390,7 @@ "id": "milcery_alcremiestrawberrymatchacream", "variant": "level_up", "result": "alcremie decoration=strawberry cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -410,7 +410,7 @@ "id": "milcery_alcremielovematchacream", "variant": "level_up", "result": "alcremie decoration=love cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -430,7 +430,7 @@ "id": "milcery_alcremieberrymatchacream", "variant": "level_up", "result": "alcremie decoration=berry cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -450,7 +450,7 @@ "id": "milcery_alcremieclovermatchacream", "variant": "level_up", "result": "alcremie decoration=clover cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -470,7 +470,7 @@ "id": "milcery_alcremieflowermatchacream", "variant": "level_up", "result": "alcremie decoration=flower cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -490,7 +490,7 @@ "id": "milcery_alcremiestarmatchacream", "variant": "level_up", "result": "alcremie decoration=star cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -510,7 +510,7 @@ "id": "milcery_alcremieribbonmatchacream", "variant": "level_up", "result": "alcremie decoration=ribbon cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -670,7 +670,7 @@ "id": "milcery_alcremiestrawberrylemoncream", "variant": "level_up", "result": "alcremie decoration=strawberry cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -690,7 +690,7 @@ "id": "milcery_alcremielovelemoncream", "variant": "level_up", "result": "alcremie decoration=love cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -710,7 +710,7 @@ "id": "milcery_alcremieberrylemoncream", "variant": "level_up", "result": "alcremie decoration=berry cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -730,7 +730,7 @@ "id": "milcery_alcremiecloverlemoncream", "variant": "level_up", "result": "alcremie decoration=clover cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -750,7 +750,7 @@ "id": "milcery_alcremieflowerlemoncream", "variant": "level_up", "result": "alcremie decoration=flower cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -770,7 +770,7 @@ "id": "milcery_alcremiestarlemoncream", "variant": "level_up", "result": "alcremie decoration=star cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -790,7 +790,7 @@ "id": "milcery_alcremieribbonlemoncream", "variant": "level_up", "result": "alcremie decoration=ribbon cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -950,7 +950,7 @@ "id": "milcery_alcremiestrawberryrubyswirl", "variant": "level_up", "result": "alcremie decoration=strawberry cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -970,7 +970,7 @@ "id": "milcery_alcremieloverubyswirl", "variant": "level_up", "result": "alcremie decoration=love cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -990,7 +990,7 @@ "id": "milcery_alcremieberryrubyswirl", "variant": "level_up", "result": "alcremie decoration=berry cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1010,7 +1010,7 @@ "id": "milcery_alcremiecloverrubyswirl", "variant": "level_up", "result": "alcremie decoration=clover cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1030,7 +1030,7 @@ "id": "milcery_alcremieflowerrubyswirl", "variant": "level_up", "result": "alcremie decoration=flower cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1050,7 +1050,7 @@ "id": "milcery_alcremiestarrubyswirl", "variant": "level_up", "result": "alcremie decoration=star cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1070,7 +1070,7 @@ "id": "milcery_alcremieribbonrubyswirl", "variant": "level_up", "result": "alcremie decoration=ribbon cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1226,6 +1226,126 @@ ], "permanent": true }, + { + "id": "milcery_alcremiestrawberryrainbowswirl", + "variant": "level_up", + "result": "alcremie decoration=strawberry cream=rainbow_swirl", + "consumeHeldItem": true, + "learnableMoves": [ + "decorate" + ], + "requirements": [ + { + "variant": "held_item", + "itemCondition": "cobblemon:strawberry_sweet" + }, + { + "variant": "time_range", + "range": "dusk" + } + ], + "permanent": true + }, + { + "id": "milcery_alcremieloverainbowswirl", + "variant": "level_up", + "result": "alcremie decoration=love cream=rainbow_swirl", + "consumeHeldItem": true, + "learnableMoves": [ + "decorate" + ], + "requirements": [ + { + "variant": "held_item", + "itemCondition": "cobblemon:love_sweet" + }, + { + "variant": "time_range", + "range": "dusk" + } + ], + "permanent": true + }, + { + "id": "milcery_alcremieberryrainbowswirl", + "variant": "level_up", + "result": "alcremie decoration=berry cream=rainbow_swirl", + "consumeHeldItem": true, + "learnableMoves": [ + "decorate" + ], + "requirements": [ + { + "variant": "held_item", + "itemCondition": "cobblemon:berry_sweet" + }, + { + "variant": "time_range", + "range": "dusk" + } + ], + "permanent": true + }, + { + "id": "milcery_alcremiecloverrainbowswirl", + "variant": "level_up", + "result": "alcremie decoration=clover cream=rainbow_swirl", + "consumeHeldItem": true, + "learnableMoves": [ + "decorate" + ], + "requirements": [ + { + "variant": "held_item", + "itemCondition": "cobblemon:clover_sweet" + }, + { + "variant": "time_range", + "range": "dusk" + } + ], + "permanent": true + }, + { + "id": "milcery_alcremieflowerrainbowswirl", + "variant": "level_up", + "result": "alcremie decoration=flower cream=rainbow_swirl", + "consumeHeldItem": true, + "learnableMoves": [ + "decorate" + ], + "requirements": [ + { + "variant": "held_item", + "itemCondition": "cobblemon:flower_sweet" + }, + { + "variant": "time_range", + "range": "dusk" + } + ], + "permanent": true + }, + { + "id": "milcery_alcremiestarrainbowswirl", + "variant": "level_up", + "result": "alcremie decoration=star cream=rainbow_swirl", + "consumeHeldItem": true, + "learnableMoves": [ + "decorate" + ], + "requirements": [ + { + "variant": "held_item", + "itemCondition": "cobblemon:star_sweet" + }, + { + "variant": "time_range", + "range": "dusk" + } + ], + "permanent": true + }, { "id": "milcery_alcremieribbonrainbowswirl", "variant": "level_up", From b7926a70ab1300daba85090ca669ac6f512b2e36 Mon Sep 17 00:00:00 2001 From: Konoha Date: Sat, 18 Jan 2025 10:17:22 -0500 Subject: [PATCH 032/121] "Permanent" evo tag implementation. It was new, sorry! Incorporates the "permanent" evo tag onto scraper gen, resolving an issue with the 3 species that required it aside from Milcery and fixing an oversight where Milcery's evos would be cut off. Alcremie evolutions now work "as intended" and no longer require 1 sweet per cream, but rather 1 sweet being consumed for the "under 5 seconds" spin and an additional sweet consumed for the "over 5 seconds" spin. Any more than two sweets was excessive. --- .../resources/data/cobblemon/species/generation2/pineco.json | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json index 3d85e46fad..6a58320624 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json @@ -196,6 +196,5 @@ } ] } - ] } \ No newline at end of file From 175aa932840773ea00f0ad008547bf7f93208f30 Mon Sep 17 00:00:00 2001 From: Konoha Date: Sat, 18 Jan 2025 11:32:55 -0500 Subject: [PATCH 033/121] Last of implemented form corrections. Resolves the base form of Shellos and Gastrodon to "West Sea," solving an issue where the dex would default to "East Sea" when the entry was given via command, locking the player out of viewing the West Sea. Fixes an oversight where "Season" was parsed as "Sea" on Deerling and Sawsbuck's form aspects. --- .../0422_shellos/0_shellos_base.json | 19 ++++--------------- ..._shellos_west.json => 1_shellos_east.json} | 12 ++++++------ .../0423_gastrodon/0_gastrodon_base.json | 19 ++++--------------- ...trodon_west.json => 1_gastrodon_east.json} | 12 ++++++------ .../species/generation5/deerling.json | 8 ++++---- .../species/generation5/sawsbuck.json | 8 ++++---- 6 files changed, 28 insertions(+), 50 deletions(-) rename common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/{1_shellos_west.json => 1_shellos_east.json} (56%) rename common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/{1_gastrodon_west.json => 1_gastrodon_east.json} (55%) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/0_shellos_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/0_shellos_base.json index 09924ccea9..6d142da4f1 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/0_shellos_base.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/0_shellos_base.json @@ -4,25 +4,14 @@ "variations": [ { "aspects": [], - "poser": "cobblemon:shellos_east", - "model": "cobblemon:shellos_east.geo", - "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_east.png", + "poser": "cobblemon:shellos_west", + "model": "cobblemon:shellos_west.geo", + "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_west.png", "layers": [] }, { "aspects": ["shiny"], - "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_east_shiny.png" - }, - { - "aspects": ["east-sea"], - "poser": "cobblemon:shellos_east", - "model": "cobblemon:shellos_east.geo", - "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_east.png", - "layers": [] - }, - { - "aspects": ["shiny", "east-sea"], - "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_east_shiny.png" + "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_west_shiny.png" }, { "aspects": ["west-sea"], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/1_shellos_west.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/1_shellos_east.json similarity index 56% rename from common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/1_shellos_west.json rename to common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/1_shellos_east.json index 7730f7a616..dc6bc30aa3 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/1_shellos_west.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0422_shellos/1_shellos_east.json @@ -3,15 +3,15 @@ "order": 1, "variations": [ { - "aspects": ["west"], - "poser": "cobblemon:shellos_west", - "model": "cobblemon:shellos_west.geo", - "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_west.png", + "aspects": ["east-sea"], + "poser": "cobblemon:shellos_east", + "model": "cobblemon:shellos_east.geo", + "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_east.png", "layers": [] }, { - "aspects": ["west", "shiny"], - "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_west_shiny.png" + "aspects": ["shiny", "east-sea"], + "texture": "cobblemon:textures/pokemon/0422_shellos/shellos_east_shiny.png" } ] } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/0_gastrodon_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/0_gastrodon_base.json index 46be75fe17..c10deb1392 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/0_gastrodon_base.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/0_gastrodon_base.json @@ -4,25 +4,14 @@ "variations": [ { "aspects": [], - "poser": "cobblemon:gastrodon_east", - "model": "cobblemon:gastrodon_east.geo", - "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_east.png", + "poser": "cobblemon:gastrodon_west", + "model": "cobblemon:gastrodon_west.geo", + "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_west.png", "layers": [] }, { "aspects": ["shiny"], - "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_east_shiny.png" - }, - { - "aspects": ["east-sea"], - "poser": "cobblemon:gastrodon_east", - "model": "cobblemon:gastrodon_east.geo", - "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_east.png", - "layers": [] - }, - { - "aspects": ["shiny", "east-sea"], - "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_east_shiny.png" + "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_west_shiny.png" }, { "aspects": ["west-sea"], diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/1_gastrodon_west.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/1_gastrodon_east.json similarity index 55% rename from common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/1_gastrodon_west.json rename to common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/1_gastrodon_east.json index afc4692a1f..7135358740 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/1_gastrodon_west.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0423_gastrodon/1_gastrodon_east.json @@ -3,15 +3,15 @@ "order": 1, "variations": [ { - "aspects": ["west"], - "poser": "cobblemon:gastrodon_west", - "model": "cobblemon:gastrodon_west.geo", - "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_west.png", + "aspects": ["east-sea"], + "poser": "cobblemon:gastrodon_east", + "model": "cobblemon:gastrodon_east.geo", + "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_east.png", "layers": [] }, { - "aspects": ["west", "shiny"], - "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_west_shiny.png" + "aspects": ["shiny", "east-sea"], + "texture": "cobblemon:textures/pokemon/0423_gastrodon/gastrodon_east_shiny.png" } ] } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json index a2a3bfd546..29fb4c2ce6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json @@ -14,7 +14,7 @@ "gen5" ], "aspects": [ - "on-spring-sea" + "spring" ], "abilities": [ "chlorophyll", @@ -185,7 +185,7 @@ "gen5" ], "aspects": [ - "on-summer-sea" + "summer" ], "abilities": [ "chlorophyll", @@ -334,7 +334,7 @@ "gen5" ], "aspects": [ - "on-autumn-sea" + "autumn" ], "abilities": [ "chlorophyll", @@ -483,7 +483,7 @@ "gen5" ], "aspects": [ - "on-winter-sea" + "winter" ], "abilities": [ "chlorophyll", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json index 1acebd6b57..870f5856fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json @@ -14,7 +14,7 @@ "gen5" ], "aspects": [ - "on-spring-sea" + "spring" ], "abilities": [ "chlorophyll", @@ -188,7 +188,7 @@ "gen5" ], "aspects": [ - "on-summer-sea" + "summer" ], "abilities": [ "chlorophyll", @@ -340,7 +340,7 @@ "gen5" ], "aspects": [ - "on-autumn-sea" + "autumn" ], "abilities": [ "chlorophyll", @@ -492,7 +492,7 @@ "gen5" ], "aspects": [ - "on-winter-sea" + "winter" ], "abilities": [ "chlorophyll", From f5e1dfe0803a85dc272da65d9b4e9f775a925def Mon Sep 17 00:00:00 2001 From: Konoha Date: Sat, 18 Jan 2025 15:01:39 -0500 Subject: [PATCH 034/121] Toxel Pre-Implementation Evo Corrects the feature requirement on the newly generated Toxel evolution. --- .../cobblemon/species/generation8/toxel.json | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json b/common/src/main/resources/data/cobblemon/species/generation8/toxel.json index 358c505a98..82951741b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/toxel.json @@ -101,7 +101,7 @@ }, { "variant": "properties", - "target": "nature=hardy" + "target": "toxel nature=hardy" } ] }, @@ -118,7 +118,7 @@ }, { "variant": "properties", - "target": "nature=brave" + "target": "toxel nature=brave" } ] }, @@ -135,7 +135,7 @@ }, { "variant": "properties", - "target": "nature=adamant" + "target": "toxel nature=adamant" } ] }, @@ -152,7 +152,7 @@ }, { "variant": "properties", - "target": "nature=naughty" + "target": "toxel nature=naughty" } ] }, @@ -169,7 +169,7 @@ }, { "variant": "properties", - "target": "nature=docile" + "target": "toxel nature=docile" } ] }, @@ -186,7 +186,7 @@ }, { "variant": "properties", - "target": "nature=impish" + "target": "toxel nature=impish" } ] }, @@ -203,7 +203,7 @@ }, { "variant": "properties", - "target": "nature=lax" + "target": "toxel nature=lax" } ] }, @@ -220,7 +220,7 @@ }, { "variant": "properties", - "target": "nature=hasty" + "target": "toxel nature=hasty" } ] }, @@ -237,7 +237,7 @@ }, { "variant": "properties", - "target": "nature=jolly" + "target": "toxel nature=jolly" } ] }, @@ -254,7 +254,7 @@ }, { "variant": "properties", - "target": "nature=naive" + "target": "toxel nature=naive" } ] }, @@ -271,7 +271,7 @@ }, { "variant": "properties", - "target": "nature=rash" + "target": "toxel nature=rash" } ] }, @@ -288,7 +288,7 @@ }, { "variant": "properties", - "target": "nature=sassy" + "target": "toxel nature=sassy" } ] }, @@ -307,7 +307,7 @@ }, { "variant": "properties", - "target": "nature=quirky" + "target": "toxel nature=quirky" } ] }, @@ -324,7 +324,7 @@ }, { "variant": "properties", - "target": "nature=lonely" + "target": "toxel nature=lonely" } ] }, @@ -341,7 +341,7 @@ }, { "variant": "properties", - "target": "nature=bold" + "target": "toxel nature=bold" } ] }, @@ -358,7 +358,7 @@ }, { "variant": "properties", - "target": "nature=relaxed" + "target": "toxel nature=relaxed" } ] }, @@ -375,7 +375,7 @@ }, { "variant": "properties", - "target": "nature=timid" + "target": "toxel nature=timid" } ] }, @@ -392,7 +392,7 @@ }, { "variant": "properties", - "target": "nature=serious" + "target": "toxel nature=serious" } ] }, @@ -409,7 +409,7 @@ }, { "variant": "properties", - "target": "nature=modest" + "target": "toxel nature=modest" } ] }, @@ -426,7 +426,7 @@ }, { "variant": "properties", - "target": "nature=mild" + "target": "toxel nature=mild" } ] }, @@ -443,7 +443,7 @@ }, { "variant": "properties", - "target": "nature=quiet" + "target": "toxel nature=quiet" } ] }, @@ -460,7 +460,7 @@ }, { "variant": "properties", - "target": "nature=bashful" + "target": "toxel nature=bashful" } ] }, @@ -477,7 +477,7 @@ }, { "variant": "properties", - "target": "nature=calm" + "target": "toxel nature=calm" } ] }, @@ -494,7 +494,7 @@ }, { "variant": "properties", - "target": "nature=gentle" + "target": "toxel nature=gentle" } ] }, @@ -513,7 +513,7 @@ }, { "variant": "properties", - "target": "nature=careful" + "target": "toxel nature=careful" } ] } From ab9a66c5560dbb9f01b4ae2af2e9a1f6376c7bfb Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Sat, 18 Jan 2025 22:19:09 +0100 Subject: [PATCH 035/121] Fixed female Seaking's model --- .../0119_seaking/seaking_female.geo.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0119_seaking/seaking_female.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0119_seaking/seaking_female.geo.json index 4cf42a7c36..6f08f9932b 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0119_seaking/seaking_female.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0119_seaking/seaking_female.geo.json @@ -21,9 +21,18 @@ "pivot": [0, 10.5, 0] }, { - "name": "head", + "name": "torso", "parent": "body", "pivot": [0, 10.5, -13], + "cubes": [ + {"origin": [-7.5, 0, -13], "size": [15, 21, 17], "uv": [0, 0]}, + {"origin": [0, 19, -10], "size": [0, 9, 17], "uv": [0, 57]} + ] + }, + { + "name": "head", + "parent": "torso", + "pivot": [0, 10.5, -13], "cubes": [ {"origin": [-6.5, 2, -16], "size": [13, 17, 5], "uv": [64, 0]} ] @@ -65,15 +74,6 @@ {"origin": [-1, 16.25, -21.75], "size": [2, 2, 3], "uv": [80, 67]} ] }, - { - "name": "torso", - "parent": "body", - "pivot": [0, 10.5, -13], - "cubes": [ - {"origin": [-7.5, 0, -13], "size": [15, 21, 17], "uv": [0, 0]}, - {"origin": [0, 19, -10], "size": [0, 9, 17], "uv": [0, 57]} - ] - }, { "name": "eyes", "parent": "torso", @@ -186,7 +186,7 @@ { "name": "tail", "parent": "torso_end", - "pivot": [0, 10.5, 4] + "pivot": [0, 8, 10] }, { "name": "tail_back_right1", From db70a0f816ae2925f0938e286f12a2c71fbba232 Mon Sep 17 00:00:00 2001 From: Konoha Date: Sat, 18 Jan 2025 16:21:21 -0500 Subject: [PATCH 036/121] Duplicate Key Culling & Inheritance Cuts down on file size by culling duplicate species data keys. Inherits the necessary implementation keys if only a selection of differences are present. Removes empty behaviour keys. --- .../species/generation1/aerodactyl.json | 117 - .../species/generation1/alakazam.json | 124 - .../species/generation1/arcanine.json | 19 - .../species/generation1/articuno.json | 8 - .../species/generation1/beedrill.json | 99 - .../species/generation1/blastoise.json | 311 -- .../species/generation1/butterfree.json | 111 - .../species/generation1/charizard.json | 469 --- .../cobblemon/species/generation1/cubone.json | 132 - .../species/generation1/diglett.json | 17 - .../species/generation1/dugtrio.json | 10 - .../cobblemon/species/generation1/eevee.json | 118 - .../species/generation1/electrode.json | 38 - .../species/generation1/exeggcute.json | 118 - .../species/generation1/exeggutor.json | 18 - .../species/generation1/farfetchd.json | 20 +- .../species/generation1/flareon.json | 1 - .../cobblemon/species/generation1/gengar.json | 309 -- .../species/generation1/geodude.json | 32 - .../cobblemon/species/generation1/golem.json | 33 - .../species/generation1/graveler.json | 33 - .../cobblemon/species/generation1/grimer.json | 31 - .../species/generation1/growlithe.json | 17 - .../species/generation1/gyarados.json | 124 +- .../species/generation1/jolteon.json | 1 - .../cobblemon/species/generation1/jynx.json | 1 - .../species/generation1/kadabra.json | 1 - .../species/generation1/kangaskhan.json | 146 - .../species/generation1/kingler.json | 137 +- .../species/generation1/koffing.json | 115 - .../cobblemon/species/generation1/lapras.json | 155 +- .../species/generation1/machamp.json | 150 - .../species/generation1/machoke.json | 1 - .../cobblemon/species/generation1/machop.json | 1 - .../cobblemon/species/generation1/magmar.json | 1 - .../species/generation1/marowak.json | 25 - .../cobblemon/species/generation1/meowth.json | 175 +- .../cobblemon/species/generation1/mewtwo.json | 354 -- .../species/generation1/moltres.json | 8 - .../cobblemon/species/generation1/mrmime.json | 10 - .../cobblemon/species/generation1/muk.json | 32 - .../species/generation1/ninetales.json | 10 - .../species/generation1/persian.json | 18 - .../species/generation1/pidgeot.json | 80 - .../species/generation1/pikachu.json | 329 +- .../cobblemon/species/generation1/pinsir.json | 106 - .../cobblemon/species/generation1/ponyta.json | 25 - .../cobblemon/species/generation1/raichu.json | 26 +- .../species/generation1/rapidash.json | 35 - .../species/generation1/raticate.json | 18 - .../species/generation1/rattata.json | 25 - .../species/generation1/sandshrew.json | 17 - .../species/generation1/sandslash.json | 18 - .../species/generation1/slowbro.json | 181 +- .../species/generation1/slowpoke.json | 39 +- .../species/generation1/snorlax.json | 180 - .../species/generation1/tangela.json | 1 - .../cobblemon/species/generation1/tauros.json | 32 +- .../species/generation1/venusaur.json | 255 -- .../species/generation1/voltorb.json | 37 - .../cobblemon/species/generation1/vulpix.json | 25 - .../species/generation1/weezing.json | 25 - .../cobblemon/species/generation1/zapdos.json | 8 - .../species/generation2/ampharos.json | 140 +- .../species/generation2/ariados.json | 1 - .../species/generation2/bellossom.json | 1 - .../cobblemon/species/generation2/celebi.json | 1 - .../cobblemon/species/generation2/cleffa.json | 1 - .../species/generation2/corsola.json | 13 +- .../species/generation2/cyndaquil.json | 116 - .../species/generation2/dunsparce.json | 1 - .../cobblemon/species/generation2/entei.json | 1 - .../cobblemon/species/generation2/espeon.json | 1 - .../cobblemon/species/generation2/furret.json | 1 - .../species/generation2/girafarig.json | 1 - .../cobblemon/species/generation2/gligar.json | 1 - .../species/generation2/heracross.json | 126 - .../cobblemon/species/generation2/hooh.json | 1 - .../cobblemon/species/generation2/hoppip.json | 1 - .../species/generation2/houndoom.json | 131 - .../species/generation2/houndour.json | 1 - .../species/generation2/igglybuff.json | 1 - .../species/generation2/jumpluff.json | 1 - .../cobblemon/species/generation2/lugia.json | 1 - .../cobblemon/species/generation2/magby.json | 1 - .../species/generation2/misdreavus.json | 1 - .../cobblemon/species/generation2/pichu.json | 110 - .../species/generation2/quilava.json | 121 - .../species/generation2/qwilfish.json | 46 - .../cobblemon/species/generation2/raikou.json | 1 - .../cobblemon/species/generation2/scizor.json | 127 - .../species/generation2/sentret.json | 1 - .../species/generation2/skiploom.json | 1 - .../species/generation2/slowking.json | 26 +- .../species/generation2/smoochum.json | 1 - .../species/generation2/sneasel.json | 37 - .../species/generation2/spinarak.json | 1 - .../species/generation2/steelix.json | 148 - .../species/generation2/suicune.json | 1 - .../cobblemon/species/generation2/togepi.json | 1 - .../species/generation2/togetic.json | 1 - .../species/generation2/typhlosion.json | 22 - .../species/generation2/tyranitar.json | 170 - .../species/generation2/umbreon.json | 1 - .../cobblemon/species/generation2/unown.json | 871 ----- .../species/generation2/ursaring.json | 1 - .../cobblemon/species/generation2/wooper.json | 35 - .../cobblemon/species/generation3/absol.json | 146 - .../cobblemon/species/generation3/aggron.json | 151 - .../species/generation3/altaria.json | 138 - .../species/generation3/azurill.json | 1 - .../species/generation3/banette.json | 123 - .../species/generation3/beautifly.json | 1 - .../species/generation3/blaziken.json | 162 - .../species/generation3/camerupt.json | 138 - .../species/generation3/castform.json | 306 -- .../species/generation3/combusken.json | 1 - .../species/generation3/delcatty.json | 1 - .../cobblemon/species/generation3/deoxys.json | 40 - .../cobblemon/species/generation3/dustox.json | 1 - .../species/generation3/electrike.json | 1 - .../species/generation3/exploud.json | 1 - .../species/generation3/gardevoir.json | 157 +- .../cobblemon/species/generation3/glalie.json | 111 - .../species/generation3/groudon.json | 120 - .../species/generation3/grumpig.json | 1 - .../species/generation3/hariyama.json | 1 - .../species/generation3/jirachi.json | 1 - .../cobblemon/species/generation3/kyogre.json | 88 - .../cobblemon/species/generation3/latias.json | 150 - .../cobblemon/species/generation3/latios.json | 143 - .../species/generation3/linoone.json | 31 - .../species/generation3/loudred.json | 1 - .../species/generation3/makuhita.json | 1 - .../species/generation3/manectric.json | 99 - .../cobblemon/species/generation3/mawile.json | 138 - .../species/generation3/medicham.json | 155 - .../species/generation3/meditite.json | 1 - .../species/generation3/metagross.json | 133 - .../cobblemon/species/generation3/minun.json | 1 - .../species/generation3/nuzleaf.json | 1 - .../cobblemon/species/generation3/plusle.json | 1 - .../species/generation3/poochyena.json | 1 - .../species/generation3/rayquaza.json | 121 - .../cobblemon/species/generation3/regice.json | 1 - .../species/generation3/regirock.json | 1 - .../species/generation3/registeel.json | 1 - .../species/generation3/sableye.json | 164 - .../species/generation3/salamence.json | 128 - .../species/generation3/sceptile.json | 167 - .../cobblemon/species/generation3/seedot.json | 1 - .../species/generation3/seviper.json | 1 - .../species/generation3/sharpedo.json | 119 +- .../species/generation3/shiftry.json | 1 - .../species/generation3/shuppet.json | 1 - .../cobblemon/species/generation3/skitty.json | 1 - .../species/generation3/snorunt.json | 1 - .../cobblemon/species/generation3/spoink.json | 1 - .../cobblemon/species/generation3/swablu.json | 1 - .../cobblemon/species/generation3/swalot.json | 1 - .../species/generation3/swampert.json | 167 - .../species/generation3/torchic.json | 1 - .../species/generation3/tropius.json | 1 - .../species/generation3/whismur.json | 1 - .../species/generation3/wurmple.json | 1 - .../cobblemon/species/generation3/wynaut.json | 1 - .../species/generation3/zangoose.json | 1 - .../species/generation3/zigzagoon.json | 36 - .../species/generation4/abomasnow.json | 127 - .../cobblemon/species/generation4/arceus.json | 3119 ----------------- .../cobblemon/species/generation4/azelf.json | 1 - .../cobblemon/species/generation4/burmy.json | 77 - .../species/generation4/cherrim.json | 31 - .../species/generation4/cherubi.json | 1 - .../species/generation4/cresselia.json | 1 - .../species/generation4/darkrai.json | 1 - .../cobblemon/species/generation4/dialga.json | 22 - .../species/generation4/electivire.json | 1 - .../species/generation4/froslass.json | 1 - .../species/generation4/gallade.json | 204 +- .../species/generation4/garchomp.json | 122 - .../species/generation4/gastrodon.json | 135 - .../species/generation4/giratina.json | 18 - .../species/generation4/glaceon.json | 1 - .../species/generation4/glameow.json | 1 - .../species/generation4/gliscor.json | 1 - .../species/generation4/heatran.json | 1 - .../species/generation4/leafeon.json | 1 - .../species/generation4/lopunny.json | 157 - .../species/generation4/lucario.json | 166 - .../cobblemon/species/generation4/luxray.json | 1 - .../species/generation4/magmortar.json | 1 - .../species/generation4/mesprit.json | 1 - .../cobblemon/species/generation4/mimejr.json | 138 - .../species/generation4/mismagius.json | 1 - .../cobblemon/species/generation4/mothim.json | 1 - .../species/generation4/pachirisu.json | 1 - .../cobblemon/species/generation4/palkia.json | 22 - .../species/generation4/purugly.json | 1 - .../species/generation4/regigigas.json | 1 - .../cobblemon/species/generation4/riolu.json | 1 - .../cobblemon/species/generation4/rotom.json | 101 - .../species/generation4/shaymin.json | 10 - .../species/generation4/shellos.json | 119 - .../cobblemon/species/generation4/shinx.json | 1 - .../species/generation4/skuntank.json | 1 - .../cobblemon/species/generation4/snover.json | 1 - .../species/generation4/spiritomb.json | 1 - .../cobblemon/species/generation4/stunky.json | 1 - .../species/generation4/tangrowth.json | 1 - .../species/generation4/togekiss.json | 1 - .../species/generation4/toxicroak.json | 1 - .../cobblemon/species/generation4/uxie.json | 1 - .../species/generation4/weavile.json | 1 - .../species/generation4/wormadam.json | 27 - .../species/generation5/accelgor.json | 1 - .../cobblemon/species/generation5/audino.json | 145 - .../species/generation5/basculin.json | 132 - .../species/generation5/bisharp.json | 1 - .../species/generation5/blitzle.json | 1 - .../species/generation5/bouffalant.json | 1 - .../species/generation5/braviary.json | 9 - .../species/generation5/cinccino.json | 1 - .../species/generation5/cobalion.json | 1 - .../species/generation5/crustle.json | 1 - .../species/generation5/darmanitan.json | 51 +- .../species/generation5/darumaka.json | 29 - .../species/generation5/deerling.json | 343 -- .../cobblemon/species/generation5/deino.json | 1 - .../cobblemon/species/generation5/dewott.json | 122 - .../species/generation5/drilbur.json | 1 - .../species/generation5/duosion.json | 1 - .../cobblemon/species/generation5/durant.json | 1 - .../species/generation5/dwebble.json | 1 - .../species/generation5/escavalier.json | 1 - .../species/generation5/excadrill.json | 1 - .../species/generation5/garbodor.json | 128 - .../species/generation5/genesect.json | 473 --- .../species/generation5/gothita.json | 1 - .../species/generation5/gothitelle.json | 1 - .../species/generation5/gothorita.json | 1 - .../species/generation5/herdier.json | 1 - .../cobblemon/species/generation5/joltik.json | 1 - .../species/generation5/karrablast.json | 1 - .../cobblemon/species/generation5/keldeo.json | 117 - .../cobblemon/species/generation5/kyurem.json | 17 - .../species/generation5/landorus.json | 98 - .../species/generation5/larvesta.json | 1 - .../species/generation5/leavanny.json | 1 - .../species/generation5/liepard.json | 1 - .../species/generation5/lilligant.json | 10 - .../species/generation5/lillipup.json | 1 - .../species/generation5/mandibuzz.json | 1 - .../species/generation5/maractus.json | 1 - .../species/generation5/meloetta.json | 127 - .../species/generation5/mienfoo.json | 1 - .../species/generation5/mienshao.json | 1 - .../species/generation5/minccino.json | 1 - .../cobblemon/species/generation5/munna.json | 1 - .../species/generation5/musharna.json | 1 - .../species/generation5/oshawott.json | 120 - .../species/generation5/panpour.json | 1 - .../species/generation5/pansage.json | 1 - .../species/generation5/pansear.json | 1 - .../species/generation5/pawniard.json | 1 - .../species/generation5/petilil.json | 103 - .../species/generation5/purrloin.json | 1 - .../species/generation5/reshiram.json | 1 - .../species/generation5/reuniclus.json | 1 - .../species/generation5/rufflet.json | 104 - .../species/generation5/samurott.json | 24 - .../cobblemon/species/generation5/sawk.json | 1 - .../species/generation5/sawsbuck.json | 397 --- .../species/generation5/scrafty.json | 1 - .../species/generation5/scraggy.json | 1 - .../species/generation5/sewaddle.json | 1 - .../species/generation5/shelmet.json | 1 - .../species/generation5/simipour.json | 1 - .../species/generation5/simisage.json | 1 - .../species/generation5/simisear.json | 1 - .../species/generation5/solosis.json | 1 - .../species/generation5/stoutland.json | 1 - .../species/generation5/stunfisk.json | 26 - .../species/generation5/swadloon.json | 1 - .../species/generation5/terrakion.json | 1 - .../cobblemon/species/generation5/throh.json | 1 - .../species/generation5/thundurus.json | 110 - .../species/generation5/tornadus.json | 100 - .../species/generation5/victini.json | 1 - .../species/generation5/virizion.json | 1 - .../species/generation5/vullaby.json | 1 - .../cobblemon/species/generation5/yamask.json | 18 - .../species/generation5/zebstrika.json | 1 - .../cobblemon/species/generation5/zekrom.json | 1 - .../species/generation5/zoroark.json | 23 - .../cobblemon/species/generation5/zorua.json | 23 - .../species/generation5/zweilous.json | 1 - .../species/generation6/aegislash.json | 20 - .../species/generation6/aromatisse.json | 1 - .../species/generation6/avalugg.json | 18 - .../species/generation6/bergmite.json | 101 - .../species/generation6/carbink.json | 1 - .../species/generation6/dedenne.json | 1 - .../species/generation6/diancie.json | 116 - .../cobblemon/species/generation6/espurr.json | 1 - .../species/generation6/flabebe.json | 432 --- .../species/generation6/floette.json | 547 +-- .../species/generation6/florges.json | 484 --- .../species/generation6/furfrou.json | 865 ----- .../cobblemon/species/generation6/gogoat.json | 1 - .../cobblemon/species/generation6/goodra.json | 19 - .../cobblemon/species/generation6/goomy.json | 86 - .../species/generation6/gourgeist.json | 345 -- .../species/generation6/greninja.json | 161 +- .../species/generation6/hawlucha.json | 1 - .../species/generation6/heliolisk.json | 1 - .../species/generation6/helioptile.json | 1 - .../cobblemon/species/generation6/hoopa.json | 20 - .../cobblemon/species/generation6/litleo.json | 1 - .../species/generation6/meowstic.json | 26 - .../species/generation6/pancham.json | 1 - .../species/generation6/pangoro.json | 1 - .../species/generation6/pumpkaboo.json | 312 -- .../cobblemon/species/generation6/pyroar.json | 1 - .../cobblemon/species/generation6/skiddo.json | 1 - .../species/generation6/sliggoo.json | 19 - .../species/generation6/slurpuff.json | 1 - .../species/generation6/spritzee.json | 1 - .../species/generation6/swirlix.json | 1 - .../species/generation6/sylveon.json | 1 - .../species/generation6/vivillon.json | 105 - .../species/generation6/volcanion.json | 1 - .../species/generation6/xerneas.json | 110 - .../species/generation6/zygarde.json | 79 +- .../species/generation7/blacephalon.json | 1 - .../species/generation7/bounsweet.json | 1 - .../species/generation7/buzzwole.json | 1 - .../species/generation7/celesteela.json | 1 - .../species/generation7/charjabug.json | 1 - .../species/generation7/cosmoem.json | 1 - .../cobblemon/species/generation7/cosmog.json | 1 - .../species/generation7/dartrix.json | 117 - .../species/generation7/decidueye.json | 23 - .../species/generation7/grubbin.json | 1 - .../species/generation7/gumshoos.json | 1 - .../species/generation7/guzzlord.json | 1 - .../species/generation7/hakamoo.json | 1 - .../species/generation7/jangmoo.json | 1 - .../species/generation7/kartana.json | 1 - .../cobblemon/species/generation7/kommoo.json | 1 - .../cobblemon/species/generation7/lunala.json | 1 - .../species/generation7/lycanroc.json | 35 - .../species/generation7/magearna.json | 153 - .../species/generation7/marshadow.json | 1 - .../species/generation7/mimikyu.json | 30 - .../cobblemon/species/generation7/minior.json | 81 - .../species/generation7/morelull.json | 1 - .../species/generation7/naganadel.json | 1 - .../species/generation7/necrozma.json | 130 - .../species/generation7/nihilego.json | 1 - .../species/generation7/oranguru.json | 1 - .../species/generation7/oricorio.json | 333 +- .../species/generation7/palossand.json | 1 - .../species/generation7/passimian.json | 1 - .../species/generation7/pheromosa.json | 1 - .../species/generation7/poipole.json | 1 - .../species/generation7/rockruff.json | 25 - .../cobblemon/species/generation7/rowlet.json | 113 - .../species/generation7/sandygast.json | 1 - .../species/generation7/shiinotic.json | 1 - .../species/generation7/silvally.json | 494 --- .../species/generation7/solgaleo.json | 1 - .../species/generation7/stakataka.json | 1 - .../species/generation7/steenee.json | 1 - .../species/generation7/tapubulu.json | 1 - .../species/generation7/tapufini.json | 1 - .../species/generation7/tapukoko.json | 1 - .../species/generation7/tapulele.json | 1 - .../species/generation7/togedemaru.json | 1 - .../species/generation7/tsareena.json | 1 - .../species/generation7/typenull.json | 1 - .../species/generation7/vikavolt.json | 1 - .../species/generation7/wishiwashi.json | 88 +- .../species/generation7/xurkitree.json | 1 - .../species/generation7/yungoos.json | 1 - .../species/generation7/zeraora.json | 1 - .../species/generation7b/melmetal.json | 92 - .../species/generation7b/meltan.json | 1 - .../species/generation8/alcremie.json | 901 ----- .../species/generation8/appletun.json | 115 - .../species/generation8/blipbug.json | 1 - .../species/generation8/calyrex.json | 17 - .../species/generation8/centiskorch.json | 98 - .../species/generation8/cinderace.json | 126 - .../species/generation8/coalossal.json | 119 - .../species/generation8/copperajah.json | 120 - .../species/generation8/corviknight.json | 119 - .../species/generation8/cramorant.json | 234 -- .../species/generation8/dottler.json | 1 - .../species/generation8/drednaw.json | 131 - .../species/generation8/duraludon.json | 106 - .../cobblemon/species/generation8/eiscue.json | 93 - .../species/generation8/eldegoss.json | 1 - .../species/generation8/eternatus.json | 90 - .../species/generation8/flapple.json | 107 - .../species/generation8/frosmoth.json | 1 - .../species/generation8/glastrier.json | 1 - .../species/generation8/gossifleur.json | 1 - .../species/generation8/greedent.json | 1 - .../species/generation8/grimmsnarl.json | 124 - .../species/generation8/grookey.json | 1 - .../species/generation8/hatenna.json | 1 - .../species/generation8/hatterene.json | 119 - .../species/generation8/hattrem.json | 1 - .../species/generation8/indeedee.json | 10 - .../species/generation8/inteleon.json | 132 - .../cobblemon/species/generation8/kubfu.json | 1 - .../species/generation8/morpeko.json | 126 - .../cobblemon/species/generation8/mrrime.json | 1 - .../species/generation8/orbeetle.json | 108 - .../species/generation8/perrserker.json | 1 - .../species/generation8/polteageist.json | 102 - .../species/generation8/regidrago.json | 1 - .../species/generation8/regieleki.json | 1 - .../species/generation8/rillaboom.json | 136 - .../species/generation8/runerigus.json | 1 - .../species/generation8/sandaconda.json | 105 - .../species/generation8/scorbunny.json | 1 - .../species/generation8/silicobra.json | 1 - .../species/generation8/sinistea.json | 90 - .../species/generation8/sirfetchd.json | 3 +- .../species/generation8/skwovet.json | 1 - .../species/generation8/spectrier.json | 1 - .../species/generation8/thwackey.json | 1 - .../cobblemon/species/generation8/toxel.json | 1 - .../species/generation8/toxtricity.json | 194 +- .../species/generation8/urshifu.json | 187 +- .../cobblemon/species/generation8/wooloo.json | 1 - .../cobblemon/species/generation8/yamper.json | 1 - .../cobblemon/species/generation8/zacian.json | 99 - .../species/generation8/zamazenta.json | 103 - .../cobblemon/species/generation8/zarude.json | 129 - .../species/generation8a/basculegion.json | 115 - .../species/generation8a/enamorus.json | 90 - .../species/generation8a/sneasler.json | 1 - .../species/generation8a/ursaluna.json | 8 - .../species/generation9/arboliva.json | 1 - .../species/generation9/archaludon.json | 1 - .../species/generation9/arctibax.json | 1 - .../species/generation9/baxcalibur.json | 1 - .../species/generation9/bombirdier.json | 1 - .../species/generation9/brambleghast.json | 1 - .../species/generation9/bramblin.json | 1 - .../species/generation9/brutebonnet.json | 1 - .../species/generation9/capsakid.json | 1 - .../species/generation9/chienpao.json | 1 - .../cobblemon/species/generation9/chiyu.json | 1 - .../species/generation9/cyclizar.json | 1 - .../species/generation9/dipplin.json | 1 - .../cobblemon/species/generation9/dolliv.json | 1 - .../species/generation9/dudunsparce.json | 159 - .../species/generation9/farigiraf.json | 1 - .../species/generation9/fezandipiti.json | 1 - .../species/generation9/fluttermane.json | 1 - .../species/generation9/frigibax.json | 1 - .../species/generation9/gimmighoul.json | 42 +- .../species/generation9/gougingfire.json | 1 - .../species/generation9/greattusk.json | 1 - .../species/generation9/greavard.json | 1 - .../species/generation9/houndstone.json | 1 - .../species/generation9/hydrapple.json | 1 - .../species/generation9/ironboulder.json | 1 - .../species/generation9/ironbundle.json | 1 - .../species/generation9/ironcrown.json | 1 - .../species/generation9/ironhands.json | 1 - .../species/generation9/ironjugulis.json | 1 - .../species/generation9/ironmoth.json | 1 - .../species/generation9/ironthorns.json | 1 - .../species/generation9/irontreads.json | 1 - .../species/generation9/ironvaliant.json | 1 - .../species/generation9/kingambit.json | 1 - .../species/generation9/koraidon.json | 1 - .../cobblemon/species/generation9/lokix.json | 1 - .../species/generation9/mabosstiff.json | 1 - .../species/generation9/maschiff.json | 1 - .../species/generation9/maushold.json | 109 - .../species/generation9/miraidon.json | 1 - .../species/generation9/munkidori.json | 1 - .../cobblemon/species/generation9/nymble.json | 1 - .../species/generation9/ogerpon.json | 766 +--- .../species/generation9/oinkologne.json | 17 - .../species/generation9/okidogi.json | 1 - .../species/generation9/orthworm.json | 1 - .../species/generation9/palafin.json | 31 +- .../cobblemon/species/generation9/pawmi.json | 1 - .../cobblemon/species/generation9/pawmo.json | 1 - .../cobblemon/species/generation9/pawmot.json | 1 - .../species/generation9/pecharunt.json | 1 - .../species/generation9/poltchageist.json | 84 - .../cobblemon/species/generation9/rabsca.json | 1 - .../species/generation9/ragingbolt.json | 1 - .../cobblemon/species/generation9/rellor.json | 1 - .../species/generation9/roaringmoon.json | 1 - .../species/generation9/sandyshocks.json | 1 - .../species/generation9/scovillain.json | 1 - .../species/generation9/screamtail.json | 1 - .../species/generation9/sinistcha.json | 88 - .../species/generation9/slitherwing.json | 1 - .../cobblemon/species/generation9/smoliv.json | 1 - .../species/generation9/spidops.json | 1 - .../species/generation9/squawkabilly.json | 287 -- .../species/generation9/tandemaus.json | 1 - .../species/generation9/tarountula.json | 1 - .../species/generation9/tatsugiri.json | 162 - .../species/generation9/terapagos.json | 163 - .../cobblemon/species/generation9/tinglu.json | 1 - .../species/generation9/toedscool.json | 1 - .../species/generation9/toedscruel.json | 1 - .../species/generation9/wochien.json | 1 - 519 files changed, 123 insertions(+), 30242 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json index a7b222a31e..5173539eb9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json @@ -202,9 +202,6 @@ "toughclaws", "h:toughclaws" ], - "eggGroups": [ - "flying" - ], "baseStats": { "hp": 80, "attack": 135, @@ -213,122 +210,8 @@ "special_defence": 95, "speed": 150 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, "baseExperienceYield": 215, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 35, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:bite", - "1:ancientpower", - "5:supersonic", - "10:wingattack", - "15:scaryface", - "20:rockslide", - "25:roar", - "30:crunch", - "35:ironhead", - "40:takedown", - "45:stoneedge", - "50:agility", - "55:hyperbeam", - "60:gigaimpact", - "egg:curse", - "egg:dragonbreath", - "egg:foresight", - "egg:pursuit", - "egg:roost", - "egg:tailwind", - "egg:whirlwind", - "egg:wideguard", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:ancientpower", - "tm:aquatail", - "tm:assurance", - "tm:bite", - "tm:brutalswing", - "tm:bulldoze", - "tm:crunch", - "tm:curse", - "tm:defog", - "tm:dragonbreath", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dualwingbeat", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:flamethrower", - "tm:fly", - "tm:foresight", - "tm:gigaimpact", - "tm:headbutt", - "tm:heatwave", - "tm:honeclaws", - "tm:hurricane", - "tm:hyperbeam", - "tm:icefang", - "tm:incinerate", - "tm:ironhead", - "tm:irontail", - "tm:laserfocus", - "tm:meteorbeam", - "tm:ominouswind", - "tm:payback", - "tm:protect", - "tm:psychicfangs", - "tm:pursuit", - "tm:raindance", - "tm:rest", - "tm:roar", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:sandstorm", - "tm:scaryface", - "tm:skyattack", - "tm:skydrop", - "tm:sleeptalk", - "tm:smackdown", - "tm:stealthrock", - "tm:steelwing", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supersonic", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thunderfang", - "tm:torment", - "tm:twister", - "tm:whirlwind", - "tm:wideguard", - "tm:wingattack" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json index 625e647f08..ccd7b46824 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json @@ -202,9 +202,6 @@ "trace", "h:trace" ], - "eggGroups": [ - "human_like" - ], "baseStats": { "hp": 55, "attack": 50, @@ -213,129 +210,8 @@ "special_defence": 105, "speed": 150 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 300, - "experienceGroup": "medium_slow", - "catchRate": 50, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:teleport", - "1:kinesis", - "1:confusion", - "1:disable", - "1:miracleeye", - "5:psybeam", - "10:reflect", - "15:allyswitch", - "20:psychocut", - "25:recover", - "30:psyshock", - "35:psychic", - "40:roleplay", - "45:futuresight", - "50:calmmind", - "egg:barrier", - "egg:confusion", - "egg:guardsplit", - "egg:magiccoat", - "egg:powertrick", - "egg:psychoshift", - "tm:allyswitch", - "tm:barrier", - "tm:bodyslam", - "tm:calmmind", - "tm:chargebeam", - "tm:confusion", - "tm:dazzlinggleam", - "tm:disable", - "tm:drainpunch", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:firepunch", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:guardsplit", - "tm:guardswap", - "tm:headbutt", - "tm:hyperbeam", - "tm:icepunch", - "tm:imprison", - "tm:irontail", - "tm:kinesis", - "tm:knockoff", - "tm:laserfocus", - "tm:lightscreen", - "tm:magiccoat", - "tm:magicroom", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:miracleeye", - "tm:nastyplot", - "tm:powerswap", - "tm:powertrick", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychocut", - "tm:psychoshift", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:roleplay", - "tm:safeguard", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:skillswap", - "tm:sleeptalk", - "tm:snatch", - "tm:speedswap", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:taunt", - "tm:telekinesis", - "tm:teleport", - "tm:terablast", - "tm:thief", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:triattack", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json index f0fedea1ee..984008c906 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json @@ -52,7 +52,6 @@ "height": 1.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -185,7 +184,6 @@ "hisuian_form" ], "aspects": [ - "hisuian", "hisuian" ], "abilities": [ @@ -193,9 +191,6 @@ "flashfire", "h:rockhead" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 95, "attack": 115, @@ -204,20 +199,6 @@ "special_defence": 80, "speed": 90 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 194, - "experienceGroup": "slow", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:rockslide", "1:firefang", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/articuno.json b/common/src/main/resources/data/cobblemon/species/generation1/articuno.json index ece7a4080b..6cbb7dc65f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/articuno.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/articuno.json @@ -180,9 +180,6 @@ "competitive", "h:competitive" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 90, "attack": 85, @@ -199,12 +196,7 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 290, - "experienceGroup": "slow", - "catchRate": 3, "eggCycles": 120, - "baseFriendship": 35, - "behaviour": {}, "drops": { "amount": 6, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json index 610a1419f5..7b1e295e4e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json @@ -185,9 +185,6 @@ "adaptability", "h:adaptability" ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 65, "attack": 150, @@ -196,104 +193,8 @@ "special_defence": 80, "speed": 145 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, "baseExperienceYield": 248, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:furyattack", - "1:twineedle", - "1:pursuit", - "1:stringshot", - "1:bugbite", - "1:poisonsting", - "1:harden", - "11:furycutter", - "14:rage", - "20:focusenergy", - "23:venoshock", - "26:assurance", - "29:toxicspikes", - "32:pinmissile", - "35:poisonjab", - "38:agility", - "41:endeavor", - "44:fellstinger", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:assurance", - "tm:batonpass", - "tm:brickbreak", - "tm:brutalswing", - "tm:bugbite", - "tm:crosspoison", - "tm:cut", - "tm:defog", - "tm:drillrun", - "tm:dualwingbeat", - "tm:electroweb", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fellstinger", - "tm:flash", - "tm:focusenergy", - "tm:furyattack", - "tm:furycutter", - "tm:gigadrain", - "tm:gigaimpact", - "tm:harden", - "tm:hyperbeam", - "tm:infestation", - "tm:irondefense", - "tm:knockoff", - "tm:laserfocus", - "tm:ominouswind", - "tm:payback", - "tm:pinmissile", - "tm:poisonjab", - "tm:poisonsting", - "tm:protect", - "tm:pursuit", - "tm:rage", - "tm:rest", - "tm:rocksmash", - "tm:roost", - "tm:screech", - "tm:silverwind", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:stringshot", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:swordsdance", - "tm:tailwind", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:toxicspikes", - "tm:twineedle", - "tm:uturn", - "tm:venoshock", - "tm:xscissor" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json index 8dad27ca69..83c21bcc57 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json @@ -224,10 +224,6 @@ "megalauncher", "h:megalauncher" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 79, "attack": 103, @@ -236,153 +232,8 @@ "special_defence": 115, "speed": 78 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, "baseExperienceYield": 315, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true, - "canSwimInLava": false, - "canBreatheUnderwater": true, - "swimSpeed": "0.2" - } - } - }, - "moves": [ - "1:flashcannon", - "1:tackle", - "1:tailwhip", - "1:bubble", - "1:withdraw", - "1:watergun", - "1:skullbash", - "9:rapidspin", - "12:bite", - "15:waterpulse", - "20:protect", - "25:raindance", - "30:aquatail", - "35:shellsmash", - "42:irondefense", - "49:hydropump", - "56:wavecrash", - "egg:aquajet", - "egg:aquaring", - "egg:fakeout", - "egg:flail", - "egg:foresight", - "egg:lifedew", - "egg:mirrorcoat", - "egg:mist", - "egg:mudsport", - "egg:refresh", - "egg:waterspout", - "egg:wavecrash", - "egg:yawn", - "tm:aquajet", - "tm:aquaring", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:bite", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bubble", - "tm:chillingwater", - "tm:crunch", - "tm:darkpulse", - "tm:dig", - "tm:dive", - "tm:doubleedge", - "tm:dragonpulse", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:flail", - "tm:flashcannon", - "tm:fling", - "tm:flipturn", - "tm:focusblast", - "tm:focuspunch", - "tm:foresight", - "tm:gigaimpact", - "tm:gyroball", - "tm:hail", - "tm:haze", - "tm:headbutt", - "tm:helpinghand", - "tm:hydrocannon", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icespinner", - "tm:icywind", - "tm:irondefense", - "tm:irontail", - "tm:lifedew", - "tm:liquidation", - "tm:megakick", - "tm:megapunch", - "tm:mirrorcoat", - "tm:mist", - "tm:muddywater", - "tm:mudshot", - "tm:mudsport", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rapidspin", - "tm:refresh", - "tm:rest", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:rollout", - "tm:scaryface", - "tm:shellsmash", - "tm:signalbeam", - "tm:skullbash", - "tm:sleeptalk", - "tm:smackdown", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:terrainpulse", - "tm:watergun", - "tm:waterpledge", - "tm:waterpulse", - "tm:waterspout", - "tm:wavecrash", - "tm:weatherball", - "tm:whirlpool", - "tm:withdraw", - "tm:workup", - "tm:yawn", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true }, @@ -402,169 +253,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "torrent", - "h:raindish" - ], - "eggGroups": [ - "monster", - "water_1" - ], - "baseStats": { - "hp": 79, - "attack": 83, - "defence": 100, - "special_attack": 85, - "special_defence": 105, - "speed": 78 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "baseExperienceYield": 265, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true, - "canSwimInLava": false, - "canBreatheUnderwater": true, - "swimSpeed": "0.2" - } - } - }, - "moves": [ - "1:flashcannon", - "1:tackle", - "1:tailwhip", - "1:bubble", - "1:withdraw", - "1:watergun", - "1:skullbash", - "9:rapidspin", - "12:bite", - "15:waterpulse", - "20:protect", - "25:raindance", - "30:aquatail", - "35:shellsmash", - "42:irondefense", - "49:hydropump", - "56:wavecrash", - "egg:aquajet", - "egg:aquaring", - "egg:fakeout", - "egg:flail", - "egg:foresight", - "egg:lifedew", - "egg:mirrorcoat", - "egg:mist", - "egg:mudsport", - "egg:refresh", - "egg:waterspout", - "egg:wavecrash", - "egg:yawn", - "tm:aquajet", - "tm:aquaring", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:bite", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bubble", - "tm:chillingwater", - "tm:crunch", - "tm:darkpulse", - "tm:dig", - "tm:dive", - "tm:doubleedge", - "tm:dragonpulse", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:flail", - "tm:flashcannon", - "tm:fling", - "tm:flipturn", - "tm:focusblast", - "tm:focuspunch", - "tm:foresight", - "tm:gigaimpact", - "tm:gyroball", - "tm:hail", - "tm:haze", - "tm:headbutt", - "tm:helpinghand", - "tm:hydrocannon", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icespinner", - "tm:icywind", - "tm:irondefense", - "tm:irontail", - "tm:lifedew", - "tm:liquidation", - "tm:megakick", - "tm:megapunch", - "tm:mirrorcoat", - "tm:mist", - "tm:muddywater", - "tm:mudshot", - "tm:mudsport", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rapidspin", - "tm:refresh", - "tm:rest", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:rollout", - "tm:scaryface", - "tm:shellsmash", - "tm:signalbeam", - "tm:skullbash", - "tm:sleeptalk", - "tm:smackdown", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:terrainpulse", - "tm:watergun", - "tm:waterpledge", - "tm:waterpulse", - "tm:waterspout", - "tm:wavecrash", - "tm:weatherball", - "tm:whirlpool", - "tm:withdraw", - "tm:workup", - "tm:yawn", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json index 184613136e..847bd4d1f9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json @@ -183,118 +183,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "compoundeyes", - "h:tintedlens" - ], - "eggGroups": [ - "bug" - ], - "baseStats": { - "hp": 60, - "attack": 45, - "defence": 50, - "special_attack": 90, - "special_defence": 80, - "speed": 70 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 198, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:gust", - "1:stringshot", - "1:bugbite", - "1:captivate", - "1:harden", - "1:tackle", - "4:supersonic", - "8:confusion", - "12:poisonpowder", - "12:stunspore", - "12:sleeppowder", - "16:psybeam", - "20:whirlwind", - "24:airslash", - "28:safeguard", - "32:bugbuzz", - "36:tailwind", - "40:ragepowder", - "44:quiverdance", - "tm:acrobatics", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:batonpass", - "tm:bugbite", - "tm:bugbuzz", - "tm:captivate", - "tm:confusion", - "tm:defog", - "tm:drainingkiss", - "tm:dreameater", - "tm:dualwingbeat", - "tm:electroweb", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gust", - "tm:harden", - "tm:hurricane", - "tm:hyperbeam", - "tm:infestation", - "tm:irondefense", - "tm:ominouswind", - "tm:poisonpowder", - "tm:pollenpuff", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychup", - "tm:quiverdance", - "tm:ragepowder", - "tm:raindance", - "tm:rest", - "tm:roost", - "tm:safeguard", - "tm:shadowball", - "tm:signalbeam", - "tm:silverwind", - "tm:skillswap", - "tm:sleeppowder", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stringshot", - "tm:strugglebug", - "tm:stunspore", - "tm:substitute", - "tm:sunnyday", - "tm:supersonic", - "tm:swift", - "tm:tackle", - "tm:tailwind", - "tm:terablast", - "tm:thief", - "tm:twister", - "tm:uturn", - "tm:venoshock", - "tm:whirlwind" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json index e81d60e26c..4254aef6e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json @@ -235,10 +235,6 @@ "toughclaws", "h:toughclaws" ], - "eggGroups": [ - "monster", - "dragon" - ], "baseStats": { "hp": 78, "attack": 130, @@ -247,156 +243,8 @@ "special_defence": 85, "speed": 100 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 317, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInLava": true - } - } - }, - "moves": [ - "1:dragonclaw", - "1:airslash", - "1:scratch", - "1:growl", - "1:ember", - "1:smokescreen", - "1:dragonrage", - "1:wingattack", - "1:heatwave", - "1:flameburst", - "12:dragonbreath", - "19:firefang", - "24:slash", - "30:flamethrower", - "39:scaryface", - "46:firespin", - "54:inferno", - "62:flareblitz", - "egg:ancientpower", - "egg:bellydrum", - "egg:bite", - "egg:counter", - "egg:dragonrage", - "egg:dragonrush", - "egg:dragontail", - "egg:irontail", - "egg:metalclaw", - "egg:wingattack", - "tm:acrobatics", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:ancientpower", - "tm:beatup", - "tm:bellydrum", - "tm:bite", - "tm:blastburn", - "tm:blazekick", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:counter", - "tm:crunch", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:dragonbreath", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", - "tm:dragontail", - "tm:earthquake", - "tm:echoedvoice", - "tm:ember", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firepledge", - "tm:firepunch", - "tm:firespin", - "tm:flameburst", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:focuspunch", - "tm:furycutter", - "tm:gigaimpact", - "tm:growl", - "tm:headbutt", - "tm:heatcrash", - "tm:heatwave", - "tm:helpinghand", - "tm:honeclaws", - "tm:hurricane", - "tm:hyperbeam", - "tm:incinerate", - "tm:inferno", - "tm:irontail", - "tm:megakick", - "tm:megapunch", - "tm:metalclaw", - "tm:mysticalfire", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:poweruppunch", - "tm:protect", - "tm:rest", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:scratch", - "tm:shadowclaw", - "tm:skydrop", - "tm:slash", - "tm:sleeptalk", - "tm:smokescreen", - "tm:solarbeam", - "tm:steelwing", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thunderpunch", - "tm:twister", - "tm:weatherball", - "tm:willowisp", - "tm:wingattack", - "tm:workup" - ], "evolutions": [], "battleOnly": true }, @@ -421,10 +269,6 @@ "drought", "h:drought" ], - "eggGroups": [ - "monster", - "dragon" - ], "baseStats": { "hp": 78, "attack": 104, @@ -433,156 +277,8 @@ "special_defence": 115, "speed": 100 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 317, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInLava": true - } - } - }, - "moves": [ - "1:dragonclaw", - "1:airslash", - "1:scratch", - "1:growl", - "1:ember", - "1:smokescreen", - "1:dragonrage", - "1:wingattack", - "1:heatwave", - "1:flameburst", - "12:dragonbreath", - "19:firefang", - "24:slash", - "30:flamethrower", - "39:scaryface", - "46:firespin", - "54:inferno", - "62:flareblitz", - "egg:ancientpower", - "egg:bellydrum", - "egg:bite", - "egg:counter", - "egg:dragonrage", - "egg:dragonrush", - "egg:dragontail", - "egg:irontail", - "egg:metalclaw", - "egg:wingattack", - "tm:acrobatics", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:ancientpower", - "tm:beatup", - "tm:bellydrum", - "tm:bite", - "tm:blastburn", - "tm:blazekick", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:counter", - "tm:crunch", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:dragonbreath", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", - "tm:dragontail", - "tm:earthquake", - "tm:echoedvoice", - "tm:ember", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firepledge", - "tm:firepunch", - "tm:firespin", - "tm:flameburst", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:focuspunch", - "tm:furycutter", - "tm:gigaimpact", - "tm:growl", - "tm:headbutt", - "tm:heatcrash", - "tm:heatwave", - "tm:helpinghand", - "tm:honeclaws", - "tm:hurricane", - "tm:hyperbeam", - "tm:incinerate", - "tm:inferno", - "tm:irontail", - "tm:megakick", - "tm:megapunch", - "tm:metalclaw", - "tm:mysticalfire", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:poweruppunch", - "tm:protect", - "tm:rest", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:scratch", - "tm:shadowclaw", - "tm:skydrop", - "tm:slash", - "tm:sleeptalk", - "tm:smokescreen", - "tm:solarbeam", - "tm:steelwing", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thunderpunch", - "tm:twister", - "tm:weatherball", - "tm:willowisp", - "tm:wingattack", - "tm:workup" - ], "evolutions": [], "battleOnly": true }, @@ -603,172 +299,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "blaze", - "h:solarpower" - ], - "eggGroups": [ - "monster", - "dragon" - ], - "baseStats": { - "hp": 78, - "attack": 84, - "defence": 78, - "special_attack": 109, - "special_defence": 85, - "speed": 100 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 267, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInLava": true - } - } - }, - "moves": [ - "1:dragonclaw", - "1:airslash", - "1:scratch", - "1:growl", - "1:ember", - "1:smokescreen", - "1:dragonrage", - "1:wingattack", - "1:heatwave", - "1:flameburst", - "12:dragonbreath", - "19:firefang", - "24:slash", - "30:flamethrower", - "39:scaryface", - "46:firespin", - "54:inferno", - "62:flareblitz", - "egg:ancientpower", - "egg:bellydrum", - "egg:bite", - "egg:counter", - "egg:dragonrage", - "egg:dragonrush", - "egg:dragontail", - "egg:irontail", - "egg:metalclaw", - "egg:wingattack", - "tm:acrobatics", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:ancientpower", - "tm:beatup", - "tm:bellydrum", - "tm:bite", - "tm:blastburn", - "tm:blazekick", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:counter", - "tm:crunch", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:dragonbreath", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", - "tm:dragontail", - "tm:earthquake", - "tm:echoedvoice", - "tm:ember", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firepledge", - "tm:firepunch", - "tm:firespin", - "tm:flameburst", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:focuspunch", - "tm:furycutter", - "tm:gigaimpact", - "tm:growl", - "tm:headbutt", - "tm:heatcrash", - "tm:heatwave", - "tm:helpinghand", - "tm:honeclaws", - "tm:hurricane", - "tm:hyperbeam", - "tm:incinerate", - "tm:inferno", - "tm:irontail", - "tm:megakick", - "tm:megapunch", - "tm:metalclaw", - "tm:mysticalfire", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:poweruppunch", - "tm:protect", - "tm:rest", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:scratch", - "tm:shadowclaw", - "tm:skydrop", - "tm:slash", - "tm:sleeptalk", - "tm:smokescreen", - "tm:solarbeam", - "tm:steelwing", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thunderpunch", - "tm:twister", - "tm:weatherball", - "tm:willowisp", - "tm:wingattack", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json index 41d54ed006..712cb51384 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json @@ -53,7 +53,6 @@ "height": 0.87, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -233,138 +232,7 @@ "aspects": [ "region-bias-alola" ], - "abilities": [ - "rockhead", - "lightningrod", - "h:battlearmor" - ], - "eggGroups": [ - "monster" - ], - "baseStats": { - "hp": 50, - "attack": 50, - "defence": 95, - "special_attack": 40, - "special_defence": 50, - "speed": 35 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 64, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:growl", - "1:boneclub", - "1:leer", - "1:mudslap", - "4:tailwhip", - "8:falseswipe", - "12:headbutt", - "16:retaliate", - "20:fling", - "24:stompingtantrum", - "29:bonerush", - "32:focusenergy", - "36:endeavor", - "40:bonemerang", - "44:thrash", - "48:doubleedge", - "egg:ancientpower", - "egg:bellydrum", - "egg:chipaway", - "egg:curse", - "egg:detect", - "egg:doublekick", - "egg:leer", - "egg:perishsong", - "egg:rage", - "egg:skullbash", - "tm:aerialace", - "tm:ancientpower", - "tm:bellydrum", - "tm:blizzard", - "tm:bodyslam", - "tm:boneclub", - "tm:bonemerang", - "tm:bonerush", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:chipaway", - "tm:curse", - "tm:detect", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:fling", - "tm:focusenergy", - "tm:focuspunch", - "tm:furycutter", - "tm:growl", - "tm:headbutt", - "tm:icebeam", - "tm:icywind", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:knockoff", - "tm:leer", - "tm:lowkick", - "tm:megakick", - "tm:megapunch", - "tm:mudslap", - "tm:perishsong", - "tm:poweruppunch", - "tm:protect", - "tm:rage", - "tm:rest", - "tm:retaliate", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:sandstorm", - "tm:scorchingsands", - "tm:screech", - "tm:skullbash", - "tm:sleeptalk", - "tm:smackdown", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:tailwhip", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:thunderpunch", - "tm:uproar" - ], "evolutions": [ { "id": "cubone_marowak", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json index d899aaf59c..f651f23217 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json @@ -209,9 +209,6 @@ "tanglinghair", "h:sandforce" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 10, "attack": 55, @@ -220,20 +217,6 @@ "special_defence": 45, "speed": 90 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 53, - "experienceGroup": "medium_fast", - "catchRate": 255, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:sandattack", "1:metalclaw", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json index cab957d97d..629538cdb5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json @@ -198,7 +198,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -206,9 +205,6 @@ "tanglinghair", "h:sandforce" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 35, "attack": 100, @@ -225,12 +221,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 149, - "experienceGroup": "medium_fast", - "catchRate": 50, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:sandtomb", "1:rototiller", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/eevee.json b/common/src/main/resources/data/cobblemon/species/generation1/eevee.json index ae692a43ab..4eaf5029e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/eevee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/eevee.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -283,124 +282,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "runaway", - "adaptability", - "h:anticipation" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 55, - "attack": 55, - "defence": 50, - "special_attack": 45, - "special_defence": 65, - "speed": 55 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 65, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 35, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:tailwhip", - "1:tackle", - "1:helpinghand", - "1:growl", - "1:covet", - "5:sandattack", - "10:quickattack", - "15:babydolleyes", - "20:refresh", - "25:bite", - "30:copycat", - "35:batonpass", - "40:takedown", - "45:trumpcard", - "50:doubleedge", - "55:lastresort", - "egg:captivate", - "egg:curse", - "egg:detect", - "egg:doublekick", - "egg:flail", - "egg:mudslap", - "egg:naturalgift", - "egg:synchronoise", - "egg:tickle", - "egg:wish", - "egg:yawn", - "tm:alluringvoice", - "tm:babydolleyes", - "tm:batonpass", - "tm:bite", - "tm:bodyslam", - "tm:calmmind", - "tm:captivate", - "tm:charm", - "tm:copycat", - "tm:covet", - "tm:curse", - "tm:detect", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:flail", - "tm:focusenergy", - "tm:growl", - "tm:headbutt", - "tm:healbell", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:laserfocus", - "tm:lastresort", - "tm:mudslap", - "tm:naturalgift", - "tm:payday", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:sandattack", - "tm:shadowball", - "tm:sleeptalk", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synchronoise", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:tickle", - "tm:trailblaze", - "tm:trumpcard", - "tm:weatherball", - "tm:wish", - "tm:workup", - "tm:yawn" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json index c179433cef..767bcd4e88 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json @@ -169,46 +169,8 @@ "hisuian_form" ], "aspects": [ - "hisuian", "hisuian" ], - "abilities": [ - "soundproof", - "static", - "h:aftermath" - ], - "eggGroups": [ - "mineral" - ], - "baseStats": { - "hp": 60, - "attack": 50, - "defence": 70, - "special_attack": 80, - "special_defence": 80, - "speed": 150 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 172, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json index d80b47fefc..0834d20cec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json @@ -224,125 +224,7 @@ "aspects": [ "region-bias-alola" ], - "abilities": [ - "chlorophyll", - "h:harvest" - ], - "eggGroups": [ - "grass" - ], - "baseStats": { - "hp": 60, - "attack": 40, - "defence": 80, - "special_attack": 60, - "special_defence": 45, - "speed": 40 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 65, - "experienceGroup": "slow", - "catchRate": 90, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:barrage", - "1:hypnosis", - "1:absorb", - "5:reflect", - "10:leechseed", - "15:megadrain", - "20:confusion", - "25:synthesis", - "30:bulletseed", - "35:gigadrain", - "40:extrasensory", - "45:uproar", - "50:bestow", - "55:solarbeam", - "egg:ancientpower", - "egg:block", - "egg:curse", - "egg:ingrain", - "egg:luckychant", - "egg:moonlight", - "egg:naturalgift", - "egg:poisonpowder", - "egg:sleeppowder", - "egg:stunspore", - "tm:absorb", - "tm:ancientpower", - "tm:barrage", - "tm:bestow", - "tm:block", - "tm:bulletseed", - "tm:confusion", - "tm:curse", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:extrasensory", - "tm:facade", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hypnosis", - "tm:imprison", - "tm:infestation", - "tm:ingrain", - "tm:leafstorm", - "tm:leechseed", - "tm:lightscreen", - "tm:luckychant", - "tm:megadrain", - "tm:moonlight", - "tm:naturalgift", - "tm:naturepower", - "tm:poisonpowder", - "tm:powerswap", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychup", - "tm:psyshock", - "tm:reflect", - "tm:rest", - "tm:rollout", - "tm:seedbomb", - "tm:selfdestruct", - "tm:skillswap", - "tm:sleeppowder", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:storedpower", - "tm:strength", - "tm:stunspore", - "tm:substitute", - "tm:sunnyday", - "tm:swordsdance", - "tm:synthesis", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:trick", - "tm:uproar", - "tm:worryseed", - "tm:zenheadbutt" - ], "evolutions": [ { "id": "exeggcute_exeggutor", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json index 5e4fbea743..f451ba24ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json @@ -225,9 +225,6 @@ "frisk", "h:harvest" ], - "eggGroups": [ - "grass" - ], "baseStats": { "hp": 95, "attack": 105, @@ -236,27 +233,12 @@ "special_defence": 75, "speed": 45 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 186, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "baseScale": 0.85, "hitbox": { "width": 1.6, "height": 17.8, "fixed": false }, "standingEyeHeight": 0.96, - "behaviour": {}, "moves": [ "1:dragonhammer", "1:seedbomb", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json index 58754d9497..c54735960b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json @@ -1,7 +1,7 @@ { "implemented": true, "nationalPokedexNumber": 83, - "name": "Farfetch’d", + "name": "Farfetch\u00e2\u20ac\u2122d", "primaryType": "normal", "secondaryType": "flying", "maleRatio": 0.5, @@ -218,10 +218,6 @@ "steadfast", "h:scrappy" ], - "eggGroups": [ - "flying", - "field" - ], "baseStats": { "hp": 52, "attack": 95, @@ -230,20 +226,6 @@ "special_defence": 62, "speed": 55 }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 132, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json index 5fe2668280..e4f567954e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json @@ -47,7 +47,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json index 850fc9cb58..19ba013f5a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json @@ -224,9 +224,6 @@ "shadowtag", "h:shadowtag" ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 60, "attack": 65, @@ -235,153 +232,8 @@ "special_defence": 95, "speed": 130 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 300, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:hypnosis", - "1:lick", - "1:meanlook", - "1:confuseray", - "1:shadowpunch", - "1:nightmare", - "1:perishsong", - "1:reflecttype", - "12:payback", - "16:spite", - "20:curse", - "24:hex", - "30:nightshade", - "36:suckerpunch", - "42:darkpulse", - "48:shadowball", - "54:destinybond", - "60:dreameater", - "egg:astonish", - "egg:clearsmog", - "egg:disable", - "egg:grudge", - "egg:haze", - "egg:nightmare", - "egg:perishsong", - "egg:psywave", - "egg:reflecttype", - "egg:smog", - "egg:toxic", - "tm:acidspray", - "tm:allyswitch", - "tm:astonish", - "tm:bodyslam", - "tm:brickbreak", - "tm:clearsmog", - "tm:confuseray", - "tm:corrosivegas", - "tm:curse", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", - "tm:drainpunch", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:firepunch", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grudge", - "tm:gunkshot", - "tm:haze", - "tm:headbutt", - "tm:hex", - "tm:hyperbeam", - "tm:hypnosis", - "tm:icepunch", - "tm:icywind", - "tm:imprison", - "tm:infestation", - "tm:knockoff", - "tm:laserfocus", - "tm:lick", - "tm:meanlook", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:nastyplot", - "tm:nightmare", - "tm:nightshade", - "tm:ominouswind", - "tm:painsplit", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:poltergeist", - "tm:powershift", - "tm:poweruppunch", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:psychup", - "tm:psywave", - "tm:raindance", - "tm:reflecttype", - "tm:rest", - "tm:rocksmash", - "tm:roleplay", - "tm:scaryface", - "tm:selfdestruct", - "tm:shadowball", - "tm:shadowclaw", - "tm:shadowpunch", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smog", - "tm:snatch", - "tm:spite", - "tm:strength", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:toxicspikes", - "tm:trick", - "tm:trickroom", - "tm:venoshock", - "tm:willowisp", - "tm:wonderroom" - ], "evolutions": [], "battleOnly": true }, @@ -402,168 +254,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "cursedbody", - "h:cursedbody" - ], - "eggGroups": [ - "amorphous" - ], - "baseStats": { - "hp": 60, - "attack": 65, - "defence": 60, - "special_attack": 130, - "special_defence": 75, - "speed": 110 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 250, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:hypnosis", - "1:lick", - "1:meanlook", - "1:confuseray", - "1:shadowpunch", - "1:nightmare", - "1:perishsong", - "1:reflecttype", - "12:payback", - "16:spite", - "20:curse", - "24:hex", - "30:nightshade", - "36:suckerpunch", - "42:darkpulse", - "48:shadowball", - "54:destinybond", - "60:dreameater", - "egg:astonish", - "egg:clearsmog", - "egg:disable", - "egg:grudge", - "egg:haze", - "egg:nightmare", - "egg:perishsong", - "egg:psywave", - "egg:reflecttype", - "egg:smog", - "egg:toxic", - "tm:acidspray", - "tm:allyswitch", - "tm:astonish", - "tm:bodyslam", - "tm:brickbreak", - "tm:clearsmog", - "tm:confuseray", - "tm:corrosivegas", - "tm:curse", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", - "tm:drainpunch", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:firepunch", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grudge", - "tm:gunkshot", - "tm:haze", - "tm:headbutt", - "tm:hex", - "tm:hyperbeam", - "tm:hypnosis", - "tm:icepunch", - "tm:icywind", - "tm:imprison", - "tm:infestation", - "tm:knockoff", - "tm:laserfocus", - "tm:lick", - "tm:meanlook", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:nastyplot", - "tm:nightmare", - "tm:nightshade", - "tm:ominouswind", - "tm:painsplit", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:poltergeist", - "tm:powershift", - "tm:poweruppunch", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:psychup", - "tm:psywave", - "tm:raindance", - "tm:reflecttype", - "tm:rest", - "tm:rocksmash", - "tm:roleplay", - "tm:scaryface", - "tm:selfdestruct", - "tm:shadowball", - "tm:shadowclaw", - "tm:shadowpunch", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smog", - "tm:snatch", - "tm:spite", - "tm:strength", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:toxicspikes", - "tm:trick", - "tm:trickroom", - "tm:venoshock", - "tm:willowisp", - "tm:wonderroom" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json index c284ddc2ef..50ef71b960 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json @@ -217,38 +217,6 @@ "sturdy", "h:galvanize" ], - "eggGroups": [ - "mineral" - ], - "baseStats": { - "hp": 40, - "attack": 80, - "defence": 100, - "special_attack": 30, - "special_defence": 30, - "speed": 20 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 60, - "experienceGroup": "medium_slow", - "catchRate": 255, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golem.json b/common/src/main/resources/data/cobblemon/species/generation1/golem.json index cdd7202744..25e91cccac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golem.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golem.json @@ -212,7 +212,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -220,38 +219,6 @@ "sturdy", "h:galvanize" ], - "eggGroups": [ - "mineral" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 130, - "special_attack": 55, - "special_defence": 65, - "speed": 45 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 248, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, "drops": { "amount": 6, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json index 725a4e26cb..e94f025ac7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json @@ -214,7 +214,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -222,38 +221,6 @@ "sturdy", "h:galvanize" ], - "eggGroups": [ - "mineral" - ], - "baseStats": { - "hp": 55, - "attack": 95, - "defence": 115, - "special_attack": 45, - "special_defence": 45, - "speed": 35 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 137, - "experienceGroup": "medium_slow", - "catchRate": 120, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json index ffcd97cb8e..6785920dc6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json @@ -223,37 +223,6 @@ "gluttony", "h:powerofalchemy" ], - "eggGroups": [ - "amorphous" - ], - "baseStats": { - "hp": 80, - "attack": 80, - "defence": 50, - "special_attack": 40, - "special_defence": 50, - "speed": 25 - }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 65, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true - } - } - }, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json b/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json index 5ffdd442db..231a9b4b1a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json @@ -193,9 +193,6 @@ "flashfire", "h:rockhead" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 60, "attack": 75, @@ -204,20 +201,6 @@ "special_defence": 50, "speed": 55 }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 70, - "experienceGroup": "slow", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:leer", "1:ember", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json index 7c21551073..1cf6552786 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json @@ -201,10 +201,6 @@ "moldbreaker", "h:moldbreaker" ], - "eggGroups": [ - "water_2", - "dragon" - ], "baseStats": { "hp": 95, "attack": 155, @@ -213,128 +209,22 @@ "special_defence": 130, "speed": 81 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 224, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 5, - "baseFriendship": 50, "dynamaxBlocked": true, "behaviour": { "moving": { + "walk": { + "avoidsLand": true + }, "swim": { - "canSwimInWater": true, - "canSwimInLava": false, + "swimSpeed": "0.2", "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canWalkOnWater": true, + "canSwimInWater": true, + "canSwimInLava": false } } }, - "moves": [ - "1:bite", - "1:dragonrage", - "1:leer", - "1:twister", - "1:flail", - "1:splash", - "1:tackle", - "4:whirlpool", - "8:icefang", - "12:brine", - "16:scaryface", - "21:waterfall", - "24:crunch", - "28:raindance", - "32:aquatail", - "36:dragondance", - "40:hydropump", - "44:hurricane", - "48:thrash", - "52:hyperbeam", - "tm:aquatail", - "tm:avalanche", - "tm:bite", - "tm:blizzard", - "tm:bodyslam", - "tm:bounce", - "tm:brine", - "tm:brutalswing", - "tm:bulldoze", - "tm:chillingwater", - "tm:crunch", - "tm:darkpulse", - "tm:dive", - "tm:doubleedge", - "tm:dragoncheer", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragonrage", - "tm:dragontail", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:flail", - "tm:flamethrower", - "tm:gigaimpact", - "tm:hail", - "tm:headbutt", - "tm:helpinghand", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icywind", - "tm:incinerate", - "tm:ironhead", - "tm:irontail", - "tm:lashout", - "tm:leer", - "tm:muddywater", - "tm:outrage", - "tm:payback", - "tm:powerwhip", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:roar", - "tm:rocksmash", - "tm:sandstorm", - "tm:scald", - "tm:scaleshot", - "tm:scaryface", - "tm:sleeptalk", - "tm:spite", - "tm:splash", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:takedown", - "tm:taunt", - "tm:temperflare", - "tm:terablast", - "tm:thrash", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json index e2a94134cc..0670d7f4cb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json index 85cefc63cf..dee9c34aca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json @@ -49,7 +49,6 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json index d4ba9b08f0..e821b5dc05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json @@ -48,7 +48,6 @@ "height": 1.4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json index 7d61be5c09..32e231a77c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json @@ -48,7 +48,6 @@ "height": 1.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -209,9 +208,6 @@ "parentalbond", "h:parentalbond" ], - "eggGroups": [ - "monster" - ], "baseStats": { "hp": 105, "attack": 125, @@ -220,150 +216,8 @@ "special_defence": 100, "speed": 100 }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 207, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:cometpunch", - "1:leer", - "1:tailwhip", - "1:rage", - "1:dizzypunch", - "1:chipaway", - "1:pound", - "4:growl", - "8:fakeout", - "12:bite", - "16:stomp", - "20:focusenergy", - "24:headbutt", - "28:suckerpunch", - "32:doublehit", - "36:crunch", - "40:endure", - "44:reversal", - "48:outrage", - "52:lastresort", - "egg:circlethrow", - "egg:counter", - "egg:crushclaw", - "egg:disable", - "egg:doubleedge", - "egg:endeavor", - "egg:foresight", - "egg:hammerarm", - "egg:stomp", - "egg:trumpcard", - "tm:aerialace", - "tm:aquatail", - "tm:assurance", - "tm:avalanche", - "tm:beatup", - "tm:bite", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulldoze", - "tm:chipaway", - "tm:circlethrow", - "tm:cometpunch", - "tm:counter", - "tm:covet", - "tm:crunch", - "tm:crushclaw", - "tm:cut", - "tm:dig", - "tm:disable", - "tm:dizzypunch", - "tm:doubleedge", - "tm:doublehit", - "tm:drainpunch", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:foresight", - "tm:furycutter", - "tm:gigaimpact", - "tm:growl", - "tm:hail", - "tm:hammerarm", - "tm:headbutt", - "tm:helpinghand", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:incinerate", - "tm:irontail", - "tm:lastresort", - "tm:leer", - "tm:lowkick", - "tm:megakick", - "tm:megapunch", - "tm:mudslap", - "tm:outrage", - "tm:pound", - "tm:poweruppunch", - "tm:protect", - "tm:rage", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:solarbeam", - "tm:spite", - "tm:stomp", - "tm:strength", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tailwhip", - "tm:terablast", - "tm:terrainpulse", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:trumpcard", - "tm:uproar", - "tm:waterpulse", - "tm:whirlpool", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json index 74e1875ba7..27e4726d96 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json @@ -194,147 +194,20 @@ "aspects": [ "gmax" ], - "abilities": [ - "hypercutter", - "shellarmor", - "h:sheerforce" - ], - "eggGroups": [ - "water_3" - ], - "baseStats": { - "hp": 55, - "attack": 130, - "defence": 115, - "special_attack": 50, - "special_defence": 50, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, "behaviour": { "moving": { + "walk": { + "walkSpeed": 0.41 + }, "swim": { + "swimSpeed": "0.2", "canSwimInWater": true, - "canSwimInLava": false, "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canSwimInLava": false } } }, - "moves": [ - "1:mudsport", - "1:bubble", - "1:visegrip", - "1:leer", - "1:harden", - "1:metalclaw", - "1:wideguard", - "1:hammerarm", - "1:watergun", - "12:mudshot", - "16:protect", - "20:bubblebeam", - "24:stomp", - "31:flail", - "36:razorshell", - "42:slam", - "48:swordsdance", - "54:crabhammer", - "60:guillotine", - "egg:ancientpower", - "egg:bide", - "egg:chipaway", - "egg:hammerarm", - "egg:knockoff", - "egg:nightslash", - "egg:slash", - "egg:tickle", - "tm:agility", - "tm:allyswitch", - "tm:amnesia", - "tm:ancientpower", - "tm:bide", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:brutalswing", - "tm:bubble", - "tm:bubblebeam", - "tm:chipaway", - "tm:crabhammer", - "tm:cut", - "tm:dig", - "tm:dive", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:flail", - "tm:fling", - "tm:furycutter", - "tm:gigaimpact", - "tm:guillotine", - "tm:hail", - "tm:hammerarm", - "tm:harden", - "tm:haze", - "tm:highhorsepower", - "tm:honeclaws", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:irondefense", - "tm:knockoff", - "tm:leer", - "tm:liquidation", - "tm:metalclaw", - "tm:mudshot", - "tm:mudslap", - "tm:mudsport", - "tm:nightslash", - "tm:protect", - "tm:quash", - "tm:raindance", - "tm:razorshell", - "tm:rest", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:scald", - "tm:slam", - "tm:slash", - "tm:sleeptalk", - "tm:stomp", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:swordsdance", - "tm:terablast", - "tm:thief", - "tm:tickle", - "tm:visegrip", - "tm:watergun", - "tm:waterpulse", - "tm:whirlpool", - "tm:wideguard", - "tm:xscissor" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json index b7182e662d..37ae57d544 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json @@ -220,122 +220,7 @@ "aspects": [ "region-bias-galar" ], - "abilities": [ - "levitate", - "neutralizinggas", - "h:stench" - ], - "eggGroups": [ - "amorphous" - ], - "baseStats": { - "hp": 40, - "attack": 65, - "defence": 95, - "special_attack": 60, - "special_defence": 45, - "speed": 35 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 68, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:poisongas", - "1:tackle", - "4:smog", - "8:smokescreen", - "12:clearsmog", - "16:assurance", - "20:sludge", - "24:haze", - "28:selfdestruct", - "32:sludgebomb", - "36:toxic", - "40:belch", - "44:explosion", - "48:memento", - "52:destinybond", - "egg:curse", - "egg:grudge", - "egg:painsplit", - "egg:psywave", - "egg:spite", - "egg:spitup", - "egg:stockpile", - "egg:swallow", - "tm:acidspray", - "tm:assurance", - "tm:belch", - "tm:bodyslam", - "tm:clearsmog", - "tm:corrosivegas", - "tm:curse", - "tm:darkpulse", - "tm:destinybond", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:grudge", - "tm:gunkshot", - "tm:gyroball", - "tm:haze", - "tm:incinerate", - "tm:infestation", - "tm:memento", - "tm:painsplit", - "tm:payback", - "tm:poisongas", - "tm:protect", - "tm:psybeam", - "tm:psywave", - "tm:raindance", - "tm:rest", - "tm:rollout", - "tm:scaryface", - "tm:screech", - "tm:selfdestruct", - "tm:shadowball", - "tm:shockwave", - "tm:sleeptalk", - "tm:sludge", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smog", - "tm:smokescreen", - "tm:spite", - "tm:spitup", - "tm:stockpile", - "tm:substitute", - "tm:sunnyday", - "tm:swallow", - "tm:tackle", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:torment", - "tm:toxic", - "tm:toxicspikes", - "tm:venomdrench", - "tm:venoshock", - "tm:willowisp" - ], "evolutions": [ { "id": "koffing_weezing", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json index abd269b018..9d75cb9224 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json @@ -219,158 +219,25 @@ "aspects": [ "gmax" ], - "abilities": [ - "waterabsorb", - "shellarmor", - "h:hydration" - ], - "eggGroups": [ - "monster", - "water_1" - ], - "baseStats": { - "hp": 130, - "attack": 85, - "defence": 80, - "special_attack": 85, - "special_defence": 95, - "speed": 60 - }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 187, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 40, - "baseFriendship": 50, "dynamaxBlocked": true, "behaviour": { "moving": { "swim": { - "canSwimInWater": true, - "canSwimInLava": false, "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canWalkOnWater": true, + "swimSpeed": "0.2", + "canSwimInWater": true, + "canSwimInLava": false + }, + "walk": { + "walkSpeed": 0.15 } + }, + "resting": { + "canSleep": true, + "light": "0-4" } }, - "moves": [ - "1:growl", - "1:watergun", - "5:sing", - "10:mist", - "15:lifedew", - "20:iceshard", - "25:confuseray", - "30:waterpulse", - "35:brine", - "40:bodyslam", - "45:icebeam", - "50:raindance", - "55:hydropump", - "60:perishsong", - "65:sheercold", - "egg:ancientpower", - "egg:curse", - "egg:fissure", - "egg:foresight", - "egg:freezedry", - "egg:horndrill", - "egg:refresh", - "egg:sparklingaria", - "egg:tickle", - "tm:alluringvoice", - "tm:ancientpower", - "tm:aquatail", - "tm:avalanche", - "tm:blizzard", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:charm", - "tm:chillingwater", - "tm:confuseray", - "tm:curse", - "tm:disarmingvoice", - "tm:dive", - "tm:doubleedge", - "tm:dragoncheer", - "tm:dragondance", - "tm:dragonpulse", - "tm:dreameater", - "tm:drillrun", - "tm:earthquake", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:fissure", - "tm:foresight", - "tm:freezedry", - "tm:frostbreath", - "tm:gigaimpact", - "tm:growl", - "tm:hail", - "tm:haze", - "tm:headbutt", - "tm:healbell", - "tm:helpinghand", - "tm:horndrill", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:iceshard", - "tm:iciclespear", - "tm:icywind", - "tm:ironhead", - "tm:irontail", - "tm:lifedew", - "tm:liquidation", - "tm:megahorn", - "tm:mist", - "tm:muddywater", - "tm:outrage", - "tm:perishsong", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:raindance", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:rocksmash", - "tm:safeguard", - "tm:sheercold", - "tm:shockwave", - "tm:signalbeam", - "tm:sing", - "tm:sleeptalk", - "tm:smartstrike", - "tm:snowscape", - "tm:sparklingaria", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:tickle", - "tm:waterfall", - "tm:watergun", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json index 6c37be93e4..206a25d603 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json @@ -48,7 +48,6 @@ "height": 1.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -204,156 +203,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "guts", - "noguard", - "h:steadfast" - ], - "eggGroups": [ - "human_like" - ], - "baseStats": { - "hp": 90, - "attack": 130, - "defence": 80, - "special_attack": 65, - "special_defence": 85, - "speed": 55 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 253, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:lowkick", - "1:leer", - "1:focusenergy", - "1:karatechop", - "1:foresight", - "1:revenge", - "1:submission", - "1:wakeupslap", - "1:wideguard", - "12:lowsweep", - "16:knockoff", - "20:scaryface", - "24:vitalthrow", - "31:strength", - "36:dualchop", - "42:bulkup", - "48:seismictoss", - "54:dynamicpunch", - "60:crosschop", - "66:doubleedge", - "egg:bulletpunch", - "egg:counter", - "egg:meditate", - "egg:powertrick", - "egg:quickguard", - "egg:rollingkick", - "egg:smellingsalts", - "egg:submission", - "egg:tickle", - "egg:wakeupslap", - "tm:assurance", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletpunch", - "tm:closecombat", - "tm:coaching", - "tm:counter", - "tm:crosschop", - "tm:crosspoison", - "tm:darkestlariat", - "tm:dig", - "tm:doubleedge", - "tm:dualchop", - "tm:dynamicpunch", - "tm:earthquake", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:foresight", - "tm:gigaimpact", - "tm:headbutt", - "tm:heavyslam", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:icepunch", - "tm:incinerate", - "tm:karatechop", - "tm:knockoff", - "tm:leer", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:meditate", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mudslap", - "tm:payback", - "tm:poisonjab", - "tm:powertrick", - "tm:poweruppunch", - "tm:protect", - "tm:quickguard", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:rockblast", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:rollingkick", - "tm:scaryface", - "tm:seismictoss", - "tm:sleeptalk", - "tm:smackdown", - "tm:smellingsalts", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:submission", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderpunch", - "tm:tickle", - "tm:vacuumwave", - "tm:vitalthrow", - "tm:wakeupslap", - "tm:wideguard", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json index e23c6cf44b..2d92c9aac1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json @@ -48,7 +48,6 @@ "height": 1.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machop.json b/common/src/main/resources/data/cobblemon/species/generation1/machop.json index c3a3da73c0..7c49102a3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machop.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machop.json @@ -48,7 +48,6 @@ "height": 1.4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json index 28182570de..9c9c94b2cf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json @@ -47,7 +47,6 @@ "height": 1.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json index 443d4f91d6..28a1989f88 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json @@ -52,7 +52,6 @@ "height": 1.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -200,30 +199,6 @@ "lightningrod", "h:rockhead" ], - "eggGroups": [ - "monster" - ], - "baseStats": { - "hp": 60, - "attack": 80, - "defence": 110, - "special_attack": 50, - "special_defence": 80, - "speed": 45 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 149, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 0.8, "hitbox": { "width": 0.7, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json index e3cb79c495..503cccc0b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json @@ -226,9 +226,6 @@ "technician", "h:rattled" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 40, "attack": 35, @@ -237,20 +234,6 @@ "special_defence": 40, "speed": 90 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 58, - "experienceGroup": "medium_fast", - "catchRate": 255, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -416,9 +399,6 @@ "toughclaws", "h:unnerve" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 50, "attack": 65, @@ -435,21 +415,16 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 58, - "experienceGroup": "medium_fast", - "catchRate": 255, - "eggCycles": 20, - "baseFriendship": 50, "behaviour": { + "resting": { + "canSleep": true, + "light": "0-4", + "willSleepOnBed": true + }, "moving": { "walk": { "walkSpeed": 0.2 } - }, - "resting": { - "canSleep": true, - "willSleepOnBed": true, - "light": "0-4" } }, "drops": { @@ -593,147 +568,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "pickup", - "technician", - "h:unnerve" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 40, - "attack": 45, - "defence": 35, - "special_attack": 40, - "special_defence": 40, - "speed": 90 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 58, - "experienceGroup": "medium_fast", - "catchRate": 255, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:growl", - "1:fakeout", - "4:feint", - "8:scratch", - "12:payday", - "16:bite", - "20:taunt", - "24:assurance", - "29:furyswipes", - "32:screech", - "36:slash", - "40:nastyplot", - "44:playrough", - "egg:assist", - "egg:captivate", - "egg:covet", - "egg:feintattack", - "egg:flail", - "egg:hypnosis", - "egg:lastresort", - "egg:nightslash", - "egg:odorsleuth", - "egg:punishment", - "egg:spite", - "egg:tailwhip", - "tm:aerialace", - "tm:agility", - "tm:amnesia", - "tm:assist", - "tm:assurance", - "tm:bite", - "tm:bodyslam", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:covet", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:doubleedge", - "tm:dreameater", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:faketears", - "tm:falseswipe", - "tm:feint", - "tm:feintattack", - "tm:flail", - "tm:flash", - "tm:foulplay", - "tm:furyswipes", - "tm:growl", - "tm:gunkshot", - "tm:headbutt", - "tm:helpinghand", - "tm:honeclaws", - "tm:hypervoice", - "tm:hypnosis", - "tm:icywind", - "tm:irontail", - "tm:knockoff", - "tm:lashout", - "tm:lastresort", - "tm:metalclaw", - "tm:nastyplot", - "tm:nightslash", - "tm:odorsleuth", - "tm:painsplit", - "tm:payback", - "tm:payday", - "tm:playrough", - "tm:powergem", - "tm:protect", - "tm:psychup", - "tm:punishment", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:scratch", - "tm:screech", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:slash", - "tm:sleeptalk", - "tm:snarl", - "tm:snatch", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tailwhip", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:trailblaze", - "tm:uturn", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json b/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json index 5162190601..2bd21b0e70 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json @@ -250,9 +250,6 @@ "steadfast", "h:steadfast" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 106, "attack": 190, @@ -261,182 +258,8 @@ "special_defence": 100, "speed": 130 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 390, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:confusion", - "1:disable", - "1:barrier", - "1:swift", - "1:miracleeye", - "1:mefirst", - "1:laserfocus", - "1:psywave", - "1:lifedew", - "8:ancientpower", - "16:psychocut", - "24:safeguard", - "32:amnesia", - "40:aurasphere", - "48:psychic", - "56:powerswap", - "56:guardswap", - "64:mist", - "72:psystrike", - "80:recover", - "88:futuresight", - "tm:agility", - "tm:allyswitch", - "tm:amnesia", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:barrier", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:bulldoze", - "tm:calmmind", - "tm:chillingwater", - "tm:confuseray", - "tm:confusion", - "tm:curse", - "tm:darkpulse", - "tm:disable", - "tm:dive", - "tm:doubleedge", - "tm:drainpunch", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:electroball", - "tm:embargo", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:hail", - "tm:headbutt", - "tm:helpinghand", - "tm:hex", - "tm:hurricane", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irontail", - "tm:knockoff", - "tm:laserfocus", - "tm:lashout", - "tm:lifedew", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:magiccoat", - "tm:magicroom", - "tm:mefirst", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:miracleeye", - "tm:mist", - "tm:nastyplot", - "tm:nightshade", - "tm:payday", - "tm:poisonjab", - "tm:powergem", - "tm:powerswap", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:psystrike", - "tm:psywave", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:reversal", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:selfdestruct", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:skillswap", - "tm:sleeptalk", - "tm:snatch", - "tm:solarbeam", - "tm:speedswap", - "tm:spite", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:trailblaze", - "tm:triattack", - "tm:trick", - "tm:trickroom", - "tm:weatherball", - "tm:willowisp", - "tm:wonderroom", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true }, @@ -462,9 +285,6 @@ "insomnia", "h:insomnia" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 106, "attack": 150, @@ -473,182 +293,8 @@ "special_defence": 120, "speed": 140 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 390, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:confusion", - "1:disable", - "1:barrier", - "1:swift", - "1:miracleeye", - "1:mefirst", - "1:laserfocus", - "1:psywave", - "1:lifedew", - "8:ancientpower", - "16:psychocut", - "24:safeguard", - "32:amnesia", - "40:aurasphere", - "48:psychic", - "56:powerswap", - "56:guardswap", - "64:mist", - "72:psystrike", - "80:recover", - "88:futuresight", - "tm:agility", - "tm:allyswitch", - "tm:amnesia", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:barrier", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:bulldoze", - "tm:calmmind", - "tm:chillingwater", - "tm:confuseray", - "tm:confusion", - "tm:curse", - "tm:darkpulse", - "tm:disable", - "tm:dive", - "tm:doubleedge", - "tm:drainpunch", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:electroball", - "tm:embargo", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:hail", - "tm:headbutt", - "tm:helpinghand", - "tm:hex", - "tm:hurricane", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irontail", - "tm:knockoff", - "tm:laserfocus", - "tm:lashout", - "tm:lifedew", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:magiccoat", - "tm:magicroom", - "tm:mefirst", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:miracleeye", - "tm:mist", - "tm:nastyplot", - "tm:nightshade", - "tm:payday", - "tm:poisonjab", - "tm:powergem", - "tm:powerswap", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:psystrike", - "tm:psywave", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:reversal", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:selfdestruct", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:skillswap", - "tm:sleeptalk", - "tm:snatch", - "tm:solarbeam", - "tm:speedswap", - "tm:spite", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:trailblaze", - "tm:triattack", - "tm:trick", - "tm:trickroom", - "tm:weatherball", - "tm:willowisp", - "tm:wonderroom", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/moltres.json b/common/src/main/resources/data/cobblemon/species/generation1/moltres.json index fb598aab27..0aa7117b6c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/moltres.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/moltres.json @@ -177,9 +177,6 @@ "berserk", "h:berserk" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 90, "attack": 85, @@ -196,12 +193,7 @@ "special_defence": 3, "speed": 0 }, - "baseExperienceYield": 290, - "experienceGroup": "slow", - "catchRate": 3, "eggCycles": 120, - "baseFriendship": 35, - "behaviour": {}, "drops": { "amount": 6, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json index cb5c7b96fd..7994f3747e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json @@ -53,7 +53,6 @@ "height": 1.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -233,9 +232,6 @@ "screencleaner", "h:icebody" ], - "eggGroups": [ - "human_like" - ], "baseStats": { "hp": 50, "attack": 65, @@ -252,12 +248,6 @@ "special_defence": 0, "speed": 2 }, - "baseExperienceYield": 161, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/muk.json b/common/src/main/resources/data/cobblemon/species/generation1/muk.json index 9a45265fe0..e634a87ecc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/muk.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/muk.json @@ -217,7 +217,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -225,37 +224,6 @@ "gluttony", "h:powerofalchemy" ], - "eggGroups": [ - "amorphous" - ], - "baseStats": { - "hp": 105, - "attack": 105, - "defence": 75, - "special_attack": 65, - "special_defence": 100, - "speed": 50 - }, - "evYield": { - "hp": 1, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 175, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true - } - } - }, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json index 80c13ca49e..5afc3bb64c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json @@ -206,16 +206,12 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ "snowcloak", "h:snowwarning" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 73, "attack": 67, @@ -232,12 +228,6 @@ "special_defence": 0, "speed": 2 }, - "baseExperienceYield": 177, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 7, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/persian.json b/common/src/main/resources/data/cobblemon/species/generation1/persian.json index fcbe54d464..3c806789a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/persian.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/persian.json @@ -213,7 +213,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -221,9 +220,6 @@ "technician", "h:rattled" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 65, "attack": 60, @@ -232,20 +228,6 @@ "special_defence": 65, "speed": 115 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 154, - "experienceGroup": "medium_fast", - "catchRate": 90, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json index 2031c3eb03..f45728a274 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json @@ -170,9 +170,6 @@ "noguard", "h:noguard" ], - "eggGroups": [ - "flying" - ], "baseStats": { "hp": 83, "attack": 80, @@ -181,85 +178,8 @@ "special_defence": 80, "speed": 121 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, "baseExperienceYield": 290, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:tackle", - "1:sandattack", - "1:gust", - "1:quickattack", - "1:hurricane", - "17:whirlwind", - "22:twister", - "27:featherdance", - "32:agility", - "38:wingattack", - "44:roost", - "50:tailwind", - "56:mirrormove", - "62:airslash", - "egg:feintattack", - "egg:foresight", - "egg:pursuit", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:bravebird", - "tm:defog", - "tm:dualwingbeat", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:feintattack", - "tm:fly", - "tm:foresight", - "tm:gigaimpact", - "tm:gust", - "tm:heatwave", - "tm:hurricane", - "tm:hyperbeam", - "tm:laserfocus", - "tm:mirrormove", - "tm:mudslap", - "tm:ominouswind", - "tm:pluck", - "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:roost", - "tm:sandattack", - "tm:skyattack", - "tm:sleeptalk", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:tackle", - "tm:tailwind", - "tm:terablast", - "tm:thief", - "tm:twister", - "tm:uproar", - "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json index 2f37ed35c2..03858c27ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json @@ -258,35 +258,11 @@ "aspects": [ "partner-cap" ], - "abilities": [ - "static", - "h:lightningrod" - ], "eggGroups": [ - "undiscovered" + "undiscovered", + "field", + "fairy" ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 112, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 10, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tailwhip", "1:thundershock", @@ -404,157 +380,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "static", - "h:lightningrod" - ], - "eggGroups": [ - "field", - "fairy" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 112, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 10, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:thundershock", - "1:growl", - "1:tailwhip", - "1:quickattack", - "1:slam", - "1:playnice", - "1:nuzzle", - "1:sweetkiss", - "1:nastyplot", - "1:charm", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "egg:bestow", - "egg:bide", - "egg:charge", - "egg:disarmingvoice", - "egg:doubleslap", - "egg:fakeout", - "egg:flail", - "egg:luckychant", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:alluringvoice", - "tm:babydolleyes", - "tm:bestow", - "tm:bide", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:covet", - "tm:dig", - "tm:disarmingvoice", - "tm:discharge", - "tm:doubleslap", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:faketears", - "tm:feint", - "tm:flail", - "tm:flash", - "tm:fling", - "tm:focuspunch", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:irontail", - "tm:knockoff", - "tm:laserfocus", - "tm:lightscreen", - "tm:luckychant", - "tm:magnetrise", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:nuzzle", - "tm:payday", - "tm:playnice", - "tm:playrough", - "tm:present", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:reversal", - "tm:risingvoltage", - "tm:rocksmash", - "tm:rollout", - "tm:shockwave", - "tm:signalbeam", - "tm:slam", - "tm:sleeptalk", - "tm:spark", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:sweetkiss", - "tm:swift", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave", - "tm:tickle", - "tm:trailblaze", - "tm:upperhand", - "tm:voltswitch", - "tm:volttackle", - "tm:wildcharge", - "tm:wish" - ], "evolutions": [], "battleOnly": true }, @@ -575,156 +401,7 @@ "aspects": [ "region-bias-alola" ], - "abilities": [ - "static", - "h:lightningrod" - ], - "eggGroups": [ - "field", - "fairy" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 112, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 10, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:thundershock", - "1:growl", - "1:tailwhip", - "1:quickattack", - "1:slam", - "1:playnice", - "1:nuzzle", - "1:sweetkiss", - "1:nastyplot", - "1:charm", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "egg:bestow", - "egg:bide", - "egg:charge", - "egg:disarmingvoice", - "egg:doubleslap", - "egg:fakeout", - "egg:flail", - "egg:luckychant", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:alluringvoice", - "tm:babydolleyes", - "tm:bestow", - "tm:bide", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:covet", - "tm:dig", - "tm:disarmingvoice", - "tm:discharge", - "tm:doubleslap", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:faketears", - "tm:feint", - "tm:flail", - "tm:flash", - "tm:fling", - "tm:focuspunch", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:irontail", - "tm:knockoff", - "tm:laserfocus", - "tm:lightscreen", - "tm:luckychant", - "tm:magnetrise", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:nuzzle", - "tm:payday", - "tm:playnice", - "tm:playrough", - "tm:present", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:reversal", - "tm:risingvoltage", - "tm:rocksmash", - "tm:rollout", - "tm:shockwave", - "tm:signalbeam", - "tm:slam", - "tm:sleeptalk", - "tm:spark", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:sweetkiss", - "tm:swift", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave", - "tm:tickle", - "tm:trailblaze", - "tm:upperhand", - "tm:voltswitch", - "tm:volttackle", - "tm:wildcharge", - "tm:wish" - ], "preEvolution": "pichu", "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json index 30333d61dd..f772289570 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json @@ -176,9 +176,6 @@ "aerilate", "h:aerilate" ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 65, "attack": 155, @@ -187,111 +184,8 @@ "special_defence": 90, "speed": 105 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 210, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:visegrip", - "1:harden", - "1:thrash", - "4:focusenergy", - "8:bind", - "12:seismictoss", - "16:bugbite", - "20:stormthrow", - "24:doublehit", - "28:vitalthrow", - "32:xscissor", - "36:strength", - "40:swordsdance", - "44:submission", - "48:guillotine", - "52:superpower", - "egg:feint", - "egg:feintattack", - "egg:flail", - "egg:furyattack", - "egg:mefirst", - "egg:quickattack", - "egg:thrash", - "tm:bind", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bugbite", - "tm:bulkup", - "tm:bulldoze", - "tm:closecombat", - "tm:cut", - "tm:dig", - "tm:doublehit", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:feint", - "tm:feintattack", - "tm:flail", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:furyattack", - "tm:furycutter", - "tm:gigaimpact", - "tm:guillotine", - "tm:harden", - "tm:headbutt", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:irondefense", - "tm:knockoff", - "tm:mefirst", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:revenge", - "tm:reversal", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:seismictoss", - "tm:sleeptalk", - "tm:smackdown", - "tm:stealthrock", - "tm:stoneedge", - "tm:stormthrow", - "tm:strength", - "tm:stringshot", - "tm:strugglebug", - "tm:submission", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swordsdance", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:throatchop", - "tm:visegrip", - "tm:vitalthrow", - "tm:xscissor" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json b/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json index daada4438e..557f6382f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json @@ -191,31 +191,6 @@ "pastelveil", "h:anticipation" ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 50, - "attack": 85, - "defence": 55, - "special_attack": 65, - "special_defence": 65, - "speed": 90 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 82, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json index 78e1bcd1de..129644f188 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json @@ -226,10 +226,6 @@ "surgesurfer", "h:surgesurfer" ], - "eggGroups": [ - "field", - "fairy" - ], "baseStats": { "hp": 60, "attack": 85, @@ -238,34 +234,20 @@ "special_defence": 85, "speed": 110 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, - "baseExperienceYield": 243, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 10, - "baseFriendship": 50, - "baseScale": 0.75, "hitbox": { "width": 0.8, "height": 1.6, "fixed": false }, "behaviour": { + "resting": { + "canSleep": true, + "light": "0-4" + }, "moving": { "swim": { "canWalkOnWater": true } - }, - "resting": { - "canSleep": true, - "light": "0-4" } }, "drops": { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json index a3a296ac57..330c173963 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json @@ -187,7 +187,6 @@ "galarian_form" ], "aspects": [ - "galarian", "galarian" ], "abilities": [ @@ -195,40 +194,6 @@ "pastelveil", "h:anticipation" ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 65, - "attack": 100, - "defence": 70, - "special_attack": 80, - "special_defence": 80, - "speed": 105 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 175, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "resting": { - "light": "0-4" - }, - "moving": { - "walk": { - "walkSpeed": 0.35 - } - } - }, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json index c9ca1026fd..53d25d04f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json @@ -190,7 +190,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -198,9 +197,6 @@ "hustle", "h:thickfat" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 71, @@ -209,20 +205,6 @@ "special_defence": 80, "speed": 77 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 145, - "experienceGroup": "medium_fast", - "catchRate": 127, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json index 4b30d1dc1d..b73c641240 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json @@ -201,31 +201,6 @@ "hustle", "h:thickfat" ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 30, - "attack": 56, - "defence": 35, - "special_attack": 25, - "special_defence": 35, - "speed": 72 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 51, - "experienceGroup": "medium_fast", - "catchRate": 255, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json index fb8bf5f459..47d14c8ea3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json @@ -222,9 +222,6 @@ "snowcloak", "h:slushrush" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 50, "attack": 75, @@ -233,20 +230,6 @@ "special_defence": 35, "speed": 40 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 60, - "experienceGroup": "medium_fast", - "catchRate": 255, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json index 3463fb5833..6000aa8649 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json @@ -205,16 +205,12 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ "snowcloak", "h:slushrush" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 100, @@ -223,20 +219,6 @@ "special_defence": 65, "speed": 65 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 158, - "experienceGroup": "medium_fast", - "catchRate": 90, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json index 1b8b09000b..f0f28f7bf2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json @@ -241,10 +241,6 @@ "shellarmor", "h:shellarmor" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 95, "attack": 75, @@ -253,167 +249,21 @@ "special_defence": 80, "speed": 30 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 207, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, "behaviour": { "moving": { "swim": { - "canSwimInWater": true, - "canSwimInLava": false, + "swimSpeed": "0.2", "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canSwimInWater": true, + "canSwimInLava": false + }, + "walk": { + "walkSpeed": 0.15 } } }, - "moves": [ - "1:curse", - "1:tackle", - "1:growl", - "1:watergun", - "1:withdraw", - "1:futuresight", - "9:yawn", - "12:confusion", - "15:disable", - "18:waterpulse", - "21:headbutt", - "24:zenheadbutt", - "27:amnesia", - "30:surf", - "33:slackoff", - "36:psychic", - "41:psychup", - "46:raindance", - "51:healpulse", - "egg:belch", - "egg:bellydrum", - "egg:block", - "egg:mefirst", - "egg:mudsport", - "egg:snore", - "egg:stomp", - "tm:afteryou", - "tm:amnesia", - "tm:aquatail", - "tm:avalanche", - "tm:belch", - "tm:bellydrum", - "tm:blizzard", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bulldoze", - "tm:calmmind", - "tm:chillingwater", - "tm:confusion", - "tm:curse", - "tm:dig", - "tm:disable", - "tm:dive", - "tm:drainpunch", - "tm:dreameater", - "tm:earthquake", - "tm:echoedvoice", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:hail", - "tm:headbutt", - "tm:healpulse", - "tm:helpinghand", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:irontail", - "tm:lightscreen", - "tm:liquidation", - "tm:magiccoat", - "tm:mefirst", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:muddywater", - "tm:mudshot", - "tm:mudsport", - "tm:nastyplot", - "tm:payday", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:razorshell", - "tm:recycle", - "tm:rest", - "tm:rocksmash", - "tm:safeguard", - "tm:scald", - "tm:shadowball", - "tm:signalbeam", - "tm:skillswap", - "tm:slackoff", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:stomp", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swift", - "tm:tackle", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:thunderwave", - "tm:triattack", - "tm:trick", - "tm:trickroom", - "tm:waterfall", - "tm:watergun", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tm:withdraw", - "tm:wonderroom", - "tm:yawn", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true }, @@ -432,7 +282,6 @@ "galarian_form" ], "aspects": [ - "galarian", "galarian" ], "abilities": [ @@ -440,10 +289,6 @@ "owntempo", "h:regenerator" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 95, "attack": 100, @@ -460,18 +305,16 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 172, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, "behaviour": { "moving": { "swim": { - "canSwimInWater": true, - "canSwimInLava": false, + "swimSpeed": "0.2", "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canSwimInWater": true, + "canSwimInLava": false + }, + "walk": { + "walkSpeed": 0.15 } } }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json index 7c89b63565..cf0c78952b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json @@ -250,39 +250,22 @@ "owntempo", "h:regenerator" ], - "eggGroups": [ - "monster", - "water_1" - ], - "baseStats": { - "hp": 90, - "attack": 65, - "defence": 65, - "special_attack": 40, - "special_defence": 40, - "speed": 15 - }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 63, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, "behaviour": { "moving": { "swim": { - "canSwimInWater": true, - "canSwimInLava": false, + "swimSpeed": "0.2", "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canSwimInWater": true, + "canSwimInLava": false + }, + "walk": { + "walkSpeed": 0.125 } + }, + "resting": { + "canSleep": true, + "willSleepOnBed": true, + "light": "0-16" } }, "drops": { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json index ab873ee7e8..1a8580dc5b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json @@ -251,187 +251,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "immunity", - "thickfat", - "h:gluttony" - ], - "eggGroups": [ - "monster" - ], - "baseStats": { - "hp": 160, - "attack": 110, - "defence": 65, - "special_attack": 65, - "special_defence": 110, - "speed": 30 - }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 189, - "experienceGroup": "slow", - "catchRate": 25, - "eggCycles": 40, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:tackle", - "1:defensecurl", - "1:lick", - "1:block", - "1:recycle", - "1:fling", - "1:lastresort", - "1:chipaway", - "1:covet", - "1:stockpile", - "1:swallow", - "1:screech", - "1:metronome", - "1:flail", - "1:odorsleuth", - "12:yawn", - "16:bite", - "20:rest", - "20:sleeptalk", - "20:snore", - "24:crunch", - "28:bodyslam", - "32:heavyslam", - "36:amnesia", - "40:highhorsepower", - "44:hammerarm", - "48:bellydrum", - "52:belch", - "56:gigaimpact", - "egg:belch", - "egg:chipaway", - "egg:counter", - "egg:curse", - "egg:doubleedge", - "egg:fissure", - "egg:lick", - "egg:naturalgift", - "egg:pursuit", - "egg:whirlwind", - "tm:afteryou", - "tm:amnesia", - "tm:belch", - "tm:bellydrum", - "tm:bite", - "tm:blizzard", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulldoze", - "tm:charm", - "tm:chillingwater", - "tm:chipaway", - "tm:counter", - "tm:covet", - "tm:crunch", - "tm:curse", - "tm:darkestlariat", - "tm:defensecurl", - "tm:dig", - "tm:doubleedge", - "tm:earthquake", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firepunch", - "tm:fissure", - "tm:flail", - "tm:flamethrower", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:gastroacid", - "tm:gigaimpact", - "tm:gunkshot", - "tm:hammerarm", - "tm:hardpress", - "tm:headbutt", - "tm:heatcrash", - "tm:heavyslam", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:iceball", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:incinerate", - "tm:ironhead", - "tm:lastresort", - "tm:lick", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mudslap", - "tm:naturalgift", - "tm:odorsleuth", - "tm:outrage", - "tm:payday", - "tm:poweruppunch", - "tm:protect", - "tm:pursuit", - "tm:raindance", - "tm:recycle", - "tm:rest", - "tm:retaliate", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:rollout", - "tm:sandstorm", - "tm:screech", - "tm:seedbomb", - "tm:selfdestruct", - "tm:shadowball", - "tm:shockwave", - "tm:sleeptalk", - "tm:smackdown", - "tm:snatch", - "tm:snore", - "tm:solarbeam", - "tm:steelroller", - "tm:stockpile", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:superpower", - "tm:surf", - "tm:swallow", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:trailblaze", - "tm:uproar", - "tm:whirlwind", - "tm:wildcharge", - "tm:workup", - "tm:yawn", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tangela.json b/common/src/main/resources/data/cobblemon/species/generation1/tangela.json index 0fba255546..fba7befea7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tangela.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tangela.json @@ -48,7 +48,6 @@ "height": 0.6, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tauros.json b/common/src/main/resources/data/cobblemon/species/generation1/tauros.json index 7640984426..a718c952f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tauros.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tauros.json @@ -53,7 +53,6 @@ "height": 1.4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -180,9 +179,6 @@ "angerpoint", "h:cudchew" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 110, @@ -199,12 +195,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 172, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:tailwhip", @@ -299,9 +289,6 @@ "angerpoint", "h:cudchew" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 110, @@ -318,12 +305,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 172, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:tailwhip", @@ -415,17 +396,14 @@ "paldean_form" ], "aspects": [ - "aqua-breed", - "paldean" + "paldean", + "aqua-breed" ], "abilities": [ "intimidate", "angerpoint", "h:cudchew" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 110, @@ -442,12 +420,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 172, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:tailwhip", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json index 40794fc8cb..3b2c7f12d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json @@ -202,10 +202,6 @@ "thickfat", "h:thickfat" ], - "eggGroups": [ - "monster", - "grass" - ], "baseStats": { "hp": 80, "attack": 100, @@ -214,125 +210,8 @@ "special_defence": 120, "speed": 80 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 1, - "speed": 0 - }, "baseExperienceYield": 313, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:tackle", - "1:growl", - "1:vinewhip", - "1:growth", - "1:petaldance", - "1:petalblizzard", - "9:leechseed", - "12:razorleaf", - "15:poisonpowder", - "15:sleeppowder", - "20:seedbomb", - "25:takedown", - "30:sweetscent", - "37:synthesis", - "44:worryseed", - "51:powerwhip", - "58:solarbeam", - "egg:curse", - "egg:grasswhistle", - "egg:ingrain", - "egg:petaldance", - "egg:skullbash", - "egg:sludge", - "egg:toxic", - "tm:acidspray", - "tm:amnesia", - "tm:bind", - "tm:block", - "tm:bodyslam", - "tm:bulldoze", - "tm:bulletseed", - "tm:charm", - "tm:curse", - "tm:cut", - "tm:doubleedge", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:flash", - "tm:frenzyplant", - "tm:furycutter", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grasspledge", - "tm:grasswhistle", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:growth", - "tm:headbutt", - "tm:helpinghand", - "tm:hyperbeam", - "tm:ingrain", - "tm:knockoff", - "tm:leafstorm", - "tm:leechseed", - "tm:magicalleaf", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:poisonjab", - "tm:poisonpowder", - "tm:powerwhip", - "tm:protect", - "tm:razorleaf", - "tm:rest", - "tm:roar", - "tm:rockclimb", - "tm:rocksmash", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:skullbash", - "tm:sleeppowder", - "tm:sleeptalk", - "tm:sludge", - "tm:sludgebomb", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:strength", - "tm:stringshot", - "tm:substitute", - "tm:sunnyday", - "tm:sweetscent", - "tm:swordsdance", - "tm:synthesis", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:terrainpulse", - "tm:toxic", - "tm:trailblaze", - "tm:venoshock", - "tm:vinewhip", - "tm:weatherball", - "tm:workup", - "tm:worryseed" - ], "evolutions": [], "battleOnly": true }, @@ -353,141 +232,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "overgrow", - "h:chlorophyll" - ], - "eggGroups": [ - "monster", - "grass" - ], - "baseStats": { - "hp": 80, - "attack": 82, - "defence": 83, - "special_attack": 100, - "special_defence": 100, - "speed": 80 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 263, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:tackle", - "1:growl", - "1:vinewhip", - "1:growth", - "1:petaldance", - "1:petalblizzard", - "9:leechseed", - "12:razorleaf", - "15:poisonpowder", - "15:sleeppowder", - "20:seedbomb", - "25:takedown", - "30:sweetscent", - "37:synthesis", - "44:worryseed", - "51:powerwhip", - "58:solarbeam", - "egg:curse", - "egg:grasswhistle", - "egg:ingrain", - "egg:petaldance", - "egg:skullbash", - "egg:sludge", - "egg:toxic", - "tm:acidspray", - "tm:amnesia", - "tm:bind", - "tm:block", - "tm:bodyslam", - "tm:bulldoze", - "tm:bulletseed", - "tm:charm", - "tm:curse", - "tm:cut", - "tm:doubleedge", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:flash", - "tm:frenzyplant", - "tm:furycutter", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grasspledge", - "tm:grasswhistle", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:growth", - "tm:headbutt", - "tm:helpinghand", - "tm:hyperbeam", - "tm:ingrain", - "tm:knockoff", - "tm:leafstorm", - "tm:leechseed", - "tm:magicalleaf", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:poisonjab", - "tm:poisonpowder", - "tm:powerwhip", - "tm:protect", - "tm:razorleaf", - "tm:rest", - "tm:roar", - "tm:rockclimb", - "tm:rocksmash", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:skullbash", - "tm:sleeppowder", - "tm:sleeptalk", - "tm:sludge", - "tm:sludgebomb", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:strength", - "tm:stringshot", - "tm:substitute", - "tm:sunnyday", - "tm:sweetscent", - "tm:swordsdance", - "tm:synthesis", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:terrainpulse", - "tm:toxic", - "tm:trailblaze", - "tm:venoshock", - "tm:vinewhip", - "tm:weatherball", - "tm:workup", - "tm:worryseed" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json b/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json index a9140b48f7..a76de10f75 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json @@ -176,43 +176,6 @@ "aspects": [ "hisuian" ], - "abilities": [ - "soundproof", - "static", - "h:aftermath" - ], - "eggGroups": [ - "mineral" - ], - "baseStats": { - "hp": 40, - "attack": 30, - "defence": 50, - "special_attack": 55, - "special_defence": 55, - "speed": 100 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 66, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json index 7480cb88e2..fb448c7de2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json @@ -206,31 +206,6 @@ "snowcloak", "h:snowwarning" ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 38, - "attack": 41, - "defence": 40, - "special_attack": 50, - "special_defence": 65, - "speed": 65 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 60, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json index 9b435fc7a4..0fe1539dca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json @@ -185,31 +185,6 @@ "neutralizinggas", "h:mistysurge" ], - "eggGroups": [ - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 90, - "defence": 120, - "special_attack": 85, - "special_defence": 70, - "speed": 60 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 172, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json b/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json index 0ba2ee3d3a..ba5b813a61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json @@ -180,9 +180,6 @@ "defiant", "h:defiant" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 90, "attack": 125, @@ -199,12 +196,7 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 290, - "experienceGroup": "slow", - "catchRate": 3, "eggCycles": 120, - "baseFriendship": 35, - "behaviour": {}, "drops": { "amount": 6, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json index d3ada30d42..a2ebb06ee5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json @@ -213,10 +213,6 @@ "moldbreaker", "h:moldbreaker" ], - "eggGroups": [ - "monster", - "field" - ], "baseStats": { "hp": 90, "attack": 95, @@ -225,144 +221,22 @@ "special_defence": 110, "speed": 45 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 305, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, "behaviour": { "moving": { + "walk": { + "walkSpeed": 0.2 + }, "swim": { "canSwimInLava": true } + }, + "resting": { + "canSleep": true, + "light": "0-4" } }, - "moves": [ - "1:firepunch", - "1:tackle", - "1:growl", - "1:thundershock", - "1:thunderwave", - "1:thunderpunch", - "1:zapcannon", - "1:magneticflux", - "1:iondeluge", - "1:dragonpulse", - "11:cottonspore", - "16:charge", - "20:takedown", - "25:electroball", - "29:confuseray", - "35:powergem", - "40:discharge", - "46:cottonguard", - "51:dazzlinggleam", - "57:lightscreen", - "62:thunder", - "egg:afteryou", - "egg:agility", - "egg:eerieimpulse", - "egg:electricterrain", - "egg:electroweb", - "egg:flatter", - "egg:odorsleuth", - "egg:sandattack", - "tm:afteryou", - "tm:agility", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:charge", - "tm:chargebeam", - "tm:confuseray", - "tm:cottonguard", - "tm:cottonspore", - "tm:dazzlinggleam", - "tm:dig", - "tm:discharge", - "tm:doubleedge", - "tm:dragoncheer", - "tm:dragonpulse", - "tm:dragontail", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firepunch", - "tm:flash", - "tm:flatter", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:gigaimpact", - "tm:growl", - "tm:headbutt", - "tm:healbell", - "tm:helpinghand", - "tm:hyperbeam", - "tm:icepunch", - "tm:iondeluge", - "tm:irontail", - "tm:laserfocus", - "tm:lightscreen", - "tm:lowkick", - "tm:magneticflux", - "tm:magnetrise", - "tm:megakick", - "tm:megapunch", - "tm:meteorbeam", - "tm:odorsleuth", - "tm:outrage", - "tm:powergem", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:risingvoltage", - "tm:roar", - "tm:rockclimb", - "tm:rocksmash", - "tm:safeguard", - "tm:sandattack", - "tm:screech", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:swift", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave", - "tm:trailblaze", - "tm:voltswitch", - "tm:wildcharge", - "tm:zapcannon" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json index ac541a75f5..a4c3118c3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 7, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json index 71c95bb616..dcd3ffca02 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json @@ -51,7 +51,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/celebi.json b/common/src/main/resources/data/cobblemon/species/generation2/celebi.json index 0bebc0f09d..aef1a07eba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/celebi.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/celebi.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json index 85675b63c6..8357cb1f60 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json @@ -50,7 +50,6 @@ "height": 0.6, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json b/common/src/main/resources/data/cobblemon/species/generation2/corsola.json index 30d28d9ae9..885a572699 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/corsola.json @@ -204,10 +204,6 @@ "weakarmor", "h:cursedbody" ], - "eggGroups": [ - "water_1", - "water_3" - ], "baseStats": { "hp": 60, "attack": 55, @@ -224,18 +220,13 @@ "special_defence": 1, "speed": 0 }, - "baseExperienceYield": 144, - "experienceGroup": "fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, "behaviour": { "moving": { "swim": { + "swimSpeed": "0.2", "canSwimInWater": true, - "canSwimInLava": false, "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canSwimInLava": false } } }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json index ed2dbf5d33..ab561d0a4e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json @@ -195,123 +195,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "blaze", - "h:flashfire" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 39, - "attack": 52, - "defence": 43, - "special_attack": 60, - "special_defence": 50, - "speed": 65 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 62, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:tackle", - "1:leer", - "6:smokescreen", - "10:ember", - "13:quickattack", - "19:flamewheel", - "22:defensecurl", - "28:flamecharge", - "31:swift", - "37:lavaplume", - "40:flamethrower", - "46:inferno", - "49:rollout", - "55:doubleedge", - "58:overheat", - "64:eruption", - "egg:covet", - "egg:crushclaw", - "egg:curse", - "egg:doublekick", - "egg:extrasensory", - "egg:flameburst", - "egg:foresight", - "egg:furyswipes", - "egg:howl", - "egg:reversal", - "egg:thrash", - "tm:aerialace", - "tm:bodyslam", - "tm:burningjealousy", - "tm:burnup", - "tm:covet", - "tm:crushclaw", - "tm:curse", - "tm:cut", - "tm:defensecurl", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:ember", - "tm:endure", - "tm:eruption", - "tm:extrasensory", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firepledge", - "tm:firespin", - "tm:flameburst", - "tm:flamecharge", - "tm:flamethrower", - "tm:flamewheel", - "tm:flareblitz", - "tm:foresight", - "tm:furyswipes", - "tm:headbutt", - "tm:heatwave", - "tm:howl", - "tm:incinerate", - "tm:inferno", - "tm:ironhead", - "tm:lavaplume", - "tm:leer", - "tm:naturepower", - "tm:overheat", - "tm:playrough", - "tm:protect", - "tm:quickattack", - "tm:rest", - "tm:reversal", - "tm:roar", - "tm:rollout", - "tm:sleeptalk", - "tm:smokescreen", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tackle", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thrash", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [ { "id": "cyndaquil_quilava", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json b/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json index b3d8c1e876..efe8ccca30 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/entei.json b/common/src/main/resources/data/cobblemon/species/generation2/entei.json index 2bac92d306..5ae79a1cce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/entei.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/entei.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json index e2bb0e0049..9b5563c89a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json @@ -47,7 +47,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/furret.json b/common/src/main/resources/data/cobblemon/species/generation2/furret.json index 9652b30cb4..dfe100d7dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/furret.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/furret.json @@ -48,7 +48,6 @@ "height": 1.42, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json b/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json index d6002fa6f1..ef9a493477 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json @@ -49,7 +49,6 @@ "height": 1.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json index e5f2ca5258..15222dbd16 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json @@ -49,7 +49,6 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/heracross.json b/common/src/main/resources/data/cobblemon/species/generation2/heracross.json index 00be97d53a..cf62e022bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/heracross.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/heracross.json @@ -198,9 +198,6 @@ "skilllink", "h:skilllink" ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 80, "attack": 185, @@ -209,131 +206,8 @@ "special_defence": 105, "speed": 75 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 210, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:nightslash", - "1:tackle", - "1:leer", - "1:feint", - "1:chipaway", - "1:armthrust", - "5:furyattack", - "10:endure", - "15:aerialace", - "20:hornattack", - "25:counter", - "30:brickbreak", - "35:pinmissile", - "40:throatchop", - "45:thrash", - "50:swordsdance", - "55:megahorn", - "60:closecombat", - "egg:bide", - "egg:doubleedge", - "egg:feint", - "egg:flail", - "egg:harden", - "egg:nightslash", - "egg:pursuit", - "egg:seismictoss", - "tm:aerialace", - "tm:armthrust", - "tm:assurance", - "tm:bide", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bugbite", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:chipaway", - "tm:closecombat", - "tm:coaching", - "tm:counter", - "tm:curse", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:feint", - "tm:flail", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:furyattack", - "tm:furycutter", - "tm:gigaimpact", - "tm:harden", - "tm:headbutt", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hornattack", - "tm:hyperbeam", - "tm:irondefense", - "tm:knockoff", - "tm:leer", - "tm:lowkick", - "tm:lunge", - "tm:megahorn", - "tm:nightslash", - "tm:pinmissile", - "tm:pounce", - "tm:protect", - "tm:pursuit", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:rockblast", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:seismictoss", - "tm:shadowclaw", - "tm:skittersmack", - "tm:sleeptalk", - "tm:smackdown", - "tm:smartstrike", - "tm:spikes", - "tm:stoneedge", - "tm:strength", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:swordsdance", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:throatchop", - "tm:trailblaze", - "tm:upperhand", - "tm:vacuumwave", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hooh.json b/common/src/main/resources/data/cobblemon/species/generation2/hooh.json index 20abf8f219..1dc1ad3fe2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hooh.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hooh.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json b/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json index dcf72d6874..091c4b2241 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json b/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json index 314373596b..b344a9e6c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 6, "entries": [ @@ -208,9 +207,6 @@ "solarpower", "h:solarpower" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 90, @@ -219,135 +215,8 @@ "special_defence": 90, "speed": 115 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 210, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:thunderfang", - "1:leer", - "1:ember", - "1:howl", - "1:smog", - "1:odorsleuth", - "1:feintattack", - "1:nastyplot", - "13:roar", - "16:bite", - "20:incinerate", - "26:beatup", - "30:firefang", - "35:torment", - "41:comeuppance", - "45:foulplay", - "50:flamethrower", - "56:crunch", - "62:inferno", - "egg:counter", - "egg:destinybond", - "egg:feint", - "egg:firespin", - "egg:punishment", - "egg:pursuit", - "egg:rage", - "egg:reversal", - "egg:spite", - "egg:suckerpunch", - "egg:thunderfang", - "tm:beatup", - "tm:bite", - "tm:bodyslam", - "tm:burningjealousy", - "tm:comeuppance", - "tm:counter", - "tm:crunch", - "tm:darkpulse", - "tm:destinybond", - "tm:doubleedge", - "tm:dreameater", - "tm:embargo", - "tm:ember", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:feint", - "tm:feintattack", - "tm:fireblast", - "tm:firefang", - "tm:firespin", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:foulplay", - "tm:gigaimpact", - "tm:headbutt", - "tm:heatwave", - "tm:helpinghand", - "tm:howl", - "tm:hyperbeam", - "tm:hypervoice", - "tm:incinerate", - "tm:inferno", - "tm:irontail", - "tm:laserfocus", - "tm:lashout", - "tm:leer", - "tm:mudshot", - "tm:mudslap", - "tm:nastyplot", - "tm:odorsleuth", - "tm:overheat", - "tm:painsplit", - "tm:payback", - "tm:protect", - "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:scaryface", - "tm:shadowball", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:smog", - "tm:snarl", - "tm:snatch", - "tm:solarbeam", - "tm:spite", - "tm:strength", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:superfang", - "tm:takedown", - "tm:taunt", - "tm:temperflare", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderfang", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:willowisp" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation2/houndour.json b/common/src/main/resources/data/cobblemon/species/generation2/houndour.json index 98c1cb10e3..dd4825788a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/houndour.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/houndour.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json b/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json index 56c6da8758..9c66a02509 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json @@ -51,7 +51,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json b/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json index eb0df10252..5ca0d64688 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lugia.json b/common/src/main/resources/data/cobblemon/species/generation2/lugia.json index 678700c115..f4000a725b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/lugia.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/lugia.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/magby.json b/common/src/main/resources/data/cobblemon/species/generation2/magby.json index 769f680a0b..bc3d098119 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/magby.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/magby.json @@ -48,7 +48,6 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json b/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json index 6f150f8cbb..14651007d9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json @@ -47,7 +47,6 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json index 25a4616fd0..f83f589a27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json @@ -50,7 +50,6 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -179,116 +178,7 @@ "aspects": [ "region-bias-alola" ], - "abilities": [ - "static", - "h:lightningrod" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 20, - "attack": 40, - "defence": 15, - "special_attack": 35, - "special_defence": 35, - "speed": 60 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 41, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 10, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:thundershock", - "1:tailwhip", - "4:playnice", - "8:sweetkiss", - "12:nuzzle", - "16:nastyplot", - "20:charm", - "egg:bestow", - "egg:bide", - "egg:charge", - "egg:disarmingvoice", - "egg:doubleslap", - "egg:fakeout", - "egg:flail", - "egg:luckychant", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:babydolleyes", - "tm:bestow", - "tm:bide", - "tm:bodyslam", - "tm:charge", - "tm:charm", - "tm:covet", - "tm:disarmingvoice", - "tm:doubleslap", - "tm:echoedvoice", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:flail", - "tm:flash", - "tm:fling", - "tm:grassknot", - "tm:headbutt", - "tm:helpinghand", - "tm:irontail", - "tm:lightscreen", - "tm:luckychant", - "tm:magnetrise", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:nuzzle", - "tm:playnice", - "tm:playrough", - "tm:present", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:reversal", - "tm:rollout", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:substitute", - "tm:surf", - "tm:sweetkiss", - "tm:swift", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave", - "tm:tickle", - "tm:trailblaze", - "tm:voltswitch", - "tm:volttackle", - "tm:wildcharge", - "tm:wish" - ], "evolutions": [ { "id": "pichu_pikachu", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json index 1e1096d370..421981ad2d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json @@ -225,128 +225,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "blaze", - "h:flashfire" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 58, - "attack": 64, - "defence": 58, - "special_attack": 80, - "special_defence": 65, - "speed": 80 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 142, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:tackle", - "1:leer", - "1:smokescreen", - "10:ember", - "13:quickattack", - "20:flamewheel", - "24:defensecurl", - "31:swift", - "35:flamecharge", - "42:lavaplume", - "46:flamethrower", - "53:inferno", - "57:rollout", - "64:doubleedge", - "68:overheat", - "75:eruption", - "egg:covet", - "egg:crushclaw", - "egg:curse", - "egg:doublekick", - "egg:extrasensory", - "egg:flameburst", - "egg:foresight", - "egg:furyswipes", - "egg:howl", - "egg:reversal", - "egg:thrash", - "tm:aerialace", - "tm:bodyslam", - "tm:brickbreak", - "tm:burningjealousy", - "tm:burnup", - "tm:covet", - "tm:crushclaw", - "tm:curse", - "tm:cut", - "tm:defensecurl", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:ember", - "tm:endeavor", - "tm:endure", - "tm:eruption", - "tm:extrasensory", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firepledge", - "tm:firespin", - "tm:flameburst", - "tm:flamecharge", - "tm:flamethrower", - "tm:flamewheel", - "tm:flareblitz", - "tm:foresight", - "tm:furycutter", - "tm:furyswipes", - "tm:headbutt", - "tm:heatwave", - "tm:howl", - "tm:incinerate", - "tm:inferno", - "tm:ironhead", - "tm:lavaplume", - "tm:leer", - "tm:naturepower", - "tm:overheat", - "tm:playrough", - "tm:protect", - "tm:quickattack", - "tm:rest", - "tm:reversal", - "tm:roar", - "tm:rocksmash", - "tm:rollout", - "tm:sleeptalk", - "tm:smokescreen", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tackle", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thrash", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:zenheadbutt" - ], "preEvolution": "cyndaquil", "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json b/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json index 5d28103447..f63c6dfad3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json @@ -219,52 +219,6 @@ "aspects": [ "hisuian" ], - "abilities": [ - "poisonpoint", - "swiftswim", - "h:intimidate" - ], - "eggGroups": [ - "water_2" - ], - "baseStats": { - "hp": 65, - "attack": 95, - "defence": 85, - "special_attack": 55, - "special_defence": 55, - "speed": 85 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 88, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "walk": { - "avoidsLand": true - }, - "swim": { - "swimSpeed": 0.3, - "canBreatheUnderwater": true, - "canSwimInWater": true, - "canSwimInLava": false - } - }, - "resting": { - "canSleep": true, - "light": "0-4" - } - }, "moves": [ "1:tackle", "1:poisonsting", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/raikou.json b/common/src/main/resources/data/cobblemon/species/generation2/raikou.json index 4057c4dd1e..dc5803f99c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/raikou.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/raikou.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json index 653f520ace..8503112eda 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json @@ -200,9 +200,6 @@ "technician", "h:technician" ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 70, "attack": 150, @@ -211,132 +208,8 @@ "special_defence": 100, "speed": 75 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 210, - "experienceGroup": "medium_fast", - "catchRate": 25, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:bulletpunch", - "1:quickattack", - "1:leer", - "1:pursuit", - "1:falseswipe", - "1:agility", - "1:furycutter", - "1:razorwind", - "1:nightslash", - "1:feint", - "1:wingattack", - "1:airslash", - "12:metalclaw", - "16:doubleteam", - "20:doublehit", - "24:slash", - "28:focusenergy", - "32:irondefense", - "36:ironhead", - "40:xscissor", - "44:swordsdance", - "egg:counter", - "egg:defog", - "egg:feint", - "egg:nightslash", - "egg:quickguard", - "egg:razorwind", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:assurance", - "tm:batonpass", - "tm:brickbreak", - "tm:brutalswing", - "tm:bugbite", - "tm:bugbuzz", - "tm:bulletpunch", - "tm:closecombat", - "tm:counter", - "tm:crosspoison", - "tm:curse", - "tm:cut", - "tm:defog", - "tm:doubleedge", - "tm:doublehit", - "tm:doubleteam", - "tm:dualwingbeat", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:feint", - "tm:flashcannon", - "tm:fling", - "tm:focusenergy", - "tm:furycutter", - "tm:gigaimpact", - "tm:hardpress", - "tm:headbutt", - "tm:helpinghand", - "tm:hyperbeam", - "tm:irondefense", - "tm:ironhead", - "tm:knockoff", - "tm:laserfocus", - "tm:leer", - "tm:lightscreen", - "tm:lunge", - "tm:metalclaw", - "tm:nightslash", - "tm:ominouswind", - "tm:pounce", - "tm:protect", - "tm:psychocut", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", - "tm:raindance", - "tm:razorwind", - "tm:rest", - "tm:reversal", - "tm:rocksmash", - "tm:roost", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:silverwind", - "tm:skittersmack", - "tm:slash", - "tm:sleeptalk", - "tm:steelbeam", - "tm:steelwing", - "tm:strength", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:trailblaze", - "tm:uturn", - "tm:vacuumwave", - "tm:wingattack", - "tm:xscissor" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sentret.json b/common/src/main/resources/data/cobblemon/species/generation2/sentret.json index 272c882e1c..903232b209 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sentret.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sentret.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json b/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json index 9936e8eefa..11e66e60b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json index 4c7a72d3bf..8f03d2e59a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json @@ -249,7 +249,6 @@ "galarian_form" ], "aspects": [ - "galarian", "galarian" ], "abilities": [ @@ -257,10 +256,6 @@ "owntempo", "h:regenerator" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 95, "attack": 65, @@ -269,29 +264,16 @@ "special_defence": 110, "speed": 30 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 172, - "experienceGroup": "medium_fast", - "catchRate": 70, - "eggCycles": 20, - "baseFriendship": 50, "behaviour": { "moving": { - "walk": { - "walkSpeed": 0.23 - }, "swim": { + "canBreatheUnderwater": true, "canSwimInWater": true, "canSwimInLava": false, - "canBreatheUnderwater": true, "swimSpeed": "0.2" + }, + "walk": { + "walkSpeed": 0.23 } } }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json index d5899c429a..bb29f04e48 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json @@ -51,7 +51,6 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json index e45dea9ce5..70af970148 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json @@ -53,7 +53,6 @@ "height": 1.25, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -230,42 +229,6 @@ "aspects": [ "hisuian" ], - "abilities": [ - "innerfocus", - "keeneye", - "h:pickpocket" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 55, - "attack": 95, - "defence": 55, - "special_attack": 35, - "special_defence": 75, - "speed": 115 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 86, - "experienceGroup": "medium_slow", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 35, - "baseScale": 0.8, - "hitbox": { - "width": 0.6, - "height": 1.25, - "fixed": false - }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json index 244599ef4d..68aa24bc8b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json index 6ffd4ee2b8..0b13b3799f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json @@ -227,9 +227,6 @@ "sandforce", "h:sandforce" ], - "eggGroups": [ - "mineral" - ], "baseStats": { "hp": 75, "attack": 125, @@ -238,153 +235,8 @@ "special_defence": 95, "speed": 30 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 214, - "experienceGroup": "medium_fast", - "catchRate": 25, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, - "moves": [ - "1:thunderfang", - "1:icefang", - "1:firefang", - "1:mudsport", - "1:tackle", - "1:harden", - "1:bind", - "1:rockthrow", - "1:rage", - "1:rockpolish", - "1:crunch", - "4:smackdown", - "8:autotomize", - "12:dragonbreath", - "16:curse", - "20:rockslide", - "24:screech", - "28:sandtomb", - "32:stealthrock", - "36:slam", - "40:sandstorm", - "44:dig", - "48:irontail", - "52:stoneedge", - "56:doubleedge", - "60:magnetrise", - "egg:block", - "egg:defensecurl", - "egg:dragontail", - "egg:flail", - "egg:headsmash", - "egg:rollout", - "egg:rototiller", - "egg:wideguard", - "tm:ancientpower", - "tm:aquatail", - "tm:autotomize", - "tm:bind", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brutalswing", - "tm:bulldoze", - "tm:crunch", - "tm:curse", - "tm:cut", - "tm:darkpulse", - "tm:defensecurl", - "tm:dig", - "tm:doubleedge", - "tm:dragonbreath", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:drillrun", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:firefang", - "tm:flail", - "tm:flashcannon", - "tm:gigaimpact", - "tm:gyroball", - "tm:harden", - "tm:headbutt", - "tm:headsmash", - "tm:heavyslam", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:iceball", - "tm:icefang", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:magnetrise", - "tm:meteorbeam", - "tm:mudslap", - "tm:mudsport", - "tm:naturepower", - "tm:payback", - "tm:powershift", - "tm:protect", - "tm:psychicfangs", - "tm:psychup", - "tm:rage", - "tm:rest", - "tm:roar", - "tm:rockblast", - "tm:rockclimb", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rockthrow", - "tm:rocktomb", - "tm:rollout", - "tm:rototiller", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaryface", - "tm:scorchingsands", - "tm:screech", - "tm:selfdestruct", - "tm:slam", - "tm:sleeptalk", - "tm:smackdown", - "tm:stealthrock", - "tm:steelbeam", - "tm:steelroller", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:tackle", - "tm:taunt", - "tm:terablast", - "tm:thunderfang", - "tm:torment", - "tm:twister", - "tm:wideguard" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation2/suicune.json b/common/src/main/resources/data/cobblemon/species/generation2/suicune.json index 85e954e0e9..1244cac59b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/suicune.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/suicune.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/togepi.json b/common/src/main/resources/data/cobblemon/species/generation2/togepi.json index dee1ab346b..a7e37c7859 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/togepi.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/togepi.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json index 530503c395..6c8fc304f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json index eda8ccb4c4..2084dab62d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json @@ -216,9 +216,6 @@ "blaze", "h:frisk" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 73, "attack": 84, @@ -227,26 +224,7 @@ "special_defence": 85, "speed": 95 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 267, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 0.75, - "hitbox": { - "width": 1.35, - "height": 2.65, - "fixed": false - }, - "behaviour": {}, "moves": [ "1:infernalparade", "1:gyroball", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json b/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json index 3225f827a3..c935ca63e5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json @@ -245,9 +245,6 @@ "sandstream", "h:sandstream" ], - "eggGroups": [ - "monster" - ], "baseStats": { "hp": 100, "attack": 164, @@ -256,175 +253,8 @@ "special_defence": 120, "speed": 71 }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 40, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInLava": true - } - } - }, - "moves": [ - "1:thunderfang", - "1:icefang", - "1:firefang", - "1:leer", - "1:darkpulse", - "1:payback", - "1:chipaway", - "1:irondefense", - "1:tackle", - "1:rockthrow", - "9:bite", - "12:scaryface", - "15:rockslide", - "18:stompingtantrum", - "21:screech", - "24:smackdown", - "27:crunch", - "33:earthquake", - "37:stoneedge", - "42:thrash", - "47:sandstorm", - "52:hyperbeam", - "59:gigaimpact", - "egg:ancientpower", - "egg:assurance", - "egg:curse", - "egg:dragondance", - "egg:focusenergy", - "egg:irondefense", - "egg:ironhead", - "egg:outrage", - "egg:pursuit", - "egg:stomp", - "tm:aerialace", - "tm:ancientpower", - "tm:aquatail", - "tm:assurance", - "tm:avalanche", - "tm:bite", - "tm:blizzard", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:chipaway", - "tm:crunch", - "tm:curse", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:doubleedge", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firepunch", - "tm:flamethrower", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:foulplay", - "tm:furycutter", - "tm:gigaimpact", - "tm:hardpress", - "tm:headbutt", - "tm:heavyslam", - "tm:helpinghand", - "tm:highhorsepower", - "tm:honeclaws", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icepunch", - "tm:icywind", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:knockoff", - "tm:lashout", - "tm:leer", - "tm:lowkick", - "tm:megakick", - "tm:megapunch", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:outrage", - "tm:payback", - "tm:powergem", - "tm:poweruppunch", - "tm:protect", - "tm:pursuit", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:roar", - "tm:rockblast", - "tm:rockclimb", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rockthrow", - "tm:rocktomb", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaryface", - "tm:screech", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:smackdown", - "tm:snarl", - "tm:spite", - "tm:stealthrock", - "tm:stomp", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:surf", - "tm:tackle", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thrash", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json index 57ad6d7f70..db9fa53d11 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json @@ -47,7 +47,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/unown.json b/common/src/main/resources/data/cobblemon/species/generation2/unown.json index 0ad5fbf8f8..15137f9de8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/unown.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/unown.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -79,38 +78,6 @@ "aspects": [ "character-b" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -129,38 +96,6 @@ "aspects": [ "character-c" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -179,38 +114,6 @@ "aspects": [ "character-d" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -229,38 +132,6 @@ "aspects": [ "character-e" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -279,38 +150,6 @@ "aspects": [ "character-f" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -329,38 +168,6 @@ "aspects": [ "character-g" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -379,38 +186,6 @@ "aspects": [ "character-h" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -429,38 +204,6 @@ "aspects": [ "character-i" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -479,38 +222,6 @@ "aspects": [ "character-j" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -529,38 +240,6 @@ "aspects": [ "character-k" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -579,38 +258,6 @@ "aspects": [ "character-l" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -629,38 +276,6 @@ "aspects": [ "character-m" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -679,38 +294,6 @@ "aspects": [ "character-n" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -729,38 +312,6 @@ "aspects": [ "character-o" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -779,38 +330,6 @@ "aspects": [ "character-p" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -829,38 +348,6 @@ "aspects": [ "character-q" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -879,38 +366,6 @@ "aspects": [ "character-r" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -929,38 +384,6 @@ "aspects": [ "character-s" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -979,38 +402,6 @@ "aspects": [ "character-t" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -1029,38 +420,6 @@ "aspects": [ "character-u" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -1079,38 +438,6 @@ "aspects": [ "character-v" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -1129,38 +456,6 @@ "aspects": [ "character-w" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -1179,38 +474,6 @@ "aspects": [ "character-x" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -1229,38 +492,6 @@ "aspects": [ "character-y" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -1279,38 +510,6 @@ "aspects": [ "character-z" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -1320,47 +519,12 @@ "maleRatio": -1, "height": 5, "weight": 50, - "pokedex": [ - "cobblemon.species.unown.desc" - ], "labels": [ "gen3" ], "aspects": [ "character-!" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false }, @@ -1370,47 +534,12 @@ "maleRatio": -1, "height": 5, "weight": 50, - "pokedex": [ - "cobblemon.species.unown.desc" - ], "labels": [ "gen3" ], "aspects": [ "character-?" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:hiddenpower", - "tm:hiddenpower" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json index 209ed71082..2e0297fb3c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json @@ -48,7 +48,6 @@ "height": 2.14, "fixed": false }, - "behaviour": {}, "drops": { "amount": 7, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/wooper.json b/common/src/main/resources/data/cobblemon/species/generation2/wooper.json index 503c377dc3..d16c2993f0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/wooper.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/wooper.json @@ -223,41 +223,6 @@ "waterabsorb", "h:unaware" ], - "eggGroups": [ - "water_1", - "field" - ], - "baseStats": { - "hp": 55, - "attack": 45, - "defence": 45, - "special_attack": 25, - "special_defence": 25, - "speed": 15 - }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 42, - "experienceGroup": "medium_fast", - "catchRate": 255, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true, - "canSwimInLava": false, - "canBreatheUnderwater": true, - "swimSpeed": "0.2" - } - } - }, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/absol.json b/common/src/main/resources/data/cobblemon/species/generation3/absol.json index 54a4823827..9ea7fd959b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/absol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/absol.json @@ -48,7 +48,6 @@ "height": 2.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -213,9 +212,6 @@ "magicbounce", "h:magicbounce" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 65, "attack": 150, @@ -224,150 +220,8 @@ "special_defence": 60, "speed": 115 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 198, - "experienceGroup": "medium_slow", - "catchRate": 30, - "eggCycles": 25, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:scratch", - "1:feint", - "1:leer", - "1:quickattack", - "1:razorwind", - "1:pursuit", - "1:bite", - "1:mefirst", - "5:doubleteam", - "10:knockoff", - "15:detect", - "20:taunt", - "25:slash", - "30:nightslash", - "35:focusenergy", - "40:suckerpunch", - "45:swordsdance", - "50:futuresight", - "55:perishsong", - "egg:bite", - "egg:curse", - "egg:doubleedge", - "egg:feint", - "egg:feintattack", - "egg:magiccoat", - "egg:meanlook", - "egg:mefirst", - "egg:perishsong", - "egg:punishment", - "tm:aerialace", - "tm:airslash", - "tm:assurance", - "tm:batonpass", - "tm:bite", - "tm:blizzard", - "tm:bodyslam", - "tm:bounce", - "tm:brutalswing", - "tm:calmmind", - "tm:chargebeam", - "tm:closecombat", - "tm:curse", - "tm:cut", - "tm:darkpulse", - "tm:detect", - "tm:doubleedge", - "tm:doubleteam", - "tm:dreameater", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:feint", - "tm:feintattack", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:focusenergy", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigaimpact", - "tm:hail", - "tm:headbutt", - "tm:hex", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:incinerate", - "tm:irontail", - "tm:knockoff", - "tm:laserfocus", - "tm:leer", - "tm:magiccoat", - "tm:meanlook", - "tm:mefirst", - "tm:megahorn", - "tm:mudslap", - "tm:nightslash", - "tm:payback", - "tm:perishsong", - "tm:playrough", - "tm:protect", - "tm:psychocut", - "tm:psychup", - "tm:punishment", - "tm:pursuit", - "tm:quickattack", - "tm:raindance", - "tm:razorwind", - "tm:rest", - "tm:retaliate", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:sandstorm", - "tm:scratch", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:slash", - "tm:sleeptalk", - "tm:snarl", - "tm:snatch", - "tm:spite", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:superpower", - "tm:swift", - "tm:swordsdance", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:waterpulse", - "tm:willowisp", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/aggron.json b/common/src/main/resources/data/cobblemon/species/generation3/aggron.json index 371a7f9d30..4d4d466831 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/aggron.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/aggron.json @@ -231,9 +231,6 @@ "filter", "h:filter" ], - "eggGroups": [ - "monster" - ], "baseStats": { "hp": 70, "attack": 140, @@ -242,156 +239,8 @@ "special_defence": 80, "speed": 50 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 315, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 35, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:tackle", - "1:harden", - "1:metalclaw", - "1:rocktomb", - "12:roar", - "16:headbutt", - "20:protect", - "24:rockslide", - "28:ironhead", - "35:metalsound", - "40:takedown", - "48:autotomize", - "56:irontail", - "64:irondefense", - "72:heavyslam", - "80:doubleedge", - "88:metalburst", - "egg:curse", - "egg:dragonrush", - "egg:endeavor", - "egg:headsmash", - "egg:mudslap", - "egg:smellingsalts", - "egg:stomp", - "tm:aerialace", - "tm:ancientpower", - "tm:aquatail", - "tm:autotomize", - "tm:avalanche", - "tm:blizzard", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:crunch", - "tm:curse", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:doubleedge", - "tm:dragonclaw", - "tm:dragonpulse", - "tm:dragonrush", - "tm:dragontail", - "tm:earthpower", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:flashcannon", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:furycutter", - "tm:gigaimpact", - "tm:harden", - "tm:headbutt", - "tm:headsmash", - "tm:heavyslam", - "tm:highhorsepower", - "tm:honeclaws", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:lowkick", - "tm:magnetrise", - "tm:megakick", - "tm:megapunch", - "tm:metalburst", - "tm:metalclaw", - "tm:metalsound", - "tm:meteorbeam", - "tm:mudslap", - "tm:outrage", - "tm:payback", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:reversal", - "tm:roar", - "tm:rockblast", - "tm:rockclimb", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:rollout", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaryface", - "tm:screech", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:smackdown", - "tm:smartstrike", - "tm:smellingsalts", - "tm:solarbeam", - "tm:spite", - "tm:stealthrock", - "tm:steelbeam", - "tm:steelroller", - "tm:stomp", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:surf", - "tm:tackle", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:uproar", - "tm:waterpulse", - "tm:whirlpool" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json index 2a551e1d52..e6a82e2e93 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ @@ -209,10 +208,6 @@ "pixilate", "h:pixilate" ], - "eggGroups": [ - "flying", - "dragon" - ], "baseStats": { "hp": 75, "attack": 110, @@ -221,141 +216,8 @@ "special_defence": 105, "speed": 80 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, "baseExperienceYield": 207, - "experienceGroup": "erratic", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:pluck", - "1:peck", - "1:growl", - "1:astonish", - "1:mist", - "1:refresh", - "1:dragonpulse", - "1:disarmingvoice", - "1:naturalgift", - "12:furyattack", - "16:round", - "20:dragonbreath", - "24:safeguard", - "28:sing", - "32:cottonguard", - "38:takedown", - "44:moonblast", - "50:perishsong", - "56:skyattack", - "egg:astonish", - "egg:defog", - "egg:dragonbreath", - "egg:dragonrush", - "egg:featherdance", - "egg:haze", - "egg:mirrormove", - "egg:pursuit", - "egg:rage", - "egg:refresh", - "egg:roost", - "egg:tailwind", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:alluringvoice", - "tm:astonish", - "tm:bodyslam", - "tm:bravebird", - "tm:breakingswipe", - "tm:bulldoze", - "tm:cottonguard", - "tm:dazzlinggleam", - "tm:defog", - "tm:disarmingvoice", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonbreath", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragonrush", - "tm:dreameater", - "tm:dualwingbeat", - "tm:earthquake", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fireblast", - "tm:firespin", - "tm:flamethrower", - "tm:fly", - "tm:furyattack", - "tm:gigaimpact", - "tm:growl", - "tm:haze", - "tm:healbell", - "tm:heatwave", - "tm:helpinghand", - "tm:honeclaws", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:incinerate", - "tm:irontail", - "tm:mirrormove", - "tm:mist", - "tm:moonblast", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:peck", - "tm:perishsong", - "tm:playrough", - "tm:pluck", - "tm:powerswap", - "tm:protect", - "tm:pursuit", - "tm:rage", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:roar", - "tm:rocksmash", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:sing", - "tm:skyattack", - "tm:sleeptalk", - "tm:snowscape", - "tm:solarbeam", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:trailblaze", - "tm:twister", - "tm:weatherball", - "tm:willowisp", - "tm:wonderroom" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/azurill.json b/common/src/main/resources/data/cobblemon/species/generation3/azurill.json index 49fee1d54c..09b1198e8a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/azurill.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/azurill.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/banette.json b/common/src/main/resources/data/cobblemon/species/generation3/banette.json index 9986d4ac83..0f4a8b3e33 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/banette.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/banette.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -186,9 +185,6 @@ "prankster", "h:prankster" ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 64, "attack": 165, @@ -197,127 +193,8 @@ "special_defence": 83, "speed": 75 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 194, - "experienceGroup": "fast", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:knockoff", - "1:screech", - "1:nightshade", - "1:spite", - "1:feintattack", - "1:astonish", - "16:willowisp", - "19:shadowsneak", - "22:hex", - "26:curse", - "30:shadowball", - "34:roleplay", - "40:suckerpunch", - "46:trick", - "53:phantomforce", - "egg:astonish", - "egg:confuseray", - "egg:destinybond", - "egg:disable", - "egg:foresight", - "egg:gunkshot", - "egg:imprison", - "egg:pursuit", - "egg:shadowsneak", - "tm:allyswitch", - "tm:astonish", - "tm:burningjealousy", - "tm:calmmind", - "tm:chargebeam", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:feintattack", - "tm:flash", - "tm:fling", - "tm:foresight", - "tm:foulplay", - "tm:gigaimpact", - "tm:grudge", - "tm:gunkshot", - "tm:headbutt", - "tm:helpinghand", - "tm:hex", - "tm:hyperbeam", - "tm:icywind", - "tm:imprison", - "tm:infestation", - "tm:knockoff", - "tm:lashout", - "tm:magiccoat", - "tm:magicroom", - "tm:metronome", - "tm:nastyplot", - "tm:nightshade", - "tm:ominouswind", - "tm:painsplit", - "tm:payback", - "tm:phantomforce", - "tm:poltergeist", - "tm:pounce", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychup", - "tm:pursuit", - "tm:raindance", - "tm:rest", - "tm:roleplay", - "tm:scaryface", - "tm:screech", - "tm:shadowball", - "tm:shadowclaw", - "tm:shadowsneak", - "tm:shockwave", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snatch", - "tm:spite", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:swordsdance", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:willowisp" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json index 7817b0fc4c..0f93d31b61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json index 2636da2c74..b6776861ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json @@ -48,7 +48,6 @@ "height": 2.6, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -234,9 +233,6 @@ "speedboost", "h:speedboost" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 80, "attack": 160, @@ -245,166 +241,8 @@ "special_defence": 80, "speed": 100 }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 315, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:firepunch", - "1:scratch", - "1:growl", - "1:ember", - "1:doublekick", - "1:peck", - "1:quickattack", - "1:blazekick", - "1:skyuppercut", - "1:flamethrower", - "1:highjumpkick", - "1:closecombat", - "1:featherdance", - "1:mirrormove", - "9:flamecharge", - "12:detect", - "15:sandattack", - "20:aerialace", - "25:slash", - "30:bounce", - "35:focusenergy", - "42:bulkup", - "49:reversal", - "56:flareblitz", - "63:bravebird", - "egg:counter", - "egg:crushclaw", - "egg:feint", - "egg:flameburst", - "egg:lastresort", - "egg:mirrormove", - "egg:nightslash", - "egg:peck", - "egg:smellingsalts", - "egg:swagger", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:assurance", - "tm:aurasphere", - "tm:batonpass", - "tm:blastburn", - "tm:blazekick", - "tm:bodyslam", - "tm:bounce", - "tm:bravebird", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:closecombat", - "tm:coaching", - "tm:counter", - "tm:crushclaw", - "tm:curse", - "tm:cut", - "tm:detect", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:dualchop", - "tm:earthquake", - "tm:echoedvoice", - "tm:ember", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:feint", - "tm:fireblast", - "tm:firepledge", - "tm:firepunch", - "tm:firespin", - "tm:flameburst", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:furycutter", - "tm:gigaimpact", - "tm:growl", - "tm:headbutt", - "tm:heatcrash", - "tm:heatwave", - "tm:helpinghand", - "tm:highjumpkick", - "tm:honeclaws", - "tm:hyperbeam", - "tm:incinerate", - "tm:knockoff", - "tm:laserfocus", - "tm:lastresort", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:megapunch", - "tm:mirrormove", - "tm:mudslap", - "tm:nightslash", - "tm:overheat", - "tm:peck", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:quickattack", - "tm:rest", - "tm:revenge", - "tm:reversal", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:sandattack", - "tm:scorchingsands", - "tm:scratch", - "tm:shadowclaw", - "tm:skyuppercut", - "tm:slash", - "tm:sleeptalk", - "tm:smellingsalts", - "tm:solarbeam", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thief", - "tm:thunderpunch", - "tm:upperhand", - "tm:uproar", - "tm:uturn", - "tm:vacuumwave", - "tm:willowisp", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json index 32382fe82f..89a5d5180d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json @@ -49,7 +49,6 @@ "height": 1.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -208,9 +207,6 @@ "sheerforce", "h:sheerforce" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 70, "attack": 120, @@ -219,142 +215,8 @@ "special_defence": 105, "speed": 20 }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 196, - "experienceGroup": "medium_fast", - "catchRate": 150, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:growl", - "1:tackle", - "1:ember", - "1:magnitude", - "1:focusenergy", - "1:rockslide", - "1:eruption", - "1:fissure", - "1:flameburst", - "12:bulldoze", - "15:incinerate", - "19:amnesia", - "22:lavaplume", - "26:earthpower", - "29:curse", - "31:takedown", - "39:yawn", - "46:earthquake", - "egg:ancientpower", - "egg:bodyslam", - "egg:defensecurl", - "egg:growth", - "egg:heatwave", - "egg:heavyslam", - "egg:howl", - "egg:ironhead", - "egg:mudbomb", - "egg:rollout", - "egg:scaryface", - "egg:spitup", - "egg:stockpile", - "egg:stomp", - "egg:swallow", - "egg:yawn", - "tm:afteryou", - "tm:amnesia", - "tm:ancientpower", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:charm", - "tm:curse", - "tm:defensecurl", - "tm:dig", - "tm:doubleedge", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:ember", - "tm:endeavor", - "tm:endure", - "tm:eruption", - "tm:explosion", - "tm:facade", - "tm:fireblast", - "tm:firespin", - "tm:fissure", - "tm:flameburst", - "tm:flamecharge", - "tm:flamethrower", - "tm:flamewheel", - "tm:flareblitz", - "tm:flashcannon", - "tm:focusenergy", - "tm:gigaimpact", - "tm:growl", - "tm:growth", - "tm:headbutt", - "tm:heatcrash", - "tm:heatwave", - "tm:heavyslam", - "tm:helpinghand", - "tm:highhorsepower", - "tm:howl", - "tm:hyperbeam", - "tm:incinerate", - "tm:ironhead", - "tm:lashout", - "tm:lavaplume", - "tm:magnitude", - "tm:mudbomb", - "tm:mudshot", - "tm:mudslap", - "tm:naturepower", - "tm:overheat", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:roar", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:rollout", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:smackdown", - "tm:solarbeam", - "tm:spitup", - "tm:stealthrock", - "tm:stockpile", - "tm:stomp", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swallow", - "tm:tackle", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:trailblaze", - "tm:willowisp", - "tm:yawn", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/castform.json b/common/src/main/resources/data/cobblemon/species/generation3/castform.json index f5a432dd95..d56426921d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/castform.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/castform.json @@ -157,36 +157,6 @@ "aspects": [ "sunny-form" ], - "abilities": [ - "forecast", - "h:forecast" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 70, - "attack": 70, - "defence": 70, - "special_attack": 70, - "special_defence": 70, - "speed": 70 - }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 147, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -196,78 +166,6 @@ } ] }, - "moves": [ - "1:tackle", - "10:watergun", - "10:ember", - "10:powdersnow", - "15:headbutt", - "20:raindance", - "20:sunnyday", - "20:hail", - "25:weatherball", - "35:blizzard", - "35:fireblast", - "35:hydropump", - "45:hurricane", - "egg:clearsmog", - "egg:disable", - "egg:luckychant", - "egg:reflecttype", - "tm:amnesia", - "tm:avalanche", - "tm:blizzard", - "tm:bodyslam", - "tm:clearsmog", - "tm:cosmicpower", - "tm:disable", - "tm:ember", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:futuresight", - "tm:guardswap", - "tm:hail", - "tm:headbutt", - "tm:hex", - "tm:hurricane", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:incinerate", - "tm:lastresort", - "tm:luckychant", - "tm:ominouswind", - "tm:powdersnow", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:reflecttype", - "tm:rest", - "tm:retaliate", - "tm:sandstorm", - "tm:scald", - "tm:shadowball", - "tm:shockwave", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:tackle", - "tm:tailwind", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:watergun", - "tm:waterpulse", - "tm:weatherball", - "tm:workup" - ], "evolutions": [], "battleOnly": true }, @@ -286,36 +184,6 @@ "aspects": [ "rainy-form" ], - "abilities": [ - "forecast", - "h:forecast" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 70, - "attack": 70, - "defence": 70, - "special_attack": 70, - "special_defence": 70, - "speed": 70 - }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 147, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -325,78 +193,6 @@ } ] }, - "moves": [ - "1:tackle", - "10:watergun", - "10:ember", - "10:powdersnow", - "15:headbutt", - "20:raindance", - "20:sunnyday", - "20:hail", - "25:weatherball", - "35:blizzard", - "35:fireblast", - "35:hydropump", - "45:hurricane", - "egg:clearsmog", - "egg:disable", - "egg:luckychant", - "egg:reflecttype", - "tm:amnesia", - "tm:avalanche", - "tm:blizzard", - "tm:bodyslam", - "tm:clearsmog", - "tm:cosmicpower", - "tm:disable", - "tm:ember", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:futuresight", - "tm:guardswap", - "tm:hail", - "tm:headbutt", - "tm:hex", - "tm:hurricane", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:incinerate", - "tm:lastresort", - "tm:luckychant", - "tm:ominouswind", - "tm:powdersnow", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:reflecttype", - "tm:rest", - "tm:retaliate", - "tm:sandstorm", - "tm:scald", - "tm:shadowball", - "tm:shockwave", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:tackle", - "tm:tailwind", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:watergun", - "tm:waterpulse", - "tm:weatherball", - "tm:workup" - ], "evolutions": [], "battleOnly": true }, @@ -415,36 +211,6 @@ "aspects": [ "snowy-form" ], - "abilities": [ - "forecast", - "h:forecast" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 70, - "attack": 70, - "defence": 70, - "special_attack": 70, - "special_defence": 70, - "speed": 70 - }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 147, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -454,78 +220,6 @@ } ] }, - "moves": [ - "1:tackle", - "10:watergun", - "10:ember", - "10:powdersnow", - "15:headbutt", - "20:raindance", - "20:sunnyday", - "20:hail", - "25:weatherball", - "35:blizzard", - "35:fireblast", - "35:hydropump", - "45:hurricane", - "egg:clearsmog", - "egg:disable", - "egg:luckychant", - "egg:reflecttype", - "tm:amnesia", - "tm:avalanche", - "tm:blizzard", - "tm:bodyslam", - "tm:clearsmog", - "tm:cosmicpower", - "tm:disable", - "tm:ember", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:futuresight", - "tm:guardswap", - "tm:hail", - "tm:headbutt", - "tm:hex", - "tm:hurricane", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:incinerate", - "tm:lastresort", - "tm:luckychant", - "tm:ominouswind", - "tm:powdersnow", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:reflecttype", - "tm:rest", - "tm:retaliate", - "tm:sandstorm", - "tm:scald", - "tm:shadowball", - "tm:shockwave", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:tackle", - "tm:tailwind", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:watergun", - "tm:waterpulse", - "tm:weatherball", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json index a492efdc35..3710039c87 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json @@ -48,7 +48,6 @@ "height": 1.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json index 98dc18d3cf..5e0aa874f1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json index 34ae423d78..461b9b77ec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json @@ -43,7 +43,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 0, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -186,13 +185,6 @@ "aspects": [ "attack-forme" ], - "abilities": [ - "pressure", - "h:pressure" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 50, "attack": 180, @@ -209,12 +201,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -359,13 +345,6 @@ "aspects": [ "defense-forme" ], - "abilities": [ - "pressure", - "h:pressure" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 50, "attack": 70, @@ -382,12 +361,6 @@ "special_defence": 1, "speed": 0 }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -538,13 +511,6 @@ "aspects": [ "speed-forme" ], - "abilities": [ - "pressure", - "h:pressure" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 50, "attack": 95, @@ -561,12 +527,6 @@ "special_defence": 0, "speed": 3 }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json index 5a1c8984c9..ba8dc5d20e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/electrike.json b/common/src/main/resources/data/cobblemon/species/generation3/electrike.json index 7ad7e8b670..ccc40a962c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/electrike.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/electrike.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json index 5a1003f447..3b4cc7924a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json @@ -48,7 +48,6 @@ "height": 1.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json index d3161702ca..907026cc98 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json @@ -249,7 +249,8 @@ "h:pixilate" ], "eggGroups": [ - "amorphous" + "amorphous", + "human_like" ], "baseStats": { "hp": 68, @@ -259,162 +260,8 @@ "special_defence": 135, "speed": 100 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 309, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:healingwish", - "1:growl", - "1:confusion", - "1:doubleteam", - "1:healpulse", - "1:mistyterrain", - "1:disarmingvoice", - "1:dazzlinggleam", - "1:captivate", - "1:mysticalfire", - "1:charm", - "1:luckychant", - "9:hypnosis", - "12:drainingkiss", - "15:teleport", - "18:psybeam", - "23:lifedew", - "28:wish", - "35:calmmind", - "42:psychic", - "49:moonblast", - "56:dreameater", - "63:futuresight", - "egg:confuseray", - "egg:destinybond", - "egg:disable", - "egg:grudge", - "egg:knockoff", - "egg:meanlook", - "egg:memento", - "egg:mysticalfire", - "egg:shadowsneak", - "egg:synchronoise", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aurasphere", - "tm:bodyslam", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:confuseray", - "tm:confusion", - "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:dreameater", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:firepunch", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:growl", - "tm:grudge", - "tm:guardswap", - "tm:headbutt", - "tm:healbell", - "tm:healingwish", - "tm:healpulse", - "tm:helpinghand", - "tm:hyperbeam", - "tm:hypervoice", - "tm:hypnosis", - "tm:icepunch", - "tm:icywind", - "tm:imprison", - "tm:knockoff", - "tm:laserfocus", - "tm:lifedew", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:magicroom", - "tm:meanlook", - "tm:megakick", - "tm:megapunch", - "tm:memento", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:moonblast", - "tm:mysticalfire", - "tm:nightshade", - "tm:painsplit", - "tm:powerswap", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:safeguard", - "tm:shadowball", - "tm:shadowsneak", - "tm:shockwave", - "tm:signalbeam", - "tm:skillswap", - "tm:sleeptalk", - "tm:snatch", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synchronoise", - "tm:taunt", - "tm:telekinesis", - "tm:teleport", - "tm:terablast", - "tm:thief", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:trick", - "tm:trickroom", - "tm:tripleaxel", - "tm:vacuumwave", - "tm:willowisp", - "tm:wish", - "tm:wonderroom", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json b/common/src/main/resources/data/cobblemon/species/generation3/glalie.json index cd675b62a2..717d7d33eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/glalie.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -186,10 +185,6 @@ "refrigerate", "h:refrigerate" ], - "eggGroups": [ - "fairy", - "mineral" - ], "baseStats": { "hp": 80, "attack": 120, @@ -198,114 +193,8 @@ "special_defence": 80, "speed": 100 }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 203, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:powdersnow", - "1:leer", - "1:doubleteam", - "1:headbutt", - "1:sheercold", - "1:freezedry", - "1:iceball", - "1:astonish", - "15:iceshard", - "20:protect", - "25:icywind", - "30:frostbreath", - "35:bite", - "40:icefang", - "47:snowscape", - "54:weatherball", - "61:crunch", - "68:blizzard", - "egg:bide", - "egg:block", - "egg:disable", - "egg:iciclecrash", - "egg:rollout", - "egg:switcheroo", - "tm:astonish", - "tm:avalanche", - "tm:bide", - "tm:bite", - "tm:blizzard", - "tm:block", - "tm:bodyslam", - "tm:bulldoze", - "tm:chillingwater", - "tm:crunch", - "tm:darkpulse", - "tm:disable", - "tm:doubleteam", - "tm:earthquake", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:foulplay", - "tm:freezedry", - "tm:frostbreath", - "tm:gigaimpact", - "tm:gyroball", - "tm:hail", - "tm:headbutt", - "tm:helpinghand", - "tm:hex", - "tm:hyperbeam", - "tm:iceball", - "tm:icebeam", - "tm:icefang", - "tm:iceshard", - "tm:icespinner", - "tm:iciclecrash", - "tm:iciclespear", - "tm:icywind", - "tm:ironhead", - "tm:laserfocus", - "tm:leer", - "tm:lightscreen", - "tm:payback", - "tm:powdersnow", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:rollout", - "tm:safeguard", - "tm:scaryface", - "tm:selfdestruct", - "tm:shadowball", - "tm:sheercold", - "tm:signalbeam", - "tm:sleeptalk", - "tm:snowscape", - "tm:spikes", - "tm:spite", - "tm:steelroller", - "tm:substitute", - "tm:switcheroo", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:torment", - "tm:trailblaze", - "tm:waterpulse", - "tm:weatherball" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/groudon.json b/common/src/main/resources/data/cobblemon/species/generation3/groudon.json index ba9db327c3..18e01dba8a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/groudon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/groudon.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -187,9 +186,6 @@ "desolateland", "h:desolateland" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 180, @@ -198,124 +194,8 @@ "special_defence": 90, "speed": 90 }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 385, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:mudshot", - "1:scaryface", - "1:lavaplume", - "1:ancientpower", - "1:precipiceblades", - "9:earthpower", - "18:bulkup", - "27:earthquake", - "36:hammerarm", - "45:fissure", - "54:rest", - "72:fireblast", - "81:solarbeam", - "90:eruption", - "tm:aerialace", - "tm:ancientpower", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:bulldoze", - "tm:crunch", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:dragonclaw", - "tm:dragonpulse", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:eruption", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firepunch", - "tm:fissure", - "tm:flamethrower", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:furycutter", - "tm:gigaimpact", - "tm:hammerarm", - "tm:headbutt", - "tm:heatcrash", - "tm:heatwave", - "tm:heavyslam", - "tm:helpinghand", - "tm:highhorsepower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:incinerate", - "tm:ironhead", - "tm:irontail", - "tm:lavaplume", - "tm:megakick", - "tm:megapunch", - "tm:metalclaw", - "tm:mudshot", - "tm:mudslap", - "tm:overheat", - "tm:poweruppunch", - "tm:precipiceblades", - "tm:protect", - "tm:rest", - "tm:roar", - "tm:rockblast", - "tm:rockclimb", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:rollout", - "tm:safeguard", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaryface", - "tm:scorchingsands", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:smackdown", - "tm:solarbeam", - "tm:spikes", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:willowisp", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json b/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json index 3621435dae..64ff334268 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 6, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json b/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json index f8805735ad..8c303ad8c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json @@ -48,7 +48,6 @@ "height": 2.05, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json b/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json index d749bbc54d..d075fb0795 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:wish", "1:confusion", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json b/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json index 8fa56cac69..ddf59df9cd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -154,9 +153,6 @@ "primordialsea", "h:primordialsea" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 150, @@ -165,92 +161,8 @@ "special_defence": 160, "speed": 90 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 385, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:waterpulse", - "1:scaryface", - "1:bodyslam", - "1:ancientpower", - "1:originpulse", - "9:aquatail", - "18:calmmind", - "27:muddywater", - "36:icebeam", - "45:sheercold", - "54:aquaring", - "72:hydropump", - "81:doubleedge", - "90:waterspout", - "tm:ancientpower", - "tm:aquaring", - "tm:aquatail", - "tm:avalanche", - "tm:blizzard", - "tm:block", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bulldoze", - "tm:calmmind", - "tm:chillingwater", - "tm:dive", - "tm:doubleedge", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:gigaimpact", - "tm:hail", - "tm:headbutt", - "tm:heavyslam", - "tm:helpinghand", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:ironhead", - "tm:liquidation", - "tm:muddywater", - "tm:originpulse", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:scaryface", - "tm:sheercold", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:waterfall", - "tm:waterpulse", - "tm:waterspout", - "tm:whirlpool" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/latias.json b/common/src/main/resources/data/cobblemon/species/generation3/latias.json index 0bdb6ec1da..725a612439 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/latias.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/latias.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ @@ -207,13 +206,6 @@ "aspects": [ "mega" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 80, "attack": 100, @@ -222,150 +214,8 @@ "special_defence": 150, "speed": 110 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 90, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:psywave", - "1:watersport", - "1:refresh", - "1:psychoshift", - "1:charm", - "1:storedpower", - "5:helpinghand", - "10:recover", - "15:confusion", - "20:tailwind", - "25:dragonbreath", - "30:wish", - "35:mistball", - "40:zenheadbutt", - "45:dragonpulse", - "50:healpulse", - "55:reflecttype", - "60:psychic", - "65:guardsplit", - "70:healingwish", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aurasphere", - "tm:batonpass", - "tm:bodyslam", - "tm:breakingswipe", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:charm", - "tm:chillingwater", - "tm:confusion", - "tm:covet", - "tm:cut", - "tm:defog", - "tm:disarmingvoice", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonbreath", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:drainingkiss", - "tm:dreameater", - "tm:dualwingbeat", - "tm:earthquake", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:fly", - "tm:furycutter", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:guardsplit", - "tm:healingwish", - "tm:healpulse", - "tm:helpinghand", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magiccoat", - "tm:magicroom", - "tm:mistball", - "tm:mysticalfire", - "tm:outrage", - "tm:protect", - "tm:psychic", - "tm:psychocut", - "tm:psychoshift", - "tm:psychup", - "tm:psyshock", - "tm:psywave", - "tm:raindance", - "tm:recover", - "tm:reflect", - "tm:reflecttype", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:roleplay", - "tm:roost", - "tm:safeguard", - "tm:sandstorm", - "tm:scaleshot", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelwing", - "tm:storedpower", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:triattack", - "tm:trick", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:watersport", - "tm:weatherball", - "tm:whirlpool", - "tm:wish", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/latios.json b/common/src/main/resources/data/cobblemon/species/generation3/latios.json index 302686bcf0..83ac72031c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/latios.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/latios.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ @@ -200,13 +199,6 @@ "aspects": [ "mega" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 80, "attack": 130, @@ -215,143 +207,8 @@ "special_defence": 120, "speed": 110 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 90, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:psywave", - "1:healblock", - "1:refresh", - "1:psychoshift", - "1:dragondance", - "1:storedpower", - "5:helpinghand", - "10:recover", - "15:confusion", - "20:tailwind", - "25:dragonbreath", - "30:allyswitch", - "35:lusterpurge", - "40:zenheadbutt", - "45:dragonpulse", - "50:healpulse", - "55:simplebeam", - "60:psychic", - "65:powersplit", - "70:memento", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:allyswitch", - "tm:aurasphere", - "tm:batonpass", - "tm:bodyslam", - "tm:breakingswipe", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confusion", - "tm:cut", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonbreath", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dreameater", - "tm:dualwingbeat", - "tm:earthquake", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:flipturn", - "tm:fly", - "tm:furycutter", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:healblock", - "tm:healpulse", - "tm:helpinghand", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:lusterpurge", - "tm:magiccoat", - "tm:memento", - "tm:mysticalfire", - "tm:outrage", - "tm:powersplit", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:psychocut", - "tm:psychoshift", - "tm:psychup", - "tm:psyshock", - "tm:psywave", - "tm:raindance", - "tm:recover", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:roost", - "tm:safeguard", - "tm:sandstorm", - "tm:scaleshot", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:simplebeam", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelwing", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:triattack", - "tm:trick", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:weatherball", - "tm:wonderroom", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json index a2ad857c5e..5a0d5ee9ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json @@ -198,39 +198,8 @@ "galarian_form" ], "aspects": [ - "galarian", "galarian" ], - "abilities": [ - "pickup", - "gluttony", - "h:quickfeet" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 78, - "attack": 70, - "defence": 61, - "special_attack": 50, - "special_defence": 61, - "speed": 100 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 147, - "experienceGroup": "medium_fast", - "catchRate": 90, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json index 5d78796218..7079e4b7a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json @@ -48,7 +48,6 @@ "height": 1.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json b/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json index 15c8256f70..7afba6a3d9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json @@ -48,7 +48,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json b/common/src/main/resources/data/cobblemon/species/generation3/manectric.json index d907d7920c..8d584b7640 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/manectric.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -170,9 +169,6 @@ "intimidate", "h:intimidate" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 70, "attack": 75, @@ -181,103 +177,8 @@ "special_defence": 80, "speed": 135 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, "baseExperienceYield": 201, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:firefang", - "1:tackle", - "1:thunderwave", - "1:leer", - "1:howl", - "1:spark", - "1:odorsleuth", - "12:quickattack", - "16:shockwave", - "20:bite", - "24:thunderfang", - "30:roar", - "36:discharge", - "42:charge", - "48:wildcharge", - "54:thunder", - "60:electricterrain", - "egg:curse", - "egg:flameburst", - "egg:headbutt", - "egg:spark", - "egg:switcheroo", - "tm:agility", - "tm:bite", - "tm:bodyslam", - "tm:charge", - "tm:chargebeam", - "tm:crunch", - "tm:curse", - "tm:discharge", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:flameburst", - "tm:flamethrower", - "tm:flash", - "tm:gigaimpact", - "tm:headbutt", - "tm:howl", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icefang", - "tm:irontail", - "tm:laserfocus", - "tm:leer", - "tm:lightscreen", - "tm:magnetrise", - "tm:mudslap", - "tm:odorsleuth", - "tm:overheat", - "tm:protect", - "tm:psychicfangs", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:risingvoltage", - "tm:roar", - "tm:scaryface", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:snarl", - "tm:spark", - "tm:strength", - "tm:substitute", - "tm:swift", - "tm:switcheroo", - "tm:tackle", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderwave", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json index 631699cd63..dfde2ca19f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json @@ -212,10 +212,6 @@ "hugepower", "h:hugepower" ], - "eggGroups": [ - "field", - "fairy" - ], "baseStats": { "hp": 50, "attack": 105, @@ -224,142 +220,8 @@ "special_defence": 95, "speed": 50 }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 168, - "experienceGroup": "fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:astonish", - "1:visegrip", - "1:feintattack", - "1:growl", - "4:fairywind", - "8:batonpass", - "12:bite", - "16:stockpile", - "16:swallow", - "16:spitup", - "20:suckerpunch", - "24:irondefense", - "28:crunch", - "32:sweetscent", - "36:ironhead", - "40:taunt", - "44:faketears", - "48:playrough", - "egg:ancientpower", - "egg:captivate", - "egg:metalburst", - "egg:poisonfang", - "egg:poweruppunch", - "egg:punishment", - "egg:seismictoss", - "egg:slam", - "egg:tickle", - "tm:ancientpower", - "tm:assurance", - "tm:astonish", - "tm:batonpass", - "tm:bite", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:captivate", - "tm:chargebeam", - "tm:crunch", - "tm:darkpulse", - "tm:drainingkiss", - "tm:embargo", - "tm:endure", - "tm:facade", - "tm:fairywind", - "tm:faketears", - "tm:falseswipe", - "tm:feintattack", - "tm:fireblast", - "tm:firefang", - "tm:flamethrower", - "tm:flashcannon", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:guardswap", - "tm:headbutt", - "tm:helpinghand", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icepunch", - "tm:icywind", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:knockoff", - "tm:laserfocus", - "tm:lastresort", - "tm:magnetrise", - "tm:megakick", - "tm:megapunch", - "tm:metalburst", - "tm:mistyterrain", - "tm:mudslap", - "tm:painsplit", - "tm:payback", - "tm:playrough", - "tm:poisonfang", - "tm:poweruppunch", - "tm:protect", - "tm:psychicfangs", - "tm:punishment", - "tm:raindance", - "tm:rest", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:sandstorm", - "tm:seismictoss", - "tm:shadowball", - "tm:slam", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snatch", - "tm:solarbeam", - "tm:spitup", - "tm:stealthrock", - "tm:steelbeam", - "tm:stockpile", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:superfang", - "tm:swallow", - "tm:sweetscent", - "tm:swordsdance", - "tm:taunt", - "tm:terablast", - "tm:thunderfang", - "tm:thunderpunch", - "tm:tickle", - "tm:torment", - "tm:visegrip" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json index 7804641be8..02fe0306b3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -227,9 +226,6 @@ "purepower", "h:purepower" ], - "eggGroups": [ - "human_like" - ], "baseStats": { "hp": 60, "attack": 100, @@ -238,159 +234,8 @@ "special_defence": 85, "speed": 100 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, "baseExperienceYield": 179, - "experienceGroup": "medium_fast", - "catchRate": 90, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:firepunch", - "1:thunderpunch", - "1:icepunch", - "1:bide", - "1:meditate", - "1:confusion", - "1:detect", - "1:workup", - "12:endure", - "15:feint", - "17:forcepalm", - "20:psybeam", - "23:calmmind", - "25:zenheadbutt", - "28:highjumpkick", - "31:psychup", - "33:acupressure", - "36:powertrick", - "47:recover", - "53:counter", - "53:axekick", - "egg:batonpass", - "egg:bulletpunch", - "egg:dynamicpunch", - "egg:fakeout", - "egg:firepunch", - "egg:foresight", - "egg:guardswap", - "egg:icepunch", - "egg:powerswap", - "egg:psychocut", - "egg:quickguard", - "egg:secretpower", - "egg:thunderpunch", - "tm:acupressure", - "tm:aerialace", - "tm:aurasphere", - "tm:axekick", - "tm:batonpass", - "tm:bide", - "tm:blazekick", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:bulletpunch", - "tm:calmmind", - "tm:closecombat", - "tm:confusion", - "tm:counter", - "tm:detect", - "tm:drainpunch", - "tm:dreameater", - "tm:dynamicpunch", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:fakeout", - "tm:feint", - "tm:firepunch", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:forcepalm", - "tm:foresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:headbutt", - "tm:helpinghand", - "tm:highjumpkick", - "tm:hyperbeam", - "tm:icepunch", - "tm:imprison", - "tm:laserfocus", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:magiccoat", - "tm:meditate", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mindreader", - "tm:nightshade", - "tm:painsplit", - "tm:poisonjab", - "tm:pound", - "tm:powerswap", - "tm:powertrick", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:quickguard", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:secretpower", - "tm:shadowball", - "tm:signalbeam", - "tm:skillswap", - "tm:sleeptalk", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunderpunch", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:upperhand", - "tm:vacuumwave", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/meditite.json b/common/src/main/resources/data/cobblemon/species/generation3/meditite.json index 87db9eb331..d1d27baeca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/meditite.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/meditite.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json index 9884be0478..efcc1ebb84 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json @@ -210,9 +210,6 @@ "toughclaws", "h:toughclaws" ], - "eggGroups": [ - "mineral" - ], "baseStats": { "hp": 80, "attack": 145, @@ -221,138 +218,8 @@ "special_defence": 110, "speed": 110 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 40, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, - "moves": [ - "1:metalclaw", - "1:confusion", - "1:pursuit", - "1:bulletpunch", - "1:hammerarm", - "1:explosion", - "1:miracleeye", - "1:honeclaws", - "1:tackle", - "6:zenheadbutt", - "12:magnetrise", - "16:flashcannon", - "26:takedown", - "34:psychic", - "42:scaryface", - "52:meteormash", - "62:irondefense", - "72:agility", - "82:hyperbeam", - "tm:aerialace", - "tm:agility", - "tm:allyswitch", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:bulletpunch", - "tm:confusion", - "tm:cosmicpower", - "tm:cut", - "tm:doubleedge", - "tm:earthquake", - "tm:endure", - "tm:expandingforce", - "tm:explosion", - "tm:facade", - "tm:flash", - "tm:flashcannon", - "tm:focuspunch", - "tm:furycutter", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:gyroball", - "tm:hammerarm", - "tm:hardpress", - "tm:headbutt", - "tm:heavyslam", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icepunch", - "tm:icywind", - "tm:irondefense", - "tm:ironhead", - "tm:knockoff", - "tm:laserfocus", - "tm:lightscreen", - "tm:magnetrise", - "tm:metalclaw", - "tm:meteorbeam", - "tm:meteormash", - "tm:miracleeye", - "tm:mudslap", - "tm:poweruppunch", - "tm:protect", - "tm:psychic", - "tm:psychicfangs", - "tm:psychicnoise", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:pursuit", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:rollout", - "tm:sandstorm", - "tm:scaryface", - "tm:selfdestruct", - "tm:shadowball", - "tm:shadowclaw", - "tm:signalbeam", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:stealthrock", - "tm:steelbeam", - "tm:steelroller", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tackle", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:thunderpunch", - "tm:trailblaze", - "tm:trick", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/minun.json b/common/src/main/resources/data/cobblemon/species/generation3/minun.json index 3b7dadc7e9..5f3446f31e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/minun.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/minun.json @@ -48,7 +48,6 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json index 6ec63c5672..63161cf672 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json @@ -50,7 +50,6 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json index 12a5f9c004..396b196f28 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json @@ -48,7 +48,6 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json index abab6047cb..edf100b01c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json b/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json index e05a414782..37f32f4724 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json @@ -50,7 +50,6 @@ "height": 3.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -190,9 +189,6 @@ "deltastream", "h:deltastream" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 105, "attack": 180, @@ -201,126 +197,9 @@ "special_defence": 100, "speed": 115 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 390, - "experienceGroup": "slow", "catchRate": 45, - "eggCycles": 120, - "baseFriendship": 0, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:twister", - "1:scaryface", - "1:airslash", - "1:ancientpower", - "1:dragonascent", - "9:crunch", - "18:dragondance", - "27:extremespeed", - "36:dragonpulse", - "45:hypervoice", - "54:rest", - "63:fly", - "72:hurricane", - "81:outrage", - "90:hyperbeam", - "tm:aerialace", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:avalanche", - "tm:bind", - "tm:blizzard", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:bulldoze", - "tm:cosmicpower", - "tm:crunch", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonascent", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:furycutter", - "tm:gigaimpact", - "tm:gyroball", - "tm:headbutt", - "tm:helpinghand", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:incinerate", - "tm:ironhead", - "tm:irontail", - "tm:meteorbeam", - "tm:outrage", - "tm:overheat", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaleshot", - "tm:scaryface", - "tm:shadowclaw", - "tm:shockwave", - "tm:skydrop", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stealthrock", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:twister", - "tm:uturn", - "tm:waterfall", - "tm:whirlpool", - "tm:wildcharge" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/regice.json b/common/src/main/resources/data/cobblemon/species/generation3/regice.json index bcb7e09458..769554978f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/regice.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/regice.json @@ -48,7 +48,6 @@ "height": 2.75, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/regirock.json b/common/src/main/resources/data/cobblemon/species/generation3/regirock.json index cf7dddc317..aa8a69342c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/regirock.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/regirock.json @@ -48,7 +48,6 @@ "height": 2.85, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/registeel.json b/common/src/main/resources/data/cobblemon/species/generation3/registeel.json index f01c9346dc..4a197eb04b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/registeel.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/registeel.json @@ -48,7 +48,6 @@ "height": 2.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json index 1e2d05a052..48945e0c1e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json @@ -50,7 +50,6 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -242,9 +241,6 @@ "magicbounce", "h:magicbounce" ], - "eggGroups": [ - "human_like" - ], "baseStats": { "hp": 50, "attack": 85, @@ -253,168 +249,8 @@ "special_defence": 115, "speed": 20 }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 168, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:leer", - "1:scratch", - "1:foresight", - "1:feintattack", - "3:astonish", - "9:shadowsneak", - "12:fakeout", - "15:disable", - "18:detect", - "21:nightshade", - "24:furyswipes", - "27:knockoff", - "30:quash", - "33:shadowclaw", - "36:meanlook", - "39:powergem", - "42:zenheadbutt", - "45:shadowball", - "48:foulplay", - "egg:captivate", - "egg:feint", - "egg:flatter", - "egg:meanlook", - "egg:metalburst", - "egg:moonlight", - "egg:punishment", - "egg:recover", - "egg:suckerpunch", - "egg:torment", - "tm:aerialace", - "tm:allyswitch", - "tm:astonish", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:calmmind", - "tm:captivate", - "tm:confuseray", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:detect", - "tm:dig", - "tm:disable", - "tm:drainpunch", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fakeout", - "tm:feint", - "tm:feintattack", - "tm:firepunch", - "tm:flash", - "tm:flatter", - "tm:fling", - "tm:focuspunch", - "tm:foresight", - "tm:foulplay", - "tm:furycutter", - "tm:furyswipes", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gravity", - "tm:gyroball", - "tm:headbutt", - "tm:helpinghand", - "tm:hex", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icepunch", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:knockoff", - "tm:lashout", - "tm:leer", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:magiccoat", - "tm:meanlook", - "tm:megakick", - "tm:megapunch", - "tm:metalburst", - "tm:metalclaw", - "tm:metronome", - "tm:moonlight", - "tm:mudshot", - "tm:mudslap", - "tm:nastyplot", - "tm:nightshade", - "tm:ominouswind", - "tm:painsplit", - "tm:payback", - "tm:phantomforce", - "tm:poisonjab", - "tm:poltergeist", - "tm:powergem", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychup", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:scratch", - "tm:shadowball", - "tm:shadowclaw", - "tm:shadowsneak", - "tm:shockwave", - "tm:signalbeam", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snarl", - "tm:snatch", - "tm:spite", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:trick", - "tm:willowisp", - "tm:wonderroom", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json b/common/src/main/resources/data/cobblemon/species/generation3/salamence.json index e669a45753..3c5e36c487 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/salamence.json @@ -206,9 +206,6 @@ "aerilate", "h:aerilate" ], - "eggGroups": [ - "dragon" - ], "baseStats": { "hp": 95, "attack": 145, @@ -217,133 +214,8 @@ "special_defence": 90, "speed": 120 }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 40, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "fly": { - "canFly": true - } - } - }, - "moves": [ - "1:rage", - "1:bite", - "1:leer", - "1:ember", - "1:protect", - "1:dragonbreath", - "1:fly", - "1:roost", - "1:dragontail", - "1:dualwingbeat", - "15:headbutt", - "20:scaryface", - "25:crunch", - "33:dragonclaw", - "39:zenheadbutt", - "46:focusenergy", - "55:flamethrower", - "73:doubleedge", - "egg:defensecurl", - "egg:dragonrage", - "egg:dragonrush", - "egg:thrash", - "egg:twister", - "tm:aerialace", - "tm:airslash", - "tm:aquatail", - "tm:bite", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:crunch", - "tm:cut", - "tm:defensecurl", - "tm:defog", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonbreath", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", - "tm:dragontail", - "tm:dualwingbeat", - "tm:earthquake", - "tm:ember", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firespin", - "tm:flamethrower", - "tm:fly", - "tm:focusenergy", - "tm:furycutter", - "tm:gigaimpact", - "tm:headbutt", - "tm:heatwave", - "tm:helpinghand", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:laserfocus", - "tm:leer", - "tm:mudslap", - "tm:ominouswind", - "tm:outrage", - "tm:protect", - "tm:psychicfangs", - "tm:rage", - "tm:raindance", - "tm:rest", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:rollout", - "tm:roost", - "tm:scaryface", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:steelwing", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thrash", - "tm:thunderfang", - "tm:twister", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json index 54e4de2bc3..5c8799de32 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json @@ -241,10 +241,6 @@ "lightningrod", "h:lightningrod" ], - "eggGroups": [ - "monster", - "dragon" - ], "baseStats": { "hp": 70, "attack": 110, @@ -253,171 +249,8 @@ "special_defence": 85, "speed": 145 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, "baseExperienceYield": 315, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:nightslash", - "1:pound", - "1:leer", - "1:absorb", - "1:quickattack", - "1:xscissor", - "1:pursuit", - "1:leafblade", - "1:agility", - "1:falseswipe", - "1:furycutter", - "1:energyball", - "1:dualchop", - "1:leafage", - "1:shedtail", - "5:megadrain", - "12:detect", - "15:quickguard", - "20:assurance", - "25:gigadrain", - "30:slam", - "35:doubleteam", - "42:screech", - "49:endeavor", - "56:leafstorm", - "egg:absorb", - "egg:crushclaw", - "egg:doublekick", - "egg:dragonbreath", - "egg:grasswhistle", - "egg:leechseed", - "egg:mudsport", - "egg:naturalgift", - "egg:nightslash", - "egg:pursuit", - "egg:razorwind", - "egg:slash", - "egg:synthesis", - "egg:worryseed", - "tm:absorb", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:assurance", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:bulletseed", - "tm:crosspoison", - "tm:crunch", - "tm:crushclaw", - "tm:cut", - "tm:detect", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:doubleteam", - "tm:dragonbreath", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:drainpunch", - "tm:dualchop", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frenzyplant", - "tm:furycutter", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grasspledge", - "tm:grasswhistle", - "tm:grassyglide", - "tm:grassyterrain", - "tm:headbutt", - "tm:helpinghand", - "tm:honeclaws", - "tm:hyperbeam", - "tm:irontail", - "tm:laserfocus", - "tm:leafage", - "tm:leafblade", - "tm:leafstorm", - "tm:leechseed", - "tm:leer", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:megadrain", - "tm:megakick", - "tm:megapunch", - "tm:mudsport", - "tm:naturalgift", - "tm:naturepower", - "tm:nightslash", - "tm:outrage", - "tm:pound", - "tm:poweruppunch", - "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", - "tm:razorwind", - "tm:rest", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:scaleshot", - "tm:screech", - "tm:seedbomb", - "tm:shedtail", - "tm:slam", - "tm:slash", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderpunch", - "tm:trailblaze", - "tm:upperhand", - "tm:vacuumwave", - "tm:workup", - "tm:worryseed", - "tm:xscissor" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/seedot.json b/common/src/main/resources/data/cobblemon/species/generation3/seedot.json index 3698fcdc6e..1a78cbc584 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seedot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seedot.json @@ -49,7 +49,6 @@ "height": 0.65, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json index d57b0a30bf..db78bc9ac6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json index a2bd1e52b9..9d83103c2f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json @@ -196,9 +196,6 @@ "strongjaw", "h:strongjaw" ], - "eggGroups": [ - "water_2" - ], "baseStats": { "hp": 70, "attack": 140, @@ -207,130 +204,22 @@ "special_defence": 65, "speed": 105 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 196, - "experienceGroup": "slow", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 35, "dynamaxBlocked": true, "behaviour": { "moving": { + "canLook": false, "walk": { "avoidsLand": true }, "swim": { - "canSwimInWater": true, - "canSwimInLava": false, + "swimSpeed": "0.2", "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canSwimInWater": true, + "canSwimInLava": false } } }, - "moves": [ - "1:feint", - "1:leer", - "1:rage", - "1:focusenergy", - "1:slash", - "1:aquajet", - "1:skullbash", - "1:nightslash", - "1:poisonfang", - "12:scaryface", - "16:bite", - "20:icefang", - "24:screech", - "28:swagger", - "34:crunch", - "40:agility", - "46:liquidation", - "52:takedown", - "egg:ancientpower", - "egg:destinybond", - "egg:doubleedge", - "egg:thrash", - "egg:waterpulse", - "tm:agility", - "tm:ancientpower", - "tm:aquajet", - "tm:assurance", - "tm:avalanche", - "tm:bite", - "tm:blizzard", - "tm:bounce", - "tm:brine", - "tm:bulldoze", - "tm:closecombat", - "tm:crunch", - "tm:darkpulse", - "tm:destinybond", - "tm:dive", - "tm:doubleedge", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:feint", - "tm:flipturn", - "tm:focusenergy", - "tm:furycutter", - "tm:gigaimpact", - "tm:hail", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icywind", - "tm:leer", - "tm:liquidation", - "tm:mudslap", - "tm:nightslash", - "tm:payback", - "tm:poisonfang", - "tm:poisonjab", - "tm:protect", - "tm:psychicfangs", - "tm:rage", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:rocktomb", - "tm:scald", - "tm:scaleshot", - "tm:scaryface", - "tm:screech", - "tm:skullbash", - "tm:slash", - "tm:sleeptalk", - "tm:snarl", - "tm:spite", - "tm:strength", - "tm:substitute", - "tm:superfang", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:torment", - "tm:uproar", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json index 191664d77a..9f261fd460 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json @@ -50,7 +50,6 @@ "height": 1.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json b/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json index e93bb3dd19..ad8d1addb9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/skitty.json b/common/src/main/resources/data/cobblemon/species/generation3/skitty.json index 3fbf770ee4..22211aaa49 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/skitty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/skitty.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json b/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json index 7f9b71ee89..8e3c1dd48c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/spoink.json b/common/src/main/resources/data/cobblemon/species/generation3/spoink.json index b122c45a4c..b11de574f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/spoink.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/spoink.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swablu.json b/common/src/main/resources/data/cobblemon/species/generation3/swablu.json index ea1b046a54..80eaf13f10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swablu.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swablu.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json index 5b914c3f8b..aae63a2921 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json index f4c82ed05e..38cedf8e15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json @@ -237,10 +237,6 @@ "swiftswim", "h:swiftswim" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 100, "attack": 150, @@ -249,171 +245,8 @@ "special_defence": 110, "speed": 70 }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 318, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true, - "canSwimInLava": false, - "canBreatheUnderwater": true, - "swimSpeed": "0.2" - } - } - }, - "moves": [ - "1:tackle", - "1:growl", - "1:mudslap", - "1:watergun", - "1:bide", - "1:mudshot", - "1:foresight", - "1:mudbomb", - "1:earthquake", - "1:hammerarm", - "1:surf", - "1:rocksmash", - "9:rockthrow", - "12:protect", - "15:supersonic", - "20:waterpulse", - "25:rockslide", - "30:takedown", - "35:amnesia", - "42:muddywater", - "49:screech", - "56:endeavor", - "63:hydropump", - "egg:ancientpower", - "egg:barrier", - "egg:bide", - "egg:bite", - "egg:counter", - "egg:curse", - "egg:doubleedge", - "egg:mirrorcoat", - "egg:mudbomb", - "egg:mudslap", - "egg:mudsport", - "egg:refresh", - "egg:sludge", - "egg:stomp", - "egg:wideguard", - "egg:yawn", - "tm:amnesia", - "tm:ancientpower", - "tm:aquatail", - "tm:avalanche", - "tm:barrier", - "tm:bide", - "tm:bite", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:chillingwater", - "tm:counter", - "tm:curse", - "tm:darkestlariat", - "tm:dig", - "tm:dive", - "tm:doubleedge", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:flipturn", - "tm:focusblast", - "tm:focuspunch", - "tm:foresight", - "tm:gigaimpact", - "tm:growl", - "tm:hail", - "tm:hammerarm", - "tm:hardpress", - "tm:headbutt", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hydrocannon", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:irontail", - "tm:knockoff", - "tm:liquidation", - "tm:lowkick", - "tm:megakick", - "tm:megapunch", - "tm:mirrorcoat", - "tm:mudbomb", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:mudsport", - "tm:outrage", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rockthrow", - "tm:rocktomb", - "tm:rollout", - "tm:sandtomb", - "tm:scaryface", - "tm:screech", - "tm:sleeptalk", - "tm:sludge", - "tm:sludgewave", - "tm:smackdown", - "tm:stealthrock", - "tm:stomp", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:superpower", - "tm:supersonic", - "tm:surf", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:uproar", - "tm:waterfall", - "tm:watergun", - "tm:waterpledge", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tm:wideguard", - "tm:workup", - "tm:yawn" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json index 99c4c86929..83d955df5a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json @@ -48,7 +48,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/tropius.json b/common/src/main/resources/data/cobblemon/species/generation3/tropius.json index 3fbcc239d4..372a6bf33a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/tropius.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/tropius.json @@ -50,7 +50,6 @@ "height": 5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/whismur.json b/common/src/main/resources/data/cobblemon/species/generation3/whismur.json index b6eb9cdccd..e2f6c1de39 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/whismur.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/whismur.json @@ -48,7 +48,6 @@ "height": 0.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json b/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json index ed74cad841..e82e04ede0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json b/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json index 71ab7c9334..86a78aff70 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json @@ -48,7 +48,6 @@ "height": 0.93, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json index b33f4450c8..7deb5da064 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json b/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json index 075260ad8b..7636093c9d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json @@ -193,42 +193,6 @@ "aspects": [ "galarian" ], - "abilities": [ - "pickup", - "gluttony", - "h:quickfeet" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 38, - "attack": 30, - "defence": 41, - "special_attack": 30, - "special_defence": 41, - "speed": 60 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 56, - "experienceGroup": "medium_fast", - "catchRate": 255, - "eggCycles": 15, - "baseFriendship": 50, - "baseScale": 0.8, - "hitbox": { - "width": 0.6, - "height": 0.4, - "fixed": false - }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json index 337fc70462..1bcc39abc1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ @@ -199,10 +198,6 @@ "snowwarning", "h:snowwarning" ], - "eggGroups": [ - "monster", - "grass" - ], "baseStats": { "hp": 90, "attack": 132, @@ -211,130 +206,8 @@ "special_defence": 105, "speed": 30 }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 208, - "experienceGroup": "slow", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:icepunch", - "1:powdersnow", - "1:leer", - "1:grasswhistle", - "1:mist", - "1:auroraveil", - "1:leafage", - "15:iceshard", - "20:razorleaf", - "25:icywind", - "30:swagger", - "35:ingrain", - "43:woodhammer", - "49:blizzard", - "56:sheercold", - "egg:doubleedge", - "egg:growth", - "egg:leechseed", - "egg:naturalgift", - "egg:skullbash", - "egg:stomp", - "egg:weatherball", - "tm:auroraveil", - "tm:avalanche", - "tm:blizzard", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulldoze", - "tm:bulletseed", - "tm:chillingwater", - "tm:curse", - "tm:doubleedge", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frostbreath", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grasswhistle", - "tm:grassyglide", - "tm:growth", - "tm:hail", - "tm:hardpress", - "tm:headbutt", - "tm:helpinghand", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:iceshard", - "tm:icespinner", - "tm:iciclespear", - "tm:icywind", - "tm:ingrain", - "tm:irontail", - "tm:leafage", - "tm:leafstorm", - "tm:leechseed", - "tm:leer", - "tm:lowkick", - "tm:magicalleaf", - "tm:megakick", - "tm:megapunch", - "tm:mist", - "tm:mudslap", - "tm:naturalgift", - "tm:outrage", - "tm:powdersnow", - "tm:protect", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:sheercold", - "tm:skullbash", - "tm:sleeptalk", - "tm:snowscape", - "tm:solarbeam", - "tm:stomp", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:swagger", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:terablast", - "tm:trailblaze", - "tm:waterpulse", - "tm:weatherball", - "tm:woodhammer", - "tm:worryseed" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation4/arceus.json b/common/src/main/resources/data/cobblemon/species/generation4/arceus.json index 8b58af219c..e6620e1cc1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/arceus.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/arceus.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:seismictoss", "1:cosmicpower", @@ -241,210 +240,6 @@ "aspects": [ "fighting-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -464,210 +259,6 @@ "aspects": [ "flying-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -687,35 +278,6 @@ "aspects": [ "poison-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:seismictoss", "1:cosmicpower", @@ -909,210 +471,6 @@ "aspects": [ "ground-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -1132,210 +490,6 @@ "aspects": [ "rock-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -1355,210 +509,6 @@ "aspects": [ "bug-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -1578,210 +528,6 @@ "aspects": [ "ghost-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -1801,210 +547,6 @@ "aspects": [ "steel-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -2024,35 +566,6 @@ "aspects": [ "fire-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:seismictoss", "1:cosmicpower", @@ -2242,210 +755,6 @@ "aspects": [ "water-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -2465,210 +774,6 @@ "aspects": [ "grass-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -2688,210 +793,6 @@ "aspects": [ "electric-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -2911,210 +812,6 @@ "aspects": [ "psychic-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -3134,210 +831,6 @@ "aspects": [ "ice-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -3357,210 +850,6 @@ "aspects": [ "dragon-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -3580,210 +869,6 @@ "aspects": [ "dark-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -3803,210 +888,6 @@ "aspects": [ "fairy-plate" ], - "abilities": [ - "multitype", - "h:multitype" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 360, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:seismictoss", - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:refresh", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:agility", - "tm:airslash", - "tm:ancientpower", - "tm:aquatail", - "tm:aurasphere", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bugbuzz", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:cosmicpower", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:electricterrain", - "tm:endure", - "tm:energyball", - "tm:extremespeed", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:furycutter", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:headbutt", - "tm:healingwish", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:judgment", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:magiccoat", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:ominouswind", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:perishsong", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:punishment", - "tm:quash", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:seismictoss", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:silverwind", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:twister", - "tm:waterfall", - "tm:waterpulse", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation4/azelf.json b/common/src/main/resources/data/cobblemon/species/generation4/azelf.json index a1a6f0dfdd..5754e6aca0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/azelf.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/azelf.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:rest", "1:confusion", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/burmy.json b/common/src/main/resources/data/cobblemon/species/generation4/burmy.json index 56a9f66b4b..b6fedecdab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/burmy.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/burmy.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -128,44 +127,6 @@ "aspects": [ "sandy-cloak" ], - "abilities": [ - "shedskin", - "h:overcoat" - ], - "eggGroups": [ - "bug" - ], - "baseStats": { - "hp": 40, - "attack": 29, - "defence": 45, - "special_attack": 29, - "special_defence": 45, - "speed": 36 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 45, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 15, - "baseFriendship": 50, - "moves": [ - "10:tackle", - "15:bugbite", - "20:stringshot", - "tm:bugbite", - "tm:electroweb", - "tm:stringshot", - "tm:tackle", - "tm:terablast" - ], "evolutions": [ { "id": "burmy_wormadam", @@ -223,44 +184,6 @@ "aspects": [ "trash-cloak" ], - "abilities": [ - "shedskin", - "h:overcoat" - ], - "eggGroups": [ - "bug" - ], - "baseStats": { - "hp": 40, - "attack": 29, - "defence": 45, - "special_attack": 29, - "special_defence": 45, - "speed": 36 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 45, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 15, - "baseFriendship": 50, - "moves": [ - "10:tackle", - "15:bugbite", - "20:stringshot", - "tm:bugbite", - "tm:electroweb", - "tm:stringshot", - "tm:tackle", - "tm:terablast" - ], "evolutions": [ { "id": "burmy_wormadam", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json index de9516b4fc..05cb46c719 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -163,36 +162,6 @@ "aspects": [ "sunshine-form" ], - "abilities": [ - "flowergift", - "h:flowergift" - ], - "eggGroups": [ - "fairy", - "grass" - ], - "baseStats": { - "hp": 70, - "attack": 60, - "defence": 70, - "special_attack": 87, - "special_defence": 78, - "speed": 85 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 158, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:growth", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json b/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json index 5079863673..a451ba98c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json b/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json index c8f64a5ef1..a3ec800d89 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:confusion", "1:doubleteam", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json b/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json index 8547de5ff5..507b6918f2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/dialga.json b/common/src/main/resources/data/cobblemon/species/generation4/dialga.json index 62797f1579..8eafa51521 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/dialga.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/dialga.json @@ -51,7 +51,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:scaryface", "1:metalclaw", @@ -165,13 +164,6 @@ "aspects": [ "origin-forme" ], - "abilities": [ - "pressure", - "h:telepathy" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 100, @@ -180,20 +172,6 @@ "special_defence": 120, "speed": 90 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:scaryface", "1:metalclaw", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json index 897cf68ccf..c88f3dcaf3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json @@ -47,7 +47,6 @@ "height": 2.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json b/common/src/main/resources/data/cobblemon/species/generation4/froslass.json index 8ee1d50f84..c53050074b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/froslass.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gallade.json b/common/src/main/resources/data/cobblemon/species/generation4/gallade.json index 9e087eefd5..9f10c60cda 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gallade.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gallade.json @@ -290,7 +290,8 @@ "h:innerfocus" ], "eggGroups": [ - "amorphous" + "amorphous", + "human_like" ], "baseStats": { "hp": 68, @@ -300,209 +301,8 @@ "special_defence": 115, "speed": 110 }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 309, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 35, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:leafblade", - "1:nightslash", - "1:leer", - "1:confusion", - "1:doubleteam", - "1:furycutter", - "1:slash", - "1:psychic", - "1:dreameater", - "1:calmmind", - "1:growl", - "1:disarmingvoice", - "1:hypnosis", - "1:drainingkiss", - "1:imprison", - "1:psybeam", - "1:lifedew", - "1:charm", - "1:futuresight", - "1:sacredsword", - "1:aquacutter", - "1:luckychant", - "9:helpinghand", - "12:feint", - "15:teleport", - "18:aerialace", - "23:falseswipe", - "28:protect", - "35:swordsdance", - "42:psychocut", - "49:healpulse", - "56:quickguard", - "56:wideguard", - "63:closecombat", - "egg:confuseray", - "egg:destinybond", - "egg:disable", - "egg:grudge", - "egg:knockoff", - "egg:meanlook", - "egg:memento", - "egg:mysticalfire", - "egg:shadowsneak", - "egg:synchronoise", - "tm:aerialace", - "tm:agility", - "tm:airslash", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aquacutter", - "tm:aurasphere", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:charm", - "tm:closecombat", - "tm:coaching", - "tm:confuseray", - "tm:confusion", - "tm:cut", - "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:drainpunch", - "tm:dreameater", - "tm:dualchop", - "tm:earthquake", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:falseswipe", - "tm:feint", - "tm:firepunch", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:furycutter", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:grudge", - "tm:headbutt", - "tm:healpulse", - "tm:helpinghand", - "tm:hex", - "tm:hyperbeam", - "tm:hypervoice", - "tm:hypnosis", - "tm:icepunch", - "tm:icywind", - "tm:imprison", - "tm:knockoff", - "tm:laserfocus", - "tm:leafblade", - "tm:leer", - "tm:lifedew", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:magicroom", - "tm:meanlook", - "tm:megakick", - "tm:megapunch", - "tm:memento", - "tm:metronome", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:nightshade", - "tm:nightslash", - "tm:painsplit", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:quickguard", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:sacredsword", - "tm:safeguard", - "tm:shadowball", - "tm:shadowclaw", - "tm:shadowsneak", - "tm:shockwave", - "tm:signalbeam", - "tm:skillswap", - "tm:slash", - "tm:sleeptalk", - "tm:snatch", - "tm:solarblade", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:synchronoise", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:teleport", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:trick", - "tm:trickroom", - "tm:tripleaxel", - "tm:upperhand", - "tm:vacuumwave", - "tm:wideguard", - "tm:willowisp", - "tm:wonderroom", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json index 3ac68072ad..d0a12aa499 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json @@ -199,10 +199,6 @@ "sandforce", "h:sandforce" ], - "eggGroups": [ - "monster", - "dragon" - ], "baseStats": { "hp": 108, "attack": 170, @@ -211,126 +207,8 @@ "special_defence": 95, "speed": 92 }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 40, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInLava": true - } - } - }, - "moves": [ - "1:tackle", - "1:sandattack", - "1:dragonrage", - "1:sandtomb", - "1:crunch", - "1:dualchop", - "1:dragonbreath", - "18:bulldoze", - "27:bite", - "34:slash", - "42:dragonclaw", - "52:dig", - "62:sandstorm", - "72:takedown", - "82:dragonrush", - "egg:doubleedge", - "egg:metalclaw", - "egg:thrash", - "egg:twister", - "tm:aerialace", - "tm:aquatail", - "tm:bite", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:crunch", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragonbreath", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", - "tm:dragontail", - "tm:dualchop", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fireblast", - "tm:firefang", - "tm:flamethrower", - "tm:fling", - "tm:furycutter", - "tm:gigaimpact", - "tm:headbutt", - "tm:helpinghand", - "tm:honeclaws", - "tm:hyperbeam", - "tm:incinerate", - "tm:ironhead", - "tm:irontail", - "tm:laserfocus", - "tm:liquidation", - "tm:metalclaw", - "tm:mudshot", - "tm:outrage", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:sandattack", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaleshot", - "tm:scaryface", - "tm:scorchingsands", - "tm:shadowclaw", - "tm:slash", - "tm:sleeptalk", - "tm:spikes", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:thrash", - "tm:thunderfang", - "tm:twister" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json index 6a25c77e18..a31e39cc39 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json @@ -199,141 +199,6 @@ "aspects": [ "east-sea" ], - "abilities": [ - "stickyhold", - "stormdrain", - "h:sandforce" - ], - "eggGroups": [ - "water_1", - "amorphous" - ], - "baseStats": { - "hp": 111, - "attack": 83, - "defence": 68, - "special_attack": 92, - "special_defence": 82, - "speed": 39 - }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:mudslap", - "1:mudsport", - "1:harden", - "1:mudbomb", - "1:recover", - "1:watergun", - "15:waterpulse", - "20:ancientpower", - "25:bodyslam", - "33:muddywater", - "39:earthpower", - "46:raindance", - "53:memento", - "egg:acidarmor", - "egg:clearsmog", - "egg:counter", - "egg:curse", - "egg:fissure", - "egg:mirrorcoat", - "egg:mist", - "egg:mudbomb", - "egg:sludge", - "egg:spitup", - "egg:stockpile", - "egg:swallow", - "egg:trumpcard", - "egg:yawn", - "tm:acidarmor", - "tm:amnesia", - "tm:ancientpower", - "tm:blizzard", - "tm:block", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:chillingwater", - "tm:clearsmog", - "tm:counter", - "tm:curse", - "tm:dig", - "tm:dive", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:fissure", - "tm:flash", - "tm:gigaimpact", - "tm:hail", - "tm:harden", - "tm:headbutt", - "tm:helpinghand", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:infestation", - "tm:liquidation", - "tm:memento", - "tm:mirrorcoat", - "tm:mist", - "tm:mudbomb", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:mudsport", - "tm:painsplit", - "tm:protect", - "tm:raindance", - "tm:recover", - "tm:rest", - "tm:rockblast", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:sandstorm", - "tm:sandtomb", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludge", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snowscape", - "tm:spikes", - "tm:spitup", - "tm:stealthrock", - "tm:stockpile", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:stringshot", - "tm:substitute", - "tm:surf", - "tm:swallow", - "tm:takedown", - "tm:terablast", - "tm:trumpcard", - "tm:waterfall", - "tm:watergun", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tm:yawn" - ], "preEvolution": "shellos", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation4/giratina.json b/common/src/main/resources/data/cobblemon/species/generation4/giratina.json index be669efe86..88833cd9e9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/giratina.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/giratina.json @@ -45,7 +45,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:shadowsneak", "1:defog", @@ -164,9 +163,6 @@ "levitate", "h:levitate" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 150, "attack": 120, @@ -175,20 +171,6 @@ "special_defence": 100, "speed": 90 }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:shadowsneak", "1:defog", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json index 9ccbab198a..8c17a46041 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json @@ -47,7 +47,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json index 4dafb06ed6..908cbf188e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json index 51160779e0..e6ccaa89fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json @@ -49,7 +49,6 @@ "height": 1.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/heatran.json b/common/src/main/resources/data/cobblemon/species/generation4/heatran.json index d0db150eef..775347fe34 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/heatran.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/heatran.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:leer", "1:firespin", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json index eed18579de..4b5e405be7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json @@ -47,7 +47,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json index 188962a0a9..39c4cbccc8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json @@ -248,10 +248,6 @@ "scrappy", "h:scrappy" ], - "eggGroups": [ - "field", - "human_like" - ], "baseStats": { "hp": 65, "attack": 136, @@ -260,161 +256,8 @@ "special_defence": 96, "speed": 135 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, "baseExperienceYield": 203, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 140, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:mirrorcoat", - "1:magiccoat", - "1:splash", - "1:pound", - "1:defensecurl", - "1:foresight", - "1:jumpkick", - "1:dizzypunch", - "1:rototiller", - "1:return", - "1:babydolleyes", - "1:frustration", - "12:afteryou", - "16:quickattack", - "20:doublekick", - "24:charm", - "28:batonpass", - "32:headbutt", - "36:agility", - "40:entrainment", - "44:flatter", - "48:bounce", - "52:healingwish", - "56:highjumpkick", - "egg:attract", - "egg:circlethrow", - "egg:copycat", - "egg:doublehit", - "egg:fakeout", - "egg:flail", - "egg:focuspunch", - "egg:jumpkick", - "egg:mudsport", - "egg:return", - "egg:skyuppercut", - "egg:sweetkiss", - "egg:switcheroo", - "egg:teeterdance", - "tm:acrobatics", - "tm:afteryou", - "tm:agility", - "tm:assurance", - "tm:attract", - "tm:aurasphere", - "tm:babydolleyes", - "tm:batonpass", - "tm:blizzard", - "tm:bounce", - "tm:brutalswing", - "tm:chargebeam", - "tm:charm", - "tm:circlethrow", - "tm:closecombat", - "tm:copycat", - "tm:cosmicpower", - "tm:covet", - "tm:cut", - "tm:defensecurl", - "tm:dig", - "tm:dizzypunch", - "tm:doublehit", - "tm:doublekick", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:entrainment", - "tm:facade", - "tm:fakeout", - "tm:faketears", - "tm:firepunch", - "tm:flail", - "tm:flatter", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foresight", - "tm:frustration", - "tm:furycutter", - "tm:gigaimpact", - "tm:grassknot", - "tm:headbutt", - "tm:healbell", - "tm:healingwish", - "tm:helpinghand", - "tm:highjumpkick", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icepunch", - "tm:irontail", - "tm:jumpkick", - "tm:laserfocus", - "tm:lastresort", - "tm:lowkick", - "tm:lowsweep", - "tm:magiccoat", - "tm:megakick", - "tm:megapunch", - "tm:mirrorcoat", - "tm:mudslap", - "tm:mudsport", - "tm:payback", - "tm:playrough", - "tm:pound", - "tm:poweruppunch", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:reversal", - "tm:rocksmash", - "tm:rototiller", - "tm:shadowball", - "tm:shockwave", - "tm:skyuppercut", - "tm:sleeptalk", - "tm:solarbeam", - "tm:splash", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:sweetkiss", - "tm:swift", - "tm:switcheroo", - "tm:teeterdance", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:tripleaxel", - "tm:uproar", - "tm:uturn", - "tm:waterpulse", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json index 86f5b9592a..3824e85033 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json @@ -50,7 +50,6 @@ "height": 2.45, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -232,10 +231,6 @@ "adaptability", "h:adaptability" ], - "eggGroups": [ - "field", - "human_like" - ], "baseStats": { "hp": 70, "attack": 145, @@ -244,169 +239,8 @@ "special_defence": 70, "speed": 112 }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 219, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:quickattack", - "1:foresight", - "1:detect", - "1:metalclaw", - "1:feint", - "1:mefirst", - "1:aurasphere", - "1:helpinghand", - "1:vacuumwave", - "1:rocksmash", - "1:laserfocus", - "1:lifedew", - "1:screech", - "1:copycat", - "1:finalgambit", - "1:reversal", - "12:counter", - "16:workup", - "20:forcepalm", - "24:calmmind", - "28:metalsound", - "32:quickguard", - "36:bonerush", - "40:swordsdance", - "44:healpulse", - "48:meteormash", - "52:dragonpulse", - "56:extremespeed", - "60:closecombat", - "egg:bite", - "egg:bulletpunch", - "egg:circlethrow", - "egg:crosschop", - "egg:detect", - "egg:followme", - "egg:highjumpkick", - "egg:howl", - "egg:mindreader", - "egg:skyuppercut", - "tm:aerialace", - "tm:agility", - "tm:aurasphere", - "tm:bite", - "tm:blazekick", - "tm:bodyslam", - "tm:bonerush", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletpunch", - "tm:calmmind", - "tm:circlethrow", - "tm:closecombat", - "tm:coaching", - "tm:copycat", - "tm:counter", - "tm:crosschop", - "tm:crunch", - "tm:darkpulse", - "tm:detect", - "tm:dig", - "tm:dragonpulse", - "tm:drainpunch", - "tm:dualchop", - "tm:earthquake", - "tm:endure", - "tm:extremespeed", - "tm:facade", - "tm:feint", - "tm:finalgambit", - "tm:flashcannon", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:followme", - "tm:forcepalm", - "tm:foresight", - "tm:furycutter", - "tm:gigaimpact", - "tm:headbutt", - "tm:healpulse", - "tm:helpinghand", - "tm:highjumpkick", - "tm:honeclaws", - "tm:howl", - "tm:hyperbeam", - "tm:icepunch", - "tm:irondefense", - "tm:irontail", - "tm:laserfocus", - "tm:lifedew", - "tm:lowkick", - "tm:lowsweep", - "tm:magnetrise", - "tm:mefirst", - "tm:megakick", - "tm:megapunch", - "tm:metalclaw", - "tm:metalsound", - "tm:meteormash", - "tm:metronome", - "tm:mindreader", - "tm:nastyplot", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:quickattack", - "tm:quickguard", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:scaryface", - "tm:screech", - "tm:shadowball", - "tm:shadowclaw", - "tm:skyuppercut", - "tm:sleeptalk", - "tm:steelbeam", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:terrainpulse", - "tm:thunderpunch", - "tm:trailblaze", - "tm:upperhand", - "tm:vacuumwave", - "tm:waterpulse", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json index 3900008adb..bfefe0de14 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json @@ -48,7 +48,6 @@ "height": 1.6, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json index 5fa594d727..9b890fae8b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json @@ -47,7 +47,6 @@ "height": 2.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json b/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json index ae02e46558..02a6171b26 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:rest", "1:confusion", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json index d396dc0729..85ac8d5b93 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json @@ -51,7 +51,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -233,144 +232,7 @@ "aspects": [ "region-bias-galar" ], - "abilities": [ - "soundproof", - "filter", - "h:technician" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 20, - "attack": 25, - "defence": 45, - "special_attack": 70, - "special_defence": 90, - "speed": 60 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 62, - "experienceGroup": "medium_fast", - "catchRate": 145, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:tickle", - "1:barrier", - "1:copycat", - "1:meditate", - "1:doubleslap", - "1:pound", - "4:batonpass", - "8:encore", - "12:confusion", - "16:roleplay", - "20:protect", - "24:recycle", - "28:psybeam", - "32:mimic", - "36:lightscreen", - "36:reflect", - "36:safeguard", - "40:suckerpunch", - "44:dazzlinggleam", - "48:psychic", - "52:teeterdance", - "egg:confuseray", - "egg:fakeout", - "egg:healingwish", - "egg:hypnosis", - "egg:powersplit", - "egg:tickle", - "egg:wakeupslap", - "tm:allyswitch", - "tm:barrier", - "tm:batonpass", - "tm:brickbreak", - "tm:calmmind", - "tm:chargebeam", - "tm:charm", - "tm:confuseray", - "tm:confusion", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:doubleslap", - "tm:drainpunch", - "tm:dreameater", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:flash", - "tm:fling", - "tm:focuspunch", - "tm:futuresight", - "tm:grassknot", - "tm:headbutt", - "tm:healingwish", - "tm:helpinghand", - "tm:hypnosis", - "tm:icywind", - "tm:infestation", - "tm:lightscreen", - "tm:magiccoat", - "tm:magicroom", - "tm:meditate", - "tm:mimic", - "tm:mistyterrain", - "tm:mudslap", - "tm:nastyplot", - "tm:pound", - "tm:powersplit", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:roleplay", - "tm:safeguard", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:skillswap", - "tm:sleeptalk", - "tm:snatch", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:taunt", - "tm:teeterdance", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:tickle", - "tm:torment", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:wakeupslap", - "tm:wonderroom" - ], "evolutions": [ { "id": "mimejr_mrmime", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json index 73d1082d04..ad8f31bdde 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json @@ -47,7 +47,6 @@ "height": 2.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json index 5eb14265d8..8e86ef5331 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json index 9e93aa3659..3f95638493 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json @@ -50,7 +50,6 @@ "height": 1.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/palkia.json b/common/src/main/resources/data/cobblemon/species/generation4/palkia.json index 93bbc50043..12e22c5e0a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/palkia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/palkia.json @@ -51,7 +51,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:scaryface", "1:waterpulse", @@ -170,13 +169,6 @@ "aspects": [ "origin-forme" ], - "abilities": [ - "pressure", - "h:telepathy" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 90, "attack": 100, @@ -185,20 +177,6 @@ "special_defence": 120, "speed": 120 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:waterpulse", "1:scaryface", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json index c205e7e5a8..de87e9af3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json b/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json index 1d8a0c7b16..74248b9b2b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json @@ -48,7 +48,6 @@ "height": 6.5, "fixed": false }, - "behaviour": {}, "moves": [ "1:dizzypunch", "1:confuseray", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json index 8436e9d968..8cffebac3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json @@ -49,7 +49,6 @@ "height": 1.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rotom.json b/common/src/main/resources/data/cobblemon/species/generation4/rotom.json index 42bbf59ea6..7c0927ae1f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rotom.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rotom.json @@ -47,7 +47,6 @@ "height": 1.3, "fixed": false }, - "behaviour": {}, "moves": [ "1:astonish", "1:doubleteam", @@ -134,13 +133,6 @@ "aspects": [ "heat-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -149,20 +141,7 @@ "special_defence": 107, "speed": 86 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, "baseExperienceYield": 182, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:astonish", "1:doubleteam", @@ -252,13 +231,6 @@ "aspects": [ "wash-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -267,20 +239,7 @@ "special_defence": 107, "speed": 86 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, "baseExperienceYield": 182, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:astonish", "1:doubleteam", @@ -370,13 +329,6 @@ "aspects": [ "frost-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -385,20 +337,7 @@ "special_defence": 107, "speed": 86 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, "baseExperienceYield": 182, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:astonish", "1:doubleteam", @@ -488,13 +427,6 @@ "aspects": [ "fan-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -503,20 +435,7 @@ "special_defence": 107, "speed": 86 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, "baseExperienceYield": 182, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:astonish", "1:doubleteam", @@ -606,13 +525,6 @@ "aspects": [ "mow-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -621,20 +533,7 @@ "special_defence": 107, "speed": 86 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, "baseExperienceYield": 182, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:astonish", "1:doubleteam", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json b/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json index 12cb7fca12..ca85074aeb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json @@ -43,7 +43,6 @@ "catchRate": 45, "eggCycles": 120, "baseFriendship": 100, - "behaviour": {}, "moves": [ "1:growth", "10:magicalleaf", @@ -138,9 +137,6 @@ "serenegrace", "h:serenegrace" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 103, @@ -157,12 +153,6 @@ "special_defence": 0, "speed": 3 }, - "baseExperienceYield": 300, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 120, - "baseFriendship": 100, - "behaviour": {}, "moves": [ "1:growth", "10:magicalleaf", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json index 983ba72734..eaa4486b6e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json @@ -194,125 +194,6 @@ "aspects": [ "east-sea" ], - "abilities": [ - "stickyhold", - "stormdrain", - "h:sandforce" - ], - "eggGroups": [ - "water_1", - "amorphous" - ], - "baseStats": { - "hp": 76, - "attack": 48, - "defence": 48, - "special_attack": 57, - "special_defence": 62, - "speed": 34 - }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 65, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:mudslap", - "1:mudsport", - "1:watergun", - "5:harden", - "10:recover", - "15:waterpulse", - "20:ancientpower", - "25:bodyslam", - "31:muddywater", - "35:earthpower", - "40:raindance", - "45:memento", - "egg:acidarmor", - "egg:clearsmog", - "egg:counter", - "egg:curse", - "egg:fissure", - "egg:mirrorcoat", - "egg:mist", - "egg:mudbomb", - "egg:sludge", - "egg:spitup", - "egg:stockpile", - "egg:swallow", - "egg:trumpcard", - "egg:yawn", - "tm:acidarmor", - "tm:amnesia", - "tm:ancientpower", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:chillingwater", - "tm:clearsmog", - "tm:counter", - "tm:curse", - "tm:dive", - "tm:earthpower", - "tm:endure", - "tm:facade", - "tm:fissure", - "tm:hail", - "tm:harden", - "tm:headbutt", - "tm:helpinghand", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:infestation", - "tm:liquidation", - "tm:memento", - "tm:mirrorcoat", - "tm:mist", - "tm:mudbomb", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:mudsport", - "tm:painsplit", - "tm:protect", - "tm:raindance", - "tm:recover", - "tm:rest", - "tm:rockslide", - "tm:rocktomb", - "tm:sandstorm", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludge", - "tm:snowscape", - "tm:spitup", - "tm:stealthrock", - "tm:stockpile", - "tm:stoneedge", - "tm:stringshot", - "tm:substitute", - "tm:surf", - "tm:swallow", - "tm:takedown", - "tm:terablast", - "tm:trumpcard", - "tm:waterfall", - "tm:watergun", - "tm:waterpulse", - "tm:whirlpool", - "tm:yawn" - ], "evolutions": [ { "id": "shellos_gastrodon", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json index 97619d74bc..194929984c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json index 1e9a9b22b7..9f5150ec61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/snover.json b/common/src/main/resources/data/cobblemon/species/generation4/snover.json index 673ab7cc57..7e5ad05794 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/snover.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/snover.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json index b907ad26cb..79d87970f1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json @@ -48,7 +48,6 @@ "height": 0.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/stunky.json b/common/src/main/resources/data/cobblemon/species/generation4/stunky.json index 11590cb975..c453830796 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/stunky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/stunky.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json index 3cb6784ae5..9d47d6866c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json @@ -48,7 +48,6 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json index f9fc85a8c1..fb19337469 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json index 1554bfe979..3689252675 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/uxie.json b/common/src/main/resources/data/cobblemon/species/generation4/uxie.json index 56219dc647..97fbf14fe4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/uxie.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/uxie.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:rest", "1:confusion", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json index 4b5570a7b3..a4cd77a4af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json @@ -48,7 +48,6 @@ "height": 1.35, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json index f75dbbac9b..edc3e81463 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json @@ -43,7 +43,6 @@ "catchRate": 45, "eggCycles": 15, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -147,13 +146,6 @@ "aspects": [ "sandy-cloak" ], - "abilities": [ - "anticipation", - "h:overcoat" - ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 60, "attack": 79, @@ -170,12 +162,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 148, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:protect", @@ -268,13 +254,6 @@ "aspects": [ "trash-cloak" ], - "abilities": [ - "anticipation", - "h:overcoat" - ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 60, "attack": 69, @@ -291,12 +270,6 @@ "special_defence": 1, "speed": 0 }, - "baseExperienceYield": 148, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:protect", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json b/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json index c8832e0a4a..797d69e4cf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json @@ -48,7 +48,6 @@ "height": 1.7, "fixed": false }, - "behaviour": {}, "moves": [ "1:acidspray", "1:doubleteam", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/audino.json b/common/src/main/resources/data/cobblemon/species/generation5/audino.json index fa6ac7f7c8..99caa01f15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/audino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/audino.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -212,9 +211,6 @@ "healer", "h:healer" ], - "eggGroups": [ - "fairy" - ], "baseStats": { "hp": 103, "attack": 60, @@ -223,149 +219,8 @@ "special_defence": 126, "speed": 50 }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 425, - "experienceGroup": "fast", - "catchRate": 255, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:pound", - "1:refresh", - "1:doubleslap", - "1:playnice", - "1:attract", - "1:secretpower", - "4:disarmingvoice", - "9:babydolleyes", - "12:helpinghand", - "16:growl", - "20:zenheadbutt", - "24:lifedew", - "28:afteryou", - "32:takedown", - "36:simplebeam", - "40:hypervoice", - "44:healpulse", - "48:doubleedge", - "52:entrainment", - "56:mistyterrain", - "60:lastresort", - "egg:bestow", - "egg:healingwish", - "egg:luckychant", - "egg:sweetkiss", - "egg:wish", - "egg:yawn", - "tm:afteryou", - "tm:allyswitch", - "tm:amnesia", - "tm:attract", - "tm:babydolleyes", - "tm:bestow", - "tm:blizzard", - "tm:bodyslam", - "tm:calmmind", - "tm:chargebeam", - "tm:covet", - "tm:dazzlinggleam", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleedge", - "tm:doubleslap", - "tm:drainingkiss", - "tm:drainpunch", - "tm:dreameater", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:entrainment", - "tm:facade", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:focuspunch", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:growl", - "tm:healbell", - "tm:healingwish", - "tm:healpulse", - "tm:helpinghand", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:incinerate", - "tm:irontail", - "tm:knockoff", - "tm:laserfocus", - "tm:lastresort", - "tm:lifedew", - "tm:lightscreen", - "tm:lowkick", - "tm:luckychant", - "tm:magiccoat", - "tm:megakick", - "tm:megapunch", - "tm:mistyterrain", - "tm:painsplit", - "tm:playnice", - "tm:pound", - "tm:poweruppunch", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roleplay", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:signalbeam", - "tm:simplebeam", - "tm:skillswap", - "tm:sleeptalk", - "tm:snatch", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:sweetkiss", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:trickroom", - "tm:uproar", - "tm:wildcharge", - "tm:wish", - "tm:workup", - "tm:yawn", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json index 111d31e507..28c8e1a5a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json @@ -187,114 +187,6 @@ "adaptability", "h:moldbreaker" ], - "eggGroups": [ - "water_2" - ], - "baseStats": { - "hp": 70, - "attack": 92, - "defence": 65, - "special_attack": 80, - "special_defence": 55, - "speed": 98 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 161, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 40, - "baseFriendship": 50, - "moves": [ - "1:watergun", - "1:chipaway", - "1:tailwhip", - "4:tackle", - "8:flail", - "12:aquajet", - "16:bite", - "20:scaryface", - "24:headbutt", - "28:soak", - "32:crunch", - "36:takedown", - "40:finalgambit", - "44:wavecrash", - "48:thrash", - "52:doubleedge", - "56:headsmash", - "egg:bubblebeam", - "egg:endeavor", - "egg:headsmash", - "egg:rage", - "tm:agility", - "tm:aquajet", - "tm:aquatail", - "tm:assurance", - "tm:bite", - "tm:blizzard", - "tm:bounce", - "tm:brine", - "tm:bubblebeam", - "tm:chillingwater", - "tm:chipaway", - "tm:crunch", - "tm:cut", - "tm:dive", - "tm:doubleedge", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:finalgambit", - "tm:flail", - "tm:flipturn", - "tm:gigaimpact", - "tm:hail", - "tm:headbutt", - "tm:headsmash", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icywind", - "tm:liquidation", - "tm:muddywater", - "tm:mudshot", - "tm:protect", - "tm:psychicfangs", - "tm:rage", - "tm:raindance", - "tm:rest", - "tm:revenge", - "tm:reversal", - "tm:scaleshot", - "tm:scaryface", - "tm:sleeptalk", - "tm:snowscape", - "tm:soak", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:swift", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thrash", - "tm:waterfall", - "tm:watergun", - "tm:waterpulse", - "tm:wavecrash", - "tm:whirlpool", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -319,30 +211,6 @@ "adaptability", "h:moldbreaker" ], - "eggGroups": [ - "water_2" - ], - "baseStats": { - "hp": 70, - "attack": 92, - "defence": 65, - "special_attack": 80, - "special_defence": 55, - "speed": 98 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 161, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 40, - "baseFriendship": 50, "moves": [ "1:tailwhip", "1:watergun", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json index 0e15e5883f..5993fd725e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json b/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json index fe9a7d038f..6411781127 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json index 7b6a34296e..49ecb67028 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json @@ -48,7 +48,6 @@ "height": 1.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 8, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json index 2be9218f8d..c013356a4e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json @@ -187,9 +187,6 @@ "sheerforce", "h:tintedlens" ], - "eggGroups": [ - "flying" - ], "baseStats": { "hp": 110, "attack": 83, @@ -206,12 +203,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 179, - "experienceGroup": "slow", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json index a7eeee2f96..b21988bb0c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json b/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json index 2f1503ed14..19078b1224 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json index e853fe6401..e3bdd590a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json index c99f129847..a0af02cee2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json @@ -202,13 +202,6 @@ "aspects": [ "zen-mode" ], - "abilities": [ - "sheerforce", - "h:zenmode" - ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 105, "attack": 30, @@ -226,17 +219,11 @@ "speed": 0 }, "baseExperienceYield": 189, - "experienceGroup": "medium_slow", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "baseScale": 1, "hitbox": { "width": 1.3, "height": 1.5, "fixed": false }, - "behaviour": {}, "moves": [ "1:tackle", "1:rage", @@ -358,38 +345,12 @@ ], "aspects": [ "standard-mode", - "galarian", "galarian" ], "abilities": [ "gorillatactics", "h:zenmode" ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 105, - "attack": 140, - "defence": 55, - "special_attack": 30, - "special_defence": 55, - "speed": 95 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 168, - "experienceGroup": "medium_slow", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -519,16 +480,13 @@ "galarian_form" ], "aspects": [ - "zen-mode", - "galarian" + "galarian", + "zen-mode" ], "abilities": [ "gorillatactics", "h:zenmode" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 105, "attack": 160, @@ -546,11 +504,6 @@ "speed": 0 }, "baseExperienceYield": 189, - "experienceGroup": "medium_slow", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:iciclecrash", "1:powdersnow", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json b/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json index 477dd1982c..1d54407c2c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json @@ -186,35 +186,6 @@ "aspects": [ "galarian" ], - "abilities": [ - "hustle", - "h:innerfocus" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 70, - "attack": 90, - "defence": 45, - "special_attack": 15, - "special_defence": 45, - "speed": 50 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 63, - "experienceGroup": "medium_slow", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json index 29fb4c2ce6..950d4b8c90 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json @@ -54,7 +54,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -187,120 +186,6 @@ "aspects": [ "summer" ], - "abilities": [ - "chlorophyll", - "sapsipper", - "h:serenegrace" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 60, - "attack": 60, - "defence": 50, - "special_attack": 40, - "special_defence": 50, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 67, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:camouflage", - "4:growl", - "7:sandattack", - "10:doublekick", - "13:leechseed", - "16:feintattack", - "20:takedown", - "24:jumpkick", - "28:aromatherapy", - "32:charm", - "37:doubleedge", - "42:solarbeam", - "egg:agility", - "egg:batonpass", - "egg:faketears", - "egg:grasswhistle", - "egg:headbutt", - "egg:naturalgift", - "egg:odorsleuth", - "egg:sleeptalk", - "egg:synthesis", - "egg:worryseed", - "tm:agility", - "tm:aromatherapy", - "tm:batonpass", - "tm:bodyslam", - "tm:bounce", - "tm:bulldoze", - "tm:bulletseed", - "tm:camouflage", - "tm:charm", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:faketears", - "tm:feintattack", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grasswhistle", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:jumpkick", - "tm:lastresort", - "tm:leafstorm", - "tm:leechseed", - "tm:lightscreen", - "tm:magicalleaf", - "tm:naturalgift", - "tm:naturepower", - "tm:odorsleuth", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:safeguard", - "tm:sandattack", - "tm:seedbomb", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:synthesis", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:trailblaze", - "tm:wildcharge", - "tm:workup", - "tm:worryseed", - "tm:zenheadbutt" - ], "evolutions": [ { "id": "deerling_sawsbuck", @@ -336,120 +221,6 @@ "aspects": [ "autumn" ], - "abilities": [ - "chlorophyll", - "sapsipper", - "h:serenegrace" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 60, - "attack": 60, - "defence": 50, - "special_attack": 40, - "special_defence": 50, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 67, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:camouflage", - "4:growl", - "7:sandattack", - "10:doublekick", - "13:leechseed", - "16:feintattack", - "20:takedown", - "24:jumpkick", - "28:aromatherapy", - "32:charm", - "37:doubleedge", - "42:solarbeam", - "egg:agility", - "egg:batonpass", - "egg:faketears", - "egg:grasswhistle", - "egg:headbutt", - "egg:naturalgift", - "egg:odorsleuth", - "egg:sleeptalk", - "egg:synthesis", - "egg:worryseed", - "tm:agility", - "tm:aromatherapy", - "tm:batonpass", - "tm:bodyslam", - "tm:bounce", - "tm:bulldoze", - "tm:bulletseed", - "tm:camouflage", - "tm:charm", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:faketears", - "tm:feintattack", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grasswhistle", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:jumpkick", - "tm:lastresort", - "tm:leafstorm", - "tm:leechseed", - "tm:lightscreen", - "tm:magicalleaf", - "tm:naturalgift", - "tm:naturepower", - "tm:odorsleuth", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:safeguard", - "tm:sandattack", - "tm:seedbomb", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:synthesis", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:trailblaze", - "tm:wildcharge", - "tm:workup", - "tm:worryseed", - "tm:zenheadbutt" - ], "evolutions": [ { "id": "deerling_sawsbuck", @@ -485,120 +256,6 @@ "aspects": [ "winter" ], - "abilities": [ - "chlorophyll", - "sapsipper", - "h:serenegrace" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 60, - "attack": 60, - "defence": 50, - "special_attack": 40, - "special_defence": 50, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 67, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:camouflage", - "4:growl", - "7:sandattack", - "10:doublekick", - "13:leechseed", - "16:feintattack", - "20:takedown", - "24:jumpkick", - "28:aromatherapy", - "32:charm", - "37:doubleedge", - "42:solarbeam", - "egg:agility", - "egg:batonpass", - "egg:faketears", - "egg:grasswhistle", - "egg:headbutt", - "egg:naturalgift", - "egg:odorsleuth", - "egg:sleeptalk", - "egg:synthesis", - "egg:worryseed", - "tm:agility", - "tm:aromatherapy", - "tm:batonpass", - "tm:bodyslam", - "tm:bounce", - "tm:bulldoze", - "tm:bulletseed", - "tm:camouflage", - "tm:charm", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:faketears", - "tm:feintattack", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grasswhistle", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:jumpkick", - "tm:lastresort", - "tm:leafstorm", - "tm:leechseed", - "tm:lightscreen", - "tm:magicalleaf", - "tm:naturalgift", - "tm:naturepower", - "tm:odorsleuth", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:safeguard", - "tm:sandattack", - "tm:seedbomb", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:synthesis", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:trailblaze", - "tm:wildcharge", - "tm:workup", - "tm:worryseed", - "tm:zenheadbutt" - ], "evolutions": [ { "id": "deerling_sawsbuck", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/deino.json b/common/src/main/resources/data/cobblemon/species/generation5/deino.json index 3664a837d9..e7698619a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/deino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/deino.json @@ -48,7 +48,6 @@ "height": 1.4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json index aac6eb0f9d..dcb21eb797 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json @@ -233,129 +233,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "torrent", - "h:shellarmor" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 75, - "defence": 60, - "special_attack": 83, - "special_defence": 60, - "speed": 60 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 145, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:tackle", - "1:tailwhip", - "1:watergun", - "1:watersport", - "1:soak", - "13:focusenergy", - "18:razorshell", - "21:furycutter", - "26:waterpulse", - "29:aerialace", - "34:aquajet", - "37:encore", - "42:aquatail", - "45:retaliate", - "50:swordsdance", - "53:hydropump", - "egg:airslash", - "egg:aquacutter", - "egg:copycat", - "egg:detect", - "egg:knockoff", - "egg:nightslash", - "egg:sacredsword", - "egg:screech", - "egg:trumpcard", - "tm:aerialace", - "tm:airslash", - "tm:aquacutter", - "tm:aquajet", - "tm:aquatail", - "tm:assurance", - "tm:avalanche", - "tm:blizzard", - "tm:brickbreak", - "tm:brine", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:cut", - "tm:detect", - "tm:dig", - "tm:dive", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:flipturn", - "tm:focusenergy", - "tm:furycutter", - "tm:grassknot", - "tm:hail", - "tm:helpinghand", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:irontail", - "tm:knockoff", - "tm:liquidation", - "tm:nightslash", - "tm:protect", - "tm:raindance", - "tm:razorshell", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:rocksmash", - "tm:sacredsword", - "tm:screech", - "tm:sleeptalk", - "tm:snowscape", - "tm:soak", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:trumpcard", - "tm:vacuumwave", - "tm:waterfall", - "tm:watergun", - "tm:waterpledge", - "tm:waterpulse", - "tm:watersport", - "tm:whirlpool", - "tm:workup", - "tm:xscissor" - ], "preEvolution": "oshawott", "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json b/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json index 69d8c4528e..3b1f5718d8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json index 9f95a13505..1b4deed5c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/durant.json b/common/src/main/resources/data/cobblemon/species/generation5/durant.json index 97e6ad8458..915c7ea459 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/durant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/durant.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json index 13e3739bd7..93b4a9b3c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json @@ -50,7 +50,6 @@ "height": 0.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json index 33be07336c..9848625396 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json @@ -49,7 +49,6 @@ "height": 2.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json index c10da971e6..186526904c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json index afdf8b8c02..c972b241a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json @@ -186,135 +186,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "stench", - "weakarmor", - "h:aftermath" - ], - "eggGroups": [ - "mineral" - ], - "baseStats": { - "hp": 80, - "attack": 95, - "defence": 82, - "special_attack": 60, - "special_defence": 82, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, - "moves": [ - "1:pound", - "1:poisongas", - "1:recycle", - "1:acidspray", - "1:doubleslap", - "1:takedown", - "1:metalclaw", - "9:amnesia", - "12:clearsmog", - "15:toxicspikes", - "18:sludge", - "21:stockpile", - "21:swallow", - "24:bodyslam", - "27:sludgebomb", - "30:toxic", - "33:belch", - "39:painsplit", - "43:gunkshot", - "48:explosion", - "egg:autotomize", - "egg:curse", - "egg:haze", - "egg:mudsport", - "egg:rollout", - "egg:sandattack", - "tm:acidspray", - "tm:amnesia", - "tm:autotomize", - "tm:belch", - "tm:bodypress", - "tm:bodyslam", - "tm:clearsmog", - "tm:corrosivegas", - "tm:crosspoison", - "tm:curse", - "tm:darkpulse", - "tm:doubleslap", - "tm:drainpunch", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:fling", - "tm:focusblast", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gunkshot", - "tm:haze", - "tm:hyperbeam", - "tm:infestation", - "tm:metalclaw", - "tm:mudsport", - "tm:painsplit", - "tm:payback", - "tm:poisongas", - "tm:pound", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:recycle", - "tm:rest", - "tm:rockblast", - "tm:rockpolish", - "tm:rollout", - "tm:sandattack", - "tm:screech", - "tm:seedbomb", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:sludge", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:solarbeam", - "tm:spikes", - "tm:spite", - "tm:stockpile", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:swallow", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunderbolt", - "tm:toxic", - "tm:toxicspikes", - "tm:venomdrench", - "tm:venoshock" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/genesect.json b/common/src/main/resources/data/cobblemon/species/generation5/genesect.json index 6fc19482e9..ced797921c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/genesect.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/genesect.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:quickattack", "1:furycutter", @@ -158,124 +157,6 @@ "aspects": [ "water-drive" ], - "abilities": [ - "download", - "h:download" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 71, - "attack": 120, - "defence": 95, - "special_attack": 120, - "special_defence": 95, - "speed": 99 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "moves": [ - "1:quickattack", - "1:furycutter", - "1:magnetbomb", - "1:slash", - "7:screech", - "14:metalclaw", - "21:fellstinger", - "28:flamecharge", - "35:metalsound", - "42:xscissor", - "49:magnetrise", - "56:bugbuzz", - "63:simplebeam", - "70:zapcannon", - "77:lockon", - "84:technoblast", - "91:selfdestruct", - "tm:aerialace", - "tm:allyswitch", - "tm:assurance", - "tm:blazekick", - "tm:blizzard", - "tm:bugbite", - "tm:bugbuzz", - "tm:chargebeam", - "tm:darkpulse", - "tm:electroweb", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fellstinger", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:furycutter", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gravity", - "tm:gunkshot", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:infestation", - "tm:irondefense", - "tm:ironhead", - "tm:lastresort", - "tm:leechlife", - "tm:lightscreen", - "tm:lockon", - "tm:magiccoat", - "tm:magnetbomb", - "tm:magnetrise", - "tm:metalclaw", - "tm:metalsound", - "tm:protect", - "tm:psychic", - "tm:quickattack", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:rockpolish", - "tm:screech", - "tm:selfdestruct", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:simplebeam", - "tm:slash", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelbeam", - "tm:strugglebug", - "tm:substitute", - "tm:swift", - "tm:technoblast", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:triattack", - "tm:uturn", - "tm:xscissor", - "tm:zapcannon", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -296,124 +177,6 @@ "aspects": [ "electric-drive" ], - "abilities": [ - "download", - "h:download" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 71, - "attack": 120, - "defence": 95, - "special_attack": 120, - "special_defence": 95, - "speed": 99 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "moves": [ - "1:quickattack", - "1:furycutter", - "1:magnetbomb", - "1:slash", - "7:screech", - "14:metalclaw", - "21:fellstinger", - "28:flamecharge", - "35:metalsound", - "42:xscissor", - "49:magnetrise", - "56:bugbuzz", - "63:simplebeam", - "70:zapcannon", - "77:lockon", - "84:technoblast", - "91:selfdestruct", - "tm:aerialace", - "tm:allyswitch", - "tm:assurance", - "tm:blazekick", - "tm:blizzard", - "tm:bugbite", - "tm:bugbuzz", - "tm:chargebeam", - "tm:darkpulse", - "tm:electroweb", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fellstinger", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:furycutter", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gravity", - "tm:gunkshot", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:infestation", - "tm:irondefense", - "tm:ironhead", - "tm:lastresort", - "tm:leechlife", - "tm:lightscreen", - "tm:lockon", - "tm:magiccoat", - "tm:magnetbomb", - "tm:magnetrise", - "tm:metalclaw", - "tm:metalsound", - "tm:protect", - "tm:psychic", - "tm:quickattack", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:rockpolish", - "tm:screech", - "tm:selfdestruct", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:simplebeam", - "tm:slash", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelbeam", - "tm:strugglebug", - "tm:substitute", - "tm:swift", - "tm:technoblast", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:triattack", - "tm:uturn", - "tm:xscissor", - "tm:zapcannon", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -434,124 +197,6 @@ "aspects": [ "fire-drive" ], - "abilities": [ - "download", - "h:download" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 71, - "attack": 120, - "defence": 95, - "special_attack": 120, - "special_defence": 95, - "speed": 99 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "moves": [ - "1:quickattack", - "1:furycutter", - "1:magnetbomb", - "1:slash", - "7:screech", - "14:metalclaw", - "21:fellstinger", - "28:flamecharge", - "35:metalsound", - "42:xscissor", - "49:magnetrise", - "56:bugbuzz", - "63:simplebeam", - "70:zapcannon", - "77:lockon", - "84:technoblast", - "91:selfdestruct", - "tm:aerialace", - "tm:allyswitch", - "tm:assurance", - "tm:blazekick", - "tm:blizzard", - "tm:bugbite", - "tm:bugbuzz", - "tm:chargebeam", - "tm:darkpulse", - "tm:electroweb", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fellstinger", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:furycutter", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gravity", - "tm:gunkshot", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:infestation", - "tm:irondefense", - "tm:ironhead", - "tm:lastresort", - "tm:leechlife", - "tm:lightscreen", - "tm:lockon", - "tm:magiccoat", - "tm:magnetbomb", - "tm:magnetrise", - "tm:metalclaw", - "tm:metalsound", - "tm:protect", - "tm:psychic", - "tm:quickattack", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:rockpolish", - "tm:screech", - "tm:selfdestruct", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:simplebeam", - "tm:slash", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelbeam", - "tm:strugglebug", - "tm:substitute", - "tm:swift", - "tm:technoblast", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:triattack", - "tm:uturn", - "tm:xscissor", - "tm:zapcannon", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -572,124 +217,6 @@ "aspects": [ "ice-drive" ], - "abilities": [ - "download", - "h:download" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 71, - "attack": 120, - "defence": 95, - "special_attack": 120, - "special_defence": 95, - "speed": 99 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "moves": [ - "1:quickattack", - "1:furycutter", - "1:magnetbomb", - "1:slash", - "7:screech", - "14:metalclaw", - "21:fellstinger", - "28:flamecharge", - "35:metalsound", - "42:xscissor", - "49:magnetrise", - "56:bugbuzz", - "63:simplebeam", - "70:zapcannon", - "77:lockon", - "84:technoblast", - "91:selfdestruct", - "tm:aerialace", - "tm:allyswitch", - "tm:assurance", - "tm:blazekick", - "tm:blizzard", - "tm:bugbite", - "tm:bugbuzz", - "tm:chargebeam", - "tm:darkpulse", - "tm:electroweb", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fellstinger", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:furycutter", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gravity", - "tm:gunkshot", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:infestation", - "tm:irondefense", - "tm:ironhead", - "tm:lastresort", - "tm:leechlife", - "tm:lightscreen", - "tm:lockon", - "tm:magiccoat", - "tm:magnetbomb", - "tm:magnetrise", - "tm:metalclaw", - "tm:metalsound", - "tm:protect", - "tm:psychic", - "tm:quickattack", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:rockpolish", - "tm:screech", - "tm:selfdestruct", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:simplebeam", - "tm:slash", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelbeam", - "tm:strugglebug", - "tm:substitute", - "tm:swift", - "tm:technoblast", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:triattack", - "tm:uturn", - "tm:xscissor", - "tm:zapcannon", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json index 0b432dc15e..ff32ef82cd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json index 8d6aa9b089..1bc1490b05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json index 767252a417..92a9c68cf8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json index 1b82bef2fb..5680b2cfa9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json @@ -48,7 +48,6 @@ "height": 1.45, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/joltik.json b/common/src/main/resources/data/cobblemon/species/generation5/joltik.json index a907601696..f68e33986a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/joltik.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/joltik.json @@ -50,7 +50,6 @@ "height": 0.6, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json index 99671392a6..e4d3f7ebe3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json b/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json index 8f21e73785..169e71861c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json @@ -44,7 +44,6 @@ "catchRate": 3, "eggCycles": 80, "baseFriendship": 35, - "behaviour": {}, "moves": [ "1:aquajet", "1:leer", @@ -151,122 +150,6 @@ "aspects": [ "sword-form-resolute" ], - "abilities": [ - "justified", - "h:justified" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 91, - "attack": 72, - "defence": 90, - "special_attack": 129, - "special_defence": 90, - "speed": 108 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 290, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 80, - "baseFriendship": 35, - "behaviour": {}, - "moves": [ - "1:aquajet", - "1:leer", - "1:helpinghand", - "1:workup", - "1:secretsword", - "7:bubblebeam", - "14:quickguard", - "21:doublekick", - "28:retaliate", - "35:aquatail", - "42:takedown", - "49:sacredsword", - "56:swordsdance", - "63:hydropump", - "70:closecombat", - "form_change:secretsword", - "tm:aerialace", - "tm:airslash", - "tm:aquajet", - "tm:aquatail", - "tm:aurasphere", - "tm:batonpass", - "tm:bounce", - "tm:brickbreak", - "tm:bubblebeam", - "tm:calmmind", - "tm:chillingwater", - "tm:closecombat", - "tm:coaching", - "tm:covet", - "tm:cut", - "tm:doubleedge", - "tm:doublekick", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:flipturn", - "tm:focusblast", - "tm:gigaimpact", - "tm:hail", - "tm:helpinghand", - "tm:hydropump", - "tm:hyperbeam", - "tm:icywind", - "tm:lastresort", - "tm:leer", - "tm:liquidation", - "tm:lowkick", - "tm:megahorn", - "tm:muddywater", - "tm:painsplit", - "tm:poisonjab", - "tm:protect", - "tm:psychup", - "tm:quickguard", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:roar", - "tm:rocksmash", - "tm:sacredsword", - "tm:safeguard", - "tm:secretsword", - "tm:sleeptalk", - "tm:smartstrike", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:trailblaze", - "tm:upperhand", - "tm:vacuumwave", - "tm:waterpulse", - "tm:workup", - "tm:xscissor" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json b/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json index 5b1efd98bf..77a6db3d1d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:dragonrage", "1:ancientpower", @@ -168,9 +167,6 @@ "turboblaze", "h:turboblaze" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 125, "attack": 120, @@ -188,11 +184,6 @@ "speed": 0 }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:dragonrage", "1:ancientpower", @@ -313,9 +304,6 @@ "teravolt", "h:teravolt" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 125, "attack": 170, @@ -333,11 +321,6 @@ "speed": 0 }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:dragonrage", "1:ancientpower", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/landorus.json b/common/src/main/resources/data/cobblemon/species/generation5/landorus.json index 0b3938928b..de29045674 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/landorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/landorus.json @@ -44,7 +44,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 90, - "behaviour": {}, "moves": [ "1:punishment", "1:rockthrow", @@ -156,9 +155,6 @@ "intimidate", "h:intimidate" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 89, "attack": 145, @@ -175,100 +171,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 90, - "behaviour": {}, - "moves": [ - "1:punishment", - "1:rockthrow", - "1:smackdown", - "1:sandtomb", - "5:leer", - "10:block", - "15:bulldoze", - "20:rocktomb", - "30:imprison", - "35:rockslide", - "40:earthpower", - "45:extrasensory", - "50:stoneedge", - "55:hammerarm", - "60:sandstorm", - "65:earthquake", - "70:outrage", - "75:fissure", - "80:sandsearstorm", - "tm:block", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:bulldoze", - "tm:calmmind", - "tm:crunch", - "tm:defog", - "tm:dig", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:explosion", - "tm:extrasensory", - "tm:facade", - "tm:fissure", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:hammerarm", - "tm:hyperbeam", - "tm:imprison", - "tm:irontail", - "tm:leer", - "tm:mudshot", - "tm:mudslap", - "tm:nastyplot", - "tm:outrage", - "tm:payback", - "tm:protect", - "tm:psychic", - "tm:punishment", - "tm:raindance", - "tm:rest", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rockthrow", - "tm:rocktomb", - "tm:roleplay", - "tm:sandsearstorm", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaryface", - "tm:scorchingsands", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:uturn", - "tm:weatherball" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json b/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json index a7dcdd51c6..123b3e6e1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json @@ -48,7 +48,6 @@ "height": 0.85, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json index 8099900202..8c4195cfac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 6, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json index 767c240a4c..5e6a26ec51 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json @@ -48,7 +48,6 @@ "height": 2.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json index a4961d6339..e3aa33d708 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json @@ -52,7 +52,6 @@ "height": 2.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -187,9 +186,6 @@ "hustle", "h:leafguard" ], - "eggGroups": [ - "grass" - ], "baseStats": { "hp": 70, "attack": 105, @@ -206,18 +202,12 @@ "special_defence": 0, "speed": 1 }, - "baseExperienceYield": 168, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 0.8, "hitbox": { "width": 0.5, "height": 2.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json index bf58b059c9..e093ef34d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json @@ -48,7 +48,6 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json index c3302c9fd6..ea99cc2281 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 7, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json index b319833bce..96055e05c1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json @@ -48,7 +48,6 @@ "height": 1.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json b/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json index 78c205e8a3..35cda9d307 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json @@ -44,7 +44,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 100, - "behaviour": {}, "moves": [ "1:round", "1:quickattack", @@ -177,13 +176,6 @@ "aspects": [ "pirouette-forme" ], - "abilities": [ - "serenegrace", - "h:serenegrace" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 128, @@ -200,125 +192,6 @@ "special_defence": 0, "speed": 1 }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 100, - "behaviour": {}, - "moves": [ - "1:round", - "1:quickattack", - "1:confusion", - "1:sing", - "1:wakeupslap", - "21:teeterdance", - "26:acrobatics", - "31:psybeam", - "36:echoedvoice", - "43:uturn", - "50:relicsong", - "57:psychic", - "64:hypervoice", - "71:roleplay", - "78:closecombat", - "85:perishsong", - "form_change:relicsong", - "tm:acrobatics", - "tm:alluringvoice", - "tm:allyswitch", - "tm:batonpass", - "tm:brickbreak", - "tm:calmmind", - "tm:charm", - "tm:closecombat", - "tm:coaching", - "tm:confusion", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainpunch", - "tm:dreameater", - "tm:dualchop", - "tm:echoedvoice", - "tm:embargo", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:faketears", - "tm:firepunch", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:healbell", - "tm:helpinghand", - "tm:honeclaws", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icepunch", - "tm:knockoff", - "tm:laserfocus", - "tm:lastresort", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:magiccoat", - "tm:magicroom", - "tm:metronome", - "tm:payback", - "tm:perishsong", - "tm:playrough", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:quickattack", - "tm:raindance", - "tm:recycle", - "tm:relicsong", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:rocksmash", - "tm:roleplay", - "tm:round", - "tm:safeguard", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:sing", - "tm:skillswap", - "tm:sleeptalk", - "tm:snatch", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:teeterdance", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:trick", - "tm:trickroom", - "tm:tripleaxel", - "tm:uturn", - "tm:wakeupslap", - "tm:wonderroom", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json b/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json index 810c2dcede..21cbdb4db5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json index 033c712c26..c732881550 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json b/common/src/main/resources/data/cobblemon/species/generation5/minccino.json index 6a1935f714..812df62d30 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/minccino.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/munna.json b/common/src/main/resources/data/cobblemon/species/generation5/munna.json index 6966e745ea..f4700498b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/munna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/munna.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json index c84dc62550..39c5480dc5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json index f7c2e631c6..5ae45463c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json @@ -204,127 +204,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "torrent", - "h:shellarmor" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 55, - "attack": 55, - "defence": 45, - "special_attack": 63, - "special_defence": 45, - "speed": 45 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 62, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:tackle", - "1:watersport", - "5:tailwhip", - "7:watergun", - "11:soak", - "13:focusenergy", - "17:razorshell", - "19:furycutter", - "23:waterpulse", - "25:aerialace", - "29:aquajet", - "31:encore", - "35:aquatail", - "37:retaliate", - "41:swordsdance", - "43:hydropump", - "egg:airslash", - "egg:aquacutter", - "egg:copycat", - "egg:detect", - "egg:knockoff", - "egg:nightslash", - "egg:sacredsword", - "egg:screech", - "egg:trumpcard", - "tm:aerialace", - "tm:airslash", - "tm:aquacutter", - "tm:aquajet", - "tm:aquatail", - "tm:assurance", - "tm:avalanche", - "tm:blizzard", - "tm:brine", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:cut", - "tm:detect", - "tm:dig", - "tm:dive", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:flipturn", - "tm:focusenergy", - "tm:furycutter", - "tm:grassknot", - "tm:hail", - "tm:helpinghand", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:irontail", - "tm:knockoff", - "tm:liquidation", - "tm:nightslash", - "tm:protect", - "tm:raindance", - "tm:razorshell", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:rocksmash", - "tm:sacredsword", - "tm:screech", - "tm:sleeptalk", - "tm:snowscape", - "tm:soak", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:trumpcard", - "tm:waterfall", - "tm:watergun", - "tm:waterpledge", - "tm:waterpulse", - "tm:watersport", - "tm:whirlpool", - "tm:workup", - "tm:xscissor" - ], "evolutions": [ { "id": "oshawott_dewott", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json b/common/src/main/resources/data/cobblemon/species/generation5/panpour.json index 4861546f42..ef7f12bd68 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/panpour.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json b/common/src/main/resources/data/cobblemon/species/generation5/pansage.json index f48b7e01ba..c6815fec46 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pansage.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json b/common/src/main/resources/data/cobblemon/species/generation5/pansear.json index bd748d36eb..a41798d6fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pansear.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json b/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json index 98d02b0d7f..2345e09a47 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/petilil.json b/common/src/main/resources/data/cobblemon/species/generation5/petilil.json index 98328feebb..af461dabf0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/petilil.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/petilil.json @@ -212,110 +212,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "chlorophyll", - "owntempo", - "h:leafguard" - ], - "eggGroups": [ - "grass" - ], - "baseStats": { - "hp": 45, - "attack": 35, - "defence": 50, - "special_attack": 70, - "special_defence": 50, - "speed": 30 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 56, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:absorb", - "1:growth", - "1:aromatherapy", - "3:helpinghand", - "6:stunspore", - "9:megadrain", - "12:charm", - "15:magicalleaf", - "18:sleeppowder", - "21:gigadrain", - "24:leechseed", - "27:afteryou", - "30:energyball", - "33:synthesis", - "36:sunnyday", - "39:entrainment", - "42:leafstorm", - "egg:bide", - "egg:grasswhistle", - "egg:healingwish", - "egg:ingrain", - "egg:naturalgift", - "egg:sweetscent", - "egg:worryseed", - "tm:absorb", - "tm:afteryou", - "tm:aromatherapy", - "tm:babydolleyes", - "tm:bide", - "tm:bulletseed", - "tm:charm", - "tm:covet", - "tm:cut", - "tm:dreameater", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grasswhistle", - "tm:grassyglide", - "tm:growth", - "tm:healbell", - "tm:healingwish", - "tm:helpinghand", - "tm:ingrain", - "tm:laserfocus", - "tm:leafstorm", - "tm:leechseed", - "tm:magicalleaf", - "tm:megadrain", - "tm:naturalgift", - "tm:naturepower", - "tm:pollenpuff", - "tm:protect", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:sleeppowder", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stunspore", - "tm:substitute", - "tm:sunnyday", - "tm:sweetscent", - "tm:synthesis", - "tm:terablast", - "tm:trailblaze", - "tm:worryseed" - ], "evolutions": [ { "id": "petilil_lilligant", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json b/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json index 817fb3e74b..4e73bec2fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json @@ -48,7 +48,6 @@ "height": 1.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json b/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json index ffabded803..f6bebdfe5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:firefang", "1:dragonrage", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json index b562a34459..0fcbbd2125 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json b/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json index 140ade3ceb..a027b47154 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json @@ -211,111 +211,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "keeneye", - "sheerforce", - "h:hustle" - ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 70, - "attack": 83, - "defence": 50, - "special_attack": 37, - "special_defence": 50, - "speed": 60 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 70, - "experienceGroup": "slow", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:peck", - "1:leer", - "1:furyattack", - "6:honeclaws", - "12:wingattack", - "18:tailwind", - "24:scaryface", - "30:aerialace", - "36:slash", - "42:whirlwind", - "48:crushclaw", - "55:airslash", - "60:defog", - "66:thrash", - "72:bravebird", - "egg:rocksmash", - "egg:roost", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:assurance", - "tm:bodyslam", - "tm:bravebird", - "tm:bulkup", - "tm:closecombat", - "tm:crushclaw", - "tm:cut", - "tm:defog", - "tm:doubleedge", - "tm:dualwingbeat", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:furyattack", - "tm:heatwave", - "tm:helpinghand", - "tm:honeclaws", - "tm:hurricane", - "tm:leer", - "tm:ominouswind", - "tm:peck", - "tm:pluck", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:scaryface", - "tm:shadowclaw", - "tm:skydrop", - "tm:slash", - "tm:sleeptalk", - "tm:steelwing", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thrash", - "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [ { "id": "rufflet_braviary", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json index f858bb11dd..201f485d38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json @@ -209,9 +209,6 @@ "torrent", "h:sharpness" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 90, "attack": 108, @@ -228,28 +225,7 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 264, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 0.75, - "hitbox": { - "width": 1.6, - "height": 2.2, - "fixed": false - }, - "behaviour": { - "resting": { - "canSleep": true, - "light": "0-4" - }, - "moving": { - "swim": { - "canBreatheUnderwater": true - } - } - }, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json index 756b120013..9f160d97e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json index 870f5856fe..18b4861571 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json @@ -54,7 +54,6 @@ "height": 1.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -190,138 +189,6 @@ "aspects": [ "summer" ], - "abilities": [ - "chlorophyll", - "sapsipper", - "h:serenegrace" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 80, - "attack": 100, - "defence": 70, - "special_attack": 60, - "special_defence": 70, - "speed": 95 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:megahorn", - "1:tackle", - "1:camouflage", - "1:growl", - "1:sandattack", - "1:feintattack", - "1:jumpkick", - "1:aromatherapy", - "1:hornleech", - "10:doublekick", - "13:leechseed", - "16:bulletseed", - "20:takedown", - "24:zenheadbutt", - "28:energyball", - "36:charm", - "44:doubleedge", - "52:solarbeam", - "egg:agility", - "egg:batonpass", - "egg:faketears", - "egg:grasswhistle", - "egg:headbutt", - "egg:naturalgift", - "egg:odorsleuth", - "egg:sleeptalk", - "egg:synthesis", - "egg:worryseed", - "tm:agility", - "tm:aromatherapy", - "tm:batonpass", - "tm:bodyslam", - "tm:bounce", - "tm:bulldoze", - "tm:bulletseed", - "tm:camouflage", - "tm:charm", - "tm:curse", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:faketears", - "tm:feintattack", - "tm:flash", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grasswhistle", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hornleech", - "tm:hyperbeam", - "tm:jumpkick", - "tm:lastresort", - "tm:leafstorm", - "tm:leechseed", - "tm:lightscreen", - "tm:magicalleaf", - "tm:megahorn", - "tm:naturalgift", - "tm:naturepower", - "tm:odorsleuth", - "tm:petalblizzard", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:rocksmash", - "tm:safeguard", - "tm:sandattack", - "tm:seedbomb", - "tm:shadowball", - "tm:sleeptalk", - "tm:smartstrike", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:swordsdance", - "tm:synthesis", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:thunderwave", - "tm:trailblaze", - "tm:wildcharge", - "tm:workup", - "tm:worryseed", - "tm:zenheadbutt" - ], "preEvolution": "deerling", "evolutions": [], "battleOnly": false @@ -342,138 +209,6 @@ "aspects": [ "autumn" ], - "abilities": [ - "chlorophyll", - "sapsipper", - "h:serenegrace" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 80, - "attack": 100, - "defence": 70, - "special_attack": 60, - "special_defence": 70, - "speed": 95 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:megahorn", - "1:tackle", - "1:camouflage", - "1:growl", - "1:sandattack", - "1:feintattack", - "1:jumpkick", - "1:aromatherapy", - "1:hornleech", - "10:doublekick", - "13:leechseed", - "16:bulletseed", - "20:takedown", - "24:zenheadbutt", - "28:energyball", - "36:charm", - "44:doubleedge", - "52:solarbeam", - "egg:agility", - "egg:batonpass", - "egg:faketears", - "egg:grasswhistle", - "egg:headbutt", - "egg:naturalgift", - "egg:odorsleuth", - "egg:sleeptalk", - "egg:synthesis", - "egg:worryseed", - "tm:agility", - "tm:aromatherapy", - "tm:batonpass", - "tm:bodyslam", - "tm:bounce", - "tm:bulldoze", - "tm:bulletseed", - "tm:camouflage", - "tm:charm", - "tm:curse", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:faketears", - "tm:feintattack", - "tm:flash", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grasswhistle", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hornleech", - "tm:hyperbeam", - "tm:jumpkick", - "tm:lastresort", - "tm:leafstorm", - "tm:leechseed", - "tm:lightscreen", - "tm:magicalleaf", - "tm:megahorn", - "tm:naturalgift", - "tm:naturepower", - "tm:odorsleuth", - "tm:petalblizzard", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:rocksmash", - "tm:safeguard", - "tm:sandattack", - "tm:seedbomb", - "tm:shadowball", - "tm:sleeptalk", - "tm:smartstrike", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:swordsdance", - "tm:synthesis", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:thunderwave", - "tm:trailblaze", - "tm:wildcharge", - "tm:workup", - "tm:worryseed", - "tm:zenheadbutt" - ], "preEvolution": "deerling", "evolutions": [], "battleOnly": false @@ -494,138 +229,6 @@ "aspects": [ "winter" ], - "abilities": [ - "chlorophyll", - "sapsipper", - "h:serenegrace" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 80, - "attack": 100, - "defence": 70, - "special_attack": 60, - "special_defence": 70, - "speed": 95 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:megahorn", - "1:tackle", - "1:camouflage", - "1:growl", - "1:sandattack", - "1:feintattack", - "1:jumpkick", - "1:aromatherapy", - "1:hornleech", - "10:doublekick", - "13:leechseed", - "16:bulletseed", - "20:takedown", - "24:zenheadbutt", - "28:energyball", - "36:charm", - "44:doubleedge", - "52:solarbeam", - "egg:agility", - "egg:batonpass", - "egg:faketears", - "egg:grasswhistle", - "egg:headbutt", - "egg:naturalgift", - "egg:odorsleuth", - "egg:sleeptalk", - "egg:synthesis", - "egg:worryseed", - "tm:agility", - "tm:aromatherapy", - "tm:batonpass", - "tm:bodyslam", - "tm:bounce", - "tm:bulldoze", - "tm:bulletseed", - "tm:camouflage", - "tm:charm", - "tm:curse", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doublekick", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:faketears", - "tm:feintattack", - "tm:flash", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grasswhistle", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hornleech", - "tm:hyperbeam", - "tm:jumpkick", - "tm:lastresort", - "tm:leafstorm", - "tm:leechseed", - "tm:lightscreen", - "tm:magicalleaf", - "tm:megahorn", - "tm:naturalgift", - "tm:naturepower", - "tm:odorsleuth", - "tm:petalblizzard", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:rocksmash", - "tm:safeguard", - "tm:sandattack", - "tm:seedbomb", - "tm:shadowball", - "tm:sleeptalk", - "tm:smartstrike", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:swordsdance", - "tm:synthesis", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:thunderwave", - "tm:trailblaze", - "tm:wildcharge", - "tm:workup", - "tm:worryseed", - "tm:zenheadbutt" - ], "preEvolution": "deerling", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json index 2d12012b93..8767893bbe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json @@ -50,7 +50,6 @@ "height": 1.65, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json b/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json index 99ad16e571..b2b6d5feea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json @@ -50,7 +50,6 @@ "height": 1.05, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json b/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json index dac1dc4fa2..45b9aa02c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json index c397eafccb..5cb624bf78 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json index 8f237f8ac8..3e3c441857 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json index 6de9df6971..8efaaeb7d8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json index b542830d7a..4905b6a746 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json b/common/src/main/resources/data/cobblemon/species/generation5/solosis.json index ad9d567d67..06b5928af5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/solosis.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json index aebb73ba84..73724df28b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json @@ -48,7 +48,6 @@ "height": 1.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 7, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json index 7aa2826fc8..2fca8dc875 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json @@ -192,10 +192,6 @@ "mimicry", "h:mimicry" ], - "eggGroups": [ - "water_1", - "amorphous" - ], "baseStats": { "hp": 109, "attack": 81, @@ -204,29 +200,7 @@ "special_defence": 84, "speed": 32 }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true, - "canSwimInLava": false, - "canBreatheUnderwater": true, - "swimSpeed": "0.2" - } - } - }, "moves": [ "1:mudslap", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json index 348582a84f..33581d4556 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json b/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json index 7a568d7ea4..f1877ff1f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/throh.json b/common/src/main/resources/data/cobblemon/species/generation5/throh.json index 1f4250ffd0..9cdc0506c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/throh.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/throh.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json b/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json index b376f15f1f..312c06a74e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json @@ -44,7 +44,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 90, - "behaviour": {}, "moves": [ "1:astonish", "1:thundershock", @@ -168,9 +167,6 @@ "voltabsorb", "h:voltabsorb" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 79, "attack": 105, @@ -187,112 +183,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 290, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 90, - "behaviour": {}, - "moves": [ - "1:astonish", - "1:thundershock", - "5:leer", - "10:swagger", - "15:bite", - "20:shockwave", - "25:healblock", - "30:charge", - "35:voltswitch", - "40:crunch", - "45:discharge", - "50:uproar", - "55:hammerarm", - "60:raindance", - "65:thunder", - "70:thrash", - "75:wildboltstorm", - "tm:acrobatics", - "tm:agility", - "tm:assurance", - "tm:astonish", - "tm:bite", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:charge", - "tm:chargebeam", - "tm:crunch", - "tm:darkpulse", - "tm:defog", - "tm:discharge", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:embargo", - "tm:endure", - "tm:facade", - "tm:flashcannon", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:gigaimpact", - "tm:grassknot", - "tm:hammerarm", - "tm:healblock", - "tm:hyperbeam", - "tm:incinerate", - "tm:irontail", - "tm:knockoff", - "tm:lashout", - "tm:leer", - "tm:nastyplot", - "tm:payback", - "tm:powershift", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:rest", - "tm:revenge", - "tm:risingvoltage", - "tm:rocksmash", - "tm:roleplay", - "tm:scaryface", - "tm:shockwave", - "tm:skydrop", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:smartstrike", - "tm:snarl", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:superpower", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave", - "tm:torment", - "tm:uproar", - "tm:uturn", - "tm:voltswitch", - "tm:weatherball", - "tm:wildboltstorm", - "tm:wildcharge", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json b/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json index 618f1c33a6..970e7dd615 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json @@ -43,7 +43,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 90, - "behaviour": {}, "moves": [ "1:astonish", "1:gust", @@ -156,9 +155,6 @@ "regenerator", "h:regenerator" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 79, "attack": 100, @@ -175,102 +171,6 @@ "special_defence": 0, "speed": 3 }, - "baseExperienceYield": 290, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 90, - "behaviour": {}, - "moves": [ - "1:astonish", - "1:gust", - "5:leer", - "10:swagger", - "15:bite", - "20:aircutter", - "25:agility", - "30:tailwind", - "35:airslash", - "40:crunch", - "45:extrasensory", - "50:uproar", - "55:hammerarm", - "60:raindance", - "65:hurricane", - "70:thrash", - "77:bleakwindstorm", - "tm:acrobatics", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:assurance", - "tm:astonish", - "tm:bite", - "tm:bleakwindstorm", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:chillingwater", - "tm:crunch", - "tm:darkpulse", - "tm:defog", - "tm:embargo", - "tm:endure", - "tm:extrasensory", - "tm:facade", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:gigaimpact", - "tm:grassknot", - "tm:gust", - "tm:hammerarm", - "tm:heatwave", - "tm:hurricane", - "tm:hyperbeam", - "tm:icywind", - "tm:incinerate", - "tm:irontail", - "tm:knockoff", - "tm:lashout", - "tm:leer", - "tm:metronome", - "tm:nastyplot", - "tm:payback", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:rest", - "tm:revenge", - "tm:reversal", - "tm:rocksmash", - "tm:roleplay", - "tm:sandstorm", - "tm:scaryface", - "tm:skydrop", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:snowscape", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:torment", - "tm:uproar", - "tm:uturn", - "tm:weatherball" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/victini.json b/common/src/main/resources/data/cobblemon/species/generation5/victini.json index 2fbd826e85..6f5a5f6848 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/victini.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/victini.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:focusenergy", "1:confusion", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/virizion.json b/common/src/main/resources/data/cobblemon/species/generation5/virizion.json index 039a94bdd3..9abd88732f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/virizion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/virizion.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json b/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json index 7e54bb8974..df06fa20ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json index 5fd4985ecd..f57a292c92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json @@ -194,10 +194,6 @@ "wanderingspirit", "h:wanderingspirit" ], - "eggGroups": [ - "mineral", - "amorphous" - ], "baseStats": { "hp": 38, "attack": 55, @@ -206,20 +202,6 @@ "special_defence": 65, "speed": 30 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 25, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json index 845442befa..3f29f21619 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json b/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json index 66e0bcffa7..03cb4c3613 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:thunderfang", "1:dragonrage", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json index cff94eff21..663f3d2739 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json @@ -51,7 +51,6 @@ "height": 2.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -201,16 +200,8 @@ "hisuian_form" ], "aspects": [ - "hisuian", "hisuian" ], - "abilities": [ - "illusion", - "h:illusion" - ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 55, "attack": 100, @@ -219,26 +210,12 @@ "special_defence": 60, "speed": 110 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 179, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 0.85, "hitbox": { "width": 1.3, "height": 3.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json index fb6ce62913..638f693fe3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json @@ -52,7 +52,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ @@ -198,13 +197,6 @@ "aspects": [ "hisuian" ], - "abilities": [ - "illusion", - "h:illusion" - ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 35, "attack": 60, @@ -213,21 +205,6 @@ "special_defence": 40, "speed": 70 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 66, - "experienceGroup": "medium_slow", - "catchRate": 75, - "eggCycles": 25, - "baseFriendship": 50, - "shoulderMountable": true, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json index bdd1bf29f8..cf55d47418 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json @@ -48,7 +48,6 @@ "height": 1.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json index 7460acefa2..e368c7222b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json @@ -170,13 +170,6 @@ "aspects": [ "blade-forme" ], - "abilities": [ - "stancechange", - "h:stancechange" - ], - "eggGroups": [ - "mineral" - ], "baseStats": { "hp": 60, "attack": 140, @@ -193,19 +186,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 250, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, "moves": [ "1:furycutter", "1:pursuit", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json index b88f28e023..8fe38c4832 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json index d10c7cb6f8..7ea07d2504 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json @@ -200,10 +200,6 @@ "icebody", "h:sturdy" ], - "eggGroups": [ - "monster", - "mineral" - ], "baseStats": { "hp": 95, "attack": 127, @@ -212,20 +208,6 @@ "special_defence": 36, "speed": 38 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 180, - "experienceGroup": "medium_fast", - "catchRate": 55, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json index 7557b1fe0b..00e35dd924 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json @@ -212,108 +212,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "owntempo", - "icebody", - "h:sturdy" - ], - "eggGroups": [ - "monster", - "mineral" - ], - "baseStats": { - "hp": 55, - "attack": 69, - "defence": 85, - "special_attack": 32, - "special_defence": 35, - "speed": 28 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:harden", - "1:rapidspin", - "3:tackle", - "6:powdersnow", - "9:curse", - "12:icywind", - "15:protect", - "18:avalanche", - "21:bite", - "24:icefang", - "27:irondefense", - "30:recover", - "33:crunch", - "36:takedown", - "39:blizzard", - "42:doubleedge", - "egg:auroraveil", - "egg:barrier", - "egg:mirrorcoat", - "egg:mist", - "egg:sharpen", - "tm:afteryou", - "tm:auroraveil", - "tm:avalanche", - "tm:barrier", - "tm:bite", - "tm:blizzard", - "tm:bodyslam", - "tm:bulldoze", - "tm:chillingwater", - "tm:crunch", - "tm:curse", - "tm:doubleedge", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:frostbreath", - "tm:gyroball", - "tm:hail", - "tm:harden", - "tm:iceball", - "tm:icebeam", - "tm:icefang", - "tm:icespinner", - "tm:iciclespear", - "tm:icywind", - "tm:irondefense", - "tm:mirrorcoat", - "tm:mist", - "tm:powdersnow", - "tm:protect", - "tm:raindance", - "tm:rapidspin", - "tm:recover", - "tm:rest", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:safeguard", - "tm:sharpen", - "tm:sleeptalk", - "tm:snowscape", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:tackle", - "tm:takedown", - "tm:terablast" - ], "evolutions": [ { "id": "bergmite_avalugg", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/carbink.json b/common/src/main/resources/data/cobblemon/species/generation6/carbink.json index 848ef0f3ab..a29d083d54 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/carbink.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/carbink.json @@ -49,7 +49,6 @@ "height": 1.15, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json index a304e14128..985539070e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json index 1a9d367e02..5c3630fac2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:tackle", "1:harden", @@ -172,9 +171,6 @@ "magicbounce", "h:magicbounce" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 50, "attack": 160, @@ -183,120 +179,8 @@ "special_defence": 110, "speed": 110 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:tackle", - "1:harden", - "1:rockthrow", - "1:sharpen", - "1:diamondstorm", - "7:guardsplit", - "14:smackdown", - "21:flail", - "28:ancientpower", - "35:rockpolish", - "42:lightscreen", - "49:rockslide", - "56:skillswap", - "63:powergem", - "70:stealthrock", - "77:moonblast", - "84:stoneedge", - "tm:afteryou", - "tm:allyswitch", - "tm:amnesia", - "tm:ancientpower", - "tm:batonpass", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:calmmind", - "tm:charm", - "tm:covet", - "tm:dazzlinggleam", - "tm:diamondstorm", - "tm:drainingkiss", - "tm:earthpower", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:faketears", - "tm:flail", - "tm:flash", - "tm:flashcannon", - "tm:gigaimpact", - "tm:gravity", - "tm:guardsplit", - "tm:guardswap", - "tm:gyroball", - "tm:hail", - "tm:harden", - "tm:healbell", - "tm:helpinghand", - "tm:hyperbeam", - "tm:irondefense", - "tm:lastresort", - "tm:lightscreen", - "tm:magnetrise", - "tm:meteorbeam", - "tm:metronome", - "tm:mistyexplosion", - "tm:moonblast", - "tm:mysticalfire", - "tm:naturepower", - "tm:playrough", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:rockpolish", - "tm:rockslide", - "tm:rockthrow", - "tm:rocktomb", - "tm:safeguard", - "tm:sandstorm", - "tm:sandtomb", - "tm:scorchingsands", - "tm:sharpen", - "tm:skillswap", - "tm:sleeptalk", - "tm:smackdown", - "tm:snowscape", - "tm:spikes", - "tm:stealthrock", - "tm:stoneedge", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tackle", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:terrainpulse", - "tm:trickroom", - "tm:wonderroom" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation6/espurr.json b/common/src/main/resources/data/cobblemon/species/generation6/espurr.json index 5808ab8911..48d2289b00 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/espurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/espurr.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json b/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json index 44eeebdfd2..aeff8a7668 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json @@ -184,114 +184,6 @@ "aspects": [ "flower-yellow" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 44, - "attack": 38, - "defence": 39, - "special_attack": 61, - "special_defence": 79, - "speed": 42 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:vinewhip", - "1:luckychant", - "6:fairywind", - "10:safeguard", - "15:razorleaf", - "20:wish", - "22:magicalleaf", - "24:grassyterrain", - "28:petalblizzard", - "33:aromatherapy", - "37:mistyterrain", - "41:moonblast", - "45:petaldance", - "48:solarbeam", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "evolutions": [ { "id": "flabebe_floette", @@ -324,114 +216,6 @@ "aspects": [ "flower-orange" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 44, - "attack": 38, - "defence": 39, - "special_attack": 61, - "special_defence": 79, - "speed": 42 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:vinewhip", - "1:luckychant", - "6:fairywind", - "10:safeguard", - "15:razorleaf", - "20:wish", - "22:magicalleaf", - "24:grassyterrain", - "28:petalblizzard", - "33:aromatherapy", - "37:mistyterrain", - "41:moonblast", - "45:petaldance", - "48:solarbeam", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "evolutions": [ { "id": "flabebe_floette", @@ -464,114 +248,6 @@ "aspects": [ "flower-blue" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 44, - "attack": 38, - "defence": 39, - "special_attack": 61, - "special_defence": 79, - "speed": 42 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:vinewhip", - "1:luckychant", - "6:fairywind", - "10:safeguard", - "15:razorleaf", - "20:wish", - "22:magicalleaf", - "24:grassyterrain", - "28:petalblizzard", - "33:aromatherapy", - "37:mistyterrain", - "41:moonblast", - "45:petaldance", - "48:solarbeam", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "evolutions": [ { "id": "flabebe_floette", @@ -604,114 +280,6 @@ "aspects": [ "flower-white" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 44, - "attack": 38, - "defence": 39, - "special_attack": 61, - "special_defence": 79, - "speed": 42 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "catchRate": 225, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:vinewhip", - "1:luckychant", - "6:fairywind", - "10:safeguard", - "15:razorleaf", - "20:wish", - "22:magicalleaf", - "24:grassyterrain", - "28:petalblizzard", - "33:aromatherapy", - "37:mistyterrain", - "41:moonblast", - "45:petaldance", - "48:solarbeam", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "evolutions": [ { "id": "flabebe_floette", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/floette.json b/common/src/main/resources/data/cobblemon/species/generation6/floette.json index ea359bb556..231902b674 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/floette.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/floette.json @@ -183,117 +183,6 @@ "aspects": [ "flower-yellow" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 54, - "attack": 45, - "defence": 47, - "special_attack": 75, - "special_defence": 98, - "speed": 52 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 130, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:vinewhip", - "1:fairywind", - "1:luckychant", - "10:safeguard", - "15:razorleaf", - "20:wish", - "25:magicalleaf", - "27:grassyterrain", - "33:petalblizzard", - "38:aromatherapy", - "43:mistyterrain", - "46:moonblast", - "51:petaldance", - "58:solarbeam", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:metronome", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "preEvolution": "flabebe", "evolutions": [ { @@ -323,117 +212,6 @@ "aspects": [ "flower-orange" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 54, - "attack": 45, - "defence": 47, - "special_attack": 75, - "special_defence": 98, - "speed": 52 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 130, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:vinewhip", - "1:fairywind", - "1:luckychant", - "10:safeguard", - "15:razorleaf", - "20:wish", - "25:magicalleaf", - "27:grassyterrain", - "33:petalblizzard", - "38:aromatherapy", - "43:mistyterrain", - "46:moonblast", - "51:petaldance", - "58:solarbeam", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:metronome", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "preEvolution": "flabebe", "evolutions": [ { @@ -463,117 +241,6 @@ "aspects": [ "flower-blue" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 54, - "attack": 45, - "defence": 47, - "special_attack": 75, - "special_defence": 98, - "speed": 52 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 130, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:vinewhip", - "1:fairywind", - "1:luckychant", - "10:safeguard", - "15:razorleaf", - "20:wish", - "25:magicalleaf", - "27:grassyterrain", - "33:petalblizzard", - "38:aromatherapy", - "43:mistyterrain", - "46:moonblast", - "51:petaldance", - "58:solarbeam", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:metronome", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "preEvolution": "flabebe", "evolutions": [ { @@ -603,117 +270,6 @@ "aspects": [ "flower-white" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 54, - "attack": 45, - "defence": 47, - "special_attack": 75, - "special_defence": 98, - "speed": 52 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 130, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:vinewhip", - "1:fairywind", - "1:luckychant", - "10:safeguard", - "15:razorleaf", - "20:wish", - "25:magicalleaf", - "27:grassyterrain", - "33:petalblizzard", - "38:aromatherapy", - "43:mistyterrain", - "46:moonblast", - "51:petaldance", - "58:solarbeam", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:metronome", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "preEvolution": "flabebe", "evolutions": [ { @@ -743,12 +299,9 @@ "aspects": [ "flower-eternal" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], "eggGroups": [ - "undiscovered" + "undiscovered", + "fairy" ], "baseStats": { "hp": 74, @@ -758,20 +311,7 @@ "special_defence": 128, "speed": 92 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, "baseExperienceYield": 193, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -784,89 +324,6 @@ } ] }, - "moves": [ - "1:tackle", - "1:vinewhip", - "1:fairywind", - "1:luckychant", - "10:safeguard", - "15:razorleaf", - "20:wish", - "25:magicalleaf", - "27:grassyterrain", - "33:petalblizzard", - "38:aromatherapy", - "43:mistyterrain", - "46:moonblast", - "51:petaldance", - "58:solarbeam", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:metronome", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation6/florges.json b/common/src/main/resources/data/cobblemon/species/generation6/florges.json index 95e5a859aa..3d6eb9b236 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/florges.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/florges.json @@ -184,127 +184,6 @@ "aspects": [ "flower-yellow" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 78, - "attack": 65, - "defence": 68, - "special_attack": 112, - "special_defence": 154, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "baseExperienceYield": 276, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:disarmingvoice", - "1:luckychant", - "1:wish", - "1:magicalleaf", - "1:flowershield", - "1:grassknot", - "1:grassyterrain", - "1:petalblizzard", - "1:mistyterrain", - "1:petaldance", - "1:aromatherapy", - "1:solarbeam", - "1:safeguard", - "1:synthesis", - "1:tackle", - "1:vinewhip", - "1:fairywind", - "1:razorleaf", - "5:moonblast", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:defog", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:flowershield", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:hyperbeam", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "preEvolution": "floette", "evolutions": [], "battleOnly": false @@ -324,127 +203,6 @@ "aspects": [ "flower-orange" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 78, - "attack": 65, - "defence": 68, - "special_attack": 112, - "special_defence": 154, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "baseExperienceYield": 276, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:disarmingvoice", - "1:luckychant", - "1:wish", - "1:magicalleaf", - "1:flowershield", - "1:grassknot", - "1:grassyterrain", - "1:petalblizzard", - "1:mistyterrain", - "1:petaldance", - "1:aromatherapy", - "1:solarbeam", - "1:safeguard", - "1:synthesis", - "1:tackle", - "1:vinewhip", - "1:fairywind", - "1:razorleaf", - "5:moonblast", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:defog", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:flowershield", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:hyperbeam", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "preEvolution": "floette", "evolutions": [], "battleOnly": false @@ -464,127 +222,6 @@ "aspects": [ "flower-blue" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 78, - "attack": 65, - "defence": 68, - "special_attack": 112, - "special_defence": 154, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "baseExperienceYield": 276, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:disarmingvoice", - "1:luckychant", - "1:wish", - "1:magicalleaf", - "1:flowershield", - "1:grassknot", - "1:grassyterrain", - "1:petalblizzard", - "1:mistyterrain", - "1:petaldance", - "1:aromatherapy", - "1:solarbeam", - "1:safeguard", - "1:synthesis", - "1:tackle", - "1:vinewhip", - "1:fairywind", - "1:razorleaf", - "5:moonblast", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:defog", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:flowershield", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:hyperbeam", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "preEvolution": "floette", "evolutions": [], "battleOnly": false @@ -604,127 +241,6 @@ "aspects": [ "flower-white" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 78, - "attack": 65, - "defence": 68, - "special_attack": 112, - "special_defence": 154, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "baseExperienceYield": 276, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:disarmingvoice", - "1:luckychant", - "1:wish", - "1:magicalleaf", - "1:flowershield", - "1:grassknot", - "1:grassyterrain", - "1:petalblizzard", - "1:mistyterrain", - "1:petaldance", - "1:aromatherapy", - "1:solarbeam", - "1:safeguard", - "1:synthesis", - "1:tackle", - "1:vinewhip", - "1:fairywind", - "1:razorleaf", - "5:moonblast", - "egg:camouflage", - "egg:captivate", - "egg:copycat", - "egg:endeavor", - "egg:tearfullook", - "tm:afteryou", - "tm:alluringvoice", - "tm:allyswitch", - "tm:aromatherapy", - "tm:batonpass", - "tm:calmmind", - "tm:camouflage", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:covet", - "tm:dazzlinggleam", - "tm:defog", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fairywind", - "tm:flash", - "tm:flowershield", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:healbell", - "tm:helpinghand", - "tm:hyperbeam", - "tm:lightscreen", - "tm:luckychant", - "tm:magicalleaf", - "tm:magiccoat", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:petalblizzard", - "tm:petaldance", - "tm:pollenpuff", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:safeguard", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synthesis", - "tm:tackle", - "tm:tearfullook", - "tm:terablast", - "tm:trailblaze", - "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" - ], "preEvolution": "floette", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json b/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json index d70bf61379..2d4a4d8c6e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -151,102 +150,6 @@ "aspects": [ "heart-trim" ], - "abilities": [ - "furcoat", - "h:furcoat" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 160, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:growl", - "5:sandattack", - "9:babydolleyes", - "12:headbutt", - "15:tailwhip", - "22:bite", - "27:odorsleuth", - "33:retaliate", - "35:takedown", - "38:charm", - "42:suckerpunch", - "48:cottonguard", - "egg:captivate", - "egg:mimic", - "egg:refresh", - "egg:roleplay", - "egg:workup", - "tm:babydolleyes", - "tm:bite", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:cottonguard", - "tm:darkpulse", - "tm:dig", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:sandattack", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -265,102 +168,6 @@ "aspects": [ "star-trim" ], - "abilities": [ - "furcoat", - "h:furcoat" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 160, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:growl", - "5:sandattack", - "9:babydolleyes", - "12:headbutt", - "15:tailwhip", - "22:bite", - "27:odorsleuth", - "33:retaliate", - "35:takedown", - "38:charm", - "42:suckerpunch", - "48:cottonguard", - "egg:captivate", - "egg:mimic", - "egg:refresh", - "egg:roleplay", - "egg:workup", - "tm:babydolleyes", - "tm:bite", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:cottonguard", - "tm:darkpulse", - "tm:dig", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:sandattack", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -379,102 +186,6 @@ "aspects": [ "diamond-trim" ], - "abilities": [ - "furcoat", - "h:furcoat" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 160, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:growl", - "5:sandattack", - "9:babydolleyes", - "12:headbutt", - "15:tailwhip", - "22:bite", - "27:odorsleuth", - "33:retaliate", - "35:takedown", - "38:charm", - "42:suckerpunch", - "48:cottonguard", - "egg:captivate", - "egg:mimic", - "egg:refresh", - "egg:roleplay", - "egg:workup", - "tm:babydolleyes", - "tm:bite", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:cottonguard", - "tm:darkpulse", - "tm:dig", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:sandattack", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -493,102 +204,6 @@ "aspects": [ "debutante-trim" ], - "abilities": [ - "furcoat", - "h:furcoat" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 160, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:growl", - "5:sandattack", - "9:babydolleyes", - "12:headbutt", - "15:tailwhip", - "22:bite", - "27:odorsleuth", - "33:retaliate", - "35:takedown", - "38:charm", - "42:suckerpunch", - "48:cottonguard", - "egg:captivate", - "egg:mimic", - "egg:refresh", - "egg:roleplay", - "egg:workup", - "tm:babydolleyes", - "tm:bite", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:cottonguard", - "tm:darkpulse", - "tm:dig", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:sandattack", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -607,102 +222,6 @@ "aspects": [ "matron-trim" ], - "abilities": [ - "furcoat", - "h:furcoat" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 160, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:growl", - "5:sandattack", - "9:babydolleyes", - "12:headbutt", - "15:tailwhip", - "22:bite", - "27:odorsleuth", - "33:retaliate", - "35:takedown", - "38:charm", - "42:suckerpunch", - "48:cottonguard", - "egg:captivate", - "egg:mimic", - "egg:refresh", - "egg:roleplay", - "egg:workup", - "tm:babydolleyes", - "tm:bite", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:cottonguard", - "tm:darkpulse", - "tm:dig", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:sandattack", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -721,102 +240,6 @@ "aspects": [ "dandy-trim" ], - "abilities": [ - "furcoat", - "h:furcoat" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 160, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:growl", - "5:sandattack", - "9:babydolleyes", - "12:headbutt", - "15:tailwhip", - "22:bite", - "27:odorsleuth", - "33:retaliate", - "35:takedown", - "38:charm", - "42:suckerpunch", - "48:cottonguard", - "egg:captivate", - "egg:mimic", - "egg:refresh", - "egg:roleplay", - "egg:workup", - "tm:babydolleyes", - "tm:bite", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:cottonguard", - "tm:darkpulse", - "tm:dig", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:sandattack", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -835,102 +258,6 @@ "aspects": [ "la_reine-trim" ], - "abilities": [ - "furcoat", - "h:furcoat" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 160, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:growl", - "5:sandattack", - "9:babydolleyes", - "12:headbutt", - "15:tailwhip", - "22:bite", - "27:odorsleuth", - "33:retaliate", - "35:takedown", - "38:charm", - "42:suckerpunch", - "48:cottonguard", - "egg:captivate", - "egg:mimic", - "egg:refresh", - "egg:roleplay", - "egg:workup", - "tm:babydolleyes", - "tm:bite", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:cottonguard", - "tm:darkpulse", - "tm:dig", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:sandattack", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -949,102 +276,6 @@ "aspects": [ "kabuki-trim" ], - "abilities": [ - "furcoat", - "h:furcoat" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 160, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:growl", - "5:sandattack", - "9:babydolleyes", - "12:headbutt", - "15:tailwhip", - "22:bite", - "27:odorsleuth", - "33:retaliate", - "35:takedown", - "38:charm", - "42:suckerpunch", - "48:cottonguard", - "egg:captivate", - "egg:mimic", - "egg:refresh", - "egg:roleplay", - "egg:workup", - "tm:babydolleyes", - "tm:bite", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:cottonguard", - "tm:darkpulse", - "tm:dig", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:sandattack", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -1063,102 +294,6 @@ "aspects": [ "pharaoh-trim" ], - "abilities": [ - "furcoat", - "h:furcoat" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "catchRate": 160, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "1:growl", - "5:sandattack", - "9:babydolleyes", - "12:headbutt", - "15:tailwhip", - "22:bite", - "27:odorsleuth", - "33:retaliate", - "35:takedown", - "38:charm", - "42:suckerpunch", - "48:cottonguard", - "egg:captivate", - "egg:mimic", - "egg:refresh", - "egg:roleplay", - "egg:workup", - "tm:babydolleyes", - "tm:bite", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:cottonguard", - "tm:darkpulse", - "tm:dig", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:headbutt", - "tm:helpinghand", - "tm:hypervoice", - "tm:irontail", - "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", - "tm:protect", - "tm:raindance", - "tm:refresh", - "tm:rest", - "tm:retaliate", - "tm:roar", - "tm:rocksmash", - "tm:roleplay", - "tm:sandattack", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:surf", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json b/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json index c452a5e659..410255c002 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/goodra.json b/common/src/main/resources/data/cobblemon/species/generation6/goodra.json index f97e377de9..846c5f9c11 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/goodra.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/goodra.json @@ -53,7 +53,6 @@ "height": 3.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ @@ -189,7 +188,6 @@ "hisuian_form" ], "aspects": [ - "hisuian", "hisuian" ], "abilities": [ @@ -197,9 +195,6 @@ "shellarmor", "h:gooey" ], - "eggGroups": [ - "dragon" - ], "baseStats": { "hp": 80, "attack": 100, @@ -208,26 +203,12 @@ "special_defence": 150, "speed": 60 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 40, - "baseFriendship": 35, "baseScale": 1, "hitbox": { "width": 2.5, "height": 3.6, "fixed": false }, - "behaviour": {}, "drops": { "amount": 7, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/goomy.json b/common/src/main/resources/data/cobblemon/species/generation6/goomy.json index 928a809369..c095b5faf0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/goomy.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/goomy.json @@ -52,7 +52,6 @@ "height": 0.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -184,92 +183,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "sapsipper", - "hydration", - "h:gooey" - ], - "eggGroups": [ - "dragon" - ], - "baseStats": { - "hp": 45, - "attack": 50, - "defence": 35, - "special_attack": 55, - "special_defence": 75, - "speed": 40 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "baseExperienceYield": 60, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 40, - "baseFriendship": 35, "dynamaxBlocked": false, - "moves": [ - "1:tackle", - "1:bubble", - "1:absorb", - "1:bide", - "5:watergun", - "10:dragonbreath", - "15:protect", - "20:flail", - "25:waterpulse", - "30:raindance", - "35:dragonpulse", - "41:curse", - "45:bodyslam", - "50:muddywater", - "egg:counter", - "egg:lifedew", - "tm:absorb", - "tm:acidarmor", - "tm:bide", - "tm:bodyslam", - "tm:bubble", - "tm:charm", - "tm:chillingwater", - "tm:counter", - "tm:curse", - "tm:dracometeor", - "tm:dragonbreath", - "tm:dragonpulse", - "tm:endure", - "tm:facade", - "tm:flail", - "tm:infestation", - "tm:irontail", - "tm:lifedew", - "tm:muddywater", - "tm:mudshot", - "tm:outrage", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:rockslide", - "tm:shockwave", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:substitute", - "tm:sunnyday", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:thunderbolt", - "tm:watergun", - "tm:waterpulse" - ], "evolutions": [ { "id": "goomy_sliggoo", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json index 7447e871c5..e7774ab8b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json @@ -194,14 +194,6 @@ "aspects": [ "pumpkin-size-small" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 55, "attack": 85, @@ -210,114 +202,7 @@ "special_defence": 75, "speed": 99 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 0.43, - "behaviour": {}, - "moves": [ - "1:explosion", - "1:astonish", - "1:confuseray", - "1:trickortreat", - "1:shadowsneak", - "1:moonblast", - "12:razorleaf", - "16:leechseed", - "20:bulletseed", - "24:scaryface", - "28:worryseed", - "32:seedbomb", - "36:shadowball", - "40:trick", - "44:painsplit", - "48:phantomforce", - "egg:bestow", - "egg:curse", - "egg:destinybond", - "egg:disable", - "tm:allyswitch", - "tm:astonish", - "tm:bestow", - "tm:brutalswing", - "tm:bulletseed", - "tm:chargebeam", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:destinybond", - "tm:disable", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fireblast", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:focusblast", - "tm:foulplay", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:gyroball", - "tm:hex", - "tm:hyperbeam", - "tm:imprison", - "tm:incinerate", - "tm:leechseed", - "tm:lightscreen", - "tm:magiccoat", - "tm:moonblast", - "tm:mysticalfire", - "tm:nastyplot", - "tm:naturepower", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:powerwhip", - "tm:protect", - "tm:psychic", - "tm:razorleaf", - "tm:rest", - "tm:rockslide", - "tm:rocksmash", - "tm:roleplay", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowsneak", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:synthesis", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:trick", - "tm:trickortreat", - "tm:trickroom", - "tm:willowisp", - "tm:worryseed" - ], "preEvolution": "pumpkaboo", "evolutions": [], "battleOnly": false @@ -338,14 +223,6 @@ "aspects": [ "pumpkin-size-large" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 75, "attack": 95, @@ -354,114 +231,7 @@ "special_defence": 75, "speed": 69 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 0.7, - "behaviour": {}, - "moves": [ - "1:explosion", - "1:astonish", - "1:confuseray", - "1:trickortreat", - "1:shadowsneak", - "1:moonblast", - "12:razorleaf", - "16:leechseed", - "20:bulletseed", - "24:scaryface", - "28:worryseed", - "32:seedbomb", - "36:shadowball", - "40:trick", - "44:painsplit", - "48:phantomforce", - "egg:bestow", - "egg:curse", - "egg:destinybond", - "egg:disable", - "tm:allyswitch", - "tm:astonish", - "tm:bestow", - "tm:brutalswing", - "tm:bulletseed", - "tm:chargebeam", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:destinybond", - "tm:disable", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fireblast", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:focusblast", - "tm:foulplay", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:gyroball", - "tm:hex", - "tm:hyperbeam", - "tm:imprison", - "tm:incinerate", - "tm:leechseed", - "tm:lightscreen", - "tm:magiccoat", - "tm:moonblast", - "tm:mysticalfire", - "tm:nastyplot", - "tm:naturepower", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:powerwhip", - "tm:protect", - "tm:psychic", - "tm:razorleaf", - "tm:rest", - "tm:rockslide", - "tm:rocksmash", - "tm:roleplay", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowsneak", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:synthesis", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:trick", - "tm:trickortreat", - "tm:trickroom", - "tm:willowisp", - "tm:worryseed" - ], "preEvolution": "pumpkaboo", "evolutions": [], "battleOnly": false @@ -482,14 +252,6 @@ "aspects": [ "pumpkin-size-super" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 85, "attack": 100, @@ -498,114 +260,7 @@ "special_defence": 75, "speed": 54 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 1, - "behaviour": {}, - "moves": [ - "1:explosion", - "1:astonish", - "1:confuseray", - "1:trickortreat", - "1:shadowsneak", - "1:moonblast", - "12:razorleaf", - "16:leechseed", - "20:bulletseed", - "24:scaryface", - "28:worryseed", - "32:seedbomb", - "36:shadowball", - "40:trick", - "44:painsplit", - "48:phantomforce", - "egg:bestow", - "egg:curse", - "egg:destinybond", - "egg:disable", - "tm:allyswitch", - "tm:astonish", - "tm:bestow", - "tm:brutalswing", - "tm:bulletseed", - "tm:chargebeam", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:destinybond", - "tm:disable", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fireblast", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:focusblast", - "tm:foulplay", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:gyroball", - "tm:hex", - "tm:hyperbeam", - "tm:imprison", - "tm:incinerate", - "tm:leechseed", - "tm:lightscreen", - "tm:magiccoat", - "tm:moonblast", - "tm:mysticalfire", - "tm:nastyplot", - "tm:naturepower", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:powerwhip", - "tm:protect", - "tm:psychic", - "tm:razorleaf", - "tm:rest", - "tm:rockslide", - "tm:rocksmash", - "tm:roleplay", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowsneak", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:synthesis", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:trick", - "tm:trickortreat", - "tm:trickroom", - "tm:willowisp", - "tm:worryseed" - ], "preEvolution": "pumpkaboo", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json index d6f3153300..6cc0f9aef3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json @@ -220,29 +220,9 @@ "h:battlebond" ], "eggGroups": [ - "undiscovered" + "undiscovered", + "water_1" ], - "baseStats": { - "hp": 72, - "attack": 95, - "defence": 67, - "special_attack": 103, - "special_defence": 71, - "speed": 122 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, - "baseExperienceYield": 265, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "moves": [ "1:watershuriken", "1:nightslash", @@ -366,7 +346,8 @@ "h:battlebond" ], "eggGroups": [ - "undiscovered" + "undiscovered", + "water_1" ], "baseStats": { "hp": 72, @@ -376,142 +357,8 @@ "special_defence": 71, "speed": 132 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, "baseExperienceYield": 320, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:nightslash", - "1:roleplay", - "1:matblock", - "1:pound", - "1:growl", - "1:bubble", - "1:quickattack", - "1:feintattack", - "1:watershuriken", - "1:haze", - "1:watergun", - "1:round", - "10:lick", - "14:waterpulse", - "19:smokescreen", - "23:shadowsneak", - "28:spikes", - "33:aerialace", - "42:substitute", - "49:extrasensory", - "56:doubleteam", - "68:hydropump", - "egg:bestow", - "egg:camouflage", - "egg:counter", - "egg:mindreader", - "egg:mudsport", - "egg:retaliate", - "egg:spikes", - "egg:switcheroo", - "egg:toxicspikes", - "egg:watersport", - "tm:acrobatics", - "tm:aerialace", - "tm:bestow", - "tm:blizzard", - "tm:bounce", - "tm:brickbreak", - "tm:brutalswing", - "tm:bubble", - "tm:camouflage", - "tm:chillingwater", - "tm:counter", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:dive", - "tm:doubleteam", - "tm:echoedvoice", - "tm:endure", - "tm:extrasensory", - "tm:facade", - "tm:falseswipe", - "tm:feintattack", - "tm:fling", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:gunkshot", - "tm:haze", - "tm:helpinghand", - "tm:hydrocannon", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:lick", - "tm:liquidation", - "tm:lowkick", - "tm:lowsweep", - "tm:matblock", - "tm:mindreader", - "tm:mudshot", - "tm:mudslap", - "tm:mudsport", - "tm:nightslash", - "tm:pound", - "tm:poweruppunch", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roleplay", - "tm:round", - "tm:shadowsneak", - "tm:sleeptalk", - "tm:sludgewave", - "tm:smackdown", - "tm:smokescreen", - "tm:snatch", - "tm:snowscape", - "tm:spikes", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:switcheroo", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:toxicspikes", - "tm:trailblaze", - "tm:upperhand", - "tm:uturn", - "tm:waterfall", - "tm:watergun", - "tm:waterpledge", - "tm:waterpulse", - "tm:watershuriken", - "tm:watersport", - "tm:weatherball", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json index e92e22ce78..b9b8c737cb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json index a9439e4bd1..109b0435d9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:eerieimpulse", "1:electrify", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json index 35edec3a3a..9ce3e0c644 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:tailwhip", "1:mudslap", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json index 65a254f9f0..cc74bc2ac8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:destinybond", "1:allyswitch", @@ -174,13 +173,6 @@ "aspects": [ "unbound" ], - "abilities": [ - "magician", - "h:magician" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 80, "attack": 160, @@ -189,20 +181,8 @@ "special_defence": 130, "speed": 80 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:destinybond", "1:allyswitch", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json index 7874060632..1f2dff32df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json index 3261e13e33..cf25f25360 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json @@ -43,7 +43,6 @@ "catchRate": 75, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -184,31 +183,6 @@ "infiltrator", "h:competitive" ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 74, - "attack": 48, - "defence": 76, - "special_attack": 83, - "special_defence": 81, - "speed": 104 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 163, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:mefirst", "1:magicalleaf", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json index 15900a3d41..5da9b473f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json index 7684efa743..7c2ea0a002 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json index 72ed089502..2f5222f4fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json @@ -188,14 +188,6 @@ "aspects": [ "pumpkin-size-small" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 44, "attack": 66, @@ -204,103 +196,7 @@ "special_defence": 55, "speed": 56 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 67, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 0.6, - "behaviour": {}, - "moves": [ - "1:astonish", - "1:trickortreat", - "4:shadowsneak", - "8:confuseray", - "12:razorleaf", - "16:leechseed", - "20:bulletseed", - "24:scaryface", - "28:worryseed", - "32:seedbomb", - "36:shadowball", - "40:trick", - "44:painsplit", - "egg:bestow", - "egg:curse", - "egg:destinybond", - "egg:disable", - "tm:allyswitch", - "tm:astonish", - "tm:bestow", - "tm:bulletseed", - "tm:chargebeam", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:destinybond", - "tm:disable", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fireblast", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:foulplay", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:gyroball", - "tm:hex", - "tm:imprison", - "tm:incinerate", - "tm:leechseed", - "tm:lightscreen", - "tm:magiccoat", - "tm:mysticalfire", - "tm:naturepower", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:psychic", - "tm:razorleaf", - "tm:rest", - "tm:rockslide", - "tm:rocksmash", - "tm:roleplay", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowsneak", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:synthesis", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:trick", - "tm:trickortreat", - "tm:trickroom", - "tm:willowisp", - "tm:worryseed" - ], "evolutions": [ { "id": "pumpkaboo_gourgeist", @@ -329,14 +225,6 @@ "aspects": [ "pumpkin-size-large" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 54, "attack": 66, @@ -345,103 +233,7 @@ "special_defence": 55, "speed": 46 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 67, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 1, - "behaviour": {}, - "moves": [ - "1:astonish", - "1:trickortreat", - "4:shadowsneak", - "8:confuseray", - "12:razorleaf", - "16:leechseed", - "20:bulletseed", - "24:scaryface", - "28:worryseed", - "32:seedbomb", - "36:shadowball", - "40:trick", - "44:painsplit", - "egg:bestow", - "egg:curse", - "egg:destinybond", - "egg:disable", - "tm:allyswitch", - "tm:astonish", - "tm:bestow", - "tm:bulletseed", - "tm:chargebeam", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:destinybond", - "tm:disable", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fireblast", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:foulplay", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:gyroball", - "tm:hex", - "tm:imprison", - "tm:incinerate", - "tm:leechseed", - "tm:lightscreen", - "tm:magiccoat", - "tm:mysticalfire", - "tm:naturepower", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:psychic", - "tm:razorleaf", - "tm:rest", - "tm:rockslide", - "tm:rocksmash", - "tm:roleplay", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowsneak", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:synthesis", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:trick", - "tm:trickortreat", - "tm:trickroom", - "tm:willowisp", - "tm:worryseed" - ], "evolutions": [ { "id": "pumpkaboo_gourgeist", @@ -470,14 +262,6 @@ "aspects": [ "pumpkin-size-super" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 59, "attack": 66, @@ -486,103 +270,7 @@ "special_defence": 55, "speed": 41 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 67, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, "baseScale": 1.4, - "behaviour": {}, - "moves": [ - "1:astonish", - "1:trickortreat", - "4:shadowsneak", - "8:confuseray", - "12:razorleaf", - "16:leechseed", - "20:bulletseed", - "24:scaryface", - "28:worryseed", - "32:seedbomb", - "36:shadowball", - "40:trick", - "44:painsplit", - "egg:bestow", - "egg:curse", - "egg:destinybond", - "egg:disable", - "tm:allyswitch", - "tm:astonish", - "tm:bestow", - "tm:bulletseed", - "tm:chargebeam", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:destinybond", - "tm:disable", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:fireblast", - "tm:flamecharge", - "tm:flamethrower", - "tm:flash", - "tm:foulplay", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:gyroball", - "tm:hex", - "tm:imprison", - "tm:incinerate", - "tm:leechseed", - "tm:lightscreen", - "tm:magiccoat", - "tm:mysticalfire", - "tm:naturepower", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:psychic", - "tm:razorleaf", - "tm:rest", - "tm:rockslide", - "tm:rocksmash", - "tm:roleplay", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowsneak", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:synthesis", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:trick", - "tm:trickortreat", - "tm:trickroom", - "tm:willowisp", - "tm:worryseed" - ], "evolutions": [ { "id": "pumpkaboo_gourgeist", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json index b11251a76b..099bc3be44 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json b/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json index 481074b002..ef7f2a650f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json b/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json index d659466770..4f9b22d8ab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json @@ -52,7 +52,6 @@ "height": 1.65, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -187,9 +186,6 @@ "shellarmor", "h:gooey" ], - "eggGroups": [ - "dragon" - ], "baseStats": { "hp": 58, "attack": 75, @@ -198,26 +194,11 @@ "special_defence": 113, "speed": 40 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 158, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 40, - "baseFriendship": 35, - "baseScale": 0.65, "hitbox": { "width": 1.45, "height": 1.75, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json index 0cacfc0b97..777654b7bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json index ea9ab96a5b..bcd8eee5e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json index d70f645e79..888e87dc1e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json index f06bd55975..894e233f39 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json @@ -47,7 +47,6 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json index ca4ddbe700..f0b0e836fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json @@ -174,111 +174,6 @@ "aspects": [ "vivillon-wings-poke-ball" ], - "abilities": [ - "shielddust", - "compoundeyes", - "h:friendguard" - ], - "eggGroups": [ - "bug" - ], - "baseStats": { - "hp": 80, - "attack": 52, - "defence": 50, - "special_attack": 90, - "special_defence": 50, - "speed": 89 - }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 206, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, - "moves": [ - "1:powder", - "1:sleeppowder", - "1:poisonpowder", - "1:stunspore", - "1:gust", - "1:strugglebug", - "1:aromatherapy", - "1:tackle", - "1:harden", - "12:lightscreen", - "17:psybeam", - "21:supersonic", - "25:drainingkiss", - "31:safeguard", - "35:bugbuzz", - "45:quiverdance", - "50:hurricane", - "egg:poisonpowder", - "egg:ragepowder", - "egg:stunspore", - "tm:acrobatics", - "tm:aircutter", - "tm:airslash", - "tm:aromatherapy", - "tm:bugbite", - "tm:bugbuzz", - "tm:confuseray", - "tm:defog", - "tm:drainingkiss", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gust", - "tm:harden", - "tm:hurricane", - "tm:hyperbeam", - "tm:infestation", - "tm:irondefense", - "tm:laserfocus", - "tm:lightscreen", - "tm:poisonpowder", - "tm:pollenpuff", - "tm:pounce", - "tm:powder", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:quiverdance", - "tm:ragepowder", - "tm:raindance", - "tm:rest", - "tm:roost", - "tm:safeguard", - "tm:signalbeam", - "tm:skittersmack", - "tm:sleeppowder", - "tm:sleeptalk", - "tm:solarbeam", - "tm:strugglebug", - "tm:stunspore", - "tm:substitute", - "tm:sunnyday", - "tm:supersonic", - "tm:swift", - "tm:tackle", - "tm:tailwind", - "tm:terablast", - "tm:thief", - "tm:uturn", - "tm:weatherball" - ], "preEvolution": "spewpa", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json index 75c0854dc2..3006abe1ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:steameruption", "1:firespin", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json b/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json index 8e4ff52b42..687c536626 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json @@ -51,7 +51,6 @@ "height": 4, "fixed": false }, - "behaviour": {}, "moves": [ "1:gravity", "1:tackle", @@ -152,115 +151,6 @@ "aspects": [ "active-mode" ], - "abilities": [ - "fairyaura", - "h:fairyaura" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 126, - "attack": 131, - "defence": 95, - "special_attack": 131, - "special_defence": 98, - "speed": 99 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 120, - "baseFriendship": 0, - "moves": [ - "1:gravity", - "1:tackle", - "5:lightscreen", - "10:aurorabeam", - "15:naturepower", - "20:nightslash", - "25:aromatherapy", - "30:psychup", - "35:hornleech", - "40:mistyterrain", - "45:ingrain", - "50:takedown", - "55:geomancy", - "60:moonblast", - "65:healpulse", - "70:megahorn", - "75:closecombat", - "80:outrage", - "85:gigaimpact", - "tm:aromatherapy", - "tm:aurorabeam", - "tm:block", - "tm:bodyslam", - "tm:calmmind", - "tm:closecombat", - "tm:cut", - "tm:dazzlinggleam", - "tm:defog", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:flashcannon", - "tm:focusblast", - "tm:geomancy", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:hail", - "tm:healpulse", - "tm:hornleech", - "tm:hyperbeam", - "tm:hypervoice", - "tm:ingrain", - "tm:laserfocus", - "tm:lightscreen", - "tm:megahorn", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:moonblast", - "tm:naturepower", - "tm:nightslash", - "tm:outrage", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:roar", - "tm:rockslide", - "tm:sleeptalk", - "tm:smartstrike", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:terrainpulse", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:wonderroom", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json b/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json index 46aa147c7b..9e20051bdf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json @@ -45,7 +45,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:bulldoze", "1:dragonbreath", @@ -153,13 +152,6 @@ "aspects": [ "10-percent" ], - "abilities": [ - "aurabreak", - "h:aurabreak" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 54, "attack": 100, @@ -168,19 +160,7 @@ "special_defence": 85, "speed": 115 }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 243, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "moves": [ "1:bulldoze", "1:dragonbreath", @@ -285,16 +265,13 @@ "restricted" ], "aspects": [ - "10-percent", - "power-construct" + "power-construct", + "10-percent" ], "abilities": [ "powerconstruct", "h:powerconstruct" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 54, "attack": 100, @@ -303,19 +280,7 @@ "special_defence": 85, "speed": 115 }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 243, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "moves": [ "1:bulldoze", "1:dragonbreath", @@ -427,30 +392,6 @@ "powerconstruct", "h:powerconstruct" ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 108, - "attack": 100, - "defence": 121, - "special_attack": 81, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "moves": [ "1:bulldoze", "1:dragonbreath", @@ -561,9 +502,6 @@ "powerconstruct", "h:powerconstruct" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 216, "attack": 100, @@ -572,20 +510,7 @@ "special_defence": 95, "speed": 85 }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 354, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:bulldoze", "1:dragonbreath", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json b/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json index e8b82cd5c0..f02b7d19b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json index 82b648236a..5df8a7bcc2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json @@ -48,7 +48,6 @@ "height": 0.6, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json b/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json index 4b026756a9..63830b16a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json b/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json index 15926e5ed5..0fdffd673e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json index 1ce98cd000..81b618eb1e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json b/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json index 5613760cdc..ae53b27fe7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:cosmicpower", "1:teleport", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json b/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json index 5e1815aa57..59d4d86fd5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:splash", "1:teleport", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json index b202d2a855..5a85173741 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json @@ -228,124 +228,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "overgrow", - "h:longreach" - ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 78, - "attack": 75, - "defence": 75, - "special_attack": 70, - "special_defence": 70, - "speed": 52 - }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 147, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:tackle", - "1:leafage", - "1:growl", - "1:astonish", - "1:foresight", - "1:furyattack", - "9:peck", - "12:shadowsneak", - "15:razorleaf", - "20:synthesis", - "25:pluck", - "30:nastyplot", - "35:suckerpunch", - "40:leafblade", - "45:featherdance", - "50:bravebird", - "egg:confuseray", - "egg:defog", - "egg:doubleteam", - "egg:furyattack", - "egg:knockoff", - "egg:roost", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:astonish", - "tm:batonpass", - "tm:bravebird", - "tm:bulletseed", - "tm:confuseray", - "tm:covet", - "tm:defog", - "tm:doubleteam", - "tm:dualwingbeat", - "tm:echoedvoice", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:featherdance", - "tm:foresight", - "tm:furyattack", - "tm:gigadrain", - "tm:grassknot", - "tm:grasspledge", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:haze", - "tm:helpinghand", - "tm:knockoff", - "tm:leafage", - "tm:leafblade", - "tm:leafstorm", - "tm:lightscreen", - "tm:magicalleaf", - "tm:nastyplot", - "tm:naturepower", - "tm:nightshade", - "tm:peck", - "tm:pluck", - "tm:protect", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:roost", - "tm:safeguard", - "tm:seedbomb", - "tm:shadowclaw", - "tm:shadowsneak", - "tm:skyattack", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelwing", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:synthesis", - "tm:tackle", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:trailblaze", - "tm:workup", - "tm:worryseed" - ], "preEvolution": "rowlet", "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json index b9b805f558..6cbaff5fd5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json @@ -215,9 +215,6 @@ "overgrow", "h:scrappy" ], - "eggGroups": [ - "flying" - ], "baseStats": { "hp": 88, "attack": 112, @@ -226,26 +223,6 @@ "special_defence": 95, "speed": 60 }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 265, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, - "baseScale": 0.65, - "hitbox": { - "width": 0.9, - "height": 3, - "fixed": false - }, - "behaviour": {}, "moves": [ "1:triplearrows", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json b/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json index d192eec5e7..5b18c77693 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json index df9606e8f4..8762522cf3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json b/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json index 021fe60aab..4097043b6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json b/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json index cf2425d751..13275be8c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json @@ -49,7 +49,6 @@ "height": 1.85, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json b/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json index 460b74cc00..c8f424f973 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json @@ -48,7 +48,6 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/kartana.json b/common/src/main/resources/data/cobblemon/species/generation7/kartana.json index 7be11e98e5..b8da9381d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/kartana.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/kartana.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json b/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json index 6070210103..72dfa37543 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json @@ -50,7 +50,6 @@ "height": 3.35, "fixed": false }, - "behaviour": {}, "drops": { "amount": 6, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lunala.json b/common/src/main/resources/data/cobblemon/species/generation7/lunala.json index 94d3f862f9..d1e6547117 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lunala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lunala.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json b/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json index 0e3d5e9659..e50575e16a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json @@ -43,7 +43,6 @@ "catchRate": 90, "eggCycles": 15, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 6, "entries": [ @@ -184,9 +183,6 @@ "vitalspirit", "h:noguard" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 85, "attack": 115, @@ -195,20 +191,6 @@ "special_defence": 75, "speed": 82 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 170, - "experienceGroup": "medium_fast", - "catchRate": 90, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:counter", "1:reversal", @@ -340,9 +322,6 @@ "toughclaws", "h:toughclaws" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 117, @@ -351,20 +330,6 @@ "special_defence": 65, "speed": 110 }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 170, - "experienceGroup": "medium_fast", - "catchRate": 90, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:thrash", "1:accelerock", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/magearna.json b/common/src/main/resources/data/cobblemon/species/generation7/magearna.json index 94ea27168d..e070dc9e1e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/magearna.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/magearna.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:gearup", "1:helpinghand", @@ -191,158 +190,6 @@ "aspects": [ "original-color" ], - "abilities": [ - "soulheart", - "h:soulheart" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 80, - "attack": 95, - "defence": 115, - "special_attack": 130, - "special_defence": 115, - "speed": 65 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:gearup", - "1:helpinghand", - "1:sonicboom", - "1:luckychant", - "1:mirrorshot", - "1:mindreader", - "1:synchronoise", - "1:heartswap", - "1:trumpcard", - "1:gyroball", - "6:defensecurl", - "12:rollout", - "18:irondefense", - "24:magneticflux", - "30:psybeam", - "36:aurorabeam", - "42:lockon", - "48:shiftgear", - "54:craftyshield", - "60:ironhead", - "66:aurasphere", - "72:flashcannon", - "78:painsplit", - "84:zapcannon", - "90:fleurcannon", - "tm:afteryou", - "tm:agility", - "tm:aurasphere", - "tm:aurorabeam", - "tm:batonpass", - "tm:bodyslam", - "tm:brickbreak", - "tm:calmmind", - "tm:chargebeam", - "tm:confuseray", - "tm:craftyshield", - "tm:dazzlinggleam", - "tm:defensecurl", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electroball", - "tm:electroweb", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:explosion", - "tm:facade", - "tm:falseswipe", - "tm:flashcannon", - "tm:fleurcannon", - "tm:focusblast", - "tm:gearup", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:gyroball", - "tm:healbell", - "tm:heartswap", - "tm:heavyslam", - "tm:helpinghand", - "tm:hyperbeam", - "tm:icebeam", - "tm:icespinner", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:lastresort", - "tm:lightscreen", - "tm:lockon", - "tm:luckychant", - "tm:magneticflux", - "tm:magnetrise", - "tm:metalsound", - "tm:mindreader", - "tm:mirrorshot", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:painsplit", - "tm:playrough", - "tm:powerswap", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psyshock", - "tm:reflect", - "tm:rest", - "tm:rollout", - "tm:selfdestruct", - "tm:shadowball", - "tm:shiftgear", - "tm:shockwave", - "tm:signalbeam", - "tm:skillswap", - "tm:sleeptalk", - "tm:snowscape", - "tm:solarbeam", - "tm:sonicboom", - "tm:speedswap", - "tm:spikes", - "tm:steelbeam", - "tm:steelroller", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:synchronoise", - "tm:takedown", - "tm:terablast", - "tm:thunderbolt", - "tm:thunderwave", - "tm:triattack", - "tm:trick", - "tm:trickroom", - "tm:trumpcard", - "tm:voltswitch", - "tm:zapcannon", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json b/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json index bb246f8a01..a5279d1c56 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:firepunch", "1:thunderpunch", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json index 18b91db93f..5716b4c7b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json @@ -51,7 +51,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -182,35 +181,6 @@ "aspects": [ "busted-form" ], - "abilities": [ - "disguise", - "h:disguise" - ], - "eggGroups": [ - "amorphous" - ], - "baseStats": { - "hp": 55, - "attack": 90, - "defence": 80, - "special_attack": 50, - "special_defence": 105, - "speed": 96 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 167, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:woodhammer", "1:splash", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/minior.json b/common/src/main/resources/data/cobblemon/species/generation7/minior.json index 3f3e4ea79e..0e7afe9914 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/minior.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/minior.json @@ -147,13 +147,6 @@ "aspects": [ "meteor-form" ], - "abilities": [ - "shieldsdown", - "h:shieldsdown" - ], - "eggGroups": [ - "mineral" - ], "baseStats": { "hp": 60, "attack": 60, @@ -171,81 +164,7 @@ "speed": 0 }, "baseExperienceYield": 154, - "experienceGroup": "medium_slow", "catchRate": 30, - "eggCycles": 25, - "baseFriendship": 50, - "moves": [ - "1:tackle", - "3:defensecurl", - "8:rollout", - "10:confuseray", - "15:swift", - "17:ancientpower", - "22:selfdestruct", - "24:stealthrock", - "29:takedown", - "31:autotomize", - "36:cosmicpower", - "38:powergem", - "43:doubleedge", - "45:shellsmash", - "50:explosion", - "tm:acrobatics", - "tm:ancientpower", - "tm:autotomize", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:confuseray", - "tm:cosmicpower", - "tm:dazzlinggleam", - "tm:defensecurl", - "tm:doubleedge", - "tm:earthpower", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:gigaimpact", - "tm:gravity", - "tm:gyroball", - "tm:hyperbeam", - "tm:ironhead", - "tm:lastresort", - "tm:lightscreen", - "tm:magnetrise", - "tm:meteorbeam", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:reflect", - "tm:rest", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocktomb", - "tm:rollout", - "tm:safeguard", - "tm:sandstorm", - "tm:scorchingsands", - "tm:selfdestruct", - "tm:shellsmash", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelroller", - "tm:stoneedge", - "tm:substitute", - "tm:swift", - "tm:tackle", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:uturn", - "tm:zenheadbutt" - ], "evolutions": [] } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/morelull.json b/common/src/main/resources/data/cobblemon/species/generation7/morelull.json index d0c0058309..392a2ff939 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/morelull.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/morelull.json @@ -50,7 +50,6 @@ "height": 0.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json b/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json index 5f573e94ea..2d06bac3b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json @@ -49,7 +49,6 @@ "height": 4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json b/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json index f00f6f6e2c..e56fbc8900 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:moonlight", "1:morningsun", @@ -169,13 +168,6 @@ "aspects": [ "dusk-fusion" ], - "abilities": [ - "prismarmor", - "h:prismarmor" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 97, "attack": 157, @@ -193,10 +185,6 @@ "speed": 0 }, "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "moves": [ "1:moonlight", "1:morningsun", @@ -320,13 +308,6 @@ "aspects": [ "dawn-fusion" ], - "abilities": [ - "prismarmor", - "h:prismarmor" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 97, "attack": 113, @@ -344,10 +325,6 @@ "speed": 0 }, "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "moves": [ "1:moonlight", "1:morningsun", @@ -476,9 +453,6 @@ "neuroforce", "h:neuroforce" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 97, "attack": 167, @@ -496,112 +470,8 @@ "speed": 1 }, "baseExperienceYield": 377, - "experienceGroup": "slow", "catchRate": 255, - "eggCycles": 120, - "baseFriendship": 0, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:moonlight", - "1:morningsun", - "1:chargebeam", - "1:mirrorshot", - "1:metalclaw", - "1:confusion", - "1:gravity", - "1:wringout", - "8:stealthrock", - "16:slash", - "24:nightslash", - "32:psychocut", - "40:storedpower", - "48:rockblast", - "56:irondefense", - "64:powergem", - "72:photongeyser", - "80:autotomize", - "88:prismaticlaser", - "tm:aerialace", - "tm:allyswitch", - "tm:autotomize", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:confusion", - "tm:cosmicpower", - "tm:darkpulse", - "tm:dragondance", - "tm:dragonpulse", - "tm:earthpower", - "tm:earthquake", - "tm:embargo", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:flashcannon", - "tm:fling", - "tm:futuresight", - "tm:gigaimpact", - "tm:gravity", - "tm:gyroball", - "tm:heatwave", - "tm:hyperbeam", - "tm:hypervoice", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:knockoff", - "tm:lightscreen", - "tm:magnetrise", - "tm:metalclaw", - "tm:meteorbeam", - "tm:mirrorshot", - "tm:moonlight", - "tm:morningsun", - "tm:nightslash", - "tm:outrage", - "tm:photongeyser", - "tm:powergem", - "tm:prismaticlaser", - "tm:protect", - "tm:psychic", - "tm:psychicfangs", - "tm:psychocut", - "tm:psyshock", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaryface", - "tm:shadowclaw", - "tm:shockwave", - "tm:signalbeam", - "tm:slash", - "tm:sleeptalk", - "tm:smartstrike", - "tm:solarbeam", - "tm:stealthrock", - "tm:stoneedge", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:trickroom", - "tm:wringout", - "tm:xscissor" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json b/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json index d5a7a7f601..20f4486083 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json index 5082a905d6..df5958940e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json index 68a468ac6b..c41aad9a94 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json @@ -43,7 +43,6 @@ "catchRate": 45, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -163,121 +162,11 @@ "aspects": [ "pom_pom-style" ], - "abilities": [ - "dancer", - "h:dancer" - ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 75, - "attack": 70, - "defence": 70, - "special_attack": 98, - "special_defence": 70, - "speed": 93 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 167, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:pound", - "1:doubleslap", - "1:mirrormove", - "4:growl", - "6:peck", - "10:helpinghand", - "13:aircutter", - "16:batonpass", - "20:featherdance", - "23:acrobatics", - "26:teeterdance", - "30:roost", - "33:flatter", - "36:airslash", - "40:revelationdance", - "43:agility", - "47:hurricane", - "egg:attract", - "egg:captivate", - "egg:defog", - "egg:pluck", - "egg:quiverdance", - "egg:safeguard", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:alluringvoice", - "tm:attract", - "tm:batonpass", - "tm:calmmind", - "tm:captivate", - "tm:charm", - "tm:covet", - "tm:defog", - "tm:doubleslap", - "tm:dualwingbeat", - "tm:embargo", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:flatter", - "tm:fly", - "tm:growl", - "tm:helpinghand", - "tm:hurricane", - "tm:icywind", - "tm:mirrormove", - "tm:peck", - "tm:pluck", - "tm:pound", - "tm:protect", - "tm:psychup", - "tm:quash", - "tm:quiverdance", - "tm:raindance", - "tm:rest", - "tm:revelationdance", - "tm:reversal", - "tm:roleplay", - "tm:roost", - "tm:safeguard", - "tm:sandstorm", - "tm:skyattack", - "tm:sleeptalk", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:teeterdance", - "tm:terablast", - "tm:trailblaze", - "tm:uturn", - "tm:workup" - ], "evolutions": [], "battleOnly": false }, { - "name": "Pa’u", + "name": "Pa\u00e2\u20ac\u2122u", "primaryType": "psychic", "secondaryType": "flying", "maleRatio": 0.25, @@ -292,116 +181,6 @@ "aspects": [ "pa'u-style" ], - "abilities": [ - "dancer", - "h:dancer" - ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 75, - "attack": 70, - "defence": 70, - "special_attack": 98, - "special_defence": 70, - "speed": 93 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 167, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:pound", - "1:doubleslap", - "1:mirrormove", - "4:growl", - "6:peck", - "10:helpinghand", - "13:aircutter", - "16:batonpass", - "20:featherdance", - "23:acrobatics", - "26:teeterdance", - "30:roost", - "33:flatter", - "36:airslash", - "40:revelationdance", - "43:agility", - "47:hurricane", - "egg:attract", - "egg:captivate", - "egg:defog", - "egg:pluck", - "egg:quiverdance", - "egg:safeguard", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:alluringvoice", - "tm:attract", - "tm:batonpass", - "tm:calmmind", - "tm:captivate", - "tm:charm", - "tm:covet", - "tm:defog", - "tm:doubleslap", - "tm:dualwingbeat", - "tm:embargo", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:flatter", - "tm:fly", - "tm:growl", - "tm:helpinghand", - "tm:hurricane", - "tm:icywind", - "tm:mirrormove", - "tm:peck", - "tm:pluck", - "tm:pound", - "tm:protect", - "tm:psychup", - "tm:quash", - "tm:quiverdance", - "tm:raindance", - "tm:rest", - "tm:revelationdance", - "tm:reversal", - "tm:roleplay", - "tm:roost", - "tm:safeguard", - "tm:sandstorm", - "tm:skyattack", - "tm:sleeptalk", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:teeterdance", - "tm:terablast", - "tm:trailblaze", - "tm:uturn", - "tm:workup" - ], "evolutions": [], "battleOnly": false }, @@ -421,116 +200,6 @@ "aspects": [ "sensu-style" ], - "abilities": [ - "dancer", - "h:dancer" - ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 75, - "attack": 70, - "defence": 70, - "special_attack": 98, - "special_defence": 70, - "speed": 93 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 167, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:pound", - "1:doubleslap", - "1:mirrormove", - "4:growl", - "6:peck", - "10:helpinghand", - "13:aircutter", - "16:batonpass", - "20:featherdance", - "23:acrobatics", - "26:teeterdance", - "30:roost", - "33:flatter", - "36:airslash", - "40:revelationdance", - "43:agility", - "47:hurricane", - "egg:attract", - "egg:captivate", - "egg:defog", - "egg:pluck", - "egg:quiverdance", - "egg:safeguard", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:alluringvoice", - "tm:attract", - "tm:batonpass", - "tm:calmmind", - "tm:captivate", - "tm:charm", - "tm:covet", - "tm:defog", - "tm:doubleslap", - "tm:dualwingbeat", - "tm:embargo", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:flatter", - "tm:fly", - "tm:growl", - "tm:helpinghand", - "tm:hurricane", - "tm:icywind", - "tm:mirrormove", - "tm:peck", - "tm:pluck", - "tm:pound", - "tm:protect", - "tm:psychup", - "tm:quash", - "tm:quiverdance", - "tm:raindance", - "tm:rest", - "tm:revelationdance", - "tm:reversal", - "tm:roleplay", - "tm:roost", - "tm:safeguard", - "tm:sandstorm", - "tm:skyattack", - "tm:sleeptalk", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:teeterdance", - "tm:terablast", - "tm:trailblaze", - "tm:uturn", - "tm:workup" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json b/common/src/main/resources/data/cobblemon/species/generation7/palossand.json index 7c15c411b4..ffdcefd2a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/palossand.json @@ -48,7 +48,6 @@ "height": 1.55, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json index 4d61aeb9a6..e5c54dda9c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json b/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json index abe6beeaf7..aa484914bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/poipole.json b/common/src/main/resources/data/cobblemon/species/generation7/poipole.json index e255c14c9b..f6c43eda1d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/poipole.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/poipole.json @@ -48,7 +48,6 @@ "height": 1.4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json b/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json index 9741908de0..3108d5a391 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ @@ -207,30 +206,6 @@ "owntempo", "h:owntempo" ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 45, - "attack": 65, - "defence": 40, - "special_attack": 30, - "special_defence": 40, - "speed": 60 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 56, - "experienceGroup": "medium_fast", - "catchRate": 190, - "eggCycles": 15, - "baseFriendship": 50, "moves": [ "1:tackle", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json index 47b190e9b8..b7936f0fa7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json @@ -196,120 +196,7 @@ "aspects": [ "region-bias-hisui" ], - "abilities": [ - "overgrow", - "h:longreach" - ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 68, - "attack": 55, - "defence": 55, - "special_attack": 50, - "special_defence": 50, - "speed": 42 - }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 64, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, "dynamaxBlocked": false, - "moves": [ - "1:tackle", - "1:growl", - "3:leafage", - "6:astonish", - "9:peck", - "12:shadowsneak", - "15:razorleaf", - "18:foresight", - "21:pluck", - "24:nastyplot", - "27:suckerpunch", - "30:leafblade", - "33:featherdance", - "36:bravebird", - "egg:confuseray", - "egg:defog", - "egg:doubleteam", - "egg:furyattack", - "egg:knockoff", - "egg:roost", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:astonish", - "tm:bravebird", - "tm:bulletseed", - "tm:confuseray", - "tm:covet", - "tm:defog", - "tm:doubleteam", - "tm:dualwingbeat", - "tm:echoedvoice", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:featherdance", - "tm:foresight", - "tm:furyattack", - "tm:gigadrain", - "tm:grassknot", - "tm:grasspledge", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:haze", - "tm:helpinghand", - "tm:knockoff", - "tm:leafage", - "tm:leafblade", - "tm:leafstorm", - "tm:lightscreen", - "tm:magicalleaf", - "tm:nastyplot", - "tm:naturepower", - "tm:nightshade", - "tm:peck", - "tm:pluck", - "tm:protect", - "tm:raindance", - "tm:razorleaf", - "tm:rest", - "tm:roost", - "tm:safeguard", - "tm:seedbomb", - "tm:shadowclaw", - "tm:shadowsneak", - "tm:skyattack", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelwing", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:swift", - "tm:swordsdance", - "tm:synthesis", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:trailblaze", - "tm:workup", - "tm:worryseed" - ], "evolutions": [ { "id": "rowlet_dartrix", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json b/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json index c852b182c2..3a330059b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json @@ -48,7 +48,6 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json index 33c4d15675..d681be9481 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json @@ -49,7 +49,6 @@ "height": 0.75, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/silvally.json b/common/src/main/resources/data/cobblemon/species/generation7/silvally.json index 3666e63489..7d04b472b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/silvally.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/silvally.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -177,35 +176,6 @@ "aspects": [ "fighting-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -332,35 +302,6 @@ "aspects": [ "flying-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -487,35 +428,6 @@ "aspects": [ "poison-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -642,35 +554,6 @@ "aspects": [ "ground-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -797,35 +680,6 @@ "aspects": [ "rock-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -952,35 +806,6 @@ "aspects": [ "bug-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -1107,35 +932,6 @@ "aspects": [ "ghost-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -1262,35 +1058,6 @@ "aspects": [ "steel-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -1417,35 +1184,6 @@ "aspects": [ "fire-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -1572,35 +1310,6 @@ "aspects": [ "water-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -1727,35 +1436,6 @@ "aspects": [ "grass-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -1882,35 +1562,6 @@ "aspects": [ "electric-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -2037,35 +1688,6 @@ "aspects": [ "psychic-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -2192,35 +1814,6 @@ "aspects": [ "ice-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -2347,35 +1940,6 @@ "aspects": [ "dragon-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -2502,35 +2066,6 @@ "aspects": [ "dark-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", @@ -2657,35 +2192,6 @@ "aspects": [ "fairy-memory" ], - "abilities": [ - "rkssystem", - "h:rkssystem" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 285, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:multiattack", "1:healblock", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json b/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json index 9efa5055ba..8e68a4fc05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:sunsteelstrike", "1:cosmicpower", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json b/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json index 662b86a9e6..9104b7ea79 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json index fe2c1db000..204a3ed32a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json @@ -48,7 +48,6 @@ "height": 1.4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json b/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json index 0fcae7639b..80693d89cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:leafage", "1:rototiller", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json b/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json index a474964dfb..1f4da9514a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:watergun", "1:refresh", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json b/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json index 4a5ef42dff..ad58657817 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:quickattack", "1:thundershock", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json b/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json index 67a76f5de2..9cd57799d5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:astonish", "1:confusion", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json b/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json index 222e0b0f8c..27b7843a92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json index 042ae3d80a..bde896d951 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json @@ -48,7 +48,6 @@ "height": 2.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/typenull.json b/common/src/main/resources/data/cobblemon/species/generation7/typenull.json index ebf5bd5ffc..ebcd196a18 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/typenull.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/typenull.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:tackle", "1:rage", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json index 8d751a1531..6fb57b0bfe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json index 91f801ea1d..d2131c6a1d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json @@ -159,13 +159,6 @@ "aspects": [ "school-form" ], - "abilities": [ - "schooling", - "h:schooling" - ], - "eggGroups": [ - "water_2" - ], "baseStats": { "hp": 45, "attack": 140, @@ -174,19 +167,7 @@ "special_defence": 135, "speed": 30 }, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 217, - "experienceGroup": "fast", - "catchRate": 60, - "eggCycles": 15, - "baseFriendship": 50, "baseScale": 2, "hitbox": { "width": 3, @@ -195,81 +176,18 @@ }, "behaviour": { "moving": { + "canLook": false, "walk": { "avoidsLand": true }, "swim": { + "swimSpeed": "0.2", "canBreatheUnderwater": true, "canSwimInWater": true, - "canSwimInLava": false, - "swimSpeed": "0.2" + "canSwimInLava": false } } }, - "moves": [ - "1:watergun", - "1:growl", - "1:feintattack", - "4:helpinghand", - "8:beatup", - "12:brine", - "16:tearfullook", - "20:dive", - "24:soak", - "28:uproar", - "32:aquatail", - "36:aquaring", - "40:endeavor", - "44:hydropump", - "48:doubleedge", - "egg:mist", - "egg:takedown", - "egg:waterpulse", - "egg:watersport", - "tm:aquaring", - "tm:aquatail", - "tm:beatup", - "tm:brine", - "tm:bulldoze", - "tm:covet", - "tm:dive", - "tm:doubleedge", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:feintattack", - "tm:flipturn", - "tm:growl", - "tm:hail", - "tm:helpinghand", - "tm:hydropump", - "tm:icebeam", - "tm:irontail", - "tm:liquidation", - "tm:mist", - "tm:muddywater", - "tm:mudshot", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:scald", - "tm:scaleshot", - "tm:sleeptalk", - "tm:soak", - "tm:substitute", - "tm:surf", - "tm:takedown", - "tm:tearfullook", - "tm:terablast", - "tm:uproar", - "tm:uturn", - "tm:waterfall", - "tm:watergun", - "tm:waterpulse", - "tm:watersport", - "tm:whirlpool" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json b/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json index 3bb03a61bb..605f3bb9df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json b/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json index bf251d0ffa..cef2766b33 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json b/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json index 1d9b0ee17b..30e6d9e4d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:scratch", "1:spark", diff --git a/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json b/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json index 575320027e..c0775638e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json +++ b/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:thunderpunch", "1:thundershock", @@ -128,98 +127,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "ironfist", - "h:ironfist" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 135, - "attack": 143, - "defence": 143, - "special_attack": 80, - "special_defence": 65, - "speed": 34 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:thunderpunch", - "1:thundershock", - "1:harden", - "1:tailwhip", - "1:headbutt", - "24:thunderwave", - "32:acidarmor", - "40:flashcannon", - "48:megapunch", - "56:protect", - "64:discharge", - "72:dynamicpunch", - "80:superpower", - "88:doubleironbash", - "96:hyperbeam", - "tm:acidarmor", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:darkestlariat", - "tm:discharge", - "tm:doubleironbash", - "tm:dynamicpunch", - "tm:earthquake", - "tm:electricterrain", - "tm:endure", - "tm:facade", - "tm:flashcannon", - "tm:gigaimpact", - "tm:gyroball", - "tm:harden", - "tm:headbutt", - "tm:heavyslam", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:irondefense", - "tm:ironhead", - "tm:megakick", - "tm:megapunch", - "tm:protect", - "tm:rest", - "tm:rockslide", - "tm:rocktomb", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelbeam", - "tm:steelroller", - "tm:substitute", - "tm:superpower", - "tm:tailwhip", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json b/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json index da72f389b4..f95438e043 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json +++ b/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:thundershock", "1:harden", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json index 4c9a37ceb0..406a635534 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json @@ -164,106 +164,6 @@ "aspects": [ "cream-ruby" ], - "abilities": [ - "sweetveil", - "h:aromaveil" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 60, - "defence": 75, - "special_attack": 110, - "special_defence": 121, - "speed": 64 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:decorate", - "1:tackle", - "1:aromaticmist", - "1:sweetkiss", - "1:sweetscent", - "1:aromatherapy", - "15:drainingkiss", - "20:charm", - "25:attract", - "30:acidarmor", - "35:dazzlinggleam", - "40:recover", - "45:mistyterrain", - "50:entrainment", - "egg:babydolleyes", - "egg:lastresort", - "tm:acidarmor", - "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:attract", - "tm:babydolleyes", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:decorate", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lastresort", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:recover", - "tm:rest", - "tm:safeguard", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast", - "tm:triattack", - "tm:wonderroom" - ], "preEvolution": "milcery", "evolutions": [], "battleOnly": false @@ -283,106 +183,6 @@ "aspects": [ "cream-matcha" ], - "abilities": [ - "sweetveil", - "h:aromaveil" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 60, - "defence": 75, - "special_attack": 110, - "special_defence": 121, - "speed": 64 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:decorate", - "1:tackle", - "1:aromaticmist", - "1:sweetkiss", - "1:sweetscent", - "1:aromatherapy", - "15:drainingkiss", - "20:charm", - "25:attract", - "30:acidarmor", - "35:dazzlinggleam", - "40:recover", - "45:mistyterrain", - "50:entrainment", - "egg:babydolleyes", - "egg:lastresort", - "tm:acidarmor", - "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:attract", - "tm:babydolleyes", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:decorate", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lastresort", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:recover", - "tm:rest", - "tm:safeguard", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast", - "tm:triattack", - "tm:wonderroom" - ], "preEvolution": "milcery", "evolutions": [], "battleOnly": false @@ -402,106 +202,6 @@ "aspects": [ "cream-mint" ], - "abilities": [ - "sweetveil", - "h:aromaveil" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 60, - "defence": 75, - "special_attack": 110, - "special_defence": 121, - "speed": 64 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:decorate", - "1:tackle", - "1:aromaticmist", - "1:sweetkiss", - "1:sweetscent", - "1:aromatherapy", - "15:drainingkiss", - "20:charm", - "25:attract", - "30:acidarmor", - "35:dazzlinggleam", - "40:recover", - "45:mistyterrain", - "50:entrainment", - "egg:babydolleyes", - "egg:lastresort", - "tm:acidarmor", - "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:attract", - "tm:babydolleyes", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:decorate", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lastresort", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:recover", - "tm:rest", - "tm:safeguard", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast", - "tm:triattack", - "tm:wonderroom" - ], "preEvolution": "milcery", "evolutions": [], "battleOnly": false @@ -521,106 +221,6 @@ "aspects": [ "cream-lemon" ], - "abilities": [ - "sweetveil", - "h:aromaveil" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 60, - "defence": 75, - "special_attack": 110, - "special_defence": 121, - "speed": 64 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:decorate", - "1:tackle", - "1:aromaticmist", - "1:sweetkiss", - "1:sweetscent", - "1:aromatherapy", - "15:drainingkiss", - "20:charm", - "25:attract", - "30:acidarmor", - "35:dazzlinggleam", - "40:recover", - "45:mistyterrain", - "50:entrainment", - "egg:babydolleyes", - "egg:lastresort", - "tm:acidarmor", - "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:attract", - "tm:babydolleyes", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:decorate", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lastresort", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:recover", - "tm:rest", - "tm:safeguard", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast", - "tm:triattack", - "tm:wonderroom" - ], "preEvolution": "milcery", "evolutions": [], "battleOnly": false @@ -640,106 +240,6 @@ "aspects": [ "cream-salted" ], - "abilities": [ - "sweetveil", - "h:aromaveil" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 60, - "defence": 75, - "special_attack": 110, - "special_defence": 121, - "speed": 64 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:decorate", - "1:tackle", - "1:aromaticmist", - "1:sweetkiss", - "1:sweetscent", - "1:aromatherapy", - "15:drainingkiss", - "20:charm", - "25:attract", - "30:acidarmor", - "35:dazzlinggleam", - "40:recover", - "45:mistyterrain", - "50:entrainment", - "egg:babydolleyes", - "egg:lastresort", - "tm:acidarmor", - "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:attract", - "tm:babydolleyes", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:decorate", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lastresort", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:recover", - "tm:rest", - "tm:safeguard", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast", - "tm:triattack", - "tm:wonderroom" - ], "preEvolution": "milcery", "evolutions": [], "battleOnly": false @@ -759,106 +259,6 @@ "aspects": [ "cream-ruby_swirl" ], - "abilities": [ - "sweetveil", - "h:aromaveil" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 60, - "defence": 75, - "special_attack": 110, - "special_defence": 121, - "speed": 64 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:decorate", - "1:tackle", - "1:aromaticmist", - "1:sweetkiss", - "1:sweetscent", - "1:aromatherapy", - "15:drainingkiss", - "20:charm", - "25:attract", - "30:acidarmor", - "35:dazzlinggleam", - "40:recover", - "45:mistyterrain", - "50:entrainment", - "egg:babydolleyes", - "egg:lastresort", - "tm:acidarmor", - "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:attract", - "tm:babydolleyes", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:decorate", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lastresort", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:recover", - "tm:rest", - "tm:safeguard", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast", - "tm:triattack", - "tm:wonderroom" - ], "preEvolution": "milcery", "evolutions": [], "battleOnly": false @@ -878,106 +278,6 @@ "aspects": [ "cream-caramel_swirl" ], - "abilities": [ - "sweetveil", - "h:aromaveil" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 60, - "defence": 75, - "special_attack": 110, - "special_defence": 121, - "speed": 64 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:decorate", - "1:tackle", - "1:aromaticmist", - "1:sweetkiss", - "1:sweetscent", - "1:aromatherapy", - "15:drainingkiss", - "20:charm", - "25:attract", - "30:acidarmor", - "35:dazzlinggleam", - "40:recover", - "45:mistyterrain", - "50:entrainment", - "egg:babydolleyes", - "egg:lastresort", - "tm:acidarmor", - "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:attract", - "tm:babydolleyes", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:decorate", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lastresort", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:recover", - "tm:rest", - "tm:safeguard", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast", - "tm:triattack", - "tm:wonderroom" - ], "preEvolution": "milcery", "evolutions": [], "battleOnly": false @@ -997,106 +297,6 @@ "aspects": [ "cream-rainbow_swirl" ], - "abilities": [ - "sweetveil", - "h:aromaveil" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 60, - "defence": 75, - "special_attack": 110, - "special_defence": 121, - "speed": 64 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 20, - "baseFriendship": 50, - "moves": [ - "1:decorate", - "1:tackle", - "1:aromaticmist", - "1:sweetkiss", - "1:sweetscent", - "1:aromatherapy", - "15:drainingkiss", - "20:charm", - "25:attract", - "30:acidarmor", - "35:dazzlinggleam", - "40:recover", - "45:mistyterrain", - "50:entrainment", - "egg:babydolleyes", - "egg:lastresort", - "tm:acidarmor", - "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:attract", - "tm:babydolleyes", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:decorate", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lastresort", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:recover", - "tm:rest", - "tm:safeguard", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast", - "tm:triattack", - "tm:wonderroom" - ], "preEvolution": "milcery", "evolutions": [], "battleOnly": false @@ -1117,108 +317,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "sweetveil", - "h:aromaveil" - ], - "eggGroups": [ - "fairy", - "amorphous" - ], - "baseStats": { - "hp": 65, - "attack": 60, - "defence": 75, - "special_attack": 110, - "special_defence": 121, - "speed": 64 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:decorate", - "1:tackle", - "1:aromaticmist", - "1:sweetkiss", - "1:sweetscent", - "1:aromatherapy", - "15:drainingkiss", - "20:charm", - "25:attract", - "30:acidarmor", - "35:dazzlinggleam", - "40:recover", - "45:mistyterrain", - "50:entrainment", - "egg:babydolleyes", - "egg:lastresort", - "tm:acidarmor", - "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:attract", - "tm:babydolleyes", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:decorate", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:entrainment", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lastresort", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:recover", - "tm:rest", - "tm:safeguard", - "tm:sleeptalk", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast", - "tm:triattack", - "tm:wonderroom" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/appletun.json b/common/src/main/resources/data/cobblemon/species/generation8/appletun.json index 9ca5987d5b..024b697908 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/appletun.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/appletun.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -165,121 +164,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "ripen", - "gluttony", - "h:thickfat" - ], - "eggGroups": [ - "grass", - "dragon" - ], - "baseStats": { - "hp": 110, - "attack": 85, - "defence": 80, - "special_attack": 100, - "special_defence": 80, - "speed": 30 - }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 170, - "experienceGroup": "erratic", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:headbutt", - "1:recycle", - "1:withdraw", - "1:astonish", - "1:growth", - "1:sweetscent", - "4:curse", - "8:stomp", - "12:leechseed", - "16:protect", - "20:bulletseed", - "24:recover", - "28:appleacid", - "32:bodyslam", - "36:irondefense", - "40:dragonpulse", - "44:energyball", - "egg:defensecurl", - "egg:recycle", - "egg:rollout", - "egg:suckerpunch", - "tm:amnesia", - "tm:appleacid", - "tm:astonish", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:bulletseed", - "tm:curse", - "tm:defensecurl", - "tm:dracometeor", - "tm:dragonpulse", - "tm:dragontail", - "tm:earthquake", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growth", - "tm:gyroball", - "tm:headbutt", - "tm:heavyslam", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:irondefense", - "tm:ironhead", - "tm:leafstorm", - "tm:leechseed", - "tm:lightscreen", - "tm:magicalleaf", - "tm:outrage", - "tm:payback", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:recover", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:rollout", - "tm:safeguard", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stomp", - "tm:stompingtantrum", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:superpower", - "tm:sweetscent", - "tm:takedown", - "tm:terablast", - "tm:trailblaze", - "tm:withdraw", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json b/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json index ad976dff79..b473b95672 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json b/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json index 1da3375a7f..74c96d1fa1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:pound", "1:megadrain", @@ -159,9 +158,6 @@ "asoneglastrier", "h:asoneglastrier" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 165, @@ -179,11 +175,6 @@ "speed": 0 }, "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 100, - "behaviour": {}, "moves": [ "1:glaciallance", "1:tackle", @@ -347,9 +338,6 @@ "asonespectrier", "h:asonespectrier" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 85, @@ -367,11 +355,6 @@ "speed": 0 }, "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 100, - "behaviour": {}, "moves": [ "1:astralbarrage", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json index 2a0e395957..4623e2dccc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json @@ -162,105 +162,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "flashfire", - "whitesmoke", - "h:flamebody" - ], - "eggGroups": [ - "bug" - ], - "baseStats": { - "hp": 100, - "attack": 115, - "defence": 65, - "special_attack": 90, - "special_defence": 90, - "speed": 65 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 184, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:inferno", - "1:ember", - "1:smokescreen", - "1:wrap", - "1:bite", - "15:flamewheel", - "20:bugbite", - "25:coil", - "32:slam", - "39:firespin", - "46:crunch", - "53:firelash", - "60:lunge", - "67:burnup", - "egg:defensecurl", - "egg:knockoff", - "egg:rollout", - "egg:strugglebug", - "tm:bite", - "tm:brutalswing", - "tm:bugbite", - "tm:bugbuzz", - "tm:burnup", - "tm:coil", - "tm:crunch", - "tm:defensecurl", - "tm:ember", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firelash", - "tm:firespin", - "tm:flamethrower", - "tm:flamewheel", - "tm:flareblitz", - "tm:gigaimpact", - "tm:heatcrash", - "tm:heatwave", - "tm:hyperbeam", - "tm:inferno", - "tm:knockoff", - "tm:leechlife", - "tm:lunge", - "tm:mysticalfire", - "tm:overheat", - "tm:powerwhip", - "tm:protect", - "tm:rest", - "tm:rollout", - "tm:scald", - "tm:scorchingsands", - "tm:skittersmack", - "tm:slam", - "tm:sleeptalk", - "tm:smokescreen", - "tm:solarbeam", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:terablast", - "tm:thunderfang", - "tm:venoshock", - "tm:willowisp", - "tm:wrap", - "tm:xscissor" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json index 137dcddfc5..dcaea68f0a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json @@ -48,7 +48,6 @@ "height": 3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 6, "entries": [ @@ -183,132 +182,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "blaze", - "h:libero" - ], - "eggGroups": [ - "field", - "human_like" - ], - "baseStats": { - "hp": 80, - "attack": 116, - "defence": 75, - "special_attack": 65, - "special_defence": 75, - "speed": 119 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, - "baseExperienceYield": 265, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:pyroball", - "1:feint", - "1:tackle", - "1:growl", - "1:ember", - "1:quickattack", - "12:doublekick", - "19:flamecharge", - "24:agility", - "30:headbutt", - "38:counter", - "46:bounce", - "54:doubleedge", - "62:courtchange", - "egg:highjumpkick", - "egg:sandattack", - "egg:suckerpunch", - "egg:superfang", - "tm:acrobatics", - "tm:agility", - "tm:allyswitch", - "tm:assurance", - "tm:batonpass", - "tm:blastburn", - "tm:blazekick", - "tm:bounce", - "tm:bulkup", - "tm:burningjealousy", - "tm:coaching", - "tm:counter", - "tm:courtchange", - "tm:doubleedge", - "tm:doublekick", - "tm:electroball", - "tm:ember", - "tm:endure", - "tm:facade", - "tm:feint", - "tm:fireblast", - "tm:firefang", - "tm:firepledge", - "tm:firepunch", - "tm:firespin", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:gigaimpact", - "tm:growl", - "tm:gunkshot", - "tm:headbutt", - "tm:heatwave", - "tm:helpinghand", - "tm:highjumpkick", - "tm:hyperbeam", - "tm:ironhead", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:mudshot", - "tm:mudslap", - "tm:overheat", - "tm:protect", - "tm:pyroball", - "tm:quickattack", - "tm:rest", - "tm:revenge", - "tm:reversal", - "tm:sandattack", - "tm:scorchingsands", - "tm:shadowball", - "tm:sleeptalk", - "tm:smackdown", - "tm:snarl", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:superfang", - "tm:swift", - "tm:swordsdance", - "tm:tackle", - "tm:takedown", - "tm:taunt", - "tm:temperflare", - "tm:terablast", - "tm:trailblaze", - "tm:uturn", - "tm:weatherball", - "tm:willowisp", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json b/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json index 62bd83b03f..e9b2d4fdec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json @@ -175,126 +175,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "steamengine", - "flamebody", - "h:flashfire" - ], - "eggGroups": [ - "mineral" - ], - "baseStats": { - "hp": 110, - "attack": 80, - "defence": 120, - "special_attack": 80, - "special_defence": 90, - "speed": 30 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 255, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "avoidsWater": true, - "canSwimInWater": false - } - } - }, - "moves": [ - "1:tarshot", - "1:flamecharge", - "1:tackle", - "1:smokescreen", - "1:rapidspin", - "1:smackdown", - "1:burnup", - "15:rockpolish", - "20:ancientpower", - "27:incinerate", - "37:stealthrock", - "45:heatcrash", - "54:rockblast", - "63:stoneedge", - "egg:block", - "egg:explosion", - "egg:mudslap", - "tm:ancientpower", - "tm:block", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:burnup", - "tm:curse", - "tm:dig", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:fireblast", - "tm:firepunch", - "tm:firespin", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:gigaimpact", - "tm:gyroball", - "tm:heatcrash", - "tm:heatwave", - "tm:heavyslam", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:megakick", - "tm:megapunch", - "tm:meteorbeam", - "tm:mudslap", - "tm:overheat", - "tm:powergem", - "tm:protect", - "tm:rapidspin", - "tm:reflect", - "tm:rest", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocktomb", - "tm:sandstorm", - "tm:sandtomb", - "tm:scald", - "tm:scorchingsands", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:smackdown", - "tm:smokescreen", - "tm:solarbeam", - "tm:spikes", - "tm:stealthrock", - "tm:stoneedge", - "tm:substitute", - "tm:sunnyday", - "tm:tackle", - "tm:takedown", - "tm:tarshot", - "tm:temperflare", - "tm:terablast", - "tm:willowisp" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json b/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json index ee81bbc625..bfd5c7bda2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json @@ -181,127 +181,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "sheerforce", - "h:heavymetal" - ], - "eggGroups": [ - "field", - "mineral" - ], - "baseStats": { - "hp": 122, - "attack": 130, - "defence": 69, - "special_attack": 80, - "special_defence": 69, - "speed": 30 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 175, - "experienceGroup": "medium_fast", - "catchRate": 90, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:heavyslam", - "1:tackle", - "1:growl", - "1:rollout", - "1:rocksmash", - "15:bulldoze", - "20:stomp", - "25:irondefense", - "30:dig", - "37:strength", - "44:ironhead", - "51:playrough", - "58:highhorsepower", - "65:superpower", - "egg:belch", - "egg:curse", - "egg:defensecurl", - "egg:doubleedge", - "egg:fissure", - "egg:slam", - "egg:swagger", - "egg:whirlwind", - "tm:belch", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:curse", - "tm:defensecurl", - "tm:dig", - "tm:doubleedge", - "tm:earthpower", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fissure", - "tm:flashcannon", - "tm:fling", - "tm:gigaimpact", - "tm:growl", - "tm:hardpress", - "tm:heatcrash", - "tm:heavyslam", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:irondefense", - "tm:ironhead", - "tm:knockoff", - "tm:megakick", - "tm:mudshot", - "tm:outrage", - "tm:payback", - "tm:playrough", - "tm:powerwhip", - "tm:protect", - "tm:rest", - "tm:revenge", - "tm:rockblast", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:rollout", - "tm:sandstorm", - "tm:screech", - "tm:slam", - "tm:sleeptalk", - "tm:smackdown", - "tm:snarl", - "tm:stealthrock", - "tm:steelbeam", - "tm:steelroller", - "tm:stomp", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:supercellslam", - "tm:superpower", - "tm:swagger", - "tm:tackle", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:whirlwind", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json index eae7cb8cfd..50f2e72778 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json @@ -189,126 +189,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "pressure", - "unnerve", - "h:mirrorarmor" - ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 98, - "attack": 87, - "defence": 105, - "special_attack": 53, - "special_defence": 85, - "speed": 67 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 248, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:steelwing", - "1:irondefense", - "1:metalsound", - "1:peck", - "1:leer", - "1:powertrip", - "1:honeclaws", - "1:screech", - "12:furyattack", - "16:pluck", - "22:taunt", - "28:scaryface", - "34:drillpeck", - "42:swagger", - "50:bravebird", - "egg:defog", - "egg:rocksmash", - "egg:roost", - "egg:sandattack", - "egg:skyattack", - "egg:spite", - "egg:tailwind", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:assurance", - "tm:bodypress", - "tm:bodyslam", - "tm:bravebird", - "tm:bulkup", - "tm:curse", - "tm:defog", - "tm:doubleedge", - "tm:drillpeck", - "tm:dualwingbeat", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:flashcannon", - "tm:fly", - "tm:focusenergy", - "tm:furyattack", - "tm:gigaimpact", - "tm:heavyslam", - "tm:honeclaws", - "tm:hurricane", - "tm:hyperbeam", - "tm:irondefense", - "tm:ironhead", - "tm:leer", - "tm:lightscreen", - "tm:metalclaw", - "tm:metalsound", - "tm:nastyplot", - "tm:payback", - "tm:peck", - "tm:pluck", - "tm:powertrip", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:rocksmash", - "tm:roost", - "tm:sandattack", - "tm:scaryface", - "tm:screech", - "tm:skyattack", - "tm:sleeptalk", - "tm:spite", - "tm:steelbeam", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:uturn", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json b/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json index 7621731306..9402eef45c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json @@ -175,123 +175,6 @@ "aspects": [ "gulping-form" ], - "abilities": [ - "gulpmissile", - "h:gulpmissile" - ], - "eggGroups": [ - "water_1", - "flying" - ], - "baseStats": { - "hp": 70, - "attack": 85, - "defence": 55, - "special_attack": 85, - "special_defence": 95, - "speed": 85 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true, - "canSwimInLava": false, - "canBreatheUnderwater": true, - "swimSpeed": "0.2" - } - } - }, - "moves": [ - "1:belch", - "1:peck", - "1:stockpile", - "1:swallow", - "1:spitup", - "7:watergun", - "14:furyattack", - "21:pluck", - "28:dive", - "35:drillpeck", - "42:amnesia", - "49:thrash", - "56:hydropump", - "egg:aerialace", - "egg:aquacutter", - "egg:aquaring", - "egg:defog", - "egg:featherdance", - "egg:roost", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:amnesia", - "tm:aquacutter", - "tm:aquaring", - "tm:assurance", - "tm:belch", - "tm:blizzard", - "tm:bravebird", - "tm:chillingwater", - "tm:defog", - "tm:dive", - "tm:drillpeck", - "tm:dualwingbeat", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:furyattack", - "tm:gigaimpact", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:liquidation", - "tm:peck", - "tm:pluck", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:reversal", - "tm:roost", - "tm:sleeptalk", - "tm:spitup", - "tm:steelwing", - "tm:stockpile", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:swallow", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:throatchop", - "tm:uproar", - "tm:watergun", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool" - ], "evolutions": [], "battleOnly": true }, @@ -311,123 +194,6 @@ "aspects": [ "gorging-form" ], - "abilities": [ - "gulpmissile", - "h:gulpmissile" - ], - "eggGroups": [ - "water_1", - "flying" - ], - "baseStats": { - "hp": 70, - "attack": 85, - "defence": 55, - "special_attack": 85, - "special_defence": 95, - "speed": 85 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true, - "canSwimInLava": false, - "canBreatheUnderwater": true, - "swimSpeed": "0.2" - } - } - }, - "moves": [ - "1:belch", - "1:peck", - "1:stockpile", - "1:swallow", - "1:spitup", - "7:watergun", - "14:furyattack", - "21:pluck", - "28:dive", - "35:drillpeck", - "42:amnesia", - "49:thrash", - "56:hydropump", - "egg:aerialace", - "egg:aquacutter", - "egg:aquaring", - "egg:defog", - "egg:featherdance", - "egg:roost", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:amnesia", - "tm:aquacutter", - "tm:aquaring", - "tm:assurance", - "tm:belch", - "tm:blizzard", - "tm:bravebird", - "tm:chillingwater", - "tm:defog", - "tm:dive", - "tm:drillpeck", - "tm:dualwingbeat", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:furyattack", - "tm:gigaimpact", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:liquidation", - "tm:peck", - "tm:pluck", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:reversal", - "tm:roost", - "tm:sleeptalk", - "tm:spitup", - "tm:steelwing", - "tm:stockpile", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:swallow", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:throatchop", - "tm:uproar", - "tm:watergun", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json index 1b8593918c..971b44f5bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json b/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json index 64e18147e0..38135974c0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json @@ -183,138 +183,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "strongjaw", - "shellarmor", - "h:swiftswim" - ], - "eggGroups": [ - "monster", - "water_1" - ], - "baseStats": { - "hp": 90, - "attack": 115, - "defence": 90, - "special_attack": 48, - "special_defence": 68, - "speed": 74 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 170, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true, - "canSwimInLava": false, - "canBreatheUnderwater": true, - "swimSpeed": "0.2" - } - } - }, - "moves": [ - "1:rocktomb", - "1:razorshell", - "1:crunch", - "1:rockpolish", - "1:tackle", - "1:watergun", - "1:bite", - "1:protect", - "21:headbutt", - "30:counter", - "39:jawlock", - "48:liquidation", - "57:bodyslam", - "66:headsmash", - "egg:dragontail", - "egg:gastroacid", - "egg:shellsmash", - "egg:skullbash", - "tm:assurance", - "tm:bite", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:chillingwater", - "tm:counter", - "tm:crunch", - "tm:dig", - "tm:dive", - "tm:doubleedge", - "tm:dragontail", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:gastroacid", - "tm:gigaimpact", - "tm:headbutt", - "tm:headsmash", - "tm:highhorsepower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icespinner", - "tm:irondefense", - "tm:irontail", - "tm:jawlock", - "tm:liquidation", - "tm:megahorn", - "tm:meteorbeam", - "tm:muddywater", - "tm:mudshot", - "tm:payback", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:razorshell", - "tm:rest", - "tm:revenge", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocktomb", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaryface", - "tm:shellsmash", - "tm:skittersmack", - "tm:skullbash", - "tm:sleeptalk", - "tm:smartstrike", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:substitute", - "tm:superfang", - "tm:superpower", - "tm:surf", - "tm:swordsdance", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:waterfall", - "tm:watergun", - "tm:waterpulse", - "tm:whirlpool" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json b/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json index 30852ee5af..dffaf3c66c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -164,112 +163,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "lightmetal", - "heavymetal", - "h:stalwart" - ], - "eggGroups": [ - "mineral", - "dragon" - ], - "baseStats": { - "hp": 70, - "attack": 95, - "defence": 115, - "special_attack": 120, - "special_defence": 50, - "speed": 85 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 187, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 30, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:metalclaw", - "1:leer", - "6:rocksmash", - "12:honeclaws", - "18:metalsound", - "24:breakingswipe", - "30:dragontail", - "36:irondefense", - "42:focusenergy", - "48:dragonclaw", - "54:flashcannon", - "60:metalburst", - "66:hyperbeam", - "egg:mirrorcoat", - "egg:nightslash", - "egg:slash", - "tm:bodypress", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:darkpulse", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragonpulse", - "tm:dragontail", - "tm:endure", - "tm:facade", - "tm:flashcannon", - "tm:focusenergy", - "tm:foulplay", - "tm:gigaimpact", - "tm:gyroball", - "tm:heavyslam", - "tm:honeclaws", - "tm:hyperbeam", - "tm:irondefense", - "tm:ironhead", - "tm:laserfocus", - "tm:leer", - "tm:lightscreen", - "tm:metalburst", - "tm:metalclaw", - "tm:metalsound", - "tm:mirrorcoat", - "tm:nightslash", - "tm:outrage", - "tm:protect", - "tm:reflect", - "tm:rest", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:scaryface", - "tm:screech", - "tm:slash", - "tm:sleeptalk", - "tm:snarl", - "tm:solarbeam", - "tm:stealthrock", - "tm:steelbeam", - "tm:steelroller", - "tm:stoneedge", - "tm:substitute", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index af7a6ffe06..d44091f945 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -170,14 +170,6 @@ "aspects": [ "noice_face" ], - "abilities": [ - "iceface", - "h:iceface" - ], - "eggGroups": [ - "water_1", - "field" - ], "baseStats": { "hp": 75, "attack": 80, @@ -186,91 +178,6 @@ "special_defence": 50, "speed": 130 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 165, - "experienceGroup": "slow", - "catchRate": 60, - "eggCycles": 25, - "baseFriendship": 50, - "moves": [ - "1:powdersnow", - "1:tackle", - "6:mist", - "12:weatherball", - "18:icywind", - "24:headbutt", - "30:amnesia", - "36:freezedry", - "42:snowscape", - "48:auroraveil", - "54:surf", - "60:blizzard", - "egg:aquaring", - "egg:bellydrum", - "egg:doubleedge", - "egg:headsmash", - "egg:iciclecrash", - "egg:soak", - "tm:agility", - "tm:amnesia", - "tm:aquaring", - "tm:auroraveil", - "tm:avalanche", - "tm:bellydrum", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:chillingwater", - "tm:dive", - "tm:doubleedge", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:flipturn", - "tm:freezedry", - "tm:gigaimpact", - "tm:hail", - "tm:headbutt", - "tm:headsmash", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icespinner", - "tm:iciclecrash", - "tm:iciclespear", - "tm:icywind", - "tm:irondefense", - "tm:ironhead", - "tm:liquidation", - "tm:mist", - "tm:powdersnow", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:reversal", - "tm:sleeptalk", - "tm:snowscape", - "tm:soak", - "tm:substitute", - "tm:surf", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:waterfall", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json b/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json index 6431889531..dead9958a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json @@ -48,7 +48,6 @@ "height": 0.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json b/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json index ccd2b5d4cb..244f7bdb2d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:poisontail", "1:confuseray", @@ -139,13 +138,6 @@ "aspects": [ "eternamax" ], - "abilities": [ - "pressure", - "h:pressure" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 255, "attack": 115, @@ -154,89 +146,7 @@ "special_defence": 250, "speed": 130 }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 563, - "experienceGroup": "slow", - "catchRate": 255, - "eggCycles": 120, - "baseFriendship": 0, - "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:poisontail", - "1:confuseray", - "1:dragontail", - "1:agility", - "8:toxic", - "16:venoshock", - "24:dragondance", - "32:crosspoison", - "40:dragonpulse", - "48:flamethrower", - "56:dynamaxcannon", - "64:cosmicpower", - "72:recover", - "80:hyperbeam", - "88:eternabeam", - "tm:agility", - "tm:assurance", - "tm:bodyslam", - "tm:brutalswing", - "tm:confuseray", - "tm:cosmicpower", - "tm:crosspoison", - "tm:dracometeor", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dynamaxcannon", - "tm:endure", - "tm:eternabeam", - "tm:facade", - "tm:fireblast", - "tm:firespin", - "tm:flamethrower", - "tm:flashcannon", - "tm:fly", - "tm:gigaimpact", - "tm:gravity", - "tm:gunkshot", - "tm:hyperbeam", - "tm:lightscreen", - "tm:meteorbeam", - "tm:mysticalfire", - "tm:outrage", - "tm:payback", - "tm:poisonjab", - "tm:poisontail", - "tm:protect", - "tm:raindance", - "tm:recover", - "tm:reflect", - "tm:rest", - "tm:scaryface", - "tm:screech", - "tm:shadowball", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:toxicspikes", - "tm:venomdrench", - "tm:venoshock" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/flapple.json b/common/src/main/resources/data/cobblemon/species/generation8/flapple.json index 9b1dc27fc8..90bfd5eb68 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/flapple.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/flapple.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -157,113 +156,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "ripen", - "gluttony", - "h:hustle" - ], - "eggGroups": [ - "grass", - "dragon" - ], - "baseStats": { - "hp": 70, - "attack": 110, - "defence": 80, - "special_attack": 95, - "special_defence": 60, - "speed": 70 - }, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 170, - "experienceGroup": "erratic", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:wingattack", - "1:recycle", - "1:withdraw", - "1:astonish", - "1:growth", - "1:twister", - "4:acidspray", - "8:acrobatics", - "12:leechseed", - "16:protect", - "20:dragonbreath", - "24:dragondance", - "28:dragonpulse", - "32:gravapple", - "36:irondefense", - "40:fly", - "44:dragonrush", - "egg:defensecurl", - "egg:recycle", - "egg:rollout", - "egg:suckerpunch", - "tm:acidspray", - "tm:acrobatics", - "tm:aerialace", - "tm:airslash", - "tm:astonish", - "tm:bulletseed", - "tm:defensecurl", - "tm:dracometeor", - "tm:dragonbreath", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragonrush", - "tm:dualwingbeat", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fly", - "tm:focusenergy", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:gravapple", - "tm:growth", - "tm:heavyslam", - "tm:hyperbeam", - "tm:irondefense", - "tm:leafstorm", - "tm:leechseed", - "tm:magicalleaf", - "tm:outrage", - "tm:pounce", - "tm:protect", - "tm:recycle", - "tm:rest", - "tm:rollout", - "tm:scaryface", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:takedown", - "tm:terablast", - "tm:trailblaze", - "tm:twister", - "tm:uturn", - "tm:wingattack", - "tm:withdraw" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json b/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json index 7a179fcf70..b5d7956b5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json b/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json index 26722de3d9..ff80d4cec6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:tackle", "1:tailwhip", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json b/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json index e69f931454..c35e552649 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json @@ -48,7 +48,6 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/greedent.json b/common/src/main/resources/data/cobblemon/species/generation8/greedent.json index 7a940083cf..59feed14eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/greedent.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/greedent.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json b/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json index d3dbe3105d..945b51fbef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json @@ -178,131 +178,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "prankster", - "frisk", - "h:pickpocket" - ], - "eggGroups": [ - "fairy", - "human_like" - ], - "baseStats": { - "hp": 95, - "attack": 120, - "defence": 65, - "special_attack": 95, - "special_defence": 75, - "speed": 60 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 255, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:spiritbreak", - "1:falsesurrender", - "1:bulkup", - "1:poweruppunch", - "1:fakeout", - "1:confide", - "1:bite", - "1:flatter", - "12:faketears", - "16:assurance", - "20:swagger", - "24:suckerpunch", - "28:torment", - "35:darkpulse", - "40:nastyplot", - "48:playrough", - "56:foulplay", - "64:hammerarm", - "egg:partingshot", - "tm:assurance", - "tm:bite", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:burningjealousy", - "tm:chillingwater", - "tm:confide", - "tm:crunch", - "tm:darkestlariat", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:drainingkiss", - "tm:drainpunch", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:faketears", - "tm:falsesurrender", - "tm:firepunch", - "tm:flatter", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:foulplay", - "tm:gigaimpact", - "tm:hammerarm", - "tm:hyperbeam", - "tm:icepunch", - "tm:imprison", - "tm:lashout", - "tm:leechlife", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mistyterrain", - "tm:nastyplot", - "tm:partingshot", - "tm:playrough", - "tm:powerswap", - "tm:poweruppunch", - "tm:powerwhip", - "tm:protect", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:scaryface", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:spiritbreak", - "tm:stompingtantrum", - "tm:substitute", - "tm:suckerpunch", - "tm:superpower", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:trailblaze", - "tm:trick", - "tm:wonderroom" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json index 30c339be43..c0d90538e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json b/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json index d98c39a85e..c8352f17d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json @@ -48,7 +48,6 @@ "height": 0.85, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json index f93331b002..8cff6de15c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json @@ -49,7 +49,6 @@ "height": 4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -167,125 +166,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "healer", - "anticipation", - "h:magicbounce" - ], - "eggGroups": [ - "fairy" - ], - "baseStats": { - "hp": 57, - "attack": 90, - "defence": 95, - "special_attack": 136, - "special_defence": 103, - "speed": 29 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 255, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:psychocut", - "1:brutalswing", - "1:confusion", - "1:playnice", - "1:lifedew", - "1:disarmingvoice", - "1:aromatherapy", - "15:aromaticmist", - "20:psybeam", - "25:healpulse", - "30:dazzlinggleam", - "37:calmmind", - "46:psychic", - "55:healingwish", - "64:magicpowder", - "egg:afteryou", - "egg:aromaticmist", - "egg:mysticalfire", - "egg:nuzzle", - "egg:quash", - "tm:afteryou", - "tm:agility", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:batonpass", - "tm:brutalswing", - "tm:calmmind", - "tm:charm", - "tm:confusion", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gravity", - "tm:guardswap", - "tm:healingwish", - "tm:healpulse", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lifedew", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicpowder", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:nuzzle", - "tm:painsplit", - "tm:playnice", - "tm:playrough", - "tm:powerswap", - "tm:powerwhip", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:quash", - "tm:reflect", - "tm:rest", - "tm:safeguard", - "tm:shadowball", - "tm:shadowclaw", - "tm:skillswap", - "tm:sleeptalk", - "tm:storedpower", - "tm:substitute", - "tm:swift", - "tm:swordsdance", - "tm:terablast", - "tm:thunderwave", - "tm:trick", - "tm:trickroom", - "tm:wonderroom" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json index 0593731b05..56efad0657 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json @@ -48,7 +48,6 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json index b94c482828..d680963858 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -155,9 +154,6 @@ "synchronize", "h:psychicsurge" ], - "eggGroups": [ - "fairy" - ], "baseStats": { "hp": 70, "attack": 55, @@ -174,12 +170,6 @@ "special_defence": 2, "speed": 0 }, - "baseExperienceYield": 166, - "experienceGroup": "fast", - "catchRate": 30, - "eggCycles": 40, - "baseFriendship": 140, - "behaviour": {}, "moves": [ "1:storedpower", "1:playnice", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json index 272f50556e..94e20f3a4b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json @@ -183,139 +183,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "torrent", - "h:sniper" - ], - "eggGroups": [ - "water_1", - "field" - ], - "baseStats": { - "hp": 70, - "attack": 85, - "defence": 65, - "special_attack": 125, - "special_defence": 65, - "speed": 120 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, - "baseExperienceYield": 265, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": { - "moving": { - "swim": { - "canSwimInWater": true, - "canSwimInLava": false, - "canBreatheUnderwater": true, - "swimSpeed": "0.2" - } - } - }, - "moves": [ - "1:snipeshot", - "1:acrobatics", - "1:pound", - "1:growl", - "1:watergun", - "1:bind", - "12:waterpulse", - "19:tearfullook", - "24:suckerpunch", - "30:uturn", - "38:liquidation", - "46:soak", - "54:raindance", - "62:hydropump", - "egg:aquajet", - "egg:aquaring", - "egg:doubleteam", - "egg:fellstinger", - "egg:haze", - "egg:iceshard", - "egg:mist", - "tm:acrobatics", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:aquajet", - "tm:aquaring", - "tm:batonpass", - "tm:bind", - "tm:blizzard", - "tm:bounce", - "tm:breakingswipe", - "tm:chillingwater", - "tm:darkpulse", - "tm:dive", - "tm:doubleteam", - "tm:endure", - "tm:facade", - "tm:fellstinger", - "tm:fling", - "tm:flipturn", - "tm:focusenergy", - "tm:gigaimpact", - "tm:growl", - "tm:haze", - "tm:hydrocannon", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:iceshard", - "tm:iciclespear", - "tm:icywind", - "tm:lightscreen", - "tm:liquidation", - "tm:metronome", - "tm:mist", - "tm:muddywater", - "tm:mudshot", - "tm:pound", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:safeguard", - "tm:scald", - "tm:shadowball", - "tm:skittersmack", - "tm:sleeptalk", - "tm:smackdown", - "tm:snipeshot", - "tm:snowscape", - "tm:soak", - "tm:substitute", - "tm:suckerpunch", - "tm:surf", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:tearfullook", - "tm:terablast", - "tm:uturn", - "tm:vacuumwave", - "tm:waterfall", - "tm:watergun", - "tm:waterpledge", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json b/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json index 1c469960a0..e74a3e923c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:rocksmash", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json index fd4a3f22da..fb04cfb234 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -173,131 +172,6 @@ "aspects": [ "hangry-mode" ], - "abilities": [ - "hungerswitch", - "h:hungerswitch" - ], - "eggGroups": [ - "field", - "fairy" - ], - "baseStats": { - "hp": 58, - "attack": 95, - "defence": 58, - "special_attack": 70, - "special_defence": 58, - "speed": 97 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 153, - "experienceGroup": "medium_fast", - "catchRate": 180, - "eggCycles": 10, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:thundershock", - "1:tailwhip", - "5:leer", - "10:powertrip", - "15:quickattack", - "20:flatter", - "25:bite", - "30:spark", - "35:torment", - "40:agility", - "45:bulletseed", - "50:crunch", - "55:aurawheel", - "60:thrash", - "egg:charge", - "egg:fakeout", - "egg:partingshot", - "egg:quash", - "egg:rapidspin", - "egg:superfang", - "egg:swagger", - "egg:tickle", - "tm:agility", - "tm:assurance", - "tm:aurawheel", - "tm:batonpass", - "tm:bite", - "tm:brickbreak", - "tm:bulletseed", - "tm:charge", - "tm:chargebeam", - "tm:crunch", - "tm:darkpulse", - "tm:doubleedge", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:faketears", - "tm:firefang", - "tm:flatter", - "tm:fling", - "tm:foulplay", - "tm:icefang", - "tm:knockoff", - "tm:lashout", - "tm:leer", - "tm:nastyplot", - "tm:outrage", - "tm:partingshot", - "tm:payback", - "tm:powertrip", - "tm:protect", - "tm:psychicfangs", - "tm:quash", - "tm:quickattack", - "tm:rapidspin", - "tm:rest", - "tm:revenge", - "tm:reversal", - "tm:risingvoltage", - "tm:scaryface", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snarl", - "tm:spark", - "tm:spite", - "tm:stompingtantrum", - "tm:substitute", - "tm:superfang", - "tm:swagger", - "tm:swift", - "tm:tailwhip", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave", - "tm:tickle", - "tm:torment", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json index e53e142212..d486590740 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json index a131d68df8..bc0de0fa7e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -155,114 +154,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "swarm", - "frisk", - "h:telepathy" - ], - "eggGroups": [ - "bug" - ], - "baseStats": { - "hp": 60, - "attack": 45, - "defence": 110, - "special_attack": 80, - "special_defence": 120, - "speed": 90 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "baseExperienceYield": 253, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:reflect", - "1:lightscreen", - "1:confusion", - "1:strugglebug", - "4:confuseray", - "8:magiccoat", - "12:agility", - "16:psybeam", - "20:hypnosis", - "24:allyswitch", - "28:bugbuzz", - "32:mirrorcoat", - "36:psychic", - "40:afteryou", - "44:calmmind", - "48:psychicterrain", - "egg:infestation", - "egg:recover", - "egg:stickyweb", - "egg:supersonic", - "tm:afteryou", - "tm:agility", - "tm:allyswitch", - "tm:batonpass", - "tm:bodypress", - "tm:bugbuzz", - "tm:calmmind", - "tm:confuseray", - "tm:confusion", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:guardswap", - "tm:helpinghand", - "tm:hyperbeam", - "tm:hypnosis", - "tm:imprison", - "tm:infestation", - "tm:irondefense", - "tm:leechlife", - "tm:lightscreen", - "tm:magiccoat", - "tm:magicroom", - "tm:mirrorcoat", - "tm:payback", - "tm:powerswap", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychocut", - "tm:psyshock", - "tm:recover", - "tm:reflect", - "tm:rest", - "tm:safeguard", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stickyweb", - "tm:storedpower", - "tm:strugglebug", - "tm:substitute", - "tm:supersonic", - "tm:terablast", - "tm:trick", - "tm:trickroom", - "tm:uturn", - "tm:wonderroom", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json index ea0e5aff11..c4927bf341 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json b/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json index 3b081fbad1..9396a4e649 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -148,107 +147,6 @@ "aspects": [ "antique" ], - "abilities": [ - "weakarmor", - "h:cursedbody" - ], - "eggGroups": [ - "mineral", - "amorphous" - ], - "baseStats": { - "hp": 60, - "attack": 65, - "defence": 65, - "special_attack": 134, - "special_defence": 114, - "speed": 70 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 178, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:teatime", - "1:strengthsap", - "1:astonish", - "1:withdraw", - "1:aromaticmist", - "1:megadrain", - "1:aromatherapy", - "18:protect", - "24:suckerpunch", - "30:sweetscent", - "36:gigadrain", - "42:nastyplot", - "48:shadowball", - "54:memento", - "60:shellsmash", - "66:curse", - "egg:allyswitch", - "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:astonish", - "tm:batonpass", - "tm:calmmind", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:endure", - "tm:facade", - "tm:foulplay", - "tm:gigadrain", - "tm:gigaimpact", - "tm:hex", - "tm:hyperbeam", - "tm:imprison", - "tm:lightscreen", - "tm:magicalleaf", - "tm:megadrain", - "tm:memento", - "tm:metronome", - "tm:nastyplot", - "tm:nightshade", - "tm:painsplit", - "tm:payback", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psyshock", - "tm:reflect", - "tm:rest", - "tm:selfdestruct", - "tm:shadowball", - "tm:shellsmash", - "tm:skillswap", - "tm:sleeptalk", - "tm:spite", - "tm:storedpower", - "tm:strengthsap", - "tm:substitute", - "tm:suckerpunch", - "tm:sweetscent", - "tm:teatime", - "tm:terablast", - "tm:trick", - "tm:trickroom", - "tm:willowisp", - "tm:withdraw", - "tm:wonderroom" - ], "preEvolution": "sinistea tea_authenticity=antique", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json b/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json index 8a156ddb93..7686a3d560 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json @@ -48,7 +48,6 @@ "height": 2.75, "fixed": false }, - "behaviour": {}, "moves": [ "1:twister", "1:visegrip", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json b/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json index b28e06412e..b87d5cb44a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json @@ -48,7 +48,6 @@ "height": 2.5, "fixed": false }, - "behaviour": {}, "moves": [ "1:thundershock", "1:rapidspin", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json index c61fcfc657..d786e0cff0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json @@ -48,7 +48,6 @@ "height": 2.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -186,142 +185,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "overgrow", - "h:grassysurge" - ], - "eggGroups": [ - "field", - "grass" - ], - "baseStats": { - "hp": 100, - "attack": 125, - "defence": 90, - "special_attack": 60, - "special_defence": 70, - "speed": 85 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 265, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:drumbeating", - "1:doublehit", - "1:grassyterrain", - "1:nobleroar", - "1:scratch", - "1:growl", - "1:branchpoke", - "1:taunt", - "12:razorleaf", - "19:screech", - "24:knockoff", - "30:slam", - "38:uproar", - "46:woodhammer", - "54:endeavor", - "62:boomburst", - "egg:fakeout", - "egg:growth", - "egg:hammerarm", - "egg:leechseed", - "egg:strength", - "egg:worryseed", - "tm:acrobatics", - "tm:assurance", - "tm:bodypress", - "tm:bodyslam", - "tm:boomburst", - "tm:branchpoke", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:darkestlariat", - "tm:doubleedge", - "tm:doublehit", - "tm:drainpunch", - "tm:drumbeating", - "tm:earthpower", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fakeout", - "tm:falseswipe", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:frenzyplant", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grasspledge", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growl", - "tm:growth", - "tm:hammerarm", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:knockoff", - "tm:leafstorm", - "tm:leechseed", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:megakick", - "tm:megapunch", - "tm:mudshot", - "tm:naturepower", - "tm:nobleroar", - "tm:protect", - "tm:razorleaf", - "tm:rest", - "tm:scaryface", - "tm:scratch", - "tm:screech", - "tm:seedbomb", - "tm:slam", - "tm:sleeptalk", - "tm:snarl", - "tm:solarbeam", - "tm:solarblade", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:trailblaze", - "tm:uproar", - "tm:uturn", - "tm:woodhammer", - "tm:workup", - "tm:worryseed" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json index 51baf71492..d3b7bbfffc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json index bb77d00a67..95212a486e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -150,111 +149,7 @@ "aspects": [ "gmax" ], - "abilities": [ - "sandspit", - "shedskin", - "h:sandveil" - ], - "eggGroups": [ - "field", - "dragon" - ], - "baseStats": { - "hp": 72, - "attack": 107, - "defence": 125, - "special_attack": 65, - "special_defence": 70, - "speed": 71 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 179, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:skullbash", - "1:wrap", - "1:sandattack", - "1:minimize", - "1:brutalswing", - "15:bulldoze", - "20:headbutt", - "25:glare", - "30:dig", - "35:sandstorm", - "42:slam", - "49:coil", - "51:sandtomb", - "egg:belch", - "egg:dragonrush", - "egg:lastresort", - "egg:mudslap", - "egg:poisontail", - "tm:belch", - "tm:bodypress", - "tm:bodyslam", - "tm:brutalswing", - "tm:bulldoze", - "tm:coil", - "tm:dig", - "tm:dragonrush", - "tm:drillrun", - "tm:earthpower", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:gigaimpact", - "tm:glare", - "tm:headbutt", - "tm:highhorsepower", - "tm:hurricane", - "tm:hyperbeam", - "tm:irondefense", - "tm:ironhead", - "tm:lastresort", - "tm:minimize", - "tm:mudshot", - "tm:mudslap", - "tm:outrage", - "tm:poisontail", - "tm:protect", - "tm:rest", - "tm:rockblast", - "tm:rockslide", - "tm:rocktomb", - "tm:sandattack", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaleshot", - "tm:scaryface", - "tm:scorchingsands", - "tm:screech", - "tm:skittersmack", - "tm:skullbash", - "tm:slam", - "tm:sleeptalk", - "tm:stealthrock", - "tm:stoneedge", - "tm:substitute", - "tm:takedown", - "tm:terablast", - "tm:thunderfang", - "tm:wrap", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json index 6b6448c95e..28fc182dda 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json @@ -49,7 +49,6 @@ "height": 1.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json b/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json index 2cf54c4af2..27e7ddbad7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json @@ -48,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json b/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json index 9c4a363495..ee508b9d24 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -147,95 +146,6 @@ "aspects": [ "antique" ], - "abilities": [ - "weakarmor", - "h:cursedbody" - ], - "eggGroups": [ - "mineral", - "amorphous" - ], - "baseStats": { - "hp": 40, - "attack": 45, - "defence": 45, - "special_attack": 74, - "special_defence": 54, - "speed": 50 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 62, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:astonish", - "1:withdraw", - "1:aromatherapy", - "6:aromaticmist", - "12:megadrain", - "24:suckerpunch", - "30:sweetscent", - "36:gigadrain", - "42:nastyplot", - "48:shadowball", - "54:memento", - "60:shellsmash", - "egg:allyswitch", - "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:astonish", - "tm:batonpass", - "tm:calmmind", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:endure", - "tm:facade", - "tm:foulplay", - "tm:gigadrain", - "tm:hex", - "tm:imprison", - "tm:magicalleaf", - "tm:megadrain", - "tm:memento", - "tm:metronome", - "tm:nastyplot", - "tm:nightshade", - "tm:payback", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psyshock", - "tm:rest", - "tm:shadowball", - "tm:shellsmash", - "tm:skillswap", - "tm:sleeptalk", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:suckerpunch", - "tm:sweetscent", - "tm:terablast", - "tm:trick", - "tm:trickroom", - "tm:willowisp", - "tm:withdraw", - "tm:wonderroom" - ], "evolutions": [ { "id": "sinistea_polteageistantique", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json index 01434947a9..eee7793304 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json @@ -1,7 +1,7 @@ { "implemented": true, "nationalPokedexNumber": 865, - "name": "Sirfetch’d", + "name": "Sirfetch\u00e2\u20ac\u2122d", "primaryType": "fighting", "maleRatio": 0.5, "height": 8, @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json b/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json index 6c92b3d418..7327cbeb41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json @@ -46,7 +46,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json b/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json index 74851d6229..ee5ab61965 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json @@ -47,7 +47,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:tackle", "1:tailwhip", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json index f39a7dfaab..bc68fe804f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json @@ -48,7 +48,6 @@ "height": 1.65, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json b/common/src/main/resources/data/cobblemon/species/generation8/toxel.json index 82951741b6..1a642707a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/toxel.json @@ -49,7 +49,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json index 3d9d628ce8..a93c7471d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -189,31 +188,6 @@ "minus", "h:technician" ], - "eggGroups": [ - "human_like" - ], - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 70, - "special_attack": 114, - "special_defence": 70, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 176, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:spark", "1:belch", @@ -339,145 +313,10 @@ "gmax" ], "aspects": [ - "amped-form", - "gmax" + "gmax", + "amped-form" ], - "abilities": [ - "punkrock", - "plus", - "h:technician" - ], - "eggGroups": [ - "human_like" - ], - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 70, - "special_attack": 114, - "special_defence": 70, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 176, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:spark", - "1:belch", - "1:tearfullook", - "1:nuzzle", - "1:growl", - "1:flail", - "1:acid", - "1:thundershock", - "1:acidspray", - "1:leer", - "1:nobleroar", - "4:charge", - "8:shockwave", - "12:scaryface", - "16:taunt", - "24:screech", - "28:swagger", - "32:toxic", - "36:discharge", - "40:poisonjab", - "44:overdrive", - "48:boomburst", - "52:shiftgear", - "egg:endeavor", - "egg:metalsound", - "tm:acid", - "tm:acidspray", - "tm:belch", - "tm:boomburst", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:discharge", - "tm:drainpunch", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firepunch", - "tm:flail", - "tm:fling", - "tm:gigaimpact", - "tm:growl", - "tm:gunkshot", - "tm:helpinghand", - "tm:hex", - "tm:hyperbeam", - "tm:hypervoice", - "tm:leer", - "tm:megakick", - "tm:megapunch", - "tm:metalsound", - "tm:metronome", - "tm:nobleroar", - "tm:nuzzle", - "tm:overdrive", - "tm:payback", - "tm:poisonjab", - "tm:poisontail", - "tm:poweruppunch", - "tm:protect", - "tm:psychicnoise", - "tm:raindance", - "tm:rest", - "tm:risingvoltage", - "tm:scaryface", - "tm:screech", - "tm:shiftgear", - "tm:shockwave", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snarl", - "tm:spark", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:tearfullook", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave", - "tm:toxic", - "tm:toxicspikes", - "tm:trailblaze", - "tm:uproar", - "tm:venoshock", - "tm:voltswitch", - "tm:wildcharge" - ], "evolutions": [], "battleOnly": true }, @@ -496,40 +335,15 @@ "gmax" ], "aspects": [ - "low_key-form", - "gmax" + "gmax", + "low_key-form" ], "abilities": [ "punkrock", "minus", "h:technician" ], - "eggGroups": [ - "human_like" - ], - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 70, - "special_attack": 114, - "special_defence": 70, - "speed": 75 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 176, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, "moves": [ "1:spark", "1:belch", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json b/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json index 395f5e8d6f..72597a67e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json @@ -50,7 +50,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:wickedblow", "1:suckerpunch", @@ -162,35 +161,6 @@ "aspects": [ "rapid_strike-style" ], - "abilities": [ - "unseenfist", - "h:unseenfist" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 100, - "attack": 130, - "defence": 100, - "special_attack": 63, - "special_defence": 60, - "speed": 97 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:surgingstrikes", "1:aquajet", @@ -297,130 +267,10 @@ "gmax" ], "aspects": [ - "single_strike-style", - "gmax" + "gmax", + "single_strike-style" ], - "abilities": [ - "unseenfist", - "h:unseenfist" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 100, - "attack": 130, - "defence": 100, - "special_attack": 63, - "special_defence": 60, - "speed": 97 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:wickedblow", - "1:suckerpunch", - "1:rocksmash", - "1:leer", - "1:endure", - "1:focusenergy", - "12:aerialace", - "16:scaryface", - "20:headbutt", - "24:brickbreak", - "28:detect", - "32:bulkup", - "36:ironhead", - "40:dynamicpunch", - "44:counter", - "48:closecombat", - "52:focuspunch", - "tm:acrobatics", - "tm:aerialace", - "tm:assurance", - "tm:aurasphere", - "tm:beatup", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:closecombat", - "tm:coaching", - "tm:counter", - "tm:crunch", - "tm:darkestlariat", - "tm:darkpulse", - "tm:detect", - "tm:dig", - "tm:doubleedge", - "tm:drainpunch", - "tm:dynamicpunch", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:firepunch", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:foulplay", - "tm:gigaimpact", - "tm:headbutt", - "tm:helpinghand", - "tm:icepunch", - "tm:irondefense", - "tm:ironhead", - "tm:lashout", - "tm:leer", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:megapunch", - "tm:metalclaw", - "tm:payback", - "tm:poisonjab", - "tm:protect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:scaryface", - "tm:sleeptalk", - "tm:snarl", - "tm:stoneedge", - "tm:substitute", - "tm:suckerpunch", - "tm:superpower", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:throatchop", - "tm:thunderpunch", - "tm:trailblaze", - "tm:uturn", - "tm:wickedblow", - "tm:workup", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true }, @@ -439,39 +289,10 @@ "gmax" ], "aspects": [ - "rapid_strike-style", - "gmax" + "gmax", + "rapid_strike-style" ], - "abilities": [ - "unseenfist", - "h:unseenfist" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 100, - "attack": 130, - "defence": 100, - "special_attack": 63, - "special_defence": 60, - "speed": 97 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, "moves": [ "1:surgingstrikes", "1:aquajet", diff --git a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json index db65623200..85c5e6ed5e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json @@ -52,7 +52,6 @@ "fixed": false }, "standingEyeHeight": 0.6, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json index 64318539d0..efb6de9b07 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json @@ -47,7 +47,6 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json index bd59da428c..f60f43ffed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json @@ -51,7 +51,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:sacredsword", "1:quickguard", @@ -149,13 +148,6 @@ "aspects": [ "crowned" ], - "abilities": [ - "intrepidsword", - "h:intrepidsword" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 92, "attack": 150, @@ -164,21 +156,7 @@ "special_defence": 115, "speed": 148 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 10, - "eggCycles": 120, - "baseFriendship": 0, - "dynamaxBlocked": true, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -187,83 +165,6 @@ } ] }, - "moves": [ - "1:sacredsword", - "1:quickguard", - "1:metalclaw", - "1:howl", - "1:quickattack", - "1:bite", - "11:slash", - "22:swordsdance", - "33:ironhead", - "44:nobleroar", - "55:crunch", - "66:moonblast", - "77:closecombat", - "88:gigaimpact", - "tm:agility", - "tm:airslash", - "tm:assurance", - "tm:bite", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:closecombat", - "tm:crunch", - "tm:dazzlinggleam", - "tm:dig", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:firefang", - "tm:flashcannon", - "tm:focusblast", - "tm:focusenergy", - "tm:gigaimpact", - "tm:helpinghand", - "tm:howl", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icefang", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:laserfocus", - "tm:metalclaw", - "tm:mistyterrain", - "tm:moonblast", - "tm:nobleroar", - "tm:playrough", - "tm:poisonjab", - "tm:protect", - "tm:psychicfangs", - "tm:psychocut", - "tm:quickattack", - "tm:quickguard", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:sacredsword", - "tm:scaryface", - "tm:slash", - "tm:sleeptalk", - "tm:snarl", - "tm:solarblade", - "tm:steelbeam", - "tm:substitute", - "tm:swift", - "tm:swordsdance", - "tm:tailslap", - "tm:takedown", - "tm:terablast", - "tm:thunderfang", - "tm:trailblaze", - "tm:wildcharge", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json index 70724bd5a8..d61002a57e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json @@ -51,7 +51,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "1:wideguard", "1:metalclaw", @@ -153,13 +152,6 @@ "aspects": [ "crowned" ], - "abilities": [ - "dauntlessshield", - "h:dauntlessshield" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 92, "attack": 120, @@ -168,21 +160,7 @@ "special_defence": 140, "speed": 128 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 10, - "eggCycles": 120, - "baseFriendship": 0, - "dynamaxBlocked": true, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -191,87 +169,6 @@ } ] }, - "moves": [ - "1:wideguard", - "1:metalclaw", - "1:howl", - "1:quickattack", - "1:bite", - "11:slash", - "22:irondefense", - "33:ironhead", - "44:metalburst", - "55:crunch", - "66:moonblast", - "77:closecombat", - "88:gigaimpact", - "tm:agility", - "tm:bite", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:closecombat", - "tm:coaching", - "tm:crunch", - "tm:dazzlinggleam", - "tm:dig", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:flashcannon", - "tm:focusblast", - "tm:focusenergy", - "tm:gigaimpact", - "tm:guardswap", - "tm:heavyslam", - "tm:helpinghand", - "tm:howl", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icefang", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:laserfocus", - "tm:lightscreen", - "tm:metalburst", - "tm:metalclaw", - "tm:moonblast", - "tm:payback", - "tm:playrough", - "tm:powerswap", - "tm:protect", - "tm:psychicfangs", - "tm:quickattack", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:roar", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:slash", - "tm:sleeptalk", - "tm:snarl", - "tm:solarbeam", - "tm:steelbeam", - "tm:stoneedge", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tailslap", - "tm:takedown", - "tm:terablast", - "tm:thunderfang", - "tm:trailblaze", - "tm:wideguard", - "tm:wildcharge", - "tm:workup" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zarude.json b/common/src/main/resources/data/cobblemon/species/generation8/zarude.json index 9dbe9e8e4a..11910b084a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zarude.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zarude.json @@ -49,7 +49,6 @@ "height": 3, "fixed": false }, - "behaviour": {}, "moves": [ "1:bind", "1:scratch", @@ -168,134 +167,6 @@ "aspects": [ "dada-cape" ], - "abilities": [ - "leafguard", - "h:leafguard" - ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 105, - "attack": 120, - "defence": 105, - "special_attack": 70, - "special_defence": 95, - "speed": 105 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "moves": [ - "1:bind", - "1:scratch", - "6:leer", - "12:vinewhip", - "18:growth", - "24:furyswipes", - "30:scaryface", - "36:grassknot", - "42:bite", - "48:uturn", - "54:swagger", - "60:energyball", - "66:synthesis", - "72:hammerarm", - "78:thrash", - "84:powerwhip", - "90:junglehealing", - "tm:acrobatics", - "tm:aerialace", - "tm:assurance", - "tm:bind", - "tm:bite", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:bulletseed", - "tm:closecombat", - "tm:crunch", - "tm:darkestlariat", - "tm:darkpulse", - "tm:dig", - "tm:doubleedge", - "tm:drainpunch", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fling", - "tm:focuspunch", - "tm:furyswipes", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growth", - "tm:hammerarm", - "tm:helpinghand", - "tm:hyperbeam", - "tm:hypervoice", - "tm:irontail", - "tm:junglehealing", - "tm:knockoff", - "tm:lashout", - "tm:leafstorm", - "tm:leer", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:megakick", - "tm:megapunch", - "tm:mudshot", - "tm:nastyplot", - "tm:payback", - "tm:petalblizzard", - "tm:powerwhip", - "tm:protect", - "tm:rest", - "tm:revenge", - "tm:roar", - "tm:rockslide", - "tm:rocktomb", - "tm:scaryface", - "tm:scratch", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snarl", - "tm:solarbeam", - "tm:solarblade", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thrash", - "tm:throatchop", - "tm:trailblaze", - "tm:uturn", - "tm:vinewhip" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json b/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json index df88b740b4..3e16212a89 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json @@ -176,14 +176,6 @@ "aspects": [ "female" ], - "abilities": [ - "swiftswim", - "adaptability", - "h:moldbreaker" - ], - "eggGroups": [ - "water_2" - ], "baseStats": { "hp": 120, "attack": 92, @@ -192,113 +184,6 @@ "special_defence": 75, "speed": 78 }, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 265, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": { - "moving": { - "canLook": false, - "walk": { - "avoidsLand": true - }, - "swim": { - "swimSpeed": 0.1, - "canBreatheUnderwater": true, - "canSwimInWater": true, - "canSwimInLava": false - } - } - }, - "moves": [ - "1:shadowball", - "1:tailwhip", - "1:watergun", - "1:phantomforce", - "4:tackle", - "8:flail", - "12:aquajet", - "16:bite", - "20:scaryface", - "24:headbutt", - "28:soak", - "32:crunch", - "36:takedown", - "40:uproar", - "44:wavecrash", - "48:thrash", - "52:doubleedge", - "56:headsmash", - "egg:endeavor", - "egg:lastrespects", - "tm:agility", - "tm:aquajet", - "tm:aquatail", - "tm:bite", - "tm:blizzard", - "tm:chillingwater", - "tm:confuseray", - "tm:crunch", - "tm:doubleedge", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flail", - "tm:flipturn", - "tm:gigaimpact", - "tm:headbutt", - "tm:headsmash", - "tm:hex", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icywind", - "tm:lastrespects", - "tm:liquidation", - "tm:muddywater", - "tm:mudshot", - "tm:nightshade", - "tm:ominouswind", - "tm:outrage", - "tm:painsplit", - "tm:phantomforce", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:scaleshot", - "tm:scaryface", - "tm:shadowball", - "tm:sleeptalk", - "tm:snowscape", - "tm:soak", - "tm:spite", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:tackle", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thrash", - "tm:uproar", - "tm:waterfall", - "tm:watergun", - "tm:waterpulse", - "tm:wavecrash", - "tm:whirlpool", - "tm:zenheadbutt" - ], "preEvolution": "basculin fish_stripes=white", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json b/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json index a1fbf2eb0d..265e585b12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json @@ -44,7 +44,6 @@ "catchRate": 3, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:astonish", "1:fairywind", @@ -140,9 +139,6 @@ "overcoat", "h:overcoat" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 74, "attack": 115, @@ -151,92 +147,6 @@ "special_defence": 100, "speed": 46 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 116, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:astonish", - "1:fairywind", - "5:torment", - "10:flatter", - "15:twister", - "20:drainingkiss", - "25:irondefense", - "30:imprison", - "35:mysticalfire", - "40:dazzlinggleam", - "45:extrasensory", - "50:uproar", - "55:superpower", - "60:healingwish", - "65:moonblast", - "70:outrage", - "75:springtidestorm", - "tm:agility", - "tm:alluringvoice", - "tm:astonish", - "tm:bodyslam", - "tm:calmmind", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:earthpower", - "tm:endure", - "tm:extrasensory", - "tm:facade", - "tm:fairywind", - "tm:flatter", - "tm:fly", - "tm:focusblast", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:healingwish", - "tm:hyperbeam", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:moonblast", - "tm:mysticalfire", - "tm:outrage", - "tm:playrough", - "tm:powershift", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:rocksmash", - "tm:scaryface", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:springtidestorm", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:torment", - "tm:twister", - "tm:uproar", - "tm:weatherball", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json b/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json index ff908e34eb..2247cd4364 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json @@ -51,7 +51,6 @@ "height": 2.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json b/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json index 08405a7083..846c4f23fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json @@ -49,7 +49,6 @@ "height": 2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 8, "entries": [ @@ -215,9 +214,6 @@ "mindseye", "h:mindseye" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 113, "attack": 70, @@ -235,11 +231,7 @@ "speed": 0 }, "baseExperienceYield": 278, - "experienceGroup": "medium_fast", "catchRate": 5, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:scratch", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json index e93dfa57c7..9cc8172481 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json @@ -41,7 +41,6 @@ "catchRate": 45, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json b/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json index b26b7b9b75..86638129c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json @@ -43,7 +43,6 @@ "catchRate": 10, "eggCycles": 30, "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:electroshot", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json index 495eb9a9c0..7811db2d3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json @@ -42,7 +42,6 @@ "catchRate": 25, "eggCycles": 40, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json index 0ddf0e4706..986cd57818 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json @@ -43,7 +43,6 @@ "catchRate": 10, "eggCycles": 40, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json b/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json index 3875e80aa8..645535c686 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json @@ -42,7 +42,6 @@ "catchRate": 25, "eggCycles": 35, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json b/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json index fc60eff860..faebfc29d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json @@ -41,7 +41,6 @@ "catchRate": 45, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json b/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json index 74c66a29df..87c8789570 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json @@ -41,7 +41,6 @@ "catchRate": 190, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json b/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json index 194a680f10..04ea2f0e1e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json @@ -42,7 +42,6 @@ "catchRate": 50, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:absorb", "1:growth", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json b/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json index b6fcd55b8e..403521eedd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json @@ -41,7 +41,6 @@ "catchRate": 190, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json b/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json index e82bc13023..90b621c32e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json @@ -42,7 +42,6 @@ "catchRate": 6, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:spite", "1:powdersnow", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json b/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json index 08df9277ea..e2b4cdfcdd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json @@ -42,7 +42,6 @@ "catchRate": 6, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:ember", "1:spite", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json index de78bfb7fe..4600c5b440 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json @@ -41,7 +41,6 @@ "catchRate": 190, "eggCycles": 30, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json b/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json index fbf3096321..f46b66c2e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json @@ -43,7 +43,6 @@ "catchRate": 45, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:doublehit", "1:withdraw", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json index 7dfeb26313..011af3563b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json @@ -41,7 +41,6 @@ "catchRate": 120, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json b/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json index 27fbbe60c4..34abecff75 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json @@ -43,7 +43,6 @@ "catchRate": 45, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -203,164 +202,6 @@ "aspects": [ "three-segment-form" ], - "abilities": [ - "serenegrace", - "runaway", - "h:rattled" - ], - "eggGroups": [ - "field" - ], - "baseStats": { - "hp": 125, - "attack": 100, - "defence": 80, - "special_attack": 85, - "special_defence": 75, - "speed": 55 - }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 182, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:defensecurl", - "1:flail", - "1:rage", - "1:pursuit", - "4:mudslap", - "8:rollout", - "12:glare", - "16:screech", - "20:ancientpower", - "24:drillrun", - "28:yawn", - "32:hyperdrill", - "36:roost", - "40:dragonrush", - "44:coil", - "48:doubleedge", - "52:endeavor", - "56:hurricane", - "62:boomburst", - "egg:aquatail", - "egg:astonish", - "egg:bide", - "egg:bite", - "egg:curse", - "egg:headbutt", - "egg:lastresort", - "egg:secretpower", - "egg:snore", - "egg:trumpcard", - "tm:agility", - "tm:airslash", - "tm:amnesia", - "tm:ancientpower", - "tm:aquatail", - "tm:astonish", - "tm:batonpass", - "tm:bide", - "tm:bite", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:boomburst", - "tm:breakingswipe", - "tm:bulldoze", - "tm:calmmind", - "tm:chillingwater", - "tm:coil", - "tm:curse", - "tm:defensecurl", - "tm:dig", - "tm:doubleedge", - "tm:dragonrush", - "tm:dragontail", - "tm:drillrun", - "tm:dualwingbeat", - "tm:earthpower", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:flail", - "tm:flamethrower", - "tm:gigaimpact", - "tm:glare", - "tm:gyroball", - "tm:headbutt", - "tm:heavyslam", - "tm:helpinghand", - "tm:hex", - "tm:hurricane", - "tm:hyperbeam", - "tm:hyperdrill", - "tm:hypervoice", - "tm:icebeam", - "tm:icespinner", - "tm:lastresort", - "tm:lunge", - "tm:mudshot", - "tm:mudslap", - "tm:outrage", - "tm:painsplit", - "tm:poisonjab", - "tm:poisontail", - "tm:pounce", - "tm:protect", - "tm:psychup", - "tm:pursuit", - "tm:rage", - "tm:raindance", - "tm:rest", - "tm:rockslide", - "tm:rocktomb", - "tm:rollout", - "tm:roost", - "tm:sandstorm", - "tm:scaleshot", - "tm:scaryface", - "tm:screech", - "tm:secretpower", - "tm:shadowball", - "tm:skittersmack", - "tm:sleeptalk", - "tm:smartstrike", - "tm:snore", - "tm:solarbeam", - "tm:spite", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:toxic", - "tm:trumpcard", - "tm:uproar", - "tm:wildcharge", - "tm:yawn", - "tm:zenheadbutt" - ], "preEvolution": "dunsparce", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json b/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json index 24019e5468..da2680f870 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json @@ -49,7 +49,6 @@ "height": 4.23, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json b/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json index 0469fe3d14..e00bceb488 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json @@ -42,7 +42,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 0, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json b/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json index 5068e8d97f..a162967a3b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json @@ -42,7 +42,6 @@ "catchRate": 30, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json b/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json index b6b140cfa3..360bef8468 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json @@ -42,7 +42,6 @@ "catchRate": 45, "eggCycles": 40, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json b/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json index fdf6ac9f3c..d287aca427 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json @@ -277,9 +277,6 @@ "runaway", "h:runaway" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 45, "attack": 30, @@ -288,19 +285,6 @@ "special_defence": 45, "speed": 80 }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 60, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 50, - "baseFriendship": 50, "shoulderMountable": true, "baseScale": 0.7, "hitbox": { @@ -317,7 +301,9 @@ "swimSpeed": 0.3, "canSwimInWater": false, "canBreatheUnderwater": true - } + }, + "wanderChance": 500, + "canLook": false }, "resting": { "canSleep": true, @@ -332,28 +318,6 @@ } ] }, - "moves": [ - "1:astonish", - "1:tackle", - "tm:astonish", - "tm:confuseray", - "tm:endure", - "tm:hex", - "tm:lightscreen", - "tm:nastyplot", - "tm:nightshade", - "tm:powergem", - "tm:protect", - "tm:reflect", - "tm:rest", - "tm:shadowball", - "tm:sleeptalk", - "tm:substitute", - "tm:tackle", - "tm:takedown", - "tm:terablast", - "tm:thief" - ], "evolutions": [ { "id": "gimmighoul_gholdengo", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json b/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json index 656d342ecc..26c83b6b8e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json @@ -42,7 +42,6 @@ "catchRate": 10, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:stomp", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json b/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json index 1a39fbbc7b..4e9d6027a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json @@ -42,7 +42,6 @@ "catchRate": 30, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:hornattack", "1:defensecurl", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/greavard.json b/common/src/main/resources/data/cobblemon/species/generation9/greavard.json index 6603dd9473..c1d5e80870 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/greavard.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/greavard.json @@ -40,7 +40,6 @@ "catchRate": 120, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json b/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json index 6b6360a5f4..113859046c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json @@ -40,7 +40,6 @@ "catchRate": 60, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 6, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json b/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json index 1648c93f4b..c4768a0a1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json @@ -43,7 +43,6 @@ "catchRate": 10, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:ficklebeam", "1:withdraw", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json b/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json index 5c8a938d35..4de8c7843b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json @@ -42,7 +42,6 @@ "catchRate": 10, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:hornattack", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json b/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json index fe1722d231..dd08e952fd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json @@ -42,7 +42,6 @@ "catchRate": 50, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:present", "1:electricterrain", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json b/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json index d3029f144c..274ca9f086 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json @@ -42,7 +42,6 @@ "catchRate": 10, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:leer", "1:electricterrain", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json b/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json index d8a4e30ef9..a670d497af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json @@ -42,7 +42,6 @@ "catchRate": 50, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:sandattack", "1:tackle", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json b/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json index c1af3b3b69..79a852d5d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json @@ -42,7 +42,6 @@ "catchRate": 30, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:electricterrain", "1:workup", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json b/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json index 68ab0f6c73..33dda1b304 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json @@ -42,7 +42,6 @@ "catchRate": 30, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:gust", "1:whirlwind", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json b/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json index efa3b84802..10c4c2683f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json @@ -42,7 +42,6 @@ "catchRate": 30, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:rockthrow", "1:firefang", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json b/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json index 2652704ad4..b91fb45845 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json @@ -42,7 +42,6 @@ "catchRate": 30, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:hornattack", "1:defensecurl", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json b/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json index 72e94d12a8..8aa0d57af5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json @@ -42,7 +42,6 @@ "catchRate": 10, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:disable", "1:doubleteam", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json index 310bd11b7a..90f98ecef3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json @@ -42,7 +42,6 @@ "catchRate": 25, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json b/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json index f546ddb737..5971bce9ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json @@ -43,7 +43,6 @@ "catchRate": 3, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:sunnyday", "1:breakingswipe", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json index f7357ce3e9..50f0ee1896 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json @@ -41,7 +41,6 @@ "catchRate": 30, "eggCycles": 20, "baseFriendship": 0, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json index aa139d41f6..19ecd771e2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json @@ -48,7 +48,6 @@ "height": 1.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 5, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json b/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json index d3495055bf..2bdd1b2854 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json @@ -48,7 +48,6 @@ "height": 0.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json index a0e2c4af89..ec79cd6934 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json @@ -167,115 +167,6 @@ "aspects": [ "maushold-family-four" ], - "abilities": [ - "friendguard", - "cheekpouch", - "h:technician" - ], - "eggGroups": [ - "field", - "fairy" - ], - "baseStats": { - "hp": 74, - "attack": 75, - "defence": 70, - "special_attack": 65, - "special_defence": 75, - "speed": 111 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "baseExperienceYield": 165, - "experienceGroup": "fast", - "catchRate": 75, - "eggCycles": 10, - "baseFriendship": 50, - "moves": [ - "1:pound", - "1:followme", - "1:babydolleyes", - "1:tidyup", - "5:echoedvoice", - "8:helpinghand", - "11:superfang", - "14:doublehit", - "18:bulletseed", - "22:encore", - "29:playrough", - "33:hypervoice", - "37:charm", - "41:beatup", - "46:copycat", - "53:populationbomb", - "egg:afteryou", - "egg:batonpass", - "egg:bite", - "egg:feint", - "egg:switcheroo", - "egg:tickle", - "tm:aerialace", - "tm:afteryou", - "tm:agility", - "tm:babydolleyes", - "tm:batonpass", - "tm:beatup", - "tm:bite", - "tm:bulletseed", - "tm:charm", - "tm:chillingwater", - "tm:copycat", - "tm:crunch", - "tm:dig", - "tm:doubleedge", - "tm:doublehit", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:feint", - "tm:followme", - "tm:gigaimpact", - "tm:grassknot", - "tm:helpinghand", - "tm:hyperbeam", - "tm:hypervoice", - "tm:lowkick", - "tm:lowsweep", - "tm:mudshot", - "tm:mudslap", - "tm:playrough", - "tm:populationbomb", - "tm:pound", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:seedbomb", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swift", - "tm:switcheroo", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thunderwave", - "tm:tickle", - "tm:tidyup", - "tm:trailblaze", - "tm:uturn", - "tm:waterpulse" - ], "preEvolution": "tandemaus", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json b/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json index ec6a6d00ef..343d1a81fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json @@ -43,7 +43,6 @@ "catchRate": 3, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:thundershock", "1:dragonbreath", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json b/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json index 7459638837..1a409f599a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json @@ -42,7 +42,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:scratch", "1:confusion", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/nymble.json b/common/src/main/resources/data/cobblemon/species/generation9/nymble.json index 71767ec65c..edee6d9c57 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/nymble.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/nymble.json @@ -40,7 +40,6 @@ "catchRate": 190, "eggCycles": 20, "baseFriendship": 20, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json b/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json index 2f66a4f6e4..61093c318e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json @@ -43,7 +43,6 @@ "catchRate": 5, "eggCycles": 10, "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:vinewhip", "1:leechseed", @@ -150,114 +149,7 @@ "waterabsorb", "h:waterabsorb" ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 5, "eggCycles": 5, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:vinewhip", - "1:leechseed", - "1:quickattack", - "1:followme", - "1:doublekick", - "1:counter", - "1:retaliate", - "1:hornleech", - "6:focusenergy", - "12:growth", - "18:slam", - "24:lowsweep", - "30:ivycudgel", - "36:throatchop", - "42:synthesis", - "48:spikyshield", - "54:powerwhip", - "60:superpower", - "66:woodhammer", - "tm:brickbreak", - "tm:bulletseed", - "tm:charm", - "tm:counter", - "tm:doublekick", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusenergy", - "tm:followme", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growth", - "tm:helpinghand", - "tm:hornleech", - "tm:ivycudgel", - "tm:knockoff", - "tm:lashout", - "tm:leafstorm", - "tm:leechseed", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:playrough", - "tm:powerwhip", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:slam", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:spikes", - "tm:spikyshield", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:throatchop", - "tm:trailblaze", - "tm:uturn", - "tm:vinewhip", - "tm:woodhammer", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -282,114 +174,7 @@ "moldbreaker", "h:moldbreaker" ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 5, "eggCycles": 5, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:vinewhip", - "1:leechseed", - "1:quickattack", - "1:followme", - "1:doublekick", - "1:counter", - "1:retaliate", - "1:hornleech", - "6:focusenergy", - "12:growth", - "18:slam", - "24:lowsweep", - "30:ivycudgel", - "36:throatchop", - "42:synthesis", - "48:spikyshield", - "54:powerwhip", - "60:superpower", - "66:woodhammer", - "tm:brickbreak", - "tm:bulletseed", - "tm:charm", - "tm:counter", - "tm:doublekick", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusenergy", - "tm:followme", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growth", - "tm:helpinghand", - "tm:hornleech", - "tm:ivycudgel", - "tm:knockoff", - "tm:lashout", - "tm:leafstorm", - "tm:leechseed", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:playrough", - "tm:powerwhip", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:slam", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:spikes", - "tm:spikyshield", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:throatchop", - "tm:trailblaze", - "tm:uturn", - "tm:vinewhip", - "tm:woodhammer", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -414,114 +199,7 @@ "sturdy", "h:sturdy" ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 5, "eggCycles": 5, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:vinewhip", - "1:leechseed", - "1:quickattack", - "1:followme", - "1:doublekick", - "1:counter", - "1:retaliate", - "1:hornleech", - "6:focusenergy", - "12:growth", - "18:slam", - "24:lowsweep", - "30:ivycudgel", - "36:throatchop", - "42:synthesis", - "48:spikyshield", - "54:powerwhip", - "60:superpower", - "66:woodhammer", - "tm:brickbreak", - "tm:bulletseed", - "tm:charm", - "tm:counter", - "tm:doublekick", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusenergy", - "tm:followme", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growth", - "tm:helpinghand", - "tm:hornleech", - "tm:ivycudgel", - "tm:knockoff", - "tm:lashout", - "tm:leafstorm", - "tm:leechseed", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:playrough", - "tm:powerwhip", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:slam", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:spikes", - "tm:spikyshield", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:throatchop", - "tm:trailblaze", - "tm:uturn", - "tm:vinewhip", - "tm:woodhammer", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -539,122 +217,15 @@ "legendary" ], "aspects": [ - "teal-mask", - "embody-aspect" + "embody-aspect", + "teal-mask" ], "abilities": [ "embodyaspectteal", "h:embodyaspectteal" ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 5, "eggCycles": 5, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:vinewhip", - "1:leechseed", - "1:quickattack", - "1:followme", - "1:doublekick", - "1:counter", - "1:retaliate", - "1:hornleech", - "6:focusenergy", - "12:growth", - "18:slam", - "24:lowsweep", - "30:ivycudgel", - "36:throatchop", - "42:synthesis", - "48:spikyshield", - "54:powerwhip", - "60:superpower", - "66:woodhammer", - "tm:brickbreak", - "tm:bulletseed", - "tm:charm", - "tm:counter", - "tm:doublekick", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusenergy", - "tm:followme", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growth", - "tm:helpinghand", - "tm:hornleech", - "tm:ivycudgel", - "tm:knockoff", - "tm:lashout", - "tm:leafstorm", - "tm:leechseed", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:playrough", - "tm:powerwhip", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:slam", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:spikes", - "tm:spikyshield", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:throatchop", - "tm:trailblaze", - "tm:uturn", - "tm:vinewhip", - "tm:woodhammer", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -673,122 +244,15 @@ "legendary" ], "aspects": [ - "wellspring-mask", - "embody-aspect" + "embody-aspect", + "wellspring-mask" ], "abilities": [ "embodyaspectwellspring", "h:embodyaspectwellspring" ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 5, "eggCycles": 5, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:vinewhip", - "1:leechseed", - "1:quickattack", - "1:followme", - "1:doublekick", - "1:counter", - "1:retaliate", - "1:hornleech", - "6:focusenergy", - "12:growth", - "18:slam", - "24:lowsweep", - "30:ivycudgel", - "36:throatchop", - "42:synthesis", - "48:spikyshield", - "54:powerwhip", - "60:superpower", - "66:woodhammer", - "tm:brickbreak", - "tm:bulletseed", - "tm:charm", - "tm:counter", - "tm:doublekick", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusenergy", - "tm:followme", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growth", - "tm:helpinghand", - "tm:hornleech", - "tm:ivycudgel", - "tm:knockoff", - "tm:lashout", - "tm:leafstorm", - "tm:leechseed", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:playrough", - "tm:powerwhip", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:slam", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:spikes", - "tm:spikyshield", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:throatchop", - "tm:trailblaze", - "tm:uturn", - "tm:vinewhip", - "tm:woodhammer", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -807,122 +271,15 @@ "legendary" ], "aspects": [ - "hearthflame-mask", - "embody-aspect" + "embody-aspect", + "hearthflame-mask" ], "abilities": [ "embodyaspecthearthflame", "h:embodyaspecthearthflame" ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 5, "eggCycles": 5, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:vinewhip", - "1:leechseed", - "1:quickattack", - "1:followme", - "1:doublekick", - "1:counter", - "1:retaliate", - "1:hornleech", - "6:focusenergy", - "12:growth", - "18:slam", - "24:lowsweep", - "30:ivycudgel", - "36:throatchop", - "42:synthesis", - "48:spikyshield", - "54:powerwhip", - "60:superpower", - "66:woodhammer", - "tm:brickbreak", - "tm:bulletseed", - "tm:charm", - "tm:counter", - "tm:doublekick", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusenergy", - "tm:followme", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growth", - "tm:helpinghand", - "tm:hornleech", - "tm:ivycudgel", - "tm:knockoff", - "tm:lashout", - "tm:leafstorm", - "tm:leechseed", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:playrough", - "tm:powerwhip", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:slam", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:spikes", - "tm:spikyshield", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:throatchop", - "tm:trailblaze", - "tm:uturn", - "tm:vinewhip", - "tm:woodhammer", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false }, @@ -941,122 +298,15 @@ "legendary" ], "aspects": [ - "cornerstone-mask", - "embody-aspect" + "embody-aspect", + "cornerstone-mask" ], "abilities": [ "embodyaspectcornerstone", "h:embodyaspectcornerstone" ], - "eggGroups": [ - "undiscovered" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 275, - "experienceGroup": "slow", - "catchRate": 5, "eggCycles": 5, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:vinewhip", - "1:leechseed", - "1:quickattack", - "1:followme", - "1:doublekick", - "1:counter", - "1:retaliate", - "1:hornleech", - "6:focusenergy", - "12:growth", - "18:slam", - "24:lowsweep", - "30:ivycudgel", - "36:throatchop", - "42:synthesis", - "48:spikyshield", - "54:powerwhip", - "60:superpower", - "66:woodhammer", - "tm:brickbreak", - "tm:bulletseed", - "tm:charm", - "tm:counter", - "tm:doublekick", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusenergy", - "tm:followme", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:growth", - "tm:helpinghand", - "tm:hornleech", - "tm:ivycudgel", - "tm:knockoff", - "tm:lashout", - "tm:leafstorm", - "tm:leechseed", - "tm:lowkick", - "tm:lowsweep", - "tm:magicalleaf", - "tm:playrough", - "tm:powerwhip", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:reversal", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:slam", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:spikes", - "tm:spikyshield", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swordsdance", - "tm:synthesis", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:throatchop", - "tm:trailblaze", - "tm:uturn", - "tm:vinewhip", - "tm:woodhammer", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json index 30101390f4..bb89a34850 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json @@ -50,7 +50,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ @@ -160,9 +159,6 @@ "gluttony", "h:thickfat" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 115, "attack": 90, @@ -171,19 +167,6 @@ "special_defence": 90, "speed": 65 }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 171, - "experienceGroup": "medium_fast", - "catchRate": 100, - "eggCycles": 15, - "baseFriendship": 50, "moves": [ "1:tackle", "1:tailwhip", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json b/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json index 7f5132725f..ea92ebbc76 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json @@ -42,7 +42,6 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:bite", "1:lowkick", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json b/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json index 0832bd3829..f054a0f366 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json @@ -40,7 +40,6 @@ "catchRate": 25, "eggCycles": 35, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/palafin.json b/common/src/main/resources/data/cobblemon/species/generation9/palafin.json index a91421864d..e466111c71 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/palafin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/palafin.json @@ -181,14 +181,6 @@ "aspects": [ "hero-form" ], - "abilities": [ - "zerotohero", - "h:zerotohero" - ], - "eggGroups": [ - "field", - "water_2" - ], "baseStats": { "hp": 100, "attack": 160, @@ -197,20 +189,7 @@ "special_defence": 87, "speed": 100 }, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, "baseExperienceYield": 228, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 40, - "baseFriendship": 50, - "baseScale": 0.85, "hitbox": { "width": 1.2, "height": 2.5, @@ -218,11 +197,15 @@ }, "behaviour": { "moving": { + "canLook": false, + "walk": { + "avoidsLand": true + }, "swim": { - "canSwimInWater": true, - "canSwimInLava": false, + "swimSpeed": "0.2", "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canSwimInWater": true, + "canSwimInLava": false } } }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json index 2ce171d3ab..83689543bf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json @@ -41,7 +41,6 @@ "catchRate": 190, "eggCycles": 15, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json index c02b335b14..24f97cdfad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json @@ -42,7 +42,6 @@ "catchRate": 80, "eggCycles": 15, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json index a5c061232b..3119b64931 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json @@ -42,7 +42,6 @@ "catchRate": 45, "eggCycles": 15, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json index 094c3532d7..ce9b09f063 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json @@ -42,7 +42,6 @@ "catchRate": 3, "eggCycles": 20, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:smog", "1:poisongas", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json b/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json index 725290ae5a..f994432068 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json @@ -44,7 +44,6 @@ "catchRate": 120, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -137,89 +136,6 @@ "aspects": [ "artisan" ], - "abilities": [ - "hospitality", - "h:heatproof" - ], - "eggGroups": [ - "mineral", - "amorphous" - ], - "baseStats": { - "hp": 40, - "attack": 45, - "defence": 45, - "special_attack": 74, - "special_defence": 54, - "speed": 50 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 62, - "experienceGroup": "medium_fast", - "catchRate": 120, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:stunspore", - "1:withdraw", - "1:astonish", - "6:absorb", - "12:lifedew", - "18:foulplay", - "24:megadrain", - "30:hex", - "36:ragepowder", - "42:gigadrain", - "48:shadowball", - "54:memento", - "60:leafstorm", - "tm:absorb", - "tm:astonish", - "tm:calmmind", - "tm:curse", - "tm:endure", - "tm:energyball", - "tm:foulplay", - "tm:gigadrain", - "tm:grassyterrain", - "tm:hex", - "tm:imprison", - "tm:irondefense", - "tm:leafstorm", - "tm:lifedew", - "tm:magicalleaf", - "tm:megadrain", - "tm:memento", - "tm:nastyplot", - "tm:nightshade", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psychup", - "tm:ragepowder", - "tm:reflect", - "tm:rest", - "tm:scald", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:spite", - "tm:stunspore", - "tm:substitute", - "tm:terablast", - "tm:trickroom", - "tm:uproar", - "tm:withdraw" - ], "evolutions": [ { "id": "poltchageist_sinistchamasterpiece", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json b/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json index 6504c355c1..3ce57d9581 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json @@ -41,7 +41,6 @@ "catchRate": 45, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json b/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json index ea51b781eb..5116f2623b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json @@ -42,7 +42,6 @@ "catchRate": 10, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:twister", "1:sunnyday", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/rellor.json b/common/src/main/resources/data/cobblemon/species/generation9/rellor.json index 50e7f87fd2..f41e3c2ce9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/rellor.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/rellor.json @@ -40,7 +40,6 @@ "catchRate": 190, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json b/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json index 258fa03e45..10a9ebb86a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json @@ -42,7 +42,6 @@ "catchRate": 10, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:dragonbreath", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json b/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json index fb8c83ef6f..55bf3eb508 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json @@ -42,7 +42,6 @@ "catchRate": 30, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:thunderwave", "1:electricterrain", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json b/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json index f7986fe417..078ad2ee22 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json @@ -42,7 +42,6 @@ "catchRate": 75, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json b/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json index 6ed9785292..8fcbcc1fd8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json @@ -42,7 +42,6 @@ "catchRate": 50, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:pound", "1:sing", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json index db47d7f67b..06f3f294b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json @@ -44,7 +44,6 @@ "catchRate": 60, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -130,93 +129,6 @@ "aspects": [ "masterpiece" ], - "abilities": [ - "hospitality", - "h:heatproof" - ], - "eggGroups": [ - "mineral", - "amorphous" - ], - "baseStats": { - "hp": 71, - "attack": 60, - "defence": 106, - "special_attack": 121, - "special_defence": 80, - "speed": 70 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 178, - "experienceGroup": "medium_fast", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:matchagotcha", - "1:stunspore", - "1:withdraw", - "1:astonish", - "6:absorb", - "12:lifedew", - "18:foulplay", - "24:megadrain", - "30:hex", - "36:ragepowder", - "42:strengthsap", - "48:shadowball", - "54:memento", - "60:leafstorm", - "tm:absorb", - "tm:astonish", - "tm:calmmind", - "tm:curse", - "tm:endure", - "tm:energyball", - "tm:foulplay", - "tm:gigadrain", - "tm:grassyterrain", - "tm:hex", - "tm:hyperbeam", - "tm:imprison", - "tm:irondefense", - "tm:leafstorm", - "tm:lifedew", - "tm:magicalleaf", - "tm:matchagotcha", - "tm:megadrain", - "tm:memento", - "tm:nastyplot", - "tm:nightshade", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psychup", - "tm:ragepowder", - "tm:reflect", - "tm:rest", - "tm:scald", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:spite", - "tm:strengthsap", - "tm:stunspore", - "tm:substitute", - "tm:terablast", - "tm:trickroom", - "tm:uproar", - "tm:withdraw" - ], "preEvolution": "poltchageist matcha_authenticity=artisan", "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json b/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json index c380c7e080..1c2f1658bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json @@ -42,7 +42,6 @@ "catchRate": 30, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:gust", "1:ember", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json b/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json index eec08961d1..02e8c03a2e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json @@ -41,7 +41,6 @@ "catchRate": 255, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/spidops.json b/common/src/main/resources/data/cobblemon/species/generation9/spidops.json index d4cf454560..30529d1bbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/spidops.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/spidops.json @@ -40,7 +40,6 @@ "catchRate": 120, "eggCycles": 15, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 4, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json index d51fae79f9..489221c7a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json @@ -162,105 +162,6 @@ "aspects": [ "squawkabilly-color-blue" ], - "abilities": [ - "intimidate", - "hustle", - "h:guts" - ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 82, - "attack": 96, - "defence": 51, - "special_attack": 45, - "special_defence": 51, - "speed": 92 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 146, - "experienceGroup": "erratic", - "catchRate": 190, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:growl", - "1:peck", - "1:mimic", - "6:quickattack", - "10:torment", - "13:aerialace", - "17:furyattack", - "20:taunt", - "24:uproar", - "27:copycat", - "30:fly", - "34:facade", - "38:swagger", - "42:bravebird", - "47:roost", - "52:reversal", - "egg:doubleedge", - "egg:finalgambit", - "egg:flatter", - "egg:partingshot", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:bravebird", - "tm:copycat", - "tm:doubleedge", - "tm:dualwingbeat", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:featherdance", - "tm:finalgambit", - "tm:flatter", - "tm:fly", - "tm:foulplay", - "tm:furyattack", - "tm:gigaimpact", - "tm:growl", - "tm:heatwave", - "tm:helpinghand", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:lashout", - "tm:mimic", - "tm:partingshot", - "tm:peck", - "tm:pounce", - "tm:protect", - "tm:quickattack", - "tm:rest", - "tm:reversal", - "tm:roost", - "tm:scaryface", - "tm:sleeptalk", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:torment", - "tm:uproar", - "tm:uturn" - ], "evolutions": [], "battleOnly": false }, @@ -285,100 +186,6 @@ "hustle", "h:sheerforce" ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 82, - "attack": 96, - "defence": 51, - "special_attack": 45, - "special_defence": 51, - "speed": 92 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 146, - "experienceGroup": "erratic", - "catchRate": 190, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:growl", - "1:peck", - "1:mimic", - "6:quickattack", - "10:torment", - "13:aerialace", - "17:furyattack", - "20:taunt", - "24:uproar", - "27:copycat", - "30:fly", - "34:facade", - "38:swagger", - "42:bravebird", - "47:roost", - "52:reversal", - "egg:doubleedge", - "egg:finalgambit", - "egg:flatter", - "egg:partingshot", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:bravebird", - "tm:copycat", - "tm:doubleedge", - "tm:dualwingbeat", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:featherdance", - "tm:finalgambit", - "tm:flatter", - "tm:fly", - "tm:foulplay", - "tm:furyattack", - "tm:gigaimpact", - "tm:growl", - "tm:heatwave", - "tm:helpinghand", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:lashout", - "tm:mimic", - "tm:partingshot", - "tm:peck", - "tm:pounce", - "tm:protect", - "tm:quickattack", - "tm:rest", - "tm:reversal", - "tm:roost", - "tm:scaryface", - "tm:sleeptalk", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:torment", - "tm:uproar", - "tm:uturn" - ], "evolutions": [], "battleOnly": false }, @@ -403,100 +210,6 @@ "hustle", "h:sheerforce" ], - "eggGroups": [ - "flying" - ], - "baseStats": { - "hp": 82, - "attack": 96, - "defence": 51, - "special_attack": 45, - "special_defence": 51, - "speed": 92 - }, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 146, - "experienceGroup": "erratic", - "catchRate": 190, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:growl", - "1:peck", - "1:mimic", - "6:quickattack", - "10:torment", - "13:aerialace", - "17:furyattack", - "20:taunt", - "24:uproar", - "27:copycat", - "30:fly", - "34:facade", - "38:swagger", - "42:bravebird", - "47:roost", - "52:reversal", - "egg:doubleedge", - "egg:finalgambit", - "egg:flatter", - "egg:partingshot", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:bravebird", - "tm:copycat", - "tm:doubleedge", - "tm:dualwingbeat", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:featherdance", - "tm:finalgambit", - "tm:flatter", - "tm:fly", - "tm:foulplay", - "tm:furyattack", - "tm:gigaimpact", - "tm:growl", - "tm:heatwave", - "tm:helpinghand", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:lashout", - "tm:mimic", - "tm:partingshot", - "tm:peck", - "tm:pounce", - "tm:protect", - "tm:quickattack", - "tm:rest", - "tm:reversal", - "tm:roost", - "tm:scaryface", - "tm:sleeptalk", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:torment", - "tm:uproar", - "tm:uturn" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json b/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json index 10c9a9545a..15a0f82c8b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json @@ -49,7 +49,6 @@ "height": 0.75, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json b/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json index 144f1a96b0..cebfc0b75c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json @@ -40,7 +40,6 @@ "catchRate": 255, "eggCycles": 15, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json index 425d1b953b..879af33733 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json @@ -152,87 +152,6 @@ "aspects": [ "tatsugiri-texture-droopy" ], - "abilities": [ - "commander", - "h:stormdrain" - ], - "eggGroups": [ - "water_2" - ], - "baseStats": { - "hp": 68, - "attack": 50, - "defence": 60, - "special_attack": 120, - "special_defence": 95, - "speed": 82 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_slow", - "catchRate": 100, - "eggCycles": 35, - "baseFriendship": 50, - "moves": [ - "1:watergun", - "1:splash", - "6:harden", - "12:helpinghand", - "17:waterpulse", - "23:soak", - "28:taunt", - "34:memento", - "39:muddywater", - "43:nastyplot", - "47:mirrorcoat", - "52:dragonpulse", - "egg:batonpass", - "egg:counter", - "egg:rapidspin", - "tm:batonpass", - "tm:chillingwater", - "tm:counter", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragondance", - "tm:dragonpulse", - "tm:endure", - "tm:facade", - "tm:gigaimpact", - "tm:harden", - "tm:helpinghand", - "tm:hydropump", - "tm:hyperbeam", - "tm:icywind", - "tm:lunge", - "tm:memento", - "tm:mirrorcoat", - "tm:muddywater", - "tm:nastyplot", - "tm:outrage", - "tm:protect", - "tm:raindance", - "tm:rapidspin", - "tm:rest", - "tm:sleeptalk", - "tm:soak", - "tm:splash", - "tm:substitute", - "tm:surf", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:watergun", - "tm:waterpulse", - "tm:whirlpool" - ], "evolutions": [], "battleOnly": false }, @@ -252,87 +171,6 @@ "aspects": [ "tatsugiri-texture-stretchy" ], - "abilities": [ - "commander", - "h:stormdrain" - ], - "eggGroups": [ - "water_2" - ], - "baseStats": { - "hp": 68, - "attack": 50, - "defence": 60, - "special_attack": 120, - "special_defence": 95, - "speed": 82 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "baseExperienceYield": 166, - "experienceGroup": "medium_slow", - "catchRate": 100, - "eggCycles": 35, - "baseFriendship": 50, - "moves": [ - "1:watergun", - "1:splash", - "6:harden", - "12:helpinghand", - "17:waterpulse", - "23:soak", - "28:taunt", - "34:memento", - "39:muddywater", - "43:nastyplot", - "47:mirrorcoat", - "52:dragonpulse", - "egg:batonpass", - "egg:counter", - "egg:rapidspin", - "tm:batonpass", - "tm:chillingwater", - "tm:counter", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragondance", - "tm:dragonpulse", - "tm:endure", - "tm:facade", - "tm:gigaimpact", - "tm:harden", - "tm:helpinghand", - "tm:hydropump", - "tm:hyperbeam", - "tm:icywind", - "tm:lunge", - "tm:memento", - "tm:mirrorcoat", - "tm:muddywater", - "tm:nastyplot", - "tm:outrage", - "tm:protect", - "tm:raindance", - "tm:rapidspin", - "tm:rest", - "tm:sleeptalk", - "tm:soak", - "tm:splash", - "tm:substitute", - "tm:surf", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:watergun", - "tm:waterpulse", - "tm:whirlpool" - ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json index 8a8007b13c..20355cfb3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json @@ -44,7 +44,6 @@ "catchRate": 255, "eggCycles": 5, "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:withdraw", "1:triattack", @@ -141,9 +140,6 @@ "terashell", "h:terashell" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 95, "attack": 95, @@ -161,84 +157,6 @@ "speed": 0 }, "baseExperienceYield": 120, - "experienceGroup": "slow", - "catchRate": 255, - "eggCycles": 5, - "baseFriendship": 50, - "behaviour": {}, - "moves": [ - "1:withdraw", - "1:triattack", - "1:rapidspin", - "10:ancientpower", - "20:headbutt", - "30:protect", - "40:earthpower", - "50:heavyslam", - "60:terastarstorm", - "70:doubleedge", - "80:rockpolish", - "90:gyroball", - "tm:ancientpower", - "tm:aurasphere", - "tm:bodypress", - "tm:bodyslam", - "tm:bugbuzz", - "tm:calmmind", - "tm:crunch", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:doubleedge", - "tm:dragonpulse", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flamethrower", - "tm:flareblitz", - "tm:flashcannon", - "tm:gigaimpact", - "tm:gravity", - "tm:gyroball", - "tm:headbutt", - "tm:heatcrash", - "tm:heavyslam", - "tm:hyperbeam", - "tm:icebeam", - "tm:icespinner", - "tm:ironhead", - "tm:meteorbeam", - "tm:powergem", - "tm:protect", - "tm:raindance", - "tm:rapidspin", - "tm:rest", - "tm:roar", - "tm:rockpolish", - "tm:rockslide", - "tm:scorchingsands", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stealthrock", - "tm:stoneedge", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:takedown", - "tm:terastarstorm", - "tm:thunder", - "tm:thunderbolt", - "tm:toxic", - "tm:triattack", - "tm:waterpulse", - "tm:weatherball", - "tm:wildcharge", - "tm:withdraw", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true }, @@ -263,9 +181,6 @@ "teraformzero", "h:teraformzero" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 160, "attack": 105, @@ -283,85 +198,7 @@ "speed": 0 }, "baseExperienceYield": 140, - "experienceGroup": "slow", - "catchRate": 255, - "eggCycles": 5, - "baseFriendship": 50, "dynamaxBlocked": true, - "behaviour": {}, - "moves": [ - "1:withdraw", - "1:triattack", - "1:rapidspin", - "10:ancientpower", - "20:headbutt", - "30:protect", - "40:earthpower", - "50:heavyslam", - "60:terastarstorm", - "70:doubleedge", - "80:rockpolish", - "90:gyroball", - "tm:ancientpower", - "tm:aurasphere", - "tm:bodypress", - "tm:bodyslam", - "tm:bugbuzz", - "tm:calmmind", - "tm:crunch", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:doubleedge", - "tm:dragonpulse", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flamethrower", - "tm:flareblitz", - "tm:flashcannon", - "tm:gigaimpact", - "tm:gravity", - "tm:gyroball", - "tm:headbutt", - "tm:heatcrash", - "tm:heavyslam", - "tm:hyperbeam", - "tm:icebeam", - "tm:icespinner", - "tm:ironhead", - "tm:meteorbeam", - "tm:powergem", - "tm:protect", - "tm:raindance", - "tm:rapidspin", - "tm:rest", - "tm:roar", - "tm:rockpolish", - "tm:rockslide", - "tm:scorchingsands", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stealthrock", - "tm:stoneedge", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:surf", - "tm:takedown", - "tm:terastarstorm", - "tm:thunder", - "tm:thunderbolt", - "tm:toxic", - "tm:triattack", - "tm:waterpulse", - "tm:weatherball", - "tm:wildcharge", - "tm:withdraw", - "tm:zenheadbutt" - ], "evolutions": [], "battleOnly": true } diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json b/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json index 80c2479a5e..8912f85a13 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json @@ -42,7 +42,6 @@ "catchRate": 6, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:meanlook", "1:sandtomb", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json b/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json index af15eeef55..e3ba197ade 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json @@ -41,7 +41,6 @@ "catchRate": 190, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json b/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json index 8afd4d450c..f9f1436827 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json @@ -41,7 +41,6 @@ "catchRate": 90, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 3, "entries": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wochien.json b/common/src/main/resources/data/cobblemon/species/generation9/wochien.json index 113073775f..9a45b43be5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wochien.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wochien.json @@ -42,7 +42,6 @@ "catchRate": 6, "eggCycles": 50, "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:absorb", "1:spite", From 627ee5e9b25ad9058187b9b10fdf316f85a8ad21 Mon Sep 17 00:00:00 2001 From: GenotypeXD-Dev Date: Sat, 18 Jan 2025 15:13:46 -0700 Subject: [PATCH 037/121] Add Implemented tag to foongus and Ducklett line --- .../resources/data/cobblemon/species/generation5/amoonguss.json | 1 + .../resources/data/cobblemon/species/generation5/ducklett.json | 1 + .../resources/data/cobblemon/species/generation5/foongus.json | 1 + .../resources/data/cobblemon/species/generation5/swanna.json | 1 + 4 files changed, 4 insertions(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json index 5076e60a7f..efb2de2de7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 591, "name": "Amoonguss", "primaryType": "grass", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json b/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json index c8143b6a89..4e85d93b46 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 580, "name": "Ducklett", "primaryType": "water", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json b/common/src/main/resources/data/cobblemon/species/generation5/foongus.json index c1e954c18f..3eb0497622 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/foongus.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 590, "name": "Foongus", "primaryType": "grass", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json index eaaaba92ee..8e9f1aa102 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 581, "name": "Swanna", "primaryType": "water", From 5188318f200dc1ec7b5b025d913f3dc7083fa957 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Sat, 18 Jan 2025 23:17:06 +0100 Subject: [PATCH 038/121] Added Eiscue's new animations + fixed it walk speed --- .../blockbench/pokemon/gen8/EiscueModel.kt | 5 +- .../0875_eiscue/eiscue_ice.animation.json | 502 ++++++++++------ .../0875_eiscue/eiscue_no_ice.animation.json | 564 ++++++++++++------ .../cobblemon/species/generation8/eiscue.json | 3 + 4 files changed, 726 insertions(+), 348 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt index a008bf8858..1b87747aee 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt @@ -8,6 +8,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen8 +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.PosableState import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel @@ -24,12 +25,14 @@ class EiscueModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame { override var portraitTranslation = Vec3(-0.1, 0.31, 0.0) override var profileScale = 0.8F - override var profileTranslation = Vec3(0.0, 0.3, 0.0) + override var profileTranslation = Vec3(0.0, 0.55, 0.0) lateinit var standing: Pose lateinit var walk: Pose lateinit var sleep: Pose + override val cryAnimation = CryProvider { bedrockStateful("eiscue_ice", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("eiscue_ice", "blink")} sleep = registerPose( diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0875_eiscue/eiscue_ice.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0875_eiscue/eiscue_ice.animation.json index 5972fa1cf9..c931f09002 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0875_eiscue/eiscue_ice.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0875_eiscue/eiscue_ice.animation.json @@ -11,27 +11,12 @@ "rotation": ["2.5+Math.cos((query.anim_time) * 90 * 2 - 60) * 1", 5, 0], "position": [0, "0+Math.cos((query.anim_time) * 90 * 2) * 0.1", 0] }, - "torso_upper": { - "rotation": ["-2.5+Math.cos((query.anim_time) * 90 * 2 - 120) * 1", -5, 0] - }, - "ice": { - "rotation": ["0+Math.cos((query.anim_time) * 90 * 2 - 60) * -2", 0, 0] - }, - "hair2": { - "rotation": ["0+Math.cos((query.anim_time) * 90 * 2 - 180) * 10", 0, "0+Math.cos((query.anim_time) * 90 * 2 - 180) * -10"] - }, "arm_left": { - "rotation": [7.5, 0, "60+Math.cos((query.anim_time) * 90 * 2 - 60) * -2"] + "rotation": [0, 0, "55+Math.cos((query.anim_time) * 90 * 2 - 60) * -2"] }, - "arm_left2": { + "hand_left": { "rotation": [0, 0, -15] }, - "arm_right": { - "rotation": [7.5, 0, "-60+Math.cos((query.anim_time) * 90 * 2 - 60) * 2"] - }, - "arm_right2": { - "rotation": [0, 0, 15] - }, "leg_left": { "rotation": [0, -25, 0], "position": [-0.1, 0, 0] @@ -39,37 +24,53 @@ "leg_right": { "rotation": [0, 25, 0], "position": [0.1, 0, 0] + }, + "arm_right": { + "rotation": [0, 0, "-55-Math.cos((query.anim_time) * 90 * 2 - 60) * -2"] + }, + "hand_right": { + "rotation": [0, 0, 15] + }, + "torso2": { + "rotation": [-2.5, 0, 0] + }, + "tail": { + "rotation": [15, 0, 0] + }, + "arm_left2": { + "rotation": [0, 0, -15] + }, + "arm_right2": { + "rotation": [0, 0, 15] + }, + "hair": { + "rotation": [0, 0, -22.5] + }, + "hair2": { + "rotation": [0, 0, 90] + }, + "hair3": { + "rotation": [0, 0, -55] + }, + "head_angle": { + "rotation": [-2.5, 0, 0] } } }, "animation.eiscue_ice.ground_walk": { "loop": true, + "animation_length": 1.9583, "bones": { "torso": { "rotation": ["5+Math.cos((query.anim_time) * 90 * 8) * 3", 0, "0+Math.cos((query.anim_time) * 90 * 4) * -5"], "position": [0, "0.3+Math.cos((query.anim_time) * 90 * 8 - 50) * -0.3", 0] }, - "torso_upper": { - "rotation": [2.5, "0+Math.cos((query.anim_time) * 90 * 4) * -2", "0+Math.cos((query.anim_time) * 90 * 4) * 7"] - }, - "ice": { - "rotation": ["-2.5+Math.cos((query.anim_time) * 90 * 8) * -5", "0+Math.cos((query.anim_time) * 90 * 4) * 2", 0] - }, - "hair2": { - "rotation": [0, 0, "0+Math.cos((query.anim_time) * 90 * 8 - 60) * 10"] - }, "arm_left": { "rotation": [0, "-15+Math.cos((query.anim_time) * 90 * 4) * -5", "52.5+Math.cos((query.anim_time) * 90 * 8) * -5"] }, - "arm_left2": { + "hand_left": { "rotation": [0, 0, 12.5] }, - "arm_right": { - "rotation": [0, "15+Math.cos((query.anim_time) * 90 * 4) * -5", "-52.5+Math.cos((query.anim_time) * 90 * 8) * 5"] - }, - "arm_right2": { - "rotation": [0, 0, -12.5] - }, "leg_left": { "rotation": ["-0.3871+Math.cos((query.anim_time) * 90 * 4) * -5", "-24.6269+Math.cos((query.anim_time) * 90 * 4) * 15", 0], "position": [ @@ -85,6 +86,27 @@ "0.25+1*math.clamp(math.sin((q.anim_time)*90*4)*1.1+0.2,0,1.3)+1*math.clamp(math.sin((q.anim_time)*90*4)*1+1,0,0)", "-0.5+Math.cos((query.anim_time) * 90 * 4) * 1" ] + }, + "arm_right": { + "rotation": [0, "15+Math.cos((query.anim_time) * 90 * 4) * -5", "-52.5+Math.cos((query.anim_time) * 90 * 8) * 5"] + }, + "hand_right": { + "rotation": [0, 0, -12.5] + }, + "hair": { + "rotation": [0, 0, "-22.5+Math.cos((query.anim_time) * 90 * 8 - 60) * 10"] + }, + "tail": { + "rotation": { + "0.0": [0, 0, 0], + "1.9583": [20, 0, 0] + } + }, + "hair2": { + "rotation": [0, 0, 90] + }, + "hair3": { + "rotation": [0, 0, -55] } } }, @@ -97,32 +119,17 @@ "torso": { "rotation": ["-20+Math.cos((query.anim_time) * 90 * 1) * 1", 0, 0] }, - "torso_upper": { - "rotation": ["17.5+Math.cos((query.anim_time) * 90 * 1 - 80) * 1", 0, 0] - }, - "neck": { + "torso2": { "rotation": [20, 0, 0], "position": [0, -0.5, 0] }, - "ice": { - "rotation": ["25+Math.cos((query.anim_time) * 90 * 1 - 160) * 1", 22.5, -20], - "position": [0, -0.25, 0] - }, - "hair2": { - "rotation": ["0+Math.cos((query.anim_time) * 90 * 1 - 220) * 10", 0, "0+Math.cos((query.anim_time) * 90 * 1 - 220) * -10"] - }, "arm_left": { - "rotation": [0, 0, 57.5] + "rotation": [-5, 0, 57.5], + "position": [0, 1, 0] }, - "arm_left2": { + "hand_left": { "rotation": [0, 0, 17.5] }, - "arm_right": { - "rotation": [0, 0, -57.5] - }, - "arm_right2": { - "rotation": [0, 0, -17.5] - }, "tail": { "rotation": [72.5, 0, 0] }, @@ -133,6 +140,25 @@ "leg_right": { "rotation": [-62.5, 20, 22.5], "position": [-1, 0.75, -1.75] + }, + "arm_right": { + "rotation": [-5, 0, -57.5], + "position": [0, 1, 0] + }, + "hand_right": { + "rotation": [0, 0, -17.5] + }, + "hair": { + "rotation": ["0+Math.cos((query.anim_time) * 90 * 1 - 220) * 10", 0, "-22.5+Math.cos((query.anim_time) * 90 * 1 - 220) * -10"] + }, + "head_angle": { + "rotation": [15, 0, 0] + }, + "hair2": { + "rotation": [0, 0, 90] + }, + "hair3": { + "rotation": [0, 0, -55] } } }, @@ -184,100 +210,13 @@ "1.375": [0, 0, 0] } }, - "torso_upper": { - "rotation": { - "0.0": ["0+Math.cos((query.anim_time) * 90 * 8 - 80) * 8", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 80) * 8"], - "1.0": ["0+Math.cos((query.anim_time) * 90 * 8 - 80) * 8", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 80) * 8"], - "1.25": [-30.56, 0, 3.15], - "1.4167": [-0.14, 0, 0.79], - "1.4583": [0, 0, 0], - "1.75": [35, 0, 0] - }, - "scale": { - "1.9167": [1, 1, 1], - "2.0": [1, "1.4+Math.cos((query.anim_time) * 90 * 32) * -0.05", 1], - "2.125": [1, "1.4+Math.cos((query.anim_time) * 90 * 32) * -0.05", 1], - "2.2917": [1, 1, 1], - "2.4167": [1, 1, 1], - "2.5": [1, "1.4+Math.cos((query.anim_time) * 90 * 32) * -0.05", 1], - "2.8333": [1, "1.4+Math.cos((query.anim_time) * 90 * 32) * -0.05", 1], - "2.9583": [1, 1, 1] - } - }, - "ice": { - "rotation": { - "0.0": ["0+Math.cos((query.anim_time) * 90 * 8 - 180) * 8", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 180) * 8"], - "1.0833": ["0+Math.cos((query.anim_time) * 90 * 8 - 180) * 8", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 180) * 8"], - "1.3333": [-11.92, 0, 1.78], - "1.4583": [0, 0, 0], - "1.5417": [0.36, 0, 0], - "1.625": [1.72, 0, 0], - "1.75": [5.5, 0, 0], - "1.8333": [0, 0, 0] - }, - "position": { - "1.4583": [0, 0, 0], - "1.6667": [0, 0, -0.75], - "1.8333": [0, 0, 0] - }, - "scale": { - "1.2917": [1, 1, 1], - "1.3333": [0.9, 0.9, 1.3], - "1.4167": [1.1, 1.1, 0.8], - "1.4583": [1, 1, 1], - "1.9167": [1, 1, 1], - "2.0": [1, "0.7225+Math.cos((query.anim_time) * 90 * 32) * 0.025", 1], - "2.125": [1, "0.7225+Math.cos((query.anim_time) * 90 * 32) * 0.025", 1], - "2.2917": [1, 1, 1], - "2.4167": [1, 1, 1], - "2.5": [1, "0.7225+Math.cos((query.anim_time) * 90 * 32) * 0.025", 1], - "2.8333": [1, "0.7225+Math.cos((query.anim_time) * 90 * 32) * 0.025", 1], - "2.9583": [1, 1, 1] - } - }, - "hair2": { - "rotation": { - "0.0": ["0+Math.cos((query.anim_time) * 90 * 8 - 240) * 15", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 240) * 15"], - "1.25": ["0+Math.cos((query.anim_time) * 90 * 8 - 240) * 15", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 240) * 15"], - "1.3333": [-42.5, 37.5, 0], - "1.4583": [25, 37.5, 0], - "1.5833": [-17.5, 37.5, 0], - "1.7083": [-27.5, 37.5, 0], - "1.7917": [-20, 37.5, 0], - "1.875": [5, 37.5, 0], - "1.9583": [10, 37.5, 0] - } - }, "arm_left": { "rotation": { "0.0": [0, "0+Math.cos((query.anim_time) * 90 * 8 - 180) * 15", "0+Math.sin((query.anim_time) * 90 * 8 - 180) * 15"], "1.125": [0, "50+Math.cos((query.anim_time) * 90 * 8 - 180) * 15", "-5+Math.sin((query.anim_time) * 90 * 8 - 180) * 15"], "1.3333": [0, 0, 0], - "1.4583": [-145, 17.5, -7.5], - "1.5833": [-170, 17.5, -7.5] - } - }, - "arm_left2": { - "rotation": { - "0.0": [0, 0, 15], - "1.4167": [0, 0, 15], - "1.5833": [0, 0, 67.5] - } - }, - "arm_right": { - "rotation": { - "0.0": [0, "0+Math.cos((query.anim_time) * 90 * 8 - 180) * 15", "0+Math.sin((query.anim_time) * 90 * 8 - 180) * 15"], - "1.125": [0, "-50+Math.cos((query.anim_time) * 90 * 8 - 180) * 15", "5+Math.sin((query.anim_time) * 90 * 8 - 180) * 15"], - "1.3333": [0, 0, 0], - "1.4583": [-145, -17.5, 7.5], - "1.5833": [-170, -17.5, 7.5] - } - }, - "arm_right2": { - "rotation": { - "0.0": [0, 0, -15], - "1.4167": [0, 0, -15], - "1.5833": [0, 0, -67.5] + "1.4583": [-160.21043, 6.89293, 20.82092], + "1.5833": [-163.69594, 3.18815, 18.63532] } }, "leg_left": { @@ -343,13 +282,115 @@ "1.6667": [0, 0, 0], "1.7917": [0, 0, 0.75] } + }, + "torso2": { + "rotation": { + "0.0": ["0+Math.cos((query.anim_time) * 90 * 8 - 80) * 8", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 80) * 8"], + "1.0": ["0+Math.cos((query.anim_time) * 90 * 8 - 80) * 8", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 80) * 8"], + "1.25": [-30.56, 0, 3.15], + "1.4167": [-0.14, 0, 0.79], + "1.4583": [0, 0, 0], + "1.75": [35, 0, 0] + }, + "scale": { + "1.9167": [1, 1, 1], + "2.0": [1, "1.4+Math.cos((query.anim_time) * 90 * 32) * -0.05", 1], + "2.125": [1, "1.4+Math.cos((query.anim_time) * 90 * 32) * -0.05", 1], + "2.2917": [1, 1, 1], + "2.4167": [1, 1, 1], + "2.5": [1, "1.4+Math.cos((query.anim_time) * 90 * 32) * -0.05", 1], + "2.8333": [1, "1.4+Math.cos((query.anim_time) * 90 * 32) * -0.05", 1], + "2.9583": [1, 1, 1] + } + }, + "head": { + "rotation": { + "0.0": ["0+Math.cos((query.anim_time) * 90 * 8 - 180) * 8", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 180) * 8"], + "1.0833": ["0+Math.cos((query.anim_time) * 90 * 8 - 180) * 8", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 180) * 8"], + "1.3333": [-11.92, 0, 1.78], + "1.4583": [0, 0, 0], + "1.5417": [0.36, 0, 0], + "1.625": [1.72, 0, 0], + "1.75": [5.5, 0, 0], + "1.8333": [0, 0, 0] + }, + "position": { + "1.4583": [0, 0, 0], + "1.6667": [0, 0, -0.75], + "1.8333": [0, 0, 0] + }, + "scale": { + "1.2917": [1, 1, 1], + "1.3333": [0.9, 0.9, 1.3], + "1.4167": [1.1, 1.1, 0.8], + "1.4583": [1, 1, 1], + "1.9167": [1, 1, 1], + "2.0": [1, "0.7225+Math.cos((query.anim_time) * 90 * 32) * 0.025", 1], + "2.125": [1, "0.7225+Math.cos((query.anim_time) * 90 * 32) * 0.025", 1], + "2.2917": [1, 1, 1], + "2.4167": [1, 1, 1], + "2.5": [1, "0.7225+Math.cos((query.anim_time) * 90 * 32) * 0.025", 1], + "2.8333": [1, "0.7225+Math.cos((query.anim_time) * 90 * 32) * 0.025", 1], + "2.9583": [1, 1, 1] + } + }, + "hair2": { + "rotation": { + "0.0": [0, 0, 90], + "1.25": ["0+Math.cos((query.anim_time) * 90 * 8 - 240) * 15", 0, "0+Math.sin((query.anim_time) * 90 * 8 - 240) * 15"], + "1.3333": [-42.5, 37.5, 0], + "1.4583": [25, 37.5, 0], + "1.5833": [-17.5, 37.5, 0], + "1.7083": [-27.5, 37.5, 0], + "1.7917": [-20, 37.5, 0], + "1.875": [5, 37.5, 0], + "1.9583": [10, 37.5, 0] + } + }, + "hair3": { + "rotation": [0, 0, -55] + }, + "arm_left2": { + "rotation": { + "0.0": [0, 0, 15], + "1.4167": [0, 0, 15], + "1.5833": [0, 0, 72.5] + } + }, + "hand_left": { + "rotation": { + "1.4167": [0, 0, 0], + "1.625": [0, 0, 42.5] + } + }, + "arm_right": { + "rotation": { + "0.0": [0, "0+Math.cos((query.anim_time) * 90 * 8 - 180) * 15", "0+Math.sin((query.anim_time) * 90 * 8 - 180) * 15"], + "1.125": [0, "-50+Math.cos((query.anim_time) * 90 * 8 - 180) * 15", "5+Math.sin((query.anim_time) * 90 * 8 - 180) * 15"], + "1.3333": [0, 0, 0], + "1.4583": [-160.21043, -6.89293, -20.82092], + "1.5833": [-163.69594, -3.18815, -18.63532] + } + }, + "arm_right2": { + "rotation": { + "0.0": [0, 0, -15], + "1.4167": [0, 0, -15], + "1.5833": [0, 0, -72.5] + } + }, + "hand_right": { + "rotation": { + "1.4167": [0, 0, 0], + "1.625": [0, 0, -42.5] + } } } }, "animation.eiscue_ice.blink": { - "animation_length": 0.16667, + "animation_length": 0.1667, "bones": { - "hair2": { + "hair": { "rotation": { "0.0": [-10, 0, 0], "0.0833": [5, 0, 0], @@ -359,7 +400,7 @@ } }, "animation.eiscue_ice.cry": { - "animation_length": 1.20833, + "animation_length": 1.2083, "bones": { "torso": { "rotation": { @@ -371,29 +412,6 @@ "1.2083": [0, 0, 0] } }, - "torso_upper": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [7.5, 0, 0], - "0.3333": [-5, 0, 0], - "1.0417": [-5, 0, 0], - "1.2083": [0, 0, 0] - }, - "position": { - "0.0": [0, 0, 0], - "0.2083": [0, -1, 0], - "0.375": [0, 0, 0] - } - }, - "ice": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [15, 0, 0], - "0.4167": [5, 0, 0], - "1.0833": [5, 0, 0], - "1.2083": [0, 0, 0] - } - }, "arm_left": { "rotation": { "0.0": [0, 0, 0], @@ -413,6 +431,156 @@ } } } + }, + "animation.eiscue_ice.water_idle": { + "loop": true, + "bones": { + "torso": { + "rotation": [17.5, 0, 0] + }, + "head_angle": { + "rotation": [-12.5, 0, 0] + }, + "hair": { + "rotation": [0, 0, -10] + }, + "hair2": { + "rotation": [0, 0, 67.5] + }, + "hair3": { + "rotation": [0, 0, -67.5] + }, + "arm_left": { + "rotation": [0, 0, 47.5] + }, + "arm_left2": { + "rotation": [0, 0, -25] + }, + "hand_left": { + "rotation": [0, 0, -20] + }, + "arm_right": { + "rotation": [0, 0, -47.5] + }, + "arm_right2": { + "rotation": [0, 0, 25] + }, + "hand_right": { + "rotation": [0, 0, 20] + }, + "leg_left": { + "rotation": [17.5, 0, -15] + }, + "leg_left2": { + "rotation": [12.5, 0, 0] + }, + "leg_right": { + "rotation": [17.5, 0, 15] + }, + "leg_right2": { + "rotation": [12.5, 0, 0] + } + } + }, + "animation.eiscue_ice.water_surface": { + "loop": true, + "bones": { + "hair": { + "rotation": [0, 0, -12.5] + }, + "hair2": { + "rotation": [0, 0, 67.5] + }, + "hair3": { + "rotation": [0, 0, -67.5] + }, + "arm_left": { + "rotation": [15, 12.5, 35] + }, + "arm_left2": { + "rotation": [0, 0, -12.5] + }, + "hand_left": { + "rotation": [0, 0, -12.5] + }, + "arm_right": { + "rotation": [15, -12.5, -35] + }, + "arm_right2": { + "rotation": [0, 0, 12.5] + }, + "hand_right": { + "rotation": [0, 0, 12.5] + }, + "leg_left": { + "rotation": [12.5, -25, 0] + }, + "leg_left2": { + "rotation": [5, 0, 0] + }, + "foot_left": { + "rotation": [5, 0, 0] + }, + "leg_right": { + "rotation": [12.5, 25, 0] + }, + "leg_right2": { + "rotation": [5, 0, 0] + }, + "foot_right": { + "rotation": [5, 0, 0] + } + } + }, + "animation.eiscue_ice.water_swim": { + "loop": true, + "bones": { + "torso": { + "rotation": [17.5, 0, 0] + }, + "head_angle": { + "rotation": [-12.5, 0, 0] + }, + "hair": { + "rotation": [0, 0, -10] + }, + "hair2": { + "rotation": [0, 0, 67.5] + }, + "hair3": { + "rotation": [0, 0, -67.5] + }, + "arm_left": { + "rotation": [0, 0, 47.5] + }, + "arm_left2": { + "rotation": [0, 0, -25] + }, + "hand_left": { + "rotation": [0, 0, -20] + }, + "arm_right": { + "rotation": [0, 0, -47.5] + }, + "arm_right2": { + "rotation": [0, 0, 25] + }, + "hand_right": { + "rotation": [0, 0, 20] + }, + "leg_left": { + "rotation": [17.5, 0, -15] + }, + "leg_left2": { + "rotation": [12.5, 0, 0] + }, + "leg_right": { + "rotation": [17.5, 0, 15] + }, + "leg_right2": { + "rotation": [12.5, 0, 0] + } + } } } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0875_eiscue/eiscue_no_ice.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0875_eiscue/eiscue_no_ice.animation.json index 4c79ce354c..aaa4064e0d 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0875_eiscue/eiscue_no_ice.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0875_eiscue/eiscue_no_ice.animation.json @@ -11,27 +11,12 @@ "rotation": ["2.5+Math.cos((query.anim_time) * 90 * 2 - 60) * 1", 5, 0], "position": [0, "0+Math.cos((query.anim_time) * 90 * 2) * 0.1", 0] }, - "torso_upper": { - "rotation": ["-2.5+Math.cos((query.anim_time) * 90 * 2 - 120) * 1", -5, 0] - }, - "ice": { - "rotation": ["0+Math.cos((query.anim_time) * 90 * 2 - 60) * -2", 0, 0] - }, - "hair2": { - "rotation": ["0+Math.cos((query.anim_time) * 90 * 2 - 180) * 10", 0, "0+Math.cos((query.anim_time) * 90 * 2 - 180) * -10"] - }, "arm_left": { - "rotation": [7.5, 0, "60+Math.cos((query.anim_time) * 90 * 2 - 60) * -2"] + "rotation": [0, 0, "55+Math.cos((query.anim_time) * 90 * 2 - 60) * -2"] }, - "arm_left2": { + "hand_left": { "rotation": [0, 0, -15] }, - "arm_right": { - "rotation": [7.5, 0, "-60+Math.cos((query.anim_time) * 90 * 2 - 60) * 2"] - }, - "arm_right2": { - "rotation": [0, 0, 15] - }, "leg_left": { "rotation": [0, -25, 0], "position": [-0.1, 0, 0] @@ -40,11 +25,41 @@ "rotation": [0, 25, 0], "position": [0.1, 0, 0] }, - "head": { - "rotation": ["0+Math.cos((query.anim_time) * 90 * 2 - 60) * -2", 0, 0] + "arm_right": { + "rotation": [0, 0, "-55-Math.cos((query.anim_time) * 90 * 2 - 60) * -2"] + }, + "hand_right": { + "rotation": [0, 0, 15] + }, + "torso2": { + "rotation": [-2.5, 0, 0] + }, + "tail": { + "rotation": [15, 0, 0] + }, + "arm_left2": { + "rotation": [0, 0, -15] + }, + "arm_right2": { + "rotation": [0, 0, 15] }, "hair": { - "rotation": ["0+Math.cos((query.anim_time) * 90 * 2 - 180) * 6", 0, "0+Math.cos((query.anim_time) * 90 * 2 - 180) * -6"] + "rotation": [0, 0, -22.5] + }, + "hair2": { + "rotation": [0, 0, 90] + }, + "hair3": { + "rotation": [0, 0, -55] + }, + "head": { + "rotation": [-2.5, 0, 0] + }, + "eye_left": { + "rotation": [0, 0, 2.5] + }, + "eye_right": { + "rotation": [0, 0, -2.5] } } }, @@ -55,27 +70,12 @@ "rotation": ["5+Math.cos((query.anim_time) * 90 * 8) * 3", 0, "0+Math.cos((query.anim_time) * 90 * 4) * -5"], "position": [0, "0.3+Math.cos((query.anim_time) * 90 * 8 - 50) * -0.3", 0] }, - "torso_upper": { - "rotation": [2.5, "0+Math.cos((query.anim_time) * 90 * 4) * -2", "0+Math.cos((query.anim_time) * 90 * 4) * 7"] - }, - "ice": { - "rotation": ["-2.5+Math.cos((query.anim_time) * 90 * 8) * -5", "0+Math.cos((query.anim_time) * 90 * 4) * 2", 0] - }, - "hair2": { - "rotation": [0, 0, "0+Math.cos((query.anim_time) * 90 * 8 - 60) * 10"] - }, "arm_left": { "rotation": [0, "-15+Math.cos((query.anim_time) * 90 * 4) * -5", "52.5+Math.cos((query.anim_time) * 90 * 8) * -5"] }, - "arm_left2": { + "hand_left": { "rotation": [0, 0, 12.5] }, - "arm_right": { - "rotation": [0, "15+Math.cos((query.anim_time) * 90 * 4) * -5", "-52.5+Math.cos((query.anim_time) * 90 * 8) * 5"] - }, - "arm_right2": { - "rotation": [0, 0, -12.5] - }, "leg_left": { "rotation": ["-0.3871+Math.cos((query.anim_time) * 90 * 4) * -5", "-24.6269+Math.cos((query.anim_time) * 90 * 4) * 15", 0], "position": [ @@ -92,11 +92,20 @@ "-0.5+Math.cos((query.anim_time) * 90 * 4) * 1" ] }, - "head": { - "rotation": ["-2.5+Math.cos((query.anim_time) * 90 * 8) * -5", "0+Math.cos((query.anim_time) * 90 * 4) * 2", 0] + "arm_right": { + "rotation": [0, "15+Math.cos((query.anim_time) * 90 * 4) * -5", "-52.5+Math.cos((query.anim_time) * 90 * 8) * 5"] + }, + "hand_right": { + "rotation": [0, 0, -12.5] }, "hair": { - "rotation": [0, 0, "0+Math.cos((query.anim_time) * 90 * 8 - 60) * 3"] + "rotation": [0, 0, "-22.5+Math.cos((query.anim_time) * 90 * 8 - 60) * 10"] + }, + "hair2": { + "rotation": [0, 0, 90] + }, + "hair3": { + "rotation": [0, 0, -55] } } }, @@ -109,28 +118,19 @@ "torso": { "rotation": ["-20+Math.cos((query.anim_time) * 90 * 1) * 1", 0, 0] }, - "torso_upper": { - "rotation": ["17.5+Math.cos((query.anim_time) * 90 * 1 - 80) * 1", 0, 0] - }, - "neck": { + "torso2": { "rotation": [20, 0, 0], "position": [0, -0.5, 0] }, - "ice": { - "rotation": ["25+Math.cos((query.anim_time) * 90 * 1 - 160) * 1", 22.5, -20], - "position": [0, -0.25, 0] - }, "arm_left": { - "rotation": [0, 0, 57.5] + "rotation": [-5, 0, 57.5], + "position": [0, 1, 0] }, - "arm_left2": { + "hand_left": { "rotation": [0, 0, 17.5] }, - "arm_right": { - "rotation": [0, 0, -57.5] - }, - "arm_right2": { - "rotation": [0, 0, -17.5] + "tail": { + "rotation": [72.5, 0, 0] }, "leg_left": { "rotation": [-62.5, -20, -22.5], @@ -140,26 +140,40 @@ "rotation": [-62.5, 20, 22.5], "position": [-1, 0.75, -1.75] }, - "head": { - "rotation": ["30+Math.cos((query.anim_time) * 90 * 1 - 160) * 1", -32.5, 5], - "position": [0, -0.25, 0] + "arm_right": { + "rotation": [-5, 0, -57.5], + "position": [0, 1, 0] }, - "eyelid_left": { - "position": [0, 0, -0.1] + "hand_right": { + "rotation": [0, 0, -17.5] + }, + "hair": { + "rotation": ["0+Math.cos((query.anim_time) * 90 * 1 - 220) * 10", 0, "-22.5+Math.cos((query.anim_time) * 90 * 1 - 220) * -10"] + }, + "head": { + "rotation": [15, 0, 0] + }, + "eye_left": { + "position": [0, 0, 0.1] + }, + "eye_right": { + "position": [0, 0, 0.1] }, "eyelid_right": { "position": [0, 0, -0.1] }, - "hair": { - "rotation": ["47.5+Math.cos((query.anim_time) * 90 * 1 - 220) * 10", 0, "-77.5+Math.cos((query.anim_time) * 90 * 1 - 220) * -10"] + "eyelid_left": { + "position": [0, 0, -0.1] }, - "tail": { - "rotation": [72.5, 0, 0] + "hair2": { + "rotation": [0, 0, 90] + }, + "hair3": { + "rotation": [0, 0, -55] } } }, "animation.eiscue_no_ice.faint": { - "loop": true, "animation_length": 3, "bones": { "body": { @@ -231,52 +245,6 @@ "2.125": [17.5, 0, 0] } }, - "head": { - "rotation": { - "0.0": [0, 0, 0], - "0.2917": [25, 0, 0], - "0.5833": [35, 0, 0], - "0.75": [42.5, 0, 0], - "1.0833": [-5, 0, 0], - "1.4167": [-10, 0, 0], - "1.5417": [30, 0, 0], - "1.875": [7.5, 0, 0], - "2.125": [20, 0, 0], - "2.4167": [24.5, 0, 0] - } - }, - "eyelid_left": { - "position": { - "0.0": [0, 0, -0.125], - "0.625": [0, 0, -0.125], - "0.6667": [0, 0, 0], - "1.3333": [0, 0, 0], - "1.375": [0, 0, -0.125] - } - }, - "eyelid_right": { - "position": { - "0.0": [0, 0, -0.125], - "0.625": [0, 0, -0.125], - "0.6667": [0, 0, 0], - "1.3333": [0, 0, 0], - "1.375": [0, 0, -0.125] - } - }, - "hair": { - "rotation": { - "0.0": [32.5, 7.5, -40], - "0.375": [-2.5, 7.5, 0], - "0.5833": [-32.5, 7.5, 30], - "0.6667": [62.5, 7.5, -62.5], - "1.0833": [0, 0, 0], - "1.375": [0, 0, 0], - "1.5833": [62.5, 7.5, -62.5], - "2.0": [0, 0, 0], - "2.2083": [41.67, 5, -44.67], - "2.5": [62.5, 7.5, -62.5] - } - }, "arm_left": { "rotation": { "0.0": [0, -12.5, 50], @@ -295,30 +263,6 @@ "2.5": [0, 0, 55] } }, - "arm_left2": { - "rotation": [0, 0, -15] - }, - "arm_right": { - "rotation": { - "0.0": [0, 12.5, -50], - "0.3333": [0, -10.5, -55], - "0.5417": [0, -15.3, -56], - "0.6667": [0, -55.3, -56], - "0.9583": [0, 0, "0+Math.cos((query.anim_time) * 90 * 24) * -20"], - "1.1667": [0, 0, "-12+Math.cos((query.anim_time) * 90 * 24) * -20"], - "1.3333": [0, 0, 42.5], - "1.4583": [0, 0, -32.5], - "1.5833": [0, 0, -46], - "1.7917": [0, 0, -28.25], - "1.9167": [0, 0, -3.5], - "2.0417": [0, 0, -43.5], - "2.25": [0, 0, -52], - "2.5": [0, 0, -55] - } - }, - "arm_right2": { - "rotation": [0, 0, 15] - }, "leg_left": { "rotation": { "0.0": [0, 0, 0], @@ -374,30 +318,87 @@ "1.5": [-0.5, 0.25, -1], "1.8333": [-0.5, 0.25, -2] } - } - } - }, - "animation.eiscue_no_ice.blink": { - "animation_length": 0.16667, - "bones": { - "eyelid_left": { - "position": { - "0.0": [0, 0, -0.1], - "0.125": [0, 0, -0.1], - "0.1667": [0, 0, 0] + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.2917": [25, 0, 0], + "0.5833": [35, 0, 0], + "0.75": [42.5, 0, 0], + "1.0833": [-5, 0, 0], + "1.4167": [-10, 0, 0], + "1.5417": [30, 0, 0], + "1.875": [7.5, 0, 0], + "2.125": [20, 0, 0], + "2.4167": [24.5, 0, 0] } }, + "hair": { + "rotation": { + "0.0": [32.5, 7.5, -40], + "0.375": [-2.5, 7.5, 0], + "0.5833": [-32.5, 7.5, 30], + "0.6667": [62.5, 7.5, -62.5], + "1.0833": [0, 0, 0], + "1.375": [0, 0, 0], + "1.5833": [62.5, 7.5, -62.5], + "2.0": [0, 0, 0], + "2.2083": [41.67, 5, -44.67], + "2.5": [62.5, 7.5, -62.5] + } + }, + "arm_left2": { + "rotation": [0, 0, -15] + }, + "arm_right": { + "rotation": { + "0.0": [0, 12.5, -50], + "0.3333": [0, -10.5, -55], + "0.5417": [0, -15.3, -56], + "0.6667": [0, -55.3, -56], + "0.9583": [0, 0, "0+Math.cos((query.anim_time) * 90 * 24) * -20"], + "1.1667": [0, 0, "-12+Math.cos((query.anim_time) * 90 * 24) * -20"], + "1.3333": [0, 0, 42.5], + "1.4583": [0, 0, -32.5], + "1.5833": [0, 0, -46], + "1.7917": [0, 0, -28.25], + "1.9167": [0, 0, -3.5], + "2.0417": [0, 0, -43.5], + "2.25": [0, 0, -52], + "2.5": [0, 0, -55] + } + }, + "arm_right2": { + "rotation": [0, 0, 15] + }, "eyelid_right": { "position": { - "0.0": [0, 0, -0.1], - "0.125": [0, 0, -0.1], - "0.1667": [0, 0, 0] + "0.0": [0, 0, -0.125], + "0.625": [0, 0, -0.125], + "0.6667": [0, 0, 0], + "1.3333": [0, 0, 0], + "1.375": [0, 0, -0.125] } + }, + "eyelid_left": { + "position": { + "0.0": [0, 0, -0.125], + "0.625": [0, 0, -0.125], + "0.6667": [0, 0, 0], + "1.3333": [0, 0, 0], + "1.375": [0, 0, -0.125] + } + }, + "hair2": { + "rotation": [0, 0, 90] + }, + "hair3": { + "rotation": [0, 0, -55] } } }, "animation.eiscue_no_ice.cry": { - "animation_length": 1.20833, + "animation_length": 1.2083, "bones": { "torso": { "rotation": { @@ -409,29 +410,6 @@ "1.2083": [0, 0, 0] } }, - "torso_upper": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [7.5, 0, 0], - "0.3333": [-5, 0, 0], - "1.0417": [-5, 0, 0], - "1.2083": [0, 0, 0] - }, - "position": { - "0.0": [0, 0, 0], - "0.2083": [0, -1, 0], - "0.375": [0, 0, 0] - } - }, - "ice": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [15, 0, 0], - "0.4167": [5, 0, 0], - "1.0833": [5, 0, 0], - "1.2083": [0, 0, 0] - } - }, "arm_left": { "rotation": { "0.0": [0, 0, 0], @@ -449,15 +427,241 @@ "1.0": [0, 22.5, 0], "1.2083": [0, 0, 0] } - }, - "head": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [15, 0, 0], - "0.4167": [5, 0, 0], - "1.0833": [5, 0, 0], - "1.2083": [0, 0, 0] + } + } + }, + "animation.eiscue_no_ice.blink": { + "animation_length": 0.1667, + "bones": { + "eye_left": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": { + "pre": [0, 0, 0.1], + "post": [0, 0, 0] + } } + }, + "eye_right": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": { + "pre": [0, 0, 0.1], + "post": [0, 0, 0] + } + } + }, + "eye_right_shocked": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": { + "pre": [0, 0, 0.1], + "post": [0, 0, 0] + } + } + }, + "eye_left_shocked": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": { + "pre": [0, 0, 0.1], + "post": [0, 0, 0] + } + } + }, + "eye_left_happy": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": { + "pre": [0, 0, 0.1], + "post": [0, 0, 0] + } + } + }, + "eye_right_happy": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": { + "pre": [0, 0, 0.1], + "post": [0, 0, 0] + } + } + }, + "eyelid_right": { + "position": { + "0.0": [0, 0, -0.1], + "0.125": [0, 0, -0.1], + "0.1667": { + "pre": [0, 0, -0.1], + "post": [0, 0, 0] + } + } + }, + "eyelid_left": { + "position": { + "0.0": [0, 0, -0.1], + "0.125": [0, 0, -0.1], + "0.1667": { + "pre": [0, 0, -0.1], + "post": [0, 0, 0] + } + } + } + } + }, + "animation.eiscue_no_ice.water_idle": { + "loop": true, + "bones": { + "torso": { + "rotation": [17.5, 0, 0] + }, + "hair": { + "rotation": [0, 0, -10] + }, + "hair2": { + "rotation": [0, 0, 67.5] + }, + "hair3": { + "rotation": [0, 0, -67.5] + }, + "arm_left": { + "rotation": [0, 0, 47.5] + }, + "arm_left2": { + "rotation": [0, 0, -25] + }, + "hand_left": { + "rotation": [0, 0, -20] + }, + "arm_right": { + "rotation": [0, 0, -47.5] + }, + "arm_right2": { + "rotation": [0, 0, 25] + }, + "hand_right": { + "rotation": [0, 0, 20] + }, + "leg_left": { + "rotation": [17.5, 0, -15] + }, + "leg_left2": { + "rotation": [12.5, 0, 0] + }, + "leg_right": { + "rotation": [17.5, 0, 15] + }, + "leg_right2": { + "rotation": [12.5, 0, 0] + }, + "head_angle": { + "rotation": [-12.5, 0, 0] + } + } + }, + "animation.eiscue_no_ice.water_surface": { + "loop": true, + "bones": { + "hair": { + "rotation": [0, 0, -12.5] + }, + "hair2": { + "rotation": [0, 0, 67.5] + }, + "hair3": { + "rotation": [0, 0, -67.5] + }, + "arm_left": { + "rotation": [15, 12.5, 35] + }, + "arm_left2": { + "rotation": [0, 0, -12.5] + }, + "hand_left": { + "rotation": [0, 0, -12.5] + }, + "arm_right": { + "rotation": [15, -12.5, -35] + }, + "arm_right2": { + "rotation": [0, 0, 12.5] + }, + "hand_right": { + "rotation": [0, 0, 12.5] + }, + "leg_left": { + "rotation": [12.5, -25, 0] + }, + "leg_left2": { + "rotation": [5, 0, 0] + }, + "foot_left": { + "rotation": [5, 0, 0] + }, + "leg_right": { + "rotation": [12.5, 25, 0] + }, + "leg_right2": { + "rotation": [5, 0, 0] + }, + "foot_right": { + "rotation": [5, 0, 0] + } + } + }, + "animation.eiscue_no_ice.water_swim": { + "loop": true, + "bones": { + "torso": { + "rotation": [17.5, 0, 0] + }, + "hair": { + "rotation": [0, 0, -10] + }, + "hair2": { + "rotation": [0, 0, 67.5] + }, + "hair3": { + "rotation": [0, 0, -67.5] + }, + "arm_left": { + "rotation": [0, 0, 47.5] + }, + "arm_left2": { + "rotation": [0, 0, -25] + }, + "hand_left": { + "rotation": [0, 0, -20] + }, + "arm_right": { + "rotation": [0, 0, -47.5] + }, + "arm_right2": { + "rotation": [0, 0, 25] + }, + "hand_right": { + "rotation": [0, 0, 20] + }, + "leg_left": { + "rotation": [17.5, 0, -15] + }, + "leg_left2": { + "rotation": [12.5, 0, 0] + }, + "leg_right": { + "rotation": [17.5, 0, 15] + }, + "leg_right2": { + "rotation": [12.5, 0, 0] + }, + "head_angle": { + "rotation": [-12.5, 0, 0] } } } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index d44091f945..a1b74b7b12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -50,6 +50,9 @@ "light": "0-4" }, "moving": { + "walk": { + "walkSpeed": 0.15 + }, "swim": { "canSwimInWater": true, "canSwimInLava": false, From 7387612f0eb593c4fe234c6bbb932983627cfd72 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Sat, 18 Jan 2025 23:17:38 +0100 Subject: [PATCH 039/121] Fixed Munchlax and Snorlax insomnia (sweet dreams) --- .../resources/data/cobblemon/species/generation1/snorlax.json | 4 ++-- .../data/cobblemon/species/generation4/munchlax.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json index 1a8580dc5b..f7faf98ce5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json @@ -52,14 +52,14 @@ "moving": { "walk": { "walkSpeed": 0.147 - }, + } + }, "resting": { "canSleep": true, "willSleepOnBed": false, "depth": "normal", "light": "0-15" } - } }, "drops": { "amount": 8, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json index e904e8b1ac..536d9cdb6a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json @@ -53,6 +53,7 @@ "moving": { "walk": { "walkSpeed": 0.118 + } }, "resting": { "canSleep": true, @@ -60,7 +61,6 @@ "depth": "normal", "light": "0-15" } - } }, "drops": { "amount": 5, From 4eb90400aa6113b06ccfb00830a65e1b53c8dc4c Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Sat, 18 Jan 2025 23:21:12 +0100 Subject: [PATCH 040/121] Fixed Galarian Slowpoke's walk speed --- .../resources/data/cobblemon/species/generation1/slowpoke.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json index cf0c78952b..068875425a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json @@ -252,6 +252,8 @@ ], "behaviour": { "moving": { + "walk": { + "walkSpeed": 0.125}, "swim": { "swimSpeed": "0.2", "canBreatheUnderwater": true, From 0c5118b8407f5925a7ba206fd5c9a87e8dcde0d4 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Sat, 18 Jan 2025 23:23:42 +0100 Subject: [PATCH 041/121] Added Galarian Slowking's animations --- .../slowking_galarian.animation.json | 759 ++++++++++++++++++ .../0199_slowking/slowking_galarian.json | 67 ++ .../0199_slowking/1_slowking_galarian.json | 2 +- 3 files changed, 827 insertions(+), 1 deletion(-) create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0199_slowking/slowking_galarian.animation.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0199_slowking/slowking_galarian.json diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0199_slowking/slowking_galarian.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0199_slowking/slowking_galarian.animation.json new file mode 100644 index 0000000000..e54d130eb9 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0199_slowking/slowking_galarian.animation.json @@ -0,0 +1,759 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.slowking_galarian.ground_idle": { + "loop": true, + "bones": { + "leftarm": { + "rotation": [90, 0, 50] + }, + "rightarm": { + "rotation": [90, 0, -50] + }, + "arm_left": { + "rotation": [1.5741, -17.4313, "49.7586-math.sin(Q.anim_time*90*1.5-30)*3"], + "position": [0, 0, 0] + }, + "arm_right": { + "rotation": [1.5741, 17.43127, "-49.7586+math.sin(Q.anim_time*90*1.5-30)*3"] + }, + "torso": { + "rotation": ["-1.6-math.cos(Q.anim_time*90*1.5)*0.8", 0, 0], + "position": [0, "0+math.sin(Q.anim_time*90*1.5)*0.2", 0] + }, + "head": { + "rotation": ["2.5-math.cos(Q.anim_time*90*1.5-30)*1", 0, 0] + }, + "arm_left2": { + "rotation": [0, "5-math.sin(Q.anim_time*90*1.5-60)*3", 2.5] + }, + "finger_left": { + "rotation": [0, 0, 20] + }, + "thumb_left": { + "rotation": [0, -45, 0] + }, + "arm_right2": { + "rotation": [0, "-5+math.sin(Q.anim_time*90*1.5-60)*3", -2.5] + }, + "finger_right": { + "rotation": [0, 0, -17.5] + }, + "thumb_right": { + "rotation": [0, 45, 0] + }, + "leg_left": { + "rotation": [0, -17.5, 0], + "position": [0, "0+math.sin(Q.anim_time*90*1.5)*0.1", 0] + }, + "leg_right": { + "rotation": [0, 17.5, 0], + "position": [0, "0+math.sin(Q.anim_time*90*1.5)*0.1", 0] + }, + "jaw": { + "rotation": ["17.5-math.cos(Q.anim_time*90*1.5-60)*3", 0, 0] + }, + "front_frill": { + "rotation": ["0-math.sin(Q.anim_time*90*1.5-30)*1", 0, 0] + }, + "left_frill": { + "rotation": [0, 0, "0-math.sin(Q.anim_time*90*1.5-30)*1"] + }, + "back_frill": { + "rotation": ["0-math.sin(Q.anim_time*90*1.5-30)*-1", 0, 0] + }, + "crown": { + "rotation": ["0-math.cos(Q.anim_time*90*1.5-60)*1", 0, 0] + }, + "foot_left": { + "position": [0, "0-math.sin(Q.anim_time*90*1.5)*0.1", 0] + }, + "foot_right": { + "position": [0, "0-math.sin(Q.anim_time*90*1.5)*0.1", 0] + }, + "tail": { + "rotation": [-15, "0-math.cos(Q.anim_time*90*1.5-60)*4", 0] + }, + "tail2": { + "rotation": [15, "0-math.cos(Q.anim_time*90*1.5-120)*8", 0] + }, + "tail3": { + "rotation": [15, "0-math.cos(Q.anim_time*90*1.5-180)*8", 0] + }, + "front_frill2": { + "rotation": ["0-math.sin(Q.anim_time*90*1.5-60)*1", 0, 0] + }, + "left_frill2": { + "rotation": [0, 0, "52.2586-math.sin(Q.anim_time*90*1.5-30)*3"], + "position": [0, 0, 0] + }, + "right_frill2": { + "rotation": [0, 0, "-52.2586+math.sin(Q.anim_time*90*1.5-30)*3"] + }, + "back_frill2": { + "rotation": ["0-math.sin(Q.anim_time*90*1.5-60)*-1", 0, 0] + } + } + }, + "animation.slowking_galarian.battle_idle": { + "loop": true, + "bones": { + "tail": { + "rotation": [-15, "0-math.cos(Q.anim_time*90*1.5-60)*4", 0] + }, + "tail2": { + "rotation": [15, "0-math.cos(Q.anim_time*90*1.5-120)*8", 0] + }, + "tail3": { + "rotation": [15, "0-math.cos(Q.anim_time*90*1.5-180)*8", 0] + }, + "leftarm": { + "rotation": [90, 0, 50] + }, + "rightarm": { + "rotation": [90, 0, -50] + }, + "arm_left": { + "rotation": [0.18545, 10.17123, "-7.6177-1*(-50.4968+math.sin(Q.anim_time*90*1.5-30)*3)"], + "position": [0, -0.5, 0] + }, + "arm_right": { + "rotation": [1.52525, -10.05906, "-50.4968+math.sin(Q.anim_time*90*1.5-30)*3"], + "position": [0, -0.5, 0] + }, + "torso": { + "rotation": ["-5-math.cos(Q.anim_time*90*1.5)*0.8", 0, 0], + "position": [0, "0+math.sin(Q.anim_time*90*1.5)*0.2", 0] + }, + "head": { + "rotation": ["15-math.cos(Q.anim_time*90*1.5-30)*1", 0, 0] + }, + "arm_left2": { + "rotation": [0, 30, 17.5] + }, + "finger_left": { + "rotation": [0, 0, 20] + }, + "thumb_left": { + "rotation": [70.73445, -72.69069, -37.97075] + }, + "arm_right2": { + "rotation": [0, -30, -17.5] + }, + "finger_right": { + "rotation": [0, 0, -20] + }, + "thumb_right": { + "rotation": [0, 40, 0] + }, + "leg_left": { + "rotation": [0, -35, 0], + "position": [0, "0+math.sin(Q.anim_time*90*1.5)*0.1", 0] + }, + "leg_right": { + "rotation": [0, 17.5, 0], + "position": [0, "0+math.sin(Q.anim_time*90*1.5)*0.1", 0] + }, + "jaw": { + "rotation": ["17.5-math.cos(Q.anim_time*90*1.5-60)*3", 0, 0] + }, + "front_frill": { + "rotation": ["0-math.sin(Q.anim_time*90*1.5)*1", 0, 0] + }, + "left_frill": { + "rotation": [0, 0, "0-math.sin(Q.anim_time*90*1.5)*1"] + }, + "back_frill": { + "rotation": ["0+math.sin(Q.anim_time*90*1.5)*1", 0, 0] + }, + "foot_left": { + "position": [0, "0-math.sin(Q.anim_time*90*1.5)*0.1", 0] + }, + "foot_right": { + "position": [0, "0-math.sin(Q.anim_time*90*1.5)*0.1", 0] + }, + "crown": { + "rotation": ["0-math.cos(Q.anim_time*90*1.5-60)*2", 0, 0] + }, + "body": { + "rotation": [0, -17.5, 0] + }, + "front_frill2": { + "rotation": ["5-math.sin(Q.anim_time*90*1.5)*1", 0, 0] + }, + "left_frill2": { + "rotation": [0, 0, "50-math.sin(Q.anim_time*90*1.5)*1"] + }, + "right_frill2": { + "rotation": [0, 0, "-1*(50-math.sin(Q.anim_time*90*1.5)*1)"] + }, + "back_frill2": { + "rotation": [22.5, 0, 0] + }, + "pupil_left": { + "position": [-0.1, 0, 0] + }, + "undefined": { + "position": [-0.1, 0, 0] + }, + "pupil_right": { + "position": [-0.1, 0, 0] + } + } + }, + "animation.slowking_galarian.ground_walk": { + "loop": true, + "animation_length": 1.3333, + "bones": { + "tail": { + "rotation": ["-15-math.cos(Q.anim_time*90*1.5*4-60)*2", "0-math.cos(Q.anim_time*90*1.5*2-60)*12", 0] + }, + "tail2": { + "rotation": ["15-math.cos(Q.anim_time*90*1.5*4-120)*2", "0-math.cos(Q.anim_time*90*1.5*2-120)*10", 0] + }, + "tail3": { + "rotation": ["15-math.cos(Q.anim_time*90*1.5*4-180)*2", "0-math.cos(Q.anim_time*90*1.5*2-180)*8", 0] + }, + "leftarm": { + "rotation": [90, 0, 50] + }, + "rightarm": { + "rotation": [90, 0, -50] + }, + "arm_left": { + "rotation": [5.5, "-16.5-math.cos(Q.anim_time*90*1.5*2)*20", "36.5-math.sin(Q.anim_time*90*1.5*2-30)*4"] + }, + "arm_right": { + "rotation": [5.5, "16.5-math.cos(Q.anim_time*90*1.5*2)*20", "-36.5-math.sin(Q.anim_time*90*1.5*2-30)*4"] + }, + "torso": { + "rotation": ["5+math.cos(Q.anim_time*90*1.5*4)*1", "0+math.cos(Q.anim_time*90*1.5*2)*4", "0-math.sin(Q.anim_time*90*1.5*2)*2"], + "position": [0, "0+math.sin(Q.anim_time*90*1.5*4-30)*0.2", 0] + }, + "head": { + "rotation": ["-5+math.cos(Q.anim_time*90*1.5*4-60)*1", 0, 0] + }, + "arm_left2": { + "rotation": [0, "20+math.sin(Q.anim_time*90*1.5*2-60)*20", "2.5-math.sin(Q.anim_time*90*1.5*2-60)*1"] + }, + "finger_left": { + "rotation": [0, 0, 20] + }, + "thumb_left": { + "rotation": [0, -42.5, 0] + }, + "arm_right2": { + "rotation": [0, "-20+math.sin(Q.anim_time*90*1.5*2-60)*20", "-2.5-math.sin(Q.anim_time*90*1.5*2-60)*1"] + }, + "finger_right": { + "rotation": [0, 0, -20] + }, + "thumb_right": { + "rotation": [0, 42.5, 0] + }, + "leg_left": { + "rotation": ["0+math.cos(q.anim_time*90*1.5*2-180)*6", -17.5, 0], + "position": [0, "0+math.clamp(math.sin(q.anim_time*90*1.5*2-180)*0.7,0,1)", "0+math.cos(q.anim_time*90*1.5*2-180)*0.6"] + }, + "leg_right": { + "rotation": ["0+math.cos(q.anim_time*90*1.5*2)*6", 17.5, 0], + "position": [0, "0+math.clamp(math.sin(q.anim_time*90*1.5*2)*0.7,0,1)", "0+math.cos(q.anim_time*90*1.5*2)*0.6"] + }, + "jaw": { + "rotation": ["17.5-math.cos(Q.anim_time*90*1.5*4-60)*3", 0, 0] + }, + "foot_left": { + "rotation": { + "0.0417": ["2.5+math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)-math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)", 0, 0], + "0.1667": ["-1+math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)-math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)", 0, 0], + "0.5417": ["-5+math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)-math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)", 0, 0], + "1.1667": [-13.03, 0, 0], + "1.3333": ["1+math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)-math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)", 0, 0] + } + }, + "foot_right": { + "rotation": { + "0.0": ["-5+math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)-math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)", 0, 0], + "0.5417": ["-5+math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)-math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)", 0, 0], + "0.6667": ["5+math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)-math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)", 0, 0], + "1.3333": ["-5+math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)-math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)", 0, 0] + }, + "position": [0, 0, 0] + }, + "front_frill": { + "rotation": ["0-math.sin(Q.anim_time*90*1.5*4-30)*1", 0, 0] + }, + "left_frill": { + "rotation": [0, 0, "0-math.sin(Q.anim_time*90*1.5*4-30)*1"] + }, + "back_frill": { + "rotation": ["0+math.sin(Q.anim_time*90*1.5*4-30)*1", 0, 0] + }, + "crown": { + "rotation": ["0-math.cos(Q.anim_time*90*1.5*4-60)*1", 0, 0] + }, + "leg_left2": { + "rotation": ["5-math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)+math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)", 0, 0] + }, + "leg_right2": { + "rotation": ["0-math.clamp(math.cos(q.anim_time*90*1.5*2+60)*6,0,6)+math.clamp(math.cos(q.anim_time*90*1.5*2-60)*6,0,6)", 0, 0] + }, + "neck": { + "rotation": ["0-math.cos(Q.anim_time*90*1.5*4)*3", 0, "0-math.sin(Q.anim_time*90*1.5*2-60)*2"] + }, + "front_frill2": { + "rotation": ["5+math.cos(Q.anim_time*90*1.5*4)*1", 0, 0] + }, + "left_frill2": { + "rotation": [0, 0, "36.5-math.sin(Q.anim_time*90*1.5*2-30)*4"] + }, + "right_frill2": { + "rotation": [0, 0, "-36.5-math.sin(Q.anim_time*90*1.5*2-30)*4"] + }, + "back_frill2": { + "rotation": ["5+math.cos(Q.anim_time*90*1.5*4)*1", 0, 0] + } + } + }, + "animation.slowking_galarian.water_idle": { + "loop": true, + "bones": { + "tail": { + "rotation": [-27.5, "0-math.cos(Q.anim_time*90*1.5-60)*4", 0] + }, + "tail2": { + "rotation": [12.5, "-math.cos(Q.anim_time*90*1.5-120)*8", 0] + }, + "tail3": { + "rotation": [15, "0-math.cos(Q.anim_time*90*1.5-180)*8", 0] + }, + "leftarm": { + "rotation": [90, 0, 50] + }, + "rightarm": { + "rotation": [90, 0, -50] + }, + "arm_left": { + "rotation": [3.76055, -7.0945, "42.5963-math.sin(Q.anim_time*90*1.5-30)*3"] + }, + "arm_right": { + "rotation": [3.76055, 7.09452, "-42.5963+math.sin(Q.anim_time*90*1.5-30)*3"] + }, + "torso": { + "rotation": ["-1.6-math.cos(Q.anim_time*90*1.5)*0.8", 0, 0], + "position": [0, "0+math.sin(Q.anim_time*90*1.5)*0.2", 0] + }, + "head": { + "rotation": ["-17.5-math.cos(Q.anim_time*90*1.5-30)*1", 0, 0] + }, + "arm_left2": { + "rotation": [0, "5+math.sin(Q.anim_time*90*1.5-60)*3", 2.5] + }, + "finger_left": { + "rotation": [0, 0, 20] + }, + "thumb_left": { + "rotation": [0, -45, 0] + }, + "arm_right2": { + "rotation": [0, -5, "-2.5+math.sin(Q.anim_time*90*1.5-60)*3"] + }, + "finger_right": { + "rotation": [0, 0, -17.5] + }, + "thumb_right": { + "rotation": [0, 45, 0] + }, + "leg_left": { + "rotation": ["10+math.cos(Q.anim_time*90*1.5)*3", -17.5, 0] + }, + "leg_right": { + "rotation": ["10+math.cos(Q.anim_time*90*1.5)*3", 17.5, 0] + }, + "jaw": { + "rotation": ["17.5-math.cos(Q.anim_time*90*1.5-60)*3", 0, 0] + }, + "front_frill": { + "rotation": ["0-math.sin(Q.anim_time*90*1.5)*1", 0, 0] + }, + "left_frill": { + "rotation": [0, 0, "0-math.sin(Q.anim_time*90*1.5)*1"] + }, + "back_frill": { + "rotation": ["0+math.sin(Q.anim_time*90*1.5)*1", 0, 0] + }, + "crown": { + "rotation": ["0-math.cos(Q.anim_time*90*1.5-30)*1", 0, 0] + }, + "foot_left": { + "rotation": [20, 0, 0] + }, + "foot_right": { + "rotation": [20, 0, 0] + }, + "body": { + "rotation": ["32.5+math.sin(Q.anim_time*90*1.5)*1", 0, 0], + "position": [0, "0+math.cos(Q.anim_time*90*1.5)*0.3", 0] + }, + "leg_left2": { + "rotation": [7.5, 0, 0] + }, + "leg_right2": { + "rotation": [7.5, 0, 0] + }, + "front_frill2": { + "rotation": ["-1*(22.5963-math.sin(Q.anim_time*90*1.5-90)*3)", 0, 0] + }, + "left_frill2": { + "rotation": [0, 0, "22.5963-math.sin(Q.anim_time*90*1.5-90)*3"] + }, + "right_frill2": { + "rotation": [0, 0, "-1*(22.5963-math.sin(Q.anim_time*90*1.5-90)*3)"] + }, + "back_frill2": { + "rotation": ["22.5963-math.sin(Q.anim_time*90*1.5-90)*3", 0, 0] + } + } + }, + "animation.slowking_galarian.water_swim": { + "loop": true, + "bones": { + "tail": { + "rotation": [-45, "-math.cos(Q.anim_time*90*2.5-60)*15", "math.cos(Q.anim_time*90*2.5-60)*10"] + }, + "tail2": { + "rotation": [7.85546, "-0.7603-math.cos(Q.anim_time*90*2.5-120)*15", 1.20833] + }, + "tail3": { + "rotation": [15, "0-math.cos(Q.anim_time*90*2.5-120)*15", 0] + }, + "leftarm": { + "rotation": [90, 0, 50] + }, + "rightarm": { + "rotation": [90, 0, -50] + }, + "arm_left": { + "rotation": [3.76055, -7.0945, "42.5963-math.sin(Q.anim_time*90*2.5-30)*3"] + }, + "arm_right": { + "rotation": [3.76055, 7.09452, "-42.5963+math.sin(Q.anim_time*90*2.5-30)*3"] + }, + "torso": { + "rotation": ["-1.6-math.cos(Q.anim_time*90*2.5)*0.8", 0, 0], + "position": [0, "0+math.sin(Q.anim_time*90*1.5)*0.2", 0] + }, + "head": { + "rotation": ["-17.5+math.cos(Q.anim_time*90*2.5-60)*2", 0, 0] + }, + "arm_left2": { + "rotation": [0, "10-math.sin(Q.anim_time*90*2.5-60)*3", 2.5] + }, + "finger_left": { + "rotation": [0, 0, 20] + }, + "thumb_left": { + "rotation": [0, -45, 0] + }, + "arm_right2": { + "rotation": [0, "-10+math.sin(Q.anim_time*90*2.5-60)*3", -2.5] + }, + "finger_right": { + "rotation": [0, 0, -17.5] + }, + "thumb_right": { + "rotation": [0, 45, 0] + }, + "leg_left": { + "rotation": ["2.5+math.cos(Q.anim_time*90*2.5)*3", -17.5, 0] + }, + "leg_right": { + "rotation": ["2.5+math.cos(Q.anim_time*90*2.5)*3", 17.5, 0] + }, + "jaw": { + "rotation": ["17.5-math.cos(Q.anim_time*90*2.5-6-90)*3", 0, 0] + }, + "front_frill": { + "rotation": ["0-math.sin(Q.anim_time*90*2.5)*2", 0, 0], + "position": [0, 0, 0] + }, + "left_frill": { + "rotation": [0, 0, "0-math.sin(Q.anim_time*90*2.5)*1.5"] + }, + "back_frill": { + "rotation": ["0+math.sin(Q.anim_time*90*2.5)*2", 0, 0] + }, + "crown": { + "rotation": ["0-math.cos(Q.anim_time*90*1.5-3-60)*1", 0, 0] + }, + "foot_left": { + "rotation": [20, 0, 0] + }, + "foot_right": { + "rotation": [20, 0, 0] + }, + "body": { + "rotation": ["42.5+math.sin(Q.anim_time*90*2.5)*2", 0, 0], + "position": [0, "0+math.cos(Q.anim_time*90*2.5)*0.4", 0] + }, + "leg_left2": { + "rotation": [7.5, 0, 0] + }, + "leg_right2": { + "rotation": [7.5, 0, 0] + }, + "neck": { + "rotation": ["-10-math.cos(Q.anim_time*90*2.5-30)*0.5", 0, 0] + }, + "front_frill2": { + "rotation": ["-1.6-math.cos(Q.anim_time*90*2.5)*5", 0, 0] + }, + "left_frill2": { + "rotation": [0, 0, "28.4-math.cos(Q.anim_time*90*2.5)*5"] + }, + "right_frill2": { + "rotation": [0, 0, "-1*(28.4-math.cos(Q.anim_time*90*2.5)*5)"] + }, + "back_frill2": { + "rotation": ["3.4-math.cos(Q.anim_time*90*2.5)*-5", 0, 0] + } + } + }, + "animation.slowking_galarian.sleep": { + "loop": true, + "bones": { + "body": { + "rotation": [-2.5, 0, 0], + "position": [0, -3, 0] + }, + "torso": { + "rotation": ["-7.5-math.cos(Q.anim_time*90*1)*0.8", 0, 0], + "position": [0, "0+math.sin(Q.anim_time*90*1)*0.2", 0] + }, + "front_frill": { + "rotation": ["0-math.sin(Q.anim_time*90*1-30)*1", 0, 0] + }, + "left_frill": { + "rotation": [0, 0, "0-math.sin(Q.anim_time*90*1-30)*1"] + }, + "back_frill": { + "rotation": ["0+math.sin(Q.anim_time*90*1-30)*1", 0, 0] + }, + "head": { + "rotation": ["5-math.cos(Q.anim_time*90*1-60)*2", 0, 0] + }, + "crown": { + "rotation": ["0-math.cos(Q.anim_time*90*1-90)*2", 0, 0] + }, + "crown_eyelid_left": { + "position": [0, 0, 0.1] + }, + "crown_eyelid_right": { + "position": [0, 0, 0.1] + }, + "jaw": { + "rotation": ["5-math.cos(Q.anim_time*90*1-90)*7", 0, 0] + }, + "arm_left": { + "rotation": [12.2, -24.89, "37.2528-math.sin(Q.anim_time*90*1-30)*2"] + }, + "arm_left2": { + "rotation": [0, 30, "-5-math.sin(Q.anim_time*90*1-60)*2"] + }, + "arm_right": { + "rotation": [12.2, 24.89, "-37.2528+math.sin(Q.anim_time*90*1-30)*2"] + }, + "arm_right2": { + "rotation": [0, -30, "5+math.sin(Q.anim_time*90*1-60)*2"] + }, + "thumb_right": { + "rotation": [48.6, 77.55, 27.35] + }, + "tail": { + "rotation": [0, "0-math.cos(Q.anim_time*90*1-60)*5", 0] + }, + "tail2": { + "rotation": [10, "0-math.cos(Q.anim_time*90*1-120)*8", 0] + }, + "tail3": { + "rotation": [12.5, "0-math.cos(Q.anim_time*90*1-180)*10", 0] + }, + "leg_left": { + "rotation": [-81.73489, -24.7716, -3.483] + }, + "leg_right": { + "rotation": [-81.73489, 24.77164, 3.48303] + }, + "finger_left": { + "rotation": [0, 0, 25] + }, + "thumb_left": { + "rotation": [48.6, -77.55, -27.35] + }, + "finger_right": { + "rotation": [0, 0, -25] + }, + "eye_left": { + "position": [-0.1, 0, 0.1] + }, + "slowking": { + "position": [0, 1, 0] + }, + "front_frill2": { + "rotation": ["9.7528-math.sin(Q.anim_time*90*1-30)*4", 0, 0] + }, + "left_frill2": { + "rotation": [0, 0, "37.2528-math.sin(Q.anim_time*90*1-30)*2"] + }, + "right_frill2": { + "rotation": [0, 0, "-37.2528+math.sin(Q.anim_time*90*1-30)*2"] + }, + "back_frill2": { + "rotation": ["9.7528-math.sin(Q.anim_time*90*1-30)*4", 0, 0] + }, + "undefined": { + "position": [-0.1, 0, 0.1] + }, + "eye_right": { + "position": [-0.1, 0, 0.1] + }, + "eyelid_left": { + "position": [0, 0, -0.1] + }, + "eyelid_right": { + "position": [0, 0, -0.1] + } + } + }, + "animation.slowking_galarian.blink": { + "animation_length": 0.1667, + "bones": { + "eye_left": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": { + "pre": [0, 0, 0.1], + "post": [0, 0, 0] + } + } + }, + "eye_right": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": { + "pre": [0, 0, 0.1], + "post": [0, 0, 0] + } + } + }, + "eyelid_left": { + "position": { + "0.0": [0, 0, -0.1], + "0.125": [0, 0, -0.1], + "0.1667": { + "pre": [0, 0, -0.1], + "post": [0, 0, 0] + } + } + }, + "eyelid_right": { + "position": { + "0.0": [0, 0, -0.1], + "0.125": [0, 0, -0.1], + "0.1667": { + "pre": [0, 0, -0.1], + "post": [0, 0, 0] + } + } + } + } + }, + "animation.slowking_galarian.cry": { + "animation_length": 1.75, + "bones": { + "ear_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [-2, 0, 0], + "post": [-2, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "ear_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [-2, 0, 0], + "post": [-2, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [5.5, 0, 0], + "post": [5.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [-16.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [1, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.75": [0, 0, 0] + } + }, + "jaw": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [2, 0, 0], + "post": [2, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [21, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0199_slowking/slowking_galarian.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0199_slowking/slowking_galarian.json new file mode 100644 index 0000000000..90af1c524c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0199_slowking/slowking_galarian.json @@ -0,0 +1,67 @@ +{ + "portraitScale": 2.0, + "portraitTranslation": [-0.1, 0.65, 0], + "profileScale": 0.8, + "profileTranslation": [0, 0.55, 0], + "rootBone": "slowking", + "animations": { + "cry": "q.bedrock_stateful('slowking_galarian', 'cry')" + }, + "poses": { + "standing": { + "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"], + "animations": [ + "q.look('head')", + "q.bedrock('slowking_galarian', 'ground_idle')" + ], + "quirks": [ + "q.bedrock_quirk('slowking_galarian', 'blink')" + ] + }, + "battle-standing": { + "poseTypes": ["STAND"], + "isBattle": true, + "animations": [ + "q.look('head')", + "q.bedrock('slowking_galarian', 'battle_idle')" + ], + "quirks": [ + "q.bedrock_quirk('slowking_galarian', 'blink')" + ] + }, + "walking": { + "poseTypes": ["WALK"], + "animations": [ + "q.look('head')", + "q.bedrock('slowking_galarian', 'ground_walk')" + ], + "quirks": [ + "q.bedrock_quirk('slowking_galarian', 'blink')" + ] + }, + "sleep": { + "poseTypes": ["SLEEP"], + "animations": ["q.bedrock('slowking_galarian', 'sleep')"] + }, + "float": { + "poseTypes": ["FLOAT"], + "animations": [ + "q.look('head')", + "q.bedrock('slowking_galarian', 'water_idle')" + ], + "quirks": [ + "q.bedrock_quirk('slowking_galarian', 'blink')" + ] + }, + "swim": { + "poseTypes": ["SWIM"], + "animations": [ + "q.look('head')", + "q.bedrock('slowking_galarian', 'water_swim')" + ], + "quirks": [ + "q.bedrock_quirk('slowking_galarian', 'blink')" + ] + } + } + } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0199_slowking/1_slowking_galarian.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0199_slowking/1_slowking_galarian.json index b7d853f721..935a2d37db 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0199_slowking/1_slowking_galarian.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0199_slowking/1_slowking_galarian.json @@ -4,7 +4,7 @@ "variations": [ { "aspects": ["galarian"], - "poser": "cobblemon:slowking", + "poser": "cobblemon:slowking_galarian", "model": "cobblemon:slowking_galarian.geo", "texture": "cobblemon:textures/pokemon/0199_slowking/slowking_galarian.png", "layers": [] From bda5e2ade244c8065b8da6eabfa6879010792806 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Sat, 18 Jan 2025 23:24:49 +0100 Subject: [PATCH 042/121] Fixed Pinsir's scale + walk speed --- .../data/cobblemon/species/generation1/pinsir.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json index f772289570..9d757ed890 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json @@ -42,13 +42,18 @@ "catchRate": 45, "eggCycles": 25, "baseFriendship": 50, - "baseScale": 0.75, + "baseScale": 0.9, "hitbox": { "width": 1, "height": 1.45, "fixed": false }, "behaviour": { + "moving": { + "walk": { + "walkSpeed": 0.15 + } + }, "resting": { "canSleep": true, "light": "0-4" From c8074dd8258e81962f549fee62bb3e685d32b290 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Sat, 18 Jan 2025 23:25:14 +0100 Subject: [PATCH 043/121] Fixed Tauros Blaze and Aqua Breeds using the wrong poser --- .../pokemon/resolvers/0128_tauros/2_tauros_paldean_blaze.json | 2 +- .../pokemon/resolvers/0128_tauros/3_tauros_paldean_aqua.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0128_tauros/2_tauros_paldean_blaze.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0128_tauros/2_tauros_paldean_blaze.json index 2824c4c274..9e487c8526 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0128_tauros/2_tauros_paldean_blaze.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0128_tauros/2_tauros_paldean_blaze.json @@ -7,7 +7,7 @@ "paldean", "blaze-breed" ], - "poser": "cobblemon:tauros", + "poser": "cobblemon:tauros_paldean_blaze", "model": "cobblemon:tauros_paldean_blaze.geo", "texture": "cobblemon:textures/pokemon/0128_tauros/tauros_paldean_blaze.png", "layers": [ diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0128_tauros/3_tauros_paldean_aqua.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0128_tauros/3_tauros_paldean_aqua.json index 2f8c59ace2..facf158a3f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0128_tauros/3_tauros_paldean_aqua.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0128_tauros/3_tauros_paldean_aqua.json @@ -7,7 +7,7 @@ "paldean", "aqua-breed" ], - "poser": "cobblemon:tauros", + "poser": "cobblemon:tauros_paldean_aqua", "model": "cobblemon:tauros_paldean_aqua.geo", "texture": "cobblemon:textures/pokemon/0128_tauros/tauros_paldean_aqua.png", "layers": [ From 8c9ee2254739548557bde8f8f8f5096c756bae77 Mon Sep 17 00:00:00 2001 From: Konoha Date: Sat, 18 Jan 2025 17:25:49 -0500 Subject: [PATCH 044/121] We don't like special characters. But we should probably retain them for compat anyways. --- .../resources/data/cobblemon/species/generation1/farfetchd.json | 2 +- .../resources/data/cobblemon/species/generation7/oricorio.json | 2 +- .../resources/data/cobblemon/species/generation8/sirfetchd.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json index c54735960b..17ffbdd2c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json @@ -1,7 +1,7 @@ { "implemented": true, "nationalPokedexNumber": 83, - "name": "Farfetch\u00e2\u20ac\u2122d", + "name": "Farfetch’d", "primaryType": "normal", "secondaryType": "flying", "maleRatio": 0.5, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json index c41aad9a94..06d8c3ea09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json @@ -166,7 +166,7 @@ "battleOnly": false }, { - "name": "Pa\u00e2\u20ac\u2122u", + "name": "Pa’u", "primaryType": "psychic", "secondaryType": "flying", "maleRatio": 0.25, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json index eee7793304..7a5e13572d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json @@ -1,7 +1,7 @@ { "implemented": true, "nationalPokedexNumber": 865, - "name": "Sirfetch\u00e2\u20ac\u2122d", + "name": "Sirfetch’d", "primaryType": "fighting", "maleRatio": 0.5, "height": 8, From e12a1df252d10a5a7887ab6e7edc0340ddea9238 Mon Sep 17 00:00:00 2001 From: Plastered_Crab <49732785+PlasteredCrab@users.noreply.github.com> Date: Sat, 18 Jan 2025 14:31:41 -0800 Subject: [PATCH 045/121] Get those heaps of fishing templates out of my water! --- .../injection/gameplay/fishing/treasure.json | 100 +----------------- 1 file changed, 3 insertions(+), 97 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/loot_table/injection/gameplay/fishing/treasure.json b/common/src/main/resources/data/cobblemon/loot_table/injection/gameplay/fishing/treasure.json index bbe6806565..1a93119e84 100644 --- a/common/src/main/resources/data/cobblemon/loot_table/injection/gameplay/fishing/treasure.json +++ b/common/src/main/resources/data/cobblemon/loot_table/injection/gameplay/fishing/treasure.json @@ -11,102 +11,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3 - }, - "add": false, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:luck_of_the_sea", - "levels": 1 - } - ] - } - } - } - ] - }, - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4 - }, - "add": false, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:luck_of_the_sea", - "levels": 2 - } - ] - } - } - } - ] - }, - { - "function": "minecraft:set_count", - "count": { - "min": 2, - "max": 4 - }, - "add": false, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:luck_of_the_sea", - "levels": { - "min": 3 - } - } - ] - } - } - } - ] - }, - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 2 - }, - "add": false, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:luck_of_the_sea", - "levels": { - "min": 1 - } - } - ] - } - } - } - } - ] + "count": 1, + "add": false } ] } @@ -119,4 +25,4 @@ ] } ] -} +} \ No newline at end of file From fdfa10f5fe2ffa71bb0bfda3213a2330ee3498bb Mon Sep 17 00:00:00 2001 From: Konoha Date: Sat, 18 Jan 2025 18:14:30 -0500 Subject: [PATCH 046/121] Reimplement Cobblemon Vivillon patterns to feature choice! --- .../data/cobblemon/species_features/vivillon_wings.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/data/cobblemon/species_features/vivillon_wings.json b/common/src/main/resources/data/cobblemon/species_features/vivillon_wings.json index f468e04f93..203f4a3b60 100644 --- a/common/src/main/resources/data/cobblemon/species_features/vivillon_wings.json +++ b/common/src/main/resources/data/cobblemon/species_features/vivillon_wings.json @@ -24,7 +24,10 @@ "ocean", "jungle", "fancy", - "poke-ball" + "poke-ball", + "inferno", + "void", + "forsaken" ], "isAspect": true, "aspectFormat": "vivillon-wings-{{choice}}" From 57f9d5b6dcdfa23baf543ddd9dd66f0a39cc6703 Mon Sep 17 00:00:00 2001 From: Konoha Date: Sat, 18 Jan 2025 18:15:33 -0500 Subject: [PATCH 047/121] Reimplement Assignments to Cobblemon Tree feature. --- .../data/cobblemon/species_feature_assignments/tree.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/data/cobblemon/species_feature_assignments/tree.json b/common/src/main/resources/data/cobblemon/species_feature_assignments/tree.json index b352ac1453..00ea5da1fc 100644 --- a/common/src/main/resources/data/cobblemon/species_feature_assignments/tree.json +++ b/common/src/main/resources/data/cobblemon/species_feature_assignments/tree.json @@ -1,6 +1,10 @@ { "pokemon": [ - "torterra" + "torterra", + "komala", + "phantump", + "trevenant", + "timburr" ], "features": [ "tree" From dae5445c3ae6a6210d5fdd14e68c9c9e1bb44190 Mon Sep 17 00:00:00 2001 From: Sterrezo Date: Sun, 19 Jan 2025 00:55:20 +0100 Subject: [PATCH 048/121] Added cries for Nidorans and Pinsir. Fixed Mudkip line and Hitmontop cries that got lost in implementation --- CHANGELOG.md | 2 ++ .../blockbench/pokemon/gen1/NidokingModel.kt | 3 +++ .../blockbench/pokemon/gen1/NidoqueenModel.kt | 3 +++ .../blockbench/pokemon/gen1/NidoranfModel.kt | 3 +++ .../blockbench/pokemon/gen1/NidoranmModel.kt | 3 +++ .../blockbench/pokemon/gen1/NidorinaModel.kt | 3 +++ .../blockbench/pokemon/gen1/NidorinoModel.kt | 3 +++ .../blockbench/pokemon/gen1/PinsirModel.kt | 3 +++ .../blockbench/pokemon/gen2/HitmontopModel.kt | 3 ++- .../0029_nidoranf/nidoranf.animation.json | 8 ++++++++ .../0030_nidorina/nidorina.animation.json | 2 +- .../0031_nidoqueen/nidoqueen.animation.json | 4 ++-- .../0032_nidoranm/nidoranm.animation.json | 8 ++++++++ .../0033_nidorino/nidorino.animation.json | 8 ++++++++ .../0034_nidoking/nidoking.animation.json | 2 +- .../0127_pinsir/pinsir.animation.json | 2 +- .../0258_mudkip/mudkip.animation.json | 8 ++++++++ .../0259_marshtomp/marshtomp.animation.json | 8 ++++++++ .../0260_swampert/swampert.animation.json | 8 ++++++++ .../sounds/pokemon/nidoking/nidoking_cry.ogg | Bin 3574 -> 29431 bytes .../pokemon/nidoqueen/nidoqueen_cry.ogg | Bin 3574 -> 21888 bytes .../sounds/pokemon/nidoranf/nidoranf_cry.ogg | Bin 3574 -> 14106 bytes .../sounds/pokemon/nidoranm/nidoranm_cry.ogg | Bin 3574 -> 19131 bytes .../sounds/pokemon/nidorina/nidorina_cry.ogg | Bin 3574 -> 15438 bytes .../sounds/pokemon/nidorino/nidorino_cry.ogg | Bin 3574 -> 20241 bytes .../sounds/pokemon/pinsir/pinsir_cry.ogg | Bin 3574 -> 14864 bytes 26 files changed, 78 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0ed08d291..6bc7167317 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,7 +53,9 @@ - Paldean Tauros's ### Added cries to the following Pokémon +- All Nidorans - Shellder, Cloyster +- Pinsir - Tyrogue, Hitmontop - Spinda diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt index 519faed7d1..d8b9d750f2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt @@ -13,6 +13,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose import com.cobblemon.mod.common.entity.PoseType @@ -40,6 +41,8 @@ class NidokingModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, B lateinit var standing: Pose lateinit var walk: Pose + override val cryAnimation = CryProvider { bedrockStateful("nidoking", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("nidoking", "blink")} standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt index e075df48d8..d6af1d82eb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt @@ -14,6 +14,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedW import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose import com.cobblemon.mod.common.entity.PoseType import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES @@ -40,6 +41,8 @@ class NidoqueenModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, lateinit var standing: Pose lateinit var walk: Pose + override val cryAnimation = CryProvider { bedrockStateful("nidoqueen", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("nidoqueen", "blink")} val spg = quirk(secondsBetweenOccurrences = 600F to 900F) { bedrockStateful("nidoqueen", "spgs_happy_place") } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranfModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranfModel.kt index 1d6ba446fe..c0be1ff641 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranfModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranfModel.kt @@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES @@ -37,6 +38,8 @@ class NidoranfModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, Q lateinit var standing: CobblemonPose lateinit var walk: CobblemonPose + override val cryAnimation = CryProvider { bedrockStateful("nidoranf", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("nidoranf", "blink") } standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranmModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranmModel.kt index 49e4d74000..83f8b1c124 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranmModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranmModel.kt @@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES @@ -37,6 +38,8 @@ class NidoranmModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, Q lateinit var standing: Pose lateinit var walk: Pose + override val cryAnimation = CryProvider { bedrockStateful("nidoranm", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("nidoranm", "blink") } standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt index 662245289f..041a1a9417 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt @@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose import com.cobblemon.mod.common.entity.PoseType @@ -40,6 +41,8 @@ class NidorinaModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, Q lateinit var walk: Pose lateinit var battleidle: Pose + override val cryAnimation = CryProvider { bedrockStateful("nidorina", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("nidorina", "blink")} standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt index 9d72a7a4be..3aa93fc26c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt @@ -12,6 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonP import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES @@ -36,6 +37,8 @@ class NidorinoModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, Q lateinit var standing: Pose lateinit var walk: Pose + override val cryAnimation = CryProvider { bedrockStateful("nidorino", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("nidorino", "blink")} standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt index 6480e84024..0955ff456a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt @@ -8,6 +8,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose import com.cobblemon.mod.common.entity.PoseType @@ -32,6 +33,8 @@ class PinsirModel(root: ModelPart) : PokemonPosableModel(root) { lateinit var battleidle: CobblemonPose lateinit var sleep: CobblemonPose + override val cryAnimation = CryProvider { bedrockStateful("pinsir", "cry") } + override fun registerPoses() { val blink = quirk { bedrockStateful("pinsir", "blink")} sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt index 112197dd65..1ad96a83bd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt @@ -9,6 +9,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose @@ -32,7 +33,7 @@ class HitmontopModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame { lateinit var walk: Pose lateinit var battleidle: Pose -// override val cryAnimation = CryProvider { bedrockStateful("hitmontop", "cry") } + override val cryAnimation = CryProvider { bedrockStateful("hitmontop", "cry") } override fun registerPoses() { val blink = quirk { bedrockStateful("hitmontop", "blink") } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0029_nidoranf/nidoranf.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0029_nidoranf/nidoranf.animation.json index d07ad65fa1..a461e82afb 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0029_nidoranf/nidoranf.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0029_nidoranf/nidoranf.animation.json @@ -43,6 +43,14 @@ } } }, + "animation.nidoranf.cry": { + "animation_length": 1.2, + "sound_effects": { + "0.04": { + "effect": "pokemon.nidoranf.cry" + } + } + }, "animation.nidoranf.blink": { "animation_length": 0.16667, "bones": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0030_nidorina/nidorina.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0030_nidorina/nidorina.animation.json index 5b80869c53..1f5e26ce74 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0030_nidorina/nidorina.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0030_nidorina/nidorina.animation.json @@ -354,7 +354,7 @@ } }, "sound_effects": { - "0.0": { + "0.04": { "effect": "pokemon.nidorina.cry" } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0031_nidoqueen/nidoqueen.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0031_nidoqueen/nidoqueen.animation.json index be42b4643f..80ffb3726e 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0031_nidoqueen/nidoqueen.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0031_nidoqueen/nidoqueen.animation.json @@ -105,8 +105,8 @@ } }, "sound_effects": { - "0.0": { - "effect": "nidoqueen_ambient" + "0.04": { + "effect": "pokemon.nidoqueen.cry" } } }, diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0032_nidoranm/nidoranm.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0032_nidoranm/nidoranm.animation.json index f10e768dfc..c049c5a98e 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0032_nidoranm/nidoranm.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0032_nidoranm/nidoranm.animation.json @@ -47,6 +47,14 @@ } } }, + "animation.nidoranm.cry": { + "animation_length": 1.2, + "sound_effects": { + "0.04": { + "effect": "pokemon.nidoranm.cry" + } + } + }, "animation.nidoranm.blink": { "animation_length": 0.16667, "bones": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0033_nidorino/nidorino.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0033_nidorino/nidorino.animation.json index 9598c15836..bf15fcfcfd 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0033_nidorino/nidorino.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0033_nidorino/nidorino.animation.json @@ -46,6 +46,14 @@ } } }, + "animation.nidorino.cry": { + "animation_length": 1.2, + "sound_effects": { + "0.04": { + "effect": "pokemon.nidorino.cry" + } + } + }, "animation.nidorino.blink": { "animation_length": 1, "bones": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0034_nidoking/nidoking.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0034_nidoking/nidoking.animation.json index de8f74fe1d..22d434bbb9 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0034_nidoking/nidoking.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0034_nidoking/nidoking.animation.json @@ -132,7 +132,7 @@ }, "sound_effects": { "0.0": { - "effect": "nidoking_ambient" + "effect": "pokemon.nidoking.cry" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0127_pinsir/pinsir.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0127_pinsir/pinsir.animation.json index f842ff001c..b54cec1f69 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0127_pinsir/pinsir.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0127_pinsir/pinsir.animation.json @@ -1495,7 +1495,7 @@ }, "sound_effects": { "0.2083": { - "effect": "pinsir_ambient" + "effect": "pokemon.pinsir.cry" } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0258_mudkip/mudkip.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0258_mudkip/mudkip.animation.json index 01a04e66af..ad03bae7ff 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0258_mudkip/mudkip.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0258_mudkip/mudkip.animation.json @@ -109,6 +109,14 @@ } } }, + "animation.mudkip.cry": { + "animation_length": 1.2, + "sound_effects": { + "0.04": { + "effect": "pokemon.mudkip.cry" + } + } + }, "animation.mudkip.blink": { "animation_length": 0.1667, "bones": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json index b1791c629f..502174bfc9 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json @@ -75,6 +75,14 @@ } } }, + "animation.marshtomp.cry": { + "animation_length": 1.2, + "sound_effects": { + "0.04": { + "effect": "pokemon.marshtomp.cry" + } + } + }, "animation.marshtomp.blink": { "animation_length": 0.1667, "bones": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0260_swampert/swampert.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0260_swampert/swampert.animation.json index 7e1115b6fa..9e8f1f4a89 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0260_swampert/swampert.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0260_swampert/swampert.animation.json @@ -209,6 +209,14 @@ } } }, + "animation.swampert.cry": { + "animation_length": 1.2, + "sound_effects": { + "0.04": { + "effect": "pokemon.swampert.cry" + } + } + }, "animation.swampert.blink": { "animation_length": 0.1667, "bones": { diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoking/nidoking_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoking/nidoking_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..a5f85685831dbaba1ce6b951c45623916d53eed3 100644 GIT binary patch literal 29431 zcmb4q1yo$Wy6*;x6fXseOK~kw+y-}dr$vgp%K$CV;_gmycPL)GxVse{oZ?02P5VFR z-m~so@4fZ*B$>?4PQHBdOTJ`hlr1dO0eIkFmv`XQ-yC_plLj0aoV$awiIvNrJ8%-^ zu=En{zv4GI-tj@Rtn5*;R#~VL;v&IL-?m1Bv`SUq^OFd+Mfq8VNp^^Tva1x&_&I@0F4u^C#EG7MhX} z+DBj-!QTJxgo4uy4*;G40rbzK@^)pd$M`G==%So+_^gz8iztx8RDbe4@4linwJ)qM zw6Py!ph3aVMFe0n5Rst_##Q^1n1oP%CV(YhNSuFA7G*f2G8X52Lgn~D5vahipC7Np zzh9ge#eYCwKOu(3Qa>f9z&@*GTG@_d=<71Z2g&$X^87C!6tKRCArYEki=q5!K7^q# z#TnMrKWtF|0WdZJ=~!IZ8roXI)8Df{y#aEp(hC2#@Ig1p{Qn(9EPpTp zA~0DFIFSrEQA?^(4>&U;|CR6$0H#wBHRe8NPH7j;0T)47kam?AOi&oTRKWVT68@+i z07TeH`kY7xVbV}znRe#Vb`hF)QJjZ~;*UiB@7Kq__5x#sGV?={bpXoSnD>9h5&&zK zAQwd({U1uO2SReUDbgm=E=Kt<({^%7aMP!|LN(IqnoCmB|7y^7jBpF4ONOD;zMRyF zG?y`1^t6J1a$Y#;$Q311uzQ4%49tGQ_ps-zrqYm07Ik2Cbtlqxi<@y_xzL1kx`t+r zf7<((S(F%MjCJvCz-ojprQ0+=H-zPG%`#3#pZ~e{Kg~x3rnmPC1pS$xD8NxjCb*P^ zl<{P)(U|c$>^~Ut$s(hqV@|zmvbF{Erpq$AvKt(btV| z3^V^p%6rE65375y#nIVeR?N%=v*O5x-7J?%J{g;WhB-Z^f&?`=hJt?(1yd@8S&S$W z;a`w^PH`S$D1xElKNa_jdi(|Hk2HSu`F|SLe<25efhOoLCKF5|*atEKmBgO^qu_rd#|d{JmSixNTE3QAaf*5L zoKyLNbMmF6DyO14p5Y{(+cdtpI=A68m-)1&`K-J7Vxzf!6Ii$LUx4`sHtX|l|ACx8 z5P8iPwIvhx?7xwdLm#!t8$~4>N39!2>y=~?npTpUwO{fT^?xA8GOQ>itSBT55)wrp znq(E4R@(g4cBt~O<^LJ}3pvux)UW_Uj-)g7e<0^OJBc_9O|{I57ys}mGzk-^tK_Ty zQ~&^ck3pCJJC3NTvCOJ*&8o3zY6$(`5d$lo_ z3vf(BD`1rXWLQMYoruAM6Tt-l6Ld9HhTsIXF^1h3wITK$5;Zx#!VL8>J`~cRA$Fw9 zKx~Er67?|#2uaY0=uSr9geW}#P<)4jMKO9#Gf4oO4)_^EG9J$%fm|56&LX|HIpD9d=aJyRF^`O((!W z0bbS6G){I~r(bSiizqEUEM>m$XB_URz87vednu(k>!#@*Y?x?gybzgLecw?t(lYuD zY|LkGtev#3a~}Mykp;cZ;jO(f&s~2N`T)mvYN1_tW$9tz!9jQVVZXzD3wuQA0j$vr zP3>zK&F8Hr#65eZE!9J{r)7;t_bn&H!wwJM8b_PJ+3d?L%D*Fhjdg|^S?Ytcoex`T z&^u!*A7C>Afg^10V9Q0vC8~W5guDdaVLL0aBj&21iy>1MV2a7&nPPK5@-;?8pBL2Q zi^*1)po{IK1dZ@9`0U@ z3Ud7!2`X~(xe0Tyrd%=A4k+?9)T}EKW=#50643b>GXvw~7}*mO^w0|GwdBHT@^STT z*yrXDshNJ{N7#A?-6O{z!f7wnX=#b?68H4`8y;y{(WsK?&J4&Re985!MVeF86 z2|4!NjD!((2z7n}JA@=5K@6oJe@YD{Hz7fd3Ff%`#XXW@XdfJ`Lofbx2iH=Li4Bxmy?NJ&nHAx}+@sl+@^&ZZy{9{7$)0*lN+ zu#pTN@Pc^??0@LGAW;^Oz-H*c7_|}DG;IRw5Jiv*Lw|}3w%8967fje(Wj4ZxOc{jD z|EE9W0 zvmV9@NmO>E-26Gl{*3rIwFo@ZF=rb+#e@dhT*TLod0J+?N9lW5V$D)^`7|# z2uxw3&G_R?!#t5c1u%C6=2rjlNg`kcu%9qy|F|gs2PUvz|8W?s^8b1boPS)0zq$XP zga#%g*qo1z3OKbn0+*@($wbMYIR%vuF*8Vms30RSMox}_OOB6@5=N!$kECpB`gHi{ zXbR@^%4=Xh!yD$(T;YO&$>qyGt$;lm+-Uqc9=K+tk1`iY1(~U{cY3ljWnr zK4%bkB8rl0QqBj{6jlcS#G@bsy@+cQ9vJ`D~Ccn({@z-d)8 z)zw?)eJhD?+Y9_o=i2+h>_>sd$hO1;71xXj%|b5T%1^|1xs*(B00#^x)*}rAI#e)N zXy~!xsiDe+wrj{SAm{F+!Dcw;B>4fDI#kPPTxAHKRRm2i1c!W0(qqaM{~05Gv}@_~SEc<}+p7uYfKKj_)$NnVc07GVG)*stG8yf$H% zQ7A?V3)=_YIenxg2RJynr&w8YhJjbEPV*nJKVb(^;3KPuz+) z#{+)`cmjY7cR)yp& z7En4UGn5tfp@p(R8K5k6AO$|4G z4sLCa50DR1&O(pQqwcLRjFiz7)pxkhVNY;=;C&n66+^z zS6C~>87u$^d{b-6%3fMkI~iGyG*AuCKYc4iqWRlBZXki% z2445fdgJldi+P<8tB(k*dn(&^Ypz_#>)wu8RaRCuxpaEu-M)4%Xw>Juyx)ZWFqo~f zrLt@YjVWrNzl&ttq+R}yz56mUDL;4yDibhg&&<3JS_)$#M$0V1686L#cs16Dlpw5* z#JbGJW_aAJz;Wg_c5~3`N4o=cHNqON_q;wdjP^RYIgY8JYj!KCGLEerm3Xjc4Qq~` zJ)v>eE#{TOv*nQrXfCB+aL_yN?5JYa`EfG)!A=xs&$3L1udzeQevu}FTN6G!@zqEt z*k8-&#OLz&zOKL4+$%R#<71C&?{gBj8G(6$o%`F{2i|B+n!=Jf@ z2k43iO&I+us<^JlM6FJv6`vG1)n>|!6o3ByRm`j<74c9kiw);XE32YmXq6a>o_*wJ zTzX!#aoZ-`ySHnxC3}BomvUmtK5pnk-Ztx^{3Pe~W47Pb^Z7`?J?U5mAJY)V3(7Fw zvtxzI(+&sXE9pt1#Md-vMYYC{$3=MA>zVgb$2vKR7O`61KrInXG4cU&fPV?o7f5E) z*pJ$iee3Gz))NuoiC^DBd!BuVQ$)Z7Xj#60gwNUh&Ih5_E141bWnH3M|1i1gxh0{6 zB43IzCsBlrsb3YY$#L=U1D9(}erdeSvf2GYZe09!-Pr2HsdKU?kM)*)yggGka!-I6 zA4^o|^yK8jRcYEm)P!URR??LGZ2W?{eVd1RN1H6c$gT!q&=HXVN_V~>WBNY7-TRU{ z0bdXIUv;M|cY_DA*>|6s@y4B}B3eJMP$j-seDoV%Y z&o0%IbYs`AC-*kG&=9k#ynHjy;=2i{o|_aZh6l=p5mA7bnB~T;MtMZl@bO$2Tf6md zx|Ar%pm;Bx*0u&-4`0O_wd9sGX;-(QC21jf!S$NxBI@o+>+{f_Z1EATSHZD5fR2le zK|7^%n5$Pe1FT=XXZVB^Xm_rB zMblIH%}x^-W8E8p`tItH*B$wM8S`vTsd{TsD{Dr%_S-ynfuUb_M~9dyJ1$%a5Z#BO@rk^$b1tme z?1saQE7Ox`FS4Tj!=hQ-c{{>{&viA|hDkKpnJqQzY@RZCTBmodi*A~agIq_6-SSlj zRY$-5dBR6|x0PrOT_*4C`cMWad1ZhMIhyx%8|SayufbijfsH}QTgJkRJ?njuqmoz+ zZgXc!k*`t&cU<0>+e}avd^CKx7)Tzul7t` zMmtv9((O}J9hyuFAOkLX++Tk4Yr>^5(zphFe1+?1pKR@L)qHqXJvQt?f}VCF%NOX2 zXbjhfhMY6*^drC-2!M-$(*qz1uWIS3yYx)4N)E@0Vi<6Pdj&7`QBww*Z)jHi3b7;w zQo$7ZXER?KogaUx$qS=FS@p)rWlpV)teMTo6_m_-%(z@R#KYw^Uc=SGI0b_*n0>Xm8Phdg?PZ}87Zy8L- zUEhJsmy=hG-`RI8-g`Gg%tS&?k}qo4lO2R*KOjK`MWzuOy6+kIy zHfL(_)6JT(HSBF5x=sK52}cm+cf=AgWtJCXvt&k&V0XQBUy$stjSEy|$X4M8gm6Td zl*YvSO*jJ9tZhVohT5lgokx81!vJF7N=xNDk{Ecydh2QNRkv3)Ob=&V3Ks+{#KQ#z zPLL9)4xAFqv(37r<+dYx2Jp7d-1vezV=w3HHi3YHHcc5^m(By;x8jxOJ$!@ z(ZJ(8%yK86ETYcVcY$fiHP1#_2yeZ7Is%%-tEW&86{K3XQpoUp^9T!vavAigevPm? zm8TpP+-R<_i#=Og57lVP7;7^!we>m}`yf^I>txVS4o7{~jj7~_{~HzUvJWn~9x?nJ z|2h7&TjgA&+1EQd*(iqX%_)6nnL_cTnE`IEq^_ml#*x$hO3de3Xa%z(a^c@CBZgO< z^~7gF%UN@EB~9NSFaVB{(&hnjB?vKsffSbrMP0uu6CEk^547jigYcEXPe24@G3CM6R-Q; z0u--O?UEx;RFei@waDde9lT_+`Vd5 za`V@dKNE0eMlq>xz|M`gcGz=gv7t#vr6MCyOmm%4fJQP0x~KdS`|9JOa{3ED-{xtF z+VA7)6#Z+O$5-e0EMH@!cKI#AUhkxubf}bSj%8x`4c!AX;+2Gqg>8%jG^H!?{ z@GqOJR>C0sg&6>kKv4;olh!ZO4d?`ofmN1{?#o7hwpAywqwZ2&VD%Od$yZy&Bduu} z*G<;YlNyp#H`}d`+v)kgG3YeXl^rdYR+DbZV4OAXxSvyRYYR0%(O=j0XN}NoTU>9D zs&nPIZMjkL+vDW@u{7a_&9P9B-9g&pY!V-2pL_TNy#qYVnR{E1f!O+dQ!O zT*2mJhz5~kH)d3-J(xQ}q+m-$*!qNV;9#Iq)tyo+BE+)epmKOKK{ru*o&jP#?$J;+ ziB*2vyE||g*kRv3LC8mQDEro>Q~BBn$=mMK!|!}~tj~!swn<>Um;1)3fr2)feNlp_ zGM)cm?1_`NIxvutj?|g}q>iOesg-!Di5r(>KRlV6g386>Hod}>GQBs<5ZMwn==Sow zii{?!M2GO@wR(0)Jw2ew?}F7*O<}R(Ew7=~YBiCaTU+|}7dx5N0VHjS-6`$X%#9fk zK9tZy*oAvO13i=<5^mg0V;pkdUmLN214zsQ;IO0g1Jnj3t>Prv(Ul#NAHU&c+s>>* ziFcv+O}BnK!XUM37kUrXTn<9Zx|*{~d@uX6kg11iYbD{!@yCQbdrqDzypvUbKdboK z=dpvCg)eIKcnjD1qPfTNNw!s9(JAVbB7>TEulW=h81&n^XZ$%vc^+5Hli5GLE0S<^ z_$(r#&}u=1(Nmd*c6Tr!M2TFnq$p5t5{Qc{_lAG*F~Jw>ktymBq5@}ZWPj6v$y<>* zFRX5!1vx}Q8*`MWdbw)LN5P4-YdZbdqbe)~%XjZ5!>Am_1dXaXQ%-P#*B* z4ONxr98*uk@OFKjhA}C3)$xoJ&a{uN&*_h=8M~~6#Sa!gR`AD%1uW?>-Ak*{N>XAd zlvG=j#&|NcS9E@-^(#0UUuHaQwbQ3(hiY9EdqAH$5m(>Y1@m8~Y($^RJ5@bPINF(R zR&2Jk$ry=H@Y?p9_WHJhMsuS7p2|#s9#Q#l{slEhFB$EVUxXbUKP#=k%Jt7zdJmQA z7Xt4iuc9lIMQ)?=N0z?)x|%A^4uE&|uztN@?Uei=_f1fVg7p2%=c4(Sy(6E}N61Ge zpbLjgw9YTSXQgo~R#-*Lg8H)|-JuH_!01q-A2^45z6}+&9@3dP5cl&;L6rew zegMsI93rJ0nc2x)D*5WrtJRiYqL0gU?&%K$CZ}HqH@df$&Ac-q?%kmKmAfIKZ(CGa z60ST#b&8_yu|+~m$u=u1vi*W8SsS$*3`Ba=ZE)nQEPvos?9jpDjk z#`iJL=B~13Zif!d;VuVpIBTj}SplTHATzu6B{>>do-I!8Zt%2X?6$NK*%(1^hK_!j z&|tNo7XJMp-brXwN`IZ^_x;B+j@20{YeEj~n$P%(lomUIoZ$$W7m5D)GR) z4PZh?{9)+`1RUnTX&?^LARyMMMjC~^S@)MbuedS3^I#*Gmb-d-c65k5+Lnnoa{e(+3LYvCQ&O#{Nu29I)e2W{i8u@Z-Q$ZDq^8B}jQ$vsw-<_Ztw zKd_7wIWv|Ud9HS=JN3qj#9@^89TNXuZhLV-!LhPkt+id@`y+3zh@HzYm(DlIw?M{* z!?0fO%f_OKk6Dx~hN`aw(~3Yd+h@H6R)ms_oW!XEgfT*OVv+;b7(G{;d&jf)p_7)4 zm_<)}8#4=H%X;bqAb6mj4DlHNudo{3Ug>HEeTV2I-l3*^g9ZjWllb`Ila+d|)T&@* zCQPLWGaiHTjQy8=H}J}7B~bvvIQ356(Ugi1WBH(faL(azx6zo+-4@pq1*O+eWx<2i zn^WZDaOJ{QzIzg`sDy^;m~o+AZU%G!6S=%ee80rPZx(|#prNr@U1N9djRqD^l5yLr zWIpaIo;mO%Qxp!Po$!=T6<8(8&9!m+%-b!J*EC+3_u$t95?k zf=PSL3??YEL(1&9ciaSxXY?4MboIvB@V>9X=l~ubue$bduqvqj-84g;`Gm(G_kCK%h?<65ICi=L~ps=-7 zw@ljc>ufhIzoVkIkkgRs_#>K6=bU596w0yl-%pe-!sVQFIyBFy4Qhn@f=Vo;BjGtpJ zt%G)LZA;kjg*AIUHQfmY^p4xCXuFZ+m#+~IH+L18|Ce3D+&(R-U0pQdle)pxQm4Cn zsImdZeqsE;*6C>F9uf48Zc|yEU@R9w54Ay|3MC;%VkXV<_|W3qTXHdQIj~{wm#k2R z56insc>Yi%+&uvxCHxGHH?I$Kdk?m{nY=zqohSfc+fq`XTT z=Ruq8Q>AQVs5DGYoF06SXe5AG`3!|R#(mxUyKth-ffY$aqpf*?8=*k4oRjl5e3#Sr zNp1hdL?$7~fH@h6_nX-$7uGnrSGc17dbyp&wu8Ion|VQgn{B1*GgjujG$iO1qWndj z>1^{4f_7(JsP8Q+wB!uzCs|bvX36AFH;9kY)YlGj!7dC=TE+RXMj)EQ=&4vDZrR{o zw|=WtQC!g;?=U4CXJ7jD$7l0_p|_xDqgoY6Sq3;uiSI4FcJIe;m^smM$9tW>C(eV% zh*&JZ>8-^y4XErZSk~a&vEWTqWcZBC#d<0N6Ej<);xZ*~1sh$wAr_?AgMkwV3%qXA zF|YZ4f=UYHoKbf|E4F3(noaBhuj07QTs@!s00ZOYD17v{9d92iX3uf51o{djdErHF zDxl?6+3oa4KXsujHF!Ef9-i&4!!|6rt?;A*kopN))PX#=hX zD!I&dGF?tRtQu5J8f8|7u4TX8>>j0@&^c z+AjC$c8&T|7?%quU!d(CBex^pLJzYtC2P;G5NFo?ZJO=WVpTFT=SZ~B+td4}gk;hyxe!Y&4Civ-;(YknL zxL9MW=Wl1*fI(J+5Js^OT7EGS;{o0BVqTb$qHPnfjKAWInxgtv*7$Q-5X>-{g;-LG zW&N7q0N+}@>A=jRLxoE!y=nlX$$0^xx3MaJE}3(@hjXe!FpLGF6{-EK9O0)~eO8<( zOOU218ojNqm;a#hv`6sOVcu>#RttPM>19v`%f1agCsp)|?+7oU+QW>1-+fSxB*JS( zkyDqKRHnNF+_Zupt*-E0IWRF10YV(jMwgF$&%;!oc2)i zn57A=<-#X|Tv?6L^!}xRG;5-Z2;(}*4c;4`+3o#vD>Fh&)S5+yV}knho`p-N(%v1Z zfgP2*E}TBhh_^g=Or2abx{9Xmqj!ptonKqlSocY-gtTS)Hmj(((%nIQdnzPM&$lAj z)!tmqL{#JIPVV9(l0&K#k5etz(X)j?0EoUKB!M-k=+U3sdru(a`5hMz7HL2~yx(%K zDSRHe4L*E^PkYUQ#SjV61jGo?8DI)}4qG)j0z?EXALWd&dEWyEV6!KssvG-tI{|@* z^+W$h8%r5myG2xad*j^s>1fE4>m+jYVJB9ZCpQeMk#@uGJF-yeJI|MKD&DK`##=`o z1}8PrZ0_1b9niJ;8Mjj&mH|=--*1^FM3ALa5jdk!01Ln4?T0SCU!_Mr_N;Am64CEt zj->MNFnX>|`65K+tA{oUB zTg-QGV6;3QTXN_t^H=sTxz{0kkOLDPv|@bXK}vR6+nq?3J|J72W3$vIZR;byL@JR@ z!6Ns#@LW}N39`}sGuDrD$T$=Fy+jt4YS+$5ZeriPg%Xregg+txcg66S3ISS9i#r*G zYQH&N&5<@fyFPf5?4Me`kIcUzB>wu+4AsE7`G+-WYp2iCb*;~n4E_KrQ zJY|lqdDqAcicMiyNzoZ#8&$lrDBoGxIu zEfK5WWM3|tkt8)yynqlRL_V612G*fPjJJI@WlxH{6I?p=7*azm0baQLllYSzj>X1yD26mL!1lVHOKgozP5K24BwVp|(YiAjeg{>WTp4wzIe zRbk%{LAFHTP5n~ILFAbTZ@2?&&_UOH4O%WAeJm0dncY4_WbpH@8#w)r_(~G2S5q?I zPJMIwu{^$yuC;#Wuyw^>Tc}j;~^%8tr__kQga?_EvH^s}%Mf1z- zF<0w~_L8m4Qzc%?r~m|yXueQ!9+m0!2Z`Iv;xeg20r4({KnJ<=v=`rm@XDBuWODZt z`5rnt8?{4}`-U*;g+$23ZOV93hc4({Ye}l9$SCJM*9d7SwnoAt z=j*?$9pfHHBq~`QcxYfZooeGR?vp=P-=`3az<;VM0e8m)L@KUxLtX81SeHm5Ij%neGt?GzHlVbP9CW)cQ$d z+H`SO2A@)1ek@E}EQK|!K}0s}gy)?7ENvhun(Xn-weI>wm*`ENKgUgnc3*}6)iR%O zd3Z|(Q-b&^Sa+dFo*JWsnrer$Q~JlJzPWr3hH+-HH*~ERJ2%Fyq7c$J3BmP@{!5F+ zR;$y+=DCxqr8>f=PWPT&D{R5wGc9bQhw@5G1Y>i|-10i;41dTw|H}5Di6%(mU3B?% zqW87*>et){9??S7)H`E!a3M>e&GM-J+GXe9G~-l^cKKd+(zHy;??WYT;MG;{QY=%H zLS5c3N4Jr4E(9vv8JC4NE-QGo)M?ay*^VM-OzCsUxb#n59LMlAjYPh)a>1pB9)T}5 zRZpIe3QTfzaIH$j?wB4lELYd1lLHSwbPK(Znh$<3Hq!p4vM%@v7!CI_!278O0$U(K>E zl_d0bUGz4v3wt*jKFC1)LRP<8^i=*Bth}+1bdtW~DB=r>bc>PzBxyeK_2 za=RkTC~??)>30uG4XLn+hHfe@JIt@DvCQvGxHb6A1*Dbq_tm7Jq)G76oPo4g%e^qsJi@8P5aw(orlS5s6v}yOAtydeqdRcUWs=36zWhT;G zsePu5#QB3WJ8!o9C&u3kC)@XYsqB=kobc|*TSuMIHXo`>w85moa=`?eB#x~NF%fM+ zn$gk@BPKpBv`#c=d9oB%rTwABEfJLp9ySO(Q;;KMdZ$v0_z?JiZ!LWJyR-23)WkDb zRs*D1hz~V^nnRhdZ1VnN`{!BlNNxC# zAP^w3`Zhex@u^wMzb>MMPq_{oX3g8~SduPlf% zSyE0G#|$$XRI=z-)Wpi%T-yZkmv4m4jLv=^qn8_{>EN-~D+yBer+F}QnB*F*r`x5^ ztS1*skeXNU{vy%!eMa>`fs$h--WGc~{@p{lT{Pt8%pumu{P(=517_fKap;MDM}kSt zV#Z`#>)eaZuksh@r!S4ldTB+^)L2y%9R_uYKP8fygPgjp<+omX4(fJ6M1kLMus=39 zA_F74HuHVyszyD8@4b#WE8K4{F+9x4Ha~^8 zunl4v&F!y0!WU)FEJHRP9sQJ3>~g`a37wuGVw-J;KD*2ej*Z@O^Cu&g11koUx&oyb z#>)ngw>)m6O~fvdEpO5#<*Q|@sZ7P8o>r}9Y*ma|i)daq$KB-Ge&*R(c%)^5ZuG~R z6~Rj1`gS06Z(#{-9Bt8l#8MLWcZ%BjBZus8nL$jI$Z1aUg3|^W`Yq^W$5ov-Jnv8!O1o?w1?4=!4md=0X1k&BBuGqt?xu!&`c5vtEOj8#a2t z31`85Fk0R8H~n8nH=)VtkXjQiJ6pbvE1F`h?wvP~BM%b681{I-Pb;;jd9w#I?yYpY z*;PDTOP+$g8BRA_O2ytjmJ#zS-1ooq1*@ERJN;4@)}LGiNUKbE^E*0&K zk;D<0Ob2l#F_dqKn!9Foi%46SIQb)AS4V4AJt?Gf3gtSas<57xs8){q;2o=-8OIv# z_42ba*3qtoqwjzn8%|?Rres@JR@(Q{VhqVMQ(mUP)eLZOy&tv2Dg^wNIa%R-15ifE z^-Rsjl+EXm_ZXxP4XK%P5Em)6-$`e^3FiJ@`)bTp1vr8NcY&G?DmlgPC@2s#Fk}`! zX1{hL7b?4ZoZPidYR$gEBHM@Zv~QfwtzA`&`1XzOf}(ZOqUYz26SAWm3Q5rG{yI0c1H;2$%;Us z=Z|qb@gwsG&>g7xRgxUSc#m{vD;A_OyAjWx(uL}_$DSNtBh`{9yOO|VFz*GIaVj{C}6A%;TS^GR<8x1*cC0|^TmKz%sAvarWGx7EzI3gDEb-P|3{kcgJ zigVLMez3J)=i>)^fB3GT{_dr|=w-ClFd`EQ9Bc+Q`V%>x=^KfhVjfOuQh-m4`ZmJGUM zz|M~q4o+c3eqf5Vs{kQ&drf7v>@r`@e zb#^LELYCFt)v7v4E(y;EgWcBbfOcsQiwf8oE)u~xX=j8iha|8@tJmYYulmEMMK`9W zTgW`5jDT--11jIub4tZPbd4n5yb2QW5L0+!vImg9&UV)zYttKi@7fbT(iA zJVuoR2)E+4e7bn~al%!7kxNnE{Ws#;+}WHX#*ZBRJmhzzXzS?`4Hwd@uopM)X1Q|q zV5fc~18;!{gc+b1mpE@>lAvnYJuSk6TX=xP%yB%g!@tSMaF$8m{xOM*tU^a}HcE2V zI9zy@XavMi^E4BoLp`9Jy_&dy*XXOOslG38d!JB8$Uz4wpW1k(y*Lj-jTLBlneRWJ=_a& z9q$Iq3z#(Rcvx>KA*r`k7UODFCib_r#3Qh?P#J#PUX2$P7Ty~ud}6HibGucRObylS zAV+&PcwJYU>23qn7y9ueWFg}{)}uI2)v3ws105d_Oy%wI@|cn9j0X&?)K;*_1kB7D zMV%5Bq--z`EU?1B2hJ%iM9lJZ3%*VT(>?>K1BN8(o+f(vIv>RAAOgra5zk=gz%4Am zeF3z*F^2xS#+++dZ__#9>W~vh3(+R8xOqnVGe%^;7mj*thsQsG0G=Qx22Ks_XWU2l z&3Hd;ax(v9M2NG6@6FASO+W7|dzC~?d9`GF zejfX~!o>cdf!i4)pNHy)G}2aA0hDX|PGMU09ZwRE&u2>gte4rsSbUF1bv5hOGY?tI z+BK)6V=W$1whVZga-50sF9kfV8Gl2|QE&!J+t4_k=?KWIzRlIHD6Yh}8w2Sw%Nwws za?@_xskMEwmzc{%oiM1#X2DYpyuAUq& zdxn6|?T_xnPAb?ucjrqN!3eO|hxwI7d{ihOHvqdLRaSYu5$Ug$pC<>pa4%II)(I|%-BgTo={cXH{ za^^GuQa<%qzhP4L>nJmy?)bLb2Q|GtfpS3&lXeqh44%W@0G^+A9Grcg_K`0>9;jrDhIvy+Q$d^UGS!y#xF#{xArhyL7)U2o6m zm$ijG$S`|ky>#y@!AXVjTcEPNa=Bai*LLacWM-$@MV?xTC#|au4;x>$bycxmlGPBp zif-E|uYr=B%~x*M;|_L`&0P#VAyYe8G~9Y>25(*s&qFa#Z6rzhIE%V|kB7gR5y7uS z((AopE7V`qCjD|wkUNTQU)fLFiK_>y22~{IG}zay3thaXQnNiAwrcqB34w%*g5>9V zX(TQgBPQxy(pTU3Va>;LmCf;x((s#pv5KH{Og#g`iPgc8rZ?bea*^}=GTJ+q0k@WzRzfEg+ zv~rECZ*;f0_F5Ih#dC_@bL!*oXf7|5eJiS)+mfm-=wzp2;Ce>1!qp&|EI%WDhUXir zrwKFE_5OwB;PrivQ%8qGEKIF5apt8~oSJV(1z%=Q3WMo(kEhqieYl&&W#Y6PB6?n@ z8QVPr32Wsy_^=tcWjOl_l>Rhq*J>|lzB>UQi$ZQcJRRN&MpxGkjGIjNB}HdPJ1~+( ze_cH?cq?%BuyS-z^SgdZsu!b!kI?0ajJQg3Th(6zUli5HU=K&DM|ax0;679-6g4DU zf}OooTdtEDUv9q6oK#wAL}E6}H7+~wlM{lfio(0gCIc<6*#Slqu4z?yvH{Y`-E%v`T6jT?#)_0B&mLi3BhQF&MFJ*>VKMz#1y5Y?@S0K>$h4Qf_r`V%SmL9 zZ5?jJ^8-IXf&ASv5Hedrl%w7TClgQZl9kFboR==#%`-4Nyx|8xPl?*maigewhSUvjCZw#UpsShe5OSDpL&P?uf$`}S9# zjEh1uDUPJl@v#&kmETrbIV<;tZ#`eX5Uk2QRfmGxOcs?lB?k1zFh{0PGH>^}_a~ZH zT5EPvr5mUhzD?a{|0?G&&)usLP&68RDr_Ha)K6DZY*HM1*vM(y`l5XE_1C2vi_28! z^t^KN2TKxB5?Xr6(al9s^?P30>AsF|{-;*G7VGSX@)VAuNU_F8w@ad9GQ*Sv=PpS4 zd;XH(CbkFPGA}C}x|;WVwo*N%0a7@=>)5^p)h)^+p)hKOm>4-v zEYhN;d8BPFweLTpxT!Z%XAA1pzKjbx`MqbbK zG(fA(!>Q3eZBta8k|jvDpB^}gU1zSRUVfjqqnSPouIkjnyr0>>cYITVGpax^laj4@oMby`b@5w7Adju@AU^w`q{3rD&Xv0L99-u9^d*@(stk(kmK_Z+E@L?O!BS zO6tyTNVFrK)Ye1wuo+4UuC6j^s4hBq`3f4kd;`_4T1zH<6Z0wYDpNaNlE~=t!a+-; z=yzYI8z>|B6+gf&L03Z*xpsT);$T_NQycGGXCP6mbnuC$Ddqk(IwN~|*fU4V!IQex zTD}>yLf5usYs4GGt^SKVoZT-k-t82MXxkn{rt>SQh0e55*lXbRJH8EZ)nu?}4~@d7 zG(xsshQBkZmFjz^0AEf2?~RPQ|K7-e{dWw|=m{0ThizbZ!(tFL78(qVfrde&VA0HP z+01D~S8OmR#J}>+vW~)?UYB6cqQp{~aUmcP8$pop^Q+brK*)7rkyG zvuCk5Y`7Ls6tIQj#pR+16{AcbYzJTd63q1ND1d&FmUgMqoH|)QJcpb>BL|#o&n+hl z-wHrIH|qR~vY3N1uys z9LU0ONN3n~1VaMnuOpn-%|1A4#NDHKZvfBV@_on>7I#T6CPK&#rqj|ZZhOkj%{9)Z zuo48*-{`i0^|uo1hHLf)A(AU(=~}fygW8Q9@7!&&emd4}!}VU^DEabrvO?MPg^~2Q zxf$PMn+S%w3)C)rM<~E9J2VY5>&UM*v)WR~U>7a*iUFfrW{N}>pmR-_;|r7b=2r+1 zCvsFMvSBG6*BkN-xXGB{lC~^+;8zVd!Wp&VRwmw?;h_Fb_6q0Vaz=TFG&+e`l9O!l z1CeZ)bQ`wY@oUQuJZr~C>go8!ntMgR(%kP_YLWFw;iqWmFV~ITMb+h5yHigm6eP7p zFJqY@oOPbZafzCrBF^l5TGQjmSoT<$QF$psD32|+Aa`r%b<_{(kFg(GVoPIWY25iQF?Pphlh%hE>g_{c8$!yT7Y*XP_~}zzG@Z_UaQ2cD{;9r?cn8o?67h7y1xoOgZdLQhB^C3+Kj@rx%^h3a!_FO|8lsek=_iI7g(Hg5~2{JOzPRrgH+ z;RexJ^DaNT9OuVVyB6ZNuw*aWcsc?;=<3)4Muxht82ObXuo+o3`ziUMuL)mW5fQa) zSJ#0hpI3vVyXXs@z~^0>#7Ln8e%p*L=71Ccy=6Z4k0h+jjzB=O2FLme<}$m*f{o{% z<$|9F>;*D-9N_w@v{@-b!vPau-0(MFy$DybJ-LBEbb&kS?oZsL)*n3Lh`H!%q>cyn zvOl5k=w#}hCz%DW*(~;#o~<0av><6yo*n*Y)R?^9P@mUJ$0pS;zaJcbTHPyp;^lK^ z{ndPGQBeVne<%G{b8o42hKY9~j9U%{V#wQK$!8A-&z(%JzivBmyKr&Oz4N@^!YcoF zr);+h2hF)-tKLl3_wAKvJTH+v&D#&& zw?pV3y#C(;;+MbbxDIs$+F8GSMed&U_ulwm)%fxqbn>BuI{plgyf=zIxc9cOBs0{r z(fHxFaGci%L*hQkZ=GjRiY@H!v()R?y51s7WJ|-@n$o+OZ3HS$vV1L>CY4p+4Vq2W zVH{5$5Gw?k?}ztZvXxIm98jkdibP3-?{V+q)=05-%^_~NMyNt>aIivrs@lwfk-J z|IB7@6ZXn0i=y*w-|tUOf8x}WoO&(szaGEy?%!+t&pwtO)&4r%^khMZxm@^jwfbz) z%lnqPV)ORL*K2(0moUzcx2y8MKYf1n`DxuP@46>92{#`7D;R3)wRKaCGwE)s>-OvV zqr1K}<3+#cPbyDch;qa3&#Po}=eYmjbmQT0w!iG{u0CG*^pWp{{OP$%wVTJref-}0 zdiSn+nwN_XtF}mb_(2A+sC&vOI{ERz;7t3{cfvFKGBkZ^`%V@f)Hja1OqXJ|RWGES zOD(n>XTRBz6;FNrsCYzee>DoG@zV567EpdVH+RaIUhFCJ5CED5lJ+@=X-e$VMWISZ zsbn(E+w`uZBd!((Z$;=Lr)Q3hqXfA@7E9{8eGEheTm3j}mUJwGTd~N|=GOttP4h9> zk;5^;>dg)#-%l*{xYFmGXU7FS=R?YEJL~|S3oWT+HU_ma8Q@=Tb3T-!p>x3|mKFNR zPg*T#8s;4hwrL(5jI<7oqk#2`y`ymU0Z3Hy>hWxpXCH>M;Z+L|b{t^bwufFH>|#d3 zRNfwsqB3p)HJ(0qLU%z5UkP?Yrf!Do7Z>%X%T>n>ZbBz0XA#9U>vODAX+1A^Ii$8cW=ocSeIjf7+A7#0(b^hsl&AndOp4c|2 zNQPw|E{x4rJRF9vhg0rI$1R(L45uG7*&uE(#_i?wt-YpCbp6*PV#$HXkVv7vigfMQ zDxEOJEJ)ZkhPyv}eu?hP(w7*{jMRAIDD?*-2SZ~bdhpQ{f}~8rTLfT!ggPh~x_T?` z^oLLNAu0EYx?DVh_^PKOBfi8i%EiRb+70L2U!SaG3`5iA{z9!qy2``n7?ixf3!eaf z%WTbKr1*e{BxE-YJ1^seNRfr(zwIZw#LC9$(Y<}ub$b9HIhdP?zQX~mDSYY%8k`3N z(A+s~WjyBR1>p=(u8dJ^EO-9eROm9h9vnoj`I~8vdGO)cy%u|q-d}Q(XX#Yc;VLS> zN}g=~C*O~T^dBw$`3z?r7TO2f4>s3Vtjuh#d@j~sYTRGaJ4;i46!Vf7XeVh$wqWj& z>Gh=Zz+61(bM4VH$pkB%s_f^U%FZs^RtVc}`nRm#9nCLQ=f?BezW=}XS$Hq`-F+?m zR*rtw!oeK9Qr1;F-MRC%mEB<8E$m6@?&FDcWrLQr3MW_{TTW_n5TA~QGA-ZaKDSEQ zn~^NLj$!5e%T`N_xYw_Gz4mOyKWJ+m6SPVXDTi>203H7qNP|x!wuRq2sJNjDa*)%{_{0a0&YHIy4AHp~8`)n^b^H zW~J#q{YOr)w3O`&Pt{lloZ1_jX?)c-jqNr4LdeAr0RW!c9KA^oMlS@0%n<%*zH}x7 zSeDZ%Z@{glfB}iSa|Bh6c1$DXTuU|iV;g&Y;vfMS0L@uk9<$nctksm+oYT>ib58uhX zdz6nJ7C$Gb_8%4s*X}N+`Sc&RbH8xQ_s$4|`JQa{sgCc5();BLmQ|3fOt9%UEuUUp z?(eS8?rJx-T`z})KX2Wi;^1`e@u~My+7u0?&UA$(X0DHKv6}qfsdMM#RnLpX=)3A` za<{4LMu&Cut&UL`Ilhk3Y#pCvfn#r=W}e0MRQ)CM{Xmk`F_LlOR(6&!#lnAz$~#mO zY)4XwQ2T3KZ zJ;9HyX7Q=zmTwPUyNsoTjv&-#WJ3IZH(=4Sv}$LZ!l4lq@Jo+<~lx7fQk ze^)Y~Wx#8W%XjUvNgOr+#{d=K0fuoc>lqBrC*B4JF`_* z_~dx@liTvyr6kkaC1>Gso!#ziIOf@UUj=9A==-gW4Ep>#{lDq-9PT|2x(}{?I16#= z-gZ1b>qEOK%Y32IIrR`#!^!7c?w%T%Yb5>p|NoqysL$3JyUR-{j!Hq9Q^f08Z_k3u zwUfT~#F^uF?Sn^oemp$)lfqwIcq<*&?`)U5E2$ATaBr+rmwwbLTq|ss$#=0>3GC%1 zLMa;NPQTaUcC0`}KVONnczOM|gs(KHpK*jFYveK9H1s63*4IDUQBA>0D7DA&2vvu! zs!n)qTD1n?mNgfCU)BA8Kp$=%Mf&pbF>#%;%0rWZQ|u)HtA;^Zvf{ z9n*Czo{g~cs!SlJkDG?NDWBaO6el0qdHnQ`YZlhXOtvkoesEpx6OL}tzUn_>lIFH7 z1!vm*6LWnb-8j|1N+|0iJ-Sp%^5tdu+3LqXmH!X+E4q9%ot-|sEVC1Q-pIo%y=Hc{ z#N44oJQQmV+Xw!4k`tAOotX)@Gyg7)>%<^wZd`HJ@t;z^^+JGocyIr-40S|=Xoi<)B0v8G^@NJx z45;ZZ<~er<&v=3wk!rHdA;=chzlwXI;Mf1i`~%G3a?X4k-8_B7J1hSD5WnnX1>3@zr+x~P+kD&NUtXG0BHWI#rE zY&52iVT^e_c8;i}LWwE4rOvy_0A4F?lMjv{V2E}pCZ)ASDY#lB>7`d|zL`JLfr$eI z0eJ%L06yNTRi&<~y`Q>m=Nfp<^fCYkjMwh3TW_f>w3_ADb{A!_?c$OfOKtQ&x41uJ zeQ`UzEj|+*YmdnfD`r(#(Ae(Vx}|Mfz8yYjs=KeCuv>>?-<^~71!Mnh@OIB@>pU9E zl{ufyzPm*$NvmVjNnD&cS0Av~?Lc(jTXrdRk9(f%nDc(${bYy5*Bne=PEB4`XEnb4 zF6yiGOEJs@z>IbMY7!ccmHeuY5#nF+nl4$gaM$PE~N<31MJ8Y|GDJ%xx;0Vz;WFH7?4Evbyw2$*#O`G z0L@km(h|>t*o7-F07Vp@Gw8F8KJWs?^yuO#@%X`AGaPZNF~6w%_~wq_xN63O4wA`*E4G13wbF)~`5|JkH~IbGBcWPBWGx zrf0GMEVStr-s{|$zl&B!!PrzWd9U5;x+$6M9VHXrSH;`1$^Pe8_n+SaafJ45*_2s< zJ=%~fJtAIGAila^RvPRTW4Q`9Fpx0yeg|`-eZZ_3bPI`a<=KNy(?TF?wAREVZ4u?&~TFEJMqIak#uPV}< z5biqk!yO#)B{A4FjaQ^xJ_VlZ+;$f*3V?6+wCgoTu4Txzbh7ek?*2-`Y5p?Z4&(%! z8wilNW#Rgf^nJ%%(^l%^I(^K8N1N4tJHLD=z1u9A|NXF( zZf6s2<<`SA&LPFY|9)0TSk5sWc(~4#g!@x<6)y?0or-R9oUV2uJ97{4FI~I-@S*mS zrFqh{s9-?q3ckW;ib@RIKu<@|S^1m>O zu$%>*RK_xT{C2B;&u-`Y*RFm0d6c(-hdz9=cId_xpAhbxVvaGjDe$6j=k2x`DNTARif=@=;JVK$j|kyKF?M#*WU@7>-y=yj$V(9!S3hJ9 z?hNb5hsLd4R167`mG$oo^Xtd3!uoCy3F)p+JN<^h13sIas)1-fo1j4Z?aFs9waV~O zU#YTk&Vue{fhK{o3@F*8iC&BVaEW`}rwkhNIQRolts3C904@V0h2r?w_rN{tbL#qL zzwy7t9=)&mg>G!V{_V<@ch~NECd}hcy*dzxi8@&mksn(zsiEWhB+1vv-22eP|9j!- zMYq0@9REXMNZo$F|KIF>NuJ&Oc$Cg9QiI;V|L4w_fA*3Hk`|;1+aNpC-oQZl@4 z(wRi+UhThKhAv$>eAmm~m5s}0*#2DVqo+D!pZ}%vo!Rs1&AoKoruL)S<>c&`PUWY+ ztPGA+dS%NnknCr6y&cu{uleq(V#mQL;D4#3&kd`_DZ%nv!HwE@7b<;pQeSHNT2-vV8y3xpIq1&(~A=+wkOk;He z0G_Kndko3|2)-q1*CEe@AzU`l34YKgRxR-noDtwvU;@SfP{)C2V5U&?u}1dS-Msf$Nv-eq zp~tl!9lx9J97PRHhArFP&tw0r5f73u#nxYU7vCM}F3mr9BH^t$+}&$Y%S*8!##Av` zS-xA@HNB}uPG;4Ir5hbdLH%SV+b3hME}nigly?VP?zV<(vA5e!{KwC=Xr>cCgcr zlV@)=gBSF&Y+OnFb63YsaM2n^J>bkf<*i3A4_4%NVc|9eYkc`dPQBJH<{4V!fs2N< z@t1k7cgUA)l*aj3HZ%HPcghK(Gfl1!bF8D+`y*;2GfwzAHY>?v4Wu&YUiOrXzGoeh zX5|WztuGD)6vG|^e(G!~MYsbX-+6wAWv+K3Rw%#)Km!vf01#jTYo3b)00U1CM}q_$ zU>;B@2m*@%+Lt)0kuA<1V|?GT(wB2+cj{P*y|HfPAL$;l{b7pbDe!u{j&g3t|i zef`=tb<(lRlVZyp`PTQQvF0iNBb#^Zqj6jh$9G619b!s^)9DpG{Lgb;l< zcbCS^n zM7yY09MnGow{FTbj3Px*3(+|*?^$IJ9b=bn#z}#yW?k?Fe1C=b_7}viD zk}aXFMLs{XO$%dC+n4m@=5eZbnnsq4nrx8iLbdEjA<&MuJi{o^e{!1*OUA3Qz~pw} z9#d)x0=^i5rhXENacNpL^App$>sLo@?jM)FxNwuG*6M!7W*t;_~=4bI=$aozUrC2yId@N&YFeK*}9wiHXfpk>68B+EO>X@ zGp*b?`#m97^{at zd1h?EN7S7L;X?(ds;}cDEc(s0?k;Rfw~*(S2hUo;979{`*tNd(?wcZ@rXE9yw3Jz> zviDc58|Kh(f24cpd3=1CWzm}!TRi!-uKBj?j){@PG%t9yO?<>~%Qy-Nb2(`6CCS$< z(A=mqaNZw7c72Vj!vnsGoJvVyAZ0kc={Q@VHX|~=o#pIt8tiLyIOYI4B(A0axVj^< zypMapX#ik6P?VRdj2QqZ+pa_|r{x)vr`v@y$8!622D!D;zLg3sZDzLUGV z<0BsNk>vS#E%!+6iLU>wx=%~wyL#oS{>s+;9C>y}itSi;C3&Zt`uO{ZgU8(Z%9EQo z;r%B%cinQ>5N}GgO_g0^Jkq5*T$pyJr=TG`i+_;_I1(`@zkIf0UJ^k9Ps>(9X@{prc~%2Er9- zxN@9dGQYP%@qMEW_7;@rux4tGSG6SFEAK#=XfbK;ad~K|rTg3+cgR&Lo_PoI6?(Y1 z;10>nk8Hy^F*lE)W|q;~rN!#n{s919S{zG>PyuNH-~0Y*)w3H8vv-~#`Y~Yws{nw& z0Z>Q>#oz<-00hAS05U+OI0GaDa6HRydz~A%x7d6nse19)G=Jsy;rR8SZGM05v0FpV zUT%DPqkAD+-ullEHy_kD$o6PqSs+4mA&vw3;#+pc<@ z4(;{FJnC)!>B#o1(yVVstiwNK-#i{3^NWQtm5qkf0aYxWeDM5N_u}d&w|F~xd{E62 zb~ap}sOb*gF4z6U-s>`J8E;w^@>LW2^ghPUx%@8mS*q!wu<#hYUQhdN4sbaAQ4tm&(% z^VECMqzj}KNd?nrb)uu?I4B74GaY9L_u}#cKPN5wUs+NPa13Ihr+sSO)MKB79?2sJ zlf}@CiuQUTbq!1;8#6NIH%N9UN>^{3k$PWRF)@#90lu1CS`QTxYemag1D3b^ zLnT6g0mnn**sTJ?PdM4UgSQ*^hC3dm?0|U7Dgx1G?$ z_^{G%Uvi$WRChg3o_;L9`k$0~onOmx-*fiI$F=JBUL9d`aqM-9{!e7n2|PQfdhs1^ ziz;j#s?RUPbSY12dc~9w4`e1-r5pc!cA_|X>74&_`abM-GtNTNT_6$qe7tqx)TKxV ze5JE=$fwWzyPfAp;KjRZ?j7N1@@d^KR^Hkrn_=aMv5y-o@=xzP%%y&DF}MG7yEo6B zG|VoY?rCRLQbcOIc@Tu{zdp~J;e5%#c*y&1AzyCBJX!AgHPC(PdMuH&>IljYD67U-v(VLue+r>!x~cG}%s~anMAs=c+BtLb>^^HX>auh2YkC`xb{> zteT)e-b5*%0kZiPd&tyj(?+X3LjJY+*EKOJ2u}xoNo=A8RZxI$s(Nv^auIF0T?yVh z9>}*haIQ2^1Wv&N`qmDb_X5XJfCokgR1il1l8*x>NoL@#TFz-svDt^_KJm3}k-Jr% zh4roHv*#Bt=cm|y8tTuZv6BngKFzF-VOY-TP zHau^|eL61H5_O-%`7R$kuPo|yYKzWA-=XkmRt~*K$DaFmg!tDuh4pu@>86vS&s%Wm zUH<>o|KOrHcDZ#I9r!!X#kTcrn(p7O>@beTLZIvKwo`Bf-+4 z*E=t+j37vpT26sqFal+HipL|V1^3~AotyLN`eIk(wp(&O4_W^EraPB(P>6%$a($<2 zq4&F8YegJB*)D9O6q@uiHQz_V*jUeoFso@|ZHeZb6oZkPWmANv$~Qp89+ zdL14uKKJ~{Umt(unaQ6n{P!2vYcCHE-Fo)cs?0n;+$Y-5pg)LpXS;z4GDZa@!}I^m1wt zhq$~lFfov+F*$@|x2totktUL_4NoPjxGK5L=W#W4L8Lczdqxe!jiJg#$GE9;83Biz zG+1|(K|0%c+iK1{wYEltwg3~S3yl0=|FP<{Q}D?QQ}f+m^GNEH= z00000dV|sc2LJ#73e4M#7yoLpVjvp9j|ML|%(#d9x5hxOl+B-4?-WNelE;kEM; zNnRgxk9(|FCFQzm@@Sx`e?BH(|FD$N#5+Kc9iQB-R~H$Nx=-J+>AlX4DP_IW1s{ua z{k2VGq%lb5``X_proFNc9;}nhMB3NR#U#}QpG#P8wfZA-abUZX=5VpUNY&+2`L^br z?~j&;g-|}TE0Xq|pnSSnn@0)Wd!M&I^`nR^xUTmwzWt4rosJOvy!6`(WF3zFM-r3~ zboJSGyzMR@Pw^95A8&mdcyn#}3S)ClQr#R-7_L^x_x<_)-a1+g7oUQwb3L`RPO|E+ zOZdKyBGh3T)d|6Bcm|EwGhDQTi|n8sD-S>h6}~UCRc67aG0wgRc+y2W)WkU# z0|0(GJW7iYh6F0?d43HmU=4w`c4x%R8XP_me)NK69rT>}ClUgdLz=q5+y;F^G!q<9 z6d(gsIC;t9fah<9x^URe>nE0etli_{rh<-^?k?>PL8$F*PV^TLk|YQPv^{}t4I^Bhv}4m#^1>@%2v;c{Vhdt@fuqp zW?hJRt|0o>T0-TQScgul$r?MOAnLdjm3oAmy`k>BFqllr_2dU`?l0Q-?-o_}vKLPL zFTR?)7LRaFd28kyyW-TPZGJ>CQhAIcNYB7LY5m0QI=W%Bg1@-M)|zw{DtoF|u}ZMx zwP*$a9tm7iFL5_fmICW?gE_2WA=|*3T@nZmD7;Q_0HzNdpwU>*0~P=WSQKF3K~-GI zM}d0uUejuIaZa0H==8qS7B+vL+^V9qAENetvP4c;Jzbg*%X^a||9^K%GU+@Uues}c z>gs2o{`Pi{`S*Ob`R)&$?&af?-cmPiq9=G!EBxF(ZT3Rpct^4R`(iC#tbeXK8oTs* z(=2DRm)qIh@8ToUwmnC*(u9I-=7+YcIEU zDmQ%WF+_YD2rR`Vt?rckM|3uL4!aCOrL?S`R_UWw?C%qkB}kwc;P$rh5eL6H0KV9} zxE8E~h*`950s#2vIhVPDUKg*!s<&AP1E8U&eP-ntD_|z{GhKf2JI!+K5#j`hRWzJO zc6e|A2UG^gFi|E21OTu~f3Du1^!a%8_{)|mT%_gJYu6hc^XB(t*ZPxKLE2q@D$xdG1 zKKzbcoCyuOO)K-c=+sOnhmPcJuPbRRo{Or0t#dNdHH3sUOIYQs%_L6An_9+Mm8Y6Z zyetcE>fkb~mszCV-fE#m-sUbDm^eSZ*lm{d_!&!w9=e+6IDjLs;Br*YVzt3m$$)?!=&{-nrsWIXyNw>EWvTX!LH9wr ziD9iEfP2wI!vH@}cq8zl0e}N@4BGn4gJbJ`z<~r52LKp4P*nqfqrmkLBrm7KS+iK2 zAFMZ96jz~f_V^!Xp;gdBUv7`TqIkYwK?-Se`LR>-ZYjNH<*Bd_!8^ZTzR$wj#S1U4 zIpu$TQJ3E*+dGv!7(Mg#;m?D&|EHTx*=d&#lAp)?Nf|d*`gi8<)EZgG%==&SXv?Aa z1d`FQ{%?m-OoZd#yRs^z|36u=;yA6Jd*_K`a~EjmqU=JXvqg^kVNN{oWRcp6pTNH* z(vuZ|kDUFB`02p^nNR4n|FLn@!5kaFQS|hcwzBUQKW*QrUq7S=pzztruy^U$VEq;*sUoonqpF*2p4Lm1(-4*YiAkC+j1F%Si`|fZts-D~?L{ zCIls$$1H=Z;AJF(-IUhdea@phsut(VF$j5kSeY>4oaNjPL~Hh+#Chz^lXor@06vJj zjB6x~W}^UR9~clsGY>afuFv_r<-~R#*~oit$O8+U7$x+iRTf9%Bfd2FK`<@A8vq~! zUC9H~-~j`GPbWRn_Dg%;;*{5S=Jvb)&prM~?(MJh@#jmMX za=4AkU7xD63yCx)6*+(RSk>lbwd~WCPtr5L>+-pOMSR!25t!X5*H1>tk4I1W^>ni0 zUPJZ%?`ZK{<$ghb$yUFW@oByK;e#wQi!?xTDd;al;r-7{?rk6 zws*PanuEAj3nLuL^_d+UE?AI~#F^{q-I(u}+T4k7`vw(u&a1CG+cZ}BUD&Y`oe9SMi4J|LPD6v(QSp(a4$ro&_pMt>aSva&PW-VSA#~U%RMpCt zoEK+xCF1*v1{^OsAo4g4JIcNk|86ffobFzkCt2tEw{ny%A3O@S9C=I>=FAp@-jHl< zeH@`$hNm95bUY3gq&<()0lv4pra8hak^~yxdcJoRZ$*3NYL0XYWakg~LKY5~U=>d= z2;d4(05t$SFBJ!1`D}LL!NP8|F>_MLz}}C?c?=Pa0|5S} z+x=MxpZ2m%1DJh}CTBr1RIAQwF7QGs*36aj1r41->Ur&90nk};h^STmdIko-6G(uA zg9DYyQ2<{J$AeVAq}-#|FmEjt${!!od+fpcec5fBkM6tO_TN*t^r;f*U3*EMR-7Bt z1^>lXJ?wvC8?OB~eEd{;eDR<+-d`=Y_uW=w9yYb+iG0uD?Gj%v{nD7)cl<1O-~XJw zJ9et@^%t%wYfk6{>a?$xyYhqB5AsLqqp((Npp)9kE6s4`wnT5dwVa0JIP5w*7a^EcY5u+ zjW)WUm!s*`&g6h4^2b>hW~uJ0`Wio;E}CZ=KZ3-Dp z)<6B}%6TPu_W7b!Z>%nTdisnfHodz%t32_sIN8okPV^4{&;DB=BPW^h<}j`g-}iI3 z&yTdJwiWIr(wgpSJ35$rw8f|M^V!HctPWC1d%vmg`sk8}#bNfELabN}>}Qws_b4M6ji~DUc^^N41Lf%7?+ED|9N;5>11taoAOn;sH~@It z8fJk&XRuP=q@f8D6||2q0uzHb8TqYJU7`(fcUFKGXz`+g5k zH(3uaUN6Zm&wsUVTl@4f(z}BT{$KpHVC~%qUJyV2_R+ERt?<2A`p)OWrGxHWj)z2baaYgi!#PEXpRQZ!2cS4mY`8%n~}{xJ2pK zMOgS7i5Bqa!dNFcTccOhdHq&Z>TprBH_aAig`Tb)4TYajp>W`o?Z?R%s^ugkBVK5k z#K|n}1wa!39+dmo+XoadfZ{*^00000jN?UG+Mc@T)8DVJ6w4o@6JZ&XC2<{5YgWj; I$k@$g%E-~Ad3;G#vMwjq6WVyL`+eUA#sdVryt-*XLj!k+K<_GJ3IT&-nqFs z_uO-T@0@ebx$nHRl9CMI2A;Ne(pCt)EtE@miBP?}sz4~gSp@m1m6d1zCkScy&L0}S zlK^KS-t@TNCH(WJEn?LQ4g)S{3oA=Q)2d3y<-&qpE_5=791#`~7Pd8vL8c;tB3YrZ zqJ*4SQ7x?6T_F}!NNM;p2<|Hwe`Iaj1s_8Iq{2+v_EzK?cW;116~4W-pqab3OX1IA zACdTG^f0a3vc8i;WCd|U#!i}hE22b%0fkLCMNH;wlKR91A1Nf}az2|rRJJdEI8d=p zgQU<-tB?kkXFx_H?TiZHvOG3P*T>icGn8Cv{0Xh3cSx-++}9&*<~o9kQdn$ST{G9C zD`N+X9jTs1XfH|-L==A)K9V&|R;>HzN)r#)b2N^)!Q=&Y0zho&AT_ut_Vl@d2mn^M zQfXb|YWzhb~^i> z5;OR)WIWoTl{8cphnGS*t;DCcn6^T-owmo9VK{G`*} zRyUdbx6ThqiS@#BdXL%8&x1<6tGs%WIy(;__sFWuaSrXsishaFP!zrhn^O05sHf~9 z6`Z4WYd`V|>Cx*NA}sXd7a}I`!8vgJQq29Z)5LAw{ewQqsY6rQh5aWT+OqZ6a)kXu z(_C5?JY|~8e{y&{o&iNo@!N6adWu0?WuYBycXPQDF5(FidtQ=|B>l0UmBc2g5;(9A zrc8X1lIF*oYC&_S1+$Cd{O7A@mt?n=Wb@X#e7;)nv%X?Fv_wv1d9E1JMJl`y?r1-_ zll9C@GJN1@df=J2f|9C&&NtIJ2N}u7V=qp|rhc1{?wdN9nV2O_oE=P@QKed?sWVa@ ze+cCdi)W_Ad1~>krJA2~*^4d{*#O*SEA{LKJzF^+-5f;dp!5O|fJYOxp)*=J&u$Ll zsP&w-1-`CWWGHzLJL={ViNi(kM%CP*8Sc<@cbK}DxjI3P&LA>U51X83<8Sp)SAaJG zaOFVY`2&G4z&Vg0xV#HAe|i7_gav($(32z#jw&;G zC^K~^Gue-q#`~=nnL5cxg^t|>vkr_F?Eh?mOxd();U;m6c(5(}70S>Xl+_2CZ-zhT zSKAh$^RBwdnkUx21fBMKkN_C*_@gVJ`l~@Y0E%!nP48RK$n4f`Yos|2N%n->10_nP zqg{%GIJD9o+|wjD?bb?=nBW%44sLJnWe}{DLTm$%t+ChYC+Z~D1WhLQdW1XMUa;z;FGG+rMg^e%Yqc0%@Sm7-33>3 zt#xzLvi#QAG#*4oFEh|A8Jd@cTBjo?RXFlYCd#jd$Y|EI>@ovKwnd>?Y8*LBEt{1> zVFCX!FKbc8x32=$qTk=zaE~e%UfPB`$2O zndKMfy{()h#eDi`z6bmJVdG}+Zu;6!zjBTrUmh_v8lB4+oQBxOjyXrZ`F>=8-g*DY zm}p{b;Kp$Hmm?MQPb&i_%AA&P=Scdn?ESoVygvU%Dns8bM$azFr1MG9A6Veg67Zw_ zgC(wmve``@O#mMU?bQ|WbyU8Z+F-bA)|Hx#dZD35*e1-;lxPe>%tX@|=|YV#r>$6{ z>25WYYK&zXLtle|HenE1OhS$6zS$%`Wh}Spgsy41#y~%1>a`i~-!tp^hMsrZgrYVG z9do(oqscY6%M4Ul8#*I*$N2JD7Ohz*xxnD`WS|A|TL zG(%0qm|@FdOoStw=r;48pjJ4t#?fkkYLsiR&ADye8XVca*8sukhYgrT?P$dy^1Z!n zWiDjV4NR!Pk+&Q+giIL4%Og&UsRF~wA+i%!vV3CXp#^*3GSH=lX^YMDaKhBL>@pBn z0}GuniC;KgzHBblJk=`1X4AnPhaoXg|oMx{;-3t$MsD>a{yIs>z4I(2GL%vX!^hXr#` z_!B|yqRiSN%d^(ZTLrUrv+1h|Q~xs7`(*gR@>r$Q_{a+YQY8SMVIAJS8%#c+9^ML# z`HkV8`;kjbkB)Q;(?Kq}6z@rCxxn9rHXKnRn3Seq;l3$R4Sy*9RS~GcyC>A zryYyNqlF;P1fX_48~Rfxx?w8hv_Y@-V8dUr)sDS7Av~#E$T9R_MyFG=!g1b%{&8{4 z=1`5U2g96ZlMx;YX54(rbl(XH%xN*wm&Y)(aWizOb8G-^heu!=-u)%K-A5iSj~(cD znnS-I3-?YUfZJ=zqq64KSBNCj{ge&|3J9q*Io6$*yjbB8Y)54 zd(R@14TG#Pol6_n))K?*q{1s4Dy`rGb371+;zFQ;hzPfQVu3NL{{j)WN|2m=Q0P^M zUhkWGk@;5y*>}vYDSMzF+*M|bbmZjpMq0I!izf&D%Z#uJmrR7i0oHw_r^TN;xXp+L z@|Ug;#EfySX21C?q}>9#aFM%2q><@>58YUYPdzD__*6<{9VJQdJW({cR$<{JSs&vn zwmn{i6*tTnJe3qgE)@=NRY8ow2N#782-h`T)1lf4z?&bg0&((ny)SEh_q+S!$q7pk zd7!!-xul3!#(%sn-je?6I#vqvYHPs`(W`zLO-$kusZW3?e&&scwea>P1M=u%}I-oR+P_l7__VRTi3A^|iVYGk=PPGW50)p3_)&IX9AQm# z^xU4{n~xMPXxlR~?~(D!3V4CrFs<6b#*LcZffJ+Wu3W!;_Yo`+VeHGUSDqy zp@)V=FruPkVt@Exlgs5UsW>>w<*rY%)!)NU1iay&WVqn9!f%Wogp~%o*5mD8DHipg diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoqueen/nidoqueen_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoqueen/nidoqueen_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..80949eb83649478f5dc676de4a1d540146bcdf2f 100644 GIT binary patch literal 21888 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 DM_7=> literal 3574 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 diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoranf/nidoranf_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoranf/nidoranf_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..ebb413454efa3b5589901bb56adb5d65d1163503 100644 GIT binary patch literal 14106 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 diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoranm/nidoranm_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoranm/nidoranm_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..c3cd023fa1c04c6163ad411f1c1ec65e9e202968 100644 GIT binary patch literal 19131 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 literal 3574 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 diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidorina/nidorina_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidorina/nidorina_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..c0b3a06db18d1c8f568271c60c76987f4af15d6a 100644 GIT binary patch literal 15438 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 BmaYH* literal 3574 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 diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidorino/nidorino_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidorino/nidorino_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..fe7d2004630bb160a4608725e6f6f2def0a001ee 100644 GIT binary patch literal 20241 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 literal 3574 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 diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/pinsir/pinsir_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/pinsir/pinsir_cry.ogg index d73c436e64eb047fd44d50b3f2089cb7721bd8e0..a91a2e2b9210423606730beec5f4660f380f554d 100644 GIT binary patch literal 14864 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 From 218d33d78db35fe3190f123a287b3430392723a0 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 19 Jan 2025 11:25:01 +1000 Subject: [PATCH 049/121] Corrected None-form defect in drops --- .../species/generation1/diglett.json | 6 +++- .../species/generation1/dugtrio.json | 6 +++- .../species/generation1/geodude.json | 2 +- .../cobblemon/species/generation1/golem.json | 8 ++--- .../species/generation1/graveler.json | 2 +- .../species/generation1/sandshrew.json | 6 +++- .../species/generation1/sandslash.json | 6 +++- .../species/generation1/venusaur.json | 9 +++--- .../species/generation1/weezing.json | 6 +++- .../cobblemon/species/generation2/pichu.json | 6 +++- .../cobblemon/species/generation3/absol.json | 6 +++- .../species/generation3/altaria.json | 2 +- .../species/generation3/banette.json | 6 +++- .../cobblemon/species/generation3/deoxys.json | 32 ++----------------- .../cobblemon/species/generation3/mawile.json | 6 +++- .../species/generation3/metagross.json | 8 +++-- .../species/generation4/lucario.json | 6 +++- .../cobblemon/species/generation5/audino.json | 4 +-- .../species/generation5/lilligant.json | 8 ++--- .../species/generation5/samurott.json | 15 +-------- .../cobblemon/species/generation5/zorua.json | 15 +-------- .../species/generation6/aegislash.json | 10 ++++-- .../species/generation6/floette.json | 2 +- .../species/generation6/florges.json | 2 +- .../cobblemon/species/generation7/minior.json | 11 ++++++- .../cobblemon/species/generation8/zacian.json | 18 +++++------ .../species/generation8/zamazenta.json | 18 +++++------ .../species/generation9/gimmighoul.json | 2 +- utilityscripts/cobblemon_drops_csv_to_json.py | 27 ++++++++++------ 29 files changed, 134 insertions(+), 121 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json index 070d6ae39a..3cb47407bf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json @@ -65,8 +65,12 @@ } }, "drops": { - "amount": 3, + "amount": 4, "entries": [ + { + "item": "minecraft:dirt", + "quantityRange": "0-1" + }, { "item": "minecraft:potato", "percentage": 2.5 diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json index b3beb7d9da..d7229a1d3c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json @@ -65,8 +65,12 @@ } }, "drops": { - "amount": 3, + "amount": 5, "entries": [ + { + "item": "minecraft:dirt", + "quantityRange": "0-2" + }, { "item": "minecraft:potato", "percentage": 5 diff --git a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json index c284ddc2ef..4d8cf6a517 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json @@ -69,7 +69,7 @@ "amount": 4, "entries": [ { - "item": "minecraft:flint", + "item": "minecraft:gravel", "quantityRange": "0-1" }, { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golem.json b/common/src/main/resources/data/cobblemon/species/generation1/golem.json index cdd7202744..237640baec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golem.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golem.json @@ -72,7 +72,7 @@ "amount": 6, "entries": [ { - "item": "minecraft:flint", + "item": "minecraft:gravel", "quantityRange": "0-3" }, { @@ -261,15 +261,15 @@ }, { "item": "cobblemon:cell_battery", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:magnet", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:shuca_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json index 725a4e26cb..356b576dd6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json @@ -72,7 +72,7 @@ "amount": 5, "entries": [ { - "item": "minecraft:flint", + "item": "minecraft:gravel", "quantityRange": "0-2" }, { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json index b37121b26c..62932bd853 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json @@ -66,8 +66,12 @@ } }, "drops": { - "amount": 2, + "amount": 3, "entries": [ + { + "item": "minecraft:armadillo_scute", + "quantityRange": "0-1" + }, { "item": "cobblemon:quick_claw", "percentage": 2.5 diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json index a5f26a2b1f..c813c1db31 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json @@ -63,8 +63,12 @@ } }, "drops": { - "amount": 2, + "amount": 4, "entries": [ + { + "item": "minecraft:armadillo_scute", + "quantityRange": "0-2" + }, { "item": "cobblemon:quick_claw", "percentage": 5 diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json index 40794fc8cb..94e800f062 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json @@ -63,14 +63,15 @@ } }, "drops": { - "amount": 2, + "amount": 4, "entries": [ { - "item": "minecraft:wheat_seeds" + "item": "minecraft:melon_seeds", + "quantityRange": "0-3" }, { - "item": "cobblemon:coba_berry", - "percentage": 2.5 + "item": "cobblemon:miracle_seed", + "percentage": 25 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json index 9b435fc7a4..8ade52a99c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json @@ -60,11 +60,15 @@ } }, "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:black_sludge", "percentage": 5 + }, + { + "item": "cobblemon:smoke_ball", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json index 25a4616fd0..6fe439d14e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json @@ -52,8 +52,12 @@ }, "behaviour": {}, "drops": { - "amount": 2, + "amount": 3, "entries": [ + { + "item": "cobblemon:light_ball", + "percentage": 2.5 + }, { "item": "cobblemon:thunder_stone", "percentage": 2.5 diff --git a/common/src/main/resources/data/cobblemon/species/generation3/absol.json b/common/src/main/resources/data/cobblemon/species/generation3/absol.json index 54a4823827..7d3091700e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/absol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/absol.json @@ -50,12 +50,16 @@ }, "behaviour": {}, "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "cobblemon:razor_claw", "percentage": 5 }, + { + "item": "cobblemon:life_orb", + "percentage": 5 + }, { "item": "cobblemon:roseli_berry", "percentage": 5 diff --git a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json index 2a551e1d52..0d50c37e1e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json @@ -54,7 +54,7 @@ "entries": [ { "item": "minecraft:white_wool", - "quantityRange": "1-2" + "quantityRange": "0-2" }, { "item": "minecraft:chicken" diff --git a/common/src/main/resources/data/cobblemon/species/generation3/banette.json b/common/src/main/resources/data/cobblemon/species/generation3/banette.json index 9986d4ac83..9075582673 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/banette.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/banette.json @@ -49,8 +49,12 @@ }, "behaviour": {}, "drops": { - "amount": 1, + "amount": 2, "entries": [ + { + "item": "minecraft:phantom_membrane", + "percentage": 5 + }, { "item": "cobblemon:spell_tag", "percentage": 5 diff --git a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json index 34ae423d78..9e505e9150 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json @@ -45,10 +45,11 @@ "baseFriendship": 0, "behaviour": {}, "drops": { - "amount": 1, + "amount": 5, "entries": [ { - "item": "minecraft:eye_of_ender" + "item": "minecraft:eye_of_ender", + "quantityRange": "3-5" } ] }, @@ -215,15 +216,6 @@ "eggCycles": 120, "baseFriendship": 0, "behaviour": {}, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - }, "moves": [ "1:leer", "1:wrap", @@ -388,15 +380,6 @@ "eggCycles": 120, "baseFriendship": 0, "behaviour": {}, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - }, "moves": [ "1:leer", "1:wrap", @@ -567,15 +550,6 @@ "eggCycles": 120, "baseFriendship": 0, "behaviour": {}, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - }, "moves": [ "1:leer", "1:wrap", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json index 631699cd63..0b4d590eeb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json @@ -56,7 +56,7 @@ } }, "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "cobblemon:razor_fang", @@ -65,6 +65,10 @@ { "item": "cobblemon:occa_berry", "percentage": 5 + }, + { + "item": "cobblemon:iron_ball", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json index 9884be0478..deb7527469 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json @@ -68,11 +68,15 @@ } }, "drops": { - "amount": 1, + "amount": 4, "entries": [ + { + "item": "minecraft:ender_pearl", + "quantityRange": "0-3" + }, { "item": "cobblemon:metal_coat", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json index 86f5b9592a..7c5ac7f340 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json @@ -52,11 +52,15 @@ }, "behaviour": {}, "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:chople_berry", "percentage": 5 + }, + { + "item": "cobblemon:expert_belt", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/audino.json b/common/src/main/resources/data/cobblemon/species/generation5/audino.json index fa6ac7f7c8..0955b76ebd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/audino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/audino.json @@ -53,11 +53,11 @@ "entries": [ { "item": "cobblemon:oran_berry", - "percentage": 10 + "percentage": 5 }, { "item": "cobblemon:fairy_feather", - "percentage": 10 + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json index a4961d6339..0577d34f41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json @@ -56,10 +56,6 @@ "drops": { "amount": 3, "entries": [ - { - "item": "cobblemon:big_root", - "percentage": 5 - }, { "item": "cobblemon:revival_herb", "percentage": 5 @@ -67,6 +63,10 @@ { "item": "cobblemon:persim_berry", "percentage": 5 + }, + { + "item": "cobblemon:absorb_bulb", + "percentage": 5 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json index f858bb11dd..35e4e24a33 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json @@ -70,7 +70,7 @@ "percentage": 25 }, { - "item": "minecraft:nautilus_shell", + "item": "cobblemon:shell_bell", "percentage": 25 } ] @@ -250,19 +250,6 @@ } } }, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:mystic_water", - "percentage": 25 - }, - { - "item": "cobblemon:shell_bell", - "percentage": 25 - } - ] - }, "moves": [ "1:megahorn", "1:ceaselessedge", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json index fb6ce62913..6a717cdae7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json @@ -61,7 +61,7 @@ "quantityRange": "1-3" }, { - "item": "cobblemon:roseli_berry", + "item": "cobblemon:colbur_berry", "percentage": 2.5 } ] @@ -228,19 +228,6 @@ "baseFriendship": 50, "shoulderMountable": true, "behaviour": {}, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:sweet_berries", - "quantityRange": "1-3" - }, - { - "item": "cobblemon:colbur_berry", - "percentage": 2.5 - } - ] - }, "moves": [ "1:scratch", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json index 7460acefa2..e4a168902a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json @@ -59,7 +59,7 @@ } }, "drops": { - "amount": 5, + "amount": 6, "entries": [ { "item": "minecraft:iron_nugget", @@ -67,11 +67,15 @@ }, { "item": "minecraft:iron_sword", - "percentage": 25 + "percentage": 10.0 }, { "item": "cobblemon:dusk_stone", - "percentage": 10 + "percentage": 10.0 + }, + { + "item": "cobblemon:ability_shield", + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/floette.json b/common/src/main/resources/data/cobblemon/species/generation6/floette.json index ea359bb556..18b283a276 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/floette.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/floette.json @@ -64,7 +64,7 @@ "amount": 2, "entries": [ { - "item": "minecraft:lily_of_the_valley" + "item": "minecraft:poppy" }, { "item": "cobblemon:kebia_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation6/florges.json b/common/src/main/resources/data/cobblemon/species/generation6/florges.json index 95e5a859aa..1c7292c9fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/florges.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/florges.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:kebia_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/minior.json b/common/src/main/resources/data/cobblemon/species/generation7/minior.json index 3f3e4ea79e..c3e1fdb49e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/minior.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/minior.json @@ -248,5 +248,14 @@ ], "evolutions": [] } - ] + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:float_stone", + "percentage": 5 + } + ] + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json index bd59da428c..98bbf8cf6b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json @@ -179,14 +179,6 @@ "baseFriendship": 0, "dynamaxBlocked": true, "behaviour": {}, - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:diamond_sword" - } - ] - }, "moves": [ "1:sacredsword", "1:quickguard", @@ -267,5 +259,13 @@ "evolutions": [], "battleOnly": true } - ] + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:diamond_sword" + } + ] + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json index 70724bd5a8..af0868d630 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json @@ -183,14 +183,6 @@ "baseFriendship": 0, "dynamaxBlocked": true, "behaviour": {}, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:ability_shield" - } - ] - }, "moves": [ "1:wideguard", "1:metalclaw", @@ -275,5 +267,13 @@ "evolutions": [], "battleOnly": true } - ] + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:ability_shield" + } + ] + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json b/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json index fdf6ac9f3c..297a1cafa6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json @@ -69,7 +69,7 @@ } }, "drops": { - "amount": 24, + "amount": 48, "entries": [ { "item": "cobblemon:relic_coin", diff --git a/utilityscripts/cobblemon_drops_csv_to_json.py b/utilityscripts/cobblemon_drops_csv_to_json.py index 0335bd7068..199d4a4862 100644 --- a/utilityscripts/cobblemon_drops_csv_to_json.py +++ b/utilityscripts/cobblemon_drops_csv_to_json.py @@ -134,36 +134,43 @@ def modify_files(file, pokemon_data_dir, drops_dict): for row in drops_dict[pokemon]: pokemon_form = row['forms'] if 'forms' in row else None + blank_drops = pd.isna(row['Drops']) or row['Drops'] == '' + removing_drops = blank_drops == False and "REMOVED" in row['Drops'] if pokemon in drops_dict: - + none_existed = False if 'forms' in data: for form in data['forms']: + # There was an explicit 'None' form? Bet, won't need to do a later process + if form['name'] == 'None': + none_existed = True # Apply the form entry mapping to the form name if applicable if pokemon_form in form_entry_mapping: pokemon_form = form_entry_mapping[pokemon_form] if form['name'] == pokemon_form: - if pd.isna(row['Drops']) or row['Drops'] == '': + if blank_drops == True: no_drops_forms.append(f'{pokemon} [{pokemon_form}]') form.pop('drops', None) - elif "REMOVED" in row['Drops']: + elif removing_drops: removed_drops_pokemon.append(file) form.pop('drops', None) else: form['drops'] = parse_drops(row['Drops']) - if 'drops' in form and 'drops' in data: - if form['drops'] == data['drops']: - form.pop('drops') - else: - if pd.isna(row['Drops']) or row['Drops'] == '': + if none_existed == False and pokemon_form == None: + if blank_drops: no_drops_base_forms.append(file) data.pop('drops', None) - elif "REMOVED" in row['Drops']: + elif removing_drops == True: removed_drops_pokemon.append(file) data.pop('drops', None) else: data['drops'] = parse_drops(row['Drops']) - + # Clean duplicates from forms + if 'forms' in data: + for form in data['forms']: + if 'drops' in form and 'drops' in data: + if form['drops'] == data['drops']: + form.pop('drops') # Write the modified data back to the file f.seek(0) json.dump(data, f, ensure_ascii=False, indent=2) From 089e6c15dab1ea849af5416ca9dadb4185d5604e Mon Sep 17 00:00:00 2001 From: Guilherme Pereira Date: Sat, 18 Jan 2025 23:10:29 -0300 Subject: [PATCH 050/121] fix 'defence' stat evolution requirement crashing the game --- .../kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt index e00c497e1b..be6a258dbc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt @@ -53,7 +53,7 @@ enum class Stats(override val identifier: ResourceLocation, override val display fun getStat(statKey: String) = when(statKey.lowercase()) { "hp" -> HP "atk", "attack" -> ATTACK // Hyper Cutter states the full stat name "Attack" - "def", "defense" -> DEFENCE // Big Pecks states the full stat name "Defense" + "def", "defense", "defence" -> DEFENCE // Big Pecks states the full stat name "Defense" "spa" -> SPECIAL_ATTACK "spd" -> SPECIAL_DEFENCE "spe", "speed" -> SPEED From 6503b0806ad3fdbe9813dd6575bdfa4ac2fe494a Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 19 Jan 2025 12:48:16 +1000 Subject: [PATCH 051/121] Ran drops script again --- .../species/generation1/aerodactyl.json | 2 +- .../species/generation1/alakazam.json | 4 +-- .../cobblemon/species/generation1/arbok.json | 2 +- .../species/generation1/arcanine.json | 2 +- .../species/generation1/beedrill.json | 4 +-- .../species/generation1/blastoise.json | 2 +- .../species/generation1/bulbasaur.json | 2 +- .../species/generation1/butterfree.json | 4 +-- .../species/generation1/chansey.json | 6 ++-- .../species/generation1/charizard.json | 2 +- .../species/generation1/charmander.json | 2 +- .../species/generation1/charmeleon.json | 2 +- .../species/generation1/clefable.json | 6 ++-- .../species/generation1/clefairy.json | 6 ++-- .../species/generation1/cloyster.json | 4 +-- .../species/generation1/dewgong.json | 4 +-- .../cobblemon/species/generation1/ditto.json | 2 +- .../cobblemon/species/generation1/dodrio.json | 4 +-- .../species/generation1/dragonair.json | 6 ++-- .../species/generation1/dragonite.json | 6 ++-- .../species/generation1/dugtrio.json | 12 +++---- .../cobblemon/species/generation1/eevee.json | 4 +-- .../species/generation1/electabuzz.json | 4 +-- .../species/generation1/electrode.json | 2 +- .../species/generation1/exeggutor.json | 4 +-- .../species/generation1/farfetchd.json | 2 +- .../cobblemon/species/generation1/fearow.json | 4 +-- .../species/generation1/flareon.json | 4 +-- .../cobblemon/species/generation1/gengar.json | 4 +-- .../cobblemon/species/generation1/gloom.json | 4 +-- .../cobblemon/species/generation1/golbat.json | 6 ++-- .../species/generation1/goldeen.json | 2 +- .../species/generation1/golduck.json | 2 +- .../cobblemon/species/generation1/golem.json | 6 ++-- .../species/generation1/graveler.json | 12 +++---- .../cobblemon/species/generation1/grimer.json | 17 ---------- .../species/generation1/gyarados.json | 4 +-- .../species/generation1/haunter.json | 4 +-- .../species/generation1/hitmonchan.json | 4 +-- .../species/generation1/hitmonlee.json | 4 +-- .../cobblemon/species/generation1/hypno.json | 2 +- .../species/generation1/ivysaur.json | 2 +- .../species/generation1/jigglypuff.json | 6 ++-- .../species/generation1/jolteon.json | 4 +-- .../cobblemon/species/generation1/jynx.json | 2 +- .../cobblemon/species/generation1/kabuto.json | 4 +-- .../species/generation1/kabutops.json | 4 +-- .../species/generation1/kadabra.json | 4 +-- .../species/generation1/kangaskhan.json | 2 +- .../species/generation1/kingler.json | 4 +-- .../cobblemon/species/generation1/lapras.json | 8 ++--- .../species/generation1/machamp.json | 6 ++-- .../species/generation1/machoke.json | 6 ++-- .../species/generation1/magikarp.json | 2 +- .../cobblemon/species/generation1/magmar.json | 6 ++-- .../species/generation1/magneton.json | 6 ++-- .../species/generation1/marowak.json | 2 +- .../cobblemon/species/generation1/mrmime.json | 6 ++-- .../cobblemon/species/generation1/muk.json | 21 ++---------- .../species/generation1/nidoking.json | 4 +-- .../species/generation1/nidoqueen.json | 4 +-- .../species/generation1/nidorina.json | 4 +-- .../species/generation1/nidorino.json | 4 +-- .../species/generation1/ninetales.json | 6 ++-- .../species/generation1/omanyte.json | 2 +- .../species/generation1/omastar.json | 2 +- .../species/generation1/parasect.json | 2 +- .../species/generation1/persian.json | 8 ++--- .../species/generation1/pidgeot.json | 4 +-- .../species/generation1/pidgeotto.json | 2 +- .../species/generation1/pikachu.json | 6 ++-- .../cobblemon/species/generation1/pinsir.json | 2 +- .../species/generation1/poliwhirl.json | 4 +-- .../species/generation1/poliwrath.json | 4 +-- .../species/generation1/primeape.json | 4 +-- .../cobblemon/species/generation1/raichu.json | 6 ++-- .../species/generation1/rapidash.json | 6 ++-- .../species/generation1/raticate.json | 4 +-- .../cobblemon/species/generation1/rhydon.json | 4 +-- .../species/generation1/sandslash.json | 8 ++--- .../cobblemon/species/generation1/seadra.json | 2 +- .../species/generation1/seaking.json | 6 ++-- .../species/generation1/slowbro.json | 6 ++-- .../species/generation1/slowpoke.json | 8 ++--- .../species/generation1/snorlax.json | 16 +++++----- .../species/generation1/squirtle.json | 2 +- .../species/generation1/tentacool.json | 2 +- .../species/generation1/tentacruel.json | 4 +-- .../species/generation1/vaporeon.json | 4 +-- .../species/generation1/venomoth.json | 4 +-- .../species/generation1/venusaur.json | 2 +- .../species/generation1/victreebel.json | 4 +-- .../species/generation1/vileplume.json | 4 +-- .../species/generation1/wartortle.json | 2 +- .../species/generation1/weepinbell.json | 4 +-- .../species/generation1/weezing.json | 10 +++--- .../species/generation1/wigglytuff.json | 6 ++-- .../species/generation2/ampharos.json | 2 +- .../species/generation2/ariados.json | 2 +- .../species/generation2/azumarill.json | 2 +- .../species/generation2/bayleef.json | 2 +- .../species/generation2/bellossom.json | 4 +-- .../species/generation2/blissey.json | 6 ++-- .../species/generation2/chikorita.json | 2 +- .../species/generation2/corsola.json | 2 +- .../cobblemon/species/generation2/crobat.json | 6 ++-- .../species/generation2/croconaw.json | 2 +- .../species/generation2/cyndaquil.json | 2 +- .../species/generation2/delibird.json | 2 +- .../species/generation2/donphan.json | 4 +-- .../cobblemon/species/generation2/espeon.json | 4 +-- .../species/generation2/feraligatr.json | 2 +- .../species/generation2/flaaffy.json | 2 +- .../species/generation2/forretress.json | 4 +-- .../cobblemon/species/generation2/furret.json | 4 +-- .../species/generation2/granbull.json | 2 +- .../species/generation2/heracross.json | 2 +- .../species/generation2/hitmontop.json | 4 +-- .../species/generation2/houndoom.json | 4 +-- .../species/generation2/jumpluff.json | 2 +- .../species/generation2/kingdra.json | 2 +- .../species/generation2/lanturn.json | 4 +-- .../cobblemon/species/generation2/ledian.json | 2 +- .../species/generation2/magcargo.json | 2 +- .../species/generation2/mantine.json | 2 +- .../cobblemon/species/generation2/marill.json | 2 +- .../species/generation2/meganium.json | 2 +- .../species/generation2/miltank.json | 2 +- .../species/generation2/noctowl.json | 4 +-- .../species/generation2/octillery.json | 2 +- .../species/generation2/piloswine.json | 4 +-- .../species/generation2/politoed.json | 4 +-- .../species/generation2/porygon2.json | 2 +- .../species/generation2/pupitar.json | 4 +-- .../species/generation2/quagsire.json | 2 +- .../species/generation2/quilava.json | 2 +- .../species/generation2/remoraid.json | 2 +- .../cobblemon/species/generation2/scizor.json | 2 +- .../species/generation2/skarmory.json | 6 ++-- .../species/generation2/skiploom.json | 2 +- .../species/generation2/slowking.json | 6 ++-- .../species/generation2/steelix.json | 4 +-- .../species/generation2/sudowoodo.json | 4 +-- .../species/generation2/sunflora.json | 2 +- .../species/generation2/togetic.json | 6 ++-- .../species/generation2/totodile.json | 2 +- .../species/generation2/typhlosion.json | 2 +- .../species/generation2/tyranitar.json | 4 +-- .../species/generation2/umbreon.json | 4 +-- .../species/generation2/ursaring.json | 6 ++-- .../species/generation2/wobbuffet.json | 2 +- .../cobblemon/species/generation2/xatu.json | 4 +-- .../cobblemon/species/generation3/absol.json | 6 ++-- .../cobblemon/species/generation3/aggron.json | 4 +-- .../species/generation3/altaria.json | 2 +- .../species/generation3/anorith.json | 2 +- .../species/generation3/armaldo.json | 2 +- .../species/generation3/banette.json | 4 +-- .../species/generation3/beautifly.json | 4 +-- .../species/generation3/blaziken.json | 2 +- .../species/generation3/breloom.json | 2 +- .../species/generation3/cacturne.json | 6 ++-- .../species/generation3/camerupt.json | 4 +-- .../species/generation3/castform.json | 8 ++--- .../species/generation3/chimecho.json | 6 ++-- .../species/generation3/claydol.json | 4 +-- .../species/generation3/combusken.json | 2 +- .../species/generation3/cradily.json | 2 +- .../species/generation3/delcatty.json | 4 +-- .../cobblemon/species/generation3/deoxys.json | 32 ++----------------- .../species/generation3/dusclops.json | 6 ++-- .../cobblemon/species/generation3/dustox.json | 4 +-- .../species/generation3/exploud.json | 2 +- .../cobblemon/species/generation3/feebas.json | 2 +- .../cobblemon/species/generation3/flygon.json | 4 +-- .../species/generation3/gardevoir.json | 6 ++-- .../cobblemon/species/generation3/glalie.json | 6 ++-- .../species/generation3/gorebyss.json | 2 +- .../species/generation3/grovyle.json | 2 +- .../species/generation3/grumpig.json | 2 +- .../species/generation3/hariyama.json | 6 ++-- .../species/generation3/huntail.json | 2 +- .../species/generation3/illumise.json | 4 +-- .../species/generation3/kecleon.json | 2 +- .../cobblemon/species/generation3/kirlia.json | 6 ++-- .../cobblemon/species/generation3/lairon.json | 4 +-- .../cobblemon/species/generation3/lileep.json | 2 +- .../species/generation3/linoone.json | 4 +-- .../cobblemon/species/generation3/lombre.json | 4 +-- .../species/generation3/loudred.json | 2 +- .../species/generation3/ludicolo.json | 4 +-- .../species/generation3/lunatone.json | 4 +-- .../species/generation3/manectric.json | 2 +- .../species/generation3/marshtomp.json | 2 +- .../species/generation3/masquerain.json | 4 +-- .../cobblemon/species/generation3/mawile.json | 6 ++-- .../species/generation3/medicham.json | 6 ++-- .../cobblemon/species/generation3/metang.json | 2 +- .../species/generation3/mightyena.json | 2 +- .../species/generation3/milotic.json | 4 +-- .../cobblemon/species/generation3/minun.json | 6 ++-- .../cobblemon/species/generation3/mudkip.json | 2 +- .../species/generation3/nuzleaf.json | 2 +- .../species/generation3/pelipper.json | 2 +- .../cobblemon/species/generation3/plusle.json | 6 ++-- .../species/generation3/relicanth.json | 4 +-- .../species/generation3/roselia.json | 6 ++-- .../species/generation3/sableye.json | 6 ++-- .../species/generation3/salamence.json | 6 ++-- .../species/generation3/sceptile.json | 2 +- .../cobblemon/species/generation3/sealeo.json | 2 +- .../species/generation3/seviper.json | 6 ++-- .../species/generation3/sharpedo.json | 4 +-- .../species/generation3/shelgon.json | 6 ++-- .../species/generation3/shiftry.json | 2 +- .../species/generation3/slaking.json | 2 +- .../species/generation3/solrock.json | 4 +-- .../cobblemon/species/generation3/spinda.json | 2 +- .../cobblemon/species/generation3/swalot.json | 4 +-- .../species/generation3/swampert.json | 2 +- .../species/generation3/swellow.json | 2 +- .../species/generation3/torchic.json | 2 +- .../species/generation3/torkoal.json | 6 ++-- .../species/generation3/treecko.json | 2 +- .../species/generation3/vibrava.json | 4 +-- .../species/generation3/vigoroth.json | 2 +- .../species/generation3/volbeat.json | 4 +-- .../species/generation3/wailord.json | 2 +- .../species/generation3/walrein.json | 2 +- .../species/generation3/whiscash.json | 2 +- .../species/generation3/zangoose.json | 6 ++-- .../species/generation4/abomasnow.json | 4 +-- .../species/generation4/ambipom.json | 2 +- .../species/generation4/bibarel.json | 2 +- .../species/generation4/bronzong.json | 6 ++-- .../species/generation4/carnivine.json | 6 ++-- .../cobblemon/species/generation4/chatot.json | 2 +- .../species/generation4/cherrim.json | 4 +-- .../species/generation4/chimchar.json | 2 +- .../species/generation4/drapion.json | 4 +-- .../species/generation4/drifblim.json | 6 ++-- .../species/generation4/dusknoir.json | 6 ++-- .../species/generation4/electivire.json | 4 +-- .../species/generation4/empoleon.json | 2 +- .../species/generation4/finneon.json | 2 +- .../species/generation4/floatzel.json | 2 +- .../species/generation4/froslass.json | 6 ++-- .../cobblemon/species/generation4/gabite.json | 4 +-- .../species/generation4/gallade.json | 6 ++-- .../species/generation4/garchomp.json | 4 +-- .../species/generation4/gastrodon.json | 2 +- .../species/generation4/glaceon.json | 4 +-- .../species/generation4/gliscor.json | 8 ++--- .../cobblemon/species/generation4/grotle.json | 2 +- .../species/generation4/happiny.json | 2 +- .../species/generation4/hippowdon.json | 4 +-- .../species/generation4/honchkrow.json | 2 +- .../species/generation4/infernape.json | 2 +- .../species/generation4/kricketune.json | 2 +- .../species/generation4/leafeon.json | 4 +-- .../species/generation4/lickilicky.json | 2 +- .../species/generation4/lopunny.json | 6 ++-- .../species/generation4/lucario.json | 4 +-- .../species/generation4/lumineon.json | 6 ++-- .../cobblemon/species/generation4/luxio.json | 4 +-- .../cobblemon/species/generation4/luxray.json | 4 +-- .../species/generation4/magmortar.json | 6 ++-- .../species/generation4/magnezone.json | 6 ++-- .../species/generation4/mamoswine.json | 4 +-- .../species/generation4/mismagius.json | 6 ++-- .../species/generation4/monferno.json | 2 +- .../cobblemon/species/generation4/mothim.json | 4 +-- .../species/generation4/munchlax.json | 14 ++++---- .../species/generation4/pachirisu.json | 2 +- .../cobblemon/species/generation4/piplup.json | 2 +- .../species/generation4/porygonz.json | 2 +- .../species/generation4/prinplup.json | 2 +- .../species/generation4/probopass.json | 6 ++-- .../species/generation4/purugly.json | 2 +- .../species/generation4/rhyperior.json | 4 +-- .../species/generation4/roserade.json | 6 ++-- .../species/generation4/skuntank.json | 2 +- .../species/generation4/spiritomb.json | 4 +-- .../species/generation4/staraptor.json | 4 +-- .../species/generation4/staravia.json | 2 +- .../species/generation4/tangrowth.json | 2 +- .../species/generation4/togekiss.json | 6 ++-- .../species/generation4/torterra.json | 2 +- .../species/generation4/toxicroak.json | 4 +-- .../species/generation4/turtwig.json | 2 +- .../species/generation4/vespiquen.json | 6 ++-- .../species/generation4/weavile.json | 6 ++-- .../species/generation4/wormadam.json | 2 +- .../species/generation4/yanmega.json | 2 +- .../species/generation5/alomomola.json | 4 +-- .../species/generation5/amoonguss.json | 2 +- .../cobblemon/species/generation5/audino.json | 4 +-- .../species/generation5/basculin.json | 4 +-- .../species/generation5/beartic.json | 2 +- .../species/generation5/beheeyem.json | 4 +-- .../species/generation5/bisharp.json | 4 +-- .../species/generation5/boldore.json | 6 ++-- .../species/generation5/bouffalant.json | 2 +- .../species/generation5/braviary.json | 4 +-- .../species/generation5/chandelure.json | 4 +-- .../species/generation5/cinccino.json | 4 +-- .../species/generation5/cofagrigus.json | 2 +- .../species/generation5/conkeldurr.json | 4 +-- .../species/generation5/crustle.json | 2 +- .../species/generation5/cryogonal.json | 4 +-- .../species/generation5/darmanitan.json | 10 +++--- .../cobblemon/species/generation5/dewott.json | 4 +-- .../species/generation5/druddigon.json | 4 +-- .../species/generation5/duosion.json | 2 +- .../cobblemon/species/generation5/emboar.json | 2 +- .../cobblemon/species/generation5/emolga.json | 2 +- .../species/generation5/escavalier.json | 4 +-- .../species/generation5/excadrill.json | 4 +-- .../species/generation5/ferrothorn.json | 4 +-- .../species/generation5/fraxure.json | 4 +-- .../species/generation5/galvantula.json | 2 +- .../species/generation5/garbodor.json | 8 ++--- .../species/generation5/gigalith.json | 6 ++-- .../cobblemon/species/generation5/golurk.json | 4 +-- .../species/generation5/gothitelle.json | 4 +-- .../species/generation5/gothorita.json | 4 +-- .../species/generation5/gurdurr.json | 4 +-- .../species/generation5/haxorus.json | 4 +-- .../species/generation5/heatmor.json | 6 ++-- .../species/generation5/herdier.json | 2 +- .../species/generation5/hydreigon.json | 2 +- .../species/generation5/jellicent.json | 2 +- .../species/generation5/krokorok.json | 4 +-- .../species/generation5/krookodile.json | 4 +-- .../species/generation5/lampent.json | 4 +-- .../species/generation5/leavanny.json | 6 ++-- .../species/generation5/liepard.json | 2 +- .../species/generation5/lilligant.json | 10 +++--- .../species/generation5/mandibuzz.json | 2 +- .../species/generation5/maractus.json | 4 +-- .../species/generation5/mienshao.json | 4 +-- .../species/generation5/musharna.json | 2 +- .../species/generation5/oshawott.json | 4 +-- .../species/generation5/palpitoad.json | 2 +- .../species/generation5/pignite.json | 2 +- .../species/generation5/reuniclus.json | 2 +- .../species/generation5/samurott.json | 19 ++--------- .../cobblemon/species/generation5/sawk.json | 6 ++-- .../species/generation5/sawsbuck.json | 2 +- .../species/generation5/scolipede.json | 4 +-- .../species/generation5/scrafty.json | 4 +-- .../species/generation5/seismitoad.json | 2 +- .../species/generation5/serperior.json | 2 +- .../species/generation5/servine.json | 2 +- .../species/generation5/sigilyph.json | 4 +-- .../species/generation5/simipour.json | 6 ++-- .../species/generation5/simisage.json | 6 ++-- .../species/generation5/simisear.json | 6 ++-- .../cobblemon/species/generation5/snivy.json | 2 +- .../species/generation5/stoutland.json | 2 +- .../species/generation5/stunfisk.json | 2 +- .../species/generation5/swadloon.json | 6 ++-- .../cobblemon/species/generation5/swanna.json | 2 +- .../species/generation5/swoobat.json | 2 +- .../cobblemon/species/generation5/tepig.json | 2 +- .../cobblemon/species/generation5/throh.json | 6 ++-- .../species/generation5/tranquill.json | 2 +- .../species/generation5/unfezant.json | 4 +-- .../species/generation5/vanillish.json | 4 +-- .../species/generation5/vanilluxe.json | 4 +-- .../species/generation5/volcarona.json | 6 ++-- .../species/generation5/watchog.json | 2 +- .../species/generation5/whimsicott.json | 4 +-- .../species/generation5/whirlipede.json | 4 +-- .../species/generation5/zebstrika.json | 2 +- .../species/generation5/zoroark.json | 4 +-- .../cobblemon/species/generation5/zorua.json | 15 +-------- .../species/generation5/zweilous.json | 2 +- .../cobblemon/species/generation6/amaura.json | 2 +- .../species/generation6/aromatisse.json | 4 +-- .../species/generation6/aurorus.json | 2 +- .../species/generation6/avalugg.json | 8 ++--- .../species/generation6/barbaracle.json | 2 +- .../species/generation6/braixen.json | 2 +- .../species/generation6/carbink.json | 6 ++-- .../species/generation6/chesnaught.json | 2 +- .../species/generation6/chespin.json | 2 +- .../species/generation6/dedenne.json | 2 +- .../species/generation6/delphox.json | 2 +- .../species/generation6/diggersby.json | 6 ++-- .../species/generation6/doublade.json | 4 +-- .../species/generation6/dragalge.json | 2 +- .../species/generation6/fennekin.json | 2 +- .../species/generation6/fletchinder.json | 2 +- .../species/generation6/floette.json | 4 +-- .../species/generation6/froakie.json | 2 +- .../species/generation6/frogadier.json | 2 +- .../species/generation6/furfrou.json | 2 +- .../cobblemon/species/generation6/gogoat.json | 2 +- .../cobblemon/species/generation6/goodra.json | 4 +-- .../species/generation6/gourgeist.json | 4 +-- .../species/generation6/greninja.json | 2 +- .../species/generation6/hawlucha.json | 6 ++-- .../cobblemon/species/generation6/klefki.json | 2 +- .../species/generation6/malamar.json | 2 +- .../species/generation6/meowstic.json | 2 +- .../species/generation6/noivern.json | 4 +-- .../species/generation6/pangoro.json | 4 +-- .../cobblemon/species/generation6/pyroar.json | 4 +-- .../species/generation6/quilladin.json | 2 +- .../species/generation6/sliggoo.json | 4 +-- .../species/generation6/slurpuff.json | 4 +-- .../species/generation6/sylveon.json | 4 +-- .../species/generation6/talonflame.json | 4 +-- .../species/generation6/trevenant.json | 4 +-- .../species/generation6/tyrantrum.json | 2 +- .../cobblemon/species/generation6/tyrunt.json | 2 +- .../species/generation6/vivillon.json | 4 +-- .../species/generation7/araquanid.json | 4 +-- .../cobblemon/species/generation7/bewear.json | 2 +- .../species/generation7/brionne.json | 2 +- .../species/generation7/bruxish.json | 4 +-- .../species/generation7/charjabug.json | 4 +-- .../cobblemon/species/generation7/comfey.json | 4 +-- .../species/generation7/crabominable.json | 2 +- .../species/generation7/dartrix.json | 2 +- .../species/generation7/decidueye.json | 2 +- .../cobblemon/species/generation7/drampa.json | 4 +-- .../species/generation7/golisopod.json | 2 +- .../species/generation7/gumshoos.json | 2 +- .../species/generation7/hakamoo.json | 2 +- .../species/generation7/incineroar.json | 4 +-- .../cobblemon/species/generation7/komala.json | 2 +- .../cobblemon/species/generation7/kommoo.json | 2 +- .../cobblemon/species/generation7/litten.json | 4 +-- .../species/generation7/lurantis.json | 4 +-- .../species/generation7/lycanroc.json | 4 +-- .../species/generation7/mimikyu.json | 4 +-- .../cobblemon/species/generation7/minior.json | 2 +- .../species/generation7/mudsdale.json | 4 +-- .../species/generation7/oranguru.json | 4 +-- .../species/generation7/oricorio.json | 4 +-- .../species/generation7/palossand.json | 4 +-- .../species/generation7/passimian.json | 4 +-- .../species/generation7/popplio.json | 2 +- .../species/generation7/primarina.json | 2 +- .../species/generation7/ribombee.json | 2 +- .../cobblemon/species/generation7/rowlet.json | 2 +- .../species/generation7/salazzle.json | 4 +-- .../species/generation7/shiinotic.json | 2 +- .../species/generation7/steenee.json | 2 +- .../species/generation7/togedemaru.json | 2 +- .../species/generation7/torracat.json | 4 +-- .../species/generation7/toucannon.json | 2 +- .../species/generation7/toxapex.json | 4 +-- .../species/generation7/tsareena.json | 2 +- .../species/generation7/turtonator.json | 4 +-- .../species/generation7/vikavolt.json | 4 +-- .../species/generation7/wishiwashi.json | 2 +- .../species/generation8/alcremie.json | 2 +- .../species/generation8/appletun.json | 2 +- .../species/generation8/arrokuda.json | 2 +- .../species/generation8/barraskewda.json | 2 +- .../species/generation8/boltund.json | 2 +- .../cobblemon/species/generation8/carkol.json | 4 +-- .../species/generation8/centiskorch.json | 4 +-- .../species/generation8/cinderace.json | 4 +-- .../species/generation8/coalossal.json | 4 +-- .../species/generation8/copperajah.json | 2 +- .../species/generation8/corviknight.json | 4 +-- .../species/generation8/corvisquire.json | 2 +- .../species/generation8/cramorant.json | 2 +- .../species/generation8/cursola.json | 2 +- .../species/generation8/dottler.json | 2 +- .../species/generation8/dragapult.json | 4 +-- .../species/generation8/drakloak.json | 4 +-- .../species/generation8/drednaw.json | 2 +- .../species/generation8/drizzile.json | 2 +- .../cobblemon/species/generation8/eiscue.json | 10 +++--- .../species/generation8/eldegoss.json | 2 +- .../species/generation8/falinks.json | 4 +-- .../species/generation8/flapple.json | 2 +- .../species/generation8/frosmoth.json | 4 +-- .../species/generation8/grapploct.json | 2 +- .../species/generation8/grimmsnarl.json | 2 +- .../species/generation8/grookey.json | 2 +- .../species/generation8/hatterene.json | 2 +- .../species/generation8/hattrem.json | 2 +- .../species/generation8/indeedee.json | 2 +- .../species/generation8/inteleon.json | 2 +- .../species/generation8/morgrem.json | 2 +- .../species/generation8/morpeko.json | 2 +- .../cobblemon/species/generation8/mrrime.json | 2 +- .../species/generation8/obstagoon.json | 2 +- .../species/generation8/orbeetle.json | 2 +- .../species/generation8/perrserker.json | 4 +-- .../species/generation8/polteageist.json | 2 +- .../cobblemon/species/generation8/raboot.json | 4 +-- .../species/generation8/rillaboom.json | 2 +- .../species/generation8/runerigus.json | 2 +- .../species/generation8/sandaconda.json | 2 +- .../species/generation8/scorbunny.json | 4 +-- .../species/generation8/sirfetchd.json | 2 +- .../cobblemon/species/generation8/sobble.json | 2 +- .../species/generation8/thievul.json | 4 +-- .../species/generation8/thwackey.json | 2 +- .../species/generation8/toxtricity.json | 2 +- .../cobblemon/species/generation8/zacian.json | 18 +++++------ .../species/generation8/zamazenta.json | 18 +++++------ .../species/generation8a/basculegion.json | 2 +- .../species/generation8a/kleavor.json | 2 +- .../species/generation8a/overqwil.json | 2 +- .../species/generation8a/sneasler.json | 6 ++-- .../species/generation8a/ursaluna.json | 6 ++-- .../species/generation8a/wyrdeer.json | 2 +- .../species/generation9/annihilape.json | 4 +-- .../species/generation9/arboliva.json | 4 +-- .../species/generation9/arctibax.json | 2 +- .../species/generation9/armarouge.json | 6 ++-- .../species/generation9/baxcalibur.json | 2 +- .../species/generation9/bellibolt.json | 4 +-- .../species/generation9/bombirdier.json | 2 +- .../species/generation9/brambleghast.json | 2 +- .../species/generation9/ceruledge.json | 6 ++-- .../species/generation9/cetitan.json | 2 +- .../species/generation9/clodsire.json | 2 +- .../species/generation9/crocalor.json | 2 +- .../species/generation9/cyclizar.json | 2 +- .../species/generation9/dachsbun.json | 2 +- .../cobblemon/species/generation9/dolliv.json | 4 +-- .../species/generation9/dondozo.json | 2 +- .../species/generation9/dudunsparce.json | 4 +-- .../species/generation9/espathra.json | 2 +- .../species/generation9/farigiraf.json | 4 +-- .../species/generation9/flamigo.json | 4 +-- .../species/generation9/floragato.json | 2 +- .../species/generation9/fuecoco.json | 2 +- .../species/generation9/garganacl.json | 2 +- .../species/generation9/glimmora.json | 4 +-- .../species/generation9/grafaiai.json | 2 +- .../species/generation9/houndstone.json | 2 +- .../species/generation9/kilowattrel.json | 2 +- .../species/generation9/kingambit.json | 4 +-- .../cobblemon/species/generation9/klawf.json | 2 +- .../cobblemon/species/generation9/lokix.json | 2 +- .../species/generation9/mabosstiff.json | 2 +- .../species/generation9/maushold.json | 2 +- .../species/generation9/meowscarada.json | 2 +- .../species/generation9/naclstack.json | 2 +- .../species/generation9/oinkologne.json | 2 +- .../species/generation9/orthworm.json | 2 +- .../cobblemon/species/generation9/pawmo.json | 2 +- .../cobblemon/species/generation9/pawmot.json | 2 +- .../species/generation9/quaquaval.json | 2 +- .../cobblemon/species/generation9/quaxly.json | 2 +- .../species/generation9/quaxwell.json | 2 +- .../species/generation9/revavroom.json | 4 +-- .../species/generation9/scovillain.json | 2 +- .../species/generation9/sinistcha.json | 2 +- .../species/generation9/skeledirge.json | 2 +- .../species/generation9/sprigatito.json | 2 +- .../species/generation9/squawkabilly.json | 2 +- .../species/generation9/tatsugiri.json | 4 +-- .../species/generation9/tinkaton.json | 2 +- .../species/generation9/tinkatuff.json | 2 +- .../species/generation9/toedscruel.json | 2 +- .../cobblemon/species/generation9/veluza.json | 2 +- 567 files changed, 996 insertions(+), 1084 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json index 5173539eb9..096185a92f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json @@ -73,7 +73,7 @@ }, { "item": "cobblemon:rocky_helmet", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json index ccd7b46824..4c332d28a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json @@ -63,11 +63,11 @@ }, { "item": "cobblemon:twisted_spoon", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json index 07e36bf444..f45f9b8d71 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:razor_fang", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json index 984008c906..29d8abb80a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json @@ -61,7 +61,7 @@ }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json index 7b1e295e4e..02d61b1f82 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json @@ -70,11 +70,11 @@ "entries": [ { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json index 83c21bcc57..2e9baf2658 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json @@ -74,7 +74,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json b/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json index f4629bc414..1a9a4957ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json index 847bd4d1f9..e704e7235e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json @@ -73,11 +73,11 @@ "entries": [ { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/chansey.json b/common/src/main/resources/data/cobblemon/species/generation1/chansey.json index 9802a72071..cd14da9d96 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/chansey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/chansey.json @@ -64,15 +64,15 @@ "entries": [ { "item": "cobblemon:lucky_egg", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:oval_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "minecraft:egg", - "percentage": 50 + "percentage": 50.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json index 4254aef6e6..2b503944bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json @@ -78,7 +78,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charmander.json b/common/src/main/resources/data/cobblemon/species/generation1/charmander.json index d63cdf05c2..5995aa4389 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charmander.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charmander.json @@ -75,7 +75,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json b/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json index 2feb8f5faa..d3385a7ad0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json index 7e0e23beff..c50c949b63 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json @@ -59,15 +59,15 @@ "entries": [ { "item": "cobblemon:moon_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json index cdddf2bd93..47fb507ad9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json @@ -59,15 +59,15 @@ "entries": [ { "item": "cobblemon:moon_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json index 8484eff61a..002f153a8e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json @@ -67,11 +67,11 @@ "entries": [ { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:shell_bell", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json index 82e4900e2d..b1671833e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json @@ -69,11 +69,11 @@ }, { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ditto.json b/common/src/main/resources/data/cobblemon/species/generation1/ditto.json index 1345bc329f..cb4842a73d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ditto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ditto.json @@ -62,7 +62,7 @@ }, { "item": "cobblemon:metal_powder", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json index 0bb14d3183..ed07d81149 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json @@ -72,11 +72,11 @@ }, { "item": "cobblemon:sharp_beak", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json b/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json index 14ba4f42a6..57bc3921dd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json @@ -74,15 +74,15 @@ }, { "item": "cobblemon:dragon_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:dragon_scale", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json index 90c407263e..7a266ff3a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json @@ -76,15 +76,15 @@ }, { "item": "cobblemon:dragon_fang", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:dragon_scale", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:yache_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json index 26c7292233..0bd7a1ed83 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json @@ -73,15 +73,15 @@ }, { "item": "minecraft:potato", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:big_root", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -342,15 +342,15 @@ }, { "item": "minecraft:potato", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:big_root", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 } ] } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/eevee.json b/common/src/main/resources/data/cobblemon/species/generation1/eevee.json index 4eaf5029e7..fa819af2fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/eevee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/eevee.json @@ -54,11 +54,11 @@ "entries": [ { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:eviolite", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json b/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json index 35753ba01b..869a1f1f10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json @@ -67,11 +67,11 @@ }, { "item": "cobblemon:electirizer", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json index 767bcd4e88..58650abd75 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json @@ -184,7 +184,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json index f451ba24ac..a5aff6a050 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json @@ -72,11 +72,11 @@ }, { "item": "cobblemon:oval_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json index 17ffbdd2c6..0569257183 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json @@ -84,7 +84,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/fearow.json b/common/src/main/resources/data/cobblemon/species/generation1/fearow.json index b937e80e3f..e956ed4c9d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/fearow.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/fearow.json @@ -70,11 +70,11 @@ }, { "item": "cobblemon:sharp_beak", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json index e4f567954e..cbebc999e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:fire_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json index 19ba013f5a..5d98941300 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json @@ -60,11 +60,11 @@ "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gloom.json b/common/src/main/resources/data/cobblemon/species/generation1/gloom.json index 68c184c4da..74cf421e67 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gloom.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gloom.json @@ -62,11 +62,11 @@ "entries": [ { "item": "cobblemon:absorb_bulb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golbat.json b/common/src/main/resources/data/cobblemon/species/generation1/golbat.json index 7adc3b63ab..71ffbc6a68 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golbat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golbat.json @@ -67,15 +67,15 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:razor_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json b/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json index bbf16561e4..100a3bc67e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json @@ -70,7 +70,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:mystic_water", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golduck.json b/common/src/main/resources/data/cobblemon/species/generation1/golduck.json index 41239af13e..4e4e3d9b66 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golduck.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golduck.json @@ -75,7 +75,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golem.json b/common/src/main/resources/data/cobblemon/species/generation1/golem.json index 0f708930be..2eb9e01010 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golem.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golem.json @@ -77,15 +77,15 @@ }, { "item": "cobblemon:everstone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:black_augurite", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:rindo_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json index 2189624317..ef6e164239 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json @@ -77,15 +77,15 @@ }, { "item": "cobblemon:everstone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:black_augurite", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -230,15 +230,15 @@ }, { "item": "cobblemon:cell_battery", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:magnet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json index 6785920dc6..c2762eaea8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json @@ -223,23 +223,6 @@ "gluttony", "h:powerofalchemy" ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:black_sludge", - "percentage": 2.5 - }, - { - "item": "cobblemon:toxic_orb", - "percentage": 2.5 - } - ] - }, "moves": [ "1:pound", "1:poisongas", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json index 1cf6552786..37ffe4de89 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json @@ -71,11 +71,11 @@ }, { "item": "minecraft:bone_meal", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/haunter.json b/common/src/main/resources/data/cobblemon/species/generation1/haunter.json index fbc0ab7911..164ee41455 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/haunter.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/haunter.json @@ -63,11 +63,11 @@ "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json b/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json index 192507f27c..1600107573 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json @@ -59,11 +59,11 @@ "entries": [ { "item": "cobblemon:black_belt", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json b/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json index 6746821da8..efbe1f8bd3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json @@ -59,11 +59,11 @@ "entries": [ { "item": "cobblemon:black_belt", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hypno.json b/common/src/main/resources/data/cobblemon/species/generation1/hypno.json index 6e79b29a6e..cb2b3cce9b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hypno.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hypno.json @@ -59,7 +59,7 @@ "entries": [ { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json b/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json index 0f00f754bf..8e29445e17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json b/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json index 5be055b399..80027723e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json @@ -61,15 +61,15 @@ "entries": [ { "item": "cobblemon:moon_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:air_balloon", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json index 0670d7f4cb..b618078b98 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:thunder_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:magnet", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json index dee9c34aca..51ccbae35c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json @@ -54,7 +54,7 @@ "entries": [ { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json b/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json index ec4d590564..4b002a59f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json @@ -70,11 +70,11 @@ "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json b/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json index 1c91b3dd51..37c85952f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json @@ -73,11 +73,11 @@ "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 10 + "percentage": 10.0 }, { "item": "minecraft:bone_meal", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json index e821b5dc05..38369565b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json @@ -57,11 +57,11 @@ }, { "item": "cobblemon:twisted_spoon", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json index 32e231a77c..864920fbf6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json index 27e4726d96..70d791d045 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json @@ -66,11 +66,11 @@ "entries": [ { "item": "cobblemon:kings_rock", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json index 9d75cb9224..dd7ddedda2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json @@ -73,19 +73,19 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "minecraft:heart_of_the_sea", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json index 206a25d603..3ed86cafbd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json @@ -53,15 +53,15 @@ "entries": [ { "item": "cobblemon:focus_band", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:muscle_band", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:wepear_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json index 2d92c9aac1..83e523f322 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json @@ -53,15 +53,15 @@ "entries": [ { "item": "cobblemon:focus_band", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:muscle_band", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json b/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json index 25140659cb..dc19d8d4f7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json @@ -71,7 +71,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wacan_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json index 9c9c94b2cf..c23f5c7361 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json @@ -52,15 +52,15 @@ "entries": [ { "item": "minecraft:blaze_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:magmarizer", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magneton.json b/common/src/main/resources/data/cobblemon/species/generation1/magneton.json index a724717714..fe4d39db7a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magneton.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magneton.json @@ -76,15 +76,15 @@ }, { "item": "cobblemon:magnet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:metal_coat", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json index 28a1989f88..16828e10ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json @@ -60,7 +60,7 @@ }, { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json index 7994f3747e..fec2133ac3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json @@ -58,11 +58,11 @@ "entries": [ { "item": "cobblemon:light_clay", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -253,7 +253,7 @@ "entries": [ { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/muk.json b/common/src/main/resources/data/cobblemon/species/generation1/muk.json index e634a87ecc..4f206b1dc9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/muk.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/muk.json @@ -69,11 +69,11 @@ }, { "item": "cobblemon:black_sludge", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:toxic_orb", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -224,23 +224,6 @@ "gluttony", "h:powerofalchemy" ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:black_sludge", - "percentage": 5 - }, - { - "item": "cobblemon:toxic_orb", - "percentage": 5 - } - ] - }, "moves": [ "1:venomdrench", "1:pound", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json index e0c4b92c9a..30b052ddb1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json @@ -61,11 +61,11 @@ "entries": [ { "item": "cobblemon:poison_barb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json index 1ef6d3c6eb..c656a1bbf1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json @@ -60,11 +60,11 @@ "entries": [ { "item": "cobblemon:poison_barb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json index c54945dc80..eb5ef49f53 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json @@ -59,11 +59,11 @@ "entries": [ { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json b/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json index b93d092c07..b74effc6af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json @@ -59,11 +59,11 @@ "entries": [ { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json index 5afc3bb64c..99c93a0f7f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json @@ -66,11 +66,11 @@ }, { "item": "minecraft:charcoal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -241,7 +241,7 @@ }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json b/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json index 96be9e0b07..11126da840 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json @@ -77,7 +77,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/omastar.json b/common/src/main/resources/data/cobblemon/species/generation1/omastar.json index 6aa26157d6..400fcae4a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/omastar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/omastar.json @@ -76,7 +76,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/parasect.json b/common/src/main/resources/data/cobblemon/species/generation1/parasect.json index e9d44b6343..35983362a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/parasect.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/parasect.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/persian.json b/common/src/main/resources/data/cobblemon/species/generation1/persian.json index 3c806789a9..37a01aa830 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/persian.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/persian.json @@ -67,11 +67,11 @@ }, { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -237,11 +237,11 @@ }, { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json index f45728a274..672ebe0c79 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json @@ -74,11 +74,11 @@ }, { "item": "cobblemon:sharp_beak", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chilan_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json index c1cce9590f..376195515d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json @@ -76,7 +76,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json index 03858c27ac..ae0ebb10e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json @@ -71,15 +71,15 @@ "entries": [ { "item": "cobblemon:light_ball", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:thunder_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json index 9d757ed890..1e5f4797e9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json index bb4fb8a77d..ded0564c96 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json @@ -67,11 +67,11 @@ "entries": [ { "item": "cobblemon:kings_rock", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json index 11fbcb0614..be817ea243 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json @@ -68,11 +68,11 @@ "entries": [ { "item": "cobblemon:kings_rock", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/primeape.json b/common/src/main/resources/data/cobblemon/species/generation1/primeape.json index 05e2988b32..aee7f1f64a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/primeape.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/primeape.json @@ -59,11 +59,11 @@ "entries": [ { "item": "cobblemon:muscle_band", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json index a0ece3dc64..066a1d0738 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json @@ -63,15 +63,15 @@ "entries": [ { "item": "cobblemon:light_ball", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:thunder_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:oran_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json index 330c173963..bc3602b922 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json @@ -72,11 +72,11 @@ }, { "item": "minecraft:blaze_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -203,7 +203,7 @@ }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json index 53d25d04f3..1d0348cf74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -214,7 +214,7 @@ }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json index 1d1cbdcfee..a25ec26daa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json @@ -62,11 +62,11 @@ "entries": [ { "item": "cobblemon:protector", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json index 420f8f53d3..af52cbf277 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json @@ -71,11 +71,11 @@ }, { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -232,11 +232,11 @@ }, { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seadra.json b/common/src/main/resources/data/cobblemon/species/generation1/seadra.json index 9850d09623..3cda912471 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seadra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seadra.json @@ -75,7 +75,7 @@ }, { "item": "cobblemon:dragon_scale", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json index 96a370588f..a127f18ceb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json @@ -71,15 +71,15 @@ }, { "item": "minecraft:bone_meal", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json index f40de25c2d..f48aefdb93 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json @@ -72,11 +72,11 @@ "entries": [ { "item": "cobblemon:kings_rock", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -327,7 +327,7 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json index 4da0eb44ab..1e956380c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json @@ -252,16 +252,14 @@ ], "behaviour": { "moving": { - "walk": { - "walkSpeed": 0.125}, + "walk": { + "walkSpeed": 0.125 + }, "swim": { "swimSpeed": "0.2", "canBreatheUnderwater": true, "canSwimInWater": true, "canSwimInLava": false - }, - "walk": { - "walkSpeed": 0.125 } }, "resting": { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json index f7faf98ce5..71fc816a34 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json @@ -54,12 +54,12 @@ "walkSpeed": 0.147 } }, - "resting": { - "canSleep": true, - "willSleepOnBed": false, - "depth": "normal", - "light": "0-15" - } + "resting": { + "canSleep": true, + "willSleepOnBed": false, + "depth": "normal", + "light": "0-15" + } }, "drops": { "amount": 8, @@ -74,11 +74,11 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:leftovers", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json b/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json index f1a2aa80c5..e6dfde8870 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json @@ -77,7 +77,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json b/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json index 8d90aa66ba..94365fae26 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json @@ -76,7 +76,7 @@ { "item": "minecraft:glow_ink_sac", "quantityRange": "1-3", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:poison_barb", diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json b/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json index 2860c05787..4b5d311d1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json @@ -76,11 +76,11 @@ { "item": "minecraft:glow_ink_sac", "quantityRange": "2-4", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json b/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json index f3d0bd32ea..fe6fd886bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json @@ -59,11 +59,11 @@ "entries": [ { "item": "cobblemon:water_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json b/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json index f0e64cf720..435d418c82 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json @@ -72,11 +72,11 @@ }, { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json index fbf54e75f0..ea4b743f63 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json b/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json index 88e3b137f7..da78373f30 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json @@ -64,11 +64,11 @@ "entries": [ { "item": "cobblemon:big_root", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json b/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json index 9e8c0ad94d..32b426a455 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json @@ -62,11 +62,11 @@ "entries": [ { "item": "cobblemon:absorb_bulb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json b/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json index 514ee73aa8..7bb70f010d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json @@ -74,7 +74,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json b/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json index 7f2237c2c8..9300806b17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json @@ -64,11 +64,11 @@ "entries": [ { "item": "cobblemon:big_root", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json index 5c8a17ac65..0d51d31bca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json @@ -64,11 +64,11 @@ "entries": [ { "item": "cobblemon:black_sludge", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:smoke_ball", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -194,15 +194,15 @@ "entries": [ { "item": "cobblemon:black_sludge", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:smoke_ball", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json b/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json index fc8d736335..77ee510809 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json @@ -60,15 +60,15 @@ "entries": [ { "item": "cobblemon:moon_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:air_balloon", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:oran_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json index a2ebb06ee5..e2b0919abd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json index a4c3118c3f..59cf2b610a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json @@ -66,7 +66,7 @@ }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json index 836b37bcc9..976263fe6a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:kebia_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json b/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json index 7ade9d846e..d81c1144a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json index dcd3ffca02..bf4689f42d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json @@ -56,11 +56,11 @@ "entries": [ { "item": "cobblemon:absorb_bulb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json index eafbc51738..648bf74e64 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json @@ -59,15 +59,15 @@ "entries": [ { "item": "cobblemon:lucky_egg", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:oval_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "minecraft:egg", - "percentage": 50 + "percentage": 50.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json b/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json index 2db9290f05..e96f5aa2c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json @@ -66,7 +66,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json b/common/src/main/resources/data/cobblemon/species/generation2/corsola.json index 885a572699..ef8499e5de 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/corsola.json @@ -69,7 +69,7 @@ "entries": [ { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/crobat.json b/common/src/main/resources/data/cobblemon/species/generation2/crobat.json index bd2016ffe4..fbfbcf7a92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/crobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/crobat.json @@ -67,15 +67,15 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:razor_fang", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:persim_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json b/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json index 72bb8d1fbf..9905b2f9f7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json @@ -70,7 +70,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json index ab561d0a4e..c5879e30a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json @@ -69,7 +69,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/delibird.json b/common/src/main/resources/data/cobblemon/species/generation2/delibird.json index d7f104a015..3f17f89e0d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/delibird.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/delibird.json @@ -75,7 +75,7 @@ }, { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/donphan.json b/common/src/main/resources/data/cobblemon/species/generation2/donphan.json index 4483990381..82d4f9f27d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/donphan.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/donphan.json @@ -67,11 +67,11 @@ }, { "item": "cobblemon:protector", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json index 9b5563c89a..84f98cfa0d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:sun_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:twisted_spoon", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json index c744e51b52..0c5bc7036f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json @@ -70,7 +70,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json index 4b9b98260f..cc79841ced 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json index 0b881e58ac..d567ab86ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json @@ -67,11 +67,11 @@ }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:iron_ball", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/furret.json b/common/src/main/resources/data/cobblemon/species/generation2/furret.json index dfe100d7dc..73428201eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/furret.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/furret.json @@ -53,11 +53,11 @@ "entries": [ { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json index efadd091b9..b4a833523a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/heracross.json b/common/src/main/resources/data/cobblemon/species/generation2/heracross.json index cf62e022bd..2403e20a10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/heracross.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/heracross.json @@ -61,7 +61,7 @@ "entries": [ { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json index 76ed75d085..1fec60d23c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json @@ -59,11 +59,11 @@ "entries": [ { "item": "cobblemon:black_belt", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json b/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json index b344a9e6c6..345f347951 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json @@ -61,11 +61,11 @@ }, { "item": "minecraft:blaze_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json b/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json index 5ca0d64688..758efafb73 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json @@ -58,7 +58,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json b/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json index df85282f45..ee65f59fed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json @@ -76,7 +76,7 @@ }, { "item": "cobblemon:dragon_scale", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json index db2b7e1883..55a1f8b12d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json @@ -76,11 +76,11 @@ }, { "item": "cobblemon:deep_sea_scale", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ledian.json b/common/src/main/resources/data/cobblemon/species/generation2/ledian.json index f2d092ffe6..6c31415d2b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ledian.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ledian.json @@ -68,7 +68,7 @@ "entries": [ { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json b/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json index 57094daaaf..8e0e68b8f9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json @@ -79,7 +79,7 @@ }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json b/common/src/main/resources/data/cobblemon/species/generation2/mantine.json index 06c4ecc45d..28f7c576c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/mantine.json @@ -76,7 +76,7 @@ }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/marill.json b/common/src/main/resources/data/cobblemon/species/generation2/marill.json index 0829816885..fd8df6154b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/marill.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/marill.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/meganium.json b/common/src/main/resources/data/cobblemon/species/generation2/meganium.json index 62efe0cd50..519bee679a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/meganium.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/meganium.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/miltank.json b/common/src/main/resources/data/cobblemon/species/generation2/miltank.json index 9bd7c4d099..d8b0ea0ea0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/miltank.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/miltank.json @@ -70,7 +70,7 @@ }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json index f8b3727ede..a072753201 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json @@ -68,11 +68,11 @@ }, { "item": "cobblemon:wise_glasses", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/octillery.json b/common/src/main/resources/data/cobblemon/species/generation2/octillery.json index 4576d4525f..e909316bca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/octillery.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/octillery.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json index 873e3588fb..68c4a3e833 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json @@ -68,11 +68,11 @@ }, { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json index 512c5bd227..20aada7acb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json @@ -66,11 +66,11 @@ }, { "item": "cobblemon:kings_rock", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json index 1919b9a303..14e3c35307 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json @@ -71,7 +71,7 @@ "entries": [ { "item": "cobblemon:upgrade", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json b/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json index a37a088cd1..acf061f173 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json @@ -64,11 +64,11 @@ "entries": [ { "item": "cobblemon:hard_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json b/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json index cfa8edac4e..5235ffca21 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json index 421981ad2d..58e3762dc3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json @@ -67,7 +67,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json b/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json index 86e34e8816..6ab503fc10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json @@ -70,7 +70,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:aspear_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json index 8503112eda..91f490cf31 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json @@ -61,7 +61,7 @@ "entries": [ { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json b/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json index 7fb0f990cc..6a276ba0b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json @@ -65,15 +65,15 @@ "entries": [ { "item": "cobblemon:sharp_beak", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:metal_coat", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json b/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json index 11e66e60b5..87b37f5e12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json @@ -57,7 +57,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json index ac68a0a43b..08060c6d79 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json @@ -72,11 +72,11 @@ "entries": [ { "item": "cobblemon:kings_rock", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -286,7 +286,7 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json index 0b13b3799f..f37178867e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json @@ -70,11 +70,11 @@ }, { "item": "cobblemon:metal_coat", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json index 80bd7d179d..de55ba8578 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json @@ -61,11 +61,11 @@ "entries": [ { "item": "cobblemon:hard_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json b/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json index e2fa34c620..9473ad7525 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json index 6c8fc304f6..80256f22ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json @@ -54,15 +54,15 @@ "entries": [ { "item": "cobblemon:lucky_egg", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:shiny_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/totodile.json b/common/src/main/resources/data/cobblemon/species/generation2/totodile.json index 9921f51e66..a5c0d0397e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/totodile.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/totodile.json @@ -74,7 +74,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json index 2084dab62d..1e066a5413 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json @@ -67,7 +67,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json b/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json index c935ca63e5..38c23e3c99 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:hard_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:chople_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json index db9fa53d11..29c8493d5e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:moon_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:black_glasses", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json index 2e0297fb3c..8f40057eea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json @@ -57,15 +57,15 @@ }, { "item": "minecraft:honey_bottle", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:peat_block", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json b/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json index 2aef72f325..2587afdad1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json @@ -65,7 +65,7 @@ "entries": [ { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation2/xatu.json b/common/src/main/resources/data/cobblemon/species/generation2/xatu.json index 6457f0b4e3..b4f3102d14 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/xatu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/xatu.json @@ -74,11 +74,11 @@ }, { "item": "cobblemon:wise_glasses", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/absol.json b/common/src/main/resources/data/cobblemon/species/generation3/absol.json index d0f761eeb5..7bf546a2a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/absol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/absol.json @@ -53,15 +53,15 @@ "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:life_orb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/aggron.json b/common/src/main/resources/data/cobblemon/species/generation3/aggron.json index 4d4d466831..07ec2a088b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/aggron.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/aggron.json @@ -65,11 +65,11 @@ }, { "item": "cobblemon:hard_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:chople_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json index 6a82d69f4b..be3d91b095 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json @@ -60,7 +60,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/anorith.json b/common/src/main/resources/data/cobblemon/species/generation3/anorith.json index dbfce93a64..6f3c5e00f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/anorith.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/anorith.json @@ -73,7 +73,7 @@ "entries": [ { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json b/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json index c8cc91fb04..f3e31038f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json @@ -72,7 +72,7 @@ "entries": [ { "item": "cobblemon:quick_claw", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/banette.json b/common/src/main/resources/data/cobblemon/species/generation3/banette.json index bbe84b9498..77b68ac99d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/banette.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/banette.json @@ -52,11 +52,11 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json index 0f93d31b61..984e5a3227 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:bright_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json index b6776861ff..a91ca97380 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json @@ -60,7 +60,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json index a7651f0f7f..69a1209378 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json @@ -70,7 +70,7 @@ }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json index f8ba6a2666..c8205023fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json @@ -69,15 +69,15 @@ }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:sticky_barb", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json index 89a5d5180d..8073342439 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json @@ -54,11 +54,11 @@ "entries": [ { "item": "minecraft:magma_cream", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/castform.json b/common/src/main/resources/data/cobblemon/species/generation3/castform.json index d56426921d..66ed46d935 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/castform.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/castform.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -162,7 +162,7 @@ "entries": [ { "item": "cobblemon:heat_rock", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -189,7 +189,7 @@ "entries": [ { "item": "cobblemon:damp_rock", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -216,7 +216,7 @@ "entries": [ { "item": "cobblemon:icy_rock", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json index 0fb1cf3b58..24bcf26c15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json @@ -63,15 +63,15 @@ "entries": [ { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cleanse_tag", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:soothe_bell", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/claydol.json b/common/src/main/resources/data/cobblemon/species/generation3/claydol.json index 9eb7a5f6b2..45166acda0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/claydol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/claydol.json @@ -69,11 +69,11 @@ }, { "item": "cobblemon:light_clay", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json index 3710039c87..467b0a303d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json @@ -60,7 +60,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cradily.json b/common/src/main/resources/data/cobblemon/species/generation3/cradily.json index e3828d6b85..4be02a77f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cradily.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cradily.json @@ -71,7 +71,7 @@ "entries": [ { "item": "cobblemon:big_root", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json index 5e0aa874f1..331f9720bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json @@ -53,11 +53,11 @@ "entries": [ { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json index 461b9b77ec..e96b7470fd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json @@ -44,10 +44,11 @@ "eggCycles": 120, "baseFriendship": 0, "drops": { - "amount": 1, + "amount": 5, "entries": [ { - "item": "minecraft:eye_of_ender" + "item": "minecraft:eye_of_ender", + "quantityRange": "3-5" } ] }, @@ -201,15 +202,6 @@ "special_defence": 0, "speed": 0 }, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - }, "moves": [ "1:leer", "1:wrap", @@ -361,15 +353,6 @@ "special_defence": 1, "speed": 0 }, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - }, "moves": [ "1:leer", "1:wrap", @@ -527,15 +510,6 @@ "special_defence": 0, "speed": 3 }, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - }, "moves": [ "1:leer", "1:wrap", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json index 5d678e2340..3ed4c6a5dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json @@ -63,15 +63,15 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:reaper_cloth", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json index ba8dc5d20e..4ae934893a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json index 3b4cc7924a..64c4814df3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:chesto_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/feebas.json b/common/src/main/resources/data/cobblemon/species/generation3/feebas.json index 26bfdbebfc..baed5ef09c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/feebas.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/feebas.json @@ -74,7 +74,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:prism_scale", diff --git a/common/src/main/resources/data/cobblemon/species/generation3/flygon.json b/common/src/main/resources/data/cobblemon/species/generation3/flygon.json index d0893215ca..5a632e32fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/flygon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/flygon.json @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:soft_sand", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:yache_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json index 907026cc98..ef21012905 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json @@ -71,15 +71,15 @@ }, { "item": "cobblemon:dawn_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:twisted_spoon", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json b/common/src/main/resources/data/cobblemon/species/generation3/glalie.json index 717d7d33eb..bef8c03ca0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/glalie.json @@ -57,15 +57,15 @@ }, { "item": "cobblemon:dawn_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json index 506aedacda..7a08987a65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json @@ -69,7 +69,7 @@ "entries": [ { "item": "cobblemon:deep_sea_scale", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json b/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json index 6a4039ed2e..4a34fa6ba7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json @@ -63,7 +63,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json b/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json index 64ff334268..5ea49904fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json @@ -60,7 +60,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json b/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json index 8c303ad8c3..59ccb154a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json @@ -53,15 +53,15 @@ "entries": [ { "item": "cobblemon:black_belt", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kings_rock", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json index 2e44fe434b..155c375aa1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json @@ -69,7 +69,7 @@ "entries": [ { "item": "cobblemon:deep_sea_tooth", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json index c2b39e28f8..741b841df5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json @@ -68,11 +68,11 @@ "entries": [ { "item": "cobblemon:bright_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json b/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json index e71785632d..440904a4cd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json @@ -63,7 +63,7 @@ "entries": [ { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json index 07c5c88f38..b6735686fd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json @@ -70,15 +70,15 @@ }, { "item": "cobblemon:dawn_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:twisted_spoon", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lairon.json b/common/src/main/resources/data/cobblemon/species/generation3/lairon.json index df5bdbe79a..04d851f5dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lairon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lairon.json @@ -65,11 +65,11 @@ }, { "item": "cobblemon:hard_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lileep.json b/common/src/main/resources/data/cobblemon/species/generation3/lileep.json index 673a10aca8..042017cd84 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lileep.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lileep.json @@ -71,7 +71,7 @@ "entries": [ { "item": "cobblemon:big_root", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json index 5a0d5ee9ca..a78dbb2448 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json @@ -68,7 +68,7 @@ "entries": [ { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -205,7 +205,7 @@ "entries": [ { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lombre.json b/common/src/main/resources/data/cobblemon/species/generation3/lombre.json index ba2452f157..711d63718e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lombre.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lombre.json @@ -74,11 +74,11 @@ }, { "item": "cobblemon:mental_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json index 7079e4b7a6..3e4ed7eec1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json b/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json index 276d726051..6d5f79b1b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json @@ -73,11 +73,11 @@ }, { "item": "cobblemon:mental_herb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:kebia_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json b/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json index dcb628ece5..1246b5df8d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json @@ -68,11 +68,11 @@ "entries": [ { "item": "cobblemon:moon_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json b/common/src/main/resources/data/cobblemon/species/generation3/manectric.json index 8d584b7640..4e64b1efb3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/manectric.json @@ -60,7 +60,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json b/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json index 756ab9f73e..a6b36422f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json index 4236aab7af..77199cb8c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json @@ -75,11 +75,11 @@ }, { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json index eb761f96c8..7f2ea421a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json @@ -60,15 +60,15 @@ "entries": [ { "item": "cobblemon:razor_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:iron_ball", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json index 02fe0306b3..50ad10d384 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json @@ -52,15 +52,15 @@ "entries": [ { "item": "cobblemon:wise_glasses", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:black_belt", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/metang.json b/common/src/main/resources/data/cobblemon/species/generation3/metang.json index 10ca7d62a4..4ec8b24a5c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/metang.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/metang.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:metal_coat", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json index 30756871e7..b8b4d0a5e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json b/common/src/main/resources/data/cobblemon/species/generation3/milotic.json index 8471730554..1ac532919a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/milotic.json @@ -71,11 +71,11 @@ "entries": [ { "item": "minecraft:bone_meal", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:prism_scale", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/minun.json b/common/src/main/resources/data/cobblemon/species/generation3/minun.json index 5f3446f31e..d3a2c03096 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/minun.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/minun.json @@ -53,15 +53,15 @@ "entries": [ { "item": "cobblemon:magnet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cell_battery", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json b/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json index 20ff0dfe2d..323d61b920 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json index 63161cf672..fbed50f426 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json @@ -59,7 +59,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json index cab57bdcc4..9c6a11a7be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json @@ -80,7 +80,7 @@ }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json index 396b196f28..dda09bac98 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json @@ -53,15 +53,15 @@ "entries": [ { "item": "cobblemon:magnet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cell_battery", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json index b949339c87..e9e9cea6e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json @@ -69,11 +69,11 @@ "entries": [ { "item": "cobblemon:deep_sea_scale", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/roselia.json b/common/src/main/resources/data/cobblemon/species/generation3/roselia.json index f6154e36d4..dd5e6dfd7e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/roselia.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/roselia.json @@ -70,15 +70,15 @@ }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:absorb_bulb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json index 48945e0c1e..c366084633 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json @@ -59,15 +59,15 @@ }, { "item": "minecraft:diamond", - "percentage": 5 + "percentage": 5.0 }, { "item": "minecraft:emerald", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json b/common/src/main/resources/data/cobblemon/species/generation3/salamence.json index 3c5e36c487..9830aa28db 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/salamence.json @@ -64,15 +64,15 @@ "entries": [ { "item": "cobblemon:dragon_fang", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:dragon_scale", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:yache_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json index 5c8799de32..d4a95c75bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json @@ -63,7 +63,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json b/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json index 46f27a0b21..5edee98350 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json index db78bc9ac6..f6043d6a47 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json @@ -52,15 +52,15 @@ "entries": [ { "item": "cobblemon:razor_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json index 9d83103c2f..0abe85f0c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json @@ -67,11 +67,11 @@ "entries": [ { "item": "cobblemon:deep_sea_tooth", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json b/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json index e0f3b7495b..b216a68a19 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json @@ -59,15 +59,15 @@ "entries": [ { "item": "cobblemon:dragon_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:dragon_scale", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json index 9f261fd460..2425d6b4c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json @@ -59,7 +59,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/slaking.json b/common/src/main/resources/data/cobblemon/species/generation3/slaking.json index d2bd1753b6..f7679d6ccb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/slaking.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/slaking.json @@ -68,7 +68,7 @@ "entries": [ { "item": "cobblemon:chesto_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/solrock.json b/common/src/main/resources/data/cobblemon/species/generation3/solrock.json index 26c7bad7e5..6c5d22a1df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/solrock.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/solrock.json @@ -67,11 +67,11 @@ "entries": [ { "item": "cobblemon:sun_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/spinda.json b/common/src/main/resources/data/cobblemon/species/generation3/spinda.json index dfcd569b98..8fd7283859 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/spinda.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/spinda.json @@ -63,7 +63,7 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json index aae63a2921..af01278b24 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:black_sludge", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json index 38cedf8e15..a5704bb23a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json index d6c63d180e..fe041d1735 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json @@ -75,7 +75,7 @@ }, { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json index 83d955df5a..7f08bebfd2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json @@ -60,7 +60,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json b/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json index d965580e7b..6b66221637 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json @@ -62,15 +62,15 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:smoke_ball", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/treecko.json b/common/src/main/resources/data/cobblemon/species/generation3/treecko.json index 23faf42c91..6f11707d7d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/treecko.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/treecko.json @@ -65,7 +65,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json b/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json index e4bf4de8d3..74fcea3cbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json @@ -66,11 +66,11 @@ "entries": [ { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json b/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json index 491fa27648..5d700e9f30 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json @@ -59,7 +59,7 @@ "entries": [ { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json index f40e1d626d..b5fa9801ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json @@ -68,11 +68,11 @@ "entries": [ { "item": "cobblemon:bright_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json index ad20e229ac..5ccfd916be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json @@ -77,7 +77,7 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/walrein.json b/common/src/main/resources/data/cobblemon/species/generation3/walrein.json index 32863b2ceb..c5a2d13e0f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/walrein.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/walrein.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json index 5726d61fdd..e818f64baf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json index 7deb5da064..0d202411b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json @@ -51,15 +51,15 @@ "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json index 1bcc39abc1..4721e724ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json @@ -57,11 +57,11 @@ }, { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json b/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json index 73c8dfb5d4..48104762bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json b/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json index 3e2c6108d4..6170ea4997 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json @@ -70,7 +70,7 @@ }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json b/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json index f78fd9b003..70c1ea9eaa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json @@ -65,15 +65,15 @@ }, { "item": "cobblemon:mental_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:light_clay", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json index b48f09292e..7316ac4806 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json @@ -62,15 +62,15 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:big_root", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json index 1ca0b38365..e79bfbd28b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json index 05cb46c719..1bd4e5f6f2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json @@ -54,11 +54,11 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json index 576c59458e..01cfaa04fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json @@ -60,7 +60,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json index 206a394da2..e1cb12fd37 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json @@ -64,11 +64,11 @@ "entries": [ { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json b/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json index 8f75cb7831..6844a09e69 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json @@ -65,15 +65,15 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:air_balloon", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json b/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json index ddf4e8e6ff..2745c0bde0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json @@ -63,15 +63,15 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:reaper_cloth", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json index c88f3dcaf3..6d0fd6295c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json @@ -56,11 +56,11 @@ }, { "item": "cobblemon:electirizer", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json index 0ab5cd6088..7f7ccea8b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json @@ -78,7 +78,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json index 1060415100..3ada205d9a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json @@ -73,7 +73,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rindo_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json index 98dbe74b3d..d8ae94e966 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json @@ -67,7 +67,7 @@ }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json b/common/src/main/resources/data/cobblemon/species/generation4/froslass.json index c53050074b..2beabbfff9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/froslass.json @@ -57,15 +57,15 @@ }, { "item": "cobblemon:dawn_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json index 6a1d23c385..e6883c94b3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json @@ -61,11 +61,11 @@ "entries": [ { "item": "cobblemon:dragon_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gallade.json b/common/src/main/resources/data/cobblemon/species/generation4/gallade.json index 9f10c60cda..bb2e30c71e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gallade.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gallade.json @@ -65,15 +65,15 @@ }, { "item": "cobblemon:dawn_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:twisted_spoon", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json index d0a12aa499..37052c1e6c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json @@ -68,11 +68,11 @@ "entries": [ { "item": "cobblemon:dragon_fang", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:haban_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json index a31e39cc39..04da02f65b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json index 8c17a46041..1a460657d4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:ice_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:never_melt_ice", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json index e6ccaa89fa..b7a02ddc1f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json @@ -54,19 +54,19 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:razor_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json index c3b098b0e2..4707f13480 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json index 2bf314266b..5b9e8a777c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json @@ -66,7 +66,7 @@ "entries": [ { "item": "cobblemon:oval_stone", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json index f09a341671..518c27f4ab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json @@ -64,11 +64,11 @@ }, { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json index 8e9593c22a..dc76c0ac17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json index 355548d273..d9f8396792 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json @@ -59,7 +59,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json index 55f0424841..96c04de066 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json @@ -63,7 +63,7 @@ "entries": [ { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json index 4b5e405be7..ae2564b611 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:leaf_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json index b35000e9d2..da7f2b8b6a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json index 39c4cbccc8..e477b9c5db 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json @@ -72,15 +72,15 @@ }, { "item": "minecraft:rabbit_foot", - "percentage": 5 + "percentage": 5.0 }, { "item": "minecraft:carrot", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json index 43d8922e91..530a1f4134 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json @@ -55,11 +55,11 @@ "entries": [ { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:expert_belt", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json index 892a6a7ab0..5f5f97658b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json @@ -73,15 +73,15 @@ }, { "item": "minecraft:bone_meal", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:prism_scale", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json index 4a4d7acd79..6ad92c0be3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json @@ -59,11 +59,11 @@ "entries": [ { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json index bfefe0de14..25afad1efa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json @@ -53,11 +53,11 @@ "entries": [ { "item": "cobblemon:quick_claw", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:shuca_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json index 9b890fae8b..0d0b3461a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json @@ -52,15 +52,15 @@ "entries": [ { "item": "minecraft:blaze_powder", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:magmarizer", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json index ace00bf86c..9ce725d55a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json @@ -76,15 +76,15 @@ }, { "item": "cobblemon:magnet", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:metal_coat", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:shuca_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json index 94f7eb36e9..6a556f838e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json @@ -68,11 +68,11 @@ }, { "item": "cobblemon:never_melt_ice", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:aspear_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json index ad8f31bdde..912aaba676 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json @@ -52,15 +52,15 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json index c10f1255bf..b6831835a0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json @@ -59,7 +59,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json index 8e86ef5331..325201944e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json index 536d9cdb6a..94757d9d15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json @@ -53,14 +53,14 @@ "moving": { "walk": { "walkSpeed": 0.118 - } - }, - "resting": { - "canSleep": true, - "willSleepOnBed": false, - "depth": "normal", - "light": "0-15" } + }, + "resting": { + "canSleep": true, + "willSleepOnBed": false, + "depth": "normal", + "light": "0-15" + } }, "drops": { "amount": 5, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json index 3f95638493..e6de50c9a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json @@ -55,7 +55,7 @@ "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json index 3fd763bde9..8dc29f891b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json @@ -79,7 +79,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json index bdd36b1bc8..cc839e1da1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json @@ -71,7 +71,7 @@ "entries": [ { "item": "cobblemon:dubious_disc", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json index a0242399a7..522557d062 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json @@ -77,7 +77,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/probopass.json b/common/src/main/resources/data/cobblemon/species/generation4/probopass.json index 4fb2d2075b..7d752035a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/probopass.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/probopass.json @@ -70,15 +70,15 @@ }, { "item": "cobblemon:hard_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:magnet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json index de87e9af3f..bcd5c01bb9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json @@ -52,7 +52,7 @@ "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json index 7f4009b266..23f682c527 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json @@ -62,11 +62,11 @@ "entries": [ { "item": "cobblemon:protector", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:passho_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/roserade.json b/common/src/main/resources/data/cobblemon/species/generation4/roserade.json index 4fb1482e2c..e7321af8b3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/roserade.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/roserade.json @@ -70,15 +70,15 @@ }, { "item": "cobblemon:poison_barb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:absorb_bulb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json index 9f5150ec61..e6823cf4e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json index 79d87970f1..ceea42830a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json @@ -53,11 +53,11 @@ "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:smoke_ball", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json index 1299075ce9..0cdef824f0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json @@ -67,11 +67,11 @@ }, { "item": "cobblemon:sharp_beak", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:yache_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json index 2a59d26402..59dbbae8a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json index 9d47d6866c..876eda53c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json @@ -57,7 +57,7 @@ }, { "item": "cobblemon:big_root", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json index fb19337469..c84455fddf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json @@ -54,15 +54,15 @@ "entries": [ { "item": "cobblemon:lucky_egg", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:shiny_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json index a3e5ee6016..d2907d1ac9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json @@ -65,7 +65,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json index 3689252675..e84669dab9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json @@ -53,11 +53,11 @@ "entries": [ { "item": "cobblemon:black_sludge", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json index c50fc78a19..5f8b7e957a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json @@ -67,7 +67,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json index da15c550de..e19205e433 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json @@ -69,15 +69,15 @@ }, { "item": "minecraft:honeycomb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:poison_barb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:charti_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json index a4cd77a4af..e1953fbb3b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json @@ -53,15 +53,15 @@ "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json index edc3e81463..aec2257c6f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json @@ -52,7 +52,7 @@ }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json b/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json index edde9fcea6..f71fe0264e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json b/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json index dc34e49936..8dbd73aa4d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json @@ -74,11 +74,11 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:deep_sea_scale", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json index efb2de2de7..79b8b44250 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json @@ -65,7 +65,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/audino.json b/common/src/main/resources/data/cobblemon/species/generation5/audino.json index 2480113172..83dffa5fd5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/audino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/audino.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json index 28c8e1a5a6..1ffbcb7d2c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json @@ -73,11 +73,11 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:deep_sea_tooth", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/beartic.json b/common/src/main/resources/data/cobblemon/species/generation5/beartic.json index 89e68a89b5..7a45edd66b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/beartic.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/beartic.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json b/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json index af15546d3d..2499cf7029 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json @@ -63,11 +63,11 @@ }, { "item": "cobblemon:light_clay", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json index 5993fd725e..ad2c1279cb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json @@ -53,11 +53,11 @@ "entries": [ { "item": "minecraft:iron_helmet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json index fd7ad2021d..59be20685b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json @@ -72,15 +72,15 @@ }, { "item": "cobblemon:hard_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:everstone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:black_augurite", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json index 49ecb67028..55bdae4e53 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json @@ -65,7 +65,7 @@ }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json index c013356a4e..f63bc8e768 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json @@ -76,7 +76,7 @@ }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -219,7 +219,7 @@ }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json b/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json index 51c8aea8ee..e725dcbba5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json @@ -69,11 +69,11 @@ }, { "item": "cobblemon:dusk_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json index b21988bb0c..30b3831218 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json b/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json index 7f344cfe2d..00c38e6d01 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json @@ -65,7 +65,7 @@ "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json index d7cc9aeffd..c28310c5a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json @@ -64,11 +64,11 @@ "entries": [ { "item": "cobblemon:muscle_band", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:razz_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json index 869158e266..8d2fe63dc8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json @@ -59,7 +59,7 @@ }, { "item": "cobblemon:hard_stone", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json index 30c1109c90..7dc7ea71d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json @@ -64,11 +64,11 @@ "entries": [ { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json index e7f8ab71fd..8a03d6e5fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json @@ -70,7 +70,7 @@ "entries": [ { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -356,11 +356,11 @@ "entries": [ { "item": "cobblemon:ice_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -600,11 +600,11 @@ "entries": [ { "item": "cobblemon:ice_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] } diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json index dcb21eb797..f9d8e47993 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json @@ -68,11 +68,11 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:shell_bell", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json b/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json index 81e0c90091..4c1e2e9141 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json @@ -60,11 +60,11 @@ "entries": [ { "item": "cobblemon:dragon_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json index 1b4deed5c7..89d92ef8ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json @@ -56,7 +56,7 @@ }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/emboar.json b/common/src/main/resources/data/cobblemon/species/generation5/emboar.json index 6f52a9cace..13b3822741 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/emboar.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/emboar.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json index d5ae6c9a48..877774b43f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json @@ -60,7 +60,7 @@ "entries": [ { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json index 9848625396..ab0216adc2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json @@ -54,11 +54,11 @@ "entries": [ { "item": "minecraft:iron_helmet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json index bd1f1957df..ba06a231bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json @@ -57,11 +57,11 @@ }, { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json b/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json index b360d1dc49..4ed69cee52 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json @@ -69,11 +69,11 @@ }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:sticky_barb", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json b/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json index a1581a04b5..6e1010074a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json @@ -60,11 +60,11 @@ "entries": [ { "item": "cobblemon:dragon_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json b/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json index 09e724af00..a9e9a7e4bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json @@ -73,7 +73,7 @@ }, { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json index c972b241a8..6832eb288f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json @@ -60,19 +60,19 @@ "entries": [ { "item": "cobblemon:black_sludge", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:leftovers", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json b/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json index 8a1580b6a5..a12613858d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json @@ -72,15 +72,15 @@ }, { "item": "cobblemon:hard_stone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:everstone", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:black_augurite", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json index 90b3d5d10e..2b2289136d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json @@ -73,11 +73,11 @@ }, { "item": "cobblemon:light_clay", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json index 1bc1490b05..7dc85139be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json @@ -56,11 +56,11 @@ }, { "item": "cobblemon:twisted_spoon", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:persim_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json index 92a9c68cf8..077eb03d78 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json @@ -56,11 +56,11 @@ }, { "item": "cobblemon:twisted_spoon", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json index 7a98160f6c..e472e4398a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json @@ -64,11 +64,11 @@ "entries": [ { "item": "cobblemon:muscle_band", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json b/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json index 1f901a8ee1..272a309067 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json @@ -60,11 +60,11 @@ "entries": [ { "item": "cobblemon:dragon_fang", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:haban_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json b/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json index 89ee24b9aa..e6116f1991 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json @@ -59,15 +59,15 @@ "entries": [ { "item": "cobblemon:flame_orb", - "percentage": 5 + "percentage": 5.0 }, { "item": "minecraft:blaze_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json index 5680b2cfa9..75798e84ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json @@ -61,7 +61,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json b/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json index df3c92995c..8072486d2a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:roseli_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json b/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json index eb01b46ecb..78fb83948b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json @@ -73,7 +73,7 @@ }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json index 4d14a47553..fe7dcfa951 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:black_glasses", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json index 84976c52ad..18cb192e95 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:black_glasses", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:tanga_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lampent.json b/common/src/main/resources/data/cobblemon/species/generation5/lampent.json index ec9b11ce53..b002488278 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lampent.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lampent.json @@ -68,11 +68,11 @@ }, { "item": "cobblemon:dusk_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json index 8c4195cfac..15b5732d59 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json @@ -57,15 +57,15 @@ }, { "item": "cobblemon:mental_herb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:revival_herb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:coba_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json index 5e6a26ec51..15cf330b40 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json @@ -57,7 +57,7 @@ }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json index 8a11ff8ae9..4382972230 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json @@ -57,15 +57,15 @@ "entries": [ { "item": "cobblemon:revival_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:absorb_bulb", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -213,11 +213,11 @@ "entries": [ { "item": "cobblemon:revival_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json index ea99cc2281..a517123360 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json index 96055e05c1..022cbdd9a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json @@ -57,11 +57,11 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:sticky_barb", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json index c732881550..d960f71d09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json @@ -53,11 +53,11 @@ "entries": [ { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:expert_belt", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json index 39c5480dc5..30f572d1b3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json @@ -52,7 +52,7 @@ "entries": [ { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json index 5ae45463c2..316105e646 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json @@ -70,11 +70,11 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:shell_bell", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json b/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json index 1b65158aac..c99b34c448 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json @@ -67,7 +67,7 @@ }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pignite.json b/common/src/main/resources/data/cobblemon/species/generation5/pignite.json index 8e99464cd4..6c37e2e167 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pignite.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pignite.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json index 0fcbbd2125..0d8c4c05c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json @@ -56,7 +56,7 @@ }, { "item": "cobblemon:persim_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json index 201f485d38..4094802cf9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json @@ -67,11 +67,11 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 25 + "percentage": 25.0 }, { - "item": "minecraft:nautilus_shell", - "percentage": 25 + "item": "cobblemon:shell_bell", + "percentage": 25.0 } ] }, @@ -226,19 +226,6 @@ "speed": 0 }, "baseScale": 0.75, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:mystic_water", - "percentage": 25 - }, - { - "item": "cobblemon:shell_bell", - "percentage": 25 - } - ] - }, "moves": [ "1:megahorn", "1:ceaselessedge", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json index 9f160d97e6..1b28500aef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json @@ -52,15 +52,15 @@ "entries": [ { "item": "cobblemon:black_belt", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:expert_belt", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json index 18b4861571..d94c4dfbef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json @@ -63,7 +63,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json index 34ffcec5ce..da2fc5ed0e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:poison_barb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json index 8767893bbe..759de44e3a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json @@ -55,11 +55,11 @@ "entries": [ { "item": "cobblemon:black_belt", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json b/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json index 75a579da87..d44c14ed8f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json @@ -67,7 +67,7 @@ }, { "item": "cobblemon:persim_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/serperior.json b/common/src/main/resources/data/cobblemon/species/generation5/serperior.json index 0d8aeb0fda..e33dca6e40 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/serperior.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/serperior.json @@ -59,7 +59,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/servine.json b/common/src/main/resources/data/cobblemon/species/generation5/servine.json index 0223dbaefa..342370056f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/servine.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/servine.json @@ -59,7 +59,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json b/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json index 1e6309f667..5bb87e17ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json @@ -69,11 +69,11 @@ }, { "item": "cobblemon:light_clay", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json index 3e3c441857..cd62c95089 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json @@ -51,15 +51,15 @@ "entries": [ { "item": "cobblemon:water_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json index 8efaaeb7d8..2e3d675d50 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json @@ -51,15 +51,15 @@ "entries": [ { "item": "cobblemon:leaf_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json index 4905b6a746..fe5fcdfa89 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json @@ -51,15 +51,15 @@ "entries": [ { "item": "cobblemon:fire_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/snivy.json b/common/src/main/resources/data/cobblemon/species/generation5/snivy.json index 3c493629b7..6102a9d60b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/snivy.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/snivy.json @@ -60,7 +60,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json index 73724df28b..75ffef5cbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json @@ -61,7 +61,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json index 2fca8dc875..c32f4951b8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json index 33581d4556..d3db33e832 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json @@ -57,15 +57,15 @@ }, { "item": "cobblemon:mental_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:revival_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json index 8e9f1aa102..8803c47f4a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json @@ -83,7 +83,7 @@ }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json b/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json index 880a3ab5dc..e8b97aaf46 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json @@ -66,7 +66,7 @@ }, { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tepig.json b/common/src/main/resources/data/cobblemon/species/generation5/tepig.json index 918be082d6..c653cfa360 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tepig.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tepig.json @@ -73,7 +73,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/throh.json b/common/src/main/resources/data/cobblemon/species/generation5/throh.json index 9cdc0506c8..f2784be7f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/throh.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/throh.json @@ -52,15 +52,15 @@ "entries": [ { "item": "cobblemon:black_belt", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:expert_belt", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json index 38386ad4a5..d27a9ea8e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json index 3b2f5e0605..0fe8ec7477 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json @@ -68,11 +68,11 @@ }, { "item": "cobblemon:sharp_beak", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:razz_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json b/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json index 5d4ceecfd1..a2732992cb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json @@ -64,11 +64,11 @@ }, { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json b/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json index 8f0a740a4b..3a0d74455f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json @@ -64,11 +64,11 @@ }, { "item": "cobblemon:never_melt_ice", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:aspear_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json b/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json index 7434547f99..f113e5ae54 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json @@ -60,15 +60,15 @@ "entries": [ { "item": "minecraft:blaze_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json index 8cc66e68d9..a4b13b5c56 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json @@ -59,7 +59,7 @@ "entries": [ { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json index 11ec065838..e7f11ce838 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json @@ -66,11 +66,11 @@ }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:absorb_bulb", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json index 314db55c4c..6c3ce9bccf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json @@ -66,11 +66,11 @@ "entries": [ { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json index 3f29f21619..f58abb58c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json @@ -56,7 +56,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json index 663f3d2739..a3a8442afb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json @@ -60,7 +60,7 @@ }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -225,7 +225,7 @@ }, { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json index 638f693fe3..ce64633fcd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json @@ -60,7 +60,7 @@ "quantityRange": "1-3" }, { - "item": "cobblemon:roseli_berry", + "item": "cobblemon:colbur_berry", "percentage": 2.5 } ] @@ -205,19 +205,6 @@ "special_defence": 40, "speed": 70 }, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:sweet_berries", - "quantityRange": "1-3" - }, - { - "item": "cobblemon:colbur_berry", - "percentage": 2.5 - } - ] - }, "moves": [ "1:scratch", "1:leer", diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json index cf55d47418..425d4bf591 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json @@ -57,7 +57,7 @@ }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/amaura.json b/common/src/main/resources/data/cobblemon/species/generation6/amaura.json index ccdec2e40a..4135fccb01 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/amaura.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/amaura.json @@ -65,7 +65,7 @@ "entries": [ { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json index 8fe38c4832..c828d9bbfe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json @@ -51,11 +51,11 @@ "entries": [ { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json b/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json index c6cce2210d..d6da40733d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json @@ -65,7 +65,7 @@ "entries": [ { "item": "cobblemon:never_melt_ice", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json index 7ea07d2504..22e7d23c38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json @@ -74,11 +74,11 @@ "entries": [ { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -213,11 +213,11 @@ "entries": [ { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json b/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json index 4a5a097cb2..d5b7f8ee12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/braixen.json b/common/src/main/resources/data/cobblemon/species/generation6/braixen.json index 73f373754c..8a11f9c165 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/braixen.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/braixen.json @@ -66,7 +66,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/carbink.json b/common/src/main/resources/data/cobblemon/species/generation6/carbink.json index a29d083d54..ee2ebb65e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/carbink.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/carbink.json @@ -54,15 +54,15 @@ "entries": [ { "item": "minecraft:diamond", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:float_stone", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json index 96e17d3609..4482a6ff04 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json @@ -58,7 +58,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/chespin.json b/common/src/main/resources/data/cobblemon/species/generation6/chespin.json index 1a8943a72b..9130f74e19 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/chespin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/chespin.json @@ -60,7 +60,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json index 985539070e..30fc558159 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json @@ -54,7 +54,7 @@ "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json index 502a6cf1dd..c445965f5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json @@ -67,7 +67,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json index 45b23bf270..1515e9e208 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json @@ -72,15 +72,15 @@ }, { "item": "minecraft:rabbit_foot", - "percentage": 5 + "percentage": 5.0 }, { "item": "minecraft:carrot", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json index 40f4882e87..661dd98b2b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json @@ -65,11 +65,11 @@ }, { "item": "minecraft:iron_sword", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:dusk_stone", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json index 6ef19e81d8..a2f3e27ed0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json index d9cffa1f93..7f979068ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json @@ -64,7 +64,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json index fc51bd8c19..9db80f1dc8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/floette.json b/common/src/main/resources/data/cobblemon/species/generation6/floette.json index cd6c737d59..b46dee1cd3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/floette.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/floette.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -320,7 +320,7 @@ }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/froakie.json b/common/src/main/resources/data/cobblemon/species/generation6/froakie.json index 27cee43c1a..a07742c083 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/froakie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/froakie.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json b/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json index 4569dd8af4..ede492491b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json @@ -70,7 +70,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json b/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json index 2d4a4d8c6e..2ee372b22f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json @@ -61,7 +61,7 @@ }, { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json b/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json index 410255c002..1007649ce3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json @@ -55,7 +55,7 @@ }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/goodra.json b/common/src/main/resources/data/cobblemon/species/generation6/goodra.json index 846c5f9c11..439609158e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/goodra.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/goodra.json @@ -62,7 +62,7 @@ }, { "item": "cobblemon:haban_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -222,7 +222,7 @@ }, { "item": "cobblemon:bluk_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json index e7774ab8b0..197d773d38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json @@ -74,11 +74,11 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json index 6cc0f9aef3..3359664787 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:mystic_water", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json index b9b8c737cb..56ba367ba1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json @@ -54,15 +54,15 @@ "entries": [ { "item": "cobblemon:kings_rock", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:expert_belt", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/klefki.json b/common/src/main/resources/data/cobblemon/species/generation6/klefki.json index edfc212479..257ce76e08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/klefki.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/klefki.json @@ -66,7 +66,7 @@ "entries": [ { "item": "minecraft:name_tag", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/malamar.json b/common/src/main/resources/data/cobblemon/species/generation6/malamar.json index 0d6d8b63d2..6dc249ea82 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/malamar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/malamar.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json index cf25f25360..1a8fda2eb4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json @@ -48,7 +48,7 @@ "entries": [ { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/noivern.json b/common/src/main/resources/data/cobblemon/species/generation6/noivern.json index 895a13b169..e07dc6c3a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/noivern.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/noivern.json @@ -61,11 +61,11 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json index 7c2ea0a002..84d96f3215 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json @@ -58,11 +58,11 @@ }, { "item": "cobblemon:mental_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json index 099bc3be44..735271bbb2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json @@ -57,11 +57,11 @@ }, { "item": "minecraft:blaze_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json b/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json index 9d5ba6d609..64f2ca7be5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json @@ -58,7 +58,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json b/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json index 4f9b22d8ab..059f6ac82c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json @@ -61,7 +61,7 @@ }, { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -212,7 +212,7 @@ }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json index 777654b7bb..5ea66cac6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json @@ -55,11 +55,11 @@ }, { "item": "minecraft:cake", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json index 894e233f39..d8ccd437c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:shiny_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json index ebd5375dae..64497e20ab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json @@ -67,11 +67,11 @@ }, { "item": "cobblemon:sharp_beak", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json index 7807e4b267..b1c67305a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json @@ -69,11 +69,11 @@ }, { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json b/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json index 4030bc3108..60820a9a63 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json @@ -69,7 +69,7 @@ "entries": [ { "item": "cobblemon:razor_fang", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json b/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json index e43a7c8cec..df6446b63b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json @@ -69,7 +69,7 @@ "entries": [ { "item": "cobblemon:razor_fang", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json index f0b0e836fb..387679b407 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json @@ -71,11 +71,11 @@ "entries": [ { "item": "cobblemon:bright_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json b/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json index d1ccf12a20..c03558aae4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json @@ -67,11 +67,11 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json index 0cd7c06b85..6c4dfb018d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json @@ -60,7 +60,7 @@ "entries": [ { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/brionne.json b/common/src/main/resources/data/cobblemon/species/generation7/brionne.json index 81a4902657..2fc7f87d7c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/brionne.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/brionne.json @@ -69,7 +69,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json b/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json index 76db41d5c7..f7f5075c20 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json @@ -71,11 +71,11 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:razor_fang", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json index 81b618eb1e..84846d5266 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json @@ -56,11 +56,11 @@ }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cell_battery", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/comfey.json b/common/src/main/resources/data/cobblemon/species/generation7/comfey.json index 145d687c77..4adf0c25dd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/comfey.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/comfey.json @@ -66,11 +66,11 @@ "entries": [ { "item": "cobblemon:misty_seed", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json index 789de7d900..9bd2c3ccba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json index 5a85173741..4b447be537 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json index 6cbaff5fd5..21128fa8a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/drampa.json b/common/src/main/resources/data/cobblemon/species/generation7/drampa.json index 32ba16d3cc..82f126420a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/drampa.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/drampa.json @@ -61,11 +61,11 @@ "entries": [ { "item": "minecraft:dragon_breath", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json b/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json index 0d0c3ec603..df55d4a1b7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json @@ -68,7 +68,7 @@ "entries": [ { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json index 8762522cf3..bc0355e606 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json @@ -52,7 +52,7 @@ "entries": [ { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json b/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json index 02b81e8555..b145788099 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json @@ -58,7 +58,7 @@ }, { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json index 6d5ba2677f..cc7aeffd4b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:expert_belt", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/komala.json b/common/src/main/resources/data/cobblemon/species/generation7/komala.json index 6aa2a945f7..35b82d0958 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/komala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/komala.json @@ -66,7 +66,7 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json b/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json index 4e9ccaa548..7242c74306 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json @@ -59,7 +59,7 @@ }, { "item": "cobblemon:razor_claw", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:roseli_berry", diff --git a/common/src/main/resources/data/cobblemon/species/generation7/litten.json b/common/src/main/resources/data/cobblemon/species/generation7/litten.json index 07e2dba7af..e9f034b841 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/litten.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/litten.json @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:expert_belt", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json b/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json index aee91102de..ac642481c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json @@ -58,11 +58,11 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json b/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json index e50575e16a..e6c20e39a0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json @@ -56,11 +56,11 @@ }, { "item": "cobblemon:hard_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json index 5716b4c7b1..82bc7e2871 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json @@ -56,11 +56,11 @@ "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/minior.json b/common/src/main/resources/data/cobblemon/species/generation7/minior.json index 7f8c788b03..cc466205de 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/minior.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/minior.json @@ -173,7 +173,7 @@ "entries": [ { "item": "cobblemon:float_stone", - "percentage": 5 + "percentage": 5.0 } ] } diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json index 8e877ebb88..901d893fe8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json @@ -72,11 +72,11 @@ }, { "item": "cobblemon:light_clay", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json index df5958940e..a803886698 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json @@ -53,11 +53,11 @@ "entries": [ { "item": "cobblemon:wise_glasses", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json index 06d8c3ea09..275b98dbd4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json @@ -55,11 +55,11 @@ }, { "item": "minecraft:honey_bottle", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json b/common/src/main/resources/data/cobblemon/species/generation7/palossand.json index 559d9a0d10..f9ee36ca48 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/palossand.json @@ -57,11 +57,11 @@ }, { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json index e5c54dda9c..0595ddc5f1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json @@ -51,11 +51,11 @@ "entries": [ { "item": "cobblemon:muscle_band", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/popplio.json b/common/src/main/resources/data/cobblemon/species/generation7/popplio.json index 8177fb380e..971f4e4101 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/popplio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/popplio.json @@ -73,7 +73,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json index 561dbf43ac..3814aa9b34 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json @@ -71,7 +71,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json index ffb1bfbac0..0036faeaec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json @@ -73,7 +73,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json index b7936f0fa7..f8a3abc641 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json b/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json index 5444a1bc57..e3a95a874c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json @@ -65,11 +65,11 @@ }, { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:smoke_ball", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json index d681be9481..bae18518e9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json @@ -58,7 +58,7 @@ }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json index 204a3ed32a..f45265f573 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json b/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json index 27b7843a92..74b6f30fbc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json @@ -54,7 +54,7 @@ "entries": [ { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/torracat.json b/common/src/main/resources/data/cobblemon/species/generation7/torracat.json index 726bf0ed8f..9493e90128 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/torracat.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/torracat.json @@ -63,11 +63,11 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:expert_belt", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json b/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json index 41b8ebcfd9..8cf1e8b77c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:sharp_beak", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json b/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json index 2931f1be0c..ee2abc9db3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json @@ -68,11 +68,11 @@ }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json index bde896d951..65161a15c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:persim_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json b/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json index 3e5efc4fe5..f12b0b6b90 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json @@ -65,11 +65,11 @@ }, { "item": "minecraft:charcoal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json index c356070f76..a2299ca531 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json @@ -52,11 +52,11 @@ "entries": [ { "item": "cobblemon:wepear_berry", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:cell_battery", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json index d2131c6a1d..b16ebb37d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json @@ -74,7 +74,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json index 406a635534..013cfbb5aa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json @@ -71,7 +71,7 @@ }, { "item": "minecraft:cake", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/appletun.json b/common/src/main/resources/data/cobblemon/species/generation8/appletun.json index 024b697908..d1a8befd4c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/appletun.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/appletun.json @@ -57,7 +57,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json b/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json index 9824880afe..0a1ed27836 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json @@ -72,7 +72,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json b/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json index b28e2a12e7..98a497179d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json @@ -72,7 +72,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json index 224b9aaff7..b8858ae147 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json @@ -67,7 +67,7 @@ }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/carkol.json b/common/src/main/resources/data/cobblemon/species/generation8/carkol.json index d216cdfc84..17ea13be6e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/carkol.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/carkol.json @@ -65,11 +65,11 @@ }, { "item": "cobblemon:black_augurite", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json index 4623e2dccc..4cf034c4a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json @@ -66,11 +66,11 @@ "entries": [ { "item": "minecraft:blaze_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json index dcaea68f0a..dd5aaac53d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json @@ -60,11 +60,11 @@ }, { "item": "minecraft:rabbit_foot", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json b/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json index e9b2d4fdec..5c9ac57be5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json @@ -65,11 +65,11 @@ }, { "item": "cobblemon:black_augurite", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:passho_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json b/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json index bfd5c7bda2..b5f799dacc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json index 50f2e72778..d201a0e605 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json @@ -72,11 +72,11 @@ }, { "item": "cobblemon:metal_coat", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:wacan_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json index d3a9f28e1c..8a3d896de6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json @@ -75,7 +75,7 @@ }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json b/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json index 9402eef45c..0bd311050c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json @@ -75,7 +75,7 @@ }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cursola.json b/common/src/main/resources/data/cobblemon/species/generation8/cursola.json index 422cd8fe42..41ce32df9e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cursola.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cursola.json @@ -64,7 +64,7 @@ "entries": [ { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json index 971b44f5bc..79dd5f5f03 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json b/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json index ab909c4569..aecd38b2bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json @@ -72,11 +72,11 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:haban_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json b/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json index 078eae20f8..b192ef675c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json @@ -71,11 +71,11 @@ "entries": [ { "item": "minecraft:phantom_membrane", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json b/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json index 38135974c0..1b16044de9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json b/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json index 2027400295..953a0ef867 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json @@ -67,7 +67,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index 931a3379ca..a774b5ee21 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -50,9 +50,9 @@ "light": "0-4" }, "moving": { - "walk": { - "walkSpeed": 0.15 - }, + "walk": { + "walkSpeed": 0.15 + }, "swim": { "canSwimInWater": true, "canSwimInLava": false, @@ -80,7 +80,7 @@ }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -199,7 +199,7 @@ }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] } diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json b/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json index dead9958a9..cd8dc08b10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json @@ -57,7 +57,7 @@ }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json index 989a20737e..103ceed0dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json @@ -61,11 +61,11 @@ "entries": [ { "item": "minecraft:golden_helmet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/flapple.json b/common/src/main/resources/data/cobblemon/species/generation8/flapple.json index 90bfd5eb68..86a09c4e60 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/flapple.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/flapple.json @@ -57,7 +57,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json b/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json index b5d7956b5d..745418bdd4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json @@ -56,11 +56,11 @@ }, { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json b/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json index c334fc5095..ad79a55ff5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json @@ -66,7 +66,7 @@ }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json b/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json index 945b51fbef..a73252ad65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json @@ -61,7 +61,7 @@ "entries": [ { "item": "cobblemon:roseli_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json index c0d90538e0..c636008a40 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json @@ -58,7 +58,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json index 8cff6de15c..b426538478 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json @@ -54,7 +54,7 @@ "entries": [ { "item": "cobblemon:babiri_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json index 56efad0657..3662040af7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json index d680963858..e3b0562b3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json @@ -55,7 +55,7 @@ "entries": [ { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json index 94e20f3a4b..7569c752c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json @@ -67,7 +67,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json b/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json index b224ee65e7..34cbaddb8b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json @@ -61,7 +61,7 @@ "entries": [ { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json index fb04cfb234..56deb23336 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json @@ -55,7 +55,7 @@ "entries": [ { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json index d486590740..f29fcbbaa3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json @@ -55,7 +55,7 @@ "entries": [ { "item": "cobblemon:aspear_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json index a6ace004ea..fc208d299c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json @@ -67,7 +67,7 @@ "entries": [ { "item": "cobblemon:chople_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json index bc0de0fa7e..0c67ef1870 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:razz_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json index c4927bf341..e0eebbda60 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json @@ -55,11 +55,11 @@ "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json b/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json index 9396a4e649..581e0906da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json @@ -54,7 +54,7 @@ "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json index fa23b053d8..66eafe2b57 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json @@ -67,11 +67,11 @@ }, { "item": "minecraft:rabbit_foot", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json index d786e0cff0..7e54d9d3e2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json @@ -57,7 +57,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json index d3b7bbfffc..577928d040 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json @@ -55,7 +55,7 @@ "entries": [ { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json index 95212a486e..ab423bb2b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json @@ -53,7 +53,7 @@ "entries": [ { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json index 28fc182dda..2346f63e1b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json @@ -61,11 +61,11 @@ }, { "item": "minecraft:rabbit_foot", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json index 7a5e13572d..8788bb91d9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json @@ -65,7 +65,7 @@ }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sobble.json b/common/src/main/resources/data/cobblemon/species/generation8/sobble.json index af3075009e..3add5628b0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sobble.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sobble.json @@ -69,7 +69,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json index d194501114..cd3568cbea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json @@ -63,11 +63,11 @@ }, { "item": "minecraft:emerald", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json index bc68fe804f..365912e2ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json @@ -57,7 +57,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json index a93c7471d7..a9a732b24e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json @@ -55,7 +55,7 @@ "entries": [ { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json index f60f43ffed..cf78a00e0d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json @@ -157,16 +157,16 @@ "speed": 148 }, "baseExperienceYield": 350, - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:diamond_sword" - } - ] - }, "evolutions": [], "battleOnly": true } - ] + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:diamond_sword" + } + ] + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json index d61002a57e..dced6ed813 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json @@ -161,16 +161,16 @@ "speed": 128 }, "baseExperienceYield": 350, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:ability_shield" - } - ] - }, "evolutions": [], "battleOnly": true } - ] + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:ability_shield" + } + ] + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json b/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json index 3e16212a89..34965c9e30 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json @@ -73,7 +73,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/kleavor.json b/common/src/main/resources/data/cobblemon/species/generation8a/kleavor.json index 0bd817d9de..d6eac216df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/kleavor.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/kleavor.json @@ -64,7 +64,7 @@ }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/overqwil.json b/common/src/main/resources/data/cobblemon/species/generation8a/overqwil.json index 4026a9d8dc..bbce976143 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/overqwil.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/overqwil.json @@ -80,7 +80,7 @@ }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json b/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json index 2247cd4364..53a75f4d2c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json @@ -56,15 +56,15 @@ "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json b/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json index 846c4f23fe..08ff8b5942 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json @@ -58,15 +58,15 @@ }, { "item": "minecraft:honey_bottle", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:peat_block", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:oran_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/wyrdeer.json b/common/src/main/resources/data/cobblemon/species/generation8a/wyrdeer.json index 78bd54d9a5..47eb84ce6f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/wyrdeer.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/wyrdeer.json @@ -64,7 +64,7 @@ }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json b/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json index 5fa3ce1133..2a02ba5a7b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:muscle_band", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json index 9cc8172481..63579d1243 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json @@ -46,11 +46,11 @@ "entries": [ { "item": "cobblemon:big_root", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:kebia_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json index 7811db2d3f..2dd275fd0e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json @@ -47,7 +47,7 @@ "entries": [ { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json b/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json index 3a9cba58a9..01c1ca4d6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json @@ -68,15 +68,15 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:auspicious_armor", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json index 986cd57818..d8f80a5588 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json @@ -48,7 +48,7 @@ "entries": [ { "item": "cobblemon:haban_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json b/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json index 2e0910b092..f75609f689 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json @@ -56,11 +56,11 @@ "entries": [ { "item": "minecraft:ochre_froglight", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json b/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json index 645535c686..39b5c6e0d2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json @@ -54,7 +54,7 @@ }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json b/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json index 6f745b1268..9536062739 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json @@ -54,7 +54,7 @@ }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json b/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json index 1d2ff64847..027375443c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json @@ -66,15 +66,15 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:malicious_armor", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json b/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json index 1744d12139..d8cee3d19b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json @@ -68,7 +68,7 @@ }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json b/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json index 6f108ea172..451f9bc4d5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json b/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json index d92fbd2a50..f56da7e1e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json @@ -58,7 +58,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json index 4600c5b440..9841982d5e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json @@ -46,7 +46,7 @@ "entries": [ { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json b/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json index 886a248abf..4d3a1c4898 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json @@ -69,7 +69,7 @@ }, { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json index 011af3563b..7681ea5a9b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json @@ -46,11 +46,11 @@ "entries": [ { "item": "cobblemon:big_root", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json b/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json index 0f01191bd2..0710e82d8d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json @@ -70,7 +70,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json b/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json index 34abecff75..1655a0687c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json @@ -48,11 +48,11 @@ "entries": [ { "item": "cobblemon:rocky_helmet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/espathra.json b/common/src/main/resources/data/cobblemon/species/generation9/espathra.json index 8189e4c68a..254907efc9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/espathra.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/espathra.json @@ -67,7 +67,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json b/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json index da2680f870..d845b378ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json @@ -58,11 +58,11 @@ }, { "item": "cobblemon:razor_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json b/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json index 8e3efb9ac8..058726e7b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json @@ -79,11 +79,11 @@ }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/floragato.json b/common/src/main/resources/data/cobblemon/species/generation9/floragato.json index 8d78fc4cfb..277bf7dfdb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/floragato.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/floragato.json @@ -65,7 +65,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json b/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json index 5b72d8bc6c..9f6f411b41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json @@ -60,7 +60,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json index 1715d9124b..624d6a3123 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:passho_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json b/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json index c13c88d42b..752620d5ab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json @@ -72,11 +72,11 @@ }, { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:float_stone", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json b/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json index f4b9c72d0c..95840aa272 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json @@ -65,7 +65,7 @@ "entries": [ { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json b/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json index 113859046c..8dfd5886da 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json @@ -53,7 +53,7 @@ }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json b/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json index f91f10f9a8..f21d12b00a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json @@ -79,7 +79,7 @@ }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json index 90f98ecef3..43d99de20f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json @@ -47,11 +47,11 @@ "entries": [ { "item": "cobblemon:rocky_helmet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/klawf.json b/common/src/main/resources/data/cobblemon/species/generation9/klawf.json index 8959f911a1..72690d5726 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/klawf.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/klawf.json @@ -63,7 +63,7 @@ "entries": [ { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json index 50f0ee1896..e522cf1d67 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json @@ -46,7 +46,7 @@ "entries": [ { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json index 19ecd771e2..250ab2d9bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json @@ -61,7 +61,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json index ec79cd6934..4c28f4e7d9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json @@ -66,7 +66,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json b/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json index 9b7e46170f..33435c0a74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json @@ -66,7 +66,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json index 42af25252e..f6962fbf30 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json @@ -72,7 +72,7 @@ }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json index bb89a34850..051380ee2a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json @@ -59,7 +59,7 @@ }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json b/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json index f054a0f366..3672ddc3ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json @@ -49,7 +49,7 @@ }, { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json index 24f97cdfad..94b1fc078e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json @@ -47,7 +47,7 @@ "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json index 3119b64931..b20fb7fa99 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json @@ -47,7 +47,7 @@ "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json b/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json index 129f6776a5..e1c45f6138 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json @@ -68,7 +68,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json b/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json index a5ece2cb99..d92507747e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json @@ -73,7 +73,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json b/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json index f24008c2df..1e6d06e1c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json @@ -71,7 +71,7 @@ "entries": [ { "item": "cobblemon:mystic_water", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json b/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json index 036a004315..5d34221292 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json @@ -64,11 +64,11 @@ }, { "item": "cobblemon:black_sludge", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json b/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json index 078ad2ee22..175d7e6802 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json @@ -51,7 +51,7 @@ }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json index 06f3f294b0..675027dd39 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json @@ -49,7 +49,7 @@ "entries": [ { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json b/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json index b7c549ce2a..98c44e93b7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json @@ -59,7 +59,7 @@ "entries": [ { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json b/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json index d45e393b8b..d3b5bc2249 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json @@ -67,7 +67,7 @@ "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json index 489221c7a8..34a72dd732 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json @@ -71,7 +71,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json index 879af33733..f5576c8448 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json @@ -73,11 +73,11 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json index bf19b56f6c..4e24eeb2df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json @@ -64,7 +64,7 @@ }, { "item": "cobblemon:razz_berry", - "percentage": 10 + "percentage": 10.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json index 475b0b5633..0ec0f469f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json @@ -64,7 +64,7 @@ }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json b/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json index f9f1436827..1e04e8bc1a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json @@ -50,7 +50,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, diff --git a/common/src/main/resources/data/cobblemon/species/generation9/veluza.json b/common/src/main/resources/data/cobblemon/species/generation9/veluza.json index ca963094ef..54efb22cc9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/veluza.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/veluza.json @@ -70,7 +70,7 @@ }, { "item": "minecraft:bone_meal", - "percentage": 5 + "percentage": 5.0 } ] }, From c8bd7c8604c62fd840487b727f077274ac77e09f Mon Sep 17 00:00:00 2001 From: Deltric Date: Sat, 18 Jan 2025 20:59:50 -0600 Subject: [PATCH 052/121] Added box number argument to PC command. --- .../mod/common/client/gui/pc/PCGUI.kt | 4 ++- .../client/net/storage/pc/OpenPCHandler.kt | 2 +- .../cobblemon/mod/common/command/PcCommand.kt | 25 ++++++++++++++----- .../client/storage/pc/OpenPCPacket.kt | 5 ++-- .../assets/cobblemon/lang/en_us.json | 7 +++--- 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt index ebccf46e03..1c176c15b0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt @@ -40,7 +40,8 @@ import net.minecraft.sounds.SoundEvent class PCGUI( val pc: ClientPC, val party: ClientParty, - val configuration: PCGUIConfiguration + val configuration: PCGUIConfiguration, + val openOnBox: Int = 1 ) : Screen(Component.translatable("cobblemon.ui.pc.title")), CobblemonRenderable { companion object { @@ -110,6 +111,7 @@ class PCGUI( pc = pc, party = party ) + this.storageWidget.box = openOnBox this.setPreviewPokemon(null) this.addRenderableWidget(storageWidget) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/storage/pc/OpenPCHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/storage/pc/OpenPCHandler.kt index e8315f5236..c937901b61 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/storage/pc/OpenPCHandler.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/storage/pc/OpenPCHandler.kt @@ -18,6 +18,6 @@ import net.minecraft.client.Minecraft object OpenPCHandler : ClientNetworkPacketHandler { override fun handle(packet: OpenPCPacket, client: Minecraft) { val pc = CobblemonClient.storage.pcStores[packet.storeID] ?: return - Minecraft.getInstance().setScreen(PCGUI(pc, CobblemonClient.storage.myParty, PCGUIConfiguration())) + Minecraft.getInstance().setScreen(PCGUI(pc, CobblemonClient.storage.myParty, PCGUIConfiguration(), packet.box)) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/command/PcCommand.kt b/common/src/main/kotlin/com/cobblemon/mod/common/command/PcCommand.kt index bd7faa7f5d..e8351a95b5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/command/PcCommand.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/command/PcCommand.kt @@ -17,10 +17,12 @@ import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket import com.cobblemon.mod.common.util.* import com.mojang.brigadier.Command import com.mojang.brigadier.CommandDispatcher +import com.mojang.brigadier.arguments.IntegerArgumentType import com.mojang.brigadier.context.CommandContext import com.mojang.brigadier.exceptions.SimpleCommandExceptionType import net.minecraft.commands.CommandSourceStack import net.minecraft.commands.Commands.literal +import net.minecraft.commands.Commands.argument object PcCommand { @@ -30,25 +32,36 @@ object PcCommand { fun register(dispatcher : CommandDispatcher) { dispatcher.register(literal(NAME) .permission(CobblemonPermissions.PC) + .then(argument("box", IntegerArgumentType.integer(1)) + .executes(this::execute) + ) .executes(this::execute) ) } private fun execute(context: CommandContext): Int { val player = context.source.playerOrException + val box = try { + IntegerArgumentType.getInteger(context, "box") + } catch (e: IllegalArgumentException) { + 1 + } val pc = player.pc() if (player.isInBattle()) { throw IN_BATTLE_EXCEPTION.create() } + if (pc.boxes.size < box) { + throw SimpleCommandExceptionType(lang("command.pc.invalid-box", box, pc.boxes.size).red()).create() + } PCLinkManager.addLink(PermissiblePcLink(pc, player, CobblemonPermissions.PC)) - OpenPCPacket(pc.uuid).sendToPlayer(player) + OpenPCPacket(pc.uuid, box - 1).sendToPlayer(player) context.source.level.playSoundServer( - position = context.source.player!!.position(), - sound = CobblemonSounds.PC_ON, - volume = 0.5F, - pitch = 1F + position = context.source.player!!.position(), + sound = CobblemonSounds.PC_ON, + volume = 0.5F, + pitch = 1F ) return Command.SINGLE_SUCCESS } -} +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/pc/OpenPCPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/pc/OpenPCPacket.kt index 83c87011cc..6cae3a3466 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/pc/OpenPCPacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/storage/pc/OpenPCPacket.kt @@ -26,16 +26,17 @@ import net.minecraft.network.RegistryFriendlyByteBuf * @author Hiroku * @since June 20th, 2022 */ -class OpenPCPacket(val storeID: UUID) : NetworkPacket { +class OpenPCPacket(val storeID: UUID, val box: Int = 1) : NetworkPacket { override val id = ID override fun encode(buffer: RegistryFriendlyByteBuf) { buffer.writeUUID(storeID) + buffer.writeInt(box) } companion object { val ID = cobblemonResource("open_pc") - fun decode(buffer: RegistryFriendlyByteBuf) = OpenPCPacket(buffer.readUUID()) + fun decode(buffer: RegistryFriendlyByteBuf) = OpenPCPacket(buffer.readUUID(), buffer.readInt()) } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/lang/en_us.json b/common/src/main/resources/assets/cobblemon/lang/en_us.json index ca867701ce..d899a76d7c 100644 --- a/common/src/main/resources/assets/cobblemon/lang/en_us.json +++ b/common/src/main/resources/assets/cobblemon/lang/en_us.json @@ -727,7 +727,7 @@ "item.cobblemon.relic_coin": "Relic Coin", "block.cobblemon.relic_coin_pouch": "Relic Coin Pouch", "block.cobblemon.relic_coin_sack": "Relic Coin Sack", - + "item.cobblemon.automaton_armor_trim_smithing_template": "Smithing Template", "trim_pattern.cobblemon.automaton": "Automaton Armor Trim", @@ -937,6 +937,7 @@ "cobblemon.command.clearparty.cleared": "Cleared %1$s's party.", "cobblemon.command.clearpc.cleared": "Cleared %1$s's PC.", "cobblemon.command.dialogue.invalid-dialogue": "Invalid dialogue identifier", + "cobblemon.command.pc.invalid-box": "Box number %1$s exceeds max boxes of %2$s.", "cobblemon.ui.generic.yes": "Yes", "cobblemon.ui.generic.no": "No", @@ -4277,7 +4278,7 @@ "entity.cobblemon.poke_bobber": "Poké Bobber", "entity.cobblemon.boat": "Boat", "entity.cobblemon.chest_boat": "Boat with Chest", - + "painting.cobblemon.premonition.title": "Premonition", "painting.cobblemon.premonition.author": "PKMNCC", "painting.cobblemon.slumber.title": "Slumber", @@ -6984,4 +6985,4 @@ "cobblemon.ability.zenmode.desc": "Changes the Pokémon's shape when HP is half or less.", "cobblemon.ability.zerotohero": "Zero to Hero", "cobblemon.ability.zerotohero.desc": "The Pokémon transforms into its Hero Form when it switches out." -} +} \ No newline at end of file From 8730ff3a3e2754193144338e8114915a9d96d930 Mon Sep 17 00:00:00 2001 From: Deltric Date: Sat, 18 Jan 2025 21:05:42 -0600 Subject: [PATCH 053/121] Mark PlayerInstancedDataStoreManager as open alongside methods. --- .../player/PlayerInstancedDataStoreManager.kt | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerInstancedDataStoreManager.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerInstancedDataStoreManager.kt index 476e68b49a..23fdea0b77 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerInstancedDataStoreManager.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerInstancedDataStoreManager.kt @@ -27,15 +27,15 @@ import net.minecraft.world.entity.player.Player * @since February 21, 2024 */ -class PlayerInstancedDataStoreManager { +open class PlayerInstancedDataStoreManager { val factories = mutableMapOf>() val saveTasks = mutableMapOf() - fun setFactory(factory: PlayerInstancedDataFactory<*>, dataType: PlayerInstancedDataStoreType) { + open fun setFactory(factory: PlayerInstancedDataFactory<*>, dataType: PlayerInstancedDataStoreType) { factories[dataType] = factory } - fun setup(server: MinecraftServer) { + open fun setup(server: MinecraftServer) { factories.values.forEach { it.setup(server) } @@ -57,62 +57,62 @@ class PlayerInstancedDataStoreManager { .build() } - fun get(playerId: UUID, dataType: PlayerInstancedDataStoreType): InstancedPlayerData { + open fun get(playerId: UUID, dataType: PlayerInstancedDataStoreType): InstancedPlayerData { if (!factories.contains(dataType)) { throw UnsupportedOperationException("No factory registered for $dataType") } return factories[dataType]!!.getForPlayer(playerId) } - fun get(player: Player, dataType: PlayerInstancedDataStoreType): InstancedPlayerData { + open fun get(player: Player, dataType: PlayerInstancedDataStoreType): InstancedPlayerData { return get(player.uuid, dataType) } - fun saveAllOfOneType(dataType: PlayerInstancedDataStoreType) { + open fun saveAllOfOneType(dataType: PlayerInstancedDataStoreType) { if (!factories.contains(dataType)) { throw UnsupportedOperationException("No factory registered for $dataType") } return factories[dataType]!!.saveAll() } - fun saveSingle(playerData: InstancedPlayerData, dataType: PlayerInstancedDataStoreType) { + open fun saveSingle(playerData: InstancedPlayerData, dataType: PlayerInstancedDataStoreType) { if (!factories.contains(dataType)) { throw UnsupportedOperationException("No factory registered for $dataType") } return factories[dataType]!!.saveSingle(playerData.uuid) } - fun onPlayerDisconnect(player: ServerPlayer) { + open fun onPlayerDisconnect(player: ServerPlayer) { factories.values.forEach { it.onPlayerDisconnect(player) } } - fun syncAllToPlayer(player: ServerPlayer) { + open fun syncAllToPlayer(player: ServerPlayer) { factories.values.forEach { it.sendToPlayer(player) } } - fun saveAllStores() { + open fun saveAllStores() { factories.values.forEach { it.saveAll() } } - fun getGenericData(player: ServerPlayer): GeneralPlayerData { + open fun getGenericData(player: ServerPlayer): GeneralPlayerData { return getGenericData(player.uuid) } - fun getGenericData(playerId: UUID): GeneralPlayerData { + open fun getGenericData(playerId: UUID): GeneralPlayerData { return get(playerId, PlayerInstancedDataStoreTypes.GENERAL) as GeneralPlayerData } - fun getPokedexData(player: ServerPlayer): PokedexManager { + open fun getPokedexData(player: ServerPlayer): PokedexManager { return getPokedexData(player.uuid) } - fun getPokedexData(playerId: UUID): PokedexManager { + open fun getPokedexData(playerId: UUID): PokedexManager { return get(playerId, PlayerInstancedDataStoreTypes.POKEDEX) as PokedexManager } } \ No newline at end of file From c7b1036bdf788fcb457f1c68245b06cbde064453 Mon Sep 17 00:00:00 2001 From: Deltric Date: Sat, 18 Jan 2025 21:06:45 -0600 Subject: [PATCH 054/121] Wrong index for openOnBox default. --- .../main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt index 1c176c15b0..921c822332 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt @@ -41,7 +41,7 @@ class PCGUI( val pc: ClientPC, val party: ClientParty, val configuration: PCGUIConfiguration, - val openOnBox: Int = 1 + val openOnBox: Int = 0 ) : Screen(Component.translatable("cobblemon.ui.pc.title")), CobblemonRenderable { companion object { From 3874867b749eb9837941e6700480805a1ab0c700 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 19 Jan 2025 13:15:57 +1000 Subject: [PATCH 055/121] Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69996f58cf..e40902ec02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - Improved Fortune drops on Mint Seeds - New Slowpoke shiny texture. - Updated drops for many Pokémon. +- Completely resynced Pokémon move and stat data based on later games. Learnsets have changed considerably to maximise available moves. ### Pokémon Added From 82e82cb28e2b503013b078526270359ffe146343 Mon Sep 17 00:00:00 2001 From: Teggy Date: Sat, 18 Jan 2025 12:41:08 +0000 Subject: [PATCH 056/121] Translated using Weblate (Spanish) Currently translated at 99.3% (6350 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/es/ --- .../main/resources/assets/cobblemon/lang/es_es.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/es_es.json b/common/src/main/resources/assets/cobblemon/lang/es_es.json index 6b89319aa9..7cbea7c450 100644 --- a/common/src/main/resources/assets/cobblemon/lang/es_es.json +++ b/common/src/main/resources/assets/cobblemon/lang/es_es.json @@ -6341,5 +6341,16 @@ "cobblemon.pokedex.variation.wood": "Madera", "cobblemon.pokedex.variation.variant": "Variante", "cobblemon.pokedex.variation.size": "Tamaño", - "cobblemon.pokedex.variation.snake_pattern": "Patrón de serpiente" + "cobblemon.pokedex.variation.snake_pattern": "Patrón de serpiente", + "cobblemon.subtitle.pokemon.wild_shiny_shine": "¡Un Pokémon salvaje variocolor brilla!", + "cobblemon.subtitle.pokemon.owned_shiny_ambient": "Un Pokémon variocolor tintinea", + "cobblemon.subtitle.pokemon.shiny_shine": "Un Pokémon variocolor brilla", + "cobblemon.subtitle.pokemon.shiny_ambient": "¡Un Pokémon salvaje variocolor tintinea!", + "cobblemon.battle.clearboost": "¡Las características de %1$s han vuelto a sus valores originales!", + "cobblemon.challenge.multi.invite": "Invitar", + "cobblemon.pokedex.variation.pattern": "Patrón", + "cobblemon.pokedex.variation.metal": "Metal", + "cobblemon.battle.crit_spread": "¡Un golpe crítico a %1$s!", + "cobblemon.battle.superEffective_spread": "¡Es supereficaz contra %1$s!", + "cobblemon.battle.resisted_spread": "No es muy eficaz contra %1$s." } From e2804dc83fdba2fe186b63e8d9506caf9533279e Mon Sep 17 00:00:00 2001 From: Konoha Date: Sun, 19 Jan 2025 09:53:16 -0500 Subject: [PATCH 057/121] Reimplement non-Torterra wood choices to Cobblemon Tree feature. --- .../resources/data/cobblemon/species_features/tree.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species_features/tree.json b/common/src/main/resources/data/cobblemon/species_features/tree.json index a7b2c29936..ae66fed8f3 100644 --- a/common/src/main/resources/data/cobblemon/species_features/tree.json +++ b/common/src/main/resources/data/cobblemon/species_features/tree.json @@ -6,15 +6,18 @@ "default": "none", "choices": [ "oak", - "swamp", "birch", "darkoak", "acacia", "azalea", + "swamp", "jungle", "spruce", "mangrove", - "cherry" + "cherry", + "apricorn", + "crimson", + "warped" ], "isAspect": true, "aspectFormat": "tree-{{choice}}" From 53e540472a7a7c9e3cdca7b2bd05e7f2c7de6f27 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Sun, 19 Jan 2025 21:02:33 +0100 Subject: [PATCH 058/121] Fixed Eiscue's scale (1 -> 0.85) --- .../resources/data/cobblemon/species/generation8/eiscue.json | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index 931a3379ca..ba7e5ad328 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -6,6 +6,7 @@ "maleRatio": 0.5, "height": 14, "weight": 890, + "baseScale": 0.85, "pokedex": [ "cobblemon.species.eiscue.desc" ], From 6d89b737a7adb1008e57e60a79fa3936bbe8d429 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Sun, 19 Jan 2025 21:02:53 +0100 Subject: [PATCH 059/121] Added flame animations to Charcadet --- .../blockbench/pokemon/gen9/CharcadetModel.kt | 20 +- .../0935_charcadet/charcadet.animation.json | 488 ++++++++++++++++-- 2 files changed, 465 insertions(+), 43 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt index e79393508e..176f844737 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt @@ -51,7 +51,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, val blink = quirk { bedrockStateful("charcadet", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, - animations = arrayOf(bedrock("charcadet", "sleep")) + animations = arrayOf(bedrock("charcadet", "sleep"), + bedrock("charcadet", "eye_flame_overlay"), + bedrock("charcadet", "head_flame_overlay")) ) standing = registerPose( @@ -61,7 +63,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, quirks = arrayOf(blink), animations = arrayOf( singleBoneLook(), - bedrock("charcadet", "ground_idle") + bedrock("charcadet", "ground_idle"), + bedrock("charcadet", "eye_flame_overlay"), + bedrock("charcadet", "head_flame_overlay") ) ) @@ -72,7 +76,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, quirks = arrayOf(blink), animations = arrayOf( singleBoneLook(), - bedrock("charcadet", "ground_walk") + bedrock("charcadet", "ground_walk"), + bedrock("charcadet", "eye_flame_overlay"), + bedrock("charcadet", "head_flame_overlay") ) ) @@ -81,7 +87,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, quirks = arrayOf(blink), animations = arrayOf( singleBoneLook(), - bedrock("charcadet", "shoulder_left") + bedrock("charcadet", "shoulder_left"), + bedrock("charcadet", "eye_flame_overlay"), + bedrock("charcadet", "head_flame_overlay") ), transformedParts = arrayOf( rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, -0.1), @@ -94,7 +102,9 @@ class CharcadetModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, quirks = arrayOf(blink), animations = arrayOf( singleBoneLook(), - bedrock("charcadet", "shoulder_right") + bedrock("charcadet", "shoulder_right"), + bedrock("charcadet", "eye_flame_overlay"), + bedrock("charcadet", "head_flame_overlay") ), transformedParts = arrayOf( rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, -0.1), diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0935_charcadet/charcadet.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0935_charcadet/charcadet.animation.json index 00947324d4..c58846a2c7 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0935_charcadet/charcadet.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0935_charcadet/charcadet.animation.json @@ -1,11 +1,93 @@ { "format_version": "1.8.0", "animations": { + "animation.charcadet.ground_idle_pose": { + "loop": true, + "bones": { + "torso": { + "rotation": [-2.5, 0, 0] + }, + "waist": { + "rotation": [2.5, 0, 0] + }, + "arm_left": { + "rotation": [1.30962, -7.38542, 34.91547] + }, + "arm_left2": { + "rotation": [0, 22.5, 0] + }, + "hand_left": { + "rotation": [0, 0, 7.5] + }, + "fingers_left": { + "rotation": [0, 0, 15] + }, + "arm_right": { + "rotation": [1.30962, 7.38542, -34.91547] + }, + "arm_right2": { + "rotation": [0, -22.5, 0] + }, + "hand_right": { + "rotation": [0, 0, -7.5] + }, + "fingers_right": { + "rotation": [0, 0, -15] + }, + "head": { + "rotation": [2.5, 0, 0] + }, + "back_flame": { + "rotation": [-5, 0, 0] + }, + "leg_left": { + "rotation": [9.98783, -0.00858, -12.92793] + }, + "leg_left2": { + "rotation": [-2.5, 0, 7.5] + }, + "foot_left": { + "rotation": [-7.48107, 0.43523, 4.98107] + }, + "leg_right": { + "rotation": [9.98783, 0.00858, 12.92793] + }, + "leg_right2": { + "rotation": [-2.5, 0, -7.5] + }, + "foot_right": { + "rotation": [-7.48107, -0.43523, -4.98107] + }, + "eye_flame_left": { + "rotation": [-12.68472, -19.93989, 0.57543] + }, + "eye_flame_left2": { + "rotation": [-49.84884, -2.22147, 21.2812] + }, + "eye_flame_left3": { + "rotation": [-10, 20, 0], + "position": [0, 0, -0.5] + }, + "eye_flame_right": { + "rotation": [-12.68472, 19.93989, -0.57543] + }, + "eye_flame_right2": { + "rotation": [-49.84884, 2.22147, -21.2812] + }, + "eye_flame_right3": { + "rotation": [-10, -20, 0], + "position": [0, 0, -0.5] + }, + "head_flame": { + "rotation": [-12.5, 0, 0] + } + } + }, "animation.charcadet.ground_idle": { "loop": true, "bones": { "torso": { - "position": [0, -0.1, 0] + "position": [0, "-0.1+Math.cos((query.anim_time) * 90 * 2) * -0.2", 0] }, "chest": { "rotation": [-2.5, 0, 0], @@ -75,6 +157,26 @@ }, "hand_left": { "rotation": [-1, 0, 0] + }, + "eye_flame_left": { + "rotation": [-12.68472, -19.93989, 0.57543] + }, + "eye_flame_left2": { + "rotation": [-49.84884, -2.22147, 21.2812] + }, + "eye_flame_left3": { + "rotation": [-10, 20, 0], + "position": [0, 0, -0.5] + }, + "eye_flame_right": { + "rotation": [-12.68472, 19.93989, -0.57543] + }, + "eye_flame_right2": { + "rotation": [-49.84884, 2.22147, -21.2812] + }, + "eye_flame_right3": { + "rotation": [-10, -20, 0], + "position": [0, 0, -0.5] } } }, @@ -165,6 +267,29 @@ }, "chest": { "rotation": [7.5, "0+Math.cos((query.anim_time) * 90 * 2*2-150) * 2", 0] + }, + "torso": { + "position": [0, "0+Math.cos((query.anim_time) * 90 * 8) * 0.4", 0] + }, + "eye_flame_left": { + "rotation": [-12.68472, -19.93989, 0.57543] + }, + "eye_flame_left2": { + "rotation": [-49.84884, -2.22147, 21.2812] + }, + "eye_flame_left3": { + "rotation": [-10, 20, 0], + "position": [0, 0, -0.5] + }, + "eye_flame_right": { + "rotation": [-12.68472, 19.93989, -0.57543] + }, + "eye_flame_right2": { + "rotation": [-49.84884, 2.22147, -21.2812] + }, + "eye_flame_right3": { + "rotation": [-10, -20, 0], + "position": [0, 0, -0.5] } } }, @@ -233,49 +358,31 @@ }, "torso": { "position": [0, 0, 0.1] - } - } - }, - "animation.charcadet.blink": { - "animation_length": 0.16667, - "bones": { - "eyelid_left": { - "position": { - "0.0": [0.1, 0, -0.1], - "0.125": [0.1, 0, -0.1], - "0.1667": [0, 0, 0] - } }, - "flame_left": { - "position": { - "0.0": [-2, 0, 1], - "0.125": [-2, 0, 1], - "0.1667": [0, 0, 0] - } + "eye_flame_left": { + "rotation": [-12.68472, -19.93989, 0.57543] }, - "eyelid_right": { - "position": { - "0.0": [-0.1, 0, -0.1], - "0.125": [-0.1, 0, -0.1], - "0.1667": [0, 0, 0] - } + "eye_flame_left2": { + "rotation": [-49.84884, -2.22147, 21.2812] }, - "flame_right": { - "position": { - "0.0": [2, 0, 1], - "0.125": [2, 0, 1], - "0.1667": [0, 0, 0] - } + "eye_flame_left3": { + "rotation": [-10, 20, 0], + "position": [0, 0, -0.5] + }, + "eye_flame_right": { + "rotation": [-12.68472, 19.93989, -0.57543] + }, + "eye_flame_right2": { + "rotation": [-49.84884, 2.22147, -21.2812] + }, + "eye_flame_right3": { + "rotation": [-10, -20, 0], + "position": [0, 0, -0.5] } } }, "animation.charcadet.cry": { "animation_length": 1.25, - "sound_effects": { - "0.04": { - "effect": "pokemon.charcadet.cry" - } - }, "bones": { "back_flame": { "rotation": { @@ -584,6 +691,26 @@ "1.5833": [32.5, 0, 0], "1.7083": [12.5, 0, 0] } + }, + "eye_flame_left": { + "rotation": [-12.68472, -19.93989, 0.57543] + }, + "eye_flame_left2": { + "rotation": [-49.84884, -2.22147, 21.2812] + }, + "eye_flame_left3": { + "rotation": [-10, 20, 0], + "position": [0, 0, -0.5] + }, + "eye_flame_right": { + "rotation": [-12.68472, 19.93989, -0.57543] + }, + "eye_flame_right2": { + "rotation": [-49.84884, 2.22147, -21.2812] + }, + "eye_flame_right3": { + "rotation": [-10, -20, 0], + "position": [0, 0, -0.5] } } }, @@ -617,7 +744,7 @@ "rotation": ["22.5+Math.cos((query.anim_time) * 90 * 2 - 60) * 2", 0, 0] }, "head": { - "rotation": [-7.67995, 12.39135, "-1.6575+Math.sin((query.anim_time) * 90 * 2 - 20) * -1"] + "rotation": [-27.67995, 12.39135, "-1.6575+Math.sin((query.anim_time) * 90 * 2 - 20) * -1"] }, "leg_left": { "rotation": [-76.20217, -29.55666, -2.87398] @@ -642,6 +769,26 @@ }, "flame_head": { "rotation": ["0+Math.cos((query.anim_time) * 90 * 8) * 6", 0, 0] + }, + "eye_flame_left": { + "rotation": [-12.68472, -19.93989, 0.57543] + }, + "eye_flame_left2": { + "rotation": [-49.84884, -2.22147, 21.2812] + }, + "eye_flame_left3": { + "rotation": [-10, 20, 0], + "position": [0, 0, -0.5] + }, + "eye_flame_right": { + "rotation": [-12.68472, 19.93989, -0.57543] + }, + "eye_flame_right2": { + "rotation": [-49.84884, 2.22147, -21.2812] + }, + "eye_flame_right3": { + "rotation": [-10, -20, 0], + "position": [0, 0, -0.5] } } }, @@ -676,7 +823,7 @@ "rotation": ["22.5+Math.cos((query.anim_time) * 90 * 2 - 60) * 2", 0, 0] }, "head": { - "rotation": [-7.67995, -12.39135, "1.6575+Math.sin((query.anim_time) * 90 * 2 - 20) * -1"] + "rotation": [-27.67995, -12.39135, "1.6575+Math.sin((query.anim_time) * 90 * 2 - 20) * -1"] }, "leg_left": { "rotation": [-87.5, 0, 0] @@ -701,6 +848,271 @@ }, "flame_head": { "rotation": ["0+Math.cos((query.anim_time) * 90 * 8) * 6", 0, 0] + }, + "eye_flame_left": { + "rotation": [-12.68472, -19.93989, 0.57543] + }, + "eye_flame_left2": { + "rotation": [-49.84884, -2.22147, 21.2812] + }, + "eye_flame_left3": { + "rotation": [-10, 20, 0], + "position": [0, 0, -0.5] + }, + "eye_flame_right": { + "rotation": [-12.68472, 19.93989, -0.57543] + }, + "eye_flame_right2": { + "rotation": [-49.84884, 2.22147, -21.2812] + }, + "eye_flame_right3": { + "rotation": [-10, -20, 0], + "position": [0, 0, -0.5] + } + } + }, + "animation.charcadet.eye_flame_overlay": { + "loop": true, + "bones": { + "eye_flame_left": { + "rotation": ["0+Math.cos((query.anim_time) * 90 * 16 - 90) * 3", "0+Math.cos((query.anim_time) * 90 * 16) * 3", 0] + }, + "eye_flame_left2": { + "rotation": [0, "0+Math.cos((query.anim_time) * 90 * 16 - 120) * 8", 0] + }, + "eye_flame_left3": { + "rotation": [0, "0+Math.cos((query.anim_time) * 90 * 16 - 240) * 8", 0] + }, + "eye_flame_right": { + "rotation": ["0+Math.cos((query.anim_time) * 90 * 16 - 90) * 3", "0+Math.cos((query.anim_time) * 90 * 16) * -3", 0] + }, + "eye_flame_right2": { + "rotation": [0, "0+Math.cos((query.anim_time) * 90 * 16 - 120) * -8", 0] + }, + "eye_flame_right3": { + "rotation": [0, "0+Math.cos((query.anim_time) * 90 * 16 - 240) * -8", 0] + } + } + }, + "animation.charcadet.head_flame_overlay": { + "loop": true, + "bones": { + "head_flame": { + "rotation": ["0+Math.cos((query.anim_time) * 90 * 8) * 4", 0, 0] + }, + "head_flame2": { + "rotation": ["0+Math.cos((query.anim_time) * 90 * 8 - 90) * 9", 0, 0] + }, + "head_flame3": { + "rotation": ["0+Math.cos((query.anim_time) * 90 * 8 - 180) * 18", 0, 0] + } + } + }, + "animation.charcadet.blink": { + "animation_length": 0.1667, + "bones": { + "eye_flame_left": { + "scale": { + "0.0": [0, 0, 0], + "0.125": [0, 0, 0], + "0.1667": [1, 1, 1] + } + }, + "eyelid_left": { + "position": { + "0.0": [0.1, 0, -0.1], + "0.125": [0.1, 0, -0.1], + "0.1667": [0, 0, 0] + } + }, + "eye_flame_right": { + "scale": { + "0.0": [0, 0, 0], + "0.125": [0, 0, 0], + "0.1667": [1, 1, 1] + } + }, + "eyelid_right": { + "position": { + "0.0": [-0.1, 0, -0.1], + "0.125": [-0.1, 0, -0.1], + "0.1667": [0, 0, 0] + } + } + } + }, + "animation.charcadet.render": { + "loop": true, + "bones": { + "torso": { + "rotation": [-2.5, 0, 0] + }, + "waist": { + "rotation": [2.5, 0, 0] + }, + "arm_left": { + "rotation": [1.30962, -7.38542, 34.91547] + }, + "arm_left2": { + "rotation": [0, 55, 0] + }, + "hand_left": { + "rotation": [0, 0, 7.5] + }, + "fingers_left": { + "rotation": [0, 0, 15] + }, + "arm_right": { + "rotation": [1.40458, 22.38126, -34.54893] + }, + "arm_right2": { + "rotation": [0, -22.5, 0] + }, + "hand_right": { + "rotation": [0, 0, -7.5] + }, + "fingers_right": { + "rotation": [0, 0, -15] + }, + "head": { + "rotation": [2.97532, -19.82169, -2.71994] + }, + "back_flame": { + "rotation": [-5, 0, 0] + }, + "leg_left": { + "rotation": [17.48783, -0.00858, -12.92793] + }, + "leg_left2": { + "rotation": [7.5, 0, 7.5] + }, + "foot_left": { + "rotation": [-24.95393, 1.27951, 6.79435] + }, + "leg_right": { + "rotation": [-27.51217, 0.00858, 12.92793] + }, + "leg_right2": { + "rotation": [27.5, 0, -7.5] + }, + "foot_right": { + "rotation": [0.03411, -0.4343, -6.98113] + }, + "eye_flame_left": { + "rotation": [-12.68472, -19.93989, 0.57543], + "position": [-0.25, 0, 0] + }, + "eye_flame_left2": { + "rotation": [-49.84884, -2.22147, 21.2812] + }, + "eye_flame_left3": { + "rotation": [-10, 20, 0], + "position": [0, 0, -0.5] + }, + "eye_flame_right": { + "rotation": [-12.68472, 19.93989, -0.57543] + }, + "eye_flame_right2": { + "rotation": [-49.84884, 2.22147, -21.2812] + }, + "eye_flame_right3": { + "rotation": [-10, -20, 0], + "position": [0, 0, -0.5] + }, + "charcadet": { + "rotation": [0, 25, 0] + }, + "body": { + "rotation": [0, 25, 0], + "position": [0, -0.4, 0] + }, + "pupil_left": { + "position": [0.75, 0, 0] + }, + "pupil_left2": { + "position": [0.5, 0, 0] + }, + "head_flame": { + "rotation": [-10, 0, 0] + }, + "head_flame2": { + "rotation": [0, 0, 12.5] + }, + "head_flame3": { + "rotation": [0, 0, -12.5] + } + } + }, + "animation.charcadet.angry": { + "loop": true, + "bones": { + "eye_angry_left": { + "position": [0.1, 0, -0.1] + }, + "eye_angry_right": { + "position": [-0.1, 0, -0.1] + } + } + }, + "animation.charcadet.sad": { + "loop": true, + "bones": { + "eye_sad_left": { + "position": [0.1, 0, -0.1] + }, + "eye_sad_right": { + "position": [-0.1, 0, -0.1] + } + } + }, + "animation.charcadet.unamused": { + "loop": true, + "bones": { + "eye_flame_left": { + "position": [0, -0.6, 0] + }, + "eye_unamused_left": { + "position": [0.1, 0, -0.1] + }, + "eye_unamused_right": { + "position": [-0.1, 0, -0.1] + }, + "eye_flame_right": { + "position": [0, -0.6, 0] + } + } + }, + "animation.charcadet.happy": { + "loop": true, + "bones": { + "eye_flame_left": { + "scale": 0 + }, + "eyelid_happy_left": { + "position": [0.1, 0, -0.1] + }, + "eye_flame_right": { + "scale": 0 + }, + "eyelid_happy_right": { + "position": [-0.1, 0, -0.1] + } + } + }, + "animation.charcadet.hurt": { + "loop": true, + "bones": { + "eye_flame_left": { + "scale": 0 + }, + "eyelid_recoil_left": { + "position": [0.1, 0, -0.1] + }, + "eye_flame_right": { + "scale": 0 + }, + "eyelid_recoil_right": { + "position": [-0.1, 0, -0.1] } } } From 33a2a0a8e0269bf061a33eebd3b03c4b44ac3b63 Mon Sep 17 00:00:00 2001 From: Hiroku Date: Sun, 19 Jan 2025 20:29:34 +0000 Subject: [PATCH 060/121] Edit CHANGELOG.md --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e40902ec02..a7a862c90e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Added an evolution method for Karrablast to evolve into Escavalier in single-player mode. - Pokédexes can now be placed in Chiseled Bookshelves. - Added crossover paintings from Close Combat, Premonition, Altar, Slumber, and Nomad. +- Added optional box argument to the /pc command ### Changes - Pokémon will now be dynamically revealed to the Pokédex as they're seen instead of revealing entire parties at the end of battle regardless. @@ -41,10 +42,19 @@ - Escavalier - Rufflet - Braviary +- Foongus +- Amoonguss + +#### Gen 6 +- Binacle +- Barbaracle #### Gen 7 - Dewpider - Araquanid +- Alolan Geodude +- Alolan Graveler +- Alolan Golem #### Gen 8 - Galarian Slowpoke @@ -85,8 +95,6 @@ - Slowbro - Slowking - Eiscue -- Binacle -- Barbaracle - Tauros - Goldeen - Seaking From bc267ec72b6d1cdf8a9bc265f06ebae85cb85e83 Mon Sep 17 00:00:00 2001 From: Konoha Date: Sun, 19 Jan 2025 17:09:33 -0500 Subject: [PATCH 061/121] Correct "Undiscovered" form oversight with data tag culling This only affects the 3 forms who are in the undiscovered group and had accidentally inherited the base form's egg groups during the culling script's comparison, and did not have handling for their "legacy" movesets not totally covered by newer games. --- .../species/generation1/pikachu.json | 102 +---------------- .../species/generation6/floette.json | 87 ++++++++++++++- .../species/generation6/greninja.json | 105 +----------------- 3 files changed, 88 insertions(+), 206 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json index 03858c27ac..026cf4c2e5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json @@ -259,107 +259,7 @@ "partner-cap" ], "eggGroups": [ - "undiscovered", - "field", - "fairy" - ], - "moves": [ - "1:tailwhip", - "1:thundershock", - "1:growl", - "1:playnice", - "1:quickattack", - "1:nuzzle", - "1:sweetkiss", - "1:nastyplot", - "1:charm", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "tm:agility", - "tm:alluringvoice", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:covet", - "tm:dig", - "tm:disarmingvoice", - "tm:discharge", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fakeout", - "tm:faketears", - "tm:feint", - "tm:flail", - "tm:fling", - "tm:focuspunch", - "tm:grassknot", - "tm:growl", - "tm:helpinghand", - "tm:irontail", - "tm:knockoff", - "tm:laserfocus", - "tm:lightscreen", - "tm:magnetrise", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:nuzzle", - "tm:payday", - "tm:playnice", - "tm:playrough", - "tm:present", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:reversal", - "tm:risingvoltage", - "tm:shockwave", - "tm:signalbeam", - "tm:slam", - "tm:sleeptalk", - "tm:spark", - "tm:substitute", - "tm:surf", - "tm:sweetkiss", - "tm:swift", - "tm:tailwhip", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave", - "tm:tickle", - "tm:trailblaze", - "tm:upperhand", - "tm:voltswitch", - "tm:volttackle", - "tm:wildcharge", - "tm:wish" + "undiscovered" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation6/floette.json b/common/src/main/resources/data/cobblemon/species/generation6/floette.json index 231902b674..93cadbb40c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/floette.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/floette.json @@ -300,8 +300,7 @@ "flower-eternal" ], "eggGroups": [ - "undiscovered", - "fairy" + "undiscovered" ], "baseStats": { "hp": 74, @@ -324,6 +323,90 @@ } ] }, + "moves": [ + "1:tackle", + "1:vinewhip", + "1:fairywind", + "1:luckychant", + "10:safeguard", + "15:razorleaf", + "20:wish", + "25:magicalleaf", + "27:grassyterrain", + "33:petalblizzard", + "38:aromatherapy", + "43:mistyterrain", + "46:moonblast", + "50:lightofruin", + "51:petaldance", + "58:solarbeam", + "egg:camouflage", + "egg:captivate", + "egg:copycat", + "egg:endeavor", + "egg:tearfullook", + "tm:afteryou", + "tm:alluringvoice", + "tm:allyswitch", + "tm:aromatherapy", + "tm:batonpass", + "tm:calmmind", + "tm:camouflage", + "tm:captivate", + "tm:charm", + "tm:chillingwater", + "tm:copycat", + "tm:covet", + "tm:dazzlinggleam", + "tm:disarmingvoice", + "tm:drainingkiss", + "tm:echoedvoice", + "tm:endeavor", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:fairywind", + "tm:flash", + "tm:gigadrain", + "tm:grassknot", + "tm:grassyterrain", + "tm:healbell", + "tm:helpinghand", + "tm:lightscreen", + "tm:luckychant", + "tm:magicalleaf", + "tm:magiccoat", + "tm:metronome", + "tm:mistyterrain", + "tm:moonblast", + "tm:naturepower", + "tm:petalblizzard", + "tm:petaldance", + "tm:pollenpuff", + "tm:protect", + "tm:psychic", + "tm:raindance", + "tm:razorleaf", + "tm:rest", + "tm:safeguard", + "tm:seedbomb", + "tm:skillswap", + "tm:sleeptalk", + "tm:solarbeam", + "tm:storedpower", + "tm:substitute", + "tm:sunnyday", + "tm:swift", + "tm:synthesis", + "tm:tackle", + "tm:tearfullook", + "tm:terablast", + "tm:trailblaze", + "tm:trick", + "tm:vinewhip", + "tm:wish", + "tm:worryseed" + ], "evolutions": [], "battleOnly": false } diff --git a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json index 6cc0f9aef3..dcf58e7992 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json @@ -220,107 +220,7 @@ "h:battlebond" ], "eggGroups": [ - "undiscovered", - "water_1" - ], - "moves": [ - "1:watershuriken", - "1:nightslash", - "1:haze", - "1:roleplay", - "1:matblock", - "1:pound", - "1:growl", - "1:bubble", - "1:quickattack", - "1:watergun", - "10:lick", - "14:waterpulse", - "19:smokescreen", - "23:shadowsneak", - "28:spikes", - "33:feintattack", - "42:substitute", - "49:extrasensory", - "56:doubleteam", - "68:hydropump", - "tm:acrobatics", - "tm:aerialace", - "tm:blizzard", - "tm:bounce", - "tm:brickbreak", - "tm:brutalswing", - "tm:bubble", - "tm:chillingwater", - "tm:counter", - "tm:darkpulse", - "tm:dig", - "tm:dive", - "tm:doubleteam", - "tm:echoedvoice", - "tm:endure", - "tm:extrasensory", - "tm:facade", - "tm:falseswipe", - "tm:feintattack", - "tm:fling", - "tm:gigaimpact", - "tm:grassknot", - "tm:growl", - "tm:gunkshot", - "tm:haze", - "tm:helpinghand", - "tm:hydrocannon", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:lick", - "tm:liquidation", - "tm:lowkick", - "tm:lowsweep", - "tm:matblock", - "tm:mudshot", - "tm:mudslap", - "tm:nightslash", - "tm:pound", - "tm:protect", - "tm:quickattack", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:rockslide", - "tm:rocktomb", - "tm:roleplay", - "tm:shadowsneak", - "tm:sleeptalk", - "tm:sludgewave", - "tm:smackdown", - "tm:smokescreen", - "tm:snatch", - "tm:snowscape", - "tm:spikes", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:switcheroo", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:toxicspikes", - "tm:trailblaze", - "tm:upperhand", - "tm:uturn", - "tm:waterfall", - "tm:watergun", - "tm:waterpledge", - "tm:waterpulse", - "tm:watershuriken", - "tm:weatherball", - "tm:workup" + "undiscovered" ], "evolutions": [], "battleOnly": false @@ -346,8 +246,7 @@ "h:battlebond" ], "eggGroups": [ - "undiscovered", - "water_1" + "undiscovered" ], "baseStats": { "hp": 72, From 452117c781c66da9be8bf45f8606b1e77c45bd60 Mon Sep 17 00:00:00 2001 From: Hiroku Date: Sun, 19 Jan 2025 22:11:37 +0000 Subject: [PATCH 062/121] Edit CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7a862c90e..37994ce471 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -99,6 +99,8 @@ - Goldeen - Seaking - Charcadet +- Armarouge +- Ceruledge - Pinsir - Geodude - Graveler From 5d5cb3a2404a0736a664a56fd7fa47be5f2309b4 Mon Sep 17 00:00:00 2001 From: GenotypeXD-Dev Date: Sun, 19 Jan 2025 16:13:07 -0700 Subject: [PATCH 063/121] Implement Alolan Exeggutor Remodel --- .../pokemon/gen1/ExeggutorAlolanModel.kt | 106 ------------------ .../repository/PokemonModelRepository.kt | 1 - .../0103_exeggutor/exeggutor_alolan.json | 65 +++++++++++ .../species/generation1/exeggutor.json | 2 +- 4 files changed, 66 insertions(+), 108 deletions(-) delete mode 100644 common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0103_exeggutor/exeggutor_alolan.json diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt deleted file mode 100644 index 427b2b2764..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (C) 2023 Cobblemon Contributors - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 - -import com.cobblemon.mod.common.client.render.models.blockbench.animation.SingleBoneLookAnimation -import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame -import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel -import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose -import com.cobblemon.mod.common.entity.PoseType -import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES -import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES -import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES -import com.cobblemon.mod.common.util.isBattling -import net.minecraft.client.model.geom.ModelPart -import net.minecraft.world.phys.Vec3 - -class ExeggutorAlolanModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame { - override val rootPart = root.registerChildWithAllChildren("exeggutor") - override val head = getPart("head") - - override val leftLeg = getPart("leg_left") - override val rightLeg = getPart("leg_right") - - val head2 = object : HeadedFrame { - override val rootPart = this@ExeggutorAlolanModel.rootPart - override val head: ModelPart = getPart("head2") - } - val head3 = object : HeadedFrame { - override val rootPart = this@ExeggutorAlolanModel.rootPart - override val head: ModelPart = getPart("head3") - } - - override var portraitScale = 1.0F - override var portraitTranslation = Vec3(-1.4, 16.55, 0.0) - - override var profileScale = 0.45F - override var profileTranslation = Vec3(0.0, 1.0, -30.0) - - lateinit var standing: Pose - lateinit var walk: Pose - lateinit var sleep: Pose - lateinit var battleidle: Pose - - override fun registerPoses() { - val blink1 = quirk { bedrockStateful("exeggutor_alolan", "blink") } - val blink2 = quirk { bedrockStateful("exeggutor_alolan", "blink2") } - val blink3 = quirk { bedrockStateful("exeggutor_alolan", "blink3") } - val blink4 = quirk { bedrockStateful("exeggutor_alolan", "blink4") } - sleep = registerPose( - poseType = PoseType.SLEEP, - animations = arrayOf(bedrock("exeggutor_alolan", "sleep")) - ) - - standing = registerPose( - poseName = "standing", - poseTypes = STATIONARY_POSES + UI_POSES, - quirks = arrayOf(blink1, blink2, blink3, blink4), - condition = { !it.isBattling }, - animations = arrayOf( - singleBoneLook(), - SingleBoneLookAnimation(head2, false, false, disableX = false, disableY = false), - SingleBoneLookAnimation(head3, false, false, disableX = false, disableY = false), - bedrock("exeggutor_alolan", "ground_idle") - ) - ) - - walk = registerPose( - poseName = "walk", - poseTypes = MOVING_POSES, - quirks = arrayOf(blink1, blink2, blink3, blink4), - animations = arrayOf( - singleBoneLook(), - SingleBoneLookAnimation(head2, false, false, disableX = false, disableY = false), - SingleBoneLookAnimation(head3, false, false, disableX = false, disableY = false), - bedrock("exeggutor_alolan", "ground_walk") - ) - ) - - battleidle = registerPose( - poseName = "battle_idle", - poseTypes = PoseType.STATIONARY_POSES, - transformTicks = 10, - quirks = arrayOf(blink1, blink2, blink3, blink4), - condition = { it.isBattling }, - animations = arrayOf( - singleBoneLook(), - SingleBoneLookAnimation(head2, false, false, disableX = false, disableY = false), - SingleBoneLookAnimation(head3, false, false, disableX = false, disableY = false), - bedrock("exeggutor_alolan", "battle_idle") - ) - - ) - } - -// override fun getFaintAnimation( -// pokemonEntity: PokemonEntity, -// state: PosableState -// ) = if (state.isPosedIn(standing, walk)) bedrockStateful("exeggutor_alolan", "faint") else null -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt index e42cfa2c47..d79920a708 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt @@ -90,7 +90,6 @@ object PokemonModelRepository : VaryingModelRepository() { inbuilt("electabuzz", ::ElectabuzzModel) inbuilt("exeggcute", ::ExeggcuteModel) inbuilt("exeggutor", ::ExeggutorModel) - inbuilt("exeggutor_alolan", ::ExeggutorAlolanModel) inbuilt("farfetchd", ::FarfetchdModel) inbuilt("farfetchd_galarian", ::FarfetchdGalarianModel) inbuilt("fearow", ::FearowModel) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0103_exeggutor/exeggutor_alolan.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0103_exeggutor/exeggutor_alolan.json new file mode 100644 index 0000000000..56a2ae7a21 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0103_exeggutor/exeggutor_alolan.json @@ -0,0 +1,65 @@ +{ + "portraitScale": 0.86, + "portraitTranslation": [-0.89, 7.81, 0], + "profileScale": 0.45, + "profileTranslation": [0, 1, -30], + "rootBone": "exeggutor_alolan", + "animations": { + "cry": "q.bedrock_stateful('exeggutor_alolan', 'cry')" + }, + "poses": { + "battle-standing": { + "poseTypes": ["STAND"], + "isBattle": true, + "animations": [ + "q.look('head')", + "q.look('head2')", + "q.look('head3')", + "q.bedrock('exeggutor_alolan', 'battle_idle')" + ], + "quirks": [ + "q.bedrock_quirk('exeggutor_alolan', 'blink')", + "q.bedrock_quirk('exeggutor_alolan', 'blink2')", + "q.bedrock_quirk('exeggutor_alolan', 'blink3')", + "q.bedrock_quirk('exeggutor_alolan', 'blink4')" + ] + }, + "standing": { + "poseTypes": ["STAND", "NONE", "PROFILE", "PORTRAIT", "FLOAT"], + "isBattle": false, + "animations": [ + "q.look('head')", + "q.look('head2')", + "q.look('head3')", + "q.bedrock('exeggutor_alolan', 'ground_idle')" + ], + "quirks": [ + "q.bedrock_quirk('exeggutor_alolan', 'blink')", + "q.bedrock_quirk('exeggutor_alolan', 'blink2')", + "q.bedrock_quirk('exeggutor_alolan', 'blink3')", + "q.bedrock_quirk('exeggutor_alolan', 'blink4')" + ] + }, + "walking": { + "poseTypes": ["WALK", "SWIM"], + "animations": [ + "q.look('head')", + "q.look('head2')", + "q.look('head3')", + "q.bedrock('exeggutor_alolan', 'ground_walk')" + ], + "quirks": [ + "q.bedrock_quirk('exeggutor_alolan', 'blink')", + "q.bedrock_quirk('exeggutor_alolan', 'blink2')", + "q.bedrock_quirk('exeggutor_alolan', 'blink3')", + "q.bedrock_quirk('exeggutor_alolan', 'blink4')" + ] + }, + "sleep": { + "poseTypes": ["SLEEP"], + "animations": [ + "q.bedrock('exeggutor_alolan', 'sleep')" + ] + } + } +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json index f451ba24ac..77ddc76ed5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json @@ -235,7 +235,7 @@ }, "hitbox": { "width": 1.6, - "height": 17.8, + "height": 11, "fixed": false }, "standingEyeHeight": 0.96, From 9df466986507e0b2153d3652da1b300fc4c9f057 Mon Sep 17 00:00:00 2001 From: GenotypeXD-Dev Date: Sun, 19 Jan 2025 16:14:16 -0700 Subject: [PATCH 064/121] Oops animations and model didnt push --- .../exeggutor_alolan.animation.json | 160 ++++----- .../0103_exeggutor/exeggutor_alolan.geo.json | 323 +++++++++--------- 2 files changed, 218 insertions(+), 265 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor_alolan.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor_alolan.animation.json index 557bdc2522..372a0e2fee 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor_alolan.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0103_exeggutor/exeggutor_alolan.animation.json @@ -206,7 +206,7 @@ }, "animation.exeggutor_alolan.ground_walk": { "loop": true, - "animation_length": 4.79167, + "animation_length": 4.7917, "bones": { "leg_left": { "rotation": { @@ -817,25 +817,30 @@ "bones": { "leg_left": { "rotation": { - "0.0": ["-15+math.clamp(-math.sin(q.anim_time*90*2.5+225)*65,-90,0)", -35, 0], + "0.0": [-15, -35, 0], "0.5833": [-15, -35, 0], - "0.625": ["-15+math.clamp(-math.sin(q.anim_time*90*2.5+225)*35,-90,0)", -35, 0], - "1.125": ["-15+math.clamp(-math.sin(q.anim_time*90*2.5+225)*35,-90,0)", -35, 0], + "0.7917": [-65, -35, 0], + "0.9583": { + "pre": [-75, -35, 0], + "post": [-75, -35, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [-65, -35, 0], + "lerp_mode": "catmullrom" + }, "1.2917": [-15, -35, 0], "1.5833": [-15, -35, 0] }, "position": { - "0.0": [ - "math.clamp(math.sin(q.anim_time*90*2.5+225)*0.5,0,90)", - "math.clamp(math.sin(q.anim_time*90*2.5+225)*3.5,0,90)", - "math.clamp(-math.sin(q.anim_time*90*2.5+225)*2,-90,0)" - ], + "0.0": [0, 0, 0], "0.5833": [0, 0, 0], - "0.625": [ - "math.clamp(math.sin(q.anim_time*90*2.5+225)*0.5,0,90)", - "math.clamp(math.sin(q.anim_time*90*2.5+225)*3.5,0,90)", - "math.clamp(-math.sin(q.anim_time*90*2.5+225)*2,-90,0)" - ], + "0.625": [0.06, 0.42, -0.24], + "0.7083": [0.18, 1.26, -0.72], + "0.7917": [0.15, 1.08, -0.62], + "0.9167": [0.11, 0.81, -0.47], + "1.0417": [0.07, 0.54, -0.31], + "1.1667": [0.04, 0.27, -0.16], "1.2917": [0, 0, 0], "1.5833": [0, 0, 0] } @@ -858,25 +863,31 @@ }, "leg_right": { "rotation": { - "0.0": ["-15+math.clamp(math.sin(q.anim_time*90*2.5+225)*35,-90,0)", 35, 0], - "0.3333": ["-15+math.clamp(math.sin(q.anim_time*90*2.5+225)*35,-90,0)", 35, 0], + "0.0": [-65, 35, 0], + "0.1667": { + "pre": [-75, 35, 0], + "post": [-75, 35, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-65, 35, 0], + "lerp_mode": "catmullrom" + }, "0.5": [-15, 35, 0], "1.3333": [-15, 35, 0], - "1.375": ["-15+math.clamp(math.sin(q.anim_time*90*2.5+225)*35,-90,0)", 35, 0] + "1.375": [-15, 35, 0], + "1.5833": [-65, 35, 0] }, "position": { - "0.0": [ - "math.clamp(math.sin(q.anim_time*90*2.5+225)*0.5,-90,0)", - "math.clamp(-math.sin(q.anim_time*90*2.5+225)*3.5,0,90)", - "math.clamp(math.sin(q.anim_time*90*2.5+225)*2,-90,0)" - ], + "0.0": [-0.37, 2.61, -1.49], + "0.0417": [-0.37, 2.61, -1.49], + "0.125": [-0.3, 2.13, -1.22], + "0.25": [-0.2, 1.42, -0.81], + "0.375": [-0.1, 0.71, -0.4], "0.5": [0, 0, 0], "1.3333": [0, 0, 0], - "1.375": [ - "math.clamp(math.sin(q.anim_time*90*2.5+225)*0.5,-90,0)", - "math.clamp(-math.sin(q.anim_time*90*2.5+225)*3.5,0,90)", - "math.clamp(math.sin(q.anim_time*90*2.5+225)*2,-90,0)" - ] + "1.375": [0, 0, 0], + "1.5833": [-0.37, 2.61, -1.49] } }, "leg_right2": { @@ -899,13 +910,13 @@ }, "body": { "position": { - "0.0": [0, -2, "-math.sin(q.anim_time*90*1)*0.15"], - "0.4583": [0, -2, "-math.sin(q.anim_time*90*1)*0.15"], - "0.5417": [0, "-2.2+math.sin(q.anim_time*90*40)*0.4", "-math.sin(q.anim_time*90*1)*0.15"], - "0.6667": [0, -2, "-math.sin(q.anim_time*90*1)*0.15"], - "1.25": [0, -2, "-math.sin(q.anim_time*90*1)*0.15"], - "1.3333": [0, "-2.2+math.sin(q.anim_time*90*40)*0.4", "-math.sin(q.anim_time*90*1)*0.15"], - "1.4583": [0, -2, "-math.sin(q.anim_time*90*1)*0.15"] + "0.0": [0, -1, "-math.sin(q.anim_time*90*1)*0.15"], + "0.4583": [0, -1, "-math.sin(q.anim_time*90*1)*0.15"], + "0.5": [0, -1.3, "-math.sin(q.anim_time*90*1)*0.15"], + "0.5417": [0, -1, "-math.sin(q.anim_time*90*1)*0.15"], + "1.25": [0, -1, "-math.sin(q.anim_time*90*1)*0.15"], + "1.2917": [0, -1.3, "-math.sin(q.anim_time*90*1)*0.15"], + "1.3333": [0, -1, "-math.sin(q.anim_time*90*1)*0.15"] } }, "torso": { @@ -1397,7 +1408,7 @@ } }, "animation.exeggutor_alolan.blink3": { - "animation_length": 0.16667, + "animation_length": 0.1667, "bones": { "eyelid_right3": { "position": { @@ -1415,25 +1426,6 @@ } } }, - "animation.exeggutor_alolan.new": { - "loop": true, - "bones": { - "body": { - "scale": 0.9 - }, - "neck11": { - "position": [0, -230, 0] - } - } - }, - "animation.exeggutor_alolan.new2": { - "loop": true, - "bones": { - "body": { - "scale": 1.2 - } - } - }, "animation.exeggutor_alolan.cry": { "animation_length": 1.5, "bones": { @@ -1472,27 +1464,15 @@ "mouth_closed": { "position": { "0.0": [0, 0, -0.1], - "0.25": { - "pre": [0, 0, -0.1], - "post": [0, 0, 0] - }, - "1.25": { - "pre": [0, 0, 0], - "post": [0, 0, -0.1] - } + "0.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]} } }, "mouth_open": { "position": { "0.0": [0, 0, 0.1], - "0.25": { - "pre": [0, 0, 0.1], - "post": [0, 0, 0] - }, - "1.25": { - "pre": [0, 0, 0], - "post": [0, 0, 0.1] - } + "0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]} } }, "head2": { @@ -1506,27 +1486,15 @@ "mouth_closed2": { "position": { "0.0": [0, 0, 0], - "0.25": { - "pre": [0, 0, 0], - "post": [0, 0, 0.2] - }, - "1.25": { - "pre": [0, 0, 0.2], - "post": [0, 0, 0] - } + "0.25": {"pre": [0, 0, 0], "post": [0, 0, 0.2]}, + "1.25": {"pre": [0, 0, 0.2], "post": [0, 0, 0]} } }, "mouth_open2": { "position": { "0.0": [0, 0, 0], - "0.25": { - "pre": [0, 0, 0], - "post": [0, 0, -0.1] - }, - "1.25": { - "pre": [0, 0, -0.1], - "post": [0, 0, 0] - } + "0.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}, + "1.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]} } }, "head3": { @@ -1540,27 +1508,15 @@ "mouth_closed3": { "position": { "0.0": [0, 0, -0.1], - "0.25": { - "pre": [0, 0, -0.1], - "post": [0, 0, 0] - }, - "1.25": { - "pre": [0, 0, 0], - "post": [0, 0, -0.1] - } + "0.25": {"pre": [0, 0, -0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, -0.1]} } }, "mouth_open3": { "position": { "0.0": [0, 0, 0.1], - "0.25": { - "pre": [0, 0, 0.1], - "post": [0, 0, 0] - }, - "1.25": { - "pre": [0, 0, 0], - "post": [0, 0, 0.1] - } + "0.25": {"pre": [0, 0, 0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, 0.1]} } }, "neck": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor_alolan.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor_alolan.geo.json index 1b3e186410..d79b3e9612 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor_alolan.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0103_exeggutor/exeggutor_alolan.geo.json @@ -12,15 +12,12 @@ }, "bones": [ { - "name": "exeggutor", - "pivot": [0, 0, 0], - "locators": { - "shiny_particles": [0, 40, 0] - } + "name": "exeggutor_alolan", + "pivot": [0, 0, 0] }, { "name": "body", - "parent": "exeggutor", + "parent": "exeggutor_alolan", "pivot": [0, -1, 0] }, { @@ -154,701 +151,701 @@ "parent": "torso", "pivot": [0, 49, 0], "cubes": [ - {"origin": [-4.5, 46, -4.5], "size": [9, 25, 9], "inflate": 0.02, "uv": [47, 145]} + {"origin": [-4.5, 46, -4.5], "size": [9, 12, 9], "inflate": 0.02, "uv": [47, 145]} ] }, { "name": "neck2", "parent": "neck", - "pivot": [0, 69.5, 0], + "pivot": [0, 57.5, 0], "cubes": [ - {"origin": [-4.5, 69, -4.5], "size": [9, 22, 9], "uv": [27, 179]} + {"origin": [-4.5, 57, -4.5], "size": [9, 9, 9], "uv": [27, 179]} ] }, { "name": "neck3", "parent": "neck2", - "pivot": [0, 89.5, 0], + "pivot": [0, 65.5, 0], "cubes": [ - {"origin": [-4.5, 89, -4.5], "size": [9, 22, 9], "inflate": 0.02, "uv": [0, 154]} + {"origin": [-4.5, 65, -4.5], "size": [9, 9, 9], "inflate": 0.02, "uv": [0, 154]} ] }, { "name": "neck4", "parent": "neck3", - "pivot": [0, 109.5, 0], + "pivot": [0, 73.5, 0], "cubes": [ - {"origin": [-4.5, 109, -4.5], "size": [9, 22, 9], "uv": [175, 116]} + {"origin": [-4.5, 73, -4.5], "size": [9, 9, 9], "uv": [175, 116]} ] }, { "name": "neck5", "parent": "neck4", - "pivot": [0, 129.5, 0], + "pivot": [0, 81.5, 0], "cubes": [ - {"origin": [-4.5, 129, -4.5], "size": [9, 22, 9], "inflate": 0.02, "uv": [119, 173]} + {"origin": [-4.5, 81, -4.5], "size": [9, 9, 9], "inflate": 0.02, "uv": [119, 173]} ] }, { "name": "neck6", "parent": "neck5", - "pivot": [0, 149.5, 0], + "pivot": [0, 89.5, 0], "cubes": [ - {"origin": [-4.5, 149, -4.5], "size": [9, 22, 9], "uv": [171, 85]} + {"origin": [-4.5, 89, -4.5], "size": [9, 9, 9], "uv": [171, 85]} ] }, { "name": "neck7", "parent": "neck6", - "pivot": [0, 171, 0], + "pivot": [0, 97.5, 0], "cubes": [ - {"origin": [-4.5, 169, -4.5], "size": [9, 22, 9], "inflate": 0.02, "uv": [166, 164]} + {"origin": [-4.5, 97, -4.5], "size": [9, 9, 9], "inflate": 0.02, "uv": [166, 164]} ] }, { "name": "neck8", "parent": "neck7", - "pivot": [0, 189.5, 0], + "pivot": [0, 105.5, 0], "cubes": [ - {"origin": [-4.5, 189, -4.5], "size": [9, 22, 9], "uv": [160, 0]} + {"origin": [-4.5, 105, -4.5], "size": [9, 9, 9], "uv": [160, 0]} ] }, { "name": "neck9", "parent": "neck8", - "pivot": [0, 209.5, 0], + "pivot": [0, 113.5, 0], "cubes": [ - {"origin": [-4.5, 209, -4.5], "size": [9, 22, 9], "inflate": 0.02, "uv": [83, 154]} + {"origin": [-4.5, 113, -4.5], "size": [9, 9, 9], "inflate": 0.02, "uv": [83, 154]} ] }, { "name": "neck10", "parent": "neck9", - "pivot": [0, 229.5, 0], + "pivot": [0, 121.5, 0], "cubes": [ - {"origin": [-4.5, 229, -4.5], "size": [9, 31, 9], "uv": [139, 133]} + {"origin": [-4.5, 121, -4.5], "size": [9, 18, 9], "uv": [139, 133]} ] }, { "name": "neck11", "parent": "neck10", - "pivot": [0, 261.5, 0], + "pivot": [0, 140.5, 0], "cubes": [ - {"origin": [-9, 258, -9], "size": [18, 25, 18], "uv": [0, 52]} + {"origin": [-9, 137, -9], "size": [18, 25, 18], "uv": [0, 52]} ] }, { "name": "upperHead", "parent": "neck11", - "pivot": [0, 212.5, 0] + "pivot": [0, 91.5, 0] }, { "name": "head", "parent": "upperHead", - "pivot": [0, 272, -8.5], + "pivot": [0, 151, -8.5], "rotation": [-7.5, 0, 0], "cubes": [ - {"origin": [-7.5, 265, -23.5], "size": [15, 19, 15], "uv": [111, 99]} + {"origin": [-7.5, 144, -23.5], "size": [15, 19, 15], "uv": [111, 99]} ] }, { "name": "mouth_closed", "parent": "head", - "pivot": [0, 262.25, -5.7], + "pivot": [0, 141.25, -5.7], "cubes": [ - {"origin": [-7.5, 267, -23.45], "size": [15, 6, 0], "inflate": 0.02, "uv": [159, 34]} + {"origin": [-7.5, 146, -23.45], "size": [15, 6, 0], "inflate": 0.02, "uv": [159, 34]} ] }, { "name": "mouth_open", "parent": "head", - "pivot": [0, 267.5, -23.53], + "pivot": [0, 146.5, -23.53], "cubes": [ - {"origin": [-7, 266, -23.51], "size": [14, 7, 0], "inflate": 0.02, "uv": [216, 0]} + {"origin": [-7, 145, -23.51], "size": [14, 7, 0], "inflate": 0.02, "uv": [216, 0]} ] }, { "name": "eye_right", "parent": "head", - "pivot": [-5.03, 275.75, -22.03], + "pivot": [-5.03, 154.75, -22.03], "cubes": [ - {"origin": [-6.51, 273.75, -23.51], "size": [5, 8, 0], "inflate": 0.02, "uv": [100, 122]} + {"origin": [-6.51, 152.75, -23.51], "size": [5, 8, 0], "inflate": 0.02, "uv": [100, 122]} ] }, { "name": "eyelid_right", "parent": "eye_right", - "pivot": [-4.95, 277.25, -22.95], + "pivot": [-4.95, 156.25, -22.95], "cubes": [ - {"origin": [-6.95, 273.75, -23.45], "size": [6, 8, 1], "inflate": 0.04, "uv": [180, 52]} + {"origin": [-6.95, 152.75, -23.45], "size": [6, 8, 1], "inflate": 0.04, "uv": [180, 52]} ] }, { "name": "eye_left", "parent": "head", - "pivot": [5.03, 275.75, -22.03], + "pivot": [5.03, 154.75, -22.03], "cubes": [ - {"origin": [1.51, 273.75, -23.51], "size": [5, 8, 0], "inflate": 0.02, "uv": [100, 114]} + {"origin": [1.51, 152.75, -23.51], "size": [5, 8, 0], "inflate": 0.02, "uv": [100, 114]} ] }, { "name": "eyelid_left", "parent": "eye_left", - "pivot": [4.95, 277.25, -22.95], + "pivot": [4.95, 156.25, -22.95], "cubes": [ - {"origin": [0.95, 273.75, -23.45], "size": [6, 8, 1], "inflate": 0.04, "uv": [146, 173]} + {"origin": [0.95, 152.75, -23.45], "size": [6, 8, 1], "inflate": 0.04, "uv": [146, 173]} ] }, { "name": "head2", "parent": "upperHead", - "pivot": [9, 271, -4], + "pivot": [9, 150, -4], "rotation": [-7.5, -60, 0], "cubes": [ - {"origin": [1.5, 264, -19], "size": [15, 19, 15], "uv": [100, 0]} + {"origin": [1.5, 143, -19], "size": [15, 19, 15], "uv": [100, 0]} ] }, { "name": "mouth_closed2", "parent": "head2", - "pivot": [9, 260.25, -1], + "pivot": [9, 139.25, -1], "cubes": [ - {"origin": [2, 266.5, -19.05], "size": [14, 6, 0], "inflate": 0.02, "uv": [54, 179]} + {"origin": [2, 145.5, -19.05], "size": [14, 6, 0], "inflate": 0.02, "uv": [54, 179]} ] }, { "name": "mouth_open2", "parent": "head2", - "pivot": [9, 267.75, -18.93], + "pivot": [9, 146.75, -18.93], "cubes": [ - {"origin": [3.5, 266.5, -18.91], "size": [11, 6, 0], "inflate": 0.02, "uv": [120, 63]} + {"origin": [3.5, 145.5, -18.91], "size": [11, 6, 0], "inflate": 0.02, "uv": [120, 63]} ] }, { "name": "eye_right2", "parent": "head2", - "pivot": [3.97, 273, -17.53], + "pivot": [3.97, 152, -17.53], "cubes": [ - {"origin": [2.45, 274, -19.01], "size": [5, 4, 0], "inflate": 0.02, "uv": [14, 95]} + {"origin": [2.45, 153, -19.01], "size": [5, 4, 0], "inflate": 0.02, "uv": [14, 95]} ] }, { "name": "eyelid_right2", "parent": "eye_right2", - "pivot": [4.07, 273, -17.43], + "pivot": [4.07, 152, -17.43], "cubes": [ - {"origin": [2.05, 274, -18.95], "size": [6, 4, 1], "inflate": 0.04, "uv": [120, 69]} + {"origin": [2.05, 153, -18.95], "size": [6, 4, 1], "inflate": 0.04, "uv": [120, 69]} ] }, { "name": "eye_left2", "parent": "head2", - "pivot": [14.03, 273, -17.53], + "pivot": [14.03, 152, -17.53], "cubes": [ - {"origin": [10.55, 274, -19.01], "size": [5, 4, 0], "inflate": 0.02, "uv": [54, 66]} + {"origin": [10.55, 153, -19.01], "size": [5, 4, 0], "inflate": 0.02, "uv": [54, 66]} ] }, { "name": "eyelid_left2", "parent": "eye_left2", - "pivot": [13.93, 273, -17.43], + "pivot": [13.93, 152, -17.43], "cubes": [ - {"origin": [9.95, 274, -18.95], "size": [6, 4, 1], "inflate": 0.04, "uv": [76, 61]} + {"origin": [9.95, 153, -18.95], "size": [6, 4, 1], "inflate": 0.04, "uv": [76, 61]} ] }, { "name": "head3", "parent": "upperHead", - "pivot": [-9, 271, -4], + "pivot": [-9, 150, -4], "rotation": [-7.5, 60, 0], "cubes": [ - {"origin": [-16.5, 264, -19], "size": [15, 19, 15], "uv": [0, 99]} + {"origin": [-16.5, 143, -19], "size": [15, 19, 15], "uv": [0, 99]} ] }, { "name": "mouth_closed3", "parent": "head3", - "pivot": [-9, 261.25, -1.2], + "pivot": [-9, 140.25, -1.2], "cubes": [ - {"origin": [-16.5, 267, -18.95], "size": [15, 6, 0], "inflate": 0.02, "uv": [100, 39]} + {"origin": [-16.5, 146, -18.95], "size": [15, 6, 0], "inflate": 0.02, "uv": [100, 39]} ] }, { "name": "mouth_open3", "parent": "head3", - "pivot": [-9, 267.5, -19.03], + "pivot": [-9, 146.5, -19.03], "cubes": [ - {"origin": [-16, 266, -19.01], "size": [14, 7, 0], "inflate": 0.02, "uv": [176, 77]} + {"origin": [-16, 145, -19.01], "size": [14, 7, 0], "inflate": 0.02, "uv": [176, 77]} ] }, { "name": "eye_left3", "parent": "head3", - "pivot": [-3.97, 274.75, -17.53], + "pivot": [-3.97, 153.75, -17.53], "cubes": [ - {"origin": [-7.45, 273.25, -19.01], "size": [5, 5, 0], "inflate": 0.02, "uv": [122, 94]} + {"origin": [-7.45, 152.25, -19.01], "size": [5, 5, 0], "inflate": 0.02, "uv": [122, 94]} ] }, { "name": "eyelid_left3", "parent": "eye_left3", - "pivot": [-4.07, 274.75, -17.43], + "pivot": [-4.07, 153.75, -17.43], "cubes": [ - {"origin": [-8.05, 273.25, -18.91], "size": [6, 5, 1], "inflate": 0.04, "uv": [100, 45]} + {"origin": [-8.05, 152.25, -18.91], "size": [6, 5, 1], "inflate": 0.04, "uv": [100, 45]} ] }, { "name": "eye_right3", "parent": "head3", - "pivot": [-14.03, 274.75, -17.53], + "pivot": [-14.03, 153.75, -17.53], "cubes": [ - {"origin": [-15.51, 273.25, -19.01], "size": [5, 5, 0], "inflate": 0.02, "uv": [122, 34]} + {"origin": [-15.51, 152.25, -19.01], "size": [5, 5, 0], "inflate": 0.02, "uv": [122, 34]} ] }, { "name": "eyelid_right3", "parent": "eye_right3", - "pivot": [-13.91, 274.75, -17.41], + "pivot": [-13.91, 153.75, -17.41], "cubes": [ - {"origin": [-15.91, 273.25, -18.91], "size": [6, 5, 1], "inflate": 0.04, "uv": [95, 9]} + {"origin": [-15.91, 152.25, -18.91], "size": [6, 5, 1], "inflate": 0.04, "uv": [95, 9]} ] }, { "name": "leaves_inner", "parent": "upperHead", - "pivot": [0, 278.5, -1.5], + "pivot": [0, 157.5, -1.5], "rotation": [0, 180, 0] }, { "name": "leaf_set11", "parent": "leaves_inner", - "pivot": [0, 281.5, 0.5] + "pivot": [0, 160.5, 0.5] }, { "name": "leaf31", "parent": "leaf_set11", - "pivot": [0, 281.5, -2.5], + "pivot": [0, 160.5, -2.5], "rotation": [30, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [207, 102]} + {"origin": [-5, 161.5, -2.5], "size": [10, 16, 0], "uv": [207, 102]} ] }, { "name": "leaf32", "parent": "leaf31", - "pivot": [0, 298.5, -2.5], + "pivot": [0, 177.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [155, 195]} + {"origin": [-5, 177.5, -2.5], "size": [10, 25, 0], "uv": [155, 195]} ] }, { "name": "leaf33", "parent": "leaf32", - "pivot": [0, 323.5, -2.5], + "pivot": [0, 202.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [0, 133]} + {"origin": [-3.5, 202.5, -2.5], "size": [7, 16, 0], "uv": [0, 133]} ] }, { "name": "leaf_set10", "parent": "leaves_inner", - "pivot": [0, 281.5, -1.5], + "pivot": [0, 160.5, -1.5], "rotation": [0, 144, 0] }, { "name": "leaf28", "parent": "leaf_set10", - "pivot": [0, 281.5, -2.5], + "pivot": [0, 160.5, -2.5], "rotation": [22.5, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [80, 114]} + {"origin": [-5, 161.5, -2.5], "size": [10, 16, 0], "uv": [80, 114]} ] }, { "name": "leaf29", "parent": "leaf28", - "pivot": [0, 298.5, -2.5], + "pivot": [0, 177.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [75, 0]} + {"origin": [-5, 177.5, -2.5], "size": [10, 25, 0], "uv": [75, 0]} ] }, { "name": "leaf30", "parent": "leaf29", - "pivot": [0, 323.5, -2.5], + "pivot": [0, 202.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [0, 52]} + {"origin": [-3.5, 202.5, -2.5], "size": [7, 16, 0], "uv": [0, 52]} ] }, { "name": "leaf_set12", "parent": "leaves_inner", - "pivot": [0, 281.5, -1.5], + "pivot": [0, 160.5, -1.5], "rotation": [0, -72, 0] }, { "name": "leaf34", "parent": "leaf_set12", - "pivot": [0, 281.5, -2.5], + "pivot": [0, 160.5, -2.5], "rotation": [25, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [156, 67]} + {"origin": [-5, 161.5, -2.5], "size": [10, 16, 0], "uv": [156, 67]} ] }, { "name": "leaf35", "parent": "leaf34", - "pivot": [0, 298.5, -2.5], + "pivot": [0, 177.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [193, 147]} + {"origin": [-5, 177.5, -2.5], "size": [10, 25, 0], "uv": [193, 147]} ] }, { "name": "leaf36", "parent": "leaf35", - "pivot": [0, 323.5, -2.5], + "pivot": [0, 202.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [108, 87]} + {"origin": [-3.5, 202.5, -2.5], "size": [7, 16, 0], "uv": [108, 87]} ] }, { "name": "leaf_set13", "parent": "leaves_inner", - "pivot": [0, 281.5, -1.5], + "pivot": [0, 160.5, -1.5], "rotation": [0, -144, 0] }, { "name": "leaf37", "parent": "leaf_set13", - "pivot": [0, 281.5, -2.5], + "pivot": [0, 160.5, -2.5], "rotation": [22.5, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [119, 154]} + {"origin": [-5, 161.5, -2.5], "size": [10, 16, 0], "uv": [119, 154]} ] }, { "name": "leaf38", "parent": "leaf37", - "pivot": [0, 298.5, -2.5], + "pivot": [0, 177.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [0, 185]} + {"origin": [-5, 177.5, -2.5], "size": [10, 25, 0], "uv": [0, 185]} ] }, { "name": "leaf39", "parent": "leaf38", - "pivot": [0, 323.5, -2.5], + "pivot": [0, 202.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [0, 95]} + {"origin": [-3.5, 202.5, -2.5], "size": [7, 16, 0], "uv": [0, 95]} ] }, { "name": "leaf_set9", "parent": "leaves_inner", - "pivot": [0, 281.5, -1.5], + "pivot": [0, 160.5, -1.5], "rotation": [0, 72, 0] }, { "name": "leaf25", "parent": "leaf_set9", - "pivot": [0, 281.5, -2.5], + "pivot": [0, 160.5, -2.5], "rotation": [25, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -2.5], "size": [10, 16, 0], "uv": [0, 210]} + {"origin": [-5, 161.5, -2.5], "size": [10, 16, 0], "uv": [0, 210]} ] }, { "name": "leaf26", "parent": "leaf25", - "pivot": [0, 298.5, -2.5], + "pivot": [0, 177.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -2.5], "size": [10, 25, 0], "uv": [196, 0]} + {"origin": [-5, 177.5, -2.5], "size": [10, 25, 0], "uv": [196, 0]} ] }, { "name": "leaf27", "parent": "leaf26", - "pivot": [0, 323.5, -2.5], + "pivot": [0, 202.5, -2.5], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -2.5], "size": [7, 16, 0], "uv": [156, 94]} + {"origin": [-3.5, 202.5, -2.5], "size": [7, 16, 0], "uv": [156, 94]} ] }, { "name": "leaves_outer", "parent": "upperHead", - "pivot": [0, 215.5, -4.5] + "pivot": [0, 94.5, -4.5] }, { "name": "leaf_set", "parent": "leaves_outer", - "pivot": [0, 281.5, 0] + "pivot": [0, 160.5, 0] }, { "name": "leaf", "parent": "leaf_set", - "pivot": [0, 281.5, -6], + "pivot": [0, 160.5, -6], "rotation": [22.5, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [215, 205]} + {"origin": [-5, 161.5, -6], "size": [10, 16, 0], "uv": [215, 205]} ] }, { "name": "leaf2", "parent": "leaf", - "pivot": [0, 298.5, -6], + "pivot": [0, 177.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [207, 77]} + {"origin": [-5, 177.5, -6], "size": [10, 25, 0], "uv": [207, 77]} ] }, { "name": "leaf3", "parent": "leaf2", - "pivot": [0, 323.5, -6], + "pivot": [0, 202.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [0, 226]} + {"origin": [-3.5, 202.5, -6], "size": [7, 16, 0], "uv": [0, 226]} ] }, { "name": "leaf_set2", "parent": "leaves_outer", - "pivot": [0, 281.5, 0], + "pivot": [0, 160.5, 0], "rotation": [0, 45, 0] }, { "name": "leaf4", "parent": "leaf_set2", - "pivot": [0, 281.5, -6], + "pivot": [0, 160.5, -6], "rotation": [30, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [213, 166]} + {"origin": [-5, 161.5, -6], "size": [10, 16, 0], "uv": [213, 166]} ] }, { "name": "leaf5", "parent": "leaf4", - "pivot": [0, 298.5, -6], + "pivot": [0, 177.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [83, 206]} + {"origin": [-5, 177.5, -6], "size": [10, 25, 0], "uv": [83, 206]} ] }, { "name": "leaf6", "parent": "leaf5", - "pivot": [0, 323.5, -6], + "pivot": [0, 202.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [215, 221]} + {"origin": [-3.5, 202.5, -6], "size": [7, 16, 0], "uv": [215, 221]} ] }, { "name": "leaf_set3", "parent": "leaves_outer", - "pivot": [0, 281.5, 0], + "pivot": [0, 160.5, 0], "rotation": [0, 90, 0] }, { "name": "leaf7", "parent": "leaf_set3", - "pivot": [0, 281.5, -6], + "pivot": [0, 160.5, -6], "rotation": [37.5, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [40, 210]} + {"origin": [-5, 161.5, -6], "size": [10, 16, 0], "uv": [40, 210]} ] }, { "name": "leaf8", "parent": "leaf7", - "pivot": [0, 298.5, -6], + "pivot": [0, 177.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [63, 206]} + {"origin": [-5, 177.5, -6], "size": [10, 25, 0], "uv": [63, 206]} ] }, { "name": "leaf9", "parent": "leaf8", - "pivot": [0, 323.5, -6], + "pivot": [0, 202.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [157, 220]} + {"origin": [-3.5, 202.5, -6], "size": [7, 16, 0], "uv": [157, 220]} ] }, { "name": "leaf_set4", "parent": "leaves_outer", - "pivot": [0, 281.5, 0], + "pivot": [0, 160.5, 0], "rotation": [0, 135, 0] }, { "name": "leaf10", "parent": "leaf_set4", - "pivot": [0, 281.5, -6], + "pivot": [0, 160.5, -6], "rotation": [35, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [213, 150]} + {"origin": [-5, 161.5, -6], "size": [10, 16, 0], "uv": [213, 150]} ] }, { "name": "leaf11", "parent": "leaf10", - "pivot": [0, 298.5, -6], + "pivot": [0, 177.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [195, 205]} + {"origin": [-5, 177.5, -6], "size": [10, 25, 0], "uv": [195, 205]} ] }, { "name": "leaf12", "parent": "leaf11", - "pivot": [0, 323.5, -6], + "pivot": [0, 202.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [143, 220]} + {"origin": [-3.5, 202.5, -6], "size": [7, 16, 0], "uv": [143, 220]} ] }, { "name": "leaf_set5", "parent": "leaves_outer", - "pivot": [0, 281.5, 0], + "pivot": [0, 160.5, 0], "rotation": [0, 180, 0] }, { "name": "leaf13", "parent": "leaf_set5", - "pivot": [0, 281.5, -6], + "pivot": [0, 160.5, -6], "rotation": [40, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [213, 134]} + {"origin": [-5, 161.5, -6], "size": [10, 16, 0], "uv": [213, 134]} ] }, { "name": "leaf14", "parent": "leaf13", - "pivot": [0, 298.5, -6], + "pivot": [0, 177.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [175, 205]} + {"origin": [-5, 177.5, -6], "size": [10, 25, 0], "uv": [175, 205]} ] }, { "name": "leaf15", "parent": "leaf14", - "pivot": [0, 323.5, -6], + "pivot": [0, 202.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [220, 41]} + {"origin": [-3.5, 202.5, -6], "size": [7, 16, 0], "uv": [220, 41]} ] }, { "name": "leaf_set6", "parent": "leaves_outer", - "pivot": [0, 281.5, 0], + "pivot": [0, 160.5, 0], "rotation": [0, -135, 0] }, { "name": "leaf16", "parent": "leaf_set6", - "pivot": [0, 281.5, -6], + "pivot": [0, 160.5, -6], "rotation": [35, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [211, 118]} + {"origin": [-5, 161.5, -6], "size": [10, 16, 0], "uv": [211, 118]} ] }, { "name": "leaf17", "parent": "leaf16", - "pivot": [0, 298.5, -6], + "pivot": [0, 177.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [123, 204]} + {"origin": [-5, 177.5, -6], "size": [10, 25, 0], "uv": [123, 204]} ] }, { "name": "leaf18", "parent": "leaf17", - "pivot": [0, 323.5, -6], + "pivot": [0, 202.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [216, 7]} + {"origin": [-3.5, 202.5, -6], "size": [7, 16, 0], "uv": [216, 7]} ] }, { "name": "leaf_set7", "parent": "leaves_outer", - "pivot": [0, 281.5, 0], + "pivot": [0, 160.5, 0], "rotation": [0, -90, 0] }, { "name": "leaf19", "parent": "leaf_set7", - "pivot": [0, 281.5, -6], + "pivot": [0, 160.5, -6], "rotation": [37.5, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [210, 25]} + {"origin": [-5, 161.5, -6], "size": [10, 16, 0], "uv": [210, 25]} ] }, { "name": "leaf20", "parent": "leaf19", - "pivot": [0, 298.5, -6], + "pivot": [0, 177.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [0, 0]} + {"origin": [-5, 177.5, -6], "size": [10, 25, 0], "uv": [0, 0]} ] }, { "name": "leaf21", "parent": "leaf20", - "pivot": [0, 323.5, -6], + "pivot": [0, 202.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [103, 185]} + {"origin": [-3.5, 202.5, -6], "size": [7, 16, 0], "uv": [103, 185]} ] }, { "name": "leaf_set8", "parent": "leaves_outer", - "pivot": [0, 281.5, 0], + "pivot": [0, 160.5, 0], "rotation": [0, -45, 0] }, { "name": "leaf22", "parent": "leaf_set8", - "pivot": [0, 281.5, -6], + "pivot": [0, 160.5, -6], "rotation": [30, 0, 0], "cubes": [ - {"origin": [-5, 282.5, -6], "size": [10, 16, 0], "uv": [20, 210]} + {"origin": [-5, 161.5, -6], "size": [10, 16, 0], "uv": [20, 210]} ] }, { "name": "leaf23", "parent": "leaf22", - "pivot": [0, 298.5, -6], + "pivot": [0, 177.5, -6], "rotation": [55, 0, 0], "cubes": [ - {"origin": [-5, 298.5, -6], "size": [10, 25, 0], "uv": [103, 204]} + {"origin": [-5, 177.5, -6], "size": [10, 25, 0], "uv": [103, 204]} ] }, { "name": "leaf24", "parent": "leaf23", - "pivot": [0, 323.5, -6], + "pivot": [0, 202.5, -6], "rotation": [42.5, 0, 0], "cubes": [ - {"origin": [-3.5, 323.5, -6], "size": [7, 16, 0], "uv": [175, 147]} + {"origin": [-3.5, 202.5, -6], "size": [7, 16, 0], "uv": [175, 147]} ] }, { From b5694b4e137b4a1112e621fa5cf41e8638a93f46 Mon Sep 17 00:00:00 2001 From: GenotypeXD-Dev Date: Sun, 19 Jan 2025 16:18:56 -0700 Subject: [PATCH 065/121] Palm tree texture fix --- .../0103_exeggutor/exeggutor_alolan.png | Bin 23561 -> 23689 bytes .../0103_exeggutor/exeggutor_alolan_shiny.png | Bin 23298 -> 23362 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan.png index 13422919b06955790c875b93fd7d95f0698f4abc..d0287cc022883d09ea80bfa03793d4af0abf9add 100644 GIT binary patch literal 23689 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 L)Kd5?ZxQ-`Y7+;^ literal 23561 zcmYIwWn5HU)bAO(8|iK-De3M;P^3Y+yK9D$4go3Y6qN2x1*E&AyFqHmx%0gDy}$cm zPJEcN&)IYKTI(NcqO~*>u`$Ro006*NR+7^O01*5T1fZe7cSi2ttpR`*P?nQ^@0)!Z z6clH?;I@8ptFO_=)XIKtxHiY@t~4AYp~lu^q|a>Jo@~VQ+2HM^BI8?uPf|5HEV_gO z(h+@}lyq+}h+k8#U?l6ksi;8z&Yza^{mo=?0a}|jIr|HddUUDfRC4R`NRY$n%IgG&9rVEaIea6Wi#!WKkv3_DNx2#zfOaXf$8a5raw!HtwiVC+ zoN$9}kKyid?`L$*Uy25%nG#?diH{bU|nGEgQ+A z8Rp6qMP5CTa+Xuy<6398-t3#+0hFu6xN%Ri1|DbsR-|72r33#=)YtG`&0 z8j5&Ns!_;QpR>`x}~5m z`lck8hyX`P`5o5Kz@Inu(vWFHnTOvECiE{6PAeO0$JLRs%}!w?^9!91@XaQeMhuPn zXLWyHlT!_ALpdfHBK$_SD&GFs?D^fae8R1au#YHo=`n@dLq$5ICOa^}lgH?4ZS#WD zDpV=W@ML)>pCpma{q-mfVExYc=436r7Pf#qBBwWYkw5`$1UG#^@-S?8;0pMi`Tl2AWKu zAL}B$!cRwAOB?RdeA;$tHF%;|EbZL9HbIVIQd&%^k=<8&YD=y57RX5{;P-LQ?8`wD@f|J-JB(6Aw=yihiqOUiYY(Mv4uhA{*#R zTZ5hV+}fwvH(}g4C>q)9w>q8^VU3lFR6+mr-y4_T;!yG|!A~uX1tUozu)sNi(SxBG_`y;mAS5q4nhNppcep&(t zqdi_gG7@BjiKA>E9wnsON`4S4hUO1+T2vk4Sx{$%KsPSTv_lT4C@Mq0bNuQU2y!MOE)l`uk1i?GNrX;tG-pftYoKLs z2+JlhB09|{enDY<=dgP%e32PRWkkO>u&yDPE#i+e_}>`pu@t%IfYe8AJ^jCLm=4;K z4gvo6C5S+c&6D*E-j!in#`^hLasb_OItpzKZLKm64p-4$? zku6|rD)ul>2kGm31l-#6+AnA-LxOE3jw97dpE}?XA&C$y7L$85{iluvf6~GTL1|!} zo3>zj9V)3lA(NGRlkjEH@D%%8?>J>)o5qDfxnXFdEF~~blSQXuKygCccPDLh#@qYT zpDzgi1^P$=$)-~hN-6-Es)O}*qyMVc8D9dT@nkjW=zPZ*TE&zfOa++kgIdm&Ez+{_ z!`D7aLe!+R5wy3;R3Rc6eYqq1g6dr>RLbw_C^v-)Eg%b5R~LdbGzWfvR>!+*eP5?6 z@@p~E(ka-JzT#(`O2x75+AFy6O|X2Z(Mp3J-p|+dIJiLZiR{9X#QJ4&Az`%s%1;YD z3lF|=<1+7Mz9-}FoUgJNJxDsNduBpDY9_Qk`rV0eP0eh>b57*2>S$Mvvn7^PA*$0k zs{GH{zqpnOQtt!E`di^In*w2QH4;te9GK&i>bE$VjR~hi)dnBA#tU8jcS1>^UAkW`3=GvOMER3gGLzyU2MH<86T#e=bymE-*wwLuUZJ-0&7~w>+ zp;|VYV&TElhEwG0JDM-SnMf4Le28lu#fV9A#+0+m8)Y=n;KjP0;D23D`ZKEnEll?4 zcr$4PZ-RXTO#_wR)Yp8Vqy*{|Bo&4~D)^E1O{{u0>L;p6o1;Y1w5+z%v~A-7v*M`h zFWT&arzmOOW0ooU#SY^xjX^prfv<08-twilSY&*=2Lh=8C&IccWxnTpYcK#&R<4gn za#<3u&30(wd@rs;a>(tCju*OnO;nc=KAwo2btyyNi99Sq8*)w+wJJumqCs$fDf!%` zbTRKD(yFA2;F9^}RA6|duKG++r$?p>_)#MJ8k(Nbu@0 z;82l|V#ZzKST)A=v>EJNOO@AV1Sf+Ia1Jx7W`(yS!{OrozMzfbxFP z=Zw(h2u?fnbd4t?^nyl70yhrAd~j_~Q#RSVRe(U!>(v%k!Kk+d(K#E)qIEtO0Un!B zfVN~jTG(6X{6x0>Zr$G#B?B}LWCuTx%<$hBKRU$p;30y(E21ksZmU6F7Dz#>&L@9= z;Q2*0ZENGQcp}+g)lO>@zk<|l#3A@#Z;88^VY zIsemPpd`Z6SU2v+Tjg$nPO0XcAJ5IVfRNm^XH*eJtb+SvuVxY@NK1K zgub#?6G3tPB|5gJnaKoZxfb(6ceVfZ3E`D2D_=VavKMjbBnQxe#T1^@n#3ET>ws-= zm?acz(W*cA;J(bN3z%qhe^odju-LE&BW$n~-?9oaMgXA4uaqrIHVV0)T|(F$g}y6Q zbCU7@!ULilf}@iJ3iqwF!S4rBifR6Ew0bf{r%`6k2YT#Pu22rq@npk`gG^H?{DC91 zZ2gSa{}%5`R1xhmljeAk=~>Puc_6SLkmYV3BYq^atTMU~tJ*(=vw3?q5gFW=A-S8$ zHZ`~F$)xBQ^>t!B3xuZq49b!W8pHFbq61O(HtVxr1hgSB&zT3BX}}N?$JXArDCo(= z#8@CGwFHpVl@F4>E_+5i!1%;bwq6&1~{3Y~z@f#(V9u!E&E$+Q&k&~zbYEQ4Q zU|OSgZ(Ki-$e8udWW}u2=L2co26_oSewp-Z1}IKBIvc+bV|Xz{WB^Pqnxu+kWsbH* zAZ3W*YC~0)aF{4JC7EyWuUohocDzmo-oD#ek5BtVQGrK2KnExZ0?I3fNXfeTp>md<3RQ$lClih@JQ(7b$<95(Ci4rYM63_07BV8H z1m^EV)P!VIJ(@QH-0bi>`kqpRUCoq2{KwG@EchP*G4T-$($P?2fKA zX4(ex7Z+>tMmPg=?=UX-$Y?KCQ{EXUOj@x-`f!Nq3r?QT8(*_p1vCBHeDDd*USOvH z1A(hRaDW7kMQU(bG&Br+p;S)x7$fQv;5kr&!o_BuGr;<$S8X)|DM_7<=b~wsoF-Iu zdxH+g#Vt74I956W?@_}%I&UHJEtT6=*+%#>`AVLwBcCyg@G4Qr7_Mcz3h0Ht zQ{XM%$2}Wat>x1}?`Z=O_N}ZK|Ga*qd|I%4GAN0&+eScG({U~1aHnVcY`ai)Ea!AP z@jyE{6j zIz}b`C*nQkmznliceR7=4PvYw(|I+m8_6sv+#FNI-1bh0qiqnYMJveRp3?C#b1Y!d z$m42k%EC5creyd>#3WJlKkxt$qyD%)ynfAkw-*j%K6I3rPj|W?1k{oPEOHg(D!f^osJ!nbHxjEUyagb}E6=;rj2sdI-l0Lg3jv~BG^?8Tp#+6$vbb;kNA@0`nM$cK+Dg>yHGFS|4E zp)^24znF1{H>0Vxu1hm}t&om%t(T0}5)3)QX^^7wvc{xFCi-wBGW|((JcKJec>Dzp z)8qd9kvHa4$W1F?Q9-5kb^OKpuh_eCp4{l(|53!3vx*a^@}|Ux_7K$I1wOeocUbzG zqbP5+r#zU6AR}5jD%+-Dy!FB=bw`OUoO-|im2T^Gh9Vh1u+uw8^&a|=mo6_1ax(?X z%o^PfCf3G1z#Ni1fdZR@mj&X$Eia-HlcBly_F)_JJc)$s8k(MA3LR~yt(hWDFw-pL zBHQjZ?8FZ7HKv>B+vgmom3^}yC$c7|g*$Sy=Z9t9z~^JrNJ~B*+pN+h7Yu{kQntVg z8rX|g+wkwbELVCAC+Cg&`P)~2vUQN_n1H;wf9~S0GE=^=<={IdB;m*oP7(amju+Lobd?2OEeH~FSV zF^A8_CaUxKhPYR->yY6$&8MA^XgD%IDlXIAD7^!hx|eQNKbE*|ccrSW=%juHP(tEB zw&X`0qls1I4zH1tIDu(3mrT$-fmHivAKc%aF=_EpTIN=LQ4T>`uA!wc(BFIl`DN!P z=pY=UkC;3f2tAZ=_g)rFqVs?NtrB3IHf{PthNd+yb5ACSbMQ9m+Zrr0I`Yi#<9T{+qwzH`)2c67pC;R^Kr#T^RC7dIO=bYn#@Bn^QXhfe*;e;!h8mN_O})*H;5WyfXIbaCqzw&Qr8T3jGY@L^`f;} znl&kECb4!iQX=5pc~`}9H+Gl%RJ?$??NS<9c*Kw(mH3Znkh@-|j-;Nd6ZFZKQ1WYio+ zXH`|uQ}rp=&dqhkt@Qas8_9za0e@L;a9gUjm~TG`oDFL5s-10mtu;jhp0QZgKp4Lm zLW0IgVzEA|3$&5S^C#r!AqZ`Lv>az+`DcN|x$gx4%I@Qrd+x_io)dNtoMj1pP9z$r ztJ%5k%Lv8y;xqfIR(Ze_NXbu9yIVg0M*6Gyd>gc>UE<>p_c;4|;er_^1c+q42al-; zHHuQWV`(i(>h9v20g6_wM3b@Ph9APK2)Q?D{qZ|t>U6u{g=LaX=jyZE=N{R?ye!~= z7mhtYwEXu&Btswnvd0u3EUb<l_qPhjicg2v>>nPyfc}(|F-_}Tkd-mP83MGIGrf# z^jX4jkhYTR?NHPU{!T#cSxP$ycX_kO_STeb#I-t~SKz4TZXBwF)qfL?No5CArNgBl!}3p?|) zP3xl7;%%P85nb3?R?E1l{@)>f zn1QkJJn$8y749u<$JgChr9HvZ@d)*s9xT(AZmB#?mt<91g7}XSD%t489~9q+#oPy4 zB+lzvVDKzdBh3D+l#cbAGLS$GsM1hs4}5|ruti4(P1@_lzVwY<4q{U0zsYsTs$O0_ zGa$VU2P(TUxe}0axch?E85Y%#s9uSNmz#j(bMRtPu0cpOO)&4{vA~NYN%bMmb9`wh zDKgFK5(^K~Dfu)HWSpq@U&b>vf$v}WLm^nDBcBg51Nc0SXyr@T*+M={*2{}l1z{t9 zB$RX)L;QAR_ZhLRa6Iv<3iZVEtHA0p*6(V`S6;T)Y)Se2B&OJbqApX%8|N7w9JYTp zNtKd+mYmo9W^AM;{(_|YO0Ywp%ExKTrLqc#zrtPpX|dhqNNIq0gw{5*iA^!gQ~kjR zSe;d0Z8>It^VoEz`rGRjxT?eHMY^F001|_49N^i5%0nFhpuayRf&i(ydQpb1n|POt z@dCD`Iwn;QQ8Dj+Vk$s?oo=bcf)@W3?ha@p_Fk+HHyx`X2-Z-Y5icvhsYxyj3jUA1 z?l)7ItGVM`xRz(5h*d-A*&xVr*z)AXMos)XUF)5rJm9~MJUGxq^D>pY(b|cCp6Q{t z)5q_t@TG}T2?`jKth)5@D0wr(Ic+}X{18LMmPm`KphKPw3cv3Mnl`>F2Slknldukx zb`$P=wVKAj@wvV{Ru_d+62g48-j5^`))sNjmrX|%3UpKuWG;nOpI)A?(8hgmkprTpEwgy8LA*zxc5uuuU=Y z89y+469%Ugt&NRsft`BEW$JPwNWJ8IL@@va%`Ysw+vQ`JQNPU%`P#j+6u~BR^R?ul ziSEDjr|%4cu#>qCIEw#zczyTHFgHm4Ez~Rtw{2U~Kqb72!o#%T>9^0*PZ}Nif5te3 zP!1Zyj{?jf_mr?*-<~ja_k1+da45cSLTM6P44k^j&?x1V$%SulMof?XY$+5pkwdFG zsXWHw@bxD9lI?aorLu+_>ll^gwn|U;Q^+RV@s8Rtgz)pRaOXaSGmlqugZxkPX7KLd&`+Z4uQ(NJ^s}_AdOnX zdiJVM#OO}_=CC#brNRiBc1pqzUXM7+n-O1#S6z1mcEsJ*)Av^md%Xp`RezynAIyBGwXmAwjR0Xq;#IwR6AGw z+WKbL8&|?wm@h@}6{XjbZuv%&5wX|&2p>@xiHLUw_0~Y$9 z;?fDbXIAnyMIssBdx3ISa>$BY(myS^P<{S&a z#h{sT49yI$;5Ec0NFYnX36@~kBIu!iX)mkhc0!lJ1Y}gkl}7wXxeqDryJn1D=eD^%C-_~|U6aJH-&I9j9f>zKNIKAFD z_t&!M*ft8zx}JB?{D?cNl#+j~0xX}+{LD+M2G^klrFP&l3BhH}kC-?cRVAEM0M0xv z%vST0ixnyU~uk?1%E7CvAtgmiyDQ zEAQ!4f>@Kti0r;eMt1y`G)-0S_Phg+nj@U~P3!UqTaO_xbcm`z^OYoT3-$cjGC zLg-|6%(!V89b{!cPy8=js^L4)ax;|~)sVs>>g!~wZ0g*z9o*4BPp2y@s_g9*P};PX~=du+OnU$p6;xo#^LB5 zB&mPwhu|wFJ_YL1u=}?zoaR0v>s^KlxBAYHt(0P$7mFYi@B^VVm-!01F4dM-Z1sb zGxsA_>Z%R|`d`&Mz`zpRoWiKw#NToQ;SeBF-eimruh&+^t|zs#awS*L$s`iii#cWK zRS9B=eqm)I;yKg~l3&g6M8$iQnE8KRfE>!uZ;^{l$sD@Khve519O+tF7!?OW)3|fl zD+r0%&{ap2Rj)(mMfj)er;1t9Tt&2T%Kf9%Fi6Rg7hN^~J~zcfJKZ4QtZ} zlhgU?6={iz0P!uX#bm8Vs3~a_+CzIurb4-fNFCyE=x?>jT5vSRvzc_Z-vR4q#kQR! z3b`*fw<;p1`Ym{QhenFH8TV?fs5ujOHLUCqFLU*+^w>pN6?oQW4SS zi?s-HlRYe4+V4VtVV3|;LX)g{W&U5*eqGM0tcNK7{yZhypH}Z* z1&k8^*Lkqs0ZZ>#O(6O&>OcIAy$GOziuJ&r-K@Ulxv%32@{>O#=36OU;cuQk#Q%n? zYREcSHL)r~zZP63cOl-1s}{l^QW}WR=7s}s9d)+z*9g105T!$>3)g6w*?E)7p-OyOqOZY+GL)*ex#Elp9TyP!h|C75*+O zv`c>?=xGMDu(rJwhY4uszQ&h2{K`pTz>nbTyQP>GS1uJ|d|13=Y$Q%ci0Rjz%P$lo zfH|E9mR%_xLxns0+#l1XgGo+{oYm|pjTtJW!}!=aA#%ibKb3KPN1Od{`cH6aIgm@s z1|Ap2=U({rOd!u@2|`8ORn`4tE`FHBr$$prO)IWfhHG05<>dU1)GujKSqpZj59mCC z`3?6dW;M<^YjFhlt@1PIde8eBl>TB}KRNA#BPT~Dtmd5S{~XHj`KBDHx*~S z<6Q$+)9N#eriN>u#)?xUJ|M;UCGk7j1cSBRy}(cJXNCR+_x4PCfol(L2+A2EZA3z0 z)*~Kb$~EvlMcjVPk=%byUu*X}QdL;~Zj>Hs?xMHSqM#`_2o>&wX~G78=^HOSBf}p| zJ7o5^peHD<_BX9|X*~pYK3eovCSfGHhD1Zu;!HyiVC(KMZG^5FuYtp*NEPURyE544 z_)Wz?;`gJMPUS**rs3YsBGFspkHZR;n&K~V{0y7Do&u*5mD{~Os1Yc6#8%zV z(=~A0KE>2=WcsS-jl-3LJzt=HoJeirJMK3bj^D8Xx#nZRx*`6yb|;(>%xWClDgB?1 z$!FyU^-~hgfh#3`-$JoMcpKn3x@EGJeC=WLF&k21pd?tHFgS{OprS?kYwtg3VK;*- zj6rOdxX`OE568WuO(yG=0xa{ig?R)$YXQ}VuI(>;njBUGRZCBB^yEKm3rCbFTi6-; zApZ1a-2jHiZ7VO?_A0Mx14(U~f)~aCR?uSstK2RD_S={q-YSTU7N3iUb9;SJ;_vIL zah)`?LKleiQ{}Eej{HDNB%>8lMT87l|UZ-m(s%}4$rp_T1r)Y|6GEW zn2;wnG<5y`22Yz@oRfMNrdtOLV+pmt`5OJG-5zYg%QDN!)r+|n;t8+xY7-1fYPy}xzC zV_-lDpXe$Ib=Z@*_Az9mM&2Ey^^2aDH9iCS6GeMUI++aP=DvQkh) zvcK7qpmXq2W-Aja?HDek+1OZ&ow=}*0-GFC^EkZ=37;P%f17>q6k+pXU}|`~JoN-7 zr*1F!w$c@+WFP>qsxxEw<0Th(X(atWqB0<^U%yOXT^pLe78pj&%@Xq4BId-QGvH+v zno@P*Aar${W%WesYZSB2+LO~f_Fc+PYDKWHHasjTvd-iKsR`d?<-Np5FIr|7p|Br( z_s3a)puW{5M)qQui=tUo|AI~lA7wvO^$c?N94pvAyq^~t558B-DOa$_Umr0y(x%G# zDe#L|kb$8pFzBw^+Ir8bc6vu}BbBYqLnhH~!6j-X#KIL`<>sU_uVGi`!n|5+KNWcN zGWopsGZhb+xSc+siG7XMtOC~p(UtH|8&2(D-0(cbV!8#l$L-%>rj<|gy6s_@h=!=c zm!C_U^Fxg7u)$YDup{$&_DXUIdy2IyN6|f&>?ul!G9Xwj4srbW+bQlp*AU!j3D+u^ z-yH7!ciZ=jmm)Nb^9yP9k^m$X+c(&;x6zj93h8GSl(NxhQPeYPzdS27ZLSY3|2Ra-O{`!ej5|x&;eVxT{n(njXH>QkBMFyJ0R^Xxq{++go4^WWs70@*Ie8`hYGhyAwgCf!tPMFT%C z?tLjRBFzMehvnCK#5Etgk|T?nkc#D;Di6zp&5|6z;q^#8>FUwO<`|ShZw{miy|n#S zdosH}qC+B;V&9>-ci)Qq)$Rm)CZo z=0Ro(UKYH0?{!Y+b0$-3Y|w8(W{eQNjE#^2tddX@7DKYqSUdFL56jrj?GAewLP}~8 z*y2W*QXcjQx&=o*93a2PsCfd+i^jL^2##OBc(;V_5bXZvywZ#8dD~#LYF7M4Kl)(o zR)!L5%$ORG+e(WPX)^Af>fwwB&J;Ie$g{1iNlL|LuxV(g&Hh-Y#MDiHp2VE;;7>W7 zRLN{%mD5Z+y8K%~>qPrS3*gIRabAf;-! zUi=Z~$!K^%7FQ}IodFbyrf-fGrhwRE>Z6<__m+sJ90~7_Q0z@77Jb8&$7wLu)J!9c z@bppi{l^}+`vJ+k4I~afK5btO&2M3~ubH(hcNp$Wu1!!9ZZjH7!O~xx*vgc(&kV2Iz{mA8<&14ux2Q=I za)Fa}WZqCU*}Na=X!2-J!Eno9^g8Ouq0inr!^4B9b$-rX>!0sjvVSsdctY?PZW)^) zM5V3SGftB{qLhl*DMp#$avJL3Y~jg7Vgto#{o<3j(6Gu@3+74Q$X6?XRIYf9SbHh2 zp4RLRx%GqL>OwvTQ=R`O=IMqRKmAKI`3BslU~-S&?x&(NF4KQ`Ql6D>fQ@*za3a#M z<_|^Kssrt?Vyi(~soT1$GAlm`z5u~3^CGunL zfy}+Uuh(XznJdMMs+mfclEdr=6h!_p2&cFj$sr`A0eT8dz@H?6y|}?jz8~Y~q&g** zTLb$ysh-nsFQW!ZmT%o>A5`0EOIG8H5o8&GaI%$*0Su!E z40g}5qox>qHdKisyy%ejuk?&}+7G?oZCSDNO;F@ z&l3qGNuF2v4Rz(H{3JWyGh-X6EY1@E$2Fb&?G8!BNMrBWe*M`O0l2apKJ}X;ME|Mf zzIIfYzWiQ9N330|>MB85tXlTFVjsmMB-Y5Rw;7!+wnoRaLBFzYiaZs{ch z87EEu05N*+MHUfIxp@A08jyMshiXH>qE(o1Cv}A4*=v{Ivwc7P=*H>O0AFfcS5?HF zS8mAEANY@AEOW|v9(ZW@lDUnYrbq&W+ znp~*^3l))s<&rcf7H-8W`2{0IHak%ukT{N|w~B3yHp44CoX|o-&_ZVM(x^=b=m^uS z3u-w8v-2+l+$JU~&}aaGYlp(2gk2muOp{=3G+}DYFLz_-n}O0ySW?rpky7$Kw z0&4P3)8VY*@0@+-(t@kTw^mg&fu9jR{Sl4{=3C3KL4lsotT{&yt)>KRr20mY;mXaCcRXY{eUZ5-Q!`*jek4P`M~?rv2U)7UCF z7`ISe7b0twS!7yKmJbysKvV~NNv|#LB1Qw{^ZhW=P7@LC$Ojy?w%nc?vXinG{nVs_ zO_nksMRCsNc=99T(UP|oI`MAb#n1WpNAwUGt=Ihp@vVJmfE>DiZCo9=K?s&cIj~|w z@h@x_RAvoo%QOkKk6c~F0fA7^L3oDLi8a;ns>(XnNac$R8h#U@m_p_~J}wow;tk)< zuuSVfK2z*2Ycf}0>KkQsC$yI>*|S1|$zaE&45rTnZ3?zYs)&&i7HLt1ogh2^`THU- zc{-fkma4a1wFLAP$do`67~HNAxbuC*GwmJHG}zBPerGu z&nKXM*ZN8R;T!wLQ4-*4q_nVqH^QK#T#Ni&PNhgA9z)0jR~@C+=@`NS(&JO18VQ+% z#PMRH$EaZ^DCX25yAiWDGgD+R0XDB7;OrlRE)V$tE!YvlI> z{B9iEfB$4v+1oDETEhz0tldMWYMPBDJAT2JR>1xRVzbZpqC{kM^Q+|#Pp1tIlaKj# zcPa?RcZSFQ6;Bj$?s#*=Ene1heDH*$)vNQ$C_2Ilkl55Q=Wf%{iiO(Chn}+h&z0cs z3^qykw)20T9JB*S{Ly1EqejFra^NNozS_Z}@I|zqumqwLKLi!gb4tQ^o}NGSvo=H4 zMwa=M0lX2qkNUQ7+jg>}m-TfOcTatVO=i@Oe)X6Q_+?KsUeY#jfEGnZ_S5WHt;iSV zCex?j>BZ?TV=TTN&&@2uHzNL1sT)f{^}J^SL#ttjjR#)eS?C4O6EWn_A%x&n`t0I2 zg-QIst==^k&{qsHu)dpN0XEQ(F0JxHMI9{eqX? zdE1!DriDm=vic-P)p9h8sH7GF+xrGj%p23K0bF?#!R;Ype|t!{? zgN2&|1OCZ%n6P8v7rjz5rW^`Q+H_0(R>x~#lq=dVd)(3cT-6CWI%q5(U?BV0A+)Baw7Q4BbJDxe5TiGoH!61C7`yl zSAtH`_iHBD7sfMKgyM!SRp9i>{jC?8gN&11esqlX`cvD7LVI=a&vkFLcGAagBzDe# zpW$ZFHwH8bSBt>gi}2|PLxS9|+48ZStk0;6vzu{xfe>26q@Ez8S#|2;V-!Cf zUuEgp9{+lWIET8y0|;4Z=M!B$qI*p{OE|=@t4b~4`D$qbR+^D%x2nqHGLIe))}Mxc zn*AsW?Zc9aLHmIXjKRLqI56i0FNP@QT!5bLh zzOU9sl&(+!`%scK>O@)mk_l8H^WXo~%Lcdlm1l52TzTD-AA!Wbi_Pc>@O4nm{J-T= zY%t<~;Y`2tTQ{eR$MyoF_`T}b%Iq*6xna1aw&Z-&#WhBhJRl*7=YnS{Hsh9560NXQNi9{9TvTGOD;~3Z zRM-Z-PRG7^kYl^Z7iHi-l%>WpLtkL%^(=FTSQact!sh&Po!T7yAEnHH7` zbshXTua@hcpe1ju1kW$7emW>Q{j?qM!Vey8Pwhb$SJ$a^B>m)cQJ9$rrE%$>xFhwo z#8SpMTBoUJp`ER==Li0gQG3)*Wv*2m69?v-z$SuG3~Y2aS2Tx|dA=X8c3$uOy>&$2 zNP858@?WX53J~1}?HnB(&$zuYI82SFER^U{DoEry3z)Xfz{;V;m29IR?|!@<>C; zuIWTCPJhiz8b3>!iHZR=_5~R-tahZHDIB+fzf> zjsgp~R|VKV<~Jj~fv23qK29RKgWz*CM_^}3@7?VFVOC?C3EioXnr5Yx#~@Z9#gmm( zT57M-QtIg<2GrdH?DC_Nkm_Jy4~K_`j3t^;j+A(Q3ii}tB2}~x>@c?#N)Q#vToYC4 zBvj*ZAh7AwCVU z<+9z`QXHmI^{uoWrzXv2U7i-BOX8G?+=w|Jxj>#25>}R0q<_0^p&W1?ETBh$eRFRfg5seCAca8zh!<;K9^3AiRyw&69T8jQ7an*0?!4phD_ zr5U8#k#HPyY!uAaL%0?`?6h|pkofBTN_LVIWnv`qG-+|Fi$-+Y;j}do;thV1a1nPk zzR1e+e~SJdAZuIR4{}E~WkvsyN^jJb;3Z~n3-5HCyk4w8OfrSMT`Yh5k}L?r0(QD%fV8c4p1=Yy_4gbNBAmaxxk$(w!p>#G=85-ByY_NnF35Jse}I z+8+6CfbsQBF-(_ACMM$>&EpC$KKNyr`$r*+=4FpzH`jXLQzti@2#-vFDO_iTUTFrm zZnb;%qOZa@T`IqhA0s#2Ff$uN@0ped={=D5>ct{Hpyq=E?eo4i=^6}+{U9e56Sma9 zW)NmvUy%BQpY>L6Mu)vIy6j1UG0%_OQ}*AF#2_4OxO>WLqRb66V8IIM6ruMyED{bcNrc|emD-h%w4A>NgRe;i=EnWL4T7QH5;Oh` z*wu38`;%+Lckk=7jgEp7Tlb647Uk|X zw`n+i9zAAizkUI5s9Q@AHwalc``?no`;+{&o$(iZ51-yiZI9(WqXSTM0Py8ILGT6D zZJ(L>V>i4^2*b}q_eS6iG^?|EB)`6XH2!(koHi=b`I{nYDZqsIXTYw3y&X+}zS6Rn z9ogJ*dn*6^_-B^ao&3#@D^Af!5Rjm)q&x>QK~V}?(-3tU-1;-V^QvAnt*H#F#{lI* z=u21}CanTeAv4~?rfzUDjvx358-<=CBEoiFzY>f5KRgW-ChsH9F2xu*}E6N=qX z$2-(E*=E6^bDOyVO2B;!yQ*Vkex~(D$oHuJV+1Il==!kA@z0W;QJLWC@@qHE^HNcW|Ms_JUYkzJKAq`SLc9)1|2 z3o|lh7iZTKIUD#HFMF#7HdAiH)hOY;$0CZr;>zAYOxG``{hfvHwX{~%r%6r)a5>5~ zAy+PN>O=g`U;h;yPNJMr({oHhH>DVgr^5XXbyu2v+Y#ZZ=_Zb+^c^5tgLraR2?lq^Mw!sbNuI!QLq8sNw zHZ}qqY-JL% zcY0UGHwJeg`2fH;N3+?W5g~j>E55p_mwckOQRxyG=AYPX>{a4nI?EPTtq3|1V3X7& z6qplWYq4g-e)d$$l6mG_0a!JT{+PqmX1+U!b0!@cWf!_%*F?a zWR3@~7(543O{4<^H3_*4ow5~wF@GWLjJD8xcS6@fg8QLW?Jz|5vH*aL0j*aBhb`h{ zs|~$UeJSU&my6VE#HuKaN*z0K$&a45)5*?BEsxqp!R0i$sbT(T(=fkp>2J^LvFkB) zDsX^fbJ}Pac@6kDCqXt8xo5^yhYer~A-%{k+amvPpV%GXrA(!3dpurfWxU54dqJmw zw?bVVvaYpE8?hckAfN&mp-M49&aQ^yfOOz5r4r1+%GabD(O)+tgb%=G#SVuAqYGX6 zjQoRTeb36{woJ-dIlB&!fW#CQWDXI?mxCj9oEg`XdRA1~S{XlE@D$Y5prw!hdoRK| zv+$;{S`~N?1wr{FLkT6sQA39LS{K(jSExsOiXy_c;zGDk@#GQmu_!De;`ji7qUFE; z1vtXc%)#fzzwzTu;J^}evf!YrgVTSszsu#6*8Bp0FK~dMCLHp#+$ltmqTj&7YmlwO zBNGGv2PK*fzXbu~YLPS3>aQTyZ+fY{g7zk{1(}jf;<%pnOhVD<{p!Y{&o4nGG(qcG zLYiM8l+(h?0aMq&a+B|m>QC~fOu+2Xd4_|(oF;mX0n+qLc`GH}SHBqXWl=%%qU4_( zKi_8jVwJguVhyY;ED!jK{Fb6$Tx6a9yAz!(r8K3uayt`N{rdU?LcU5TynBB?kwEwX zp}1@&pMEm-pNtRvbdD{4_u+jO1EGNO6s#I)XW}P!bsg_E72?qJE6oAA!N-x2#vXwv zz0Xq7dEXH5jikRf=4g}_p4_TNrm>i>L@Zy2{{F9(7N1ZbErB2SWJ3!?vcIG!q`9H0k^;Z;c*v4lm2|+rPE(wXHyFpqyBn5$`k?xS(rMpBL zDG6OlQdqh}8Wsekr4b2vm+yPt|KR;)&Uwz9Gv_%o^E@;6b$_nQ-@efP*_#kC^Jt6A zOq4et6q334i}Gm&*7xC(QT}DmEr~tuj)0ROPQNS2{gi8k zhJL`&?xLAVKU1;?Yv@-g?mR5D|1YuoY8ar+0zCHjer7R-nkIBsW>i}C7pZsVvO8t?W|U=0oa=NYwa z6aEEh82QlK{}IoT^YyWuN6FxRtm`rRo;ni;tc0sUonwu$+>;;(EA;pmX<%mXt^DtK z#^{@rWhXyrfg3GsFJ*u<#hNhm#j177jCtbXzCUQ{v@#6wYVJg2N%wu`P>IJ&R@zX7 z+eMi)IlaM~>y=~8b_~C|f)=Pl;iu-ma7WxImfCZW|F(9{ykVmqZF%sGop3&}dE9?b9?`AqE zLdDvYlO1wK4;MnWf|2Ge6hw_uc2E7dxJiWb*Gs>vj&I*Z+nQ;-FPfXWU6Xe%!Twg? zuit}l3ByZ&Vo?-v5_61sM)_z0anq7LRA zPV1AdoPUyv(H5*4Y=q=K;xU;p*SG_k@2Hlv`xNh|x9bv4Xulxej|Wy8Pl>;R7HnE{ znn$Ub)s)_R`EsHIk-ASKLaL?#xBu7Rz8i?D4=!Hb6r${4D)x1d1is}o`Ebc7 ztY%J|fv*PHVf(pTS;e?y`MWPRV}4A<=>--*WhG0nrQaK?bLft5bC2!WQkev9I!*B0HP0`f{X5H{?U`ztu!hYGzI77U*iN3iNiKwlI%l@J zKUpnK;W#O0k(oX}YXlF29C0jHUZEIXUPThvP~RHd+m}Ipg7N;;CQQ(6Scb_e?wj?( zpQ@)3w`OR(wq3WI_I}A+j?7bR(L4slsI|mF4I0Dvpe^HK_k4cgWo)u2Jj^%Y`#i1uA~q#y6T7Z< zvv$sPtNa#UTv;(ip+TAYBGV|gXH7Rz8hp}z6kMcbQTuln$=lO@lKt`5Y4H@+MY+O+ zyFY=QPQ7`$qJ$n1F-Wa&9!v2SaN1MR6d>_ga8(w8x zkYEa(w(pd+LmWsJ;?@i>gm54OkSL=K9Wfh47MTT|Ke8r*q>x573aphGsuc|-dQ|oE zW=&Npu+8IfZ6Ctj4P~7JsAf;3tWPn{Nm2o!WJcLDidTxdqb=w%!O%Nz3mOc$A(7ug z&tRE67d?mDGiAXY^tL#aqUB_}O{%p+$*@QC&Mj$ZPK*MmHYS(o52Kql``k(rJ8D#G zRP&1?d5!;#jcw!ZpR|FBwFd; zxgY5b%W`?EOh~T&Z0~ua^>!}u1!GcYm4*TLJIG-Pg(&tissXP4U^e^D?X~J7J-K_k zruFG8Tt4q8=nqNWgY(M<@kA!wV|lx<$!9m$VMF-&1qn)jRZ8!D-{&2(s76Heet9wK z;0Rqb1cz>Y2N03dWCaUtzcET>43ozA?LE8n``UEtXZl4OEdw47cm`kSy*E(z`#eWn8}|~Ie*9KP3XQX-m)B4Kk|aJl zL0T~E@1*@~>NW_l!~y_X(c>#roX>-1HJ+MkNN$0NwD2XXe$j!8Dr>r@=|XDkw97a+ zWzw%uoVNHMQj*!YroyjxFKMMruOw+6h|^CE1V0X20y}i|WBBaLUdY|r6sUlRi_}Bj z=PUj*iFKVY3l2J15mt;>>yXuuCmSy0NHPYYF0S-ky8xBrL21MrF3UjrquilL1XZ$W ziaYn9CetR{d_U3gF!;{Y6oamZryYes_pB(6FD5vWE!HgBQJib|ycY946c}ijudg%_ewB&0CUnD?7MdabQF*4}5SUpBpM-H4>@GqC@psz+zQ;dSA)5q!F_1tX~=lXSB*fzT!eV=Z{;CovF$5lJP!XH0tPEs$(DWh$PVRefSWE++~dv?5BMqv|7Bk{`_=)!wi#nQZG)70_rwf>%4 zNjOOaF5PvgG1zC{=s43YQ|i zVax>wqkAl#4HiI8EcpXddC?I%h<4>4IzON2O9OnXKGU$bSq&>YPq+H_&TwzOIdrjJ zkNgWpL&iAN<*?^qH^&&{J0-7rCE!DqNz6vVhO5EJweZ0@q1O=`#80@hZuq0|l?&zs zR{JmgKIjGb>Lw1y=rPrPGh}KUBE4&OMmV>V;vA6!6nLnPhRiGV@5O ztxqr%=yS+@hqZ~|k%etdaM{^{nO2!34Rgu-oaA;Fj?H~@oW%Slz=#W-+YcOJt>&WZ zWxK{liH+Oaj{P>jKUqK^JS2~@m^17j7Y#(OhbK6Gux~USw7Avobt-mUvJd;|Og5AsW3RGae`mHjhj2bB7Gu51(~2D~;PdjK=X z+7DaA-tCQAauX%j`JYfajXCf7;dx=F4(R(0F`~*8l8;xs%sG=6O#*JpAgDgNvOzEoKL=8}3 zH^XErR7F(sORnGv+6I!gG>NUZpy|5V#Fu)){<0Mr+X|i%|$_|9YA`W65>rq2k!U z=r6X{9y1B`K=3_aw-ll+t*(ZP* zc3DYHv^a_*P~laUa}8(a&lZ0_Fa#SM>%1xhROA{8IpMwb7=QE5bz_m7PXWJRKGlI7 z@{AA(g~{r&=eR`5eU6YQutJta=5ZbMViIIM^8SBr5I^Ik$XJko<)T=x0GR9i+*Z#2Vg1OSXoAM z!bMPM|CPJawO*ex$X22+?$6bEe|~NjO8A1R;Ed(x{)FZF_|%!vtoQKKgp!hk=Dex< zpbA>XCG1JJCRMRwekQ-nQx*4jpeOqIL%>yIm5a^3QseisJQQ~#+J%Z8WT0ElgL2-1b*QTBW%Zz z&Pi}J{|S>EzFgh^E#(Oqb~4b1buQ>Qwzwt3gHgn>b5FfujaqTf1piL2?Gqf@Ia z{%^^_P6htq1muY+r&#E9o-OlL*y z+SKf_{?b?Zef2wrT1$+xvB4|TB?hvtKz6vEA=c|>@cezK5-MZ3op)T3_4Wm#*J! z&IK(5iu`*#J(!l&7Qw0rsj0*N~b~#XyJVu>13H=c|<;WIVD@edkVBZnjUTal;wXT8V0L z-uAwxj*h*1`Vwm(2v4ry-=nGF%^)Kk?Aot2t`{W3CoIo7Zk>rtM@C%mJCeLu%M$tS zE^wvll_O}U39@ro@DEYHc$!Y)qdGF3B$pID%DZn>^FjA#rA>Vp4S#eoC0OWLT%dLK zEjBlqq?C&<%bejJrTY=oX>vgiHpc{k9ro`NR{`*Ze4huw80EraeJ0}>Iw33fh`IKY zD)S=NFjxpZQXsrgp(j6*A8nD2OuBSIU#y8@qMnd{LHUsR4#><^sc#hnf)!M8B+Pg5UOOD4wPfNX{UZm3HZdjOS!S{h z#QGep{%XP_U=jzypEt|xnXvgmN$^C6D&#j~98X3vTAH29>(0X3W`kWXg&oLTlWFijF+VXm@d>k6UnF$tzAKaNC^tC@`X<1?T`%PV=yBcw*O$N0PDfpEm ze?y;d>AM1UG*PDB4(lwFxZuyKdSd{5;lpg?5OV-z$G`rt!Gk4v$qM6^dh;^HT4i8N zQ`XLVNT$Rnj<^{!jE{0G4mR@ZwvA7nzGUrR$8&`7L>TFvG4aXeAU?#LkfKyH+U zCModNZ%OPD1k9A9%OG-iVeV~}3aqN|l&i6ZD?Rnh+d09A*(7RH>U3MGwvhN;)eg*C zDFN1jY?FhaXsrh27m}?4VTi_!BuWdOIL~=4JoF?)e&u-mImo7=%;wG7wPP4PAlDi4xe15_9kj3vobo zDq=qTrOWO^bO_?CS_}{lq_nW!aMeg;ZrH%pl9=rfrQ!4?u#i)N#z@^w=!lUy+wdYw6(xOf>@en^XgePkd8L= z@p%}(#;5>Cx|&)9;Ra{7@`;W>CE#f0#=& zO*Wb31GyBZBxJx2J~#wSW6>W4n-1Nv6m8Mv1<1WlU|GJGS;SQNo*h#*nXz~p&=W>& zEwn}4w`WCLOpu-n)=u0LU~m|ctf09w&}pUYi!Oj!R*ajfKw_`LaaS_9Kw8xGq+~iP zf6=aqSipukq776Mwyd*zERpocLt7}aE&i=g+E^l4c13qu?FLwh)}^ove756Ht7!I= z55H^0Uqin1P2Tl{Rvt#zlIoH64L5Q5jJ0C+Pv@IR!#09Y62-V~jiu|s5Q@WB`%H}* z2MwQ%dGuHQuP4pMdmr!NPG_31L*8?qOsJhf7=A@TTX9!*%;fZ>&XexI~ z##db>Wzbz?$frs}^?f=D^IXbRrJ(@VWcE0&p64%{#m7Zk9bdcUt@CD;DxWm`2tNAe z-65a%CP}M80az0snXo~}lurCpSjfR*8BE8goAd%JML#SjHFRAKMiEQ^N7AGf`1!<`ghv+VCsvD)SN@jG&~ua|Y|YO~Q7> z;bo(dLFdtw2DZCiuax)H(_`3bp4`&f{w%t~7cb8mBQr0|!pJDrss&?X;d6t40fC64 zYNYxaSuHwcvGB3+A~Eu_B{O;0<0Y&TzPf54+#L-K$dW)wED3NWS;a^L;W}|z>m7Qc zuZjpoc^Li%H-gfQ^N|(Gb{q52MDiN*P0UtqV^1Y-dxtD-7$YAf&t_WK_=eja5Bk-LCFc(IR v;-r+l*Ba0AyDOhr$32|>e>m)Q-#_A9)#dd{BUVF2d;={uox2!1u02TTB%l=Sy#~U;;4Qpp=YIMcKl1_Y5IE- zb3f7PIVpO$CVXwPLH_g#`qP!&&h2S?0EWC88Up}#W6pIjfU@f6-+epSB?*ox%JUS) zMlb+qlElv)5!m`dy80JLAyq1KSQZ3;`}06^yWi23PkVbb0PsyLm`EkhfaGa`JNGZj zH387T5sC!>WwswXgMZ|^8Xl@l8bPs#1j1DfL?pAJZFfjb`DU=y_3g%>V?Y6?D?dxY zi8Y=Zcz=F9n-Hd+UyZy3z0U2}FLBKK#gyZ#N(<#f0}@o4Si$q@M)wcs{7NN#!G_P!;j;GblXdRjpuY&Rzmc_QwH zTtHP4LG0I%70HF&<4X5KAk^-J&>DJ*CMfARn;FOkXfLB46F5Y9}yys7Z?O06DrK|!iST?G5`5uf$nn>H_W9@)nj*Y;BMPg327{Gm9h zwzR?@x72XDV^;0PtHy&TYX}3^l(OgzB`CxieS!hw>@rxe~pgWzu+ZR|E70 zWeESUcv)viD-ffar5iCyJ0V}H-zRlCmTweVBX|O1i7x-LqEU#d_OU06{}*ysCc;0` zcA4tnP&p>MiKDjei{Q`K6JTfK;z#0SZ;v~Kbby8yPiohX1RslK%+$>bh!xrCT+sRH zLJ!gaGNK>0B;tV8%jJCL7aFJF`#S%_OFsUIvArBlHEf22OVjN9y5b+MHI`R`{K}vD zHiPd2z2DaS^NX1TG~BK`=qyjhtjR)L*={90KX$ubA3XK_YYeTU>t$zQ|J^sDC}$fA zfXu6|(q-Pg{PBF8*EKdLl>ifdVN@BEv_Ej+ouu)N`_;>R+>mH?Ggj1d^~5vq zK3=BF)+NxG8%;OP+@5uEocN~D_zS`}&l+oh%0{Q|-wV^$7_Q}s$bJeuPh9DBrQ8c7 zS_p^Ue8Uvz^^B%afM2O5r$$pNTDY4%?6E!fc8k-Sg#uAwX`VvnNtIwxWE09x5&3v0 zhfz{DN*SS`kcAY0wRy3c4Y<_{IIRw-o;?Ze66^P-G^N(~m_3fIJoD5OxXFDppenxj zawKQKUkPJ0PCt0i0bF{Psi- z$GH>0G7@d>NEBG1<)BE#P}}#}Hsa8r4u#X>Y+hHx4m$CqP!nRwB3bxJdYMl<#fRsi zX0`|Rxyth-jQ@-D=?@Lgv<(uQ7rd_`&>~PsFSZ1moR;vzX>qJCtBkgAO zgTT1AHGi10ga)+6PPr0@>1*FYE}LskP@Nl%?661VZfp`%$hZ8M?#Bm-NzHSgx0OXh z>|A&y>}dJQLS3~q8BO~$3~1^ePny}7sG@$=$+k>5l1y?*FyHcPSh(pqk{>BNiFjNUjf(C%>K}QTq16ED;6)ah10AXF<$5&GY!A_sNC_w29N2I4r$y zi359O?b! z{%_5e_kSLdAkt4zv7VDF(WL9m*&Evu#q>8*pObBn`|xr@eT89&>z8+GASF;w%qxK1 z0vl`3d<-0gQouyL9UdwYy%N%zV(ptF8oCCy`IBUa_oISC|C!W@^Xy;(b6+E(9=pfJ zeioJ*H#Q94sDiyizMt{eAONPifHK0=-%&XE0X~7VAK4f*$4Sjd`r{?pU4~8KKu>+i z@`UAm`oyf-opRn`K!Xwplcl^od-1CwH%2!E%J2UsGlJF`JZ4h0WvN?YiZ57DZm|h<{E(JFBk#W02}U)>Kj#0unw1 zT`864@;%IEJBul>QS-e;TV<8Wk&=T>SB_W5FwBMpHyf__gQ3Ce@0q&@pw-FqP?V3` zd0-v_%k^m*Nk*?VDR8TGL76Cnl;JhS!;`!;UH}mANu?fp+Hp)`g+2T8M8n}OY^}bs z0Qc6R&@+rcY6BZeK6I=>@rzl%l0#^{g)F2 z006(SZzbA_-Cds-H?`9~PFv=s1JRExA1TLeGAqBQDM|#0c8Xz;w<3b0i8bZ3W9)=E zNwl~SI5i!{{sD@O04|&<{?=G>@J>I;Kdgc?UhD0?7r11BFMfi(fiig!55!#n59>PI zq4+DQ@PMTq0_<7075r%?uNfh#DjzdGNXigKaItC#x579Jr>!5ina6U5kMJj!**DX) zSQ^rJ-{fLj5;`+ZSem6G?qJl4?;KG!P+QMac>>K^1K=lsbHj_P(g zK$q#Wj)N4YwUgf?HS7u2=Ar@}2WohkCbm8!O&o2ifuu~(-QnR5|5PS)kRje}hIgp)lE8Vg zag{w{o+>qJ6X&$7YtKg(P|tBVOomL)bTDU1y5R7@E!s01|1QtH?HOOq{hdOJt*>}s zN=A)*D>UL{aX++McN|p&GYy;;<(p=Wcot&(9%er+s1-LQ-F^A>>zh38D~u4`d#>km z_gh~3XVaXkQobK`#GG&bTP#r3n}xe)*xg>rtL$gHu;g5?QALQf%o0v^&Cy3w4q-z_ ziAJ=I%lXSMmbd}WHqOJ7k>@&YKffG*ie)z)oZf4Sk!+3a{*dNYBz0NOu&Qah;Psz!Dt@&nqcp7a zQu3|EwB|RjJGQ@X%#7$UbuT)1hA1yklKh}eaPn`$(tMi_(7?mdMIIB6<;BX+KgHB+ zyz=0doaWDPHdO;03}q>Vms!rii0GdqVgx$>JU#}q!sAJu3dhlggoxmJ^~dFh<2ZEm ztbvS13hvo+*b=3L+WsKErn^=kqW^`D^bxb{*303yL*x`AZwR5(w*0yx-LjkT*(T@}*Yyk8J&(mN*hY5LR5MvkM<4455G z3N;D=O+A`6?$LZ5L~M!<_cd%U)J)-nN}f2^vvA0hGYiU5yU|N|J5UvQ5OT&1m;X>| zZDhiK>7zcE*HwL;P()W}$u7V?J2O?)OAO6jAFKWE4H?^4g;au}t$-$4s^o}_drNAN z;DEhvz>%oieSAE@*U#XQj+%i9O}=o5#F`$ea8cyu-z2x`tBy){LQ0wI@7}Bl;gB~4 zkLeAlg!q`d8UXQG6%ywuCg16>j5?4Ml*obANRR0fzs?XneDCBLF3hDDupn^|A%?RaIaU=U zoLynPlY>*sSQ2=5PAs{%;3?lvPPO#)9@8`LtE1s!K^gx~nu1l0InqT8we_&fisBK6 z-d9kkqA?rkfWTDL)bOo1Ac5A@s5lB>n#AiA(kmiR_&NPy_*deSc~5YGu!tYC@H8Ww zas#aVG)>^zbGFFD_ToDLdwpZHnyhoWRx=4nuKM$85`8X6-c>sdMPlePvqWPAdspB|A8{NKA+ij(IeJL#S+!XzMCtUsk~D2$N>KufRUX zrknBTjpx($Tj*^R*emUG4R0?uvSj~HQ|T|BBNB8tj>rCrjl|kL-bt*M-cXwnvv?F@KMzx!qRj@6soDUc9^OPBTlaR>-zSoI2Ji zid3j9fi-=q8;yToktG`ddG24<@adVrjHp0$mtt^MAL!NbK$W`II3gT}2V|;+n}cQL zzw+kfT!RkO`_Iw|T;^T$Y{RHwa6(ZubvEbkSp9@0PPh*(1`u4+o0^!ce)RgqV!@}op$JGf8=p8ULA=)pBff6}HFX`p05r~e;K(BDmftO}ZwNjM z1o&B<0nl3JxT~#*S8k%9yIklvVq3p&w~ry{-$SuA8BoqWR7}sMV2y969VBdM9cxe` zFV}AyE+pyWR%bK-M0Lk8klclSQ&0u_O*@U9*lwN|W9g4wlu2|b!0yDN(pf(xHqT|& z2U`uhCp%ve{#SU>rdDx6NaP`6?#CYmwRF^j+bHmBKL=qN#t1ARusM_0}oEw3Yg z3uCF(E54@Mt2xiZ=n9R~<8|NfJ3E790cF_xO9{65L+6#Oa1U?YEARZvuHTLsr9z|q^j%x^t+rcJYQu7*-o$exk#LTL<| z(;0oj{wtUGS?nNqZx|-!@TD9qj4(BqSZtx(H$bDFEu9_Pa2z4AMY-o}O7~!3Ql+R| z_~)x$0}bVW`8h(=RE?$e@9Ypul5mQ^ODt|jbk;vIy%}NZ=KYc8^3yS0ACeF66Ryqc zvBMOdrMmzki)^_zTua2!TK4QG0jcQ6i0YP$_>-r2$=%KF+)N0k5mljYz zen;Scke4*o0dwqhwm?fGOP_UVyuVzt#ZS5vlG18)Qx5dXNiFxk|LryPl?f7ye#jw( zrQ7NVQc4oOOIMb`n zR(nVEFs%;p;NNl)4%(}EW7huQLh$3DEfZL{s>1wtyH(J{)#l~ym>CE*)-f98CFFKD zQ*Z<6v|oO;)b9C?QZNoG^!oJXeG?pXcVE>oBwJtz8shnb$mJ0%U1J*)=09c$*sWGvV{J3YxuY>;eK)3*vlvG*A*zywE0sS za}q~f0)}$B3w2uDb?OU_Vwb%r%h+L>RJb5BM;NLCFZ>vdb15bY)*HC}>^3^fhFOE# z*l3jJeWjtQ8cLlv?v#PSn9;80d$T9Yg;)q!=0S@Iu`NTCq64jxNUg&g`WW>)R$en$ zjx+!H*3p@_4Ab+SOJaP5h$rhFq9nRqv+Ab$q?XFppsxE?a4`S>hq?fd@?vpdh(s(*^&QUoS^QQ@AY%pFG4u- z&!=gG;XWAl#HeKyXN$;#(H!H7eM+k}n~m73d5H#*la}%jHib~lVE1#X{6g^91-HahR2qAp84$3pf{Uy4#_ z^p!TPKPxzhj!+|+)#JmVZ8RonhZ*SC#w7;_bh2UTvP1w;3jLVhy;Pr!rdZa~6Kf)L zyJiE1e@yI5Mma&3;OZv+9y>hz?$5OGy!ok!4f1Ji2b)m*|Tr zOE|yZj!7A#Ntr1BfHT!oL%sHU+M|LAnQTZ}HdN@hrc`-BV%Xc^V9Rq0%m^$be-koz zmu7$OtpCuWsa){ov0QK>Qo`gr;TJpF@IzQOED=%hgAmzmyWQEgJb;5tZy{l8 zmnGLJr*yByQo9h|>P~KzIs@8nAe)d8NYpoV94&=H$_dt;eX=0sGYJao-m|KLk4YMA zLo>Hb?Wz1T3n+7K)rYGx(Cpg@*NZ&=gMFByA@?F@P^Q@9Bqa9oIyBw|)0>@koYL~x z`1^l$C1oc5{I}=R)q;n})-au*TI8hk3!;de#t=!s<6)U+j8{;AP5*YqLvF$Ys3|C^ zmB?>yBf4@p5lb(n8h_!A}!0e9{%dgSkK z0ksmAX$Yd;3y%FSiIq+!7dlm(jHyPEGj3(|<6;dUr<~$uj6BZ9TDo7#==C8oS>lKH z#Ndk;rn(yJ(sSy#EgL0e4DWKHaU1z$&vv)eD$wLf=f?HvS4r-JsRKs5W}3|983)v- zF9;L~ujkyXm6e?()#5KJ6dYkoyE6@tEG-B9Siyo*lsnb&+Z~YuPYX}&ZCa%Pey04m z8KMHl6vfI8DzJoIFqBZ53Nx9hlxF3@_O1NPl^t9Q0~&!9;Moy>n0c(uVGV!EFK$d| zWlWtug6}Ok+-R~M`Ry%=xEv(4I&=H*+AMbY)||j3!bs~S?9hz*14)t)YRi=;!dvPE z;m*QR!+)ADDGk9NJXXTr%62_i21~Ze=llew=ZFw@i_QvN5HBh2Gj4!@u@Pt=-;-F}X=}a%<>wP_!qD@lTjVP-MXWDA8HbF^l5OizY?&}vSv z;6IW@LimfA184bX)m0;$+qwB24GU;qhh0-WBkbaoitKtEB`BIb7QR(Ic&n?$oPHI#!&bn|4qo?Gnl__h{P{wHmA|CX49n*uND*N297*!tMe z^WN(yRwz3t2{VC<#kbDk6zJo@#~vt~u2~}{a&a%eqyK!o24`~kimXzrcnk+7u~iZG zy`ib#T>i!T*WPQl^&H2g#`wCCW|2nhHmTwg@oDhtbh-|9TdA zQSZoi2cZ_GpuTg%$+o}(RbsbHMG{k%o&q12vPhWTrgnL97QXl3|aJ1005qE#0(-8$%x z51dUwyK8N8yT8!o5CCNqbSGBlW5BH*60RrC&|+(QAb#Wa!9D$ioWwM18myi+h5dml zUro#)MzDB*+57qCn^=iGa`#KqN0qnDuKjL7tW>Y#>-*4~+fxx2+g`CW}I-+YTjZ7MX*pQGU9mX#T60$PW|fK$DU zFYbtp-7?AnL29MnHmr9thUjj>q`!o$jDF!lxQJ3 z7$jDaPz&{_XchM=n;C@u%vV20&v3R7Yc)fhT8i6|sF>&0pTfG=J&Y5DR4b*3Nd^sRFt&=u3itPBE%t;j zI&kGCJQ)gtG$q3_;o46s*stn}LzXk8Pw`cpr|3e0aQvzb&UpGPC^MpV;w)Ke2FOgV z;>R&L;16N{9kglL;x4N$X4$lBV_BDuW7uK2pUoQ2g@4w~C-0z|eR=%3av?k;CUr(2 zf&BkjfI#PP4t>S`NtCF&oj|ue!p}b#N|`i{iRB$sxZKqaIt%UCY%jKva6??FSueM)3PX?ONtdW8q73;W zzZu2XOp-zvevxzH8Bn!_#QD2%Q~M~O`687{ag>il6H~f_%{Sl}?-Re=##5NrW?@z+ zSd_X2am$KAG?d-`RglXQ_pGF3`}E*<`ZRwf1C7jA+w=FmlB)TEWS5NMzFvIIMkaQP z+Rrffw1Bf9UT(;@wzO*C>rX=s2mIj=_Jx`{K;*%;F5M@uHDurv>gc!rA6#L$4SqGm zrN4$_o_5@{ggWp@>;JZz&PQn}O#TXC;2*I2v8~2JY`?EAiWYA_+k;4Z{)>lDK*)Ps z=&r1=MyJ0G*36(z))T(x2f%p)T+tOxk&#-ITN0kc_Ebf z8bFf|9ir;6(Ytb)rxt$zHE$`Q+4vOg3Q%6tvlfh-l~E6foa~NzkC8sGuZO!)3%=idYo%hPNSB|BSUC#TI?pJ{wDUn z^XQp?^30M1irK5Hd(JKb$xCb%3YM0e+@7B|4x1T?YnuIQHnG*OEe$$Uq^i*v;5H?) z)`cE_S#q`62|=AavC^Z9l9RW}mYTB%_+QZiusci^U`dCF&9EfAO44;(`}5<5B_9aQ z!PSo>EE>3A4m(Bj*2qn+js+%|n66UPKNI?#Q@8KKJnwL1#R7sqhoLAl&u876PW&)dU{oDy@vOR;eohl;(&fkgu4mSTFDe*eq{b+h6`jIQv>3h1I2F%ij?a8TN@X_G-2SBxO{;1?N(QEo-)!dawoL>h%%ixK}Cm=LZV z2|2VzOfOu2dAoDmfCARsJeik|AtkUkYiX`m;^A0K8Ell;nePU#%gT-AdX(kLZZJp1 z(Sczt&#Fhs;Dk^+JQl>>B3o{#nK*ljG10%n?z`MP{#T`&NM~$x63=gD12<*lFbna> z$v1U*o1YDW=WD5rsl7yzI2C(T7?9Q5Wzs%VxsmHiP*!C71{@&s7bWlA>`rBxrMiM- zUm&T#S`o>3l}e{;v+9CR9YwOhrt>uUmv(3+M>|#-JtYvsG13oWPSa7xlRz?u;b)2G z=@oS5N2#gb5!a7+c0vh_63&x5uetkco!7CCJen0{uC|p;(=k#Wc$uLmqil@+@V<>j zsBP14)kmAtCo=5gcNU+AD~U?Rd9pP+R4jkUR!~pGq;|p_S3~Vt{!P?{Yocqu$kfkd z-M+m^d1u_ZLCxwh@{6g?%>hd74;2@~=dio@z@PhPx;J|CU-n_9n%_x8Slei7qt@I@ zf53$1(VON+beyswJ_7L|MLI82hD;;mF2-D>y$>9nH8-C*pERG}3@FlXz^|4%wJ$pA zm?z+0Ql}(nfAUPEXIMGgRGfC(PFSLO5AmO7N;_R=4A2s@bCi$`49}i4$oF~*{=MMR z)b+e9GK60KQ~cEV2E0!GQ4*u}bd~Jd{1?XHQGMmi=GQ-Yf1mo?4zF@La{(#aygFRW z2s<%+!^X;L-Z>pP&ZWk#AFiFB#P6OoHd)H^xW1ID$<51(R(m)TUD*yUCvL2SPOp-4 zVHs{sXmj50zNXdAGZ)bAh2iiE4y;bM&NQf4#2(5uIbGrA*pV?EVXa2DmDa<{FZZlO z+OZ|HgqY!z)&9042z{12A&E-WszSS;_R-b`IUx9tfBheekz>EaNVWPhevPN-T;doN zAF$OmjngzS#wrNdhX9?9fQlqmW6Ch+fqJLRXZ{N@|t7u zqyy2G*FKi2qW!_&J>^d~4?%|0*@yF{&eKUfE$U$83WE@FRmqTCFywyo)lq+i4vjms&cVFtJU)9+o; zUk!f*?ZUX7-FOA>MH}zmRij-lo8-J&_9F3@&2hVG(p?EJTEod>p(H4Q??NGOQTf%M zW^bU7Z()|r#EN69)ayu4pG{{!ejGY%^{GxWSWjxg2$E%#<+7g_3xU-BTLyZ@foi8C zgabbyY!9T0A5B`9*7LfCq?GlXjDzznEY&RRHlYB(NPHQzD#aJ;G3P(IP)3U*PU}>K zSQ2_e2=?3^8=Hch+UX?I*A@G{hB!}CY?V{3WtP{&!QgHj;WVsu^bEE^=M5FACl^+j zwGj!aZ(P`2G^wKRd%tckUWP-xTGJpH97HR#@_`0=DnCX%13<{bnJ%*LlO={I4oPRR zCF`=EwLexWjeD%vaBsca2RDcul6?_?2nlZBJi}IWP~E$K;^WPnKuJP*o~HmhxnBkP z_=R*gN)5iuXw0h1-+Z=~fGPfq?^etEdCKFwQQ41@yI`)CxI*%- z?>9FwFRQv=)6l7mq4(j6Y))AUO`PJ3e~)eEv$!AUJ0ds@ zL-}o~x@qB_=~;LOJ9YB>hpB~=)?>9GqP+%4=B9uH{rG7P&Ok##(I9mC{6Y_qa9*^Z z<0!#e8k@x9ec(*3%(4Bs-4wxN*SK6#Qq@e^EPX=)vCLDzUVr{Pi}RkKQ4QBYO|sUo zO963vNQm*n932z4i}+9Y5E8Ss1$JvpF@S8m|M3qyZzgZ2km~5%qQwZMIIuFo6bW;w zgHHu6bH&lTGz6yfYzDABsAF=cyD-Svfn@8GsZwJejL4W?^2w@ANvP_-ub(vr++{CxQFjv#@d1aY-ArH*pHxq7M!)1JF+9TABLWOW zNRK)LBd1WxC3EmfjS34Kvzrb^5sm3XNhsW3%JN*!M)M0}O<=n72fn#?-{l?iXRmR9 zUlj(!KC>e;az^vN;YQO3D;WiB=ii9l&e;;o%d3G2iZ(e}qUaTEBv=!_>_C2O+Sau^ zK-4hE1;t#=Q>ULaNh1MIxb9jbT6{s9xtyBj&~GF3k6W;=m5R6BDbycy)YLNs3U`l=3e740&7~0Na75gC=P2cihGxnHG~fb^UD|N zi$pdB)R%zthxVh3%;iR|ze86yGh+5z8hx#qfFJ6rQd0-Kg5s2NhDL3WD*YcBPgZ9= zWh!;S`zVuf`IU3u*x7DsAI9^qi0RNHIiyFRzOXdggG0np!P#$eoy!r})f9gtcy?tJ zk$jNgMLN0|gFH`s&@HTpyN)8Rou7+ttqn@K0okkfS-O&m@ecbLR&f(7o#3@`lq zA$!gn?p$}SYD5<7`&{X3j+a$fZm-rFCld~u5Twa5t@T9rQeh03(w@BUM?a$NJTl9>K;Q>x*AVHYQuG4RWrIen0o`Vx1B{yu@(HO!+uFu zU0wVMipcAmx>nsd5$K4;3Wl;Juccjp*U=9Mhj=LxYpT*I_UXib@QUBtrggshA9oRS zuUGNA;*kcMZ|Z%=)w+H!+)Z$(7Fch)723=aX(i!HNiktKic-i6WwDW1#eIxU#gP2M zu_xy%zF|kqaEnijl0vFE(ii0cEq1%sUf90un>}IiAZoelO|-E(DkbgtP^msq|pUV-nJP z$#Y38$Jn~>I@;&6!~DpASfqaV6TJ(aCmYO%2~MS0OmpF3%k*sW|9oB#ZfO&iIi*GX z?0rVn_REky4&D~ZhXjoF1VxGG25ZYqLd7GpLP<6>lBY!ZCBlv4moJw7=CpxBO&Ff{ z+ne6xPt_rlW$9*Ep^0Vrt)CxVX1tqQ(;qlJaDh2mqNq&$sw}g(^BaiBu2Kvysq^N;+KP5a4SkAbE4W~z1Dinmj zQBJw)*hJ>@;qye7U~${7+z6Pa-cgl!hj6u`|A$mBdce&D|A($9`9ll$5=KkvL)+OG zjmV5C@5V;e<*C_1|CN(4w=a-3@Eb*UB2Ab^h+J{nXlC?7i@#~XLH}L0ifhg3b}Zzl zn)4$2H^Pc(tmMO8a0g@?llsX@qz_BXka`QL7TCd$owh??`7#x&E)ej2wS<=*I>oij zVaB%3GM3I>w@jAip5>A$xwx~@ybFHt(Z>e5RgSu5sxeLtr}=(#>&m_>!F_<~Ay8Sg zSzf780BKuA4GUA0N``OMR$x;Xpi>zb0p5rWBu-WJ#IqKp^s~6tH|rZt{;w^|_r04& zP`XjDpk1k-;uq|b6tw&J1=x(^Li6lfW1_0+DJtd2*EE3R$4U!9OrjJ{?3j|Fxvl;_ zW+fm8HoPM;Q$JWw8oc((iLE}Lonuj37x#jAMtp~}t%*yy=dy?7MF^rxvi@eMKbwJe zCbn>zzqqQ*#zAz~dJ@^T1ldf6q5nZ5bJK(2bPfJzif=wE5WTD*IqnDPly_)_3Xs01 zqybySd#KE2y|jM&N7H%OBOu*BM$K}FB2RoET(i!DUl-pPKGE&795yW2SH*9E77 z)fur#$CP%2*}y9*jvwzvlBL+x3NF7jHc$MV_lM`MY0kNW>8WV=x8yxtml$ zLTIsxTz3y>yiWQ~B3po)kY6ryqdA$!+!7i)p37%lCV?hT$ny{<P6R&Kkktb7DTLHTH zrwUdy9(DDfeBG|u42HAhCvBv&Yy)rXy-cHI%#?Z-zkJXJ{i{)+L<&8&Gb3&BY^Ocg z72gXVou667C5%{TVD7QhB1CBR)1*#w`1Pilcp9b_5?LB}E`whLQtswy^v>rc)#e0mD4P6hcr<84OAYgy>& z>>SUUHsQNUO|{z>obw_7+B>&fk+w z=aelCjaa&}51bbor#RF%JfHpq|3YN$Nze(|3GGA^&*yd%)se}!s|XEMR+gwRUao-3 z-fqAr&O5HLJPXH|^L_uj?)Ef?{VizM_1mjHB0JV15Bg^%z_**cw>;Zbs>m9UTJrdjnQv}8XPaXvkZmS3|tfjYyS4= zw7a4BBmQJYlB~z&=2?8|G-~pxHoh#N{tk_aji2&QEhINV2FjNHdAtdy&*l3*r z)mZ^Hyut{-*KH?#q`*;8$Cxv4I=lMeSF_j+b+mdV{cBqiC5tRk=#|&=$z+H+-s`>C zn;TN{LTLR)R!Osr-34=Y9;io%hf>;=L8{!5M;29c zQkdOc&F5-d1ADw{7DuzoofO&WxSbS{+OR$RDJuf5@A!V509{n+U1J6Rh;8GHsy^7fXtXRyx&6&&pw+5z_4 z=2$IyJ#B#;I-Q^=1IU!j0@5v05AepBMWmH1^TnIUAs@KBwGFOu?9S0y345+JxJY&> zF3W*#gUm*KrLq&jO`v9UNz~5Fu1*npZCElCD?!(LSl+F0*JZUl%K~RVwQ%daIi4Br z^XQGy95491{N{29eQ0d=HQfADVV3f|mNoh2Bm&H9edkMNw5g26;nW7+y;hS5!uOD5 z)=7o+4)6ReM5tRgd_BYzK{407#<-pt|9_>2@T@Ccy zHUZ3TRI6Z!0r)+K{Pjs6^xbB{YPF(aA|ZD(Ux4?4;W}kZ=rL9{RtyZB?jaQoWwTjBZMk2Ht_Oe@UBSDfvLTt{F_jG$su zehJCESpS-|z3+yb((2j{_z=pEU8)wYkB#CE@ZgL!wg?#~7kgmf%93mlL}us7HO^Qr zXn;O$D@?d9aIOtFQb;Q8_s;BVyRWMz@A9>NPsNHw?P&~-UL&LJTL|Z5i}Es(HQz_x zO2G|(yY1^$weDjYqGa5r+5cARHhZUA>g+nc(N(nSkq9HFaBi9w1FclpD*`K^`ry{V zkdCY6o90w=SS|To(6onE;5lMP{eY}ZbY4o5Eib@SFIHLu)?tC%#K$<*>VXRr>tE+? zl8y!iagW9gS5IElqTqzvO^%m1wm*Gbt1_+yz#03Y*}&{iDdKR)*losSzH`|uV)na1 z0IIK`bPeI!$o4b(gF7Bc5Okjvui4l_Guq&PB#Qit-4*o5Q$muM0%gkUv=4>|9jz{v zh7GToC1x#^$m)&>OnLSuke*IR!>oY_8gUujHl#aQ{*X9~c32sj-0vcAPAuew`oir= zHjm5iTmonppn(%r#o=w?W#ni|k5&<)gMh!^ClD4EPRbfLdltUk{8uq<6nqQ3>=ZiD z)I%Ph@<=gE7qOsUEq-@Xatx)gCZ!FjMd-QTE7`|3+6m*p8|Iv7gzc9{G{{ZbhdrfB zc_>tP08%)^_3Yq?n=F#5F)Oqmrhmq?K(gVSsAyZu9Xwx_OJva%Uc+bm&Th>7O_~=k zcUEeTzXM{Tyx`Z?uduWmiHt;?>>sEp4&^UW*qEgRp#-_lVVMk}_j(6t!qV)KiOYzN zyS`vWn&HKyYxuaYM=q4vm6*>%$;itOy@8fDb~Zf+ZyQhK$BSO3yV zRk9Gk$6-QFa64vEEsdaB{449_g#Gkcpc{D!%m_)yE$`je0g|btJC7Ia) z0MXTd{|j*OQ^O&7e_^elBok@M;Dp+acvu`{2>9KS{|w#EZ4{W~y_;z7!(BT@4fU8#_KRJoIE06X)@(*p!qgK^{NDCyJ`bnr8C$BM`)1A^fHojE#N zh>%)RU^zMAJG%TE%TxvzP3CReuZDQR|E)j=G2N=Lf_>f?z7(@d2<5}$g{^H5#mSU> zvBT;Z=P+B$VArM!wjY6ly^ zMQJOfHJPE~wX3)e<4-F}i#@{swQ`nUQT@>#9=au!5Rev>96F?>h7N%t6p$QAVQ3gc zIwXgNp}RW-q`SLILKsO&kvshE{S)q+^JdOkv)1>lwa?jmf1XF~ztzhW803-{fNM=d z@@YH!aN2@zOdzyh@{MWI87YkIH$i@Ox?imfXLBJKAp>M+lWS4H{%LY1wCMa}oZcUl z=!{wqI{og~(YlZBy=)GSNWUB-ZQ~S%83h}C`BNcC7paF7Auj5s$eOJEM<9ki1lYgv zO(N-GG8pDphma4I}W#3U<}U&=atx{<^C)EtV|R&6J{L z5TRELyq1F(d#3*K#&&wy-m!D1$fLtF9{|}Y1Vc+ji?#nx>p{kn^4SNO&*Zb(8qQoD zdhD_)_V!r3H+Q{Rp!wraX^x< z)TT6LomR$P_Y-BM%9<@e~N`wb@2eDs&@tRPfl8-Ss?e?I7Nx z;@Ua@yZK!_sp~(eScKU^#;6aaq1}rl*o&l>9y{}!aR9|h;$drB+r=7Q{~swqRpam2 zm`7(Q<3BO)@V|h-clKt`6kbg_mryDLUo-vfgzsHijEn%Dobq zezO|g!!#~Wg}>n~pUEg*SlVbsy)0r`k8O10(5JnE8B6 zHBul$@vte28h_yq`*O^i5fA~nayDZ2DdzeP|GL1yxt3MJOOd9Fao^C4Tq>;~Qz{`n zJ03g4VL&Ef$ICNlr$MpJ28dCu;%FBt>(^%C2k>08By1X2YP_cvc%RtjflSknxMN)h z{4)wn*okL?O5HxC@Tp_?kMoNSEpilwJ)cLqCL;?a*U0Kt94A=DuGW1yZ_QYD^NG|$ zoy=?EzA%N(&CJcuP1cP=<2!^CAaMn*XdrIFOW3md)UtMSJJ6hlL zECCq(GL6ZTYXpS?*cGYA1W*h-^w@;jYr8OO*sc5#oVRKb9y2bgOW`>?u|M{?z0dbP z6?&V;0a{7IedFrz)X9K7%S6CYEIOySOgu>4dxWvhoz0WQi$45|X^@c1Ij?5Ar}WEyu%2+UR;t(@P8rL;Ak(& zD)SZb@^iU0$UTY93v{}wB_Mtge;h)5k~Trw_yO{Vnmfv!!;p$0J{0`KByKu(275tU zxUaNk#61OH5YwC@T#v~J{UqJ%gOfh8@ss}X!;fT~RF5B6%UkQJr$=q6#%X0iFVRcuot>Mq^MQfU7kAD3ghY59|g>bt4S z*2~X!Ivu(swV1QCGiSz)s+B{2LpYl8vfTNYX}D^eivA#V!Il2BFAW^6PJNFfI+Q=< zaRIv(A>p%;?d5erxN;fx#=c`e!`(RXj|l-fIwQS|OCk0d_l;wCNqR{O(QR8?&)|0* zE*!zZr^_lbW9w!->@}sbaMFQqcJYZIT5zlBV4^z;0wc^<9PgZNJ+A0DogSY(-0Lu| z%zALSkIM3^_=h61K+Jw5ZCjkgA~!y2+5Kwur$3Z495J9CXLh5=>9aFvD}iE6a4uR`g7+lvT%HJ8#JLf=(@JC8wLtO zi$SSj>|fTB2UY$-?G6v+KAPqiz8TkrDL~Cyh|ntKMs=Qo(px=1i!T&9b}*>oR&47r z8OygDM3$n@bo()5m0<-#UTLo|)2 z(6&~~1>d77cOl^xdWA7sX_wVp4<5F>LD>2)&oH3Rms&5DoUw-_7M6UI-h~5g#RabG zktI{#J;(c|S{MZ?RmL%<2OyIm)5HvUWbxh@k(sY+A=!{8Y*Y;=-}~x2FD9VsaUDPK zQK+Q_d$5HjvZ6w!r41hyj9+O;)`dSssQUalcX(BnTxZorl!1)+SiAbrIVQ#fp%Z%y zz8zZTv&UNvNuVqdsT2&1eHVqE_+L`i5!HXEm^4H+@d>k!ltyy~$^a;FjVmcuxT|yd z;TU0t0(+^}qI~sZ_ZHNfkBwoqz~A`29rfXO_hO+qSfSCcF^3|b!jS^}OZbFJ(T!us zy#7SH?CsdX;OJmgoR9*oy}P<| zPoFRTJ}h2Bh4a}z)Fo8(@awk1CAp|TWcQxfkoE^{7QcZt2FijjJk~v)lO%Za zedS8);)!aCP_RU>F=CMJ)dPp5^8jFJJ_X_`)WcXk)YbgTLcBDo^0~ts`7e8W^2*2< z2nW>E1^;X#9h47DVcu4aOYDQ@@e{fARZq2KGpPb2c7r~qocspCU#>KVch%T5A&(s0 zIFvC2>i`Tzn6O$YJxMJN7^Tj_ql%^mQ|XC9+&l2?1pHZA#44YB(iQV9_+*XPX6t7g z7nfLC0Om~KL0j(1HmfwylD;Z1>hTBbI!aIZ4I2vekxgw!uHZC!KL22v2-x7r6RaGvZ;Zy4TSHAi za_#|MSc28BUKN*C%o?F&Gi@!_j2zNr+r4dp3YUzpEuxPmcVCXM=Oj9qXy{|Q1R1n4 zF*P=6S^?CsJHs-6p|c?C!8B^h*RL{$H+c?ybilFhh*!S(>HZ^$VnRHK1}-Fl;TKeN zHQWLD{peuH1#7o?kbQHSus~HMRLz53W?BU#w3lp;r`<(}>2;m>^m4Equ!Ly*MJ;lT zlj9^v1*G2&m(I)~4E5kl8RVQd1|8ko*Dm!-Hd9j z)spnh4x=ohkh2P{tK;7_!(XmiWYJd|O?_Caj%7*mTsOt9TS8HlTA4v_+Z4`W252-V zC0XjT;AdY7N~>ms6mTZ+PbJoO!V9VUKUKK#tGD-P%T)5}n1M=(qL14uoE^e!9Dkrv zhGhBJ5!Fh{VzQI*)m2BM=?nQ5XM!f{(7`+_QFL35A=&H=n)B{u<$WBf`zRWH@IJh${A|Ly&Kx3iXf&>Jr4!HZ&)sqKuF0fzAcu4M zd`w<8SFqVnCNN)PAP^d!zthW$JJd?`TjYm;Ij3abR_Zhr|DO~tTF2#SmN3KgSk4N$+nq|Pv;c-k+I!*CF5lO0(u9E~RJ z>>D49dei^BK%yd=uF;^B6!Vp?;S)ecCbg~jSFx{VrX>TU-RM7F&NY*P`FF6Kv0Z+X zlWz7}v$wFtQ)n9V^;&;w-<|$^(YyF9!p8#y$rPq4nk61Q?bXrVtvw~GW@Wjmy(T&e zQXh}(ti4-znS=e6_$U4m6f89F_}5D#G4B9gcjlL-dAUhIuQMtx?QXwHHsjM@_XBFV zlO=uP$bFzzCSZS`cbz-%7a-yO!TbzD+GyORRFcabFizj@VM|FLMyg?9%^Fgbh+r8M zHXVY?Pl6y)sS1(&oGogg4(lN?2YqXNZr8Ec9C1PGR4t)*vbO-q0$D7kV=OSx%4)aRON=HBo19XY6QO%Ph?k^>6$Lbma!5qwi)VMGVm;EE%0^RlD$I~(o8@t4XFT~tk1o!wa3 zqG>y$1B^_?L)e~KUFx@QKN&bORF+3nrkQ0gvdC(h(@RXn0|Uy|cfbn;?3?E(y3BR| zI;Zv3_pn#>=&bMl*7uZh1JjRj1EM+OVEJ9R(Rz zTQ9CHNB!Q06LHa{x;??P+Di8QOM{Y%QDR~ac_*oU0yD)rFj;Nv+4uV!Avwd~{E{~9 za$z@<_cMIMaR%3pkVR%?IZI|8^s~_Rn1yk1>S-AcxyagfyVNc4(%u}Hs*zQHqygW0 zCs{OmCq-n}YpwRx=6to;DjX;KlJ?z;GwJ6Ob1mRCULR>MCU1|7D8Sl2* z;D*7kwbCK?27b+ZD7;Vf*SD&Yj<26TBC^EMcV2w2S_E)wEIuOoNuqo54*+qYDfH7;!b@-yQNCte z*-*=ccjAyiDt;jk@xvC+{y^7nP-@es>=|e_@-*kM<%)mpiBw4SLx||QP7KC#j7HpXc)f z)NyI~h|5iwiS;AxU#mP<)g=!5{cIXlQ|3nKnH~Cpe1~A42Ewt_H@gO32bf<$_}w_S zBh2!A-qRO+P&2m70pc;RZ1o%s%k5VqEyn95o1lJ~DF))Zqers9iG{^4WADiLhxp^q z&%=4qK;amdN7YD}RBhF>#<`yt2K0TD-Ac{J?XIJbA&xkozn;slwg3nfIsnrJAE~FP zsUZ_Nom1R(X3bH(uIe5JAC!$7SPQBpWXCWT3z2$$DQEG8{&U2UJFaC!&)jXxfaH^~ z)B0{DZ=ytA0EFxPoG49qsHF(_#n}?F9AfGFlixWyC4+}lAV0S!w2n1Y7>4EhMSz?# zs7ld21YTU|(tNlf= zR{YBHA9Bj~TDqXNy`PpsCx>M;G>)|O>OUw$5kMc`vv5y*RJMK^WZipSX3;qnaw-T_ z`o>bft;*<4IV7xM7-!5)Dy!p~mFAn2yc^m64OQfFfp`cy?uFksp1*VXo~u+XGLX6g z{{CG^5rJCG-xA`-?i#8n^S^1dnGm9RggG*~E5d@5tI0^*VOp?v#9>=P#HtZsS2EW)10neggeEZ3q}R^{F4&5g5~lqOrSg#*cQte;K) zl`_Oe@hG={(a(>TG&L-i5e7V0^4+;7A}w>R=%p=V4Vr;pk)P8$p?tMCqnXcS?dvQV zq^!!XL{IyHl3wi>CL{wr0tz?^dV3{W&16;U2vUtBn#uuHLd5tHa$g|NPstoe*EZ$o zN4NCiB0_PiFp$=tnH-@lJ$YVdy|bM2Mv7_Ol5l&tTj|HZT}-3e)9WB>KsNRKbRQ^O zOra?|#bC*Llp*0H@1N3r;sr09y{w)nY~(v^qBUwYDde=5SDVBN8aBz;!iYsECq3Bt z^l6f;_}7B6$XTjDS$4APGE)9pBPLHyxy|LJRQ)tQ84ryo0TdUk0H@DPN(1qu?C)eF zd_&&4;b-4n(bVwN9Pb~>@zE?AT%SnZ`I*DCB--;(#$F0XW}*?G{I09#tWm#3blanjvuG1_N{5~lZni@LHsPHf zkp(J&xTj5=c(BIAwcJY+7R}=RAz<$^6u;v{44}r+K+?_bv7CHpJ0EIK?tPqm2)WDq zY*B-CE;JzGH1|0?l`QN>4bzDq7$n#}e!Ir_SQ9v=bI7J1oj1if@si$!e*l80Q*5EA ziZ-!}fnzR7$czx#;x?2c>svX`Zq-2>MN!$lk5W; z>Tv>Aq4Fi=0uzQnOdC=u981F03A7n$C8JT%Drgys_`xX3lJ0e_IEmAV75oqc0-ciG zV{@ayWaXmV=RDa?2r4nC5N}Qlm&n#dH+2j!ry!_h*#|?kmYY8(NOKx`@)GqG9llBu0VBv1_0 zwOLOi9%hEjhy0n?Ap5I{K_N%)*!ih=Lv#@H_hbmalp>E*VJ>Fg1L<5fnqT$gq1BKn z>?7MxF;WLMBnxnE6(~1QfR9`NU=T7eJ08?Id@$G+lc1!R66yqCTu22MGh_cb+*POf z`*_F1gA)tDE_H(p@P9u86&dUf_o||acu{u~{(oHbHXks8yL00k(}z=0Zft<^TXp#g I*$-d-2WqQ8n*aa+ literal 23298 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 LUDZ0}m+$`{{BL-? From 145481530d39ddaa3f7ccc08976eb9174832a712 Mon Sep 17 00:00:00 2001 From: Luan Nadaletti Date: Mon, 20 Jan 2025 02:06:41 -0300 Subject: [PATCH 066/121] fix evolution dropping held item --- .../main/kotlin/com/cobblemon/mod/common/api/drop/DropTable.kt | 2 -- .../mod/common/entity/pokemon/PokemonServerDelegate.kt | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/drop/DropTable.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/drop/DropTable.kt index 3d860d62ee..561a0f2459 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/drop/DropTable.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/drop/DropTable.kt @@ -95,8 +95,6 @@ class DropTable { pokemon: Pokemon? = null, ) { val drops = getDrops(amount, pokemon).toMutableList() - val heldItem = (entity as PokemonEntity?)?.pokemon?.heldItemNoCopy() ?: ItemStack.EMPTY - if (!heldItem.isEmpty) entity?.spawnAtLocation(heldItem.item) LOOT_DROPPED.postThen( event = LootDroppedEvent(this, player, entity, drops), ifSucceeded = { it.drops.forEach { it.drop(entity, world, pos, player) } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt index 21cfe9f532..30856af23f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt @@ -34,6 +34,7 @@ import net.minecraft.network.chat.Component import net.minecraft.network.syncher.EntityDataAccessor import net.minecraft.world.damagesource.DamageSource import net.minecraft.world.entity.ai.attributes.Attributes +import net.minecraft.world.item.ItemStack import net.minecraft.world.level.pathfinder.PathType /** Handles purely server logic for a Pokémon */ @@ -258,6 +259,8 @@ class PokemonServerDelegate : PokemonSideDelegate { if (entity.ownerUUID == null && entity.owner == null) { entity.level().broadcastEntityEvent(entity, 60.toByte()) // Sends smoke effect if(entity.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_LOOT)) { + val heldItem = (entity as PokemonEntity?)?.pokemon?.heldItemNoCopy() ?: ItemStack.EMPTY + if (!heldItem.isEmpty) entity.spawnAtLocation(heldItem.item) (entity.drops ?: entity.pokemon.form.drops).drop(entity, entity.level() as ServerLevel, entity.position(), entity.killer) } } From a1974fbe74fe1b34fe394f725d644ed3436f8a4f Mon Sep 17 00:00:00 2001 From: Luan Nadaletti Date: Mon, 20 Jan 2025 02:28:36 -0300 Subject: [PATCH 067/121] add held item autocomplete --- .../common/pokemon/properties/PropertiesCompletionProvider.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt index 5f3cec7eb5..708f3bdb22 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/properties/PropertiesCompletionProvider.kt @@ -147,6 +147,7 @@ internal object PropertiesCompletionProvider : DataRegistry { this.inject(setOf("originaltrainer", "ot"), setOf("")) this.inject(setOf("originaltrainertype", "ottype"), setOf("None", "Player", "NPC")) this.inject(setOf("nickname", "nick"), setOf("")) + this.inject(setOf("helditem", "held_item"), setOf("cobblemon:exp_share")) Stats.PERMANENT.forEach{ stat -> val statName = stat.toString().lowercase() From 6dbf1288a04427a3c5bbce438fd2fcb6bab8b412 Mon Sep 17 00:00:00 2001 From: Polymeta <40173118+Polymeta@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:38:01 +0000 Subject: [PATCH 068/121] fix berry bonus yield and sodium dynamic lights compatibility (also small version bumps) Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com> --- CHANGELOG.md | 2 ++ .../data/cobblemon/berries/aguav_berry.json | 10 +++++++- .../data/cobblemon/berries/apicot_berry.json | 10 +++++++- .../data/cobblemon/berries/aspear_berry.json | 10 +++++++- .../data/cobblemon/berries/babiri_berry.json | 10 +++++++- .../data/cobblemon/berries/belue_berry.json | 10 +++++++- .../data/cobblemon/berries/bluk_berry.json | 10 +++++++- .../data/cobblemon/berries/charti_berry.json | 10 +++++++- .../data/cobblemon/berries/cheri_berry.json | 10 +++++++- .../data/cobblemon/berries/chesto_berry.json | 10 +++++++- .../data/cobblemon/berries/chilan_berry.json | 10 +++++++- .../data/cobblemon/berries/chople_berry.json | 10 +++++++- .../data/cobblemon/berries/coba_berry.json | 10 +++++++- .../data/cobblemon/berries/colbur_berry.json | 10 +++++++- .../data/cobblemon/berries/cornn_berry.json | 10 +++++++- .../data/cobblemon/berries/custap_berry.json | 10 +++++++- .../data/cobblemon/berries/durin_berry.json | 10 +++++++- .../data/cobblemon/berries/enigma_berry.json | 10 +++++++- .../data/cobblemon/berries/figy_berry.json | 10 +++++++- .../data/cobblemon/berries/ganlon_berry.json | 10 +++++++- .../data/cobblemon/berries/grepa_berry.json | 10 +++++++- .../data/cobblemon/berries/haban_berry.json | 10 +++++++- .../data/cobblemon/berries/hondew_berry.json | 10 +++++++- .../data/cobblemon/berries/hopo_berry.json | 20 +++++++++++----- .../data/cobblemon/berries/iapapa_berry.json | 10 +++++++- .../data/cobblemon/berries/jaboca_berry.json | 10 +++++++- .../data/cobblemon/berries/kasib_berry.json | 10 +++++++- .../data/cobblemon/berries/kebia_berry.json | 10 +++++++- .../data/cobblemon/berries/kee_berry.json | 10 +++++++- .../data/cobblemon/berries/kelpsy_berry.json | 10 +++++++- .../data/cobblemon/berries/lansat_berry.json | 10 +++++++- .../data/cobblemon/berries/leppa_berry.json | 10 +++++++- .../data/cobblemon/berries/liechi_berry.json | 10 +++++++- .../data/cobblemon/berries/lum_berry.json | 10 +++++++- .../data/cobblemon/berries/mago_berry.json | 10 +++++++- .../data/cobblemon/berries/magost_berry.json | 10 +++++++- .../data/cobblemon/berries/maranga_berry.json | 10 +++++++- .../data/cobblemon/berries/micle_berry.json | 10 +++++++- .../data/cobblemon/berries/nanab_berry.json | 10 +++++++- .../data/cobblemon/berries/nomel_berry.json | 10 +++++++- .../data/cobblemon/berries/occa_berry.json | 10 +++++++- .../data/cobblemon/berries/oran_berry.json | 10 +++++++- .../data/cobblemon/berries/pamtre_berry.json | 10 +++++++- .../data/cobblemon/berries/passho_berry.json | 10 +++++++- .../data/cobblemon/berries/payapa_berry.json | 10 +++++++- .../data/cobblemon/berries/pecha_berry.json | 10 +++++++- .../data/cobblemon/berries/persim_berry.json | 10 +++++++- .../data/cobblemon/berries/petaya_berry.json | 10 +++++++- .../data/cobblemon/berries/pinap_berry.json | 10 +++++++- .../data/cobblemon/berries/pomeg_berry.json | 10 +++++++- .../data/cobblemon/berries/qualot_berry.json | 10 +++++++- .../data/cobblemon/berries/rabuta_berry.json | 10 +++++++- .../data/cobblemon/berries/rawst_berry.json | 10 +++++++- .../data/cobblemon/berries/razz_berry.json | 10 +++++++- .../data/cobblemon/berries/rindo_berry.json | 10 +++++++- .../data/cobblemon/berries/roseli_berry.json | 10 +++++++- .../data/cobblemon/berries/rowap_berry.json | 10 +++++++- .../data/cobblemon/berries/salac_berry.json | 10 +++++++- .../data/cobblemon/berries/shuca_berry.json | 10 +++++++- .../data/cobblemon/berries/sitrus_berry.json | 10 +++++++- .../data/cobblemon/berries/spelon_berry.json | 10 +++++++- .../data/cobblemon/berries/starf_berry.json | 10 +++++++- .../data/cobblemon/berries/tamato_berry.json | 10 +++++++- .../data/cobblemon/berries/tanga_berry.json | 10 +++++++- .../data/cobblemon/berries/touga_berry.json | 10 +++++++- .../data/cobblemon/berries/wacan_berry.json | 10 +++++++- .../data/cobblemon/berries/watmel_berry.json | 10 +++++++- .../data/cobblemon/berries/wepear_berry.json | 10 +++++++- .../data/cobblemon/berries/wiki_berry.json | 10 +++++++- .../data/cobblemon/berries/yache_berry.json | 10 +++++++- gradle/libs.versions.toml | 8 +++---- .../client/CobblemonNeoForgeClient.kt | 4 ++-- utilityscripts/berry_spreadsheet_to_json.py | 23 +++++++++++++------ 73 files changed, 650 insertions(+), 87 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37994ce471..b3d39c127c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -157,6 +157,8 @@ - Fixed Fast Ball capture rate applying to all Pokémon. - Fix "learned new move" messages appearing for already known moves on Pokémon evolutions. - Fix Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames. +- Fixed Berries not giving bonus yields when planted in their preferred biomes +- Fix NeoForge not supporting "SodiumDynamicLights" ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. diff --git a/common/src/main/resources/data/cobblemon/berries/aguav_berry.json b/common/src/main/resources/data/cobblemon/berries/aguav_berry.json index 0d179efe0b..466149b30b 100644 --- a/common/src/main/resources/data/cobblemon/berries/aguav_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/aguav_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/apicot_berry.json b/common/src/main/resources/data/cobblemon/berries/apicot_berry.json index c5279ca86b..0ab375c8ae 100644 --- a/common/src/main/resources/data/cobblemon/berries/apicot_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/apicot_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/aspear_berry.json b/common/src/main/resources/data/cobblemon/berries/aspear_berry.json index daaad10fb4..b4b2ca9dc4 100644 --- a/common/src/main/resources/data/cobblemon/berries/aspear_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/aspear_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/babiri_berry.json b/common/src/main/resources/data/cobblemon/berries/babiri_berry.json index 4a10fd7b1b..25ae40a53c 100644 --- a/common/src/main/resources/data/cobblemon/berries/babiri_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/babiri_berry.json @@ -19,7 +19,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/belue_berry.json b/common/src/main/resources/data/cobblemon/berries/belue_berry.json index ca696adeb9..7897c7144b 100644 --- a/common/src/main/resources/data/cobblemon/berries/belue_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/belue_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/bluk_berry.json b/common/src/main/resources/data/cobblemon/berries/bluk_berry.json index 71a89e0c1e..f1744b9d34 100644 --- a/common/src/main/resources/data/cobblemon/berries/bluk_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/bluk_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/charti_berry.json b/common/src/main/resources/data/cobblemon/berries/charti_berry.json index f5c71d00a9..8b4b80b35b 100644 --- a/common/src/main/resources/data/cobblemon/berries/charti_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/charti_berry.json @@ -21,7 +21,15 @@ "coarse", "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/cheri_berry.json b/common/src/main/resources/data/cobblemon/berries/cheri_berry.json index 6ff17d6a47..b54e5df98b 100644 --- a/common/src/main/resources/data/cobblemon/berries/cheri_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/cheri_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/chesto_berry.json b/common/src/main/resources/data/cobblemon/berries/chesto_berry.json index 8721e186f8..5b13158e54 100644 --- a/common/src/main/resources/data/cobblemon/berries/chesto_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/chesto_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/chilan_berry.json b/common/src/main/resources/data/cobblemon/berries/chilan_berry.json index d9f7dd4733..54c27be7bc 100644 --- a/common/src/main/resources/data/cobblemon/berries/chilan_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/chilan_berry.json @@ -19,7 +19,15 @@ "loamy", "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/chople_berry.json b/common/src/main/resources/data/cobblemon/berries/chople_berry.json index 575b54310c..6631033424 100644 --- a/common/src/main/resources/data/cobblemon/berries/chople_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/chople_berry.json @@ -19,7 +19,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/coba_berry.json b/common/src/main/resources/data/cobblemon/berries/coba_berry.json index 89c0136396..afee91132d 100644 --- a/common/src/main/resources/data/cobblemon/berries/coba_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/coba_berry.json @@ -20,7 +20,15 @@ "loamy", "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/colbur_berry.json b/common/src/main/resources/data/cobblemon/berries/colbur_berry.json index 103147ec32..1fd20c719b 100644 --- a/common/src/main/resources/data/cobblemon/berries/colbur_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/colbur_berry.json @@ -20,7 +20,15 @@ "coarse", "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/cornn_berry.json b/common/src/main/resources/data/cobblemon/berries/cornn_berry.json index 7887e7001e..a556ba97d8 100644 --- a/common/src/main/resources/data/cobblemon/berries/cornn_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/cornn_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/custap_berry.json b/common/src/main/resources/data/cobblemon/berries/custap_berry.json index b6a63d8349..d412036dde 100644 --- a/common/src/main/resources/data/cobblemon/berries/custap_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/custap_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/durin_berry.json b/common/src/main/resources/data/cobblemon/berries/durin_berry.json index 900e64b2fe..cefcdf2cee 100644 --- a/common/src/main/resources/data/cobblemon/berries/durin_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/durin_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/enigma_berry.json b/common/src/main/resources/data/cobblemon/berries/enigma_berry.json index de447e3269..f7d5bb7de6 100644 --- a/common/src/main/resources/data/cobblemon/berries/enigma_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/enigma_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/figy_berry.json b/common/src/main/resources/data/cobblemon/berries/figy_berry.json index 35c0c88c06..0e3607aac7 100644 --- a/common/src/main/resources/data/cobblemon/berries/figy_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/figy_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/ganlon_berry.json b/common/src/main/resources/data/cobblemon/berries/ganlon_berry.json index ab6ea2c5b0..959fe70e72 100644 --- a/common/src/main/resources/data/cobblemon/berries/ganlon_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/ganlon_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/grepa_berry.json b/common/src/main/resources/data/cobblemon/berries/grepa_berry.json index f259e214c9..52dbb8cf4c 100644 --- a/common/src/main/resources/data/cobblemon/berries/grepa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/grepa_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/haban_berry.json b/common/src/main/resources/data/cobblemon/berries/haban_berry.json index 915b18f3be..9a1a052d0e 100644 --- a/common/src/main/resources/data/cobblemon/berries/haban_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/haban_berry.json @@ -22,7 +22,15 @@ "coarse", "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/hondew_berry.json b/common/src/main/resources/data/cobblemon/berries/hondew_berry.json index 106a04e200..3f7c4df06c 100644 --- a/common/src/main/resources/data/cobblemon/berries/hondew_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/hondew_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/hopo_berry.json b/common/src/main/resources/data/cobblemon/berries/hopo_berry.json index c4851c37f9..211172bcce 100644 --- a/common/src/main/resources/data/cobblemon/berries/hopo_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/hopo_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ @@ -154,11 +162,11 @@ "sproutShape": "tall-sprout", "matureShape": "tall-mature", "flavors": { - "SPICY": 20, - "DRY": 20, - "SWEET": 20, - "BITTER": 20, - "SOUR": 20 + "SPICY": 15, + "DRY": 15, + "SWEET": 15, + "BITTER": 15, + "SOUR": 15 }, "weight": 1.0, "tintIndexes": [], diff --git a/common/src/main/resources/data/cobblemon/berries/iapapa_berry.json b/common/src/main/resources/data/cobblemon/berries/iapapa_berry.json index 18441ef5f4..1c9670afb1 100644 --- a/common/src/main/resources/data/cobblemon/berries/iapapa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/iapapa_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": false, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/jaboca_berry.json b/common/src/main/resources/data/cobblemon/berries/jaboca_berry.json index cf716298ff..0c405fa3aa 100644 --- a/common/src/main/resources/data/cobblemon/berries/jaboca_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/jaboca_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/kasib_berry.json b/common/src/main/resources/data/cobblemon/berries/kasib_berry.json index 86072f98ff..fecffed79a 100644 --- a/common/src/main/resources/data/cobblemon/berries/kasib_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/kasib_berry.json @@ -22,7 +22,15 @@ "coarse", "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/kebia_berry.json b/common/src/main/resources/data/cobblemon/berries/kebia_berry.json index e1657bc4fa..8b4ace8f8b 100644 --- a/common/src/main/resources/data/cobblemon/berries/kebia_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/kebia_berry.json @@ -21,7 +21,15 @@ "humid", "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/kee_berry.json b/common/src/main/resources/data/cobblemon/berries/kee_berry.json index 0faedd276c..fab2ae207d 100644 --- a/common/src/main/resources/data/cobblemon/berries/kee_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/kee_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/kelpsy_berry.json b/common/src/main/resources/data/cobblemon/berries/kelpsy_berry.json index 22452e2ade..1a7521da8c 100644 --- a/common/src/main/resources/data/cobblemon/berries/kelpsy_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/kelpsy_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/lansat_berry.json b/common/src/main/resources/data/cobblemon/berries/lansat_berry.json index c99ff275da..9b89409d58 100644 --- a/common/src/main/resources/data/cobblemon/berries/lansat_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/lansat_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/leppa_berry.json b/common/src/main/resources/data/cobblemon/berries/leppa_berry.json index cdaf37887e..c64ed86ea6 100644 --- a/common/src/main/resources/data/cobblemon/berries/leppa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/leppa_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/liechi_berry.json b/common/src/main/resources/data/cobblemon/berries/liechi_berry.json index 374e5f0874..48075ce7eb 100644 --- a/common/src/main/resources/data/cobblemon/berries/liechi_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/liechi_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/lum_berry.json b/common/src/main/resources/data/cobblemon/berries/lum_berry.json index de6c349789..f869581851 100644 --- a/common/src/main/resources/data/cobblemon/berries/lum_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/lum_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/mago_berry.json b/common/src/main/resources/data/cobblemon/berries/mago_berry.json index 092856c81a..3f237189e1 100644 --- a/common/src/main/resources/data/cobblemon/berries/mago_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/mago_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/magost_berry.json b/common/src/main/resources/data/cobblemon/berries/magost_berry.json index 1dc76bae8c..0e6521c62d 100644 --- a/common/src/main/resources/data/cobblemon/berries/magost_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/magost_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/maranga_berry.json b/common/src/main/resources/data/cobblemon/berries/maranga_berry.json index f65030d75a..eb8875391b 100644 --- a/common/src/main/resources/data/cobblemon/berries/maranga_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/maranga_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/micle_berry.json b/common/src/main/resources/data/cobblemon/berries/micle_berry.json index 884a310b3b..8d48cdcbee 100644 --- a/common/src/main/resources/data/cobblemon/berries/micle_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/micle_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/nanab_berry.json b/common/src/main/resources/data/cobblemon/berries/nanab_berry.json index e1d15cebf4..9fa013dcbf 100644 --- a/common/src/main/resources/data/cobblemon/berries/nanab_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/nanab_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/nomel_berry.json b/common/src/main/resources/data/cobblemon/berries/nomel_berry.json index ed465878ee..f1432588b0 100644 --- a/common/src/main/resources/data/cobblemon/berries/nomel_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/nomel_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/occa_berry.json b/common/src/main/resources/data/cobblemon/berries/occa_berry.json index 07fc0a53e4..6b055fbaac 100644 --- a/common/src/main/resources/data/cobblemon/berries/occa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/occa_berry.json @@ -21,7 +21,15 @@ "humid", "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/oran_berry.json b/common/src/main/resources/data/cobblemon/berries/oran_berry.json index 0813335059..6dcd303ea9 100644 --- a/common/src/main/resources/data/cobblemon/berries/oran_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/oran_berry.json @@ -18,7 +18,15 @@ "peat", "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/pamtre_berry.json b/common/src/main/resources/data/cobblemon/berries/pamtre_berry.json index 769bf8f8a5..cfbc52f8db 100644 --- a/common/src/main/resources/data/cobblemon/berries/pamtre_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/pamtre_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/passho_berry.json b/common/src/main/resources/data/cobblemon/berries/passho_berry.json index e5fbcccc08..fd95d0aa09 100644 --- a/common/src/main/resources/data/cobblemon/berries/passho_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/passho_berry.json @@ -21,7 +21,15 @@ "humid", "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/payapa_berry.json b/common/src/main/resources/data/cobblemon/berries/payapa_berry.json index 61b8f6b015..de5bb4ce3e 100644 --- a/common/src/main/resources/data/cobblemon/berries/payapa_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/payapa_berry.json @@ -22,7 +22,15 @@ "loamy", "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/pecha_berry.json b/common/src/main/resources/data/cobblemon/berries/pecha_berry.json index 3277b2fe76..727f5d29ea 100644 --- a/common/src/main/resources/data/cobblemon/berries/pecha_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/pecha_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/persim_berry.json b/common/src/main/resources/data/cobblemon/berries/persim_berry.json index 40b43b0936..3361ec4b8e 100644 --- a/common/src/main/resources/data/cobblemon/berries/persim_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/persim_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/petaya_berry.json b/common/src/main/resources/data/cobblemon/berries/petaya_berry.json index b73a5c1b69..885956b9ec 100644 --- a/common/src/main/resources/data/cobblemon/berries/petaya_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/petaya_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/pinap_berry.json b/common/src/main/resources/data/cobblemon/berries/pinap_berry.json index 0ade76e79e..ee86bc6d8b 100644 --- a/common/src/main/resources/data/cobblemon/berries/pinap_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/pinap_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": false, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json b/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json index 8a7191f843..bd2f55cd43 100644 --- a/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/pomeg_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/qualot_berry.json b/common/src/main/resources/data/cobblemon/berries/qualot_berry.json index 2d1c1b6ed1..fcc17ec87c 100644 --- a/common/src/main/resources/data/cobblemon/berries/qualot_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/qualot_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/rabuta_berry.json b/common/src/main/resources/data/cobblemon/berries/rabuta_berry.json index 6d00fb1dec..0e6a444cbe 100644 --- a/common/src/main/resources/data/cobblemon/berries/rabuta_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/rabuta_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/rawst_berry.json b/common/src/main/resources/data/cobblemon/berries/rawst_berry.json index c4e6d073d8..ec9ae77ee9 100644 --- a/common/src/main/resources/data/cobblemon/berries/rawst_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/rawst_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/razz_berry.json b/common/src/main/resources/data/cobblemon/berries/razz_berry.json index 429f0bd01f..0c60fea506 100644 --- a/common/src/main/resources/data/cobblemon/berries/razz_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/razz_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/rindo_berry.json b/common/src/main/resources/data/cobblemon/berries/rindo_berry.json index 04337ada0c..3e6bcdae4c 100644 --- a/common/src/main/resources/data/cobblemon/berries/rindo_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/rindo_berry.json @@ -21,7 +21,15 @@ "loamy", "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/roseli_berry.json b/common/src/main/resources/data/cobblemon/berries/roseli_berry.json index 84a1b09b95..6dcd4931ea 100644 --- a/common/src/main/resources/data/cobblemon/berries/roseli_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/roseli_berry.json @@ -21,7 +21,15 @@ "loamy", "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/rowap_berry.json b/common/src/main/resources/data/cobblemon/berries/rowap_berry.json index fef545cd12..a25a617926 100644 --- a/common/src/main/resources/data/cobblemon/berries/rowap_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/rowap_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/salac_berry.json b/common/src/main/resources/data/cobblemon/berries/salac_berry.json index 0e7881b397..af22ab24a9 100644 --- a/common/src/main/resources/data/cobblemon/berries/salac_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/salac_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/shuca_berry.json b/common/src/main/resources/data/cobblemon/berries/shuca_berry.json index 951837d45e..2c0dd476d1 100644 --- a/common/src/main/resources/data/cobblemon/berries/shuca_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/shuca_berry.json @@ -19,7 +19,15 @@ "loamy", "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/sitrus_berry.json b/common/src/main/resources/data/cobblemon/berries/sitrus_berry.json index 1b8e6cac2c..45699e849a 100644 --- a/common/src/main/resources/data/cobblemon/berries/sitrus_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/sitrus_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/spelon_berry.json b/common/src/main/resources/data/cobblemon/berries/spelon_berry.json index 139d380099..215242f794 100644 --- a/common/src/main/resources/data/cobblemon/berries/spelon_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/spelon_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/starf_berry.json b/common/src/main/resources/data/cobblemon/berries/starf_berry.json index 546ba7f381..ad65bca69d 100644 --- a/common/src/main/resources/data/cobblemon/berries/starf_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/starf_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/tamato_berry.json b/common/src/main/resources/data/cobblemon/berries/tamato_berry.json index 94193325f6..45746af22b 100644 --- a/common/src/main/resources/data/cobblemon/berries/tamato_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/tamato_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/tanga_berry.json b/common/src/main/resources/data/cobblemon/berries/tanga_berry.json index 8b8510fcf8..30772b452a 100644 --- a/common/src/main/resources/data/cobblemon/berries/tanga_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/tanga_berry.json @@ -20,7 +20,15 @@ "humid", "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/touga_berry.json b/common/src/main/resources/data/cobblemon/berries/touga_berry.json index aff1629d67..887b1b11f3 100644 --- a/common/src/main/resources/data/cobblemon/berries/touga_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/touga_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "peat" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/wacan_berry.json b/common/src/main/resources/data/cobblemon/berries/wacan_berry.json index fa6357388c..c9e26ff827 100644 --- a/common/src/main/resources/data/cobblemon/berries/wacan_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/wacan_berry.json @@ -21,7 +21,15 @@ "loamy", "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/watmel_berry.json b/common/src/main/resources/data/cobblemon/berries/watmel_berry.json index 4e7f167d6a..9a8de5253e 100644 --- a/common/src/main/resources/data/cobblemon/berries/watmel_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/watmel_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "humid" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/wepear_berry.json b/common/src/main/resources/data/cobblemon/berries/wepear_berry.json index 04e4d70d0c..89332832ba 100644 --- a/common/src/main/resources/data/cobblemon/berries/wepear_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/wepear_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "loamy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [ { diff --git a/common/src/main/resources/data/cobblemon/berries/wiki_berry.json b/common/src/main/resources/data/cobblemon/berries/wiki_berry.json index 70012dc299..5e33b9cf7f 100644 --- a/common/src/main/resources/data/cobblemon/berries/wiki_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/wiki_berry.json @@ -17,7 +17,15 @@ "favoriteMulches": [ "sandy" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": true, "spawnConditions": [], "growthPoints": [ diff --git a/common/src/main/resources/data/cobblemon/berries/yache_berry.json b/common/src/main/resources/data/cobblemon/berries/yache_berry.json index c49507c2ca..b0c76efdac 100644 --- a/common/src/main/resources/data/cobblemon/berries/yache_berry.json +++ b/common/src/main/resources/data/cobblemon/berries/yache_berry.json @@ -18,7 +18,15 @@ "favoriteMulches": [ "coarse" ], - "growthFactors": [], + "growthFactors": [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": 0, + "max": 1 + } + } + ], "randomizedGrowthPoints": false, "spawnConditions": [ { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9db3a3b37c..6352d291a0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -35,10 +35,10 @@ debugutils-forge = "1.21-1.0.6-neoforge" mongo = "4.10.2" # Testing -junit = "5.9.0" -mockito = "5.2.0" -mockk = "1.12.1" -classgraph = "4.8.153" +junit = "5.11.4" +mockito = "5.14.2" +mockk = "1.13.14" +classgraph = "4.8.179" [libraries] # General Buildscript Plugins diff --git a/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/CobblemonNeoForgeClient.kt b/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/CobblemonNeoForgeClient.kt index c9cf337728..b4e9a16ab8 100644 --- a/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/CobblemonNeoForgeClient.kt +++ b/neoforge/src/main/kotlin/com/cobblemon/mod/neoforge/client/CobblemonNeoForgeClient.kt @@ -232,9 +232,9 @@ object CobblemonNeoForgeClient : CobblemonClientImplementation { private fun attemptModCompat() { // They have no Maven nor are they published on Modrinth :( // Good thing is they are a copy pasta adapted to Forge :D - if (Cobblemon.implementation.isModInstalled("dynamiclightsreforged")) { + if (Cobblemon.implementation.isModInstalled("dynamiclightsreforged") || Cobblemon.implementation.isModInstalled("sodiumdynamiclights")) { LambDynamicLightsCompat.hookCompat() - Cobblemon.LOGGER.info("Dynamic Lights Reforged compatibility enabled") + Cobblemon.LOGGER.info("Dynamic Lights compatibility enabled") } } } \ No newline at end of file diff --git a/utilityscripts/berry_spreadsheet_to_json.py b/utilityscripts/berry_spreadsheet_to_json.py index 02e2d2ea61..6223d502d6 100644 --- a/utilityscripts/berry_spreadsheet_to_json.py +++ b/utilityscripts/berry_spreadsheet_to_json.py @@ -4,9 +4,11 @@ import json import requests from openpyxl import load_workbook +berry_data_wb = load_workbook(filename="Cobblemon Berry Data.xlsx", data_only=True) +berry_placements_wb = load_workbook(filename="Berry Placements.xlsx", data_only=True) +berry_mutations_wb = load_workbook(filename="Berry Mutations (v2).xlsx", data_only=True) def stuff(): - berry_data_wb = load_workbook(filename="Cobblemon Berry Data.xlsx", data_only=True) berry_dict = {} berry_file_name = "" for row in berry_data_wb.active.iter_rows(2): @@ -35,8 +37,18 @@ def stuff(): } fav_mulches = [i.lower() for i in row[3].value.split(", ")] berry_dict["favoriteMulches"] = fav_mulches - berry_dict["growthFactors"] = [] - berry_dict["randomizedGrowthPoints"] = True + betterYields = row[5].value.split("-") + berry_dict["growthFactors"] = [ + { + "variant": "cobblemon:preferred_biome", + "bonusYield": { + "min": int(betterYields[0]) - int(baseYields[0]), + "max": int(betterYields[1]) - int(baseYields[1]) + } + } + ] + place_row = berry_placements_wb.active[row[0].row + 1] + berry_dict["randomizedGrowthPoints"] = True if place_row[2].value == '❌' else False spawn_type = row[11].value if spawn_type == "PREFERRED_BIOME": berry_dict["spawnConditions"] = [ @@ -88,12 +100,11 @@ def stuff(): berry_dict["fruitModel"] = f"cobblemon:{berry_prefix}_berry.geo" berry_dict["fruitTexture"] = f"cobblemon:{berry_prefix}" berry_dict["boneMealChance"] = int(row[21].value) / 100.0 - with open(f"berries/{berry_file_name}", "w+") as file: + with open(f"../common/src/main/resources/data/cobblemon/berries/{berry_file_name}", "w+") as file: file.write(json.dumps(berry_dict, indent=2)) def get_growth_points(rowNum): - berry_placements_wb = load_workbook(filename="Berry Placements.xlsx", data_only=True) row = berry_placements_wb.active[rowNum + 1] numSpots = 0 for i in range(0, 10): @@ -118,7 +129,6 @@ def get_growth_points(rowNum): return result def get_stage_one_y_pos(rowNum): - berry_placements_wb = load_workbook(filename="Berry Placements.xlsx", data_only=True) row = berry_placements_wb.active[rowNum + 1] return { "position": { @@ -134,7 +144,6 @@ def get_stage_one_y_pos(rowNum): } def get_mutations(berry_name): - berry_mutations_wb = load_workbook(filename="Berry Mutations (v2).xlsx", data_only=True) result = {} for row in berry_mutations_wb.active.iter_rows(2): add_mutation = False From 107ec7634d538c8cccc7f02bf0252065f7dc9c2c Mon Sep 17 00:00:00 2001 From: Konoha Date: Mon, 20 Jan 2025 16:16:28 -0500 Subject: [PATCH 069/121] Temp-Swap Unsupported Evo Item References & Sidemod Tutor Support Temporarily exchanges items that aren't in Cobblemon referenced on some species with items that are, avoiding the crash that would occur when Bisharp's evolution was parsed. Adds a new utility script to mass-manage TM/Tutor moves from the movepool. Reintroduces the "tutor" subset of TMs for addons that utilize the source already. More aggressive culling on unplanned base-mod TM moves from level/egg pools, this prevents breakage with addons using the "lazy" way of only pulling the source in species data. Doing this will eventually break custom TMs in the TMM, so it is recommended that addons/plugins migrate to global lists of TMs for interfacing moves instead of just pulling "tm:" for each species. Also re-preps the aspect format for Keldeo's species feature to match others. --- .../cobblemon/species/generation1/abra.json | 39 +- .../species/generation1/aerodactyl.json | 41 +- .../species/generation1/alakazam.json | 48 +- .../cobblemon/species/generation1/arbok.json | 51 +- .../species/generation1/arcanine.json | 79 +- .../species/generation1/articuno.json | 60 +- .../species/generation1/beedrill.json | 39 +- .../species/generation1/bellsprout.json | 32 +- .../species/generation1/blastoise.json | 51 +- .../species/generation1/bulbasaur.json | 34 +- .../species/generation1/butterfree.json | 34 +- .../species/generation1/caterpie.json | 6 +- .../species/generation1/chansey.json | 65 +- .../species/generation1/charizard.json | 46 +- .../species/generation1/charmander.json | 36 +- .../species/generation1/charmeleon.json | 36 +- .../species/generation1/clefable.json | 83 +- .../species/generation1/clefairy.json | 80 +- .../species/generation1/cloyster.json | 34 +- .../cobblemon/species/generation1/cubone.json | 45 +- .../species/generation1/dewgong.json | 40 +- .../species/generation1/diglett.json | 69 +- .../cobblemon/species/generation1/ditto.json | 3 +- .../cobblemon/species/generation1/dodrio.json | 36 +- .../cobblemon/species/generation1/doduo.json | 32 +- .../species/generation1/dragonair.json | 31 +- .../species/generation1/dragonite.json | 52 +- .../species/generation1/dratini.json | 31 +- .../species/generation1/drowzee.json | 44 +- .../species/generation1/dugtrio.json | 80 +- .../cobblemon/species/generation1/eevee.json | 31 +- .../cobblemon/species/generation1/ekans.json | 43 +- .../species/generation1/electabuzz.json | 42 +- .../species/generation1/electrode.json | 56 +- .../species/generation1/exeggcute.json | 35 +- .../species/generation1/exeggutor.json | 105 +- .../species/generation1/farfetchd.json | 75 +- .../cobblemon/species/generation1/fearow.json | 35 +- .../species/generation1/flareon.json | 46 +- .../cobblemon/species/generation1/gastly.json | 45 +- .../cobblemon/species/generation1/gengar.json | 57 +- .../species/generation1/geodude.json | 66 +- .../cobblemon/species/generation1/gloom.json | 34 +- .../cobblemon/species/generation1/golbat.json | 38 +- .../species/generation1/goldeen.json | 34 +- .../species/generation1/golduck.json | 55 +- .../cobblemon/species/generation1/golem.json | 77 +- .../species/generation1/graveler.json | 70 +- .../cobblemon/species/generation1/grimer.json | 86 +- .../species/generation1/growlithe.json | 58 +- .../species/generation1/gyarados.json | 36 +- .../species/generation1/haunter.json | 48 +- .../species/generation1/hitmonchan.json | 45 +- .../species/generation1/hitmonlee.json | 46 +- .../cobblemon/species/generation1/horsea.json | 34 +- .../cobblemon/species/generation1/hypno.json | 48 +- .../species/generation1/ivysaur.json | 34 +- .../species/generation1/jigglypuff.json | 67 +- .../species/generation1/jolteon.json | 45 +- .../cobblemon/species/generation1/jynx.json | 55 +- .../cobblemon/species/generation1/kabuto.json | 33 +- .../species/generation1/kabutops.json | 48 +- .../species/generation1/kadabra.json | 45 +- .../cobblemon/species/generation1/kakuna.json | 9 +- .../species/generation1/kangaskhan.json | 57 +- .../species/generation1/kingler.json | 43 +- .../species/generation1/koffing.json | 30 +- .../cobblemon/species/generation1/krabby.json | 38 +- .../cobblemon/species/generation1/lapras.json | 45 +- .../species/generation1/lickitung.json | 50 +- .../species/generation1/machamp.json | 49 +- .../species/generation1/machoke.json | 43 +- .../cobblemon/species/generation1/machop.json | 42 +- .../species/generation1/magikarp.json | 4 +- .../cobblemon/species/generation1/magmar.json | 41 +- .../species/generation1/magnemite.json | 30 +- .../species/generation1/magneton.json | 31 +- .../cobblemon/species/generation1/mankey.json | 50 +- .../species/generation1/marowak.json | 111 ++- .../cobblemon/species/generation1/meowth.json | 125 ++- .../species/generation1/metapod.json | 8 +- .../cobblemon/species/generation1/mew.json | 169 +++- .../cobblemon/species/generation1/mewtwo.json | 66 +- .../species/generation1/moltres.json | 54 +- .../cobblemon/species/generation1/mrmime.json | 112 ++- .../cobblemon/species/generation1/muk.json | 100 +- .../species/generation1/nidoking.json | 60 +- .../species/generation1/nidoqueen.json | 59 +- .../species/generation1/nidoranf.json | 35 +- .../species/generation1/nidoranm.json | 36 +- .../species/generation1/nidorina.json | 36 +- .../species/generation1/nidorino.json | 37 +- .../species/generation1/ninetales.json | 83 +- .../cobblemon/species/generation1/oddish.json | 34 +- .../species/generation1/omanyte.json | 32 +- .../species/generation1/omastar.json | 37 +- .../cobblemon/species/generation1/onix.json | 36 +- .../cobblemon/species/generation1/paras.json | 38 +- .../species/generation1/parasect.json | 42 +- .../species/generation1/persian.json | 97 +- .../species/generation1/pidgeot.json | 29 +- .../species/generation1/pidgeotto.json | 26 +- .../cobblemon/species/generation1/pidgey.json | 25 +- .../species/generation1/pikachu.json | 44 +- .../cobblemon/species/generation1/pinsir.json | 41 +- .../species/generation1/poliwag.json | 33 +- .../species/generation1/poliwhirl.json | 34 +- .../species/generation1/poliwrath.json | 50 +- .../cobblemon/species/generation1/ponyta.json | 58 +- .../species/generation1/porygon.json | 37 +- .../species/generation1/primeape.json | 56 +- .../species/generation1/psyduck.json | 49 +- .../cobblemon/species/generation1/raichu.json | 98 +- .../species/generation1/rapidash.json | 77 +- .../species/generation1/raticate.json | 84 +- .../species/generation1/rattata.json | 71 +- .../cobblemon/species/generation1/rhydon.json | 62 +- .../species/generation1/rhyhorn.json | 48 +- .../species/generation1/sandshrew.json | 95 +- .../species/generation1/sandslash.json | 107 +- .../species/generation1/scyther.json | 36 +- .../cobblemon/species/generation1/seadra.json | 36 +- .../species/generation1/seaking.json | 36 +- .../cobblemon/species/generation1/seel.json | 33 +- .../species/generation1/shellder.json | 26 +- .../species/generation1/slowbro.json | 99 +- .../species/generation1/slowpoke.json | 87 +- .../species/generation1/snorlax.json | 73 +- .../species/generation1/spearow.json | 31 +- .../species/generation1/squirtle.json | 42 +- .../species/generation1/starmie.json | 42 +- .../cobblemon/species/generation1/staryu.json | 31 +- .../species/generation1/tangela.json | 35 +- .../cobblemon/species/generation1/tauros.json | 114 ++- .../species/generation1/tentacool.json | 36 +- .../species/generation1/tentacruel.json | 41 +- .../species/generation1/vaporeon.json | 47 +- .../species/generation1/venomoth.json | 38 +- .../species/generation1/venonat.json | 29 +- .../species/generation1/venusaur.json | 43 +- .../species/generation1/victreebel.json | 40 +- .../species/generation1/vileplume.json | 39 +- .../species/generation1/voltorb.json | 49 +- .../cobblemon/species/generation1/vulpix.json | 71 +- .../species/generation1/wartortle.json | 42 +- .../cobblemon/species/generation1/weedle.json | 7 +- .../species/generation1/weepinbell.json | 34 +- .../species/generation1/weezing.json | 75 +- .../species/generation1/wigglytuff.json | 72 +- .../cobblemon/species/generation1/zapdos.json | 60 +- .../cobblemon/species/generation1/zubat.json | 36 +- .../cobblemon/species/generation2/aipom.json | 48 +- .../species/generation2/ampharos.json | 43 +- .../species/generation2/ariados.json | 41 +- .../species/generation2/azumarill.json | 50 +- .../species/generation2/bayleef.json | 35 +- .../species/generation2/bellossom.json | 44 +- .../species/generation2/blissey.json | 69 +- .../cobblemon/species/generation2/celebi.json | 52 +- .../species/generation2/chikorita.json | 31 +- .../species/generation2/chinchou.json | 32 +- .../cobblemon/species/generation2/cleffa.json | 46 +- .../species/generation2/corsola.json | 78 +- .../cobblemon/species/generation2/crobat.json | 41 +- .../species/generation2/croconaw.json | 44 +- .../species/generation2/cyndaquil.json | 35 +- .../species/generation2/delibird.json | 44 +- .../species/generation2/donphan.json | 53 +- .../species/generation2/dunsparce.json | 55 +- .../cobblemon/species/generation2/elekid.json | 37 +- .../cobblemon/species/generation2/entei.json | 33 +- .../cobblemon/species/generation2/espeon.json | 50 +- .../species/generation2/feraligatr.json | 54 +- .../species/generation2/flaaffy.json | 34 +- .../species/generation2/forretress.json | 43 +- .../cobblemon/species/generation2/furret.json | 52 +- .../species/generation2/girafarig.json | 51 +- .../cobblemon/species/generation2/gligar.json | 52 +- .../species/generation2/granbull.json | 57 +- .../species/generation2/heracross.json | 44 +- .../species/generation2/hitmontop.json | 44 +- .../cobblemon/species/generation2/hooh.json | 44 +- .../species/generation2/hoothoot.json | 41 +- .../cobblemon/species/generation2/hoppip.json | 33 +- .../species/generation2/houndoom.json | 47 +- .../species/generation2/houndour.json | 42 +- .../species/generation2/igglybuff.json | 38 +- .../species/generation2/jumpluff.json | 36 +- .../species/generation2/kingdra.json | 38 +- .../species/generation2/lanturn.json | 39 +- .../species/generation2/larvitar.json | 33 +- .../cobblemon/species/generation2/ledian.json | 31 +- .../cobblemon/species/generation2/ledyba.json | 28 +- .../cobblemon/species/generation2/lugia.json | 53 +- .../cobblemon/species/generation2/magby.json | 36 +- .../species/generation2/magcargo.json | 38 +- .../species/generation2/mantine.json | 42 +- .../cobblemon/species/generation2/mareep.json | 27 +- .../cobblemon/species/generation2/marill.json | 48 +- .../species/generation2/meganium.json | 45 +- .../species/generation2/miltank.json | 47 +- .../species/generation2/misdreavus.json | 46 +- .../species/generation2/murkrow.json | 40 +- .../cobblemon/species/generation2/natu.json | 44 +- .../species/generation2/noctowl.json | 44 +- .../species/generation2/octillery.json | 41 +- .../cobblemon/species/generation2/phanpy.json | 38 +- .../cobblemon/species/generation2/pichu.json | 31 +- .../species/generation2/piloswine.json | 38 +- .../cobblemon/species/generation2/pineco.json | 28 +- .../species/generation2/politoed.json | 39 +- .../species/generation2/porygon2.json | 38 +- .../species/generation2/pupitar.json | 36 +- .../species/generation2/quagsire.json | 42 +- .../species/generation2/quilava.json | 38 +- .../species/generation2/qwilfish.json | 83 +- .../cobblemon/species/generation2/raikou.json | 34 +- .../species/generation2/remoraid.json | 33 +- .../cobblemon/species/generation2/scizor.json | 43 +- .../species/generation2/sentret.json | 47 +- .../species/generation2/shuckle.json | 40 +- .../species/generation2/skarmory.json | 41 +- .../species/generation2/skiploom.json | 34 +- .../species/generation2/slowking.json | 107 +- .../cobblemon/species/generation2/slugma.json | 33 +- .../species/generation2/smeargle.json | 3 +- .../species/generation2/smoochum.json | 41 +- .../species/generation2/sneasel.json | 90 +- .../species/generation2/snubbull.json | 51 +- .../species/generation2/spinarak.json | 36 +- .../species/generation2/stantler.json | 49 +- .../species/generation2/steelix.json | 50 +- .../species/generation2/sudowoodo.json | 45 +- .../species/generation2/suicune.json | 35 +- .../species/generation2/sunflora.json | 33 +- .../species/generation2/sunkern.json | 25 +- .../cobblemon/species/generation2/swinub.json | 32 +- .../species/generation2/teddiursa.json | 44 +- .../cobblemon/species/generation2/togepi.json | 48 +- .../species/generation2/togetic.json | 62 +- .../species/generation2/totodile.json | 41 +- .../species/generation2/typhlosion.json | 111 ++- .../species/generation2/tyranitar.json | 56 +- .../species/generation2/tyrogue.json | 28 +- .../species/generation2/umbreon.json | 49 +- .../cobblemon/species/generation2/unown.json | 3 +- .../species/generation2/ursaring.json | 52 +- .../species/generation2/wobbuffet.json | 6 +- .../cobblemon/species/generation2/wooper.json | 66 +- .../cobblemon/species/generation2/xatu.json | 49 +- .../cobblemon/species/generation2/yanma.json | 31 +- .../cobblemon/species/generation3/absol.json | 59 +- .../cobblemon/species/generation3/aggron.json | 56 +- .../species/generation3/altaria.json | 46 +- .../species/generation3/anorith.json | 29 +- .../species/generation3/armaldo.json | 42 +- .../cobblemon/species/generation3/aron.json | 35 +- .../species/generation3/azurill.json | 31 +- .../cobblemon/species/generation3/bagon.json | 31 +- .../cobblemon/species/generation3/baltoy.json | 38 +- .../species/generation3/banette.json | 44 +- .../species/generation3/barboach.json | 33 +- .../species/generation3/beautifly.json | 34 +- .../cobblemon/species/generation3/beldum.json | 7 +- .../species/generation3/blaziken.json | 56 +- .../species/generation3/breloom.json | 51 +- .../cobblemon/species/generation3/cacnea.json | 53 +- .../species/generation3/cacturne.json | 62 +- .../species/generation3/camerupt.json | 45 +- .../species/generation3/carvanha.json | 32 +- .../species/generation3/cascoon.json | 10 +- .../species/generation3/castform.json | 23 +- .../species/generation3/chimecho.json | 52 +- .../species/generation3/clamperl.json | 17 +- .../species/generation3/claydol.json | 44 +- .../species/generation3/combusken.json | 44 +- .../species/generation3/corphish.json | 35 +- .../species/generation3/cradily.json | 39 +- .../species/generation3/crawdaunt.json | 43 +- .../species/generation3/delcatty.json | 47 +- .../cobblemon/species/generation3/deoxys.json | 227 ++++- .../species/generation3/dusclops.json | 47 +- .../species/generation3/duskull.json | 37 +- .../cobblemon/species/generation3/dustox.json | 33 +- .../species/generation3/electrike.json | 31 +- .../species/generation3/exploud.json | 46 +- .../cobblemon/species/generation3/feebas.json | 21 +- .../cobblemon/species/generation3/flygon.json | 60 +- .../species/generation3/gardevoir.json | 60 +- .../cobblemon/species/generation3/glalie.json | 35 +- .../species/generation3/gorebyss.json | 31 +- .../species/generation3/groudon.json | 42 +- .../species/generation3/grovyle.json | 46 +- .../species/generation3/grumpig.json | 61 +- .../cobblemon/species/generation3/gulpin.json | 37 +- .../species/generation3/hariyama.json | 53 +- .../species/generation3/huntail.json | 32 +- .../species/generation3/illumise.json | 39 +- .../species/generation3/jirachi.json | 51 +- .../species/generation3/kecleon.json | 59 +- .../cobblemon/species/generation3/kirlia.json | 50 +- .../cobblemon/species/generation3/kyogre.json | 27 +- .../cobblemon/species/generation3/lairon.json | 37 +- .../cobblemon/species/generation3/latias.json | 60 +- .../cobblemon/species/generation3/latios.json | 58 +- .../cobblemon/species/generation3/lileep.json | 32 +- .../species/generation3/linoone.json | 83 +- .../cobblemon/species/generation3/lombre.json | 41 +- .../cobblemon/species/generation3/lotad.json | 30 +- .../species/generation3/loudred.json | 38 +- .../species/generation3/ludicolo.json | 45 +- .../species/generation3/lunatone.json | 46 +- .../species/generation3/luvdisc.json | 28 +- .../species/generation3/makuhita.json | 47 +- .../species/generation3/manectric.json | 35 +- .../species/generation3/marshtomp.json | 43 +- .../species/generation3/masquerain.json | 46 +- .../cobblemon/species/generation3/mawile.json | 56 +- .../species/generation3/medicham.json | 54 +- .../species/generation3/meditite.json | 47 +- .../species/generation3/metagross.json | 50 +- .../cobblemon/species/generation3/metang.json | 42 +- .../species/generation3/mightyena.json | 38 +- .../species/generation3/milotic.json | 40 +- .../cobblemon/species/generation3/minun.json | 37 +- .../cobblemon/species/generation3/mudkip.json | 39 +- .../species/generation3/nincada.json | 28 +- .../species/generation3/ninjask.json | 39 +- .../species/generation3/nosepass.json | 39 +- .../cobblemon/species/generation3/numel.json | 41 +- .../species/generation3/nuzleaf.json | 46 +- .../species/generation3/pelipper.json | 38 +- .../cobblemon/species/generation3/plusle.json | 38 +- .../species/generation3/poochyena.json | 34 +- .../cobblemon/species/generation3/ralts.json | 48 +- .../species/generation3/rayquaza.json | 42 +- .../cobblemon/species/generation3/regice.json | 28 +- .../species/generation3/regirock.json | 33 +- .../species/generation3/registeel.json | 32 +- .../species/generation3/relicanth.json | 38 +- .../species/generation3/roselia.json | 39 +- .../species/generation3/sableye.json | 69 +- .../species/generation3/salamence.json | 48 +- .../species/generation3/sceptile.json | 57 +- .../cobblemon/species/generation3/sealeo.json | 33 +- .../cobblemon/species/generation3/seedot.json | 31 +- .../species/generation3/seviper.json | 52 +- .../species/generation3/sharpedo.json | 41 +- .../species/generation3/shedinja.json | 40 +- .../species/generation3/shelgon.json | 32 +- .../species/generation3/shiftry.json | 61 +- .../species/generation3/shroomish.json | 27 +- .../species/generation3/shuppet.json | 38 +- .../species/generation3/silcoon.json | 10 +- .../cobblemon/species/generation3/skitty.json | 41 +- .../species/generation3/slaking.json | 65 +- .../species/generation3/slakoth.json | 47 +- .../species/generation3/snorunt.json | 23 +- .../species/generation3/solrock.json | 46 +- .../cobblemon/species/generation3/spheal.json | 33 +- .../cobblemon/species/generation3/spinda.json | 53 +- .../cobblemon/species/generation3/spoink.json | 43 +- .../species/generation3/surskit.json | 29 +- .../cobblemon/species/generation3/swablu.json | 37 +- .../cobblemon/species/generation3/swalot.json | 45 +- .../species/generation3/swampert.json | 55 +- .../species/generation3/swellow.json | 32 +- .../species/generation3/taillow.json | 29 +- .../species/generation3/torchic.json | 33 +- .../species/generation3/torkoal.json | 42 +- .../species/generation3/trapinch.json | 31 +- .../species/generation3/treecko.json | 42 +- .../species/generation3/tropius.json | 43 +- .../species/generation3/vibrava.json | 52 +- .../species/generation3/vigoroth.json | 59 +- .../species/generation3/volbeat.json | 36 +- .../species/generation3/wailmer.json | 29 +- .../species/generation3/wailord.json | 35 +- .../species/generation3/walrein.json | 41 +- .../species/generation3/whiscash.json | 39 +- .../species/generation3/whismur.json | 32 +- .../species/generation3/wingull.json | 31 +- .../species/generation3/wurmple.json | 8 +- .../cobblemon/species/generation3/wynaut.json | 6 +- .../species/generation3/zangoose.json | 57 +- .../species/generation3/zigzagoon.json | 65 +- .../species/generation4/abomasnow.json | 44 +- .../species/generation4/ambipom.json | 53 +- .../cobblemon/species/generation4/arceus.json | 228 ++++- .../cobblemon/species/generation4/azelf.json | 50 +- .../species/generation4/bastiodon.json | 38 +- .../species/generation4/bibarel.json | 42 +- .../cobblemon/species/generation4/bidoof.json | 30 +- .../cobblemon/species/generation4/bonsly.json | 32 +- .../species/generation4/bronzong.json | 42 +- .../species/generation4/bronzor.json | 38 +- .../cobblemon/species/generation4/budew.json | 30 +- .../cobblemon/species/generation4/buizel.json | 42 +- .../species/generation4/buneary.json | 56 +- .../cobblemon/species/generation4/burmy.json | 6 +- .../species/generation4/carnivine.json | 36 +- .../cobblemon/species/generation4/chatot.json | 28 +- .../species/generation4/cherrim.json | 60 +- .../species/generation4/cherubi.json | 29 +- .../species/generation4/chimchar.json | 45 +- .../species/generation4/chingling.json | 41 +- .../cobblemon/species/generation4/combee.json | 10 +- .../species/generation4/cranidos.json | 36 +- .../species/generation4/cresselia.json | 41 +- .../species/generation4/croagunk.json | 55 +- .../species/generation4/darkrai.json | 41 +- .../cobblemon/species/generation4/dialga.json | 76 +- .../species/generation4/drapion.json | 46 +- .../species/generation4/drifblim.json | 46 +- .../species/generation4/drifloon.json | 42 +- .../species/generation4/dusknoir.json | 50 +- .../species/generation4/electivire.json | 47 +- .../species/generation4/empoleon.json | 62 +- .../species/generation4/finneon.json | 31 +- .../species/generation4/floatzel.json | 45 +- .../species/generation4/froslass.json | 42 +- .../cobblemon/species/generation4/gabite.json | 37 +- .../species/generation4/gallade.json | 80 +- .../species/generation4/garchomp.json | 44 +- .../species/generation4/gastrodon.json | 43 +- .../cobblemon/species/generation4/gible.json | 34 +- .../species/generation4/giratina.json | 89 +- .../species/generation4/glaceon.json | 46 +- .../species/generation4/glameow.json | 36 +- .../species/generation4/gliscor.json | 57 +- .../cobblemon/species/generation4/grotle.json | 36 +- .../species/generation4/happiny.json | 29 +- .../species/generation4/heatran.json | 29 +- .../species/generation4/hippopotas.json | 29 +- .../species/generation4/hippowdon.json | 33 +- .../species/generation4/honchkrow.json | 45 +- .../species/generation4/infernape.json | 63 +- .../species/generation4/kricketot.json | 9 +- .../species/generation4/kricketune.json | 35 +- .../species/generation4/leafeon.json | 48 +- .../species/generation4/lickilicky.json | 51 +- .../species/generation4/lopunny.json | 63 +- .../species/generation4/lucario.json | 65 +- .../species/generation4/lumineon.json | 34 +- .../cobblemon/species/generation4/luxio.json | 33 +- .../cobblemon/species/generation4/luxray.json | 38 +- .../species/generation4/magmortar.json | 47 +- .../species/generation4/magnezone.json | 37 +- .../species/generation4/mamoswine.json | 43 +- .../species/generation4/manaphy.json | 39 +- .../species/generation4/mantyke.json | 30 +- .../species/generation4/mesprit.json | 49 +- .../cobblemon/species/generation4/mimejr.json | 44 +- .../species/generation4/mismagius.json | 50 +- .../species/generation4/monferno.json | 50 +- .../cobblemon/species/generation4/mothim.json | 30 +- .../species/generation4/munchlax.json | 62 +- .../species/generation4/pachirisu.json | 48 +- .../cobblemon/species/generation4/palkia.json | 76 +- .../cobblemon/species/generation4/phione.json | 29 +- .../cobblemon/species/generation4/piplup.json | 37 +- .../species/generation4/porygonz.json | 41 +- .../species/generation4/prinplup.json | 40 +- .../species/generation4/probopass.json | 47 +- .../species/generation4/purugly.json | 41 +- .../species/generation4/rampardos.json | 42 +- .../species/generation4/regigigas.json | 37 +- .../species/generation4/rhyperior.json | 65 +- .../cobblemon/species/generation4/riolu.json | 45 +- .../species/generation4/roserade.json | 42 +- .../cobblemon/species/generation4/rotom.json | 174 +++- .../species/generation4/shaymin.json | 66 +- .../species/generation4/shellos.json | 36 +- .../species/generation4/shieldon.json | 30 +- .../cobblemon/species/generation4/shinx.json | 33 +- .../species/generation4/skorupi.json | 33 +- .../species/generation4/skuntank.json | 49 +- .../cobblemon/species/generation4/snover.json | 33 +- .../species/generation4/spiritomb.json | 38 +- .../species/generation4/staraptor.json | 34 +- .../species/generation4/staravia.json | 30 +- .../cobblemon/species/generation4/starly.json | 30 +- .../cobblemon/species/generation4/stunky.json | 44 +- .../species/generation4/tangrowth.json | 42 +- .../species/generation4/togekiss.json | 66 +- .../species/generation4/torterra.json | 50 +- .../species/generation4/toxicroak.json | 61 +- .../species/generation4/turtwig.json | 36 +- .../cobblemon/species/generation4/uxie.json | 52 +- .../species/generation4/vespiquen.json | 39 +- .../species/generation4/weavile.json | 54 +- .../species/generation4/wormadam.json | 91 +- .../species/generation4/yanmega.json | 38 +- .../species/generation5/accelgor.json | 32 +- .../species/generation5/alomomola.json | 39 +- .../species/generation5/amoonguss.json | 32 +- .../cobblemon/species/generation5/archen.json | 41 +- .../species/generation5/archeops.json | 45 +- .../cobblemon/species/generation5/audino.json | 61 +- .../cobblemon/species/generation5/axew.json | 39 +- .../species/generation5/basculin.json | 63 +- .../species/generation5/beartic.json | 41 +- .../species/generation5/beheeyem.json | 48 +- .../species/generation5/bisharp.json | 45 +- .../species/generation5/blitzle.json | 31 +- .../species/generation5/boldore.json | 22 +- .../species/generation5/bouffalant.json | 37 +- .../species/generation5/braviary.json | 75 +- .../species/generation5/carracosta.json | 39 +- .../species/generation5/chandelure.json | 36 +- .../species/generation5/cinccino.json | 39 +- .../species/generation5/cobalion.json | 35 +- .../species/generation5/cofagrigus.json | 42 +- .../species/generation5/conkeldurr.json | 44 +- .../species/generation5/cottonee.json | 29 +- .../species/generation5/crustle.json | 35 +- .../species/generation5/cryogonal.json | 30 +- .../species/generation5/cubchoo.json | 33 +- .../species/generation5/darmanitan.json | 151 ++- .../species/generation5/darumaka.json | 54 +- .../species/generation5/deerling.json | 31 +- .../cobblemon/species/generation5/deino.json | 31 +- .../cobblemon/species/generation5/dewott.json | 36 +- .../species/generation5/drilbur.json | 29 +- .../species/generation5/druddigon.json | 49 +- .../species/generation5/ducklett.json | 26 +- .../species/generation5/duosion.json | 38 +- .../cobblemon/species/generation5/durant.json | 33 +- .../species/generation5/dwebble.json | 31 +- .../species/generation5/eelektrik.json | 28 +- .../species/generation5/eelektross.json | 50 +- .../cobblemon/species/generation5/elgyem.json | 45 +- .../cobblemon/species/generation5/emboar.json | 50 +- .../cobblemon/species/generation5/emolga.json | 33 +- .../species/generation5/escavalier.json | 37 +- .../species/generation5/excadrill.json | 37 +- .../species/generation5/ferroseed.json | 28 +- .../species/generation5/ferrothorn.json | 34 +- .../species/generation5/foongus.json | 29 +- .../species/generation5/fraxure.json | 40 +- .../species/generation5/frillish.json | 35 +- .../species/generation5/galvantula.json | 39 +- .../species/generation5/garbodor.json | 32 +- .../species/generation5/genesect.json | 45 +- .../species/generation5/gigalith.json | 28 +- .../cobblemon/species/generation5/golett.json | 42 +- .../cobblemon/species/generation5/golurk.json | 51 +- .../species/generation5/gothita.json | 45 +- .../species/generation5/gothitelle.json | 48 +- .../species/generation5/gothorita.json | 45 +- .../species/generation5/gurdurr.json | 40 +- .../species/generation5/haxorus.json | 43 +- .../species/generation5/heatmor.json | 43 +- .../species/generation5/herdier.json | 32 +- .../species/generation5/hydreigon.json | 51 +- .../species/generation5/jellicent.json | 37 +- .../cobblemon/species/generation5/joltik.json | 35 +- .../species/generation5/karrablast.json | 27 +- .../cobblemon/species/generation5/keldeo.json | 41 +- .../cobblemon/species/generation5/klang.json | 31 +- .../cobblemon/species/generation5/klink.json | 30 +- .../species/generation5/klinklang.json | 35 +- .../species/generation5/krokorok.json | 44 +- .../species/generation5/krookodile.json | 54 +- .../cobblemon/species/generation5/kyurem.json | 122 ++- .../species/generation5/lampent.json | 33 +- .../species/generation5/landorus.json | 33 +- .../species/generation5/larvesta.json | 24 +- .../species/generation5/leavanny.json | 46 +- .../species/generation5/liepard.json | 43 +- .../species/generation5/lilligant.json | 76 +- .../species/generation5/lillipup.json | 32 +- .../species/generation5/litwick.json | 32 +- .../species/generation5/mandibuzz.json | 36 +- .../species/generation5/maractus.json | 38 +- .../species/generation5/meloetta.json | 55 +- .../species/generation5/mienfoo.json | 36 +- .../species/generation5/mienshao.json | 42 +- .../species/generation5/minccino.json | 36 +- .../cobblemon/species/generation5/munna.json | 40 +- .../species/generation5/musharna.json | 43 +- .../species/generation5/oshawott.json | 35 +- .../species/generation5/palpitoad.json | 31 +- .../species/generation5/panpour.json | 39 +- .../species/generation5/pansage.json | 39 +- .../species/generation5/pansear.json | 33 +- .../cobblemon/species/generation5/patrat.json | 35 +- .../species/generation5/pawniard.json | 39 +- .../species/generation5/petilil.json | 30 +- .../cobblemon/species/generation5/pidove.json | 27 +- .../species/generation5/pignite.json | 44 +- .../species/generation5/purrloin.json | 35 +- .../species/generation5/reshiram.json | 39 +- .../species/generation5/reuniclus.json | 51 +- .../species/generation5/roggenrola.json | 21 +- .../species/generation5/rufflet.json | 28 +- .../species/generation5/samurott.json | 93 +- .../species/generation5/sandile.json | 37 +- .../cobblemon/species/generation5/sawk.json | 33 +- .../species/generation5/sawsbuck.json | 39 +- .../species/generation5/scolipede.json | 34 +- .../species/generation5/scrafty.json | 48 +- .../species/generation5/scraggy.json | 44 +- .../species/generation5/seismitoad.json | 42 +- .../species/generation5/serperior.json | 45 +- .../species/generation5/servine.json | 38 +- .../species/generation5/sewaddle.json | 28 +- .../species/generation5/shelmet.json | 24 +- .../species/generation5/sigilyph.json | 46 +- .../species/generation5/simipour.json | 44 +- .../species/generation5/simisage.json | 44 +- .../species/generation5/simisear.json | 39 +- .../cobblemon/species/generation5/snivy.json | 38 +- .../species/generation5/solosis.json | 38 +- .../species/generation5/stoutland.json | 36 +- .../species/generation5/stunfisk.json | 71 +- .../species/generation5/swadloon.json | 29 +- .../cobblemon/species/generation5/swanna.json | 31 +- .../species/generation5/swoobat.json | 47 +- .../cobblemon/species/generation5/tepig.json | 31 +- .../species/generation5/terrakion.json | 33 +- .../cobblemon/species/generation5/throh.json | 35 +- .../species/generation5/thundurus.json | 40 +- .../species/generation5/timburr.json | 39 +- .../species/generation5/tirtouga.json | 34 +- .../species/generation5/tornadus.json | 31 +- .../species/generation5/tranquill.json | 27 +- .../species/generation5/trubbish.json | 27 +- .../species/generation5/tympole.json | 26 +- .../cobblemon/species/generation5/tynamo.json | 8 +- .../species/generation5/unfezant.json | 29 +- .../species/generation5/vanillish.json | 26 +- .../species/generation5/vanillite.json | 26 +- .../species/generation5/vanilluxe.json | 29 +- .../species/generation5/venipede.json | 22 +- .../species/generation5/victini.json | 43 +- .../species/generation5/virizion.json | 34 +- .../species/generation5/volcarona.json | 38 +- .../species/generation5/vullaby.json | 31 +- .../species/generation5/watchog.json | 48 +- .../species/generation5/whimsicott.json | 38 +- .../species/generation5/whirlipede.json | 22 +- .../cobblemon/species/generation5/woobat.json | 43 +- .../cobblemon/species/generation5/yamask.json | 67 +- .../species/generation5/zebstrika.json | 39 +- .../cobblemon/species/generation5/zekrom.json | 45 +- .../species/generation5/zoroark.json | 88 +- .../cobblemon/species/generation5/zorua.json | 68 +- .../species/generation5/zweilous.json | 34 +- .../species/generation6/aegislash.json | 70 +- .../cobblemon/species/generation6/amaura.json | 38 +- .../species/generation6/aromatisse.json | 35 +- .../species/generation6/aurorus.json | 40 +- .../species/generation6/avalugg.json | 64 +- .../species/generation6/barbaracle.json | 50 +- .../species/generation6/bergmite.json | 24 +- .../species/generation6/binacle.json | 40 +- .../species/generation6/braixen.json | 39 +- .../species/generation6/bunnelby.json | 30 +- .../species/generation6/carbink.json | 40 +- .../species/generation6/chesnaught.json | 61 +- .../species/generation6/chespin.json | 45 +- .../species/generation6/clauncher.json | 30 +- .../species/generation6/clawitzer.json | 36 +- .../species/generation6/dedenne.json | 36 +- .../species/generation6/delphox.json | 51 +- .../species/generation6/diancie.json | 46 +- .../species/generation6/diggersby.json | 50 +- .../species/generation6/doublade.json | 30 +- .../species/generation6/dragalge.json | 37 +- .../cobblemon/species/generation6/espurr.json | 40 +- .../species/generation6/fennekin.json | 28 +- .../species/generation6/flabebe.json | 33 +- .../species/generation6/fletchinder.json | 24 +- .../species/generation6/fletchling.json | 22 +- .../species/generation6/floette.json | 70 +- .../species/generation6/florges.json | 40 +- .../species/generation6/froakie.json | 35 +- .../species/generation6/frogadier.json | 38 +- .../species/generation6/furfrou.json | 29 +- .../cobblemon/species/generation6/gogoat.json | 39 +- .../cobblemon/species/generation6/goodra.json | 80 +- .../cobblemon/species/generation6/goomy.json | 23 +- .../species/generation6/gourgeist.json | 41 +- .../species/generation6/greninja.json | 49 +- .../species/generation6/hawlucha.json | 51 +- .../species/generation6/heliolisk.json | 38 +- .../species/generation6/helioptile.json | 30 +- .../species/generation6/honedge.json | 30 +- .../cobblemon/species/generation6/hoopa.json | 100 +- .../cobblemon/species/generation6/inkay.json | 44 +- .../cobblemon/species/generation6/klefki.json | 35 +- .../cobblemon/species/generation6/litleo.json | 24 +- .../species/generation6/malamar.json | 49 +- .../species/generation6/meowstic.json | 92 +- .../cobblemon/species/generation6/noibat.json | 38 +- .../species/generation6/noivern.json | 45 +- .../species/generation6/pancham.json | 53 +- .../species/generation6/pangoro.json | 66 +- .../species/generation6/phantump.json | 45 +- .../species/generation6/pumpkaboo.json | 38 +- .../cobblemon/species/generation6/pyroar.json | 29 +- .../species/generation6/quilladin.json | 49 +- .../species/generation6/scatterbug.json | 8 +- .../cobblemon/species/generation6/skiddo.json | 33 +- .../cobblemon/species/generation6/skrelp.json | 34 +- .../species/generation6/sliggoo.json | 53 +- .../species/generation6/slurpuff.json | 33 +- .../cobblemon/species/generation6/spewpa.json | 9 +- .../species/generation6/spritzee.json | 30 +- .../species/generation6/swirlix.json | 30 +- .../species/generation6/sylveon.json | 45 +- .../species/generation6/talonflame.json | 27 +- .../species/generation6/trevenant.json | 53 +- .../species/generation6/tyrantrum.json | 45 +- .../cobblemon/species/generation6/tyrunt.json | 41 +- .../species/generation6/vivillon.json | 30 +- .../species/generation6/volcanion.json | 30 +- .../species/generation6/xerneas.json | 35 +- .../species/generation6/yveltal.json | 33 +- .../species/generation6/zygarde.json | 187 +++- .../species/generation7/araquanid.json | 40 +- .../cobblemon/species/generation7/bewear.json | 38 +- .../species/generation7/blacephalon.json | 31 +- .../species/generation7/bounsweet.json | 31 +- .../species/generation7/brionne.json | 33 +- .../species/generation7/bruxish.json | 40 +- .../species/generation7/buzzwole.json | 36 +- .../species/generation7/celesteela.json | 36 +- .../species/generation7/charjabug.json | 24 +- .../cobblemon/species/generation7/comfey.json | 40 +- .../species/generation7/cosmoem.json | 4 +- .../cobblemon/species/generation7/cosmog.json | 4 +- .../species/generation7/crabominable.json | 42 +- .../species/generation7/crabrawler.json | 36 +- .../species/generation7/cutiefly.json | 40 +- .../species/generation7/dartrix.json | 35 +- .../species/generation7/decidueye.json | 90 +- .../species/generation7/dewpider.json | 35 +- .../species/generation7/dhelmise.json | 36 +- .../cobblemon/species/generation7/drampa.json | 48 +- .../species/generation7/fomantis.json | 28 +- .../species/generation7/golisopod.json | 47 +- .../species/generation7/grubbin.json | 23 +- .../species/generation7/gumshoos.json | 40 +- .../species/generation7/guzzlord.json | 44 +- .../species/generation7/hakamoo.json | 34 +- .../species/generation7/incineroar.json | 51 +- .../species/generation7/jangmoo.json | 27 +- .../species/generation7/kartana.json | 27 +- .../cobblemon/species/generation7/komala.json | 36 +- .../cobblemon/species/generation7/kommoo.json | 54 +- .../cobblemon/species/generation7/litten.json | 27 +- .../cobblemon/species/generation7/lunala.json | 45 +- .../species/generation7/lurantis.json | 35 +- .../species/generation7/lycanroc.json | 136 ++- .../species/generation7/magearna.json | 54 +- .../species/generation7/mareanie.json | 26 +- .../species/generation7/marshadow.json | 48 +- .../species/generation7/mimikyu.json | 82 +- .../cobblemon/species/generation7/minior.json | 32 +- .../species/generation7/morelull.json | 31 +- .../species/generation7/mudbray.json | 27 +- .../species/generation7/mudsdale.json | 30 +- .../species/generation7/naganadel.json | 44 +- .../species/generation7/necrozma.json | 144 ++- .../species/generation7/nihilego.json | 41 +- .../species/generation7/oranguru.json | 41 +- .../species/generation7/oricorio.json | 28 +- .../species/generation7/palossand.json | 43 +- .../species/generation7/passimian.json | 41 +- .../species/generation7/pheromosa.json | 39 +- .../species/generation7/pikipek.json | 26 +- .../species/generation7/poipole.json | 21 +- .../species/generation7/popplio.json | 33 +- .../species/generation7/primarina.json | 45 +- .../species/generation7/pyukumuku.json | 20 +- .../species/generation7/ribombee.json | 43 +- .../species/generation7/rockruff.json | 69 +- .../cobblemon/species/generation7/rowlet.json | 34 +- .../species/generation7/salandit.json | 38 +- .../species/generation7/salazzle.json | 46 +- .../species/generation7/sandygast.json | 40 +- .../species/generation7/shiinotic.json | 35 +- .../species/generation7/silvally.json | 918 +++++++++++++----- .../species/generation7/solgaleo.json | 43 +- .../species/generation7/stakataka.json | 39 +- .../species/generation7/steenee.json | 34 +- .../species/generation7/stufful.json | 32 +- .../species/generation7/tapubulu.json | 40 +- .../species/generation7/tapufini.json | 34 +- .../species/generation7/tapukoko.json | 32 +- .../species/generation7/tapulele.json | 36 +- .../species/generation7/togedemaru.json | 43 +- .../species/generation7/torracat.json | 28 +- .../species/generation7/toucannon.json | 33 +- .../species/generation7/toxapex.json | 30 +- .../species/generation7/trumbeak.json | 27 +- .../species/generation7/tsareena.json | 42 +- .../species/generation7/turtonator.json | 38 +- .../species/generation7/typenull.json | 27 +- .../species/generation7/vikavolt.json | 33 +- .../cobblemon/species/generation7/wimpod.json | 12 +- .../species/generation7/wishiwashi.json | 25 +- .../species/generation7/xurkitree.json | 28 +- .../species/generation7/yungoos.json | 30 +- .../species/generation7/zeraora.json | 44 +- .../species/generation7b/melmetal.json | 25 +- .../species/generation7b/meltan.json | 12 +- .../species/generation8/alcremie.json | 32 +- .../species/generation8/appletun.json | 34 +- .../cobblemon/species/generation8/applin.json | 6 +- .../species/generation8/arctovish.json | 26 +- .../species/generation8/arctozolt.json | 30 +- .../species/generation8/arrokuda.json | 25 +- .../species/generation8/barraskewda.json | 29 +- .../species/generation8/blipbug.json | 3 - .../species/generation8/boltund.json | 29 +- .../species/generation8/calyrex.json | 127 ++- .../cobblemon/species/generation8/carkol.json | 22 +- .../species/generation8/centiskorch.json | 29 +- .../species/generation8/chewtle.json | 20 +- .../species/generation8/cinderace.json | 41 +- .../species/generation8/clobbopus.json | 21 +- .../species/generation8/coalossal.json | 28 +- .../species/generation8/copperajah.json | 35 +- .../species/generation8/corviknight.json | 28 +- .../species/generation8/corvisquire.json | 21 +- .../species/generation8/cramorant.json | 32 +- .../cobblemon/species/generation8/cufant.json | 30 +- .../species/generation8/cursola.json | 38 +- .../species/generation8/dottler.json | 22 +- .../species/generation8/dracovish.json | 32 +- .../species/generation8/dracozolt.json | 34 +- .../species/generation8/dragapult.json | 29 +- .../species/generation8/drakloak.json | 25 +- .../species/generation8/drednaw.json | 37 +- .../cobblemon/species/generation8/dreepy.json | 13 +- .../species/generation8/drizzile.json | 22 +- .../species/generation8/dubwool.json | 20 +- .../species/generation8/duraludon.json | 31 +- .../cobblemon/species/generation8/eiscue.json | 31 +- .../species/generation8/eldegoss.json | 29 +- .../species/generation8/eternatus.json | 22 +- .../species/generation8/falinks.json | 28 +- .../species/generation8/flapple.json | 30 +- .../species/generation8/frosmoth.json | 26 +- .../species/generation8/glastrier.json | 26 +- .../species/generation8/gossifleur.json | 24 +- .../species/generation8/grapploct.json | 29 +- .../species/generation8/greedent.json | 36 +- .../species/generation8/grimmsnarl.json | 35 +- .../species/generation8/grookey.json | 29 +- .../species/generation8/hatenna.json | 26 +- .../species/generation8/hatterene.json | 37 +- .../species/generation8/hattrem.json | 26 +- .../species/generation8/impidimp.json | 20 +- .../species/generation8/indeedee.json | 62 +- .../species/generation8/inteleon.json | 35 +- .../cobblemon/species/generation8/kubfu.json | 25 +- .../species/generation8/milcery.json | 16 +- .../species/generation8/morgrem.json | 22 +- .../species/generation8/morpeko.json | 41 +- .../cobblemon/species/generation8/mrrime.json | 54 +- .../cobblemon/species/generation8/nickit.json | 16 +- .../species/generation8/obstagoon.json | 45 +- .../species/generation8/orbeetle.json | 30 +- .../species/generation8/perrserker.json | 40 +- .../species/generation8/pincurchin.json | 27 +- .../species/generation8/polteageist.json | 31 +- .../cobblemon/species/generation8/raboot.json | 27 +- .../species/generation8/regidrago.json | 23 +- .../species/generation8/regieleki.json | 21 +- .../species/generation8/rillaboom.json | 45 +- .../species/generation8/rolycoly.json | 18 +- .../species/generation8/rookidee.json | 21 +- .../species/generation8/runerigus.json | 35 +- .../species/generation8/sandaconda.json | 34 +- .../species/generation8/scorbunny.json | 26 +- .../species/generation8/silicobra.json | 21 +- .../species/generation8/sinistea.json | 26 +- .../species/generation8/sirfetchd.json | 36 +- .../species/generation8/sizzlipede.json | 19 +- .../species/generation8/skwovet.json | 23 +- .../cobblemon/species/generation8/snom.json | 10 +- .../cobblemon/species/generation8/sobble.json | 22 +- .../species/generation8/spectrier.json | 25 +- .../species/generation8/stonjourner.json | 25 +- .../species/generation8/thievul.json | 27 +- .../species/generation8/thwackey.json | 30 +- .../cobblemon/species/generation8/toxel.json | 11 +- .../species/generation8/toxtricity.json | 126 ++- .../species/generation8/urshifu.json | 105 +- .../cobblemon/species/generation8/wooloo.json | 15 +- .../cobblemon/species/generation8/yamper.json | 22 +- .../cobblemon/species/generation8/zacian.json | 35 +- .../species/generation8/zamazenta.json | 33 +- .../cobblemon/species/generation8/zarude.json | 37 +- .../species/generation8a/basculegion.json | 35 +- .../species/generation8a/enamorus.json | 31 +- .../species/generation8a/kleavor.json | 38 +- .../species/generation8a/overqwil.json | 40 +- .../species/generation8a/sneasler.json | 43 +- .../species/generation8a/ursaluna.json | 92 +- .../species/generation8a/wyrdeer.json | 45 +- .../species/generation9/annihilape.json | 54 +- .../species/generation9/arboliva.json | 29 +- .../species/generation9/archaludon.json | 29 +- .../species/generation9/arctibax.json | 22 +- .../species/generation9/armarouge.json | 31 +- .../species/generation9/baxcalibur.json | 33 +- .../species/generation9/bellibolt.json | 23 +- .../species/generation9/bombirdier.json | 32 +- .../species/generation9/brambleghast.json | 27 +- .../species/generation9/bramblin.json | 24 +- .../species/generation9/brutebonnet.json | 28 +- .../species/generation9/capsakid.json | 24 +- .../species/generation9/ceruledge.json | 32 +- .../species/generation9/cetitan.json | 28 +- .../species/generation9/cetoddle.json | 26 +- .../species/generation9/charcadet.json | 15 +- .../species/generation9/chienpao.json | 27 +- .../cobblemon/species/generation9/chiyu.json | 23 +- .../species/generation9/clodsire.json | 39 +- .../species/generation9/crocalor.json | 25 +- .../species/generation9/cyclizar.json | 31 +- .../species/generation9/dachsbun.json | 28 +- .../species/generation9/dipplin.json | 24 +- .../cobblemon/species/generation9/dolliv.json | 23 +- .../species/generation9/dondozo.json | 28 +- .../species/generation9/dudunsparce.json | 54 +- .../species/generation9/espathra.json | 36 +- .../species/generation9/farigiraf.json | 44 +- .../species/generation9/fezandipiti.json | 31 +- .../species/generation9/fidough.json | 26 +- .../species/generation9/finizen.json | 24 +- .../species/generation9/flamigo.json | 25 +- .../species/generation9/flittle.json | 23 +- .../species/generation9/floragato.json | 29 +- .../species/generation9/fluttermane.json | 27 +- .../species/generation9/frigibax.json | 20 +- .../species/generation9/fuecoco.json | 24 +- .../species/generation9/garganacl.json | 33 +- .../species/generation9/gholdengo.json | 24 +- .../species/generation9/gimmighoul.json | 7 +- .../species/generation9/glimmet.json | 18 +- .../species/generation9/glimmora.json | 25 +- .../species/generation9/gougingfire.json | 34 +- .../species/generation9/grafaiai.json | 30 +- .../species/generation9/greattusk.json | 32 +- .../species/generation9/greavard.json | 30 +- .../species/generation9/houndstone.json | 33 +- .../species/generation9/hydrapple.json | 29 +- .../species/generation9/ironboulder.json | 29 +- .../species/generation9/ironbundle.json | 19 +- .../species/generation9/ironcrown.json | 25 +- .../species/generation9/ironhands.json | 31 +- .../species/generation9/ironjugulis.json | 28 +- .../species/generation9/ironleaves.json | 29 +- .../species/generation9/ironmoth.json | 21 +- .../species/generation9/ironthorns.json | 33 +- .../species/generation9/irontreads.json | 30 +- .../species/generation9/ironvaliant.json | 49 +- .../species/generation9/kilowattrel.json | 27 +- .../species/generation9/kingambit.json | 38 +- .../cobblemon/species/generation9/klawf.json | 31 +- .../species/generation9/koraidon.json | 35 +- .../species/generation9/lechonk.json | 23 +- .../cobblemon/species/generation9/lokix.json | 27 +- .../species/generation9/mabosstiff.json | 28 +- .../species/generation9/maschiff.json | 20 +- .../species/generation9/maushold.json | 29 +- .../species/generation9/meowscarada.json | 44 +- .../species/generation9/miraidon.json | 25 +- .../species/generation9/munkidori.json | 27 +- .../cobblemon/species/generation9/nacli.json | 22 +- .../species/generation9/naclstack.json | 25 +- .../cobblemon/species/generation9/nymble.json | 16 +- .../species/generation9/ogerpon.json | 35 +- .../species/generation9/oinkologne.json | 62 +- .../species/generation9/okidogi.json | 37 +- .../species/generation9/orthworm.json | 24 +- .../species/generation9/palafin.json | 73 +- .../cobblemon/species/generation9/pawmi.json | 25 +- .../cobblemon/species/generation9/pawmo.json | 31 +- .../cobblemon/species/generation9/pawmot.json | 40 +- .../species/generation9/pecharunt.json | 20 +- .../species/generation9/poltchageist.json | 22 +- .../species/generation9/quaquaval.json | 37 +- .../cobblemon/species/generation9/quaxly.json | 23 +- .../species/generation9/quaxwell.json | 26 +- .../cobblemon/species/generation9/rabsca.json | 35 +- .../species/generation9/ragingbolt.json | 26 +- .../cobblemon/species/generation9/rellor.json | 18 +- .../species/generation9/revavroom.json | 28 +- .../species/generation9/roaringmoon.json | 37 +- .../species/generation9/sandyshocks.json | 26 +- .../species/generation9/scovillain.json | 31 +- .../species/generation9/screamtail.json | 40 +- .../species/generation9/shroodle.json | 25 +- .../species/generation9/sinistcha.json | 25 +- .../species/generation9/skeledirge.json | 35 +- .../species/generation9/slitherwing.json | 29 +- .../cobblemon/species/generation9/smoliv.json | 23 +- .../species/generation9/spidops.json | 32 +- .../species/generation9/sprigatito.json | 26 +- .../species/generation9/squawkabilly.json | 27 +- .../species/generation9/tadbulb.json | 20 +- .../species/generation9/tandemaus.json | 25 +- .../species/generation9/tarountula.json | 26 +- .../species/generation9/tatsugiri.json | 20 +- .../species/generation9/terapagos.json | 30 +- .../cobblemon/species/generation9/tinglu.json | 27 +- .../species/generation9/tinkatink.json | 27 +- .../species/generation9/tinkaton.json | 29 +- .../species/generation9/tinkatuff.json | 27 +- .../species/generation9/toedscool.json | 33 +- .../species/generation9/toedscruel.json | 37 +- .../cobblemon/species/generation9/varoom.json | 21 +- .../cobblemon/species/generation9/veluza.json | 30 +- .../species/generation9/walkingwake.json | 26 +- .../species/generation9/wattrel.json | 25 +- .../species/generation9/wiglett.json | 21 +- .../species/generation9/wochien.json | 28 +- .../species/generation9/wugtrio.json | 26 +- .../species_features/sword_form.json | 2 +- utilityscripts/addon_movesource_helper.py | 195 ++++ 1027 files changed, 29132 insertions(+), 13834 deletions(-) create mode 100644 utilityscripts/addon_movesource_helper.py diff --git a/common/src/main/resources/data/cobblemon/species/generation1/abra.json b/common/src/main/resources/data/cobblemon/species/generation1/abra.json index cf8cc21f78..a35d3e080d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/abra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/abra.json @@ -88,11 +88,9 @@ "egg:powertrick", "egg:psychoshift", "tm:allyswitch", - "tm:barrier", "tm:bodyslam", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:dazzlinggleam", "tm:drainpunch", "tm:dreameater", @@ -108,7 +106,6 @@ "tm:foulplay", "tm:grassknot", "tm:gravity", - "tm:guardsplit", "tm:guardswap", "tm:headbutt", "tm:icepunch", @@ -121,11 +118,9 @@ "tm:megapunch", "tm:metronome", "tm:powerswap", - "tm:powertrick", "tm:protect", "tm:psychic", "tm:psychicterrain", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", @@ -146,7 +141,6 @@ "tm:swift", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderpunch", @@ -156,7 +150,38 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gravity", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json index 5173539eb9..5e940760cb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/aerodactyl.json @@ -106,13 +106,11 @@ "tm:ancientpower", "tm:aquatail", "tm:assurance", - "tm:bite", "tm:brutalswing", "tm:bulldoze", "tm:crunch", "tm:curse", "tm:defog", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", @@ -125,7 +123,6 @@ "tm:firefang", "tm:flamethrower", "tm:fly", - "tm:foresight", "tm:gigaimpact", "tm:headbutt", "tm:heatwave", @@ -142,7 +139,6 @@ "tm:payback", "tm:protect", "tm:psychicfangs", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:roar", @@ -164,7 +160,6 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", "tm:tailwind", "tm:takedown", @@ -174,9 +169,39 @@ "tm:thunderfang", "tm:torment", "tm:twister", - "tm:whirlwind", - "tm:wideguard", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:defog", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:meteorbeam", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderfang", + "tutor:twister" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json index ccd7b46824..3eb6dd8023 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/alakazam.json @@ -94,13 +94,10 @@ "egg:powertrick", "egg:psychoshift", "tm:allyswitch", - "tm:barrier", "tm:bodyslam", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:dazzlinggleam", - "tm:disable", "tm:drainpunch", "tm:dreameater", "tm:embargo", @@ -119,14 +116,12 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:guardsplit", "tm:guardswap", "tm:headbutt", "tm:hyperbeam", "tm:icepunch", "tm:imprison", "tm:irontail", - "tm:kinesis", "tm:knockoff", "tm:laserfocus", "tm:lightscreen", @@ -135,20 +130,16 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:miracleeye", "tm:nastyplot", "tm:powerswap", - "tm:powertrick", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicterrain", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -167,7 +158,6 @@ "tm:swift", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderpunch", @@ -177,7 +167,43 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "kadabra", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json index 07e36bf444..22f4628434 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arbok.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json @@ -100,22 +100,17 @@ "egg:spite", "egg:suckerpunch", "egg:switcheroo", - "tm:acid", "tm:acidspray", "tm:aquatail", "tm:beatup", - "tm:belch", "tm:bind", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", "tm:bulldoze", - "tm:coil", "tm:crunch", "tm:darkpulse", "tm:dig", - "tm:disable", "tm:doubleedge", "tm:dragontail", "tm:earthquake", @@ -125,7 +120,6 @@ "tm:gastroacid", "tm:gigadrain", "tm:gigaimpact", - "tm:glare", "tm:gunkshot", "tm:haze", "tm:headbutt", @@ -136,19 +130,14 @@ "tm:knockoff", "tm:lashout", "tm:leechlife", - "tm:leer", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:painsplit", "tm:payback", - "tm:poisonfang", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", "tm:psychicfangs", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:rockslide", @@ -158,22 +147,17 @@ "tm:screech", "tm:seedbomb", "tm:skittersmack", - "tm:slam", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snarl", "tm:snatch", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:swallow", - "tm:switcheroo", "tm:takedown", "tm:terablast", "tm:thief", @@ -185,7 +169,40 @@ "tm:trailblaze", "tm:venomdrench", "tm:venoshock", - "tm:wrap" + "tutor:aquatail", + "tutor:bind", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:firefang", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:leechlife", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:seedbomb", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spikes", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:thunderfang" ], "preEvolution": "ekans", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json index 984008c906..9b7e7b0030 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/arcanine.json @@ -95,10 +95,8 @@ "egg:thrash", "tm:aerialace", "tm:agility", - "tm:bite", "tm:bodyslam", "tm:bulldoze", - "tm:burnup", "tm:charm", "tm:closecombat", "tm:covet", @@ -106,41 +104,31 @@ "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:dragonpulse", - "tm:ember", "tm:endure", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:firefang", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:gigaimpact", "tm:headbutt", "tm:heatcrash", "tm:heatwave", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:incinerate", "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", - "tm:morningsun", - "tm:odorsleuth", "tm:outrage", "tm:overheat", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:ragingfury", "tm:rest", "tm:retaliate", "tm:reversal", @@ -161,10 +149,34 @@ "tm:temperflare", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderfang", "tm:wildcharge", - "tm:willowisp" + "tm:willowisp", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:covet", + "tutor:dragonpulse", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:outrage", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:thunderfang", + "tutor:wildcharge" ], "preEvolution": "growlithe", "evolutions": [], @@ -227,7 +239,6 @@ "egg:thrash", "tm:aerialace", "tm:agility", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:closecombat", @@ -235,37 +246,28 @@ "tm:crunch", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:dragonpulse", - "tm:ember", "tm:endure", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:firefang", "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:gigaimpact", - "tm:headsmash", "tm:heatcrash", "tm:heatwave", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:ironhead", "tm:irontail", - "tm:leer", - "tm:morningsun", "tm:outrage", "tm:overheat", "tm:powergem", "tm:protect", "tm:psychicfangs", - "tm:ragingfury", "tm:rest", "tm:retaliate", "tm:reversal", @@ -273,7 +275,6 @@ "tm:rockblast", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:scaryface", @@ -291,10 +292,34 @@ "tm:temperflare", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderfang", "tm:wildcharge", - "tm:willowisp" + "tm:willowisp", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:covet", + "tutor:dragonpulse", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:irontail", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:thunderfang", + "tutor:wildcharge" ], "preEvolution": "growlithe hisuian", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/articuno.json b/common/src/main/resources/data/cobblemon/species/generation1/articuno.json index 6cbb7dc65f..c2b5130b7a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/articuno.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/articuno.json @@ -108,27 +108,21 @@ "tm:facade", "tm:featherdance", "tm:fly", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", - "tm:gust", "tm:hail", "tm:haze", "tm:helpinghand", "tm:hurricane", "tm:hyperbeam", "tm:icebeam", - "tm:iceshard", "tm:icespinner", "tm:iciclespear", "tm:icywind", "tm:laserfocus", "tm:lightscreen", - "tm:mindreader", - "tm:mist", "tm:ominouswind", "tm:pluck", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:reflect", @@ -137,7 +131,6 @@ "tm:rocksmash", "tm:roost", "tm:sandstorm", - "tm:sheercold", "tm:signalbeam", "tm:skyattack", "tm:skydrop", @@ -154,7 +147,30 @@ "tm:twister", "tm:uturn", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:signalbeam", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:tripleaxel", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [], "forms": [ @@ -237,7 +253,6 @@ "tm:ancientpower", "tm:bravebird", "tm:calmmind", - "tm:confusion", "tm:doubleteam", "tm:dreameater", "tm:dualwingbeat", @@ -245,29 +260,23 @@ "tm:expandingforce", "tm:facade", "tm:fly", - "tm:freezingglare", "tm:futuresight", "tm:gigaimpact", "tm:guardswap", - "tm:gust", "tm:helpinghand", "tm:hurricane", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:imprison", "tm:lightscreen", - "tm:mindreader", "tm:powerswap", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicnoise", "tm:psychocut", - "tm:psychoshift", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:scaryface", @@ -285,7 +294,26 @@ "tm:terablast", "tm:trick", "tm:trickroom", - "tm:uturn" + "tm:uturn", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:calmmind", + "tutor:dualwingbeat", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:trick" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json index 7b1e295e4e..d2c7f28696 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/beedrill.json @@ -116,14 +116,11 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:fellstinger", "tm:flash", "tm:focusenergy", - "tm:furyattack", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", - "tm:harden", "tm:hyperbeam", "tm:infestation", "tm:irondefense", @@ -133,10 +130,7 @@ "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:protect", - "tm:pursuit", - "tm:rage", "tm:rest", "tm:rocksmash", "tm:roost", @@ -156,10 +150,39 @@ "tm:thief", "tm:throatchop", "tm:toxicspikes", - "tm:twineedle", "tm:uturn", "tm:venoshock", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:drillrun", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stringshot", + "tutor:tailwind", + "tutor:throatchop", + "tutor:xscissor" ], "preEvolution": "kakuna", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json b/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json index d0d88da2ec..d2f85253a0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/bellsprout.json @@ -97,12 +97,9 @@ "egg:tickle", "egg:worryseed", "egg:wringout", - "tm:acid", "tm:acidspray", - "tm:belch", "tm:bind", "tm:bulletseed", - "tm:clearsmog", "tm:cut", "tm:encore", "tm:endure", @@ -114,9 +111,7 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:infestation", - "tm:ingrain", "tm:knockoff", "tm:leafstorm", "tm:leechlife", @@ -125,39 +120,44 @@ "tm:naturalgift", "tm:naturepower", "tm:poisonjab", - "tm:poisonpowder", "tm:pounce", "tm:powerwhip", "tm:protect", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:seedbomb", - "tm:slam", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:solarbeam", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:terablast", "tm:thief", - "tm:tickle", "tm:toxic", "tm:trailblaze", "tm:venoshock", - "tm:vinewhip", "tm:weatherball", "tm:worryseed", - "tm:wrap", - "tm:wringout" + "tutor:bind", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:knockoff", + "tutor:leechlife", + "tutor:magicalleaf", + "tutor:poisonjab", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:suckerpunch", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json index 83c21bcc57..9e588483aa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json @@ -109,18 +109,14 @@ "egg:waterspout", "egg:wavecrash", "egg:yawn", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", "tm:aurasphere", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:brine", - "tm:bubble", "tm:chillingwater", "tm:crunch", "tm:darkpulse", @@ -131,14 +127,11 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:flail", "tm:flashcannon", "tm:fling", "tm:flipturn", "tm:focusblast", "tm:focuspunch", - "tm:foresight", "tm:gigaimpact", "tm:gyroball", "tm:hail", @@ -154,20 +147,14 @@ "tm:icywind", "tm:irondefense", "tm:irontail", - "tm:lifedew", "tm:liquidation", "tm:megakick", "tm:megapunch", - "tm:mirrorcoat", - "tm:mist", "tm:muddywater", "tm:mudshot", - "tm:mudsport", "tm:poweruppunch", "tm:protect", "tm:raindance", - "tm:rapidspin", - "tm:refresh", "tm:rest", "tm:roar", "tm:rockclimb", @@ -176,30 +163,48 @@ "tm:rocktomb", "tm:rollout", "tm:scaryface", - "tm:shellsmash", "tm:signalbeam", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:strength", "tm:substitute", "tm:surf", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:terrainpulse", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:waterspout", - "tm:wavecrash", "tm:weatherball", "tm:whirlpool", - "tm:withdraw", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:darkpulse", + "tutor:dive", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:liquidation", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:terrainpulse", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "wartortle", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json b/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json index f4629bc414..e1431b7d83 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json @@ -114,51 +114,55 @@ "tm:gigadrain", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", - "tm:growth", "tm:headbutt", "tm:helpinghand", - "tm:ingrain", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:naturepower", - "tm:petaldance", - "tm:poisonpowder", "tm:powerwhip", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:rocksmash", "tm:safeguard", "tm:seedbomb", - "tm:skullbash", - "tm:sleeppowder", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:solarbeam", "tm:strength", "tm:stringshot", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:toxic", "tm:trailblaze", "tm:venoshock", - "tm:vinewhip", "tm:weatherball", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:bind", + "tutor:energyball", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stringshot", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json index 847bd4d1f9..0b3a5ff69a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/butterfree.json @@ -109,7 +109,6 @@ "tm:bugbite", "tm:bugbuzz", "tm:captivate", - "tm:confusion", "tm:defog", "tm:drainingkiss", "tm:dreameater", @@ -121,21 +120,16 @@ "tm:flash", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", - "tm:harden", "tm:hurricane", "tm:hyperbeam", "tm:infestation", "tm:irondefense", "tm:ominouswind", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:quiverdance", - "tm:ragepowder", "tm:raindance", "tm:rest", "tm:roost", @@ -144,24 +138,42 @@ "tm:signalbeam", "tm:silverwind", "tm:skillswap", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", "tm:stringshot", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:twister", "tm:uturn", "tm:venoshock", - "tm:whirlwind" + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:tailwind", + "tutor:twister" ], "preEvolution": "metapod", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json b/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json index 15c088a7d1..56a2977a98 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/caterpie.json @@ -82,8 +82,10 @@ "tm:bugbite", "tm:electroweb", "tm:stringshot", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:electroweb", + "tutor:stringshot" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/chansey.json b/common/src/main/resources/data/cobblemon/species/generation1/chansey.json index 9802a72071..839b90db3c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/chansey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/chansey.json @@ -111,9 +111,7 @@ "egg:present", "egg:seismictoss", "tm:allyswitch", - "tm:aromatherapy", "tm:babydolleyes", - "tm:bestow", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", @@ -121,19 +119,14 @@ "tm:calmmind", "tm:charm", "tm:chillingwater", - "tm:copycat", - "tm:counter", "tm:covet", "tm:dazzlinggleam", - "tm:defensecurl", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleslap", "tm:drainpunch", "tm:dreameater", "tm:earthquake", "tm:echoedvoice", - "tm:eggbomb", "tm:electricterrain", "tm:endeavor", "tm:endure", @@ -147,12 +140,9 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:hail", "tm:headbutt", "tm:healbell", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", @@ -163,22 +153,16 @@ "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:lifedew", "tm:lightscreen", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:minimize", - "tm:mudbomb", "tm:naturalgift", - "tm:pound", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:psychic", "tm:raindance", "tm:recycle", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:rockclimb", @@ -188,15 +172,12 @@ "tm:rollout", "tm:safeguard", "tm:sandstorm", - "tm:seismictoss", "tm:shadowball", "tm:shockwave", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:snatch", "tm:snowscape", - "tm:softboiled", "tm:solarbeam", "tm:stealthrock", "tm:stompingtantrum", @@ -204,9 +185,7 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -220,7 +199,49 @@ "tm:waterpulse", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:babydolleyes", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "happiny", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json index 4254aef6e6..3bab268e2f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json @@ -117,8 +117,6 @@ "tm:airslash", "tm:ancientpower", "tm:beatup", - "tm:bellydrum", - "tm:bite", "tm:blastburn", "tm:blazekick", "tm:bodyslam", @@ -126,22 +124,17 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:counter", "tm:crunch", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:earthquake", "tm:echoedvoice", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", @@ -149,7 +142,6 @@ "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -159,7 +151,6 @@ "tm:focuspunch", "tm:furycutter", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:heatcrash", "tm:heatwave", @@ -168,7 +159,6 @@ "tm:hurricane", "tm:hyperbeam", "tm:incinerate", - "tm:inferno", "tm:irontail", "tm:megakick", "tm:megapunch", @@ -188,12 +178,9 @@ "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", "tm:skydrop", - "tm:slash", "tm:sleeptalk", - "tm:smokescreen", "tm:solarbeam", "tm:steelwing", "tm:strength", @@ -208,8 +195,37 @@ "tm:twister", "tm:weatherball", "tm:willowisp", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:blastburn", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:firefang", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderpunch", + "tutor:twister" ], "preEvolution": "charmeleon", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charmander.json b/common/src/main/resources/data/cobblemon/species/generation1/charmander.json index d63cdf05c2..589cbbb65e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charmander.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charmander.json @@ -104,24 +104,17 @@ "egg:wingattack", "tm:ancientpower", "tm:beatup", - "tm:bellydrum", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", - "tm:counter", "tm:crunch", "tm:cut", "tm:dig", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:echoedvoice", - "tm:ember", "tm:endure", "tm:facade", "tm:falseswipe", @@ -130,7 +123,6 @@ "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -138,13 +130,11 @@ "tm:focusblast", "tm:focuspunch", "tm:furycutter", - "tm:growl", "tm:headbutt", "tm:heatwave", "tm:helpinghand", "tm:honeclaws", "tm:incinerate", - "tm:inferno", "tm:irontail", "tm:megakick", "tm:megapunch", @@ -159,11 +149,8 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", - "tm:smokescreen", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -175,8 +162,27 @@ "tm:thunderpunch", "tm:weatherball", "tm:willowisp", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:ancientpower", + "tutor:dragonpulse", + "tutor:falseswipe", + "tutor:firefang", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderpunch" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json b/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json index 2feb8f5faa..77ccff2ce0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charmeleon.json @@ -101,24 +101,17 @@ "egg:wingattack", "tm:ancientpower", "tm:beatup", - "tm:bellydrum", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", - "tm:counter", "tm:crunch", "tm:cut", "tm:dig", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:echoedvoice", - "tm:ember", "tm:endure", "tm:facade", "tm:falseswipe", @@ -127,7 +120,6 @@ "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -135,13 +127,11 @@ "tm:focusblast", "tm:focuspunch", "tm:furycutter", - "tm:growl", "tm:headbutt", "tm:heatwave", "tm:helpinghand", "tm:honeclaws", "tm:incinerate", - "tm:inferno", "tm:irontail", "tm:megakick", "tm:megapunch", @@ -156,11 +146,8 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", - "tm:smokescreen", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -172,8 +159,27 @@ "tm:thunderpunch", "tm:weatherball", "tm:willowisp", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:ancientpower", + "tutor:dragonpulse", + "tutor:falseswipe", + "tutor:firefang", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderpunch" ], "preEvolution": "charmander", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json index 7e0e23beff..e2418008cd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefable.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefable.json @@ -110,11 +110,8 @@ "tm:alluringvoice", "tm:allyswitch", "tm:amnesia", - "tm:aromatherapy", "tm:babydolleyes", "tm:batonpass", - "tm:bellydrum", - "tm:bestow", "tm:blizzard", "tm:bodyslam", "tm:bounce", @@ -123,15 +120,12 @@ "tm:chargebeam", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:cosmicpower", "tm:covet", "tm:dazzlinggleam", - "tm:defensecurl", "tm:dig", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleslap", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -149,16 +143,12 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:followme", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:headbutt", "tm:healbell", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", @@ -171,28 +161,19 @@ "tm:knockoff", "tm:laserfocus", "tm:lastresort", - "tm:lifedew", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:megakick", "tm:megapunch", "tm:meteorbeam", - "tm:meteormash", "tm:metronome", - "tm:mimic", - "tm:minimize", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", - "tm:moonlight", "tm:mysticalfire", "tm:nightshade", "tm:playrough", - "tm:pound", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:psybeam", "tm:psychic", @@ -210,19 +191,15 @@ "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", - "tm:splash", - "tm:spotlight", "tm:stealthrock", "tm:storedpower", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:takedown", "tm:telekinesis", @@ -232,16 +209,68 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:tickle", "tm:triattack", "tm:trick", "tm:uproar", - "tm:wakeupslap", "tm:waterpulse", - "tm:wish", "tm:wonderroom", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:babydolleyes", + "tutor:bounce", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:mistyexplosion", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "clefairy", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json index cdddf2bd93..462a09165a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/clefairy.json @@ -110,11 +110,8 @@ "tm:alluringvoice", "tm:allyswitch", "tm:amnesia", - "tm:aromatherapy", "tm:babydolleyes", "tm:batonpass", - "tm:bellydrum", - "tm:bestow", "tm:blizzard", "tm:bodyslam", "tm:bounce", @@ -123,15 +120,12 @@ "tm:chargebeam", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:cosmicpower", "tm:covet", "tm:dazzlinggleam", - "tm:defensecurl", "tm:dig", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleslap", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -148,14 +142,10 @@ "tm:flash", "tm:fling", "tm:focuspunch", - "tm:followme", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:headbutt", "tm:healbell", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hypervoice", "tm:icebeam", @@ -166,28 +156,19 @@ "tm:irontail", "tm:knockoff", "tm:lastresort", - "tm:lifedew", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:megakick", "tm:megapunch", "tm:meteorbeam", - "tm:meteormash", "tm:metronome", - "tm:mimic", - "tm:minimize", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", - "tm:moonlight", "tm:mysticalfire", "tm:nightshade", "tm:playrough", - "tm:pound", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:psybeam", "tm:psychic", @@ -205,19 +186,15 @@ "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", - "tm:splash", - "tm:spotlight", "tm:stealthrock", "tm:storedpower", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:takedown", "tm:telekinesis", @@ -227,16 +204,65 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:tickle", "tm:triattack", "tm:trick", "tm:uproar", - "tm:wakeupslap", "tm:waterpulse", - "tm:wish", "tm:wonderroom", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:babydolleyes", + "tutor:bounce", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:mistyexplosion", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "cleffa", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json index 8484eff61a..a5f0c55e99 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cloyster.json @@ -103,16 +103,11 @@ "egg:rapidspin", "egg:twineedle", "egg:waterpulse", - "tm:aquaring", - "tm:aurorabeam", "tm:avalanche", - "tm:barrier", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bubblebeam", "tm:chillingwater", - "tm:clamp", "tm:dive", "tm:drillrun", "tm:endure", @@ -125,14 +120,10 @@ "tm:hydropump", "tm:hyperbeam", "tm:icebeam", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:irondefense", - "tm:leer", - "tm:lifedew", "tm:lightscreen", "tm:liquidation", "tm:mudshot", @@ -141,38 +132,47 @@ "tm:poisonjab", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:razorshell", "tm:rest", "tm:rockblast", "tm:scaryface", "tm:screech", "tm:selfdestruct", - "tm:shellsmash", "tm:signalbeam", "tm:sleeptalk", "tm:smartstrike", "tm:snowscape", - "tm:spikecannon", "tm:spikes", "tm:steelroller", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:torment", "tm:toxicspikes", "tm:triattack", - "tm:twineedle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:withdraw" + "tutor:dive", + "tutor:drillrun", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:liquidation", + "tutor:poisonjab", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:steelroller", + "tutor:swift", + "tutor:waterpulse" ], "preEvolution": "shellder", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json index 712cb51384..5964a9aa54 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json @@ -95,21 +95,14 @@ "egg:skullbash", "tm:aerialace", "tm:ancientpower", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", - "tm:boneclub", - "tm:bonemerang", - "tm:bonerush", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:chipaway", "tm:curse", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:echoedvoice", @@ -124,7 +117,6 @@ "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:growl", "tm:headbutt", "tm:icebeam", "tm:icywind", @@ -133,15 +125,12 @@ "tm:ironhead", "tm:irontail", "tm:knockoff", - "tm:leer", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:mudslap", - "tm:perishsong", "tm:poweruppunch", "tm:protect", - "tm:rage", "tm:rest", "tm:retaliate", "tm:rockclimb", @@ -151,7 +140,6 @@ "tm:sandstorm", "tm:scorchingsands", "tm:screech", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -161,12 +149,39 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tailwhip", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderpunch", - "tm:uproar" + "tm:uproar", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:thunderpunch", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json index 82e4900e2d..d286176681 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json @@ -109,12 +109,8 @@ "egg:stockpile", "egg:swallow", "tm:alluringvoice", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", - "tm:aurorabeam", "tm:avalanche", - "tm:belch", "tm:blizzard", "tm:bodyslam", "tm:brine", @@ -122,7 +118,6 @@ "tm:charm", "tm:chillingwater", "tm:curse", - "tm:disable", "tm:dive", "tm:doubleedge", "tm:drillrun", @@ -130,49 +125,37 @@ "tm:encore", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:fakeout", "tm:fling", "tm:flipturn", "tm:frostbreath", "tm:gigaimpact", - "tm:growl", "tm:hail", "tm:haze", "tm:headbutt", "tm:helpinghand", - "tm:horndrill", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", - "tm:iceshard", "tm:icespinner", "tm:iciclespear", "tm:icywind", "tm:irontail", "tm:knockoff", - "tm:lick", "tm:liquidation", "tm:muddywater", "tm:payday", - "tm:perishsong", "tm:playrough", "tm:protect", "tm:raindance", "tm:rest", "tm:safeguard", - "tm:sheercold", "tm:signalbeam", - "tm:slam", "tm:sleeptalk", "tm:smartstrike", "tm:snowscape", - "tm:spitup", - "tm:stockpile", "tm:substitute", "tm:surf", - "tm:swallow", "tm:takedown", "tm:terablast", "tm:thief", @@ -181,9 +164,28 @@ "tm:waterfall", "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:dive", + "tutor:drillrun", + "tutor:endeavor", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:playrough", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "seel", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json index 8361851d7a..a02a3f933a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/diglett.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/diglett.json @@ -108,7 +108,6 @@ "tm:allyswitch", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:beatup", "tm:bodyslam", "tm:bulldoze", @@ -123,35 +122,24 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:feintattack", - "tm:finalgambit", - "tm:fissure", "tm:foulplay", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", - "tm:magnitude", - "tm:memento", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:protect", - "tm:pursuit", "tm:rest", "tm:reversal", "tm:rockblast", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:smackdown", @@ -167,7 +155,28 @@ "tm:thief", "tm:throatchop", "tm:uproar", - "tm:workup" + "tm:workup", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:uproar" ], "evolutions": [ { @@ -246,7 +255,6 @@ "tm:allyswitch", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:beatup", "tm:bodyslam", "tm:bulldoze", @@ -257,32 +265,23 @@ "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:feintattack", - "tm:finalgambit", - "tm:fissure", "tm:flashcannon", "tm:foulplay", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", "tm:irondefense", "tm:ironhead", - "tm:magnitude", - "tm:memento", "tm:metalclaw", "tm:metalsound", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:protect", - "tm:pursuit", "tm:rest", "tm:reversal", "tm:rockblast", "tm:rockslide", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", @@ -303,8 +302,28 @@ "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", - "tm:workup" + "tm:workup", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:ironhead", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ditto.json b/common/src/main/resources/data/cobblemon/species/generation1/ditto.json index 1345bc329f..a606aa78e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ditto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ditto.json @@ -67,8 +67,7 @@ ] }, "moves": [ - "1:transform", - "tm:transform" + "1:transform" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json index 0bb14d3183..9b8d1febc0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dodrio.json @@ -109,7 +109,6 @@ "egg:supersonic", "egg:whirlwind", "tm:acrobatics", - "tm:acupressure", "tm:aerialace", "tm:agility", "tm:assurance", @@ -118,38 +117,26 @@ "tm:bodyslam", "tm:bravebird", "tm:doubleedge", - "tm:doublehit", - "tm:drillpeck", "tm:drillrun", "tm:echoedvoice", "tm:endeavor", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feintattack", - "tm:flail", "tm:fly", - "tm:furyattack", "tm:gigaimpact", - "tm:growl", "tm:helpinghand", "tm:hyperbeam", - "tm:jumpkick", "tm:knockoff", "tm:leer", "tm:lowkick", "tm:lunge", - "tm:mirrormove", "tm:mudslap", "tm:naturalgift", "tm:payback", - "tm:peck", "tm:pluck", "tm:pounce", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:rage", "tm:raindance", "tm:rest", "tm:roost", @@ -160,7 +147,6 @@ "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", "tm:swordsdance", "tm:tailwind", @@ -168,15 +154,31 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:torment", "tm:trailblaze", "tm:triattack", "tm:uproar", - "tm:whirlwind", "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:drillrun", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:uproar" ], "preEvolution": "doduo", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/doduo.json b/common/src/main/resources/data/cobblemon/species/generation1/doduo.json index c49346dbf4..42a78c7c60 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/doduo.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/doduo.json @@ -107,7 +107,6 @@ "egg:supersonic", "egg:whirlwind", "tm:acrobatics", - "tm:acupressure", "tm:aerialace", "tm:agility", "tm:assurance", @@ -115,32 +114,20 @@ "tm:bodyslam", "tm:bravebird", "tm:doubleedge", - "tm:doublehit", - "tm:drillpeck", "tm:echoedvoice", "tm:endeavor", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feintattack", - "tm:flail", - "tm:furyattack", - "tm:growl", "tm:helpinghand", - "tm:jumpkick", "tm:knockoff", "tm:leer", "tm:lowkick", "tm:lunge", - "tm:mirrormove", "tm:mudslap", "tm:naturalgift", - "tm:peck", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:rage", "tm:raindance", "tm:rest", "tm:roost", @@ -149,20 +136,31 @@ "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", "tm:swordsdance", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:triattack", "tm:uproar", - "tm:whirlwind", "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:endeavor", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json b/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json index 14ba4f42a6..51cf0ad5a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dragonair.json @@ -108,7 +108,6 @@ "egg:supersonic", "egg:waterpulse", "tm:agility", - "tm:aquajet", "tm:aquatail", "tm:bind", "tm:blizzard", @@ -117,15 +116,11 @@ "tm:brutalswing", "tm:chillingwater", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:endure", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:firespin", @@ -142,9 +137,7 @@ "tm:incinerate", "tm:ironhead", "tm:irontail", - "tm:leer", "tm:lightscreen", - "tm:mist", "tm:outrage", "tm:protect", "tm:raindance", @@ -152,11 +145,9 @@ "tm:safeguard", "tm:scaleshot", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:surf", "tm:swift", "tm:takedown", @@ -168,7 +159,27 @@ "tm:waterfall", "tm:waterpulse", "tm:weatherball", - "tm:wrap" + "tutor:aquatail", + "tutor:bind", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "dratini", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json index 90c407263e..16979174ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json @@ -120,7 +120,6 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:aquajet", "tm:aquatail", "tm:bind", "tm:blizzard", @@ -135,18 +134,14 @@ "tm:defog", "tm:dive", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:earthquake", "tm:encore", "tm:endure", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:firepunch", @@ -174,13 +169,11 @@ "tm:incinerate", "tm:ironhead", "tm:irontail", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mist", "tm:ominouswind", "tm:outrage", "tm:poweruppunch", @@ -198,7 +191,6 @@ "tm:scaryface", "tm:shockwave", "tm:skydrop", - "tm:slam", "tm:sleeptalk", "tm:snowscape", "tm:steelwing", @@ -208,7 +200,6 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:supersonic", "tm:surf", "tm:swift", "tm:tailwind", @@ -222,8 +213,47 @@ "tm:waterfall", "tm:waterpulse", "tm:weatherball", - "tm:wingattack", - "tm:wrap" + "tutor:aerialace", + "tutor:aircutter", + "tutor:aquatail", + "tutor:bind", + "tutor:bulldoze", + "tutor:defog", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:lowkick", + "tutor:ominouswind", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "dragonair", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dratini.json b/common/src/main/resources/data/cobblemon/species/generation1/dratini.json index aa6d9a9632..b62e12d13f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dratini.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dratini.json @@ -106,7 +106,6 @@ "egg:supersonic", "egg:waterpulse", "tm:agility", - "tm:aquajet", "tm:aquatail", "tm:bind", "tm:blizzard", @@ -115,15 +114,11 @@ "tm:brutalswing", "tm:chillingwater", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:endure", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:firespin", @@ -140,9 +135,7 @@ "tm:incinerate", "tm:ironhead", "tm:irontail", - "tm:leer", "tm:lightscreen", - "tm:mist", "tm:outrage", "tm:protect", "tm:raindance", @@ -150,11 +143,9 @@ "tm:safeguard", "tm:scaleshot", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:surf", "tm:swift", "tm:takedown", @@ -165,7 +156,27 @@ "tm:twister", "tm:waterfall", "tm:waterpulse", - "tm:wrap" + "tutor:aquatail", + "tutor:bind", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json b/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json index d9731c2fdf..1fa9660bf5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/drowzee.json @@ -96,15 +96,11 @@ "egg:secretpower", "egg:thunderpunch", "tm:allyswitch", - "tm:assist", - "tm:barrier", "tm:bodyslam", "tm:brickbreak", "tm:calmmind", - "tm:confusion", "tm:curse", "tm:dazzlinggleam", - "tm:disable", "tm:doubleedge", "tm:drainingkiss", "tm:drainpunch", @@ -116,7 +112,6 @@ "tm:facade", "tm:firepunch", "tm:flash", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:focuspunch", @@ -127,7 +122,6 @@ "tm:haze", "tm:headbutt", "tm:helpinghand", - "tm:hypnosis", "tm:icepunch", "tm:imprison", "tm:knockoff", @@ -136,16 +130,12 @@ "tm:lowsweep", "tm:magiccoat", "tm:magicroom", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:mindreader", "tm:nastyplot", "tm:nightshade", - "tm:poisongas", - "tm:pound", - "tm:powersplit", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -173,7 +163,6 @@ "tm:sunnyday", "tm:swagger", "tm:swift", - "tm:synchronoise", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -187,8 +176,37 @@ "tm:triattack", "tm:trick", "tm:trickroom", - "tm:wakeupslap", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json index 775400c194..62d5452313 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json @@ -113,7 +113,6 @@ "tm:allyswitch", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:beatup", "tm:bodyslam", "tm:bulldoze", @@ -128,39 +127,26 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:feintattack", - "tm:finalgambit", - "tm:fissure", "tm:foulplay", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", "tm:hyperbeam", - "tm:magnitude", - "tm:memento", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", - "tm:nightslash", "tm:protect", - "tm:pursuit", "tm:rest", "tm:reversal", "tm:rockblast", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rototiller", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -178,7 +164,30 @@ "tm:throatchop", "tm:triattack", "tm:uproar", - "tm:workup" + "tm:workup", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:uproar" ], "preEvolution": "diglett", "evolutions": [], @@ -255,7 +264,6 @@ "tm:allyswitch", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:beatup", "tm:bodyslam", "tm:bulldoze", @@ -269,36 +277,25 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:feintattack", - "tm:finalgambit", - "tm:fissure", "tm:flashcannon", "tm:foulplay", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", - "tm:magnitude", - "tm:memento", "tm:metalclaw", "tm:metalsound", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", - "tm:nightslash", "tm:protect", - "tm:pursuit", "tm:rest", "tm:reversal", "tm:rockblast", "tm:rockslide", "tm:rocktomb", - "tm:rototiller", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", @@ -320,11 +317,36 @@ "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:triattack", "tm:uproar", - "tm:workup" + "tm:workup", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:uproar" ], "preEvolution": "diglett alolan", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/eevee.json b/common/src/main/resources/data/cobblemon/species/generation1/eevee.json index 4eaf5029e7..a617f385fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/eevee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/eevee.json @@ -93,25 +93,19 @@ "tm:alluringvoice", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:calmmind", "tm:captivate", "tm:charm", - "tm:copycat", "tm:covet", "tm:curse", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:faketears", - "tm:flail", "tm:focusenergy", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -123,31 +117,36 @@ "tm:naturalgift", "tm:payday", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", - "tm:sandattack", "tm:shadowball", "tm:sleeptalk", "tm:storedpower", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:trailblaze", - "tm:trumpcard", "tm:weatherball", - "tm:wish", "tm:workup", - "tm:yawn" + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:focusenergy", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:mudslap", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:swift" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ekans.json b/common/src/main/resources/data/cobblemon/species/generation1/ekans.json index 210766bcfc..60df06beea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ekans.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ekans.json @@ -94,19 +94,14 @@ "egg:spite", "egg:suckerpunch", "egg:switcheroo", - "tm:acid", "tm:acidspray", "tm:aquatail", "tm:beatup", - "tm:belch", "tm:bind", - "tm:bite", "tm:brutalswing", - "tm:coil", "tm:crunch", "tm:darkpulse", "tm:dig", - "tm:disable", "tm:doubleedge", "tm:earthquake", "tm:endure", @@ -114,7 +109,6 @@ "tm:firefang", "tm:gastroacid", "tm:gigadrain", - "tm:glare", "tm:gunkshot", "tm:haze", "tm:headbutt", @@ -123,18 +117,13 @@ "tm:knockoff", "tm:lashout", "tm:leechlife", - "tm:leer", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:payback", - "tm:poisonfang", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", "tm:psychicfangs", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:rockslide", @@ -144,21 +133,16 @@ "tm:screech", "tm:seedbomb", "tm:skittersmack", - "tm:slam", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snarl", "tm:snatch", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:strength", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:swallow", - "tm:switcheroo", "tm:takedown", "tm:terablast", "tm:thief", @@ -167,7 +151,32 @@ "tm:toxicspikes", "tm:trailblaze", "tm:venoshock", - "tm:wrap" + "tutor:aquatail", + "tutor:bind", + "tutor:darkpulse", + "tutor:firefang", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gunkshot", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:leechlife", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:seedbomb", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spikes", + "tutor:spite", + "tutor:suckerpunch" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json b/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json index 35753ba01b..05d4503563 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/electabuzz.json @@ -101,46 +101,36 @@ "egg:karatechop", "egg:meditate", "egg:rollingkick", - "tm:barrier", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:charge", "tm:chargebeam", "tm:covet", - "tm:crosschop", - "tm:discharge", "tm:doubleedge", "tm:dualchop", - "tm:dynamicpunch", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:endure", "tm:facade", - "tm:feint", "tm:firepunch", "tm:flash", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:followme", "tm:gigaimpact", - "tm:hammerarm", "tm:headbutt", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", "tm:irontail", - "tm:karatechop", "tm:knockoff", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", "tm:magnetrise", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metalsound", @@ -148,13 +138,11 @@ "tm:poweruppunch", "tm:protect", "tm:psychic", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", "tm:rockclimb", "tm:rocksmash", - "tm:rollingkick", "tm:screech", "tm:shockwave", "tm:signalbeam", @@ -170,12 +158,38 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:uproar", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:bulkup", + "tutor:chargebeam", + "tutor:covet", + "tutor:dualchop", + "tutor:electroweb", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "elekid", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json index 767bcd4e88..0562d98e2d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/electrode.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/electrode.json @@ -96,7 +96,6 @@ "tm:charge", "tm:chargebeam", "tm:curse", - "tm:discharge", "tm:doubleedge", "tm:eerieimpulse", "tm:electricterrain", @@ -114,10 +113,8 @@ "tm:hyperbeam", "tm:lightscreen", "tm:magiccoat", - "tm:magneticflux", "tm:magnetrise", "tm:metalsound", - "tm:mirrorcoat", "tm:protect", "tm:raindance", "tm:recycle", @@ -130,14 +127,11 @@ "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", - "tm:sonicboom", - "tm:spark", "tm:steelroller", "tm:substitute", "tm:suckerpunch", "tm:supercellslam", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -145,11 +139,31 @@ "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:torment", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelroller", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:wildcharge" ], "preEvolution": "voltorb", "evolutions": [], @@ -214,9 +228,7 @@ "tm:bulletseed", "tm:charge", "tm:chargebeam", - "tm:chloroblast", "tm:curse", - "tm:discharge", "tm:doubleedge", "tm:electricterrain", "tm:electroball", @@ -235,7 +247,6 @@ "tm:hyperbeam", "tm:iceball", "tm:leafstorm", - "tm:leechseed", "tm:protect", "tm:raindance", "tm:recycle", @@ -248,22 +259,37 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:solarbeam", - "tm:stunspore", "tm:substitute", "tm:supercellslam", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tm:worryseed" + "tm:worryseed", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:worryseed" ], "preEvolution": "voltorb hisuian", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json index 0834d20cec..355ed0569f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggcute.json @@ -102,19 +102,14 @@ "egg:poisonpowder", "egg:sleeppowder", "egg:stunspore", - "tm:absorb", "tm:ancientpower", - "tm:barrage", - "tm:bestow", "tm:block", "tm:bulletseed", - "tm:confusion", "tm:curse", "tm:dreameater", "tm:endure", "tm:energyball", "tm:explosion", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:gigadrain", @@ -122,19 +117,12 @@ "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", - "tm:hypnosis", "tm:imprison", "tm:infestation", - "tm:ingrain", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", - "tm:luckychant", - "tm:megadrain", - "tm:moonlight", "tm:naturalgift", "tm:naturepower", - "tm:poisonpowder", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -148,13 +136,11 @@ "tm:seedbomb", "tm:selfdestruct", "tm:skillswap", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", "tm:storedpower", "tm:strength", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:swordsdance", @@ -165,7 +151,26 @@ "tm:trick", "tm:uproar", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:block", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:psychic", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:telekinesis", + "tutor:trick", + "tutor:uproar", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json index 77ddc76ed5..c272de9f82 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/exeggutor.json @@ -113,26 +113,20 @@ "egg:poisonpowder", "egg:sleeppowder", "egg:stunspore", - "tm:absorb", "tm:ancientpower", - "tm:barrage", - "tm:bestow", "tm:block", "tm:bodyslam", "tm:bulldoze", "tm:bulletseed", "tm:calmmind", - "tm:confusion", "tm:curse", "tm:doubleedge", "tm:dreameater", "tm:earthquake", - "tm:eggbomb", "tm:endure", "tm:energyball", "tm:expandingforce", "tm:explosion", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:futuresight", @@ -142,25 +136,17 @@ "tm:grassyglide", "tm:grassyterrain", "tm:gravity", - "tm:growth", "tm:headbutt", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:infestation", - "tm:ingrain", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:lowkick", - "tm:luckychant", "tm:magicalleaf", - "tm:megadrain", - "tm:moonlight", "tm:naturalgift", "tm:naturepower", - "tm:poisonpowder", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -176,15 +162,12 @@ "tm:seedbomb", "tm:selfdestruct", "tm:skillswap", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:stomp", "tm:stompingtantrum", "tm:storedpower", "tm:strength", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:swordsdance", @@ -197,9 +180,38 @@ "tm:trick", "tm:trickroom", "tm:uproar", - "tm:woodhammer", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stompingtantrum", + "tutor:synthesis", + "tutor:telekinesis", + "tutor:terrainpulse", + "tutor:trick", + "tutor:uproar", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "exeggcute", "evolutions": [], @@ -272,10 +284,7 @@ "egg:poisonpowder", "egg:sleeppowder", "egg:stunspore", - "tm:absorb", "tm:ancientpower", - "tm:barrage", - "tm:bestow", "tm:block", "tm:bodyslam", "tm:breakingswipe", @@ -284,21 +293,17 @@ "tm:bulldoze", "tm:bulletseed", "tm:calmmind", - "tm:confusion", "tm:curse", "tm:doubleedge", "tm:dracometeor", "tm:dragoncheer", - "tm:dragonhammer", "tm:dragonpulse", "tm:dragontail", "tm:dreameater", "tm:earthquake", - "tm:eggbomb", "tm:endure", "tm:energyball", "tm:explosion", - "tm:extrasensory", "tm:facade", "tm:flamethrower", "tm:gigadrain", @@ -307,28 +312,20 @@ "tm:grassyglide", "tm:grassyterrain", "tm:gravity", - "tm:growth", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:infestation", - "tm:ingrain", "tm:ironhead", "tm:irontail", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:lowkick", - "tm:luckychant", "tm:magicalleaf", - "tm:megadrain", - "tm:moonlight", "tm:naturalgift", "tm:naturepower", "tm:outrage", - "tm:poisonpowder", "tm:powerswap", "tm:powerwhip", "tm:protect", @@ -343,13 +340,11 @@ "tm:seedbomb", "tm:selfdestruct", "tm:skillswap", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", "tm:stompingtantrum", "tm:storedpower", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:superpower", @@ -364,9 +359,43 @@ "tm:trick", "tm:trickroom", "tm:uproar", - "tm:woodhammer", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:energyball", + "tutor:flamethrower", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:synthesis", + "tutor:telekinesis", + "tutor:terrainpulse", + "tutor:trick", + "tutor:uproar", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "exeggcute", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json index 17ffbdd2c6..9cb2d3f073 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/farfetchd.json @@ -1,7 +1,7 @@ { "implemented": true, "nationalPokedexNumber": 83, - "name": "Farfetch’d", + "name": "Farfetch\u00e2\u20ac\u2122d", "primaryType": "normal", "secondaryType": "flying", "maleRatio": 0.5, @@ -142,16 +142,9 @@ "tm:facade", "tm:falseswipe", "tm:featherdance", - "tm:feint", - "tm:finalgambit", - "tm:firstimpression", - "tm:flail", "tm:fly", "tm:focusenergy", - "tm:foresight", - "tm:furyattack", "tm:furycutter", - "tm:gust", "tm:headbutt", "tm:heatwave", "tm:helpinghand", @@ -160,25 +153,17 @@ "tm:laserfocus", "tm:lastresort", "tm:leafblade", - "tm:leer", - "tm:mirrormove", "tm:mudslap", - "tm:nightslash", "tm:ominouswind", - "tm:peck", "tm:pluck", "tm:poisonjab", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:rest", "tm:retaliate", "tm:revenge", "tm:roost", - "tm:sandattack", - "tm:simplebeam", "tm:skyattack", - "tm:slash", "tm:sleeptalk", "tm:solarblade", "tm:steelwing", @@ -190,11 +175,36 @@ "tm:terablast", "tm:thief", "tm:throatchop", - "tm:trumpcard", "tm:twister", "tm:uproar", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:covet", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:poisonjab", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:twister", + "tutor:uproar" ], "evolutions": [], "forms": [ @@ -279,38 +289,25 @@ "tm:brickbreak", "tm:brutalswing", "tm:closecombat", - "tm:counter", "tm:covet", "tm:curse", "tm:defog", - "tm:detect", "tm:doubleedge", "tm:dualwingbeat", "tm:endure", "tm:facade", - "tm:feint", - "tm:finalgambit", - "tm:flail", "tm:focusenergy", "tm:furycutter", "tm:helpinghand", "tm:knockoff", "tm:leafblade", - "tm:leer", - "tm:nightslash", - "tm:peck", "tm:poisonjab", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:retaliate", "tm:revenge", "tm:rocksmash", - "tm:sandattack", - "tm:simplebeam", "tm:skyattack", - "tm:slam", "tm:sleeptalk", "tm:solarblade", "tm:steelwing", @@ -320,7 +317,21 @@ "tm:swordsdance", "tm:terablast", "tm:throatchop", - "tm:workup" + "tm:workup", + "tutor:covet", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:throatchop" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/fearow.json b/common/src/main/resources/data/cobblemon/species/generation1/fearow.json index b937e80e3f..c498d41c92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/fearow.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/fearow.json @@ -103,11 +103,9 @@ "tm:agility", "tm:aircutter", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:bravebird", "tm:defog", - "tm:drillpeck", "tm:drillrun", "tm:dualwingbeat", "tm:echoedvoice", @@ -115,27 +113,18 @@ "tm:facade", "tm:falseswipe", "tm:featherdance", - "tm:feintattack", "tm:fly", "tm:focusenergy", - "tm:furyattack", "tm:gigaimpact", - "tm:growl", "tm:heatwave", "tm:hyperbeam", "tm:laserfocus", - "tm:leer", - "tm:mirrormove", "tm:mudslap", "tm:ominouswind", "tm:payday", - "tm:peck", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roost", "tm:scaryface", @@ -153,9 +142,29 @@ "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:drillrun", + "tutor:dualwingbeat", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:throatchop", + "tutor:twister", + "tutor:uproar" ], "preEvolution": "spearow", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json index e4f567954e..7eb5fd77ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json @@ -100,21 +100,16 @@ "tm:alluringvoice", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:burningjealousy", "tm:calmmind", "tm:captivate", "tm:charm", - "tm:copycat", "tm:covet", "tm:curse", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", @@ -122,13 +117,11 @@ "tm:fireblast", "tm:firefang", "tm:firespin", - "tm:flail", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:heatwave", @@ -139,7 +132,6 @@ "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:lavaplume", "tm:mudslap", "tm:mysticalfire", "tm:naturalgift", @@ -147,39 +139,55 @@ "tm:payday", "tm:powershift", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", "tm:rocksmash", - "tm:sandattack", "tm:scaryface", "tm:scorchingsands", "tm:shadowball", "tm:sleeptalk", - "tm:smog", "tm:storedpower", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:swift", - "tm:synchronoise", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:tickle", "tm:trailblaze", - "tm:trumpcard", "tm:weatherball", "tm:willowisp", - "tm:wish", "tm:workup", - "tm:yawn" + "tutor:babydolleyes", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:covet", + "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:mudslap", + "tutor:mysticalfire", + "tutor:powershift", + "tutor:rest", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:swift" ], "preEvolution": "eevee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gastly.json b/common/src/main/resources/data/cobblemon/species/generation1/gastly.json index ea46efcf44..81658263e2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gastly.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gastly.json @@ -103,15 +103,11 @@ "egg:toxic", "tm:acidspray", "tm:allyswitch", - "tm:astonish", - "tm:clearsmog", "tm:confuseray", "tm:corrosivegas", "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:endure", @@ -121,32 +117,24 @@ "tm:firepunch", "tm:foulplay", "tm:gigadrain", - "tm:grudge", "tm:gunkshot", "tm:haze", "tm:hex", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:imprison", "tm:infestation", - "tm:lick", - "tm:meanlook", "tm:nastyplot", - "tm:nightmare", "tm:nightshade", "tm:ominouswind", "tm:painsplit", "tm:payback", - "tm:perishsong", "tm:poisonjab", "tm:poltergeist", "tm:protect", "tm:psychic", "tm:psychup", - "tm:psywave", "tm:raindance", - "tm:reflecttype", "tm:rest", "tm:scaryface", "tm:selfdestruct", @@ -156,7 +144,6 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", "tm:snatch", "tm:spite", "tm:substitute", @@ -175,7 +162,37 @@ "tm:trickroom", "tm:venoshock", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:firepunch", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gunkshot", + "tutor:icepunch", + "tutor:icywind", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json index 19ba013f5a..f02fc48518 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gengar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gengar.json @@ -100,17 +100,13 @@ "egg:toxic", "tm:acidspray", "tm:allyswitch", - "tm:astonish", "tm:bodyslam", "tm:brickbreak", - "tm:clearsmog", "tm:confuseray", "tm:corrosivegas", "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:drainpunch", "tm:dreameater", "tm:embargo", @@ -126,31 +122,25 @@ "tm:foulplay", "tm:gigadrain", "tm:gigaimpact", - "tm:grudge", "tm:gunkshot", "tm:haze", "tm:headbutt", "tm:hex", "tm:hyperbeam", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:imprison", "tm:infestation", "tm:knockoff", "tm:laserfocus", - "tm:lick", - "tm:meanlook", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:nastyplot", - "tm:nightmare", "tm:nightshade", "tm:ominouswind", "tm:painsplit", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poisonjab", "tm:poltergeist", @@ -160,9 +150,7 @@ "tm:psychic", "tm:psychicnoise", "tm:psychup", - "tm:psywave", "tm:raindance", - "tm:reflecttype", "tm:rest", "tm:rocksmash", "tm:roleplay", @@ -170,13 +158,11 @@ "tm:selfdestruct", "tm:shadowball", "tm:shadowclaw", - "tm:shadowpunch", "tm:skillswap", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", "tm:snatch", "tm:spite", "tm:strength", @@ -198,7 +184,48 @@ "tm:trickroom", "tm:venoshock", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "haunter", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json index 50ef71b960..d356d9193f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/geodude.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/geodude.json @@ -112,17 +112,14 @@ "egg:megapunch", "egg:wideguard", "tm:ancientpower", - "tm:autotomize", "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:dynamicpunch", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -130,23 +127,19 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focuspunch", "tm:gyroball", - "tm:hammerarm", "tm:harden", "tm:headbutt", "tm:highhorsepower", "tm:incinerate", "tm:irondefense", - "tm:magnitude", "tm:megapunch", "tm:metronome", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:naturepower", "tm:poweruppunch", "tm:protect", @@ -156,7 +149,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", @@ -173,11 +165,31 @@ "tm:suckerpunch", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderpunch", - "tm:wideguard" + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:highhorsepower", + "tutor:irondefense", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:thunderpunch" ], "evolutions": [ { @@ -264,7 +276,6 @@ "egg:screech", "egg:wideguard", "egg:zapcannon", - "tm:autotomize", "tm:block", "tm:bodyslam", "tm:brickbreak", @@ -272,11 +283,8 @@ "tm:bulldoze", "tm:charge", "tm:chargebeam", - "tm:counter", "tm:curse", - "tm:defensecurl", "tm:dig", - "tm:discharge", "tm:doubleedge", "tm:earthpower", "tm:earthquake", @@ -286,7 +294,6 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focuspunch", @@ -305,7 +312,6 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", @@ -313,7 +319,6 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:smackdown", - "tm:spark", "tm:stealthrock", "tm:steelroller", "tm:stoneedge", @@ -321,7 +326,6 @@ "tm:sunnyday", "tm:supercellslam", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", @@ -329,9 +333,31 @@ "tm:thunderpunch", "tm:thunderwave", "tm:voltswitch", - "tm:wideguard", "tm:wildcharge", - "tm:zapcannon" + "tutor:block", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:earthpower", + "tutor:electroweb", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:highhorsepower", + "tutor:irondefense", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gloom.json b/common/src/main/resources/data/cobblemon/species/generation1/gloom.json index 68c184c4da..da4be58f0d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gloom.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gloom.json @@ -99,8 +99,6 @@ "egg:synthesis", "egg:teeterdance", "egg:tickle", - "tm:absorb", - "tm:acid", "tm:acidspray", "tm:afteryou", "tm:bulletseed", @@ -109,53 +107,49 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:gastroacid", "tm:gigadrain", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:infestation", - "tm:ingrain", "tm:leafstorm", - "tm:leechseed", - "tm:luckychant", "tm:magicalleaf", - "tm:megadrain", - "tm:moonblast", - "tm:moonlight", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:secretpower", "tm:seedbomb", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:teeterdance", "tm:terablast", - "tm:tickle", "tm:toxic", "tm:trailblaze", "tm:venoshock", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "oddish", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golbat.json b/common/src/main/resources/data/cobblemon/species/generation1/golbat.json index 7adc3b63ab..93013453d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golbat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golbat.json @@ -104,15 +104,12 @@ "egg:quickattack", "egg:whirlwind", "egg:wingattack", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:agility", "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:astonish", - "tm:bite", "tm:bravebird", "tm:confuseray", "tm:crunch", @@ -121,26 +118,18 @@ "tm:dualwingbeat", "tm:endure", "tm:facade", - "tm:feintattack", "tm:fly", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:haze", "tm:heatwave", "tm:hyperbeam", - "tm:hypnosis", "tm:leechlife", - "tm:meanlook", "tm:nastyplot", "tm:ominouswind", "tm:payback", "tm:pluck", - "tm:poisonfang", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:roost", @@ -153,7 +142,6 @@ "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:supersonic", "tm:swift", "tm:tailwind", "tm:taunt", @@ -165,9 +153,29 @@ "tm:uturn", "tm:venomdrench", "tm:venoshock", - "tm:whirlwind", - "tm:wingattack", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:leechlife", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:superfang", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "zubat", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json b/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json index bbf16561e4..2d2c2c5f54 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/goldeen.json @@ -104,9 +104,7 @@ "egg:mudsport", "egg:psybeam", "egg:skullbash", - "tm:acupressure", "tm:agility", - "tm:aquaring", "tm:aquatail", "tm:blizzard", "tm:bodyslam", @@ -115,14 +113,10 @@ "tm:drillrun", "tm:endure", "tm:facade", - "tm:flail", "tm:flipturn", - "tm:furyattack", "tm:furycutter", "tm:hail", "tm:haze", - "tm:hornattack", - "tm:horndrill", "tm:hydropump", "tm:icebeam", "tm:icywind", @@ -131,8 +125,6 @@ "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:peck", "tm:poisonjab", "tm:protect", "tm:psybeam", @@ -141,22 +133,36 @@ "tm:scald", "tm:scaleshot", "tm:signalbeam", - "tm:skullbash", "tm:sleeptalk", "tm:smartstrike", - "tm:soak", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tailwhip", "tm:terablast", "tm:throatchop", "tm:waterfall", "tm:waterpulse", - "tm:watersport", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bounce", + "tutor:dive", + "tutor:drillrun", + "tutor:flipturn", + "tutor:furycutter", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:megahorn", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:scaleshot", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golduck.json b/common/src/main/resources/data/cobblemon/species/generation1/golduck.json index 41239af13e..79aaa9df68 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golduck.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golduck.json @@ -112,21 +112,15 @@ "egg:synchronoise", "egg:yawn", "tm:amnesia", - "tm:aquajet", "tm:aquatail", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:brine", - "tm:bubble", "tm:calmmind", "tm:chillingwater", - "tm:clearsmog", "tm:confuseray", - "tm:confusion", - "tm:crosschop", "tm:dig", - "tm:disable", "tm:dive", "tm:doubleedge", "tm:encore", @@ -138,9 +132,7 @@ "tm:flipturn", "tm:focusblast", "tm:focuspunch", - "tm:foresight", "tm:furycutter", - "tm:furyswipes", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", @@ -151,7 +143,6 @@ "tm:honeclaws", "tm:hydropump", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icepunch", "tm:icywind", @@ -162,11 +153,9 @@ "tm:liquidation", "tm:lowkick", "tm:lowsweep", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:nastyplot", @@ -180,26 +169,20 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rockclimb", "tm:rocksmash", "tm:roleplay", - "tm:scratch", "tm:screech", "tm:secretpower", "tm:shadowclaw", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:sleeptalk", - "tm:soak", "tm:strength", "tm:substitute", "tm:surf", "tm:swift", - "tm:synchronoise", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -208,14 +191,44 @@ "tm:trailblaze", "tm:vacuumwave", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", "tm:wonderroom", "tm:worryseed", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:calmmind", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:lowkick", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:vacuumwave", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "psyduck", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golem.json b/common/src/main/resources/data/cobblemon/species/generation1/golem.json index 25e91cccac..7ef4751c72 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golem.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golem.json @@ -116,7 +116,6 @@ "egg:megapunch", "egg:wideguard", "tm:ancientpower", - "tm:autotomize", "tm:block", "tm:bodypress", "tm:bodyslam", @@ -124,10 +123,8 @@ "tm:brutalswing", "tm:bulldoze", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:dynamicpunch", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -135,7 +132,6 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", @@ -143,7 +139,6 @@ "tm:furycutter", "tm:gigaimpact", "tm:gyroball", - "tm:hammerarm", "tm:harden", "tm:hardpress", "tm:headbutt", @@ -153,13 +148,11 @@ "tm:incinerate", "tm:irondefense", "tm:ironhead", - "tm:magnitude", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:naturepower", "tm:poweruppunch", "tm:protect", @@ -170,7 +163,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", @@ -179,7 +171,6 @@ "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", - "tm:steamroller", "tm:steelroller", "tm:stompingtantrum", "tm:stoneedge", @@ -188,11 +179,35 @@ "tm:suckerpunch", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderpunch", - "tm:wideguard" + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:thunderpunch" ], "preEvolution": "graveler", "evolutions": [], @@ -268,7 +283,6 @@ "egg:wideguard", "egg:zapcannon", "tm:allyswitch", - "tm:autotomize", "tm:block", "tm:bodypress", "tm:bodyslam", @@ -277,11 +291,8 @@ "tm:bulldoze", "tm:charge", "tm:chargebeam", - "tm:counter", "tm:curse", - "tm:defensecurl", "tm:dig", - "tm:discharge", "tm:doubleedge", "tm:earthpower", "tm:earthquake", @@ -293,7 +304,6 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", @@ -320,7 +330,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:scaryface", @@ -329,9 +338,7 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:spark", "tm:stealthrock", - "tm:steamroller", "tm:steelroller", "tm:stompingtantrum", "tm:stoneedge", @@ -339,7 +346,6 @@ "tm:sunnyday", "tm:supercellslam", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", @@ -347,9 +353,36 @@ "tm:thunderpunch", "tm:thunderwave", "tm:voltswitch", - "tm:wideguard", "tm:wildcharge", - "tm:zapcannon" + "tutor:allyswitch", + "tutor:block", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:earthpower", + "tutor:electroweb", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "preEvolution": "graveler alolan", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json index e94f025ac7..78bb5849cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json @@ -115,7 +115,6 @@ "egg:megapunch", "egg:wideguard", "tm:ancientpower", - "tm:autotomize", "tm:block", "tm:bodypress", "tm:bodyslam", @@ -123,10 +122,8 @@ "tm:brutalswing", "tm:bulldoze", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:dynamicpunch", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -134,13 +131,11 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:gyroball", - "tm:hammerarm", "tm:harden", "tm:hardpress", "tm:headbutt", @@ -149,12 +144,10 @@ "tm:incinerate", "tm:irondefense", "tm:ironhead", - "tm:magnitude", "tm:megapunch", "tm:metronome", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:naturepower", "tm:poweruppunch", "tm:protect", @@ -164,7 +157,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", @@ -181,11 +173,32 @@ "tm:suckerpunch", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderpunch", - "tm:wideguard" + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:highhorsepower", + "tutor:irondefense", + "tutor:ironhead", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:thunderpunch" ], "preEvolution": "geodude", "evolutions": [ @@ -269,7 +282,6 @@ "egg:wideguard", "egg:zapcannon", "tm:allyswitch", - "tm:autotomize", "tm:block", "tm:bodyslam", "tm:brickbreak", @@ -277,11 +289,8 @@ "tm:bulldoze", "tm:charge", "tm:chargebeam", - "tm:counter", "tm:curse", - "tm:defensecurl", "tm:dig", - "tm:discharge", "tm:doubleedge", "tm:earthpower", "tm:earthquake", @@ -292,7 +301,6 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", @@ -313,7 +321,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", @@ -323,7 +330,6 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:spark", "tm:stealthrock", "tm:steelroller", "tm:stompingtantrum", @@ -332,7 +338,6 @@ "tm:sunnyday", "tm:supercellslam", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", @@ -340,9 +345,34 @@ "tm:thunderpunch", "tm:thunderwave", "tm:voltswitch", - "tm:wideguard", "tm:wildcharge", - "tm:zapcannon" + "tutor:allyswitch", + "tutor:block", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:earthpower", + "tutor:electroweb", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:highhorsepower", + "tutor:irondefense", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:rollout", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "preEvolution": "geodude alolan", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json index 6785920dc6..8915b96952 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/grimer.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/grimer.json @@ -105,16 +105,13 @@ "egg:spitup", "egg:stockpile", "egg:swallow", - "tm:acidarmor", "tm:acidspray", "tm:assurance", - "tm:belch", "tm:bodyslam", "tm:brutalswing", "tm:confuseray", "tm:curse", "tm:dig", - "tm:disable", "tm:drainpunch", "tm:endure", "tm:explosion", @@ -125,7 +122,6 @@ "tm:fling", "tm:gigadrain", "tm:gunkshot", - "tm:harden", "tm:haze", "tm:helpinghand", "tm:hex", @@ -133,19 +129,12 @@ "tm:imprison", "tm:incinerate", "tm:infestation", - "tm:lick", - "tm:meanlook", - "tm:memento", "tm:metronome", - "tm:minimize", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:painsplit", "tm:payback", - "tm:poisongas", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -157,20 +146,14 @@ "tm:screech", "tm:selfdestruct", "tm:shadowball", - "tm:shadowpunch", - "tm:shadowsneak", "tm:shockwave", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", "tm:smog", - "tm:spitup", - "tm:stockpile", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:takedown", "tm:taunt", "tm:terablast", @@ -181,7 +164,26 @@ "tm:torment", "tm:toxic", "tm:venoshock", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:gigadrain", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [ { @@ -268,20 +270,15 @@ "egg:spitup", "egg:stockpile", "egg:swallow", - "tm:acidarmor", "tm:acidspray", "tm:assurance", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", - "tm:clearsmog", "tm:crunch", "tm:curse", "tm:darkpulse", "tm:dig", - "tm:disable", "tm:drainpunch", "tm:embargo", "tm:endure", @@ -295,7 +292,6 @@ "tm:gigadrain", "tm:gigaimpact", "tm:gunkshot", - "tm:harden", "tm:helpinghand", "tm:hex", "tm:hyperbeam", @@ -303,21 +299,14 @@ "tm:imprison", "tm:infestation", "tm:knockoff", - "tm:meanlook", - "tm:memento", "tm:metronome", - "tm:minimize", "tm:mudshot", "tm:mudslap", "tm:painsplit", "tm:payback", - "tm:poisonfang", - "tm:poisongas", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:quash", "tm:raindance", "tm:recycle", @@ -330,19 +319,15 @@ "tm:screech", "tm:selfdestruct", "tm:shadowball", - "tm:shadowsneak", "tm:shockwave", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snarl", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:swift", "tm:takedown", "tm:taunt", @@ -354,7 +339,36 @@ "tm:torment", "tm:toxic", "tm:venoshock", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spite", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json b/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json index 231a9b4b1a..03bda110b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json @@ -98,9 +98,7 @@ "egg:ragingfury", "egg:thrash", "tm:agility", - "tm:bite", "tm:bodyslam", - "tm:burnup", "tm:charm", "tm:closecombat", "tm:covet", @@ -108,33 +106,24 @@ "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", "tm:firefang", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:howl", "tm:incinerate", "tm:irontail", - "tm:leer", - "tm:morningsun", - "tm:odorsleuth", "tm:outrage", "tm:overheat", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:ragingfury", "tm:rest", "tm:retaliate", "tm:reversal", @@ -152,10 +141,25 @@ "tm:temperflare", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderfang", "tm:wildcharge", - "tm:willowisp" + "tm:willowisp", + "tutor:covet", + "tutor:firefang", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:outrage", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:thunderfang", + "tutor:wildcharge" ], "evolutions": [ { @@ -224,15 +228,12 @@ "egg:morningsun", "egg:thrash", "tm:agility", - "tm:bite", "tm:bodyslam", "tm:closecombat", "tm:covet", "tm:crunch", "tm:dig", "tm:doubleedge", - "tm:doublekick", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", @@ -240,15 +241,10 @@ "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", - "tm:headsmash", "tm:heatwave", "tm:helpinghand", - "tm:howl", "tm:irontail", - "tm:leer", - "tm:morningsun", "tm:outrage", "tm:overheat", "tm:powergem", @@ -275,10 +271,26 @@ "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:thunderfang", "tm:wildcharge", - "tm:willowisp" + "tm:willowisp", + "tutor:covet", + "tutor:firefang", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:thunderfang", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json index 1cf6552786..a818ef68d8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json @@ -102,7 +102,6 @@ "52:hyperbeam", "tm:aquatail", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:bounce", @@ -117,14 +116,12 @@ "tm:dragoncheer", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", "tm:fireblast", - "tm:flail", "tm:flamethrower", "tm:gigaimpact", "tm:hail", @@ -140,7 +137,6 @@ "tm:ironhead", "tm:irontail", "tm:lashout", - "tm:leer", "tm:muddywater", "tm:outrage", "tm:payback", @@ -156,18 +152,15 @@ "tm:scaryface", "tm:sleeptalk", "tm:spite", - "tm:splash", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", @@ -175,7 +168,34 @@ "tm:twister", "tm:waterfall", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:dive", + "tutor:dragonpulse", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:lashout", + "tutor:outrage", + "tutor:rest", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "magikarp", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/haunter.json b/common/src/main/resources/data/cobblemon/species/generation1/haunter.json index fbc0ab7911..adea13cc09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/haunter.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/haunter.json @@ -101,15 +101,11 @@ "egg:toxic", "tm:acidspray", "tm:allyswitch", - "tm:astonish", - "tm:clearsmog", "tm:confuseray", "tm:corrosivegas", "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:encore", @@ -122,46 +118,36 @@ "tm:focusblast", "tm:foulplay", "tm:gigadrain", - "tm:grudge", "tm:gunkshot", "tm:haze", "tm:hex", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:imprison", "tm:infestation", - "tm:lick", - "tm:meanlook", "tm:metronome", "tm:nastyplot", - "tm:nightmare", "tm:nightshade", "tm:ominouswind", "tm:painsplit", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poisonjab", "tm:poltergeist", "tm:protect", "tm:psychic", "tm:psychup", - "tm:psywave", "tm:raindance", - "tm:reflecttype", "tm:rest", "tm:scaryface", "tm:selfdestruct", "tm:shadowball", "tm:shadowclaw", - "tm:shadowpunch", "tm:skillswap", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", "tm:snatch", "tm:spite", "tm:substitute", @@ -181,7 +167,39 @@ "tm:trickroom", "tm:venoshock", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:firepunch", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gunkshot", + "tutor:icepunch", + "tutor:icywind", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "gastly", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json b/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json index 192507f27c..5c6e3f63f2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hitmonchan.json @@ -108,13 +108,9 @@ "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:closecombat", "tm:coaching", - "tm:cometpunch", - "tm:counter", "tm:covet", - "tm:detect", "tm:doubleedge", "tm:drainpunch", "tm:earthquake", @@ -122,36 +118,27 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", "tm:gigaimpact", "tm:headbutt", "tm:helpinghand", - "tm:highjumpkick", "tm:icepunch", "tm:knockoff", "tm:laserfocus", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mindreader", "tm:mudslap", "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickguard", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:retaliate", "tm:revenge", @@ -162,7 +149,6 @@ "tm:rocktomb", "tm:roleplay", "tm:scaryface", - "tm:skyuppercut", "tm:sleeptalk", "tm:stoneedge", "tm:strength", @@ -170,7 +156,6 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -181,7 +166,35 @@ "tm:upperhand", "tm:uproar", "tm:vacuumwave", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:covet", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:vacuumwave" ], "preEvolution": "tyrogue", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json b/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json index 6746821da8..739c576c79 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hitmonlee.json @@ -102,7 +102,6 @@ "egg:rapidspin", "egg:vacuumwave", "tm:aurasphere", - "tm:axekick", "tm:batonpass", "tm:blazekick", "tm:bodyslam", @@ -110,46 +109,33 @@ "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:covet", "tm:doubleedge", - "tm:doublekick", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", "tm:fling", "tm:focusblast", "tm:focusenergy", - "tm:foresight", "tm:gigaimpact", "tm:headbutt", "tm:helpinghand", - "tm:highjumpkick", - "tm:jumpkick", "tm:knockoff", "tm:laserfocus", "tm:lowkick", "tm:lowsweep", "tm:lunge", - "tm:machpunch", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mindreader", "tm:mudslap", "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:retaliate", "tm:revenge", @@ -159,7 +145,6 @@ "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:rollingkick", "tm:scaryface", "tm:sleeptalk", "tm:stompingtantrum", @@ -171,7 +156,6 @@ "tm:superpower", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -180,8 +164,34 @@ "tm:upperhand", "tm:uproar", "tm:vacuumwave", - "tm:wideguard", - "tm:workup" + "tm:workup", + "tutor:bounce", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:covet", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:uproar", + "tutor:vacuumwave" ], "preEvolution": "tyrogue", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/horsea.json b/common/src/main/resources/data/cobblemon/species/generation1/horsea.json index fafdf9fb24..7639302be5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/horsea.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/horsea.json @@ -103,23 +103,15 @@ "egg:razorwind", "egg:splash", "tm:agility", - "tm:aurorabeam", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", - "tm:clearsmog", - "tm:disable", "tm:dive", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:endure", "tm:facade", - "tm:flail", "tm:flashcannon", "tm:flipturn", "tm:focusenergy", @@ -129,30 +121,42 @@ "tm:icebeam", "tm:icywind", "tm:laserfocus", - "tm:leer", "tm:liquidation", "tm:muddywater", - "tm:octazooka", "tm:outrage", "tm:protect", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:scaleshot", "tm:signalbeam", "tm:sleeptalk", - "tm:smokescreen", - "tm:splash", "tm:substitute", "tm:surf", "tm:swift", "tm:terablast", "tm:twister", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:bounce", + "tutor:dive", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:icebeam", + "tutor:icywind", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/hypno.json b/common/src/main/resources/data/cobblemon/species/generation1/hypno.json index 6e79b29a6e..c1de7af505 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/hypno.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/hypno.json @@ -95,18 +95,14 @@ "egg:secretpower", "egg:thunderpunch", "tm:allyswitch", - "tm:assist", - "tm:barrier", "tm:batonpass", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:calmmind", "tm:confuseray", - "tm:confusion", "tm:curse", "tm:dazzlinggleam", - "tm:disable", "tm:doubleedge", "tm:drainingkiss", "tm:drainpunch", @@ -118,7 +114,6 @@ "tm:facade", "tm:firepunch", "tm:flash", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:focuspunch", @@ -132,7 +127,6 @@ "tm:helpinghand", "tm:hex", "tm:hyperbeam", - "tm:hypnosis", "tm:icepunch", "tm:imprison", "tm:knockoff", @@ -141,17 +135,12 @@ "tm:lowsweep", "tm:magiccoat", "tm:magicroom", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:mindreader", "tm:nastyplot", - "tm:nightmare", "tm:nightshade", - "tm:poisongas", - "tm:pound", - "tm:powersplit", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -180,8 +169,6 @@ "tm:sunnyday", "tm:swagger", "tm:swift", - "tm:switcheroo", - "tm:synchronoise", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -195,8 +182,39 @@ "tm:triattack", "tm:trick", "tm:trickroom", - "tm:wakeupslap", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:zenheadbutt" ], "preEvolution": "drowzee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json b/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json index 0f00f754bf..032bd36b62 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ivysaur.json @@ -114,52 +114,56 @@ "tm:gigadrain", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", - "tm:growth", "tm:headbutt", "tm:helpinghand", - "tm:ingrain", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:naturepower", - "tm:petaldance", - "tm:poisonpowder", "tm:powerwhip", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:roar", "tm:rocksmash", "tm:safeguard", "tm:seedbomb", - "tm:skullbash", - "tm:sleeppowder", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:solarbeam", "tm:strength", "tm:stringshot", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:toxic", "tm:trailblaze", "tm:venoshock", - "tm:vinewhip", "tm:weatherball", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:bind", + "tutor:energyball", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stringshot", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "bulbasaur", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json b/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json index 5be055b399..a9e3c48e42 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jigglypuff.json @@ -121,16 +121,12 @@ "tm:captivate", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:darkpulse", "tm:dazzlinggleam", - "tm:defensecurl", "tm:dig", - "tm:disable", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleslap", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -141,7 +137,6 @@ "tm:energyball", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:fireblast", "tm:firepunch", "tm:flamethrower", @@ -153,7 +148,6 @@ "tm:gyroball", "tm:headbutt", "tm:healbell", - "tm:healpulse", "tm:helpinghand", "tm:hypervoice", "tm:icebeam", @@ -169,23 +163,17 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mimic", "tm:mistyexplosion", "tm:mistyterrain", "tm:nastyplot", "tm:painsplit", - "tm:perishsong", - "tm:playnice", "tm:playrough", - "tm:pound", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:psychic", "tm:psychicnoise", "tm:psychup", "tm:psyshock", - "tm:punishment", "tm:raindance", "tm:recycle", "tm:reflect", @@ -200,21 +188,16 @@ "tm:selfdestruct", "tm:shadowball", "tm:shockwave", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", "tm:steelroller", - "tm:stockpile", "tm:storedpower", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swallow", - "tm:sweetkiss", "tm:swift", "tm:takedown", "tm:taunt", @@ -228,12 +211,56 @@ "tm:trailblaze", "tm:triattack", "tm:uproar", - "tm:wakeupslap", "tm:waterpulse", "tm:wildcharge", - "tm:wish", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bounce", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:mistyexplosion", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "igglybuff", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json index 0670d7f4cb..61812d37dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json @@ -102,20 +102,15 @@ "tm:alluringvoice", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:calmmind", "tm:captivate", "tm:charge", "tm:charm", - "tm:copycat", "tm:covet", "tm:curse", - "tm:detect", "tm:dig", - "tm:discharge", "tm:doubleedge", - "tm:doublekick", "tm:echoedvoice", "tm:eerieimpulse", "tm:electricterrain", @@ -125,11 +120,9 @@ "tm:facade", "tm:faketears", "tm:falseswipe", - "tm:flail", "tm:flash", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -146,15 +139,12 @@ "tm:payday", "tm:pinmissile", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:risingvoltage", "tm:roar", "tm:rocksmash", - "tm:sandattack", "tm:shadowball", "tm:shockwave", "tm:signalbeam", @@ -164,25 +154,44 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderfang", - "tm:thundershock", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", - "tm:trumpcard", "tm:voltswitch", "tm:weatherball", "tm:wildcharge", - "tm:wish", "tm:workup", - "tm:yawn" + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:electroweb", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:wildcharge" ], "preEvolution": "eevee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json index dee9c34aca..6237e38fe4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json @@ -96,10 +96,7 @@ "tm:calmmind", "tm:captivate", "tm:charm", - "tm:confusion", - "tm:copycat", "tm:covet", - "tm:doubleslap", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -109,7 +106,6 @@ "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:flash", "tm:fling", @@ -122,7 +118,6 @@ "tm:hail", "tm:headbutt", "tm:healbell", - "tm:heartstamp", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", @@ -130,24 +125,15 @@ "tm:icepunch", "tm:iciclespear", "tm:icywind", - "tm:lick", "tm:lightscreen", - "tm:lovelykiss", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:miracleeye", "tm:mudslap", "tm:nastyplot", "tm:payback", - "tm:perishsong", - "tm:pound", - "tm:powdersnow", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -162,12 +148,10 @@ "tm:roleplay", "tm:shadowball", "tm:signalbeam", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:storedpower", "tm:substitute", - "tm:sweetkiss", "tm:taunt", "tm:telekinesis", "tm:terablast", @@ -177,12 +161,43 @@ "tm:trickroom", "tm:tripleaxel", "tm:uproar", - "tm:wakeupslap", "tm:waterpulse", - "tm:wish", "tm:wonderroom", - "tm:wringout", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:covet", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:telekinesis", + "tutor:trick", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "smoochum", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json b/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json index ec4d590564..57ff77720f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kabuto.json @@ -102,25 +102,18 @@ "egg:megadrain", "egg:rapidspin", "egg:takedown", - "tm:absorb", "tm:aerialace", "tm:ancientpower", - "tm:aquajet", - "tm:aurorabeam", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bubblebeam", "tm:confuseray", "tm:dig", "tm:earthpower", "tm:endure", "tm:facade", - "tm:flail", - "tm:foresight", "tm:gigadrain", "tm:hail", - "tm:harden", "tm:honeclaws", "tm:hydropump", "tm:icebeam", @@ -128,16 +121,13 @@ "tm:irondefense", "tm:knockoff", "tm:leechlife", - "tm:leer", "tm:liquidation", - "tm:megadrain", "tm:metalsound", "tm:meteorbeam", "tm:mudshot", "tm:mudslap", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:rockblast", "tm:rockpolish", @@ -145,10 +135,8 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:sandattack", "tm:sandstorm", "tm:scald", - "tm:scratch", "tm:screech", "tm:sleeptalk", "tm:smackdown", @@ -162,7 +150,26 @@ "tm:waterfall", "tm:waterpulse", "tm:whirlpool", - "tm:wringout" + "tutor:aerialace", + "tutor:ancientpower", + "tutor:earthpower", + "tutor:gigadrain", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:leechlife", + "tutor:liquidation", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json b/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json index 1c91b3dd51..32674875f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kabutops.json @@ -110,17 +110,13 @@ "egg:megadrain", "egg:rapidspin", "egg:takedown", - "tm:absorb", "tm:aerialace", "tm:ancientpower", - "tm:aquajet", "tm:aquatail", - "tm:aurorabeam", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:brine", - "tm:bubblebeam", "tm:confuseray", "tm:crosspoison", "tm:cut", @@ -129,15 +125,11 @@ "tm:earthpower", "tm:endure", "tm:facade", - "tm:feint", - "tm:flail", "tm:flipturn", - "tm:foresight", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", "tm:hail", - "tm:harden", "tm:headbutt", "tm:honeclaws", "tm:hydropump", @@ -147,21 +139,17 @@ "tm:irondefense", "tm:knockoff", "tm:leechlife", - "tm:leer", "tm:liquidation", "tm:lowkick", - "tm:megadrain", "tm:megakick", "tm:metalsound", "tm:meteorbeam", "tm:mudshot", "tm:mudslap", "tm:naturepower", - "tm:nightslash", "tm:protect", "tm:psychocut", "tm:raindance", - "tm:rapidspin", "tm:razorshell", "tm:rest", "tm:rockblast", @@ -171,12 +159,9 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:sandattack", "tm:sandstorm", "tm:scald", - "tm:scratch", "tm:screech", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -191,8 +176,37 @@ "tm:waterfall", "tm:waterpulse", "tm:whirlpool", - "tm:wringout", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:dive", + "tutor:earthpower", + "tutor:flipturn", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:leechlife", + "tutor:liquidation", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:superpower", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "kabuto", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json index e821b5dc05..572cf318ff 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kadabra.json @@ -88,13 +88,10 @@ "egg:powertrick", "egg:psychoshift", "tm:allyswitch", - "tm:barrier", "tm:bodyslam", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:dazzlinggleam", - "tm:disable", "tm:drainpunch", "tm:dreameater", "tm:embargo", @@ -111,12 +108,10 @@ "tm:futuresight", "tm:grassknot", "tm:gravity", - "tm:guardsplit", "tm:guardswap", "tm:headbutt", "tm:icepunch", "tm:irontail", - "tm:kinesis", "tm:knockoff", "tm:lightscreen", "tm:magiccoat", @@ -124,19 +119,15 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:miracleeye", "tm:powerswap", - "tm:powertrick", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicterrain", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -154,7 +145,6 @@ "tm:swift", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderpunch", @@ -164,7 +154,40 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gravity", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "abra", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json b/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json index fc5744cb1c..3fa4cf75a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kakuna.json @@ -81,12 +81,15 @@ "1:poisonsting", "tm:bugbite", "tm:electroweb", - "tm:harden", "tm:irondefense", - "tm:poisonsting", "tm:skittersmack", "tm:stringshot", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:electroweb", + "tutor:irondefense", + "tutor:skittersmack", + "tutor:stringshot" ], "preEvolution": "weedle", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json index 32e231a77c..5355dfc009 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json @@ -93,30 +93,20 @@ "tm:assurance", "tm:avalanche", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:chipaway", - "tm:circlethrow", - "tm:cometpunch", - "tm:counter", "tm:covet", "tm:crunch", - "tm:crushclaw", "tm:cut", "tm:dig", - "tm:disable", - "tm:dizzypunch", "tm:doubleedge", - "tm:doublehit", "tm:drainpunch", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:fireblast", "tm:firepunch", "tm:flamethrower", @@ -124,12 +114,9 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", "tm:furycutter", "tm:gigaimpact", - "tm:growl", "tm:hail", - "tm:hammerarm", "tm:headbutt", "tm:helpinghand", "tm:hydropump", @@ -140,16 +127,13 @@ "tm:incinerate", "tm:irontail", "tm:lastresort", - "tm:leer", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:mudslap", "tm:outrage", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -167,24 +151,57 @@ "tm:sleeptalk", "tm:solarbeam", "tm:spite", - "tm:stomp", "tm:strength", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:surf", - "tm:tailwhip", "tm:terablast", "tm:terrainpulse", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:trumpcard", "tm:uproar", "tm:waterpulse", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:covet", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json index 27e4726d96..0208816aa6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kingler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kingler.json @@ -106,30 +106,21 @@ "tm:allyswitch", "tm:amnesia", "tm:ancientpower", - "tm:bide", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:brine", "tm:brutalswing", - "tm:bubble", - "tm:bubblebeam", - "tm:chipaway", - "tm:crabhammer", "tm:cut", "tm:dig", "tm:dive", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:flail", "tm:fling", "tm:furycutter", "tm:gigaimpact", - "tm:guillotine", "tm:hail", - "tm:hammerarm", - "tm:harden", "tm:haze", "tm:highhorsepower", "tm:honeclaws", @@ -139,13 +130,10 @@ "tm:icywind", "tm:irondefense", "tm:knockoff", - "tm:leer", "tm:liquidation", "tm:metalclaw", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:nightslash", "tm:protect", "tm:quash", "tm:raindance", @@ -155,10 +143,7 @@ "tm:rocksmash", "tm:rocktomb", "tm:scald", - "tm:slam", - "tm:slash", "tm:sleeptalk", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", @@ -167,13 +152,31 @@ "tm:swordsdance", "tm:terablast", "tm:thief", - "tm:tickle", - "tm:visegrip", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:wideguard", - "tm:xscissor" + "tm:xscissor", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:dive", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "krabby", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json index 37ae57d544..79365ff755 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json @@ -98,32 +98,25 @@ "egg:swallow", "tm:acidspray", "tm:assurance", - "tm:belch", "tm:bodyslam", - "tm:clearsmog", "tm:corrosivegas", "tm:curse", "tm:darkpulse", - "tm:destinybond", "tm:endure", "tm:explosion", "tm:facade", "tm:fireblast", "tm:flamethrower", "tm:flash", - "tm:grudge", "tm:gunkshot", "tm:gyroball", "tm:haze", "tm:incinerate", "tm:infestation", - "tm:memento", "tm:painsplit", "tm:payback", - "tm:poisongas", "tm:protect", "tm:psybeam", - "tm:psywave", "tm:raindance", "tm:rest", "tm:rollout", @@ -133,18 +126,11 @@ "tm:shadowball", "tm:shockwave", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", - "tm:smokescreen", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:substitute", "tm:sunnyday", - "tm:swallow", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -156,7 +142,21 @@ "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:willowisp" + "tm:willowisp", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:flamethrower", + "tutor:gunkshot", + "tutor:painsplit", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:thunderbolt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/krabby.json b/common/src/main/resources/data/cobblemon/species/generation1/krabby.json index bf4461183d..e7c4cc631c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/krabby.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/krabby.json @@ -101,41 +101,29 @@ "tm:allyswitch", "tm:amnesia", "tm:ancientpower", - "tm:bide", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:brine", - "tm:bubble", - "tm:bubblebeam", - "tm:chipaway", - "tm:crabhammer", "tm:cut", "tm:dig", "tm:dive", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:flail", "tm:fling", "tm:furycutter", - "tm:guillotine", "tm:hail", - "tm:hammerarm", - "tm:harden", "tm:haze", "tm:honeclaws", "tm:icebeam", "tm:icywind", "tm:irondefense", "tm:knockoff", - "tm:leer", "tm:liquidation", "tm:metalclaw", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:nightslash", "tm:protect", "tm:raindance", "tm:razorshell", @@ -144,10 +132,7 @@ "tm:rocksmash", "tm:rocktomb", "tm:scald", - "tm:slam", - "tm:slash", "tm:sleeptalk", - "tm:stomp", "tm:strength", "tm:substitute", "tm:superpower", @@ -155,12 +140,27 @@ "tm:swordsdance", "tm:terablast", "tm:thief", - "tm:tickle", - "tm:visegrip", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:xscissor" + "tm:xscissor", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:dive", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:waterpulse", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json index 9d75cb9224..6d240f77a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json @@ -140,51 +140,38 @@ "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fissure", - "tm:foresight", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", - "tm:growl", "tm:hail", "tm:haze", "tm:headbutt", "tm:healbell", "tm:helpinghand", - "tm:horndrill", "tm:hydropump", "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", - "tm:iceshard", "tm:iciclespear", "tm:icywind", "tm:ironhead", "tm:irontail", - "tm:lifedew", "tm:liquidation", "tm:megahorn", - "tm:mist", "tm:muddywater", "tm:outrage", - "tm:perishsong", "tm:protect", "tm:psychic", "tm:psychicnoise", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:safeguard", - "tm:sheercold", "tm:shockwave", "tm:signalbeam", - "tm:sing", "tm:sleeptalk", "tm:smartstrike", "tm:snowscape", - "tm:sparklingaria", "tm:strength", "tm:substitute", "tm:surf", @@ -192,13 +179,39 @@ "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:tickle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:dive", + "tutor:dragonpulse", + "tutor:drillrun", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:liquidation", + "tutor:megahorn", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json b/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json index ca4c6a0530..53243c516a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/lickitung.json @@ -94,8 +94,6 @@ "egg:wringout", "tm:amnesia", "tm:aquatail", - "tm:belch", - "tm:bellydrum", "tm:bind", "tm:blizzard", "tm:bodypress", @@ -103,12 +101,9 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:chipaway", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", - "tm:disable", "tm:dragontail", "tm:dreameater", "tm:earthquake", @@ -120,7 +115,6 @@ "tm:fling", "tm:focuspunch", "tm:gigaimpact", - "tm:hammerarm", "tm:headbutt", "tm:helpinghand", "tm:hydropump", @@ -132,9 +126,6 @@ "tm:incinerate", "tm:irontail", "tm:knockoff", - "tm:lick", - "tm:magnitude", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:muddywater", @@ -144,7 +135,6 @@ "tm:protect", "tm:psychup", "tm:raindance", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:rockclimb", @@ -156,33 +146,57 @@ "tm:screech", "tm:shadowball", "tm:shockwave", - "tm:slam", "tm:sleeptalk", - "tm:smellingsalts", "tm:snore", "tm:solarbeam", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:surf", "tm:swordsdance", "tm:terablast", "tm:terrainpulse", "tm:thief", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:waterpulse", "tm:whirlpool", "tm:workup", - "tm:wrap", - "tm:wringout", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bind", + "tutor:bulldoze", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snore", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json index 206a25d603..ff5862dd02 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json @@ -101,17 +101,13 @@ "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:crosschop", "tm:crosspoison", "tm:darkestlariat", "tm:dig", "tm:doubleedge", "tm:dualchop", - "tm:dynamicpunch", "tm:earthquake", "tm:encore", "tm:endure", @@ -123,7 +119,6 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", "tm:gigaimpact", "tm:headbutt", "tm:heavyslam", @@ -132,23 +127,18 @@ "tm:hyperbeam", "tm:icepunch", "tm:incinerate", - "tm:karatechop", "tm:knockoff", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:mudslap", "tm:payback", "tm:poisonjab", - "tm:powertrick", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -160,16 +150,12 @@ "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:rollingkick", "tm:scaryface", - "tm:seismictoss", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:superpower", @@ -177,12 +163,37 @@ "tm:thief", "tm:throatchop", "tm:thunderpunch", - "tm:tickle", "tm:vacuumwave", - "tm:vitalthrow", - "tm:wakeupslap", - "tm:wideguard", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:dualchop", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:trick", + "tutor:vacuumwave" ], "preEvolution": "machoke", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json index 2d92c9aac1..9b8fceffe8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json @@ -99,15 +99,11 @@ "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:crosschop", "tm:dig", "tm:doubleedge", "tm:dualchop", - "tm:dynamicpunch", "tm:earthquake", "tm:encore", "tm:endure", @@ -119,29 +115,23 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", "tm:headbutt", "tm:heavyslam", "tm:helpinghand", "tm:icepunch", "tm:incinerate", - "tm:karatechop", "tm:knockoff", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:mudslap", "tm:payback", "tm:poisonjab", - "tm:powertrick", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -152,26 +142,43 @@ "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:rollingkick", "tm:scaryface", - "tm:seismictoss", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:stompingtantrum", "tm:strength", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:terablast", "tm:thief", "tm:thunderpunch", - "tm:tickle", "tm:vacuumwave", - "tm:vitalthrow", - "tm:wakeupslap", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:dualchop", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:trick", + "tutor:vacuumwave" ], "preEvolution": "machop", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/machop.json b/common/src/main/resources/data/cobblemon/species/generation1/machop.json index 7c49102a3f..4fd1740278 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machop.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machop.json @@ -97,15 +97,11 @@ "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:crosschop", "tm:dig", "tm:doubleedge", "tm:dualchop", - "tm:dynamicpunch", "tm:earthquake", "tm:encore", "tm:endure", @@ -117,29 +113,23 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", "tm:headbutt", "tm:heavyslam", "tm:helpinghand", "tm:icepunch", "tm:incinerate", - "tm:karatechop", "tm:knockoff", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:mudslap", "tm:payback", "tm:poisonjab", - "tm:powertrick", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -150,25 +140,41 @@ "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:rollingkick", "tm:scaryface", - "tm:seismictoss", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:strength", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:terablast", "tm:thief", "tm:thunderpunch", - "tm:tickle", "tm:vacuumwave", - "tm:vitalthrow", - "tm:wakeupslap", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:dualchop", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:trick", + "tutor:vacuumwave" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json b/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json index 25140659cb..be551bef1d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magikarp.json @@ -84,9 +84,7 @@ "15:tackle", "25:flail", "tm:bounce", - "tm:flail", - "tm:splash", - "tm:tackle" + "tutor:bounce" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json index 9c9c94b2cf..6ba9c6d7de 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json @@ -93,37 +93,26 @@ "egg:karatechop", "egg:machpunch", "tm:acidspray", - "tm:barrier", - "tm:belch", - "tm:bellydrum", "tm:bodyslam", "tm:brickbreak", "tm:burningjealousy", - "tm:clearsmog", "tm:confuseray", "tm:covet", - "tm:crosschop", "tm:curse", "tm:doubleedge", "tm:dualchop", - "tm:dynamicpunch", - "tm:ember", "tm:endure", "tm:facade", - "tm:feintattack", "tm:fireblast", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:followme", "tm:gigaimpact", "tm:headbutt", "tm:heatcrash", @@ -132,13 +121,9 @@ "tm:hyperbeam", "tm:incinerate", "tm:irontail", - "tm:karatechop", "tm:knockoff", - "tm:lavaplume", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:megakick", "tm:megapunch", "tm:metronome", @@ -156,8 +141,6 @@ "tm:scorchingsands", "tm:screech", "tm:sleeptalk", - "tm:smog", - "tm:smokescreen", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -168,7 +151,29 @@ "tm:thief", "tm:thunderpunch", "tm:uproar", - "tm:willowisp" + "tm:willowisp", + "tutor:burningjealousy", + "tutor:covet", + "tutor:dualchop", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:thunderpunch", + "tutor:uproar" ], "preEvolution": "magby", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json b/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json index c3aa49cdcb..622c67c8e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magnemite.json @@ -112,7 +112,6 @@ "tm:charge", "tm:chargebeam", "tm:confuseray", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -129,12 +128,9 @@ "tm:irondefense", "tm:ironhead", "tm:lightscreen", - "tm:lockon", "tm:magiccoat", - "tm:magnetbomb", "tm:magnetrise", "tm:metalsound", - "tm:mirrorshot", "tm:protect", "tm:raindance", "tm:recycle", @@ -147,23 +143,37 @@ "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", - "tm:sonicboom", - "tm:spark", "tm:steelbeam", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:chargebeam", + "tutor:electroweb", + "tutor:flashcannon", + "tutor:gravity", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/magneton.json b/common/src/main/resources/data/cobblemon/species/generation1/magneton.json index a724717714..c69eac6e07 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magneton.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magneton.json @@ -116,7 +116,6 @@ "tm:charge", "tm:chargebeam", "tm:confuseray", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -134,12 +133,9 @@ "tm:irondefense", "tm:ironhead", "tm:lightscreen", - "tm:lockon", "tm:magiccoat", - "tm:magnetbomb", "tm:magnetrise", "tm:metalsound", - "tm:mirrorshot", "tm:protect", "tm:raindance", "tm:recycle", @@ -152,24 +148,39 @@ "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", - "tm:sonicboom", - "tm:spark", "tm:steelbeam", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:triattack", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:chargebeam", + "tutor:electroweb", + "tutor:flashcannon", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge" ], "preEvolution": "magnemite", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mankey.json b/common/src/main/resources/data/cobblemon/species/generation1/mankey.json index eb9fb32f2b..9a3485c4b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mankey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mankey.json @@ -105,9 +105,7 @@ "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:counter", "tm:covet", - "tm:crosschop", "tm:curse", "tm:dig", "tm:doubleedge", @@ -118,40 +116,30 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:finalgambit", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", - "tm:furyswipes", "tm:gunkshot", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", "tm:icepunch", "tm:irontail", - "tm:karatechop", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:nightslash", "tm:outrage", "tm:overheat", "tm:payback", "tm:payday", "tm:poisonjab", - "tm:powertrip", "tm:poweruppunch", "tm:protect", - "tm:punishment", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -163,14 +151,11 @@ "tm:rocktomb", "tm:roleplay", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:seedbomb", - "tm:seismictoss", "tm:shadowclaw", "tm:skullbash", "tm:sleeptalk", - "tm:smellingsalts", "tm:spite", "tm:stompingtantrum", "tm:stoneedge", @@ -183,13 +168,44 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunderbolt", "tm:thunderpunch", "tm:uproar", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:irontail", + "tutor:lashout", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json index 28a1989f88..5e7bc06ea4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/marowak.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/marowak.json @@ -94,21 +94,14 @@ "egg:skullbash", "tm:aerialace", "tm:ancientpower", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", - "tm:boneclub", - "tm:bonemerang", - "tm:bonerush", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:chipaway", "tm:curse", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:echoedvoice", @@ -125,7 +118,6 @@ "tm:focuspunch", "tm:furycutter", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:hyperbeam", "tm:icebeam", @@ -136,16 +128,13 @@ "tm:irontail", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:mudslap", "tm:outrage", - "tm:perishsong", "tm:poweruppunch", "tm:protect", - "tm:rage", "tm:rest", "tm:retaliate", "tm:rockclimb", @@ -155,7 +144,6 @@ "tm:sandstorm", "tm:scorchingsands", "tm:screech", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -166,13 +154,46 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tailwhip", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunderpunch", - "tm:uproar" + "tm:uproar", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:uproar" ], "preEvolution": "cubone", "evolutions": [], @@ -256,23 +277,16 @@ "tm:aerialace", "tm:allyswitch", "tm:ancientpower", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", - "tm:boneclub", - "tm:bonemerang", - "tm:bonerush", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", "tm:burningjealousy", - "tm:chipaway", "tm:curse", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:dreameater", "tm:earthpower", "tm:earthquake", @@ -286,14 +300,12 @@ "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:heatwave", "tm:hex", @@ -306,17 +318,14 @@ "tm:irontail", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:mudslap", "tm:outrage", "tm:painsplit", - "tm:perishsong", "tm:poltergeist", "tm:protect", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -326,8 +335,6 @@ "tm:scorchingsands", "tm:screech", "tm:shadowball", - "tm:shadowbone", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:spite", @@ -338,16 +345,56 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tailwhip", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:uproar", - "tm:willowisp" + "tm:willowisp", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar" ], "preEvolution": "cubone", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json index 503cccc0b4..9483bf824d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json @@ -105,9 +105,7 @@ "tm:aerialace", "tm:agility", "tm:amnesia", - "tm:assist", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:captivate", "tm:charm", @@ -122,22 +120,15 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:falseswipe", - "tm:feint", - "tm:feintattack", - "tm:flail", "tm:flash", "tm:foulplay", - "tm:furyswipes", - "tm:growl", "tm:gunkshot", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", "tm:hypervoice", - "tm:hypnosis", "tm:icywind", "tm:irontail", "tm:knockoff", @@ -145,8 +136,6 @@ "tm:lastresort", "tm:metalclaw", "tm:nastyplot", - "tm:nightslash", - "tm:odorsleuth", "tm:painsplit", "tm:payback", "tm:payday", @@ -154,17 +143,14 @@ "tm:powergem", "tm:protect", "tm:psychup", - "tm:punishment", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -172,7 +158,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -184,7 +169,35 @@ "tm:torment", "tm:trailblaze", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lastresort", + "tutor:painsplit", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt" ], "evolutions": [ { @@ -279,9 +292,7 @@ "tm:aerialace", "tm:agility", "tm:amnesia", - "tm:assist", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:captivate", "tm:charm", @@ -298,19 +309,11 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feint", - "tm:feintattack", - "tm:flail", - "tm:flatter", "tm:foulplay", - "tm:furyswipes", - "tm:growl", "tm:gunkshot", "tm:helpinghand", "tm:hypervoice", - "tm:hypnosis", "tm:icywind", "tm:irontail", "tm:knockoff", @@ -318,26 +321,21 @@ "tm:lastresort", "tm:metalclaw", "tm:nastyplot", - "tm:nightslash", - "tm:partingshot", "tm:payback", "tm:payday", "tm:playrough", "tm:powergem", "tm:protect", "tm:psychup", - "tm:punishment", "tm:quash", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -356,7 +354,33 @@ "tm:torment", "tm:trailblaze", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lastresort", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt" ], "evolutions": [ { @@ -475,15 +499,11 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:falseswipe", - "tm:flail", "tm:flashcannon", "tm:fling", "tm:foulplay", - "tm:furyswipes", - "tm:growl", "tm:gunkshot", "tm:gyroball", "tm:helpinghand", @@ -498,7 +518,6 @@ "tm:metalsound", "tm:metronome", "tm:nastyplot", - "tm:nightslash", "tm:payback", "tm:payday", "tm:playrough", @@ -506,12 +525,10 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:spite", "tm:stealthrock", @@ -524,14 +541,40 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", "tm:trailblaze", "tm:uturn", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/metapod.json b/common/src/main/resources/data/cobblemon/species/generation1/metapod.json index 0354bae63f..f7cb216f76 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/metapod.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/metapod.json @@ -83,11 +83,13 @@ "1:tackle", "tm:bugbite", "tm:electroweb", - "tm:harden", "tm:irondefense", "tm:stringshot", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:electroweb", + "tutor:irondefense", + "tutor:stringshot" ], "preEvolution": "caterpie", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mew.json b/common/src/main/resources/data/cobblemon/species/generation1/mew.json index a0a1fa9ab3..b60a10191c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mew.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mew.json @@ -83,10 +83,11 @@ "tm:ancientpower", "tm:aquatail", "tm:assurance", + "tm:attract", "tm:aurasphere", "tm:auroraveil", "tm:avalanche", - "tm:barrier", + "tm:babydolleyes", "tm:batonpass", "tm:beatup", "tm:bind", @@ -109,12 +110,14 @@ "tm:bulletseed", "tm:burningjealousy", "tm:calmmind", + "tm:captivate", "tm:charge", "tm:chargebeam", "tm:charm", "tm:chillingwater", "tm:closecombat", "tm:coaching", + "tm:confide", "tm:confuseray", "tm:corrosivegas", "tm:cosmicpower", @@ -131,6 +134,7 @@ "tm:disarmingvoice", "tm:dive", "tm:doubleedge", + "tm:doubleteam", "tm:dracometeor", "tm:dragoncheer", "tm:dragonclaw", @@ -210,6 +214,7 @@ "tm:hydropump", "tm:hyperbeam", "tm:hypervoice", + "tm:iceball", "tm:icebeam", "tm:icefang", "tm:icepunch", @@ -229,7 +234,6 @@ "tm:leafblade", "tm:leafstorm", "tm:leechlife", - "tm:lifedew", "tm:lightscreen", "tm:liquidation", "tm:lowkick", @@ -239,7 +243,6 @@ "tm:magiccoat", "tm:magicroom", "tm:magnetrise", - "tm:mefirst", "tm:megahorn", "tm:megakick", "tm:megapunch", @@ -254,6 +257,7 @@ "tm:mudslap", "tm:mysticalfire", "tm:nastyplot", + "tm:naturalgift", "tm:naturepower", "tm:nightshade", "tm:ominouswind", @@ -272,8 +276,8 @@ "tm:pollenpuff", "tm:poltergeist", "tm:pounce", - "tm:pound", "tm:powergem", + "tm:powershift", "tm:powerswap", "tm:poweruppunch", "tm:powerwhip", @@ -291,7 +295,6 @@ "tm:razorshell", "tm:recycle", "tm:reflect", - "tm:reflecttype", "tm:rest", "tm:retaliate", "tm:revenge", @@ -307,6 +310,7 @@ "tm:roleplay", "tm:rollout", "tm:roost", + "tm:round", "tm:safeguard", "tm:sandstorm", "tm:sandtomb", @@ -315,6 +319,7 @@ "tm:scaryface", "tm:scorchingsands", "tm:screech", + "tm:secretpower", "tm:seedbomb", "tm:selfdestruct", "tm:shadowball", @@ -333,6 +338,7 @@ "tm:smartstrike", "tm:snarl", "tm:snatch", + "tm:snore", "tm:snowscape", "tm:solarbeam", "tm:solarblade", @@ -356,6 +362,7 @@ "tm:superfang", "tm:superpower", "tm:surf", + "tm:swagger", "tm:swift", "tm:swordsdance", "tm:synthesis", @@ -378,7 +385,6 @@ "tm:toxic", "tm:toxicspikes", "tm:trailblaze", - "tm:transform", "tm:triattack", "tm:trick", "tm:trickroom", @@ -402,7 +408,156 @@ "tm:workup", "tm:worryseed", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:afteryou", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:bind", + "tutor:blastburn", + "tutor:block", + "tutor:bounce", + "tutor:bugbite", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:coaching", + "tutor:corrosivegas", + "tutor:covet", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:drillrun", + "tutor:dualchop", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:electroweb", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:falseswipe", + "tutor:firefang", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:frenzyplant", + "tutor:furycutter", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:gravity", + "tutor:gunkshot", + "tutor:healbell", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:iceball", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lastresort", + "tutor:leechlife", + "tutor:liquidation", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:magnetrise", + "tutor:megahorn", + "tutor:meteorbeam", + "tutor:mistyexplosion", + "tutor:mudslap", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:outrage", + "tutor:painsplit", + "tutor:playrough", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:powershift", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:roost", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:snore", + "tutor:spikes", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:terrainpulse", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:trick", + "tutor:tripleaxel", + "tutor:twister", + "tutor:uproar", + "tutor:vacuumwave", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:wonderroom", + "tutor:worryseed", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json b/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json index 2bd21b0e70..d0cb2084ab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mewtwo.json @@ -93,7 +93,6 @@ "tm:aquatail", "tm:aurasphere", "tm:avalanche", - "tm:barrier", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", @@ -103,10 +102,8 @@ "tm:calmmind", "tm:chillingwater", "tm:confuseray", - "tm:confusion", "tm:curse", "tm:darkpulse", - "tm:disable", "tm:dive", "tm:doubleedge", "tm:drainpunch", @@ -147,18 +144,14 @@ "tm:knockoff", "tm:laserfocus", "tm:lashout", - "tm:lifedew", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", "tm:magiccoat", "tm:magicroom", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:miracleeye", - "tm:mist", "tm:nastyplot", "tm:nightshade", "tm:payday", @@ -174,10 +167,7 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:psystrike", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -223,7 +213,61 @@ "tm:weatherball", "tm:willowisp", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dive", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:poisonjab", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/moltres.json b/common/src/main/resources/data/cobblemon/species/generation1/moltres.json index 0aa7117b6c..27970a908e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/moltres.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/moltres.json @@ -100,11 +100,9 @@ "tm:ancientpower", "tm:bravebird", "tm:burningjealousy", - "tm:burnup", "tm:defog", "tm:doubleedge", "tm:dualwingbeat", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", @@ -114,14 +112,12 @@ "tm:flareblitz", "tm:fly", "tm:gigaimpact", - "tm:gust", "tm:heatwave", "tm:helpinghand", "tm:hurricane", "tm:hyperbeam", "tm:incinerate", "tm:laserfocus", - "tm:leer", "tm:mysticalfire", "tm:ominouswind", "tm:overheat", @@ -151,7 +147,29 @@ "tm:uturn", "tm:weatherball", "tm:willowisp", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:burningjealousy", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:scorchingsands", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister" ], "evolutions": [], "forms": [ @@ -238,11 +256,9 @@ "tm:dualwingbeat", "tm:endure", "tm:facade", - "tm:fierywrath", "tm:fly", "tm:foulplay", "tm:gigaimpact", - "tm:gust", "tm:helpinghand", "tm:hex", "tm:hurricane", @@ -250,8 +266,6 @@ "tm:hypervoice", "tm:imprison", "tm:lashout", - "tm:leer", - "tm:memento", "tm:nastyplot", "tm:painsplit", "tm:payback", @@ -277,7 +291,27 @@ "tm:terablast", "tm:thief", "tm:uturn", - "tm:wingattack" + "tutor:aerialace", + "tutor:afteryou", + "tutor:ancientpower", + "tutor:darkpulse", + "tutor:dualwingbeat", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:lashout", + "tutor:painsplit", + "tutor:rest", + "tutor:shadowball", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:tailwind" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json index 7994f3747e..b6047f719c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json @@ -104,7 +104,6 @@ "egg:wakeupslap", "tm:aerialace", "tm:allyswitch", - "tm:barrier", "tm:batonpass", "tm:bodyslam", "tm:brickbreak", @@ -112,11 +111,8 @@ "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", - "tm:copycat", "tm:covet", "tm:dazzlinggleam", - "tm:doubleslap", "tm:drainpunch", "tm:dreameater", "tm:encore", @@ -124,7 +120,6 @@ "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:firepunch", "tm:flash", "tm:fling", @@ -136,10 +131,8 @@ "tm:grassknot", "tm:guardswap", "tm:headbutt", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:infestation", @@ -148,19 +141,15 @@ "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mimic", "tm:mistyterrain", "tm:mudslap", "tm:mysticalfire", "tm:nastyplot", "tm:payback", - "tm:pound", "tm:powershift", - "tm:powersplit", "tm:powerswap", "tm:poweruppunch", "tm:protect", @@ -169,8 +158,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", - "tm:quickguard", "tm:raindance", "tm:recycle", "tm:reflect", @@ -189,7 +176,6 @@ "tm:suckerpunch", "tm:sunnyday", "tm:taunt", - "tm:teeterdance", "tm:telekinesis", "tm:terablast", "tm:thief", @@ -197,15 +183,54 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:trick", "tm:trickroom", "tm:uproar", - "tm:wakeupslap", - "tm:wideguard", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:mysticalfire", + "tutor:powershift", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "mimejr", "evolutions": [], @@ -297,7 +322,6 @@ "egg:wakeupslap", "tm:allyswitch", "tm:avalanche", - "tm:barrier", "tm:batonpass", "tm:blizzard", "tm:bodyslam", @@ -305,50 +329,36 @@ "tm:calmmind", "tm:charm", "tm:confuseray", - "tm:confusion", - "tm:copycat", "tm:dazzlinggleam", - "tm:doublekick", - "tm:doubleslap", "tm:drainpunch", "tm:encore", "tm:endure", "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:fling", "tm:focusblast", "tm:foulplay", - "tm:freezedry", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:guardswap", "tm:hail", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icepunch", - "tm:iceshard", "tm:iciclespear", "tm:icywind", "tm:irondefense", "tm:lightscreen", "tm:magicroom", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mimic", - "tm:mirrorcoat", "tm:mistyterrain", "tm:nastyplot", "tm:payback", - "tm:pound", - "tm:powersplit", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -356,7 +366,6 @@ "tm:psychicterrain", "tm:psyshock", "tm:raindance", - "tm:rapidspin", "tm:recycle", "tm:reflect", "tm:rest", @@ -373,20 +382,47 @@ "tm:suckerpunch", "tm:sunnyday", "tm:taunt", - "tm:teeterdance", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:trick", "tm:trickroom", "tm:tripleaxel", "tm:uproar", - "tm:wakeupslap", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:magicroom", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:thunderbolt", + "tutor:trick", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "mimejr", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/muk.json b/common/src/main/resources/data/cobblemon/species/generation1/muk.json index e634a87ecc..acb9def457 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/muk.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/muk.json @@ -106,10 +106,8 @@ "egg:spitup", "egg:stockpile", "egg:swallow", - "tm:acidarmor", "tm:acidspray", "tm:assurance", - "tm:belch", "tm:block", "tm:bodyslam", "tm:brickbreak", @@ -118,7 +116,6 @@ "tm:curse", "tm:darkpulse", "tm:dig", - "tm:disable", "tm:drainpunch", "tm:endure", "tm:explosion", @@ -132,7 +129,6 @@ "tm:gigadrain", "tm:gigaimpact", "tm:gunkshot", - "tm:harden", "tm:haze", "tm:helpinghand", "tm:hex", @@ -143,20 +139,13 @@ "tm:infestation", "tm:knockoff", "tm:lashout", - "tm:lick", "tm:lunge", - "tm:meanlook", - "tm:memento", "tm:metronome", - "tm:minimize", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:painsplit", "tm:payback", - "tm:poisongas", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -169,21 +158,15 @@ "tm:screech", "tm:selfdestruct", "tm:shadowball", - "tm:shadowpunch", - "tm:shadowsneak", "tm:shockwave", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", "tm:smog", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:swift", "tm:takedown", "tm:taunt", @@ -197,7 +180,37 @@ "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lashout", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "preEvolution": "grimer", "evolutions": [], @@ -270,21 +283,16 @@ "egg:spitup", "egg:stockpile", "egg:swallow", - "tm:acidarmor", "tm:acidspray", "tm:assurance", - "tm:belch", - "tm:bite", "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", - "tm:clearsmog", "tm:crunch", "tm:curse", "tm:darkpulse", "tm:dig", - "tm:disable", "tm:drainpunch", "tm:embargo", "tm:endure", @@ -300,7 +308,6 @@ "tm:gigadrain", "tm:gigaimpact", "tm:gunkshot", - "tm:harden", "tm:haze", "tm:helpinghand", "tm:hex", @@ -310,20 +317,13 @@ "tm:infestation", "tm:knockoff", "tm:lashout", - "tm:meanlook", - "tm:memento", "tm:metronome", - "tm:minimize", "tm:mudshot", "tm:mudslap", "tm:painsplit", "tm:payback", - "tm:poisonfang", - "tm:poisongas", "tm:poisonjab", - "tm:pound", "tm:protect", - "tm:pursuit", "tm:quash", "tm:raindance", "tm:recycle", @@ -336,19 +336,15 @@ "tm:screech", "tm:selfdestruct", "tm:shadowball", - "tm:shadowsneak", "tm:shockwave", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snarl", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:swift", "tm:takedown", "tm:taunt", @@ -361,7 +357,39 @@ "tm:toxic", "tm:venomdrench", "tm:venoshock", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lashout", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spite", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "preEvolution": "grimer alolan", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json index e0c4b92c9a..2bf6385b79 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoking.json @@ -110,13 +110,8 @@ "tm:brickbreak", "tm:bulldoze", "tm:captivate", - "tm:chipaway", - "tm:confusion", - "tm:counter", "tm:cut", "tm:dig", - "tm:disable", - "tm:doublekick", "tm:dragonpulse", "tm:dragontail", "tm:drillrun", @@ -128,29 +123,23 @@ "tm:fireblast", "tm:firepunch", "tm:flamethrower", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:furyattack", "tm:furycutter", "tm:gigaimpact", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", "tm:hex", "tm:highhorsepower", "tm:honeclaws", - "tm:hornattack", - "tm:horndrill", "tm:hyperbeam", "tm:icebeam", "tm:icepunch", "tm:icywind", "tm:incinerate", "tm:irontail", - "tm:leer", "tm:megahorn", "tm:megakick", "tm:megapunch", @@ -158,9 +147,7 @@ "tm:mudslap", "tm:outrage", "tm:payday", - "tm:peck", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:poweruppunch", "tm:protect", @@ -193,13 +180,11 @@ "tm:sunnyday", "tm:superfang", "tm:superpower", - "tm:supersonic", "tm:surf", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", @@ -211,7 +196,50 @@ "tm:venomdrench", "tm:venoshock", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:drillrun", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:megahorn", + "tutor:mudslap", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "nidorino", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json index 1ef6d3c6eb..ca317ab5f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoqueen.json @@ -100,7 +100,6 @@ "tm:aquatail", "tm:avalanche", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -108,13 +107,9 @@ "tm:bulldoze", "tm:captivate", "tm:charm", - "tm:chipaway", - "tm:counter", "tm:crunch", "tm:cut", "tm:dig", - "tm:disable", - "tm:doublekick", "tm:dragonpulse", "tm:dragontail", "tm:drillrun", @@ -126,15 +121,12 @@ "tm:fireblast", "tm:firepunch", "tm:flamethrower", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:hex", @@ -152,13 +144,10 @@ "tm:mudslap", "tm:outrage", "tm:payday", - "tm:poisonfang", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:quash", "tm:raindance", "tm:rest", @@ -171,11 +160,9 @@ "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -188,9 +175,7 @@ "tm:sunnyday", "tm:superfang", "tm:superpower", - "tm:supersonic", "tm:surf", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -206,7 +191,49 @@ "tm:venomdrench", "tm:venoshock", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:drillrun", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:mudslap", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superfang", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "nidorina", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json index d704143753..7acafa5ada 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json @@ -94,53 +94,38 @@ "egg:takedown", "tm:aerialace", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:captivate", "tm:charm", - "tm:chipaway", - "tm:counter", "tm:crunch", "tm:cut", "tm:dig", - "tm:disable", - "tm:doublekick", "tm:earthpower", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:flatter", "tm:focusenergy", - "tm:furyswipes", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", "tm:icebeam", "tm:irontail", "tm:mudslap", - "tm:poisonfang", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:rocksmash", - "tm:scratch", "tm:shadowclaw", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:sludgebomb", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:supersonic", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", @@ -150,7 +135,25 @@ "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:waterpulse" + "tm:waterpulse", + "tutor:aerialace", + "tutor:earthpower", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:irontail", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:superfang", + "tutor:thunderbolt", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json index 529748f8d2..5755a62089 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json @@ -99,34 +99,21 @@ "tm:blizzard", "tm:bodyslam", "tm:captivate", - "tm:chipaway", - "tm:confusion", - "tm:counter", "tm:cut", "tm:dig", - "tm:disable", - "tm:doublekick", "tm:drillrun", "tm:earthpower", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:flatter", "tm:focusenergy", - "tm:furyattack", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", "tm:honeclaws", - "tm:hornattack", - "tm:horndrill", "tm:icebeam", "tm:irontail", - "tm:leer", "tm:mudslap", - "tm:peck", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", "tm:raindance", @@ -142,18 +129,35 @@ "tm:suckerpunch", "tm:sunnyday", "tm:superfang", - "tm:supersonic", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:toxic", "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:waterpulse" + "tm:waterpulse", + "tutor:drillrun", + "tutor:earthpower", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:irontail", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderbolt", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json index c54945dc80..e823cb178c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json @@ -95,45 +95,32 @@ "egg:takedown", "tm:aerialace", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:captivate", "tm:charm", - "tm:chipaway", - "tm:counter", "tm:crunch", "tm:cut", "tm:dig", - "tm:disable", - "tm:doublekick", "tm:earthpower", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:flatter", "tm:focusenergy", - "tm:furyswipes", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", "tm:icebeam", "tm:irontail", "tm:mudslap", - "tm:poisonfang", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:rocksmash", - "tm:scratch", "tm:shadowclaw", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:sludgebomb", "tm:stompingtantrum", @@ -141,8 +128,6 @@ "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:supersonic", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", @@ -152,7 +137,26 @@ "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:waterpulse" + "tm:waterpulse", + "tutor:aerialace", + "tutor:earthpower", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:irontail", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:thunderbolt", + "tutor:waterpulse" ], "preEvolution": "nidoranf", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json b/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json index b93d092c07..cf7308c50a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidorino.json @@ -100,34 +100,21 @@ "tm:blizzard", "tm:bodyslam", "tm:captivate", - "tm:chipaway", - "tm:confusion", - "tm:counter", "tm:cut", "tm:dig", - "tm:disable", - "tm:doublekick", "tm:drillrun", "tm:earthpower", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:flatter", "tm:focusenergy", - "tm:furyattack", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", "tm:honeclaws", - "tm:hornattack", - "tm:horndrill", "tm:icebeam", "tm:irontail", - "tm:leer", "tm:mudslap", - "tm:peck", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", "tm:raindance", @@ -144,18 +131,36 @@ "tm:suckerpunch", "tm:sunnyday", "tm:superfang", - "tm:supersonic", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:toxic", "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:waterpulse" + "tm:waterpulse", + "tutor:drillrun", + "tutor:earthpower", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:irontail", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderbolt", + "tutor:waterpulse" ], "preEvolution": "nidoranm", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json index 5afc3bb64c..94e1fe5343 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ninetales.json @@ -118,41 +118,29 @@ "tm:covet", "tm:darkpulse", "tm:dig", - "tm:disable", "tm:doubleedge", "tm:dreameater", - "tm:ember", "tm:encore", "tm:endure", "tm:energyball", - "tm:extrasensory", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:fireblast", "tm:firespin", - "tm:flail", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", "tm:foulplay", "tm:gigaimpact", - "tm:grudge", "tm:headbutt", - "tm:healingwish", "tm:heatwave", "tm:helpinghand", "tm:hex", - "tm:howl", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:incinerate", - "tm:inferno", "tm:irontail", "tm:laserfocus", - "tm:memento", "tm:mysticalfire", "tm:nastyplot", "tm:nightshade", @@ -164,7 +152,6 @@ "tm:protect", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:rest", "tm:roar", "tm:roleplay", @@ -181,12 +168,37 @@ "tm:sunnyday", "tm:swift", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:weatherball", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:energyball", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:laserfocus", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:rest", + "tutor:roleplay", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:swift", + "tutor:zenheadbutt" ], "preEvolution": "vulpix", "evolutions": [], @@ -280,7 +292,6 @@ "egg:secretpower", "egg:sheercold", "tm:agility", - "tm:aurorabeam", "tm:auroraveil", "tm:avalanche", "tm:babydolleyes", @@ -296,45 +307,33 @@ "tm:darkpulse", "tm:dazzlinggleam", "tm:dig", - "tm:disable", "tm:disarmingvoice", "tm:doubleedge", "tm:drainingkiss", "tm:dreameater", "tm:encore", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:faketears", - "tm:feintattack", - "tm:flail", "tm:foulplay", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", - "tm:grudge", "tm:hail", "tm:healbell", "tm:helpinghand", "tm:hex", - "tm:howl", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", - "tm:iceshard", "tm:iciclespear", "tm:icywind", "tm:imprison", "tm:irontail", "tm:laserfocus", - "tm:mist", "tm:mistyterrain", - "tm:moonblast", "tm:nastyplot", "tm:painsplit", "tm:payback", "tm:playrough", - "tm:powdersnow", "tm:powerswap", "tm:protect", "tm:psychup", @@ -345,7 +344,6 @@ "tm:roleplay", "tm:safeguard", "tm:secretpower", - "tm:sheercold", "tm:sleeptalk", "tm:snowscape", "tm:spite", @@ -353,13 +351,36 @@ "tm:substitute", "tm:swift", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:tripleaxel", "tm:weatherball", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:painsplit", + "tutor:playrough", + "tutor:rest", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:tripleaxel", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "vulpix alolan", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/oddish.json b/common/src/main/resources/data/cobblemon/species/generation1/oddish.json index f7262ea616..820d9e3523 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/oddish.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/oddish.json @@ -97,8 +97,6 @@ "egg:synthesis", "egg:teeterdance", "egg:tickle", - "tm:absorb", - "tm:acid", "tm:acidspray", "tm:afteryou", "tm:bulletseed", @@ -107,51 +105,47 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:gastroacid", "tm:gigadrain", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:infestation", - "tm:ingrain", "tm:leafstorm", - "tm:leechseed", - "tm:luckychant", "tm:magicalleaf", - "tm:megadrain", - "tm:moonblast", - "tm:moonlight", "tm:naturalgift", "tm:naturepower", - "tm:petaldance", - "tm:poisonpowder", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:secretpower", "tm:seedbomb", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:teeterdance", "tm:terablast", - "tm:tickle", "tm:toxic", "tm:trailblaze", "tm:venoshock", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json b/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json index 96be9e0b07..ff42106a08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/omanyte.json @@ -111,15 +111,10 @@ "egg:waterpulse", "egg:wringout", "tm:ancientpower", - "tm:aurorabeam", - "tm:bide", "tm:bind", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bubblebeam", - "tm:constrict", "tm:dive", "tm:earthpower", "tm:endure", @@ -133,13 +128,11 @@ "tm:icywind", "tm:irondefense", "tm:knockoff", - "tm:leer", "tm:meteorbeam", "tm:muddywater", "tm:mudshot", "tm:protect", "tm:raindance", - "tm:reflecttype", "tm:rest", "tm:rockblast", "tm:rockpolish", @@ -147,28 +140,37 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:sandattack", "tm:sandstorm", "tm:scald", - "tm:shellsmash", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:spikes", "tm:stealthrock", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:terablast", "tm:thief", - "tm:tickle", "tm:toxicspikes", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:withdraw", - "tm:wringout" + "tutor:ancientpower", + "tutor:bind", + "tutor:dive", + "tutor:earthpower", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/omastar.json b/common/src/main/resources/data/cobblemon/species/generation1/omastar.json index 6aa26157d6..3098847f0d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/omastar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/omastar.json @@ -113,15 +113,10 @@ "egg:waterpulse", "egg:wringout", "tm:ancientpower", - "tm:aurorabeam", - "tm:bide", "tm:bind", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bubblebeam", - "tm:constrict", "tm:crunch", "tm:dive", "tm:earthpower", @@ -138,7 +133,6 @@ "tm:icywind", "tm:irondefense", "tm:knockoff", - "tm:leer", "tm:liquidation", "tm:meteorbeam", "tm:muddywater", @@ -146,7 +140,6 @@ "tm:pinmissile", "tm:protect", "tm:raindance", - "tm:reflecttype", "tm:rest", "tm:rockblast", "tm:rockclimb", @@ -155,30 +148,42 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:sandattack", "tm:sandstorm", "tm:scald", - "tm:shellsmash", - "tm:slam", "tm:sleeptalk", "tm:smackdown", - "tm:spikecannon", "tm:spikes", "tm:stealthrock", "tm:stoneedge", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:terablast", "tm:thief", - "tm:tickle", "tm:toxicspikes", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:withdraw", - "tm:wringout" + "tutor:ancientpower", + "tutor:bind", + "tutor:dive", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:liquidation", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:waterpulse" ], "preEvolution": "omanyte", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/onix.json b/common/src/main/resources/data/cobblemon/species/generation1/onix.json index 4beae20dc4..b7e0b101fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/onix.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/onix.json @@ -119,10 +119,8 @@ "tm:brutalswing", "tm:bulldoze", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", @@ -132,25 +130,20 @@ "tm:endure", "tm:explosion", "tm:facade", - "tm:flail", "tm:flashcannon", "tm:gyroball", - "tm:harden", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:highhorsepower", "tm:ironhead", "tm:irontail", "tm:meteorbeam", "tm:mudslap", - "tm:mudsport", "tm:naturepower", "tm:payback", "tm:powershift", "tm:protect", "tm:psychup", - "tm:rage", "tm:rest", "tm:roar", "tm:rockblast", @@ -158,17 +151,14 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", - "tm:rototiller", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", "tm:scorchingsands", "tm:screech", "tm:selfdestruct", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -177,12 +167,34 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:taunt", "tm:terablast", "tm:torment", "tm:twister", - "tm:wideguard" + "tutor:ancientpower", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:drillrun", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:highhorsepower", + "tutor:ironhead", + "tutor:irontail", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:powershift", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:twister" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/paras.json b/common/src/main/resources/data/cobblemon/species/generation1/paras.json index 1207123f03..585791b70c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/paras.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/paras.json @@ -94,70 +94,72 @@ "egg:rototiller", "egg:sweetscent", "egg:wideguard", - "tm:absorb", "tm:aerialace", "tm:afteryou", "tm:agility", - "tm:aromatherapy", "tm:bodyslam", "tm:brickbreak", "tm:bugbite", "tm:bulletseed", - "tm:counter", "tm:crosspoison", "tm:cut", "tm:dig", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:fellstinger", - "tm:flail", "tm:flash", "tm:furycutter", "tm:gigadrain", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:honeclaws", "tm:knockoff", "tm:leechlife", - "tm:leechseed", "tm:lightscreen", "tm:metalclaw", "tm:naturalgift", "tm:naturepower", - "tm:poisonpowder", "tm:protect", "tm:psybeam", - "tm:pursuit", - "tm:ragepowder", "tm:rest", "tm:rocksmash", - "tm:rototiller", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:spore", "tm:stringshot", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:terablast", "tm:thief", "tm:venoshock", - "tm:wideguard", "tm:worryseed", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:afteryou", + "tutor:bugbite", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:knockoff", + "tutor:leechlife", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stringshot", + "tutor:synthesis", + "tutor:worryseed", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/parasect.json b/common/src/main/resources/data/cobblemon/species/generation1/parasect.json index e9d44b6343..c3b35fae08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/parasect.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/parasect.json @@ -98,16 +98,13 @@ "egg:rototiller", "egg:sweetscent", "egg:wideguard", - "tm:absorb", "tm:aerialace", "tm:afteryou", "tm:agility", - "tm:aromatherapy", "tm:bodyslam", "tm:brickbreak", "tm:bugbite", "tm:bulletseed", - "tm:counter", "tm:crosspoison", "tm:cut", "tm:dig", @@ -115,8 +112,6 @@ "tm:energyball", "tm:facade", "tm:falseswipe", - "tm:fellstinger", - "tm:flail", "tm:flash", "tm:furycutter", "tm:gigadrain", @@ -124,48 +119,59 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:honeclaws", "tm:hyperbeam", "tm:knockoff", "tm:leechlife", - "tm:leechseed", "tm:lightscreen", "tm:metalclaw", "tm:naturalgift", "tm:naturepower", - "tm:poisonpowder", "tm:protect", "tm:psybeam", - "tm:pursuit", - "tm:ragepowder", "tm:rest", "tm:rocksmash", - "tm:rototiller", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:spore", "tm:stringshot", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:terablast", "tm:thief", "tm:throatchop", "tm:venoshock", - "tm:wideguard", "tm:worryseed", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:afteryou", + "tutor:bugbite", + "tutor:energyball", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:leechlife", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stringshot", + "tutor:synthesis", + "tutor:throatchop", + "tutor:worryseed", + "tutor:xscissor" ], "preEvolution": "paras", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/persian.json b/common/src/main/resources/data/cobblemon/species/generation1/persian.json index 3c806789a9..5cdef0a3b6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/persian.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/persian.json @@ -109,9 +109,7 @@ "tm:aerialace", "tm:agility", "tm:amnesia", - "tm:assist", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:captivate", "tm:charm", @@ -127,24 +125,17 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:falseswipe", - "tm:feint", - "tm:feintattack", - "tm:flail", "tm:flash", "tm:foulplay", - "tm:furyswipes", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:icywind", "tm:irontail", "tm:knockoff", @@ -152,8 +143,6 @@ "tm:lastresort", "tm:metalclaw", "tm:nastyplot", - "tm:nightslash", - "tm:odorsleuth", "tm:painsplit", "tm:payback", "tm:payday", @@ -161,19 +150,16 @@ "tm:powergem", "tm:protect", "tm:psychup", - "tm:punishment", "tm:raindance", "tm:rest", "tm:retaliate", "tm:roar", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -181,8 +167,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -194,7 +178,38 @@ "tm:torment", "tm:trailblaze", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lastresort", + "tutor:painsplit", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt" ], "preEvolution": "meowth", "evolutions": [], @@ -279,10 +294,8 @@ "tm:aerialace", "tm:agility", "tm:amnesia", - "tm:assist", "tm:assurance", "tm:beatup", - "tm:bite", "tm:bodyslam", "tm:burningjealousy", "tm:captivate", @@ -300,21 +313,13 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feint", - "tm:feintattack", - "tm:flail", - "tm:flatter", "tm:foulplay", - "tm:furyswipes", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:icywind", "tm:irontail", "tm:knockoff", @@ -322,28 +327,23 @@ "tm:lastresort", "tm:metalclaw", "tm:nastyplot", - "tm:nightslash", - "tm:partingshot", "tm:payback", "tm:payday", "tm:playrough", "tm:powergem", "tm:protect", "tm:psychup", - "tm:punishment", "tm:quash", "tm:raindance", "tm:rest", "tm:retaliate", "tm:roar", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:snarl", @@ -352,7 +352,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:takedown", "tm:taunt", "tm:terablast", @@ -364,7 +363,37 @@ "tm:torment", "tm:trailblaze", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:burningjealousy", + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lastresort", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt" ], "preEvolution": "meowth alolan", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json index f45728a274..9e48b45d28 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgeot.json @@ -110,41 +110,48 @@ "tm:endure", "tm:facade", "tm:featherdance", - "tm:feintattack", "tm:fly", - "tm:foresight", "tm:gigaimpact", - "tm:gust", "tm:heatwave", "tm:hurricane", "tm:hyperbeam", "tm:laserfocus", - "tm:mirrormove", "tm:mudslap", "tm:ominouswind", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:roost", - "tm:sandattack", "tm:skyattack", "tm:sleeptalk", "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "preEvolution": "pidgeotto", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json index c1cce9590f..2ed9a16874 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json @@ -108,38 +108,42 @@ "tm:endure", "tm:facade", "tm:featherdance", - "tm:feintattack", "tm:fly", - "tm:foresight", - "tm:gust", "tm:heatwave", "tm:hurricane", - "tm:mirrormove", "tm:mudslap", "tm:ominouswind", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:roost", - "tm:sandattack", "tm:skyattack", "tm:sleeptalk", "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:heatwave", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "preEvolution": "pidgey", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json index 310485e5ee..510201cdd0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pidgey.json @@ -105,37 +105,40 @@ "tm:endure", "tm:facade", "tm:featherdance", - "tm:feintattack", "tm:fly", - "tm:foresight", - "tm:gust", "tm:hurricane", - "tm:mirrormove", "tm:mudslap", "tm:ominouswind", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:roost", - "tm:sandattack", "tm:skyattack", "tm:sleeptalk", "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json index 026cf4c2e5..07ffc5037f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json @@ -119,8 +119,6 @@ "tm:agility", "tm:alluringvoice", "tm:babydolleyes", - "tm:bestow", - "tm:bide", "tm:bodyslam", "tm:brickbreak", "tm:charge", @@ -129,8 +127,6 @@ "tm:covet", "tm:dig", "tm:disarmingvoice", - "tm:discharge", - "tm:doubleslap", "tm:doubleteam", "tm:drainingkiss", "tm:echoedvoice", @@ -142,33 +138,24 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feint", - "tm:flail", "tm:flash", "tm:fling", "tm:focuspunch", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:irontail", "tm:knockoff", "tm:laserfocus", "tm:lightscreen", - "tm:luckychant", "tm:magnetrise", "tm:megakick", "tm:megapunch", "tm:nastyplot", - "tm:nuzzle", "tm:payday", - "tm:playnice", "tm:playrough", - "tm:present", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:reflect", "tm:rest", @@ -178,30 +165,47 @@ "tm:rollout", "tm:shockwave", "tm:signalbeam", - "tm:slam", "tm:sleeptalk", - "tm:spark", "tm:strength", "tm:substitute", "tm:surf", - "tm:sweetkiss", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", "tm:upperhand", "tm:voltswitch", "tm:volttackle", "tm:wildcharge", - "tm:wish" + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:covet", + "tutor:electroweb", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:playrough", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:volttackle", + "tutor:wildcharge" ], "preEvolution": "pichu", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json index 9d757ed890..fe310e6816 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/pinsir.json @@ -102,32 +102,23 @@ "tm:closecombat", "tm:cut", "tm:dig", - "tm:doublehit", "tm:earthquake", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", - "tm:feintattack", - "tm:flail", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:furyattack", "tm:furycutter", "tm:gigaimpact", - "tm:guillotine", - "tm:harden", "tm:headbutt", "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", "tm:irondefense", "tm:knockoff", - "tm:mefirst", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:revenge", @@ -136,27 +127,45 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:seismictoss", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", "tm:stoneedge", - "tm:stormthrow", "tm:strength", "tm:stringshot", "tm:strugglebug", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:swordsdance", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", - "tm:visegrip", - "tm:vitalthrow", - "tm:xscissor" + "tm:xscissor", + "tutor:bind", + "tutor:bugbite", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:knockoff", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:stringshot", + "tutor:superpower", + "tutor:throatchop", + "tutor:xscissor" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json index 0a621b0ee5..4837fe438c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwag.json @@ -101,17 +101,13 @@ "egg:waterpulse", "egg:watersport", "tm:amnesia", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", "tm:chillingwater", "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doubleslap", "tm:earthpower", "tm:encore", "tm:endeavor", @@ -123,39 +119,46 @@ "tm:headbutt", "tm:helpinghand", "tm:hydropump", - "tm:hypnosis", "tm:iceball", "tm:icebeam", "tm:icywind", "tm:liquidation", "tm:lowkick", - "tm:mindreader", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:pound", "tm:protect", "tm:psychic", "tm:raindance", - "tm:refresh", "tm:rest", "tm:sleeptalk", - "tm:splash", "tm:substitute", "tm:surf", "tm:swift", "tm:takedown", "tm:terablast", "tm:thief", - "tm:wakeupslap", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:iceball", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json index bb4fb8a77d..4d10fbe680 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwhirl.json @@ -104,18 +104,14 @@ "egg:waterpulse", "egg:watersport", "tm:amnesia", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", "tm:chillingwater", "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doubleslap", "tm:earthpower", "tm:earthquake", "tm:encore", @@ -129,7 +125,6 @@ "tm:headbutt", "tm:helpinghand", "tm:hydropump", - "tm:hypnosis", "tm:icebeam", "tm:icepunch", "tm:icywind", @@ -139,23 +134,17 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mindreader", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:sleeptalk", - "tm:splash", "tm:strength", "tm:substitute", "tm:surf", @@ -163,13 +152,28 @@ "tm:takedown", "tm:terablast", "tm:thief", - "tm:wakeupslap", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse" ], "preEvolution": "poliwag", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json b/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json index 11fbcb0614..aa98c5fda6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/poliwrath.json @@ -110,26 +110,20 @@ "egg:watersport", "tm:amnesia", "tm:batonpass", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", - "tm:bubble", - "tm:bubblebeam", "tm:bulkup", "tm:bulldoze", "tm:chillingwater", - "tm:circlethrow", "tm:closecombat", "tm:coaching", "tm:darkestlariat", "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doubleslap", "tm:drainpunch", "tm:dualchop", - "tm:dynamicpunch", "tm:earthpower", "tm:earthquake", "tm:encore", @@ -147,7 +141,6 @@ "tm:highhorsepower", "tm:hydropump", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icepunch", "tm:icywind", @@ -158,21 +151,16 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mindreader", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", "tm:payback", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", - "tm:refresh", "tm:rest", "tm:reversal", "tm:rockclimb", @@ -181,9 +169,7 @@ "tm:rocktomb", "tm:scaryface", "tm:sleeptalk", - "tm:splash", "tm:strength", - "tm:submission", "tm:substitute", "tm:superpower", "tm:surf", @@ -195,14 +181,42 @@ "tm:throatchop", "tm:upperhand", "tm:vacuumwave", - "tm:wakeupslap", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:dive", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:earthpower", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:vacuumwave", + "tutor:waterpulse" ], "preEvolution": "poliwhirl", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json b/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json index 557f6382f6..1c7241078c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ponyta.json @@ -108,28 +108,20 @@ "tm:captivate", "tm:charm", "tm:doubleedge", - "tm:doublekick", "tm:echoedvoice", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", - "tm:growl", "tm:headbutt", "tm:heatwave", "tm:highhorsepower", - "tm:horndrill", - "tm:hypnosis", "tm:incinerate", - "tm:inferno", "tm:irontail", "tm:lowkick", - "tm:morningsun", "tm:mysticalfire", "tm:overheat", "tm:playrough", @@ -138,18 +130,27 @@ "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", - "tm:stomp", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:wildcharge", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:bounce", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:highhorsepower", + "tutor:irontail", + "tutor:lowkick", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:wildcharge" ], "evolutions": [ { @@ -230,25 +231,16 @@ "tm:bounce", "tm:calmmind", "tm:charm", - "tm:confusion", "tm:dazzlinggleam", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:expandingforce", "tm:facade", - "tm:fairywind", "tm:futuresight", - "tm:growl", - "tm:healingwish", - "tm:healpulse", "tm:highhorsepower", - "tm:horndrill", - "tm:hypnosis", "tm:imprison", "tm:irontail", "tm:lowkick", - "tm:morningsun", "tm:mysticalfire", "tm:playrough", "tm:protect", @@ -256,17 +248,29 @@ "tm:psychic", "tm:rest", "tm:sleeptalk", - "tm:stomp", "tm:storedpower", "tm:substitute", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:wildcharge", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bounce", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:expandingforce", + "tutor:highhorsepower", + "tutor:irontail", + "tutor:lowkick", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/porygon.json b/common/src/main/resources/data/cobblemon/species/generation1/porygon.json index c703adcc54..bba04c0013 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/porygon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/porygon.json @@ -83,9 +83,6 @@ "tm:blizzard", "tm:charge", "tm:chargebeam", - "tm:conversion", - "tm:conversion2", - "tm:discharge", "tm:doubleedge", "tm:dreameater", "tm:eerieimpulse", @@ -102,7 +99,6 @@ "tm:icywind", "tm:irontail", "tm:lastresort", - "tm:lockon", "tm:magiccoat", "tm:magnetrise", "tm:powerswap", @@ -111,11 +107,9 @@ "tm:psychic", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:recycle", "tm:rest", "tm:shadowball", - "tm:sharpen", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -124,21 +118,44 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:triattack", "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zapcannon", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/primeape.json b/common/src/main/resources/data/cobblemon/species/generation1/primeape.json index 05e2988b32..a2ac722a07 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/primeape.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/primeape.json @@ -108,9 +108,7 @@ "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:counter", "tm:covet", - "tm:crosschop", "tm:curse", "tm:dig", "tm:doubleedge", @@ -121,14 +119,11 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:finalgambit", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", - "tm:furyswipes", "tm:gigaimpact", "tm:gunkshot", "tm:headbutt", @@ -137,28 +132,19 @@ "tm:hyperbeam", "tm:icepunch", "tm:irontail", - "tm:karatechop", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:nightslash", "tm:outrage", "tm:overheat", "tm:payback", "tm:payday", "tm:poisonjab", - "tm:powertrip", "tm:poweruppunch", "tm:protect", - "tm:punishment", - "tm:pursuit", - "tm:rage", - "tm:ragefist", "tm:raindance", "tm:rest", "tm:retaliate", @@ -170,15 +156,12 @@ "tm:rocktomb", "tm:roleplay", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:seedbomb", - "tm:seismictoss", "tm:shadowclaw", "tm:skullbash", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:spite", "tm:stealthrock", "tm:stompingtantrum", @@ -192,7 +175,6 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", @@ -200,7 +182,43 @@ "tm:uproar", "tm:uturn", "tm:vacuumwave", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:lashout", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:vacuumwave" ], "preEvolution": "mankey", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json b/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json index 83a0db34f0..1f0ba2b5c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/psyduck.json @@ -114,15 +114,10 @@ "tm:bodyslam", "tm:brickbreak", "tm:brine", - "tm:bubble", "tm:calmmind", "tm:chillingwater", - "tm:clearsmog", "tm:confuseray", - "tm:confusion", - "tm:crosschop", "tm:dig", - "tm:disable", "tm:dive", "tm:doubleedge", "tm:encore", @@ -133,15 +128,12 @@ "tm:fling", "tm:flipturn", "tm:focuspunch", - "tm:foresight", - "tm:furyswipes", "tm:hail", "tm:haze", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", "tm:hydropump", - "tm:hypnosis", "tm:icebeam", "tm:icepunch", "tm:icywind", @@ -154,7 +146,6 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:nastyplot", @@ -167,25 +158,19 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:roleplay", - "tm:scratch", "tm:screech", "tm:secretpower", "tm:shadowclaw", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:sleeptalk", - "tm:soak", "tm:strength", "tm:substitute", "tm:surf", "tm:swift", - "tm:synchronoise", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -194,14 +179,40 @@ "tm:trailblaze", "tm:vacuumwave", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", "tm:wonderroom", "tm:worryseed", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:calmmind", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:lowkick", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:vacuumwave", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json index a0ece3dc64..ecdabfb954 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raichu.json @@ -112,8 +112,6 @@ "tm:agility", "tm:alluringvoice", "tm:babydolleyes", - "tm:bestow", - "tm:bide", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -123,8 +121,6 @@ "tm:covet", "tm:dig", "tm:disarmingvoice", - "tm:discharge", - "tm:doubleslap", "tm:doubleteam", "tm:drainingkiss", "tm:echoedvoice", @@ -136,17 +132,13 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feint", - "tm:flail", "tm:flash", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:hyperbeam", @@ -154,18 +146,13 @@ "tm:knockoff", "tm:laserfocus", "tm:lightscreen", - "tm:luckychant", "tm:magnetrise", "tm:megakick", "tm:megapunch", "tm:nastyplot", - "tm:nuzzle", "tm:payday", - "tm:playnice", "tm:playrough", - "tm:present", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:reflect", "tm:rest", @@ -176,31 +163,50 @@ "tm:safeguard", "tm:shockwave", "tm:signalbeam", - "tm:slam", "tm:sleeptalk", - "tm:spark", "tm:speedswap", "tm:strength", "tm:substitute", "tm:surf", - "tm:sweetkiss", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", "tm:upperhand", "tm:voltswitch", "tm:volttackle", "tm:wildcharge", - "tm:wish" + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:covet", + "tutor:electroweb", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:playrough", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:volttackle", + "tutor:wildcharge" ], "preEvolution": "pikachu", "evolutions": [], @@ -287,8 +293,6 @@ "tm:agility", "tm:alluringvoice", "tm:allyswitch", - "tm:bestow", - "tm:bide", "tm:bodyslam", "tm:brickbreak", "tm:calmmind", @@ -298,8 +302,6 @@ "tm:covet", "tm:dig", "tm:disarmingvoice", - "tm:discharge", - "tm:doubleslap", "tm:doubleteam", "tm:drainingkiss", "tm:echoedvoice", @@ -312,40 +314,31 @@ "tm:endure", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feint", - "tm:flail", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:helpinghand", "tm:hyperbeam", "tm:irontail", "tm:knockoff", "tm:laserfocus", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", "tm:magnetrise", "tm:megakick", "tm:megapunch", "tm:nastyplot", - "tm:nuzzle", "tm:payday", - "tm:playnice", "tm:playrough", - "tm:present", "tm:protect", "tm:psychic", "tm:psychicnoise", "tm:psychicterrain", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:recycle", "tm:reflect", @@ -356,16 +349,12 @@ "tm:shockwave", "tm:signalbeam", "tm:skillswap", - "tm:slam", "tm:sleeptalk", - "tm:spark", "tm:speedswap", "tm:storedpower", "tm:substitute", "tm:surf", - "tm:sweetkiss", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -373,15 +362,44 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", "tm:upperhand", "tm:voltswitch", "tm:volttackle", "tm:wildcharge", - "tm:wish" + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:electroweb", + "tutor:endeavor", + "tutor:expandingforce", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:magnetrise", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:volttackle", + "tutor:wildcharge" ], "preEvolution": "pikachu", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json index 330c173963..ca3d01735d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rapidash.json @@ -114,60 +114,66 @@ "tm:captivate", "tm:charm", "tm:doubleedge", - "tm:doublekick", "tm:drillrun", "tm:echoedvoice", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", - "tm:furyattack", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:heatwave", "tm:highhorsepower", - "tm:horndrill", "tm:hyperbeam", - "tm:hypnosis", "tm:incinerate", - "tm:inferno", "tm:irontail", "tm:lowkick", "tm:megahorn", - "tm:morningsun", "tm:mysticalfire", "tm:overheat", "tm:payday", "tm:playrough", "tm:poisonjab", "tm:protect", - "tm:quickattack", "tm:rest", "tm:scorchingsands", "tm:sleeptalk", "tm:smartstrike", "tm:solarbeam", "tm:solarblade", - "tm:stomp", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:wildcharge", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:bounce", + "tutor:drillrun", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:lowkick", + "tutor:megahorn", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:wildcharge" ], "preEvolution": "ponyta", "evolutions": [], @@ -237,31 +243,22 @@ "tm:bounce", "tm:calmmind", "tm:charm", - "tm:confusion", "tm:dazzlinggleam", "tm:doubleedge", - "tm:doublekick", "tm:drillrun", "tm:endure", "tm:expandingforce", "tm:facade", - "tm:fairywind", "tm:futuresight", "tm:gigaimpact", - "tm:growl", - "tm:healingwish", - "tm:healpulse", "tm:highhorsepower", - "tm:horndrill", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:irontail", "tm:lowkick", "tm:magicroom", "tm:megahorn", "tm:mistyterrain", - "tm:morningsun", "tm:mysticalfire", "tm:payday", "tm:playrough", @@ -270,25 +267,45 @@ "tm:psychic", "tm:psychicterrain", "tm:psychocut", - "tm:quickattack", "tm:rest", "tm:sleeptalk", "tm:smartstrike", - "tm:stomp", "tm:storedpower", "tm:substitute", "tm:swift", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:trickroom", "tm:wildcharge", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bounce", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:drillrun", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:lowkick", + "tutor:magicroom", + "tutor:megahorn", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:trick", + "tutor:wildcharge", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "ponyta galarian", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json index 53d25d04f3..1ff2f61874 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json @@ -101,12 +101,10 @@ "egg:swagger", "tm:assurance", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:chargebeam", "tm:closecombat", - "tm:counter", "tm:covet", "tm:crunch", "tm:cut", @@ -115,27 +113,20 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:finalgambit", - "tm:flamewheel", "tm:focusenergy", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:headbutt", "tm:hyperbeam", - "tm:hyperfang", "tm:icebeam", "tm:icywind", "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:mefirst", "tm:mudslap", "tm:pluck", "tm:protect", "tm:psychicfangs", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -157,8 +148,6 @@ "tm:superfang", "tm:swagger", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -170,7 +159,34 @@ "tm:uproar", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:chargebeam", + "tutor:covet", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "rattata", "evolutions": [], @@ -247,13 +263,11 @@ "egg:uproar", "tm:assurance", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:bulkup", "tm:burningjealousy", "tm:closecombat", - "tm:counter", "tm:covet", "tm:crunch", "tm:darkpulse", @@ -263,25 +277,19 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:finalgambit", "tm:focusenergy", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:hyperbeam", - "tm:hyperfang", "tm:icebeam", "tm:icywind", "tm:irontail", "tm:knockoff", "tm:lashout", "tm:lastresort", - "tm:mefirst", "tm:protect", "tm:psychicfangs", - "tm:pursuit", "tm:quash", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -297,17 +305,12 @@ "tm:sludgewave", "tm:snarl", "tm:snatch", - "tm:stockpile", "tm:stompingtantrum", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:superfang", - "tm:swallow", - "tm:switcheroo", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:taunt", "tm:terablast", "tm:thief", @@ -318,7 +321,36 @@ "tm:torment", "tm:uproar", "tm:venoshock", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:burningjealousy", + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lastresort", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "rattata alolan", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json index b73c641240..a6985c399d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rattata.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rattata.json @@ -100,11 +100,9 @@ "egg:swagger", "tm:assurance", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:chargebeam", - "tm:counter", "tm:covet", "tm:crunch", "tm:cut", @@ -113,24 +111,17 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:finalgambit", - "tm:flamewheel", "tm:focusenergy", - "tm:furyswipes", "tm:grassknot", "tm:headbutt", - "tm:hyperfang", "tm:icebeam", "tm:icywind", "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:mefirst", "tm:mudslap", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -147,8 +138,6 @@ "tm:sunnyday", "tm:superfang", "tm:swagger", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -159,7 +148,29 @@ "tm:uproar", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:chargebeam", + "tutor:covet", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [ { @@ -241,10 +252,8 @@ "egg:uproar", "tm:assurance", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:bodyslam", - "tm:counter", "tm:covet", "tm:crunch", "tm:darkpulse", @@ -254,21 +263,15 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:finalgambit", "tm:focusenergy", - "tm:furyswipes", "tm:grassknot", - "tm:hyperfang", "tm:icebeam", "tm:icywind", "tm:irontail", "tm:lashout", "tm:lastresort", - "tm:mefirst", "tm:protect", - "tm:pursuit", "tm:quash", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -281,15 +284,10 @@ "tm:sludgebomb", "tm:snarl", "tm:snatch", - "tm:stockpile", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:superfang", - "tm:swallow", - "tm:switcheroo", - "tm:tackle", - "tm:tailwhip", "tm:taunt", "tm:terablast", "tm:thief", @@ -298,7 +296,28 @@ "tm:thunderwave", "tm:torment", "tm:uproar", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:lashout", + "tutor:lastresort", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json index 1d1cbdcfee..56e0651db5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rhydon.json @@ -110,16 +110,12 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:chipaway", - "tm:counter", "tm:crunch", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", "tm:doubleedge", "tm:dragonpulse", - "tm:dragonrush", "tm:drillrun", "tm:earthpower", "tm:earthquake", @@ -133,18 +129,13 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:furyattack", "tm:furycutter", "tm:gigaimpact", - "tm:guardsplit", - "tm:hammerarm", "tm:headbutt", "tm:heatcrash", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", - "tm:hornattack", - "tm:horndrill", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", @@ -154,11 +145,9 @@ "tm:incinerate", "tm:irondefense", "tm:irontail", - "tm:magnitude", "tm:megahorn", "tm:megakick", "tm:megapunch", - "tm:metalburst", "tm:meteorbeam", "tm:mudshot", "tm:mudslap", @@ -179,18 +168,15 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:rototiller", "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", "tm:shadowclaw", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:smartstrike", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -200,8 +186,6 @@ "tm:superpower", "tm:surf", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", @@ -209,7 +193,51 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:uproar" + "tm:uproar", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:drillrun", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:megahorn", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar" ], "preEvolution": "rhyhorn", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json b/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json index 9b6bad8bef..0c13bfc9df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/rhyhorn.json @@ -103,15 +103,11 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", - "tm:chipaway", - "tm:counter", "tm:crunch", - "tm:crushclaw", "tm:curse", "tm:dig", "tm:doubleedge", "tm:dragonpulse", - "tm:dragonrush", "tm:drillrun", "tm:earthpower", "tm:earthquake", @@ -121,21 +117,15 @@ "tm:fireblast", "tm:firefang", "tm:flamethrower", - "tm:furyattack", - "tm:guardsplit", "tm:headbutt", "tm:heavyslam", "tm:highhorsepower", - "tm:hornattack", - "tm:horndrill", "tm:icebeam", "tm:icefang", "tm:icywind", "tm:incinerate", "tm:irontail", - "tm:magnitude", "tm:megahorn", - "tm:metalburst", "tm:mudshot", "tm:mudslap", "tm:payback", @@ -152,17 +142,14 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:rototiller", "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:smartstrike", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -171,15 +158,44 @@ "tm:supercellslam", "tm:superpower", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderfang", - "tm:uproar" + "tm:uproar", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:drillrun", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:highhorsepower", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irontail", + "tutor:megahorn", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json index c68c043b21..c60f33c3ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandshrew.json @@ -111,13 +111,10 @@ "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:chipaway", - "tm:counter", "tm:covet", "tm:crushclaw", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", @@ -126,11 +123,9 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:flail", "tm:fling", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gyroball", "tm:headbutt", "tm:highhorsepower", @@ -139,30 +134,22 @@ "tm:knockoff", "tm:leechlife", "tm:lowkick", - "tm:magnitude", "tm:metalclaw", "tm:mudshot", "tm:mudslap", - "tm:nightslash", "tm:poisonjab", - "tm:poisonsting", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockclimb", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:rototiller", "tm:safeguard", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:spikes", @@ -181,7 +168,38 @@ "tm:thief", "tm:throatchop", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:covet", + "tutor:earthpower", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:highhorsepower", + "tutor:irontail", + "tutor:knockoff", + "tutor:leechlife", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superfang", + "tutor:swift", + "tutor:throatchop", + "tutor:xscissor" ], "evolutions": [ { @@ -280,37 +298,29 @@ "tm:aquatail", "tm:auroraveil", "tm:avalanche", - "tm:bide", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:chipaway", - "tm:counter", "tm:covet", - "tm:crushclaw", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:flashcannon", "tm:fling", "tm:focuspunch", "tm:frostbreath", "tm:furycutter", - "tm:furyswipes", "tm:gyroball", "tm:hail", "tm:honeclaws", "tm:iceball", "tm:icebeam", "tm:icepunch", - "tm:iceshard", "tm:icespinner", "tm:iciclecrash", "tm:iciclespear", @@ -322,21 +332,14 @@ "tm:leechlife", "tm:lowkick", "tm:metalclaw", - "tm:mirrorcoat", - "tm:mist", - "tm:nightslash", "tm:poisonjab", - "tm:powdersnow", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockslide", "tm:rocktomb", "tm:rollout", "tm:safeguard", - "tm:scratch", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:stealthrock", @@ -352,7 +355,39 @@ "tm:throatchop", "tm:tripleaxel", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:covet", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:iceball", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:leechlife", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:superfang", + "tutor:swift", + "tutor:throatchop", + "tutor:tripleaxel", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json index dd035e643d..c8c762fdb9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json @@ -109,13 +109,9 @@ "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:chipaway", - "tm:counter", "tm:covet", - "tm:crushclaw", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:drillrun", @@ -125,12 +121,10 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:flail", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:gunkshot", "tm:gyroball", @@ -142,31 +136,23 @@ "tm:knockoff", "tm:leechlife", "tm:lowkick", - "tm:magnitude", "tm:metalclaw", "tm:mudshot", "tm:mudslap", - "tm:nightslash", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockclimb", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:rototiller", "tm:safeguard", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:spikes", @@ -185,7 +171,42 @@ "tm:thief", "tm:throatchop", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:covet", + "tutor:drillrun", + "tutor:earthpower", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:leechlife", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superfang", + "tutor:swift", + "tutor:throatchop", + "tutor:xscissor" ], "preEvolution": "sandshrew", "evolutions": [], @@ -275,17 +296,12 @@ "tm:aquatail", "tm:auroraveil", "tm:avalanche", - "tm:bide", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:chipaway", - "tm:counter", "tm:covet", - "tm:crushclaw", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:drillrun", @@ -294,14 +310,12 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:flail", "tm:flashcannon", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:frostbreath", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:gyroball", "tm:hail", @@ -310,9 +324,7 @@ "tm:iceball", "tm:icebeam", "tm:icepunch", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:irondefense", @@ -321,24 +333,16 @@ "tm:knockoff", "tm:leechlife", "tm:lowkick", - "tm:metalburst", "tm:metalclaw", - "tm:mirrorcoat", - "tm:mist", - "tm:nightslash", "tm:pinmissile", "tm:poisonjab", - "tm:powdersnow", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockslide", "tm:rocktomb", "tm:rollout", "tm:safeguard", - "tm:scratch", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:spikes", @@ -355,7 +359,44 @@ "tm:throatchop", "tm:tripleaxel", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:covet", + "tutor:drillrun", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:leechlife", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:superfang", + "tutor:swift", + "tutor:throatchop", + "tutor:tripleaxel", + "tutor:xscissor" ], "preEvolution": "sandshrew alolan", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/scyther.json b/common/src/main/resources/data/cobblemon/species/generation1/scyther.json index d8ae76aad3..9018247094 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/scyther.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/scyther.json @@ -98,17 +98,14 @@ "tm:bugbite", "tm:bugbuzz", "tm:closecombat", - "tm:counter", "tm:crosspoison", "tm:cut", "tm:defog", - "tm:doublehit", "tm:doubleteam", "tm:dualwingbeat", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", "tm:focusenergy", "tm:furycutter", "tm:gigaimpact", @@ -116,19 +113,13 @@ "tm:helpinghand", "tm:hyperbeam", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lunge", - "tm:nightslash", "tm:ominouswind", "tm:pounce", "tm:protect", "tm:psychocut", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:rocksmash", @@ -137,7 +128,6 @@ "tm:scaryface", "tm:silverwind", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:steelwing", "tm:strugglebug", @@ -152,8 +142,30 @@ "tm:trailblaze", "tm:uturn", "tm:vacuumwave", - "tm:wingattack", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:psychocut", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:vacuumwave", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seadra.json b/common/src/main/resources/data/cobblemon/species/generation1/seadra.json index 9850d09623..537767db9b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seadra.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seadra.json @@ -103,23 +103,15 @@ "egg:razorwind", "egg:splash", "tm:agility", - "tm:aurorabeam", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", - "tm:clearsmog", - "tm:disable", "tm:dive", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:endure", "tm:facade", - "tm:flail", "tm:flashcannon", "tm:flipturn", "tm:focusenergy", @@ -131,32 +123,46 @@ "tm:icebeam", "tm:icywind", "tm:laserfocus", - "tm:leer", "tm:liquidation", "tm:muddywater", - "tm:octazooka", "tm:outrage", "tm:protect", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:scaleshot", "tm:scaryface", "tm:signalbeam", "tm:sleeptalk", - "tm:smokescreen", "tm:snowscape", - "tm:splash", "tm:substitute", "tm:surf", "tm:swift", "tm:terablast", "tm:twister", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:bounce", + "tutor:dive", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "horsea", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json index 96a370588f..c506dffa8b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json @@ -106,9 +106,7 @@ "egg:mudsport", "egg:psybeam", "egg:skullbash", - "tm:acupressure", "tm:agility", - "tm:aquaring", "tm:aquatail", "tm:blizzard", "tm:bodyslam", @@ -117,15 +115,11 @@ "tm:drillrun", "tm:endure", "tm:facade", - "tm:flail", "tm:flipturn", - "tm:furyattack", "tm:furycutter", "tm:gigaimpact", "tm:hail", "tm:haze", - "tm:hornattack", - "tm:horndrill", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", @@ -135,8 +129,6 @@ "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:peck", "tm:poisonjab", "tm:protect", "tm:psybeam", @@ -145,22 +137,38 @@ "tm:scald", "tm:scaleshot", "tm:signalbeam", - "tm:skullbash", "tm:sleeptalk", "tm:smartstrike", - "tm:soak", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tailwhip", "tm:terablast", "tm:throatchop", "tm:waterfall", "tm:waterpulse", - "tm:watersport", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bounce", + "tutor:dive", + "tutor:drillrun", + "tutor:flipturn", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:megahorn", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:scaleshot", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "preEvolution": "goldeen", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seel.json b/common/src/main/resources/data/cobblemon/species/generation1/seel.json index efcbc920c9..97477ee942 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seel.json @@ -106,61 +106,45 @@ "egg:spitup", "egg:stockpile", "egg:swallow", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", - "tm:aurorabeam", "tm:avalanche", - "tm:belch", "tm:blizzard", "tm:bodyslam", "tm:brine", "tm:charm", "tm:chillingwater", "tm:curse", - "tm:disable", "tm:dive", "tm:doubleedge", "tm:drillrun", "tm:echoedvoice", "tm:encore", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:fakeout", "tm:fling", "tm:flipturn", - "tm:growl", "tm:hail", "tm:haze", "tm:headbutt", "tm:helpinghand", - "tm:horndrill", "tm:hydropump", "tm:icebeam", - "tm:iceshard", "tm:icespinner", "tm:iciclespear", "tm:icywind", "tm:irontail", - "tm:lick", "tm:muddywater", "tm:payday", - "tm:perishsong", "tm:protect", "tm:raindance", "tm:rest", "tm:safeguard", "tm:signalbeam", - "tm:slam", "tm:sleeptalk", "tm:smartstrike", "tm:snowscape", - "tm:spitup", - "tm:stockpile", "tm:substitute", "tm:surf", - "tm:swallow", "tm:takedown", "tm:terablast", "tm:thief", @@ -169,9 +153,22 @@ "tm:waterfall", "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:dive", + "tutor:drillrun", + "tutor:flipturn", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/shellder.json b/common/src/main/resources/data/cobblemon/species/generation1/shellder.json index 31bb021096..a23d2442b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/shellder.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/shellder.json @@ -97,15 +97,10 @@ "egg:rapidspin", "egg:twineedle", "egg:waterpulse", - "tm:aquaring", - "tm:aurorabeam", "tm:avalanche", - "tm:barrier", "tm:blizzard", "tm:brine", - "tm:bubblebeam", "tm:chillingwater", - "tm:clamp", "tm:dive", "tm:endure", "tm:explosion", @@ -114,43 +109,44 @@ "tm:helpinghand", "tm:hydropump", "tm:icebeam", - "tm:iceshard", "tm:icespinner", "tm:iciclespear", "tm:icywind", "tm:irondefense", - "tm:leer", - "tm:lifedew", "tm:liquidation", "tm:mudshot", "tm:payback", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:razorshell", "tm:rest", "tm:rockblast", "tm:screech", "tm:selfdestruct", - "tm:shellsmash", "tm:sleeptalk", "tm:snowscape", "tm:spikes", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:toxicspikes", "tm:triattack", - "tm:twineedle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:withdraw" + "tutor:dive", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:liquidation", + "tutor:rest", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:swift", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json index f40de25c2d..31126ab049 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowbro.json @@ -111,8 +111,6 @@ "tm:amnesia", "tm:aquatail", "tm:avalanche", - "tm:belch", - "tm:bellydrum", "tm:blizzard", "tm:block", "tm:bodypress", @@ -122,10 +120,8 @@ "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:confusion", "tm:curse", "tm:dig", - "tm:disable", "tm:dive", "tm:drainpunch", "tm:dreameater", @@ -145,10 +141,8 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:hail", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hydropump", "tm:hyperbeam", @@ -162,13 +156,11 @@ "tm:lightscreen", "tm:liquidation", "tm:magiccoat", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:muddywater", "tm:mudshot", - "tm:mudsport", "tm:nastyplot", "tm:payday", "tm:protect", @@ -188,18 +180,15 @@ "tm:shadowball", "tm:signalbeam", "tm:skillswap", - "tm:slackoff", "tm:sleeptalk", "tm:snore", "tm:snowscape", - "tm:stomp", "tm:storedpower", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -208,14 +197,48 @@ "tm:trick", "tm:trickroom", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:withdraw", "tm:wonderroom", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:dive", + "tutor:drainpunch", + "tutor:expandingforce", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snore", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "slowpoke", "evolutions": [], @@ -355,12 +378,9 @@ "egg:bellydrum", "egg:block", "egg:stomp", - "tm:acid", "tm:acidspray", "tm:amnesia", "tm:avalanche", - "tm:belch", - "tm:bellydrum", "tm:blizzard", "tm:block", "tm:bodypress", @@ -371,10 +391,8 @@ "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:confusion", "tm:curse", "tm:dig", - "tm:disable", "tm:dive", "tm:doubleedge", "tm:drainpunch", @@ -389,12 +407,10 @@ "tm:foulplay", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:hail", "tm:haze", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hydropump", "tm:hyperbeam", @@ -430,21 +446,17 @@ "tm:sandstorm", "tm:scaryface", "tm:shadowball", - "tm:shellsidearm", "tm:skillswap", - "tm:slackoff", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:smackdown", "tm:snowscape", - "tm:stomp", "tm:storedpower", "tm:substitute", "tm:sunnyday", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderwave", @@ -457,10 +469,39 @@ "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:withdraw", "tm:wonderroom", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:dive", + "tutor:drainpunch", + "tutor:expandingforce", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:liquidation", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:swift", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "slowpoke galarian", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json index 4da0eb44ab..dcd1678e43 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/slowpoke.json @@ -114,8 +114,6 @@ "tm:amnesia", "tm:aquatail", "tm:avalanche", - "tm:belch", - "tm:bellydrum", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -123,10 +121,8 @@ "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:confusion", "tm:curse", "tm:dig", - "tm:disable", "tm:dive", "tm:dreameater", "tm:earthquake", @@ -139,10 +135,8 @@ "tm:flash", "tm:foulplay", "tm:grassknot", - "tm:growl", "tm:hail", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hydropump", "tm:icebeam", @@ -153,9 +147,7 @@ "tm:lightscreen", "tm:liquidation", "tm:magiccoat", - "tm:mefirst", "tm:mudshot", - "tm:mudsport", "tm:payday", "tm:protect", "tm:psybeam", @@ -170,18 +162,15 @@ "tm:shadowball", "tm:signalbeam", "tm:skillswap", - "tm:slackoff", "tm:sleeptalk", "tm:snore", "tm:snowscape", - "tm:stomp", "tm:storedpower", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -190,13 +179,40 @@ "tm:trick", "tm:trickroom", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", "tm:wonderroom", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:dive", + "tutor:expandingforce", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snore", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { @@ -252,16 +268,14 @@ ], "behaviour": { "moving": { - "walk": { - "walkSpeed": 0.125}, + "walk": { + "walkSpeed": 0.125 + }, "swim": { "swimSpeed": "0.2", "canBreatheUnderwater": true, "canSwimInWater": true, "canSwimInLava": false - }, - "walk": { - "walkSpeed": 0.125 } }, "resting": { @@ -305,11 +319,8 @@ "egg:bellydrum", "egg:block", "egg:stomp", - "tm:acid", "tm:amnesia", "tm:avalanche", - "tm:belch", - "tm:bellydrum", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -317,10 +328,8 @@ "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:confusion", "tm:curse", "tm:dig", - "tm:disable", "tm:dive", "tm:earthquake", "tm:endure", @@ -330,10 +339,8 @@ "tm:flamethrower", "tm:foulplay", "tm:grassknot", - "tm:growl", "tm:hail", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hydropump", "tm:icebeam", @@ -355,16 +362,13 @@ "tm:safeguard", "tm:shadowball", "tm:skillswap", - "tm:slackoff", "tm:sleeptalk", "tm:snowscape", - "tm:stomp", "tm:storedpower", "tm:substitute", "tm:sunnyday", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderwave", @@ -376,8 +380,29 @@ "tm:weatherball", "tm:whirlpool", "tm:wonderroom", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:dive", + "tutor:expandingforce", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json index f7faf98ce5..51f5e09174 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json @@ -54,12 +54,12 @@ "walkSpeed": 0.147 } }, - "resting": { - "canSleep": true, - "willSleepOnBed": false, - "depth": "normal", - "light": "0-15" - } + "resting": { + "canSleep": true, + "willSleepOnBed": false, + "depth": "normal", + "light": "0-15" + } }, "drops": { "amount": 8, @@ -124,9 +124,6 @@ "egg:whirlwind", "tm:afteryou", "tm:amnesia", - "tm:belch", - "tm:bellydrum", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodypress", @@ -135,13 +132,10 @@ "tm:bulldoze", "tm:charm", "tm:chillingwater", - "tm:chipaway", - "tm:counter", "tm:covet", "tm:crunch", "tm:curse", "tm:darkestlariat", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthquake", @@ -150,8 +144,6 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:fissure", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", @@ -159,7 +151,6 @@ "tm:gastroacid", "tm:gigaimpact", "tm:gunkshot", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heatcrash", @@ -175,18 +166,15 @@ "tm:incinerate", "tm:ironhead", "tm:lastresort", - "tm:lick", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:mudslap", "tm:naturalgift", - "tm:odorsleuth", "tm:outrage", "tm:payday", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:recycle", "tm:rest", @@ -208,7 +196,6 @@ "tm:snore", "tm:solarbeam", "tm:steelroller", - "tm:stockpile", "tm:stompingtantrum", "tm:strength", "tm:substitute", @@ -216,8 +203,6 @@ "tm:supercellslam", "tm:superpower", "tm:surf", - "tm:swallow", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:terrainpulse", @@ -226,11 +211,51 @@ "tm:thunderpunch", "tm:trailblaze", "tm:uproar", - "tm:whirlwind", "tm:wildcharge", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:block", + "tutor:bulldoze", + "tutor:covet", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:iceball", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:ironhead", + "tutor:lastresort", + "tutor:mudslap", + "tutor:outrage", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:snore", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "munchlax", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/spearow.json b/common/src/main/resources/data/cobblemon/species/generation1/spearow.json index 7bb4b78652..513b464ec7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/spearow.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/spearow.json @@ -101,10 +101,8 @@ "tm:agility", "tm:aircutter", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:defog", - "tm:drillpeck", "tm:drillrun", "tm:dualwingbeat", "tm:echoedvoice", @@ -112,23 +110,14 @@ "tm:facade", "tm:falseswipe", "tm:featherdance", - "tm:feintattack", "tm:fly", "tm:focusenergy", - "tm:furyattack", - "tm:growl", "tm:heatwave", - "tm:leer", - "tm:mirrormove", "tm:mudslap", "tm:ominouswind", - "tm:peck", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roost", "tm:scaryface", @@ -145,9 +134,25 @@ "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:drillrun", + "tutor:dualwingbeat", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:heatwave", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json b/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json index f1a2aa80c5..8fd93f5b97 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/squirtle.json @@ -110,27 +110,20 @@ "egg:waterspout", "egg:wavecrash", "egg:yawn", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:brine", - "tm:bubble", "tm:chillingwater", "tm:dig", "tm:dive", "tm:doubleedge", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:flail", "tm:fling", "tm:flipturn", "tm:focuspunch", - "tm:foresight", "tm:gyroball", "tm:hail", "tm:haze", @@ -143,44 +136,47 @@ "tm:icywind", "tm:irondefense", "tm:irontail", - "tm:lifedew", "tm:liquidation", "tm:megakick", "tm:megapunch", - "tm:mirrorcoat", - "tm:mist", "tm:muddywater", "tm:mudshot", - "tm:mudsport", "tm:poweruppunch", "tm:protect", "tm:raindance", - "tm:rapidspin", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:rollout", - "tm:shellsmash", - "tm:skullbash", "tm:sleeptalk", "tm:strength", "tm:substitute", "tm:surf", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:waterspout", - "tm:wavecrash", "tm:weatherball", "tm:whirlpool", - "tm:withdraw", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:dive", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:liquidation", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/starmie.json b/common/src/main/resources/data/cobblemon/species/generation1/starmie.json index 42574fe3c8..04e389f302 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/starmie.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/starmie.json @@ -90,8 +90,6 @@ "tm:avalanche", "tm:blizzard", "tm:brine", - "tm:bubblebeam", - "tm:camouflage", "tm:confuseray", "tm:cosmicpower", "tm:dazzlinggleam", @@ -108,7 +106,6 @@ "tm:gravity", "tm:gyroball", "tm:hail", - "tm:harden", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", @@ -116,7 +113,6 @@ "tm:lightscreen", "tm:magiccoat", "tm:meteorbeam", - "tm:minimize", "tm:painsplit", "tm:powergem", "tm:protect", @@ -125,24 +121,18 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:rapidspin", - "tm:recover", "tm:recycle", "tm:reflect", - "tm:reflecttype", "tm:rest", "tm:rollout", "tm:scald", "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:spotlight", "tm:substitute", "tm:surf", "tm:swift", - "tm:tackle", "tm:telekinesis", "tm:terablast", "tm:thunder", @@ -153,10 +143,38 @@ "tm:trickroom", "tm:twister", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:twister", + "tutor:waterpulse", + "tutor:wonderroom" ], "preEvolution": "staryu", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/staryu.json b/common/src/main/resources/data/cobblemon/species/generation1/staryu.json index 29234002ef..48027b4f69 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/staryu.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/staryu.json @@ -85,8 +85,6 @@ "egg:reflecttype", "tm:blizzard", "tm:brine", - "tm:bubblebeam", - "tm:camouflage", "tm:confuseray", "tm:cosmicpower", "tm:dazzlinggleam", @@ -99,26 +97,20 @@ "tm:gravity", "tm:gyroball", "tm:hail", - "tm:harden", "tm:hydropump", "tm:icebeam", "tm:icywind", "tm:lightscreen", "tm:magiccoat", - "tm:minimize", "tm:painsplit", "tm:powergem", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:psywave", "tm:raindance", - "tm:rapidspin", - "tm:recover", "tm:recycle", "tm:reflect", - "tm:reflecttype", "tm:rest", "tm:rollout", "tm:scald", @@ -127,7 +119,6 @@ "tm:substitute", "tm:surf", "tm:swift", - "tm:tackle", "tm:terablast", "tm:thunder", "tm:thunderbolt", @@ -135,9 +126,27 @@ "tm:triattack", "tm:twister", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:gravity", + "tutor:icebeam", + "tutor:icywind", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tangela.json b/common/src/main/resources/data/cobblemon/species/generation1/tangela.json index fba7befea7..ebf2d498ee 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tangela.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tangela.json @@ -88,66 +88,67 @@ "egg:ragepowder", "egg:wakeupslap", "egg:wringout", - "tm:absorb", "tm:amnesia", "tm:ancientpower", "tm:bind", "tm:bodyslam", "tm:bulletseed", - "tm:confusion", - "tm:constrict", "tm:cut", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", "tm:hyperbeam", "tm:infestation", - "tm:ingrain", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", - "tm:megadrain", "tm:naturalgift", "tm:naturepower", "tm:painsplit", - "tm:poisonpowder", "tm:powerswap", "tm:powerwhip", "tm:protect", "tm:psychup", - "tm:ragepowder", "tm:reflect", "tm:rest", "tm:rocksmash", "tm:seedbomb", "tm:shockwave", - "tm:slam", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:swordsdance", "tm:synthesis", "tm:terablast", "tm:thief", - "tm:tickle", - "tm:vinewhip", - "tm:wakeupslap", "tm:worryseed", - "tm:wringout" + "tutor:ancientpower", + "tutor:bind", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:painsplit", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tauros.json b/common/src/main/resources/data/cobblemon/species/generation1/tauros.json index a718c952f3..2d59d3d59a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tauros.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tauros.json @@ -103,7 +103,6 @@ "tm:headbutt", "tm:helpinghand", "tm:highhorsepower", - "tm:hornattack", "tm:hyperbeam", "tm:icebeam", "tm:icywind", @@ -115,9 +114,6 @@ "tm:outrage", "tm:payback", "tm:protect", - "tm:pursuit", - "tm:rage", - "tm:ragingbull", "tm:raindance", "tm:rest", "tm:retaliate", @@ -142,19 +138,43 @@ "tm:sunnyday", "tm:surf", "tm:swagger", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", "tm:trailblaze", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:lashout", + "tutor:megahorn", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -221,7 +241,6 @@ "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:drillrun", "tm:earthquake", "tm:endeavor", @@ -235,7 +254,6 @@ "tm:lashout", "tm:outrage", "tm:protect", - "tm:ragingbull", "tm:raindance", "tm:rest", "tm:reversal", @@ -251,17 +269,32 @@ "tm:sunnyday", "tm:surf", "tm:swagger", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:trailblaze", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:drillrun", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:lashout", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:throatchop", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -330,7 +363,6 @@ "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:drillrun", "tm:earthquake", "tm:endeavor", @@ -350,7 +382,6 @@ "tm:outrage", "tm:overheat", "tm:protect", - "tm:ragingbull", "tm:raindance", "tm:rest", "tm:reversal", @@ -365,18 +396,33 @@ "tm:substitute", "tm:sunnyday", "tm:swagger", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:temperflare", "tm:terablast", "tm:thief", - "tm:thrash", "tm:trailblaze", "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:drillrun", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:lashout", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -437,7 +483,6 @@ "60:closecombat", "egg:curse", "egg:endeavor", - "tm:aquajet", "tm:bodypress", "tm:bodyslam", "tm:bulkup", @@ -447,7 +492,6 @@ "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:drillrun", "tm:earthquake", "tm:endeavor", @@ -463,7 +507,6 @@ "tm:liquidation", "tm:outrage", "tm:protect", - "tm:ragingbull", "tm:raindance", "tm:rest", "tm:reversal", @@ -478,19 +521,34 @@ "tm:substitute", "tm:surf", "tm:swagger", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:trailblaze", "tm:waterpulse", - "tm:wavecrash", "tm:whirlpool", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:drillrun", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:lashout", + "tutor:liquidation", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json b/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json index 8d90aa66ba..e525bff8e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tentacool.json @@ -112,22 +112,13 @@ "egg:rapidspin", "egg:tickle", "egg:wringout", - "tm:acid", - "tm:acidarmor", "tm:acidspray", - "tm:acupressure", - "tm:aquaring", - "tm:aurorabeam", - "tm:barrier", "tm:bind", "tm:blizzard", "tm:brine", "tm:brutalswing", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", "tm:confuseray", - "tm:constrict", "tm:crosspoison", "tm:cut", "tm:dazzlinggleam", @@ -147,16 +138,13 @@ "tm:knockoff", "tm:liquidation", "tm:magiccoat", - "tm:mirrorcoat", "tm:muddywater", "tm:mudshot", "tm:payback", "tm:poisonjab", - "tm:poisonsting", "tm:pounce", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:safeguard", "tm:screech", @@ -164,22 +152,36 @@ "tm:sludgebomb", "tm:sludgewave", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:swordsdance", "tm:terablast", "tm:thief", "tm:throatchop", - "tm:tickle", "tm:toxic", "tm:toxicspikes", "tm:venoshock", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:wrap", - "tm:wringout" + "tutor:bind", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:flipturn", + "tutor:gigadrain", + "tutor:gunkshot", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:poisonjab", + "tutor:rest", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json b/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json index 2860c05787..847b73831b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/tentacruel.json @@ -115,22 +115,13 @@ "egg:rapidspin", "egg:tickle", "egg:wringout", - "tm:acid", - "tm:acidarmor", "tm:acidspray", - "tm:acupressure", - "tm:aquaring", - "tm:aurorabeam", - "tm:barrier", "tm:bind", "tm:blizzard", "tm:brine", "tm:brutalswing", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", "tm:confuseray", - "tm:constrict", "tm:corrosivegas", "tm:crosspoison", "tm:cut", @@ -153,17 +144,13 @@ "tm:knockoff", "tm:liquidation", "tm:magiccoat", - "tm:mirrorcoat", "tm:muddywater", "tm:mudshot", "tm:payback", "tm:poisonjab", - "tm:poisonsting", "tm:pounce", "tm:protect", "tm:raindance", - "tm:rapidspin", - "tm:reflecttype", "tm:rest", "tm:safeguard", "tm:scaryface", @@ -173,24 +160,42 @@ "tm:sludgebomb", "tm:sludgewave", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:swordsdance", "tm:terablast", "tm:thief", "tm:throatchop", - "tm:tickle", "tm:toxic", "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:wrap", - "tm:wringout" + "tutor:bind", + "tutor:corrosivegas", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:flipturn", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:poisonjab", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "preEvolution": "tentacool", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json b/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json index f3d0bd32ea..0624bf1aa1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vaporeon.json @@ -106,39 +106,29 @@ "egg:tickle", "egg:wish", "egg:yawn", - "tm:acidarmor", "tm:alluringvoice", - "tm:aquaring", "tm:aquatail", - "tm:aurorabeam", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bubble", "tm:calmmind", "tm:captivate", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:curse", - "tm:detect", "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doublekick", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:faketears", - "tm:flail", "tm:flipturn", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", "tm:hail", "tm:haze", "tm:headbutt", @@ -158,14 +148,11 @@ "tm:naturalgift", "tm:payday", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", "tm:rocksmash", - "tm:sandattack", "tm:scald", "tm:shadowball", "tm:signalbeam", @@ -176,22 +163,40 @@ "tm:sunnyday", "tm:surf", "tm:swift", - "tm:synchronoise", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:trailblaze", - "tm:trumpcard", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:wish", "tm:workup", - "tm:yawn" + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:dive", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse" ], "preEvolution": "eevee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json b/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json index f0e64cf720..7aee6b40a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venomoth.json @@ -117,36 +117,27 @@ "tm:bugbite", "tm:bugbuzz", "tm:confuseray", - "tm:confusion", "tm:defog", - "tm:disable", "tm:doubleedge", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:foresight", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:hyperbeam", "tm:infestation", "tm:leechlife", "tm:lunge", "tm:megadrain", - "tm:morningsun", "tm:nightshade", "tm:ominouswind", - "tm:poisonfang", - "tm:poisonpowder", "tm:pounce", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicnoise", - "tm:quiverdance", - "tm:ragepowder", "tm:rest", "tm:roost", "tm:screech", @@ -155,19 +146,15 @@ "tm:silverwind", "tm:skillswap", "tm:skittersmack", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:solarbeam", "tm:stringshot", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -178,7 +165,30 @@ "tm:venomdrench", "tm:venoshock", "tm:whirlwind", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:leechlife", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stringshot", + "tutor:swift", + "tutor:twister", + "tutor:zenheadbutt" ], "preEvolution": "venonat", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venonat.json b/common/src/main/resources/data/cobblemon/species/generation1/venonat.json index eecb91c62e..555c6fdb1b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venonat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venonat.json @@ -98,47 +98,36 @@ "tm:bugbite", "tm:bugbuzz", "tm:confuseray", - "tm:confusion", - "tm:disable", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:foresight", "tm:gigadrain", "tm:infestation", "tm:leechlife", "tm:lunge", "tm:megadrain", - "tm:morningsun", "tm:nightshade", - "tm:poisonfang", - "tm:poisonpowder", "tm:pounce", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicnoise", - "tm:ragepowder", "tm:rest", "tm:screech", "tm:secretpower", "tm:signalbeam", "tm:skillswap", "tm:skittersmack", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", "tm:stringshot", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -146,7 +135,23 @@ "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bugbite", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:leechlife", + "tutor:psychic", + "tutor:rest", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stringshot", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json index 3b2c7f12d1..760069aacf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/venusaur.json @@ -124,27 +124,19 @@ "tm:gigaimpact", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", - "tm:growth", "tm:headbutt", "tm:helpinghand", "tm:hyperbeam", - "tm:ingrain", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:poisonjab", - "tm:poisonpowder", "tm:powerwhip", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:roar", "tm:rockclimb", @@ -152,10 +144,7 @@ "tm:safeguard", "tm:scaryface", "tm:seedbomb", - "tm:skullbash", - "tm:sleeppowder", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:solarbeam", "tm:stompingtantrum", @@ -163,20 +152,44 @@ "tm:stringshot", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:terrainpulse", "tm:toxic", "tm:trailblaze", "tm:venoshock", - "tm:vinewhip", "tm:weatherball", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:energyball", + "tutor:falseswipe", + "tutor:frenzyplant", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stompingtantrum", + "tutor:stringshot", + "tutor:synthesis", + "tutor:terrainpulse", + "tutor:worryseed" ], "preEvolution": "ivysaur", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json b/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json index 88e3b137f7..3a82a91921 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json @@ -104,14 +104,11 @@ "egg:tickle", "egg:worryseed", "egg:wringout", - "tm:acid", "tm:acidspray", - "tm:belch", "tm:bind", "tm:bodyslam", "tm:bugbite", "tm:bulletseed", - "tm:clearsmog", "tm:cut", "tm:encore", "tm:endure", @@ -124,58 +121,61 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:hyperbeam", "tm:infestation", - "tm:ingrain", "tm:knockoff", "tm:leafblade", "tm:leafstorm", - "tm:leaftornado", "tm:leechlife", "tm:lunge", "tm:magicalleaf", "tm:naturalgift", "tm:naturepower", "tm:poisonjab", - "tm:poisonpowder", "tm:pounce", "tm:powerwhip", "tm:protect", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:scaryface", "tm:seedbomb", - "tm:slam", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:solarbeam", - "tm:spitup", - "tm:stockpile", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:swallow", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", "tm:terablast", "tm:thief", - "tm:tickle", "tm:toxic", "tm:trailblaze", "tm:venoshock", - "tm:vinewhip", "tm:weatherball", "tm:worryseed", - "tm:wrap", - "tm:wringout" + "tutor:bind", + "tutor:bugbite", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:leechlife", + "tutor:magicalleaf", + "tutor:poisonjab", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "weepinbell", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json b/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json index 9e8c0ad94d..76b36c6196 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vileplume.json @@ -101,11 +101,8 @@ "egg:synthesis", "egg:teeterdance", "egg:tickle", - "tm:absorb", - "tm:acid", "tm:acidspray", "tm:afteryou", - "tm:aromatherapy", "tm:bodyslam", "tm:bulletseed", "tm:charm", @@ -115,7 +112,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:fling", "tm:gastroacid", @@ -124,51 +120,52 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:hyperbeam", "tm:infestation", - "tm:ingrain", "tm:leafstorm", - "tm:leechseed", - "tm:luckychant", "tm:magicalleaf", - "tm:megadrain", - "tm:moonblast", - "tm:moonlight", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:secretpower", "tm:seedbomb", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:solarbeam", "tm:solarblade", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:teeterdance", "tm:terablast", - "tm:tickle", "tm:toxic", "tm:trailblaze", "tm:venoshock", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:corrosivegas", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "gloom", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json b/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json index a76de10f75..569d73690b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/voltorb.json @@ -94,7 +94,6 @@ "tm:assurance", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:doubleedge", "tm:eerieimpulse", "tm:electricterrain", @@ -112,7 +111,6 @@ "tm:magiccoat", "tm:magnetrise", "tm:metalsound", - "tm:mirrorcoat", "tm:protect", "tm:raindance", "tm:recycle", @@ -124,24 +122,38 @@ "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", - "tm:sonicboom", - "tm:spark", "tm:steelroller", "tm:substitute", "tm:suckerpunch", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:torment", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelroller", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge" ], "evolutions": [ { @@ -218,7 +230,6 @@ "tm:bulletseed", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:doubleedge", "tm:electricterrain", "tm:electroball", @@ -235,7 +246,6 @@ "tm:gyroball", "tm:iceball", "tm:leafstorm", - "tm:leechseed", "tm:protect", "tm:raindance", "tm:recycle", @@ -247,21 +257,34 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:solarbeam", - "tm:stunspore", "tm:substitute", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tm:worryseed" + "tm:worryseed", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:iceball", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json index fb448c7de2..037cd7a2f9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/vulpix.json @@ -115,36 +115,24 @@ "tm:covet", "tm:darkpulse", "tm:dig", - "tm:disable", "tm:doubleedge", - "tm:ember", "tm:encore", "tm:endure", "tm:energyball", - "tm:extrasensory", "tm:facade", - "tm:feintattack", "tm:fireblast", "tm:firespin", - "tm:flail", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", "tm:foulplay", - "tm:grudge", "tm:headbutt", - "tm:healingwish", "tm:heatwave", "tm:helpinghand", "tm:hex", - "tm:howl", - "tm:hypnosis", "tm:imprison", "tm:incinerate", - "tm:inferno", "tm:irontail", - "tm:memento", "tm:mysticalfire", "tm:nastyplot", "tm:ominouswind", @@ -154,7 +142,6 @@ "tm:powerswap", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:rest", "tm:roar", "tm:roleplay", @@ -167,12 +154,31 @@ "tm:sunnyday", "tm:swift", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:weatherball", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:burningjealousy", + "tutor:covet", + "tutor:darkpulse", + "tutor:energyball", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:rest", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [ { @@ -253,7 +259,6 @@ "egg:secretpower", "egg:sheercold", "tm:agility", - "tm:aurorabeam", "tm:auroraveil", "tm:babydolleyes", "tm:batonpass", @@ -267,41 +272,29 @@ "tm:darkpulse", "tm:dazzlinggleam", "tm:dig", - "tm:disable", "tm:disarmingvoice", "tm:doubleedge", "tm:drainingkiss", "tm:encore", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:faketears", - "tm:feintattack", - "tm:flail", "tm:foulplay", - "tm:freezedry", "tm:frostbreath", - "tm:grudge", "tm:hail", "tm:healbell", "tm:helpinghand", "tm:hex", - "tm:howl", - "tm:hypnosis", "tm:icebeam", - "tm:iceshard", "tm:iciclespear", "tm:icywind", "tm:imprison", "tm:irontail", - "tm:mist", "tm:mistyterrain", - "tm:moonblast", "tm:nastyplot", "tm:painsplit", "tm:payback", "tm:playrough", - "tm:powdersnow", "tm:powerswap", "tm:protect", "tm:psychup", @@ -311,7 +304,6 @@ "tm:roleplay", "tm:safeguard", "tm:secretpower", - "tm:sheercold", "tm:sleeptalk", "tm:snowscape", "tm:spite", @@ -319,11 +311,28 @@ "tm:substitute", "tm:swift", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:weatherball", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:covet", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:foulplay", + "tutor:healbell", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:painsplit", + "tutor:playrough", + "tutor:rest", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json b/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json index 514ee73aa8..f36792b348 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/wartortle.json @@ -108,27 +108,20 @@ "egg:waterspout", "egg:wavecrash", "egg:yawn", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:brine", - "tm:bubble", "tm:chillingwater", "tm:dig", "tm:dive", "tm:doubleedge", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:flail", "tm:fling", "tm:flipturn", "tm:focuspunch", - "tm:foresight", "tm:gyroball", "tm:hail", "tm:haze", @@ -141,44 +134,47 @@ "tm:icywind", "tm:irondefense", "tm:irontail", - "tm:lifedew", "tm:liquidation", "tm:megakick", "tm:megapunch", - "tm:mirrorcoat", - "tm:mist", "tm:muddywater", "tm:mudshot", - "tm:mudsport", "tm:poweruppunch", "tm:protect", "tm:raindance", - "tm:rapidspin", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:rollout", - "tm:shellsmash", - "tm:skullbash", "tm:sleeptalk", "tm:strength", "tm:substitute", "tm:surf", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:waterspout", - "tm:wavecrash", "tm:weatherball", "tm:whirlpool", - "tm:withdraw", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:dive", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:liquidation", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "squirtle", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weedle.json b/common/src/main/resources/data/cobblemon/species/generation1/weedle.json index ff6079143f..e6f9a726b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weedle.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weedle.json @@ -79,10 +79,13 @@ "9:bugbite", "tm:bugbite", "tm:electroweb", - "tm:poisonsting", "tm:skittersmack", "tm:stringshot", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:electroweb", + "tutor:skittersmack", + "tutor:stringshot" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json b/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json index 7f2237c2c8..551636193b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weepinbell.json @@ -97,14 +97,11 @@ "egg:tickle", "egg:worryseed", "egg:wringout", - "tm:acid", "tm:acidspray", - "tm:belch", "tm:bind", "tm:bodyslam", "tm:bugbite", "tm:bulletseed", - "tm:clearsmog", "tm:cut", "tm:encore", "tm:endure", @@ -116,9 +113,7 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:infestation", - "tm:ingrain", "tm:knockoff", "tm:leafstorm", "tm:leechlife", @@ -127,40 +122,47 @@ "tm:naturalgift", "tm:naturepower", "tm:poisonjab", - "tm:poisonpowder", "tm:pounce", "tm:powerwhip", "tm:protect", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:seedbomb", - "tm:slam", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:solarbeam", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", "tm:terablast", "tm:thief", - "tm:tickle", "tm:toxic", "tm:trailblaze", "tm:venoshock", - "tm:vinewhip", "tm:weatherball", "tm:worryseed", - "tm:wrap", - "tm:wringout" + "tutor:bind", + "tutor:bugbite", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:knockoff", + "tutor:leechlife", + "tutor:magicalleaf", + "tutor:poisonjab", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "bellsprout", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json index 0fe1539dca..c1c57c80cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/weezing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/weezing.json @@ -96,14 +96,10 @@ "egg:swallow", "tm:acidspray", "tm:assurance", - "tm:belch", "tm:bodyslam", - "tm:clearsmog", "tm:corrosivegas", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:doublehit", "tm:endure", "tm:explosion", "tm:facade", @@ -111,7 +107,6 @@ "tm:flamethrower", "tm:flash", "tm:gigaimpact", - "tm:grudge", "tm:gunkshot", "tm:gyroball", "tm:haze", @@ -119,13 +114,10 @@ "tm:hyperbeam", "tm:incinerate", "tm:infestation", - "tm:memento", "tm:painsplit", "tm:payback", - "tm:poisongas", "tm:protect", "tm:psybeam", - "tm:psywave", "tm:raindance", "tm:rest", "tm:rollout", @@ -135,18 +127,11 @@ "tm:shadowball", "tm:shockwave", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", - "tm:smokescreen", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:substitute", "tm:sunnyday", - "tm:swallow", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -158,7 +143,24 @@ "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:willowisp" + "tm:willowisp", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:painsplit", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:thunderbolt" ], "preEvolution": "koffing", "evolutions": [], @@ -235,45 +237,34 @@ "egg:stockpile", "egg:swallow", "tm:acidspray", - "tm:aromatherapy", - "tm:aromaticmist", "tm:assurance", - "tm:belch", "tm:bodyslam", "tm:brutalswing", - "tm:clearsmog", "tm:corrosivegas", "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", "tm:defog", - "tm:destinybond", "tm:doubleedge", - "tm:doublehit", "tm:endure", "tm:explosion", "tm:facade", - "tm:fairywind", "tm:fireblast", "tm:flamethrower", "tm:gigaimpact", - "tm:grudge", "tm:gunkshot", "tm:gyroball", "tm:haze", "tm:heatwave", "tm:hyperbeam", - "tm:memento", "tm:mistyexplosion", "tm:mistyterrain", "tm:overheat", "tm:painsplit", "tm:payback", "tm:playrough", - "tm:poisongas", "tm:protect", "tm:psybeam", - "tm:psywave", "tm:raindance", "tm:rest", "tm:scaryface", @@ -281,19 +272,11 @@ "tm:selfdestruct", "tm:shadowball", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", - "tm:smokescreen", "tm:spite", - "tm:spitup", - "tm:stockpile", - "tm:strangesteam", "tm:substitute", "tm:sunnyday", - "tm:swallow", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -305,7 +288,27 @@ "tm:venomdrench", "tm:venoshock", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:mistyexplosion", + "tutor:painsplit", + "tutor:playrough", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:thunderbolt", + "tutor:wonderroom" ], "preEvolution": "koffing", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json b/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json index fc8d736335..436082b750 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/wigglytuff.json @@ -121,16 +121,12 @@ "tm:captivate", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:darkpulse", "tm:dazzlinggleam", - "tm:defensecurl", "tm:dig", - "tm:disable", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleslap", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -142,7 +138,6 @@ "tm:expandingforce", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:fireblast", "tm:firepunch", "tm:flamethrower", @@ -156,7 +151,6 @@ "tm:gyroball", "tm:headbutt", "tm:healbell", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", @@ -175,23 +169,17 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mimic", "tm:mistyexplosion", "tm:mistyterrain", "tm:nastyplot", "tm:painsplit", - "tm:perishsong", - "tm:playnice", "tm:playrough", - "tm:pound", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:psychic", "tm:psychicnoise", "tm:psychup", "tm:psyshock", - "tm:punishment", "tm:raindance", "tm:recycle", "tm:reflect", @@ -206,21 +194,16 @@ "tm:selfdestruct", "tm:shadowball", "tm:shockwave", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", "tm:steelroller", - "tm:stockpile", "tm:storedpower", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swallow", - "tm:sweetkiss", "tm:swift", "tm:takedown", "tm:taunt", @@ -234,12 +217,61 @@ "tm:trailblaze", "tm:triattack", "tm:uproar", - "tm:wakeupslap", "tm:waterpulse", "tm:wildcharge", - "tm:wish", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bounce", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mistyexplosion", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "jigglypuff", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json b/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json index ba5b813a61..6e86683c5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/zapdos.json @@ -101,9 +101,6 @@ "tm:bravebird", "tm:charge", "tm:defog", - "tm:detect", - "tm:discharge", - "tm:drillpeck", "tm:dualwingbeat", "tm:eerieimpulse", "tm:electricterrain", @@ -120,10 +117,8 @@ "tm:hyperbeam", "tm:laserfocus", "tm:lightscreen", - "tm:magneticflux", "tm:metalsound", "tm:ominouswind", - "tm:peck", "tm:pluck", "tm:protect", "tm:raindance", @@ -147,14 +142,36 @@ "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:twister", "tm:uturn", "tm:voltswitch", "tm:weatherball", "tm:wildcharge", - "tm:zapcannon" + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:roost", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:twister", + "tutor:wildcharge" ], "evolutions": [], "forms": [ @@ -241,10 +258,7 @@ "tm:bulkup", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:detect", "tm:doubleedge", - "tm:drillpeck", "tm:dualwingbeat", "tm:endeavor", "tm:endure", @@ -261,10 +275,8 @@ "tm:lowsweep", "tm:megakick", "tm:payback", - "tm:peck", "tm:pluck", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -286,9 +298,29 @@ "tm:taunt", "tm:terablast", "tm:throatchop", - "tm:thunderouskick", "tm:trailblaze", - "tm:uturn" + "tm:uturn", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bounce", + "tutor:bulkup", + "tutor:coaching", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:lowkick", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation1/zubat.json b/common/src/main/resources/data/cobblemon/species/generation1/zubat.json index 882d664fd4..77ab8344f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/zubat.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/zubat.json @@ -104,15 +104,12 @@ "egg:quickattack", "egg:whirlwind", "egg:wingattack", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:agility", "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:astonish", - "tm:bite", "tm:bravebird", "tm:confuseray", "tm:crunch", @@ -121,24 +118,16 @@ "tm:dualwingbeat", "tm:endure", "tm:facade", - "tm:feintattack", "tm:fly", "tm:gigadrain", - "tm:gust", "tm:haze", "tm:heatwave", - "tm:hypnosis", "tm:leechlife", - "tm:meanlook", "tm:nastyplot", "tm:ominouswind", "tm:payback", "tm:pluck", - "tm:poisonfang", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:roost", @@ -150,7 +139,6 @@ "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:supersonic", "tm:swift", "tm:tailwind", "tm:taunt", @@ -162,9 +150,27 @@ "tm:uturn", "tm:venomdrench", "tm:venoshock", - "tm:whirlwind", - "tm:wingattack", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigadrain", + "tutor:heatwave", + "tutor:leechlife", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:superfang", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/aipom.json b/common/src/main/resources/data/cobblemon/species/generation2/aipom.json index dbf609c02a..19671ce209 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/aipom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/aipom.json @@ -99,31 +99,25 @@ "tm:aerialace", "tm:agility", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:beatup", "tm:bounce", "tm:brickbreak", "tm:brutalswing", "tm:chillingwater", - "tm:counter", "tm:covet", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:doublehit", - "tm:doubleslap", "tm:dreameater", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:firepunch", "tm:fling", "tm:focuspunch", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", "tm:grassknot", "tm:gunkshot", "tm:headbutt", @@ -138,29 +132,23 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:nastyplot", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", "tm:revenge", "tm:rocksmash", "tm:roleplay", - "tm:sandattack", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:snatch", @@ -170,9 +158,7 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -182,12 +168,42 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", "tm:upperhand", "tm:uturn", "tm:waterpulse", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bounce", + "tutor:covet", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json index a2ebb06ee5..169d856ebe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ampharos.json @@ -112,11 +112,8 @@ "tm:charge", "tm:chargebeam", "tm:confuseray", - "tm:cottonguard", - "tm:cottonspore", "tm:dazzlinggleam", "tm:dig", - "tm:discharge", "tm:doubleedge", "tm:dragoncheer", "tm:dragonpulse", @@ -131,28 +128,23 @@ "tm:facade", "tm:firepunch", "tm:flash", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", - "tm:iondeluge", "tm:irontail", "tm:laserfocus", "tm:lightscreen", "tm:lowkick", - "tm:magneticflux", "tm:magnetrise", "tm:megakick", "tm:megapunch", "tm:meteorbeam", - "tm:odorsleuth", "tm:outrage", "tm:powergem", "tm:poweruppunch", @@ -165,7 +157,6 @@ "tm:rockclimb", "tm:rocksmash", "tm:safeguard", - "tm:sandattack", "tm:screech", "tm:shockwave", "tm:signalbeam", @@ -176,18 +167,46 @@ "tm:sunnyday", "tm:supercellslam", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:afteryou", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:dragonpulse", + "tutor:electroweb", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "preEvolution": "flaaffy", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json index a4c3118c3f..d70eb89527 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ariados.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ariados.json @@ -102,7 +102,6 @@ "egg:ragepowder", "egg:sonicboom", "egg:twineedle", - "tm:absorb", "tm:acidspray", "tm:agility", "tm:assurance", @@ -110,18 +109,14 @@ "tm:bounce", "tm:bugbite", "tm:bugbuzz", - "tm:constrict", "tm:crosspoison", "tm:dig", - "tm:disable", "tm:electroweb", "tm:endure", "tm:facade", - "tm:fellstinger", "tm:flash", "tm:focusenergy", "tm:foulplay", - "tm:furyswipes", "tm:gigadrain", "tm:gigaimpact", "tm:hex", @@ -133,19 +128,14 @@ "tm:lunge", "tm:megahorn", "tm:nightshade", - "tm:nightslash", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:pounce", "tm:protect", "tm:psychic", - "tm:pursuit", - "tm:ragepowder", "tm:rest", "tm:scaryface", "tm:screech", - "tm:shadowsneak", "tm:signalbeam", "tm:skittersmack", "tm:sleeptalk", @@ -153,10 +143,7 @@ "tm:sludgewave", "tm:smartstrike", "tm:solarbeam", - "tm:sonicboom", - "tm:spiderweb", "tm:spite", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -168,12 +155,34 @@ "tm:throatchop", "tm:toxic", "tm:toxicspikes", - "tm:toxicthread", "tm:trailblaze", - "tm:twineedle", "tm:venomdrench", "tm:venoshock", - "tm:xscissor" + "tm:xscissor", + "tutor:bounce", + "tutor:bugbite", + "tutor:electroweb", + "tutor:focusenergy", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:leechlife", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:xscissor" ], "preEvolution": "spinarak", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json index 836b37bcc9..0831d1848c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json @@ -103,24 +103,16 @@ "egg:watersport", "tm:alluringvoice", "tm:amnesia", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:bounce", "tm:brickbreak", "tm:brutalswing", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", - "tm:camouflage", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", - "tm:defensecurl", "tm:dig", "tm:disarmingvoice", "tm:dive", @@ -157,41 +149,55 @@ "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:perishsong", "tm:playrough", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:rollout", - "tm:sing", - "tm:slam", "tm:sleeptalk", "tm:snowscape", - "tm:soak", - "tm:splash", "tm:steelroller", "tm:strength", "tm:substitute", "tm:superpower", - "tm:supersonic", "tm:surf", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:trailblaze", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:covet", + "tutor:dive", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:mistyexplosion", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:steelroller", + "tutor:superpower", + "tutor:swift", + "tutor:waterpulse" ], "preEvolution": "marill", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json b/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json index 7ade9d846e..688e7f18d4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bayleef.json @@ -96,11 +96,9 @@ "egg:vinewhip", "egg:wringout", "tm:ancientpower", - "tm:aromatherapy", "tm:bodyslam", "tm:bulletseed", "tm:charm", - "tm:counter", "tm:curse", "tm:cut", "tm:doubleedge", @@ -110,36 +108,27 @@ "tm:energyball", "tm:facade", "tm:faketears", - "tm:flail", "tm:flash", "tm:furycutter", "tm:gigadrain", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", - "tm:ingrain", "tm:irontail", "tm:knockoff", "tm:laserfocus", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", "tm:magiccoat", "tm:mudslap", "tm:naturalgift", "tm:naturepower", - "tm:poisonpowder", "tm:protect", - "tm:razorleaf", "tm:reflect", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:safeguard", @@ -151,17 +140,33 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:trailblaze", - "tm:vinewhip", "tm:workup", "tm:worryseed", - "tm:wringout" + "tutor:ancientpower", + "tutor:energyball", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "chikorita", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json index dcd3ffca02..5de348168f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json @@ -95,8 +95,6 @@ "egg:synthesis", "egg:teeterdance", "egg:tickle", - "tm:absorb", - "tm:acid", "tm:acidspray", "tm:afteryou", "tm:batonpass", @@ -110,7 +108,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:fling", "tm:gastroacid", @@ -119,56 +116,61 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:hyperbeam", "tm:infestation", - "tm:ingrain", "tm:laserfocus", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", - "tm:luckychant", "tm:magicalleaf", - "tm:megadrain", - "tm:moonblast", - "tm:moonlight", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:playrough", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:quiverdance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:secretpower", "tm:seedbomb", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", "tm:solarblade", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:teeterdance", "tm:terablast", - "tm:tickle", "tm:toxic", "tm:trailblaze", "tm:tripleaxel", "tm:uproar", "tm:venoshock", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:worryseed" ], "preEvolution": "gloom", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json index eafbc51738..750a6e021c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/blissey.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/blissey.json @@ -108,10 +108,8 @@ "egg:seismictoss", "tm:alluringvoice", "tm:allyswitch", - "tm:aromatherapy", "tm:avalanche", "tm:babydolleyes", - "tm:bestow", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -120,19 +118,14 @@ "tm:calmmind", "tm:charm", "tm:chillingwater", - "tm:copycat", - "tm:counter", "tm:covet", "tm:dazzlinggleam", - "tm:defensecurl", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleslap", "tm:drainpunch", "tm:dreameater", "tm:earthquake", "tm:echoedvoice", - "tm:eggbomb", "tm:electricterrain", "tm:endeavor", "tm:endure", @@ -147,12 +140,9 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:hail", "tm:headbutt", "tm:healbell", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", @@ -163,24 +153,18 @@ "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:lifedew", "tm:lightscreen", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:minimize", - "tm:mudbomb", "tm:naturalgift", - "tm:pound", "tm:powershift", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", "tm:recycle", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:rockclimb", @@ -190,15 +174,12 @@ "tm:rollout", "tm:safeguard", "tm:sandstorm", - "tm:seismictoss", "tm:shadowball", "tm:shockwave", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:snatch", "tm:snowscape", - "tm:softboiled", "tm:solarbeam", "tm:stealthrock", "tm:stompingtantrum", @@ -206,9 +187,7 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -223,7 +202,53 @@ "tm:waterpulse", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:babydolleyes", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:powershift", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "chansey", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/celebi.json b/common/src/main/resources/data/cobblemon/species/generation2/celebi.json index aef1a07eba..0c9f826b72 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/celebi.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/celebi.json @@ -78,7 +78,6 @@ "tm:batonpass", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cut", "tm:dazzlinggleam", "tm:dreameater", @@ -98,8 +97,6 @@ "tm:grassyglide", "tm:grassyterrain", "tm:healbell", - "tm:healblock", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", "tm:imprison", @@ -107,8 +104,6 @@ "tm:lastresort", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", - "tm:lifedew", "tm:lightscreen", "tm:magicalleaf", "tm:magiccoat", @@ -118,7 +113,6 @@ "tm:nastyplot", "tm:naturalgift", "tm:naturepower", - "tm:perishsong", "tm:pollenpuff", "tm:protect", "tm:psychic", @@ -126,7 +120,6 @@ "tm:psychocut", "tm:psychup", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:safeguard", @@ -158,7 +151,50 @@ "tm:weatherball", "tm:wonderroom", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:block", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:telekinesis", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json b/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json index 2db9290f05..6fa82604f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/chikorita.json @@ -97,11 +97,9 @@ "egg:vinewhip", "egg:wringout", "tm:ancientpower", - "tm:aromatherapy", "tm:bodyslam", "tm:bulletseed", "tm:charm", - "tm:counter", "tm:curse", "tm:cut", "tm:doubleedge", @@ -111,34 +109,25 @@ "tm:energyball", "tm:facade", "tm:faketears", - "tm:flail", "tm:flash", "tm:furycutter", "tm:gigadrain", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", - "tm:ingrain", "tm:irontail", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", "tm:magiccoat", "tm:mudslap", "tm:naturalgift", "tm:naturepower", - "tm:poisonpowder", "tm:protect", - "tm:razorleaf", "tm:reflect", - "tm:refresh", "tm:rest", "tm:safeguard", "tm:seedbomb", @@ -147,17 +136,29 @@ "tm:solarblade", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:trailblaze", - "tm:vinewhip", "tm:workup", "tm:worryseed", - "tm:wringout" + "tutor:ancientpower", + "tutor:energyball", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:irontail", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json index 61dddd722c..c50de723ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/chinchou.json @@ -108,19 +108,15 @@ "egg:waterpulse", "tm:agility", "tm:amnesia", - "tm:aquaring", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:charge", "tm:chargebeam", "tm:chillingwater", "tm:confuseray", "tm:curse", "tm:dazzlinggleam", - "tm:discharge", "tm:dive", "tm:doubleedge", "tm:eerieimpulse", @@ -129,7 +125,6 @@ "tm:electroweb", "tm:endure", "tm:facade", - "tm:flail", "tm:flash", "tm:flipturn", "tm:hail", @@ -137,9 +132,7 @@ "tm:hydropump", "tm:icebeam", "tm:icywind", - "tm:iondeluge", "tm:liquidation", - "tm:mist", "tm:muddywater", "tm:protect", "tm:psybeam", @@ -151,11 +144,8 @@ "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", - "tm:soak", - "tm:spark", "tm:substitute", "tm:suckerpunch", - "tm:supersonic", "tm:surf", "tm:takedown", "tm:terablast", @@ -164,10 +154,28 @@ "tm:thunderwave", "tm:voltswitch", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:wildcharge" + "tm:wildcharge", + "tutor:bounce", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:electroweb", + "tutor:flipturn", + "tutor:healbell", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json index 8357cb1f60..3b2ac583b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cleffa.json @@ -86,14 +86,11 @@ "tm:afteryou", "tm:alluringvoice", "tm:amnesia", - "tm:aromatherapy", "tm:babydolleyes", - "tm:bellydrum", "tm:bodyslam", "tm:calmmind", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:dazzlinggleam", "tm:dig", @@ -113,7 +110,6 @@ "tm:grassknot", "tm:gravity", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hypervoice", "tm:icywind", @@ -126,11 +122,8 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mimic", "tm:mistyterrain", "tm:playrough", - "tm:pound", - "tm:present", "tm:protect", "tm:psybeam", "tm:psychic", @@ -145,26 +138,53 @@ "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:sing", "tm:sleeptalk", "tm:solarbeam", - "tm:splash", "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:telekinesis", "tm:terablast", "tm:thunderwave", - "tm:tickle", "tm:trick", "tm:uproar", "tm:waterpulse", - "tm:wish", "tm:wonderroom", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json b/common/src/main/resources/data/cobblemon/species/generation2/corsola.json index 885a572699..89fc344f0b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/corsola.json @@ -104,17 +104,11 @@ "egg:waterpulse", "tm:amnesia", "tm:ancientpower", - "tm:aquaring", - "tm:barrier", - "tm:bide", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", "tm:calmmind", - "tm:camouflage", "tm:confuseray", "tm:curse", "tm:dig", @@ -124,34 +118,24 @@ "tm:endure", "tm:explosion", "tm:facade", - "tm:flail", "tm:hail", - "tm:harden", "tm:headbutt", - "tm:headsmash", "tm:hydropump", "tm:icebeam", "tm:iciclespear", "tm:icywind", - "tm:ingrain", "tm:irondefense", - "tm:lifedew", "tm:lightscreen", "tm:liquidation", - "tm:luckychant", "tm:magiccoat", "tm:meteorbeam", - "tm:mirrorcoat", - "tm:mist", "tm:mudslap", "tm:naturepower", "tm:powergem", "tm:protect", "tm:psychic", "tm:raindance", - "tm:recover", "tm:reflect", - "tm:refresh", "tm:rest", "tm:rockblast", "tm:rockpolish", @@ -166,7 +150,6 @@ "tm:selfdestruct", "tm:shadowball", "tm:sleeptalk", - "tm:spikecannon", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -175,12 +158,35 @@ "tm:suckerpunch", "tm:sunnyday", "tm:surf", - "tm:tackle", "tm:terablast", "tm:throatchop", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:earthpower", + "tutor:endeavor", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:waterpulse" ], "evolutions": [], "forms": [ @@ -261,7 +267,6 @@ "egg:waterpulse", "tm:amnesia", "tm:ancientpower", - "tm:astonish", "tm:blizzard", "tm:bodyslam", "tm:brine", @@ -269,19 +274,14 @@ "tm:calmmind", "tm:confuseray", "tm:curse", - "tm:destinybond", "tm:dig", - "tm:disable", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:facade", "tm:gigadrain", - "tm:grudge", "tm:hail", - "tm:harden", "tm:haze", - "tm:headsmash", "tm:hex", "tm:hydropump", "tm:icebeam", @@ -291,7 +291,6 @@ "tm:lightscreen", "tm:liquidation", "tm:meteorbeam", - "tm:mirrorcoat", "tm:naturepower", "tm:nightshade", "tm:powergem", @@ -314,16 +313,35 @@ "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", - "tm:strengthsap", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:tackle", "tm:terablast", "tm:throatchop", "tm:waterpulse", "tm:whirlpool", - "tm:willowisp" + "tm:willowisp", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:earthpower", + "tutor:gigadrain", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:liquidation", + "tutor:meteorbeam", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:throatchop", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/crobat.json b/common/src/main/resources/data/cobblemon/species/generation2/crobat.json index bd2016ffe4..2f54722ba7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/crobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/crobat.json @@ -107,15 +107,12 @@ "egg:quickattack", "egg:whirlwind", "egg:wingattack", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:agility", "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:astonish", - "tm:bite", "tm:bravebird", "tm:confuseray", "tm:crosspoison", @@ -126,28 +123,20 @@ "tm:dualwingbeat", "tm:endure", "tm:facade", - "tm:feintattack", "tm:fly", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:haze", "tm:heatwave", "tm:hex", "tm:hurricane", "tm:hyperbeam", - "tm:hypnosis", "tm:leechlife", - "tm:meanlook", "tm:nastyplot", "tm:ominouswind", "tm:payback", "tm:pluck", - "tm:poisonfang", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:roost", @@ -161,7 +150,6 @@ "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:supersonic", "tm:swift", "tm:tailwind", "tm:taunt", @@ -174,10 +162,33 @@ "tm:uturn", "tm:venomdrench", "tm:venoshock", - "tm:whirlwind", - "tm:wingattack", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:darkpulse", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:leechlife", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:superfang", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar", + "tutor:xscissor", + "tutor:zenheadbutt" ], "preEvolution": "golbat", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json b/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json index 72bb8d1fbf..5c7be45761 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/croconaw.json @@ -101,16 +101,12 @@ "egg:watersport", "tm:aerialace", "tm:ancientpower", - "tm:aquajet", "tm:aquatail", - "tm:bite", "tm:blizzard", "tm:block", "tm:breakingswipe", "tm:brickbreak", "tm:chillingwater", - "tm:chipaway", - "tm:counter", "tm:crunch", "tm:curse", "tm:cut", @@ -123,8 +119,6 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:flail", - "tm:flatter", "tm:fling", "tm:flipturn", "tm:focuspunch", @@ -138,7 +132,6 @@ "tm:icepunch", "tm:icywind", "tm:irontail", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:megakick", @@ -146,11 +139,9 @@ "tm:metalclaw", "tm:muddywater", "tm:mudslap", - "tm:mudsport", "tm:poweruppunch", "tm:protect", "tm:psychicfangs", - "tm:rage", "tm:raindance", "tm:rest", "tm:roar", @@ -158,10 +149,8 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:spite", "tm:strength", @@ -172,16 +161,41 @@ "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:trailblaze", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:superpower", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "totodile", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json index ab561d0a4e..99b47b794a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/cyndaquil.json @@ -106,60 +106,57 @@ "tm:burningjealousy", "tm:burnup", "tm:covet", - "tm:crushclaw", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:doublekick", - "tm:ember", "tm:endure", - "tm:eruption", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firefang", "tm:firepledge", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", - "tm:foresight", - "tm:furyswipes", "tm:headbutt", "tm:heatwave", - "tm:howl", "tm:incinerate", - "tm:inferno", "tm:ironhead", - "tm:lavaplume", - "tm:leer", "tm:naturepower", "tm:overheat", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:roar", "tm:rollout", "tm:sleeptalk", - "tm:smokescreen", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:burningjealousy", + "tutor:covet", + "tutor:firefang", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:ironhead", + "tutor:playrough", + "tutor:rest", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:swift", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/delibird.json b/common/src/main/resources/data/cobblemon/species/generation2/delibird.json index d7f104a015..3cac24f10b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/delibird.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/delibird.json @@ -100,11 +100,9 @@ "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:aurorabeam", "tm:auroraveil", "tm:avalanche", "tm:batonpass", - "tm:bestow", "tm:blizzard", "tm:bodyslam", "tm:bounce", @@ -112,22 +110,17 @@ "tm:brickbreak", "tm:brutalswing", "tm:chillingwater", - "tm:counter", "tm:defog", - "tm:destinybond", - "tm:drillpeck", "tm:drillrun", "tm:dualwingbeat", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:featherdance", "tm:fling", "tm:fly", "tm:focuspunch", "tm:foulplay", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", "tm:gunkshot", @@ -139,20 +132,15 @@ "tm:iceball", "tm:icebeam", "tm:icepunch", - "tm:iceshard", "tm:icespinner", "tm:iciclespear", "tm:icywind", "tm:megakick", "tm:megapunch", - "tm:memento", "tm:pluck", "tm:poweruppunch", - "tm:present", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:rapidspin", "tm:recycle", "tm:rest", "tm:reversal", @@ -163,7 +151,6 @@ "tm:sleeptalk", "tm:snowscape", "tm:spikes", - "tm:splash", "tm:steelwing", "tm:substitute", "tm:swift", @@ -174,7 +161,36 @@ "tm:trailblaze", "tm:tripleaxel", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bounce", + "tutor:defog", + "tutor:drillrun", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:swift", + "tutor:tailwind", + "tutor:tripleaxel", + "tutor:waterpulse" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/donphan.json b/common/src/main/resources/data/cobblemon/species/generation2/donphan.json index 4483990381..2c519c486a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/donphan.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/donphan.json @@ -118,9 +118,7 @@ "tm:brutalswing", "tm:bulldoze", "tm:charm", - "tm:counter", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", @@ -131,41 +129,31 @@ "tm:endure", "tm:facade", "tm:firefang", - "tm:fissure", - "tm:flail", "tm:focusenergy", - "tm:furyattack", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:gyroball", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", - "tm:hornattack", "tm:hyperbeam", "tm:hypervoice", "tm:icefang", - "tm:iceshard", "tm:icespinner", "tm:irondefense", "tm:ironhead", "tm:irontail", "tm:knockoff", "tm:lastresort", - "tm:magnitude", "tm:mudshot", "tm:mudslap", "tm:naturalgift", - "tm:odorsleuth", "tm:playrough", "tm:poisonjab", "tm:powerwhip", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:roar", "tm:rockpolish", @@ -177,7 +165,6 @@ "tm:sandtomb", "tm:scaryface", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:smartstrike", @@ -190,13 +177,49 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", "tm:throatchop", "tm:thunderfang", - "tm:trailblaze" + "tm:trailblaze", + "tutor:ancientpower", + "tutor:block", + "tutor:bounce", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderfang" ], "preEvolution": "phanpy", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json b/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json index efe8ccca30..11456fedf5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json @@ -93,23 +93,17 @@ "tm:amnesia", "tm:ancientpower", "tm:aquatail", - "tm:astonish", "tm:batonpass", - "tm:bide", "tm:bind", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:breakingswipe", "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:coil", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:dragonrush", "tm:dreameater", "tm:drillrun", "tm:earthpower", @@ -118,16 +112,13 @@ "tm:endure", "tm:facade", "tm:fireblast", - "tm:flail", "tm:flamethrower", "tm:gigaimpact", - "tm:glare", "tm:gyroball", "tm:headbutt", "tm:helpinghand", "tm:hex", "tm:hyperbeam", - "tm:hyperdrill", "tm:hypervoice", "tm:icebeam", "tm:icespinner", @@ -144,8 +135,6 @@ "tm:pounce", "tm:protect", "tm:psychup", - "tm:pursuit", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -181,11 +170,49 @@ "tm:thunder", "tm:thunderbolt", "tm:toxic", - "tm:trumpcard", "tm:uproar", "tm:wildcharge", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bind", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:drillrun", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:irontail", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snore", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/elekid.json b/common/src/main/resources/data/cobblemon/species/generation2/elekid.json index 83527946d6..17fdc8204c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/elekid.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/elekid.json @@ -101,52 +101,40 @@ "egg:karatechop", "egg:meditate", "egg:rollingkick", - "tm:barrier", "tm:bodyslam", "tm:brickbreak", "tm:charge", "tm:chargebeam", "tm:covet", - "tm:crosschop", - "tm:discharge", "tm:doubleedge", "tm:dualchop", - "tm:dynamicpunch", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:endure", "tm:facade", - "tm:feint", "tm:firepunch", "tm:flash", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:followme", - "tm:hammerarm", "tm:headbutt", "tm:helpinghand", "tm:icepunch", - "tm:karatechop", "tm:knockoff", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:magnetrise", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metalsound", "tm:poweruppunch", "tm:protect", "tm:psychic", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:rocksmash", - "tm:rollingkick", "tm:screech", "tm:shockwave", "tm:signalbeam", @@ -161,12 +149,33 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:uproar", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:covet", + "tutor:dualchop", + "tutor:electroweb", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/entei.json b/common/src/main/resources/data/cobblemon/species/generation2/entei.json index 5ae79a1cce..d943416bac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/entei.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/entei.json @@ -80,7 +80,6 @@ "72:fireblast", "78:eruption", "tm:agility", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:calmmind", @@ -88,18 +87,13 @@ "tm:cut", "tm:dig", "tm:doubleedge", - "tm:ember", "tm:endure", - "tm:eruption", - "tm:extrasensory", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:firefang", "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:flash", "tm:gigaimpact", @@ -111,8 +105,6 @@ "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:lavaplume", - "tm:leer", "tm:overheat", "tm:protect", "tm:quash", @@ -122,16 +114,13 @@ "tm:roar", "tm:rockclimb", "tm:rocksmash", - "tm:sacredfire", "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", "tm:shadowball", "tm:sleeptalk", - "tm:smokescreen", "tm:snarl", "tm:solarbeam", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -143,7 +132,27 @@ "tm:terablast", "tm:trailblaze", "tm:weatherball", - "tm:willowisp" + "tm:willowisp", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:rest", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json index 9b5563c89a..ab4099e430 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json @@ -101,22 +101,17 @@ "tm:allyswitch", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:calmmind", "tm:captivate", "tm:charm", "tm:confuseray", - "tm:confusion", - "tm:copycat", "tm:covet", "tm:curse", "tm:cut", "tm:dazzlinggleam", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:drainingkiss", "tm:dreameater", "tm:echoedvoice", @@ -124,14 +119,12 @@ "tm:expandingforce", "tm:facade", "tm:faketears", - "tm:flail", "tm:flash", "tm:focusenergy", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -145,7 +138,6 @@ "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:morningsun", "tm:mudslap", "tm:naturalgift", "tm:payday", @@ -159,14 +151,11 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", - "tm:sandattack", "tm:shadowball", "tm:signalbeam", "tm:skillswap", @@ -175,23 +164,46 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", "tm:trick", "tm:trickroom", - "tm:trumpcard", "tm:weatherball", - "tm:wish", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:expandingforce", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:zenheadbutt" ], "preEvolution": "eevee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json index c744e51b52..026cf66dbc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/feraligatr.json @@ -103,10 +103,8 @@ "tm:aerialace", "tm:agility", "tm:ancientpower", - "tm:aquajet", "tm:aquatail", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -115,8 +113,6 @@ "tm:brutalswing", "tm:bulldoze", "tm:chillingwater", - "tm:chipaway", - "tm:counter", "tm:crunch", "tm:curse", "tm:cut", @@ -131,8 +127,6 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:flail", - "tm:flatter", "tm:fling", "tm:flipturn", "tm:focusblast", @@ -152,7 +146,6 @@ "tm:icywind", "tm:irontail", "tm:lashout", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:megakick", @@ -160,12 +153,10 @@ "tm:metalclaw", "tm:muddywater", "tm:mudslap", - "tm:mudsport", "tm:outrage", "tm:poweruppunch", "tm:protect", "tm:psychicfangs", - "tm:rage", "tm:raindance", "tm:rest", "tm:roar", @@ -175,10 +166,8 @@ "tm:rocktomb", "tm:scaleshot", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:spite", @@ -191,16 +180,51 @@ "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:trailblaze", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:lashout", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "croconaw", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json index 4b9b98260f..c41238db83 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/flaaffy.json @@ -106,11 +106,8 @@ "tm:charge", "tm:chargebeam", "tm:confuseray", - "tm:cottonguard", - "tm:cottonspore", "tm:dazzlinggleam", "tm:dig", - "tm:discharge", "tm:doubleedge", "tm:echoedvoice", "tm:eerieimpulse", @@ -122,10 +119,8 @@ "tm:facade", "tm:firepunch", "tm:flash", - "tm:flatter", "tm:fling", "tm:focuspunch", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -136,7 +131,6 @@ "tm:magnetrise", "tm:megakick", "tm:megapunch", - "tm:odorsleuth", "tm:powergem", "tm:poweruppunch", "tm:protect", @@ -147,7 +141,6 @@ "tm:roar", "tm:rocksmash", "tm:safeguard", - "tm:sandattack", "tm:screech", "tm:shockwave", "tm:signalbeam", @@ -156,17 +149,38 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:afteryou", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:electroweb", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:healbell", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:irontail", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "preEvolution": "mareep", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json index 0b881e58ac..9506c79d61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/forretress.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/forretress.json @@ -106,15 +106,12 @@ "egg:swift", "egg:toxicspikes", "tm:allyswitch", - "tm:autotomize", - "tm:bide", "tm:block", "tm:bodypress", "tm:bodyslam", "tm:bugbite", "tm:bugbuzz", "tm:bulldoze", - "tm:counter", "tm:curse", "tm:dig", "tm:doubleedge", @@ -124,7 +121,6 @@ "tm:endure", "tm:explosion", "tm:facade", - "tm:flail", "tm:flashcannon", "tm:gigadrain", "tm:gigaimpact", @@ -143,17 +139,14 @@ "tm:lunge", "tm:magnetrise", "tm:metalsound", - "tm:mirrorshot", "tm:naturalgift", "tm:painsplit", "tm:payback", "tm:pinmissile", "tm:poisonjab", "tm:pounce", - "tm:powertrick", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:reflect", "tm:rest", "tm:revenge", @@ -183,7 +176,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -191,7 +183,40 @@ "tm:toxicspikes", "tm:venoshock", "tm:voltswitch", - "tm:zapcannon" + "tutor:allyswitch", + "tutor:block", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:drillrun", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stoneedge", + "tutor:stringshot", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick" ], "preEvolution": "pineco", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/furret.json b/common/src/main/resources/data/cobblemon/species/generation2/furret.json index dfe100d7dc..991771732a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/furret.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/furret.json @@ -92,7 +92,6 @@ "tm:agility", "tm:amnesia", "tm:aquatail", - "tm:assist", "tm:assurance", "tm:babydolleyes", "tm:batonpass", @@ -104,10 +103,8 @@ "tm:chargebeam", "tm:charm", "tm:chillingwater", - "tm:coil", "tm:covet", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:echoedvoice", @@ -120,10 +117,7 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:followme", - "tm:foresight", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:growl", @@ -137,26 +131,20 @@ "tm:irontail", "tm:knockoff", "tm:lastresort", - "tm:mefirst", "tm:naturalgift", "tm:playrough", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", "tm:reversal", "tm:rocksmash", "tm:rollout", - "tm:scratch", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slam", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:strength", @@ -173,14 +161,50 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:tidyup", "tm:trailblaze", "tm:trick", "tm:uproar", "tm:uturn", "tm:waterpulse", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:covet", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "sentret", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json b/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json index ef9a493477..6a4a1af3f9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json @@ -100,7 +100,6 @@ "tm:allyswitch", "tm:amnesia", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:beatup", "tm:bodyslam", @@ -108,12 +107,9 @@ "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:confusion", "tm:crunch", "tm:dazzlinggleam", "tm:doubleedge", - "tm:doublehit", - "tm:doublekick", "tm:dreameater", "tm:earthquake", "tm:echoedvoice", @@ -123,13 +119,11 @@ "tm:expandingforce", "tm:facade", "tm:flash", - "tm:foresight", "tm:foulplay", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:guardswap", "tm:headbutt", "tm:helpinghand", @@ -141,10 +135,7 @@ "tm:lightscreen", "tm:lowkick", "tm:magiccoat", - "tm:meanlook", - "tm:mirrorcoat", "tm:nastyplot", - "tm:odorsleuth", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -155,7 +146,6 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:razorwind", "tm:recycle", "tm:reflect", "tm:rest", @@ -167,7 +157,6 @@ "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:stomp", "tm:stompingtantrum", "tm:storedpower", "tm:strength", @@ -175,7 +164,6 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -186,11 +174,44 @@ "tm:trailblaze", "tm:trick", "tm:trickroom", - "tm:twinbeam", "tm:uproar", - "tm:wish", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json index 15222dbd16..e58feadc17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/gligar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/gligar.json @@ -104,8 +104,6 @@ "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:counter", - "tm:crabhammer", "tm:crosspoison", "tm:crunch", "tm:cut", @@ -118,14 +116,11 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", - "tm:feintattack", "tm:firefang", "tm:fling", "tm:furycutter", "tm:guillotine", "tm:gunkshot", - "tm:harden", "tm:headbutt", "tm:highhorsepower", "tm:honeclaws", @@ -134,37 +129,28 @@ "tm:knockoff", "tm:lunge", "tm:metalclaw", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", - "tm:nightslash", "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", - "tm:powertrick", "tm:powerwhip", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", "tm:scaryface", "tm:screech", "tm:skittersmack", - "tm:skyuppercut", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:spikes", @@ -189,8 +175,42 @@ "tm:toxicspikes", "tm:uturn", "tm:venoshock", - "tm:wingattack", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:falseswipe", + "tutor:firefang", + "tutor:furycutter", + "tutor:gunkshot", + "tutor:highhorsepower", + "tutor:icefang", + "tutor:irontail", + "tutor:knockoff", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:trick", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json index efadd091b9..b8a0a4433c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/granbull.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json @@ -99,14 +99,12 @@ "egg:retaliate", "egg:smellingsalts", "egg:snore", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", "tm:closecombat", - "tm:counter", "tm:covet", "tm:crunch", "tm:curse", @@ -119,7 +117,6 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:fireblast", "tm:firefang", "tm:firepunch", @@ -128,7 +125,6 @@ "tm:focusblast", "tm:focuspunch", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -140,23 +136,19 @@ "tm:irontail", "tm:lashout", "tm:lastresort", - "tm:lick", "tm:lowkick", "tm:lowsweep", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mimic", "tm:mudslap", "tm:outrage", "tm:overheat", "tm:payback", "tm:playrough", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:psychicfangs", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -171,7 +163,6 @@ "tm:shockwave", "tm:sleeptalk", "tm:sludgebomb", - "tm:smellingsalts", "tm:snarl", "tm:snore", "tm:solarbeam", @@ -183,8 +174,6 @@ "tm:sunnyday", "tm:superfang", "tm:superpower", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:temperflare", @@ -200,7 +189,51 @@ "tm:uproar", "tm:waterpulse", "tm:wildcharge", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:icepunch", + "tutor:irontail", + "tutor:lashout", + "tutor:lastresort", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snore", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superfang", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wildcharge" ], "preEvolution": "snubbull", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/heracross.json b/common/src/main/resources/data/cobblemon/species/generation2/heracross.json index cf62e022bd..bbb15b7abd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/heracross.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/heracross.json @@ -93,9 +93,7 @@ "egg:pursuit", "egg:seismictoss", "tm:aerialace", - "tm:armthrust", "tm:assurance", - "tm:bide", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -104,10 +102,8 @@ "tm:bulkup", "tm:bulldoze", "tm:bulletseed", - "tm:chipaway", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:curse", "tm:cut", "tm:dig", @@ -117,31 +113,23 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", - "tm:flail", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:furyattack", "tm:furycutter", "tm:gigaimpact", - "tm:harden", "tm:headbutt", "tm:helpinghand", "tm:highhorsepower", - "tm:hornattack", "tm:hyperbeam", "tm:irondefense", "tm:knockoff", - "tm:leer", "tm:lowkick", "tm:lunge", "tm:megahorn", - "tm:nightslash", "tm:pinmissile", "tm:pounce", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -151,7 +139,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:seismictoss", "tm:shadowclaw", "tm:skittersmack", "tm:sleeptalk", @@ -164,16 +151,41 @@ "tm:substitute", "tm:sunnyday", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:trailblaze", "tm:upperhand", "tm:vacuumwave", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bugbite", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:knockoff", + "tutor:lowkick", + "tutor:megahorn", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stoneedge", + "tutor:throatchop", + "tutor:vacuumwave" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json index 76ed75d085..4a872efed0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json @@ -107,12 +107,9 @@ "tm:brutalswing", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:covet", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:drillrun", @@ -120,30 +117,20 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", "tm:focusblast", "tm:focusenergy", - "tm:foresight", "tm:gigaimpact", "tm:gyroball", "tm:headbutt", "tm:helpinghand", - "tm:highjumpkick", "tm:icespinner", "tm:laserfocus", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:megakick", "tm:megapunch", - "tm:mindreader", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:retaliate", "tm:revenge", @@ -151,7 +138,6 @@ "tm:rockslide", "tm:rocksmash", "tm:roleplay", - "tm:rollingkick", "tm:rollout", "tm:sandstorm", "tm:sleeptalk", @@ -161,18 +147,40 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", "tm:tripleaxel", - "tm:triplekick", "tm:twister", "tm:upperhand", "tm:uproar", "tm:vacuumwave", - "tm:wideguard", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:covet", + "tutor:drillrun", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:swift", + "tutor:tripleaxel", + "tutor:twister", + "tutor:uproar", + "tutor:vacuumwave" ], "preEvolution": "tyrogue", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hooh.json b/common/src/main/resources/data/cobblemon/species/generation2/hooh.json index e9c39d861b..2fb13933d5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hooh.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hooh.json @@ -85,7 +85,6 @@ "tm:ancientpower", "tm:bodyslam", "tm:bravebird", - "tm:burnup", "tm:calmmind", "tm:chargebeam", "tm:defog", @@ -96,7 +95,6 @@ "tm:earthquake", "tm:echoedvoice", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firespin", @@ -108,7 +106,6 @@ "tm:futuresight", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:heatwave", "tm:helpinghand", "tm:hurricane", @@ -118,7 +115,6 @@ "tm:incinerate", "tm:ironhead", "tm:laserfocus", - "tm:lifedew", "tm:lightscreen", "tm:mysticalfire", "tm:naturalgift", @@ -128,14 +124,11 @@ "tm:protect", "tm:psychic", "tm:psychup", - "tm:punishment", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:rocksmash", "tm:roost", - "tm:sacredfire", "tm:safeguard", "tm:sandstorm", "tm:scorchingsands", @@ -158,9 +151,42 @@ "tm:thunderbolt", "tm:twister", "tm:weatherball", - "tm:whirlwind", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:twister", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json index 853328bd07..82d1436a70 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hoothoot.json @@ -115,38 +115,27 @@ "tm:bravebird", "tm:calmmind", "tm:confuseray", - "tm:confusion", "tm:defog", "tm:dreameater", "tm:dualwingbeat", "tm:echoedvoice", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:featherdance", - "tm:feintattack", "tm:fly", - "tm:foresight", - "tm:growl", "tm:haze", "tm:heatwave", "tm:hurricane", "tm:hypervoice", - "tm:hypnosis", "tm:imprison", "tm:magiccoat", - "tm:meanlook", - "tm:mirrormove", - "tm:moonblast", "tm:nastyplot", "tm:nightshade", "tm:ominouswind", - "tm:peck", "tm:pluck", "tm:protect", "tm:psybeam", "tm:psychic", - "tm:psychoshift", "tm:psychup", "tm:raindance", "tm:recycle", @@ -164,20 +153,38 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", - "tm:synchronoise", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", "tm:twister", "tm:uproar", - "tm:whirlwind", - "tm:wingattack", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:calmmind", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:heatwave", + "tutor:hypervoice", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:skillswap", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json b/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json index 091c4b2241..74881d91e2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json @@ -87,24 +87,18 @@ "egg:strengthsap", "egg:switcheroo", "egg:worryseed", - "tm:absorb", "tm:acrobatics", "tm:aerialace", - "tm:aromatherapy", "tm:batonpass", "tm:bounce", "tm:bulletseed", "tm:charm", - "tm:confusion", - "tm:cottonguard", - "tm:cottonspore", "tm:dazzlinggleam", "tm:doubleedge", "tm:encore", "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", "tm:fling", "tm:gigadrain", @@ -114,42 +108,43 @@ "tm:helpinghand", "tm:infestation", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:lunge", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:payday", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:ragepowder", "tm:raindance", "tm:reflect", "tm:rest", "tm:seedbomb", "tm:silverwind", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", - "tm:splash", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:switcheroo", "tm:swordsdance", "tm:synthesis", - "tm:tackle", - "tm:tailwhip", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", "tm:uturn", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:bounce", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:tailwind", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json b/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json index b344a9e6c6..be104973a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json @@ -101,23 +101,16 @@ "egg:suckerpunch", "egg:thunderfang", "tm:beatup", - "tm:bite", "tm:bodyslam", "tm:burningjealousy", - "tm:comeuppance", - "tm:counter", "tm:crunch", "tm:darkpulse", - "tm:destinybond", "tm:doubleedge", "tm:dreameater", "tm:embargo", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", - "tm:feint", - "tm:feintattack", "tm:fireblast", "tm:firefang", "tm:firespin", @@ -129,27 +122,20 @@ "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:incinerate", - "tm:inferno", "tm:irontail", "tm:laserfocus", "tm:lashout", - "tm:leer", "tm:mudshot", "tm:mudslap", "tm:nastyplot", - "tm:odorsleuth", "tm:overheat", "tm:painsplit", "tm:payback", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -161,7 +147,6 @@ "tm:shadowball", "tm:sleeptalk", "tm:sludgebomb", - "tm:smog", "tm:snarl", "tm:snatch", "tm:solarbeam", @@ -181,7 +166,37 @@ "tm:torment", "tm:toxic", "tm:trailblaze", - "tm:willowisp" + "tm:willowisp", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lashout", + "tutor:mudslap", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:throatchop", + "tutor:thunderfang" ], "preEvolution": "houndour", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation2/houndour.json b/common/src/main/resources/data/cobblemon/species/generation2/houndour.json index dd4825788a..eb28148b11 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/houndour.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/houndour.json @@ -98,22 +98,15 @@ "egg:suckerpunch", "egg:thunderfang", "tm:beatup", - "tm:bite", "tm:bodyslam", "tm:burningjealousy", - "tm:comeuppance", - "tm:counter", "tm:crunch", "tm:darkpulse", - "tm:destinybond", "tm:doubleedge", "tm:dreameater", "tm:embargo", - "tm:ember", "tm:endure", "tm:facade", - "tm:feint", - "tm:feintattack", "tm:fireblast", "tm:firefang", "tm:firespin", @@ -124,25 +117,18 @@ "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:incinerate", - "tm:inferno", "tm:irontail", "tm:lashout", - "tm:leer", "tm:mudshot", "tm:mudslap", "tm:nastyplot", - "tm:odorsleuth", "tm:overheat", "tm:painsplit", "tm:payback", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -154,7 +140,6 @@ "tm:shadowball", "tm:sleeptalk", "tm:sludgebomb", - "tm:smog", "tm:snarl", "tm:snatch", "tm:solarbeam", @@ -172,7 +157,32 @@ "tm:torment", "tm:toxic", "tm:trailblaze", - "tm:willowisp" + "tm:willowisp", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:firefang", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irontail", + "tutor:lashout", + "tutor:mudslap", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderfang" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json b/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json index 9c66a02509..2a50e66a0a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/igglybuff.json @@ -93,12 +93,9 @@ "tm:bounce", "tm:captivate", "tm:charm", - "tm:copycat", "tm:covet", "tm:dazzlinggleam", - "tm:defensecurl", "tm:dig", - "tm:disable", "tm:disarmingvoice", "tm:doubleedge", "tm:drainingkiss", @@ -109,7 +106,6 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:fireblast", "tm:flamethrower", "tm:flash", @@ -118,7 +114,6 @@ "tm:gravity", "tm:headbutt", "tm:healbell", - "tm:healpulse", "tm:helpinghand", "tm:hypervoice", "tm:icywind", @@ -130,14 +125,10 @@ "tm:megapunch", "tm:mistyterrain", "tm:painsplit", - "tm:perishsong", "tm:playrough", - "tm:pound", - "tm:present", "tm:protect", "tm:psychic", "tm:psychup", - "tm:punishment", "tm:raindance", "tm:recycle", "tm:reflect", @@ -148,20 +139,41 @@ "tm:screech", "tm:shadowball", "tm:shockwave", - "tm:sing", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:takedown", "tm:terablast", "tm:thunderwave", "tm:trailblaze", "tm:wildcharge", - "tm:wish", - "tm:workup" + "tm:workup", + "tutor:bounce", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icywind", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:swift", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json b/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json index 5ca0d64688..3488560c36 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json @@ -91,17 +91,12 @@ "egg:strengthsap", "egg:switcheroo", "egg:worryseed", - "tm:absorb", "tm:acrobatics", "tm:aerialace", - "tm:aromatherapy", "tm:batonpass", "tm:bounce", "tm:bulletseed", "tm:charm", - "tm:confusion", - "tm:cottonguard", - "tm:cottonspore", "tm:dazzlinggleam", "tm:doubleedge", "tm:encore", @@ -109,7 +104,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", "tm:fling", "tm:gigadrain", @@ -121,42 +115,46 @@ "tm:hyperbeam", "tm:infestation", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:lunge", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:payday", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:ragepowder", "tm:raindance", "tm:reflect", "tm:rest", "tm:seedbomb", "tm:silverwind", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", - "tm:splash", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:switcheroo", "tm:swordsdance", "tm:synthesis", - "tm:tackle", - "tm:tailwhip", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", "tm:uturn", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:bounce", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:tailwind", + "tutor:worryseed" ], "preEvolution": "skiploom", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json b/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json index df85282f45..3bf67e2fdf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/kingdra.json @@ -107,27 +107,19 @@ "egg:razorwind", "egg:splash", "tm:agility", - "tm:aurorabeam", "tm:blizzard", "tm:bodyslam", "tm:bounce", "tm:breakingswipe", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", - "tm:clearsmog", - "tm:disable", "tm:dive", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:endure", "tm:facade", - "tm:flail", "tm:flashcannon", "tm:flipturn", "tm:focusenergy", @@ -141,24 +133,19 @@ "tm:icywind", "tm:ironhead", "tm:laserfocus", - "tm:leer", "tm:liquidation", "tm:muddywater", - "tm:octazooka", "tm:outrage", "tm:protect", "tm:quash", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:scald", "tm:scaleshot", "tm:scaryface", "tm:signalbeam", "tm:sleeptalk", - "tm:smokescreen", "tm:snowscape", - "tm:splash", "tm:substitute", "tm:surf", "tm:swift", @@ -166,12 +153,31 @@ "tm:terablast", "tm:twister", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:wavecrash", "tm:weatherball", "tm:whirlpool", - "tm:yawn" + "tutor:bounce", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "seadra", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json index db2b7e1883..860cb01fa0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/lanturn.json @@ -113,20 +113,16 @@ "egg:waterpulse", "tm:agility", "tm:amnesia", - "tm:aquaring", "tm:aquatail", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:charge", "tm:chargebeam", "tm:chillingwater", "tm:confuseray", "tm:curse", "tm:dazzlinggleam", - "tm:discharge", "tm:dive", "tm:doubleedge", "tm:eerieimpulse", @@ -135,7 +131,6 @@ "tm:electroweb", "tm:endure", "tm:facade", - "tm:flail", "tm:flash", "tm:flipturn", "tm:gigaimpact", @@ -145,9 +140,7 @@ "tm:hyperbeam", "tm:icebeam", "tm:icywind", - "tm:iondeluge", "tm:liquidation", - "tm:mist", "tm:muddywater", "tm:protect", "tm:psybeam", @@ -159,16 +152,9 @@ "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", - "tm:soak", - "tm:spark", - "tm:spitup", - "tm:spotlight", - "tm:stockpile", "tm:substitute", "tm:suckerpunch", - "tm:supersonic", "tm:surf", - "tm:swallow", "tm:takedown", "tm:terablast", "tm:thunder", @@ -176,10 +162,31 @@ "tm:thunderwave", "tm:voltswitch", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:wildcharge" + "tm:wildcharge", + "tutor:aquatail", + "tutor:bounce", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:electroweb", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:wildcharge" ], "preEvolution": "chinchou", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/larvitar.json b/common/src/main/resources/data/cobblemon/species/generation2/larvitar.json index 43de3c2440..5a9e267a9a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/larvitar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/larvitar.json @@ -103,11 +103,9 @@ "egg:stomp", "tm:ancientpower", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:chipaway", "tm:crunch", "tm:curse", "tm:darkpulse", @@ -126,14 +124,12 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:leer", "tm:mudshot", "tm:mudslap", "tm:outrage", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -141,7 +137,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:sandtomb", @@ -152,18 +147,38 @@ "tm:snarl", "tm:spite", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", - "tm:torment" + "tm:torment", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ledian.json b/common/src/main/resources/data/cobblemon/species/generation2/ledian.json index f2d092ffe6..ca49de0bb7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ledian.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ledian.json @@ -97,14 +97,10 @@ "tm:airslash", "tm:assurance", "tm:batonpass", - "tm:bide", "tm:brickbreak", "tm:bugbite", "tm:bugbuzz", - "tm:cometpunch", - "tm:counter", "tm:dig", - "tm:dizzypunch", "tm:doubleedge", "tm:drainpunch", "tm:dualwingbeat", @@ -123,7 +119,6 @@ "tm:infestation", "tm:knockoff", "tm:lightscreen", - "tm:machpunch", "tm:megakick", "tm:megapunch", "tm:ominouswind", @@ -145,16 +140,36 @@ "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:thunderpunch", "tm:uproar", - "tm:uturn" + "tm:uturn", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:drainpunch", + "tutor:dualwingbeat", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:ominouswind", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:roost", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderpunch", + "tutor:uproar" ], "preEvolution": "ledyba", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json b/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json index eca1142843..cb202d4f32 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json @@ -97,14 +97,10 @@ "tm:airslash", "tm:assurance", "tm:batonpass", - "tm:bide", "tm:brickbreak", "tm:bugbite", "tm:bugbuzz", - "tm:cometpunch", - "tm:counter", "tm:dig", - "tm:dizzypunch", "tm:doubleedge", "tm:drainpunch", "tm:dualwingbeat", @@ -120,7 +116,6 @@ "tm:infestation", "tm:knockoff", "tm:lightscreen", - "tm:machpunch", "tm:megakick", "tm:megapunch", "tm:ominouswind", @@ -140,16 +135,33 @@ "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:thunderpunch", "tm:uproar", - "tm:uturn" + "tm:uturn", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:drainpunch", + "tutor:dualwingbeat", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:icepunch", + "tutor:knockoff", + "tutor:ominouswind", + "tutor:rest", + "tutor:rollout", + "tutor:roost", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderpunch", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lugia.json b/common/src/main/resources/data/cobblemon/species/generation2/lugia.json index f4000a725b..b2da222cf2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/lugia.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/lugia.json @@ -78,7 +78,6 @@ "90:skyattack", "tm:acrobatics", "tm:aerialace", - "tm:aeroblast", "tm:aircutter", "tm:airslash", "tm:ancientpower", @@ -96,7 +95,6 @@ "tm:dive", "tm:doubleedge", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:dreameater", "tm:dualwingbeat", @@ -104,14 +102,12 @@ "tm:earthquake", "tm:echoedvoice", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:fly", "tm:futuresight", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:hail", "tm:headbutt", "tm:helpinghand", @@ -127,7 +123,6 @@ "tm:laserfocus", "tm:lightscreen", "tm:liquidation", - "tm:mist", "tm:naturalgift", "tm:ominouswind", "tm:protect", @@ -135,9 +130,7 @@ "tm:psychicnoise", "tm:psychup", "tm:psyshock", - "tm:punishment", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:rocksmash", @@ -171,9 +164,51 @@ "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:whirlwind", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:defog", + "tutor:dive", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:twister", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/magby.json b/common/src/main/resources/data/cobblemon/species/generation2/magby.json index bc3d098119..e0cb96506e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/magby.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/magby.json @@ -92,46 +92,31 @@ "egg:karatechop", "egg:machpunch", "tm:acidspray", - "tm:barrier", - "tm:belch", - "tm:bellydrum", "tm:bodyslam", "tm:brickbreak", "tm:burningjealousy", - "tm:clearsmog", "tm:confuseray", "tm:covet", - "tm:crosschop", "tm:curse", "tm:doubleedge", "tm:dualchop", - "tm:dynamicpunch", - "tm:ember", "tm:endure", "tm:facade", - "tm:feintattack", "tm:fireblast", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusenergy", "tm:focuspunch", - "tm:followme", "tm:headbutt", "tm:heatwave", "tm:helpinghand", "tm:incinerate", "tm:irontail", - "tm:karatechop", - "tm:lavaplume", - "tm:leer", "tm:lowkick", - "tm:machpunch", "tm:megakick", "tm:megapunch", "tm:overheat", @@ -145,8 +130,6 @@ "tm:scaryface", "tm:screech", "tm:sleeptalk", - "tm:smog", - "tm:smokescreen", "tm:substitute", "tm:sunnyday", "tm:takedown", @@ -154,7 +137,24 @@ "tm:terablast", "tm:thief", "tm:thunderpunch", - "tm:willowisp" + "tm:willowisp", + "tutor:burningjealousy", + "tutor:covet", + "tutor:dualchop", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:thunderpunch" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json b/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json index 57094daaaf..26502a904f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/magcargo.json @@ -111,41 +111,33 @@ "egg:spitup", "egg:stockpile", "egg:swallow", - "tm:acidarmor", "tm:afteryou", "tm:amnesia", "tm:ancientpower", "tm:bodyslam", "tm:bulldoze", "tm:burningjealousy", - "tm:clearsmog", "tm:curse", "tm:earthpower", "tm:earthquake", - "tm:ember", "tm:endure", "tm:explosion", "tm:facade", "tm:fireblast", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", "tm:gigaimpact", "tm:guardswap", "tm:gyroball", - "tm:harden", "tm:heatcrash", "tm:heatwave", "tm:hyperbeam", "tm:incinerate", - "tm:inferno", "tm:infestation", "tm:irondefense", - "tm:lavaplume", "tm:lightscreen", - "tm:memento", "tm:mudshot", "tm:mudslap", "tm:naturepower", @@ -153,40 +145,52 @@ "tm:painsplit", "tm:powergem", "tm:protect", - "tm:recover", "tm:reflect", "tm:rest", "tm:rockblast", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", "tm:selfdestruct", - "tm:shellsmash", "tm:sleeptalk", "tm:smackdown", - "tm:smog", - "tm:smokescreen", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:takedown", "tm:temperflare", "tm:terablast", "tm:willowisp", - "tm:yawn" + "tutor:afteryou", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge" ], "preEvolution": "slugma", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json b/common/src/main/resources/data/cobblemon/species/generation2/mantine.json index 06c4ecc45d..fe8ceb1225 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/mantine.json @@ -116,7 +116,6 @@ "tm:aircutter", "tm:airslash", "tm:amnesia", - "tm:aquaring", "tm:aquatail", "tm:assurance", "tm:blizzard", @@ -124,8 +123,6 @@ "tm:bodyslam", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", "tm:bulletseed", "tm:confuseray", @@ -148,9 +145,7 @@ "tm:icywind", "tm:ironhead", "tm:liquidation", - "tm:mirrorcoat", "tm:mudslap", - "tm:mudsport", "tm:powershift", "tm:protect", "tm:psybeam", @@ -163,26 +158,47 @@ "tm:scald", "tm:seedbomb", "tm:signalbeam", - "tm:slam", "tm:sleeptalk", - "tm:splash", "tm:stringshot", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:twister", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:wideguard", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:defog", + "tutor:dive", + "tutor:dualwingbeat", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:liquidation", + "tutor:mudslap", + "tutor:powershift", + "tutor:rest", + "tutor:rockslide", + "tutor:roost", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "mantyke", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/mareep.json b/common/src/main/resources/data/cobblemon/species/generation2/mareep.json index 293574fec2..b02d2b8e91 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/mareep.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/mareep.json @@ -109,11 +109,8 @@ "tm:charge", "tm:chargebeam", "tm:confuseray", - "tm:cottonguard", - "tm:cottonspore", "tm:dazzlinggleam", "tm:dig", - "tm:discharge", "tm:doubleedge", "tm:echoedvoice", "tm:eerieimpulse", @@ -124,15 +121,12 @@ "tm:endure", "tm:facade", "tm:flash", - "tm:flatter", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", "tm:irontail", "tm:lightscreen", "tm:magnetrise", - "tm:odorsleuth", "tm:powergem", "tm:protect", "tm:raindance", @@ -140,23 +134,36 @@ "tm:rest", "tm:risingvoltage", "tm:safeguard", - "tm:sandattack", "tm:screech", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:afteryou", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:electroweb", + "tutor:endeavor", + "tutor:healbell", + "tutor:helpinghand", + "tutor:irontail", + "tutor:magnetrise", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:thunderbolt", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/marill.json b/common/src/main/resources/data/cobblemon/species/generation2/marill.json index 0829816885..eaae143119 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/marill.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/marill.json @@ -103,24 +103,16 @@ "egg:watersport", "tm:alluringvoice", "tm:amnesia", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:bounce", "tm:brickbreak", "tm:brutalswing", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", - "tm:camouflage", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", - "tm:defensecurl", "tm:dig", "tm:disarmingvoice", "tm:dive", @@ -154,41 +146,53 @@ "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:perishsong", "tm:playrough", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:rollout", - "tm:sing", - "tm:slam", "tm:sleeptalk", "tm:snowscape", - "tm:soak", - "tm:splash", "tm:steelroller", "tm:strength", "tm:substitute", "tm:superpower", - "tm:supersonic", "tm:surf", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:trailblaze", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:covet", + "tutor:dive", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:mistyexplosion", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:steelroller", + "tutor:superpower", + "tutor:swift", + "tutor:waterpulse" ], "preEvolution": "azurill", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/meganium.json b/common/src/main/resources/data/cobblemon/species/generation2/meganium.json index 62efe0cd50..2ba298144b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/meganium.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/meganium.json @@ -98,13 +98,11 @@ "egg:vinewhip", "egg:wringout", "tm:ancientpower", - "tm:aromatherapy", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", "tm:bulletseed", "tm:charm", - "tm:counter", "tm:curse", "tm:cut", "tm:doubleedge", @@ -117,7 +115,6 @@ "tm:energyball", "tm:facade", "tm:faketears", - "tm:flail", "tm:flash", "tm:frenzyplant", "tm:furycutter", @@ -125,20 +122,15 @@ "tm:gigaimpact", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", - "tm:ingrain", "tm:irontail", "tm:knockoff", "tm:laserfocus", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", "tm:magiccoat", @@ -147,12 +139,8 @@ "tm:naturepower", "tm:outrage", "tm:petalblizzard", - "tm:petaldance", - "tm:poisonpowder", "tm:protect", - "tm:razorleaf", "tm:reflect", - "tm:refresh", "tm:rest", "tm:rockclimb", "tm:rocksmash", @@ -165,19 +153,42 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:trailblaze", - "tm:vinewhip", "tm:weatherball", "tm:workup", "tm:worryseed", - "tm:wringout", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:energyball", + "tutor:frenzyplant", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:synthesis", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "bayleef", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/miltank.json b/common/src/main/resources/data/cobblemon/species/generation2/miltank.json index 9bd7c4d099..1d48d8bd4f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/miltank.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/miltank.json @@ -103,8 +103,6 @@ "egg:punishment", "egg:seismictoss", "tm:afteryou", - "tm:belch", - "tm:bide", "tm:blizzard", "tm:block", "tm:bodypress", @@ -114,8 +112,6 @@ "tm:captivate", "tm:charm", "tm:curse", - "tm:defensecurl", - "tm:dizzypunch", "tm:doubleedge", "tm:earthquake", "tm:echoedvoice", @@ -126,12 +122,9 @@ "tm:focusblast", "tm:focuspunch", "tm:gigaimpact", - "tm:growl", "tm:gyroball", - "tm:hammerarm", "tm:headbutt", "tm:healbell", - "tm:heartstamp", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", @@ -144,15 +137,12 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:milkdrink", "tm:mudslap", "tm:naturalgift", "tm:playrough", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:psychup", - "tm:punishment", "tm:raindance", "tm:rest", "tm:retaliate", @@ -162,30 +152,57 @@ "tm:rocktomb", "tm:rollout", "tm:sandstorm", - "tm:seismictoss", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", "tm:solarbeam", "tm:stealthrock", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:tackle", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:wakeupslap", "tm:waterpulse", "tm:whirlpool", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:block", + "tutor:bulldoze", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json b/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json index 14651007d9..8f8b5c9378 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/misdreavus.json @@ -89,17 +89,14 @@ "egg:suckerpunch", "egg:wonderroom", "tm:allyswitch", - "tm:astonish", "tm:burningjealousy", "tm:calmmind", "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", "tm:drainingkiss", "tm:dreameater", "tm:echoedvoice", @@ -113,7 +110,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:grudge", "tm:headbutt", "tm:healbell", @@ -126,15 +122,11 @@ "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", - "tm:mefirst", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:ominouswind", "tm:painsplit", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poltergeist", "tm:powergem", @@ -144,13 +136,11 @@ "tm:psychicnoise", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:rest", "tm:scaryface", "tm:screech", "tm:shadowball", - "tm:shadowsneak", "tm:shockwave", "tm:skillswap", "tm:sleeptalk", @@ -173,7 +163,41 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json b/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json index bb3d325b45..7a954b61a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/murkrow.json @@ -113,7 +113,6 @@ "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:astonish", "tm:bravebird", "tm:calmmind", "tm:confuseray", @@ -121,18 +120,14 @@ "tm:defog", "tm:doubleedge", "tm:dreameater", - "tm:drillpeck", "tm:dualwingbeat", "tm:embargo", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feintattack", - "tm:flatter", "tm:fly", "tm:foulplay", "tm:gigaimpact", - "tm:gust", "tm:haze", "tm:heatwave", "tm:hex", @@ -140,21 +135,15 @@ "tm:hyperbeam", "tm:icywind", "tm:lashout", - "tm:meanlook", - "tm:mirrormove", "tm:mudslap", "tm:nastyplot", "tm:nightshade", "tm:ominouswind", "tm:payback", - "tm:peck", - "tm:perishsong", "tm:pluck", "tm:protect", "tm:psychic", "tm:psychicnoise", - "tm:psychoshift", - "tm:pursuit", "tm:quash", "tm:raindance", "tm:rest", @@ -182,8 +171,33 @@ "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:lashout", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/natu.json b/common/src/main/resources/data/cobblemon/species/generation2/natu.json index f91cfedcbd..c8a95e69c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/natu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/natu.json @@ -110,13 +110,11 @@ "tm:cosmicpower", "tm:dazzlinggleam", "tm:dreameater", - "tm:drillpeck", "tm:dualwingbeat", "tm:endure", "tm:expandingforce", "tm:facade", "tm:featherdance", - "tm:feintattack", "tm:flash", "tm:futuresight", "tm:gigadrain", @@ -125,34 +123,25 @@ "tm:haze", "tm:heatwave", "tm:imprison", - "tm:leer", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", - "tm:mefirst", - "tm:miracleeye", "tm:nightshade", "tm:ominouswind", "tm:painsplit", - "tm:peck", "tm:pluck", "tm:powerswap", "tm:protect", "tm:psychic", - "tm:psychoshift", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:roost", "tm:shadowball", "tm:signalbeam", "tm:silverwind", - "tm:simplebeam", "tm:skillswap", "tm:skyattack", "tm:sleeptalk", @@ -163,10 +152,8 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swift", - "tm:synchronoise", "tm:tailwind", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderwave", @@ -174,8 +161,35 @@ "tm:trickroom", "tm:twister", "tm:uturn", - "tm:wish", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:dualwingbeat", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:heatwave", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:twister", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json index f8b3727ede..5a255d2913 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/noctowl.json @@ -115,7 +115,6 @@ "tm:bravebird", "tm:calmmind", "tm:confuseray", - "tm:confusion", "tm:curse", "tm:defog", "tm:doubleedge", @@ -123,37 +122,27 @@ "tm:dualwingbeat", "tm:echoedvoice", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:featherdance", - "tm:feintattack", "tm:fly", - "tm:foresight", "tm:futuresight", "tm:gigaimpact", - "tm:growl", "tm:haze", "tm:heatwave", "tm:hurricane", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:imprison", "tm:laserfocus", "tm:magiccoat", - "tm:meanlook", - "tm:mirrormove", - "tm:moonblast", "tm:nastyplot", "tm:nightshade", "tm:ominouswind", - "tm:peck", "tm:pluck", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicnoise", - "tm:psychoshift", "tm:psychup", "tm:raindance", "tm:recycle", @@ -172,20 +161,41 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", - "tm:synchronoise", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", "tm:twister", "tm:uproar", - "tm:whirlwind", - "tm:wingattack", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:calmmind", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:skillswap", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "hoothoot", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/octillery.json b/common/src/main/resources/data/cobblemon/species/generation2/octillery.json index 4576d4525f..27e87966b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/octillery.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/octillery.json @@ -107,23 +107,17 @@ "egg:waterspout", "tm:acidspray", "tm:assurance", - "tm:aurorabeam", "tm:bind", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:bulletseed", "tm:chargebeam", - "tm:constrict", "tm:dive", "tm:endure", "tm:energyball", - "tm:entrainment", "tm:facade", "tm:fireblast", - "tm:flail", "tm:flamethrower", "tm:flashcannon", "tm:focusenergy", @@ -137,10 +131,8 @@ "tm:icywind", "tm:incinerate", "tm:liquidation", - "tm:lockon", "tm:mudshot", "tm:mudslap", - "tm:octazooka", "tm:payback", "tm:protect", "tm:psybeam", @@ -158,23 +150,44 @@ "tm:sludgewave", "tm:smackdown", "tm:snore", - "tm:soak", "tm:stringshot", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:surf", "tm:swift", "tm:terablast", "tm:thief", "tm:thunderwave", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:waterspout", "tm:whirlpool", - "tm:wrap", - "tm:wringout" + "tutor:bind", + "tutor:bounce", + "tutor:chargebeam", + "tutor:dive", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snore", + "tutor:stringshot", + "tutor:swift", + "tutor:waterpulse" ], "preEvolution": "remoraid", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json b/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json index 72242263de..2f34d5727c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/phanpy.json @@ -102,9 +102,7 @@ "tm:bodyslam", "tm:bulldoze", "tm:charm", - "tm:counter", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", @@ -114,18 +112,13 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", "tm:focusenergy", - "tm:growl", "tm:gunkshot", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", "tm:hypervoice", - "tm:iceshard", "tm:ironhead", "tm:irontail", "tm:knockoff", @@ -133,7 +126,6 @@ "tm:mudshot", "tm:mudslap", "tm:naturalgift", - "tm:odorsleuth", "tm:playrough", "tm:protect", "tm:raindance", @@ -146,7 +138,6 @@ "tm:sandstorm", "tm:sandtomb", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:snore", @@ -157,11 +148,36 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", - "tm:trailblaze" + "tm:trailblaze", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json index f83f589a27..018c8888db 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json @@ -83,14 +83,11 @@ "egg:tickle", "egg:wish", "tm:babydolleyes", - "tm:bestow", - "tm:bide", "tm:bodyslam", "tm:charge", "tm:charm", "tm:covet", "tm:disarmingvoice", - "tm:doubleslap", "tm:echoedvoice", "tm:electricterrain", "tm:electroball", @@ -98,8 +95,6 @@ "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:flail", "tm:flash", "tm:fling", "tm:grassknot", @@ -107,15 +102,11 @@ "tm:helpinghand", "tm:irontail", "tm:lightscreen", - "tm:luckychant", "tm:magnetrise", "tm:megakick", "tm:megapunch", "tm:nastyplot", - "tm:nuzzle", - "tm:playnice", "tm:playrough", - "tm:present", "tm:protect", "tm:raindance", "tm:reflect", @@ -127,22 +118,34 @@ "tm:sleeptalk", "tm:substitute", "tm:surf", - "tm:sweetkiss", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", "tm:voltswitch", "tm:volttackle", "tm:wildcharge", - "tm:wish" + "tutor:babydolleyes", + "tutor:covet", + "tutor:electroweb", + "tutor:helpinghand", + "tutor:irontail", + "tutor:magnetrise", + "tutor:playrough", + "tutor:rest", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:volttackle", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json index 873e3588fb..0cb5f11905 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json @@ -109,7 +109,6 @@ "tm:ancientpower", "tm:avalanche", "tm:babydolleyes", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:bulldoze", @@ -122,10 +121,6 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", - "tm:freezedry", - "tm:furyattack", "tm:gigaimpact", "tm:hail", "tm:haze", @@ -134,18 +129,10 @@ "tm:hyperbeam", "tm:icebeam", "tm:icefang", - "tm:iceshard", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", - "tm:mist", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:odorsleuth", - "tm:peck", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -166,12 +153,31 @@ "tm:strength", "tm:substitute", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:throatchop", - "tm:trailblaze" + "tm:trailblaze", + "tutor:ancientpower", + "tutor:babydolleyes", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop" ], "preEvolution": "swinub", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json index 6a58320624..fac26de006 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pineco.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pineco.json @@ -94,12 +94,10 @@ "egg:swift", "egg:toxicspikes", "tm:autotomize", - "tm:bide", "tm:bodyslam", "tm:bugbite", "tm:bugbuzz", "tm:bulldoze", - "tm:counter", "tm:curse", "tm:dig", "tm:doubleedge", @@ -107,7 +105,6 @@ "tm:endure", "tm:explosion", "tm:facade", - "tm:flail", "tm:gigadrain", "tm:gravity", "tm:gyroball", @@ -123,10 +120,8 @@ "tm:pinmissile", "tm:poisonjab", "tm:pounce", - "tm:powertrick", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:reflect", "tm:rest", "tm:revenge", @@ -150,11 +145,30 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:toxicspikes", - "tm:venoshock" + "tm:venoshock", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:drillrun", + "tutor:gigadrain", + "tutor:gravity", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stringshot", + "tutor:swift", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json index 512c5bd227..483acda133 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/politoed.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json @@ -107,19 +107,15 @@ "egg:waterpulse", "egg:watersport", "tm:amnesia", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:bounce", "tm:brickbreak", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", "tm:chillingwater", "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doubleslap", "tm:earthpower", "tm:earthquake", "tm:echoedvoice", @@ -138,7 +134,6 @@ "tm:hydropump", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:icebeam", "tm:icepunch", "tm:icywind", @@ -148,26 +143,19 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mindreader", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", "tm:payback", - "tm:perishsong", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:screech", "tm:sleeptalk", - "tm:splash", "tm:strength", "tm:substitute", "tm:surf", @@ -176,13 +164,32 @@ "tm:takedown", "tm:terablast", "tm:thief", - "tm:wakeupslap", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:bounce", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse" ], "preEvolution": "poliwhirl", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json index 1919b9a303..fd36a07fbc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/porygon2.json @@ -98,10 +98,6 @@ "tm:blizzard", "tm:charge", "tm:chargebeam", - "tm:conversion", - "tm:conversion2", - "tm:defensecurl", - "tm:discharge", "tm:doubleedge", "tm:dreameater", "tm:eerieimpulse", @@ -118,7 +114,6 @@ "tm:icywind", "tm:irontail", "tm:lastresort", - "tm:lockon", "tm:magiccoat", "tm:magnetrise", "tm:powerswap", @@ -127,11 +122,9 @@ "tm:psychic", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:recycle", "tm:rest", "tm:shadowball", - "tm:sharpen", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -140,21 +133,44 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:triattack", "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zapcannon", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "porygon", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json b/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json index a37a088cd1..987d875e57 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pupitar.json @@ -104,11 +104,9 @@ "tm:aerialace", "tm:ancientpower", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:chipaway", "tm:crunch", "tm:curse", "tm:darkpulse", @@ -129,14 +127,12 @@ "tm:ironhead", "tm:irontail", "tm:lashout", - "tm:leer", "tm:mudshot", "tm:mudslap", "tm:outrage", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -144,7 +140,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:sandtomb", @@ -155,18 +150,41 @@ "tm:snarl", "tm:spite", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", - "tm:torment" + "tm:torment", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lashout", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower" ], "preEvolution": "larvitar", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json b/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json index cfa8edac4e..b0ddf897f7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/quagsire.json @@ -113,12 +113,10 @@ "tm:brickbreak", "tm:bulldoze", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doublekick", "tm:drainpunch", "tm:earthpower", "tm:earthquake", @@ -147,16 +145,12 @@ "tm:liquidation", "tm:megakick", "tm:megapunch", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:poweruppunch", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:rockslide", "tm:rocksmash", @@ -164,22 +158,17 @@ "tm:rollout", "tm:safeguard", "tm:sandstorm", - "tm:slam", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snowscape", "tm:spikes", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:surf", - "tm:swallow", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", @@ -187,10 +176,37 @@ "tm:toxicspikes", "tm:trailblaze", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:yawn" + "tutor:afteryou", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dive", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:waterpulse" ], "preEvolution": "wooper", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json index 421981ad2d..4ac24e595a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/quilava.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/quilava.json @@ -105,64 +105,64 @@ "tm:burningjealousy", "tm:burnup", "tm:covet", - "tm:crushclaw", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:doublekick", - "tm:ember", "tm:endeavor", "tm:endure", - "tm:eruption", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firefang", "tm:firepledge", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", - "tm:foresight", "tm:furycutter", - "tm:furyswipes", "tm:headbutt", "tm:heatwave", - "tm:howl", "tm:incinerate", - "tm:inferno", "tm:ironhead", - "tm:lavaplume", - "tm:leer", "tm:naturepower", "tm:overheat", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:roar", "tm:rocksmash", "tm:rollout", "tm:sleeptalk", - "tm:smokescreen", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:burningjealousy", + "tutor:covet", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:furycutter", + "tutor:heatwave", + "tutor:ironhead", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:swift", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "cyndaquil", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json b/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json index f63c6dfad3..d364f9e160 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/qwilfish.json @@ -116,35 +116,25 @@ "egg:supersonic", "egg:waterpulse", "tm:acidspray", - "tm:acupressure", "tm:agility", - "tm:aquajet", "tm:aquatail", "tm:assurance", - "tm:astonish", - "tm:barbbarrage", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", "tm:crunch", "tm:curse", - "tm:destinybond", "tm:dive", "tm:doubleedge", "tm:endure", "tm:explosion", "tm:facade", - "tm:fellstinger", - "tm:flail", "tm:flipturn", "tm:gigaimpact", "tm:gunkshot", "tm:gyroball", "tm:hail", - "tm:harden", "tm:haze", "tm:headbutt", "tm:hex", @@ -152,13 +142,11 @@ "tm:icebeam", "tm:icywind", "tm:liquidation", - "tm:minimize", "tm:mudshot", "tm:painsplit", "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", "tm:raindance", @@ -177,15 +165,11 @@ "tm:sludgewave", "tm:spikes", "tm:spite", - "tm:spitup", "tm:steelroller", - "tm:stockpile", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -196,9 +180,33 @@ "tm:venomdrench", "tm:venoshock", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bounce", + "tutor:dive", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rollout", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:steelroller", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "evolutions": [], "forms": [ @@ -248,30 +256,20 @@ "egg:supersonic", "egg:waterpulse", "tm:acidspray", - "tm:acupressure", "tm:agility", - "tm:aquajet", "tm:aquatail", - "tm:astonish", - "tm:barbbarrage", - "tm:bite", "tm:blizzard", "tm:brine", - "tm:bubblebeam", "tm:chillingwater", "tm:crunch", "tm:curse", "tm:darkpulse", - "tm:destinybond", "tm:doubleedge", "tm:endure", "tm:facade", - "tm:fellstinger", - "tm:flail", "tm:gigaimpact", "tm:gunkshot", "tm:gyroball", - "tm:harden", "tm:haze", "tm:hex", "tm:hydropump", @@ -280,12 +278,10 @@ "tm:icywind", "tm:lashout", "tm:liquidation", - "tm:minimize", "tm:mudshot", "tm:painsplit", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", "tm:raindance", @@ -299,14 +295,10 @@ "tm:sludgebomb", "tm:spikes", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -315,7 +307,28 @@ "tm:toxicspikes", "tm:venoshock", "tm:waterfall", - "tm:waterpulse" + "tm:waterpulse", + "tutor:aquatail", + "tutor:darkpulse", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:iceball", + "tutor:icebeam", + "tutor:icywind", + "tutor:lashout", + "tutor:liquidation", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/raikou.json b/common/src/main/resources/data/cobblemon/species/generation2/raikou.json index dc5803f99c..a73a16810a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/raikou.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/raikou.json @@ -76,39 +76,32 @@ "78:zapcannon", "tm:agility", "tm:aurasphere", - "tm:bite", "tm:bodyslam", "tm:calmmind", "tm:charge", "tm:chargebeam", "tm:crunch", "tm:cut", - "tm:discharge", "tm:doubleedge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:endure", - "tm:extrasensory", - "tm:extremespeed", "tm:facade", "tm:flash", "tm:gigaimpact", "tm:headbutt", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:magnetrise", "tm:mudslap", "tm:protect", "tm:quash", - "tm:quickattack", "tm:raindance", "tm:reflect", "tm:rest", @@ -124,7 +117,6 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -136,13 +128,35 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderfang", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:voltswitch", "tm:weatherball", "tm:wildcharge", - "tm:zapcannon" + "tutor:calmmind", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json b/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json index 86e34e8816..805fc211e9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json @@ -103,20 +103,15 @@ "egg:waterspout", "tm:acidspray", "tm:assurance", - "tm:aurorabeam", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:bulletseed", "tm:chargebeam", "tm:dive", "tm:endure", - "tm:entrainment", "tm:facade", "tm:fireblast", - "tm:flail", "tm:flamethrower", "tm:focusenergy", "tm:gunkshot", @@ -127,10 +122,8 @@ "tm:icebeam", "tm:icywind", "tm:incinerate", - "tm:lockon", "tm:mudshot", "tm:mudslap", - "tm:octazooka", "tm:protect", "tm:psybeam", "tm:psychic", @@ -144,21 +137,37 @@ "tm:sleeptalk", "tm:smackdown", "tm:snore", - "tm:soak", "tm:stringshot", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:surf", "tm:swift", "tm:terablast", "tm:thief", "tm:thunderwave", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:waterspout", - "tm:whirlpool" + "tm:whirlpool", + "tutor:bounce", + "tutor:chargebeam", + "tutor:dive", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stringshot", + "tutor:swift", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json index 8503112eda..bb5ecbb40b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/scizor.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/scizor.json @@ -104,21 +104,17 @@ "tm:brutalswing", "tm:bugbite", "tm:bugbuzz", - "tm:bulletpunch", "tm:closecombat", - "tm:counter", "tm:crosspoison", "tm:curse", "tm:cut", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:doubleteam", "tm:dualwingbeat", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", "tm:flashcannon", "tm:fling", "tm:focusenergy", @@ -132,20 +128,14 @@ "tm:ironhead", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lunge", "tm:metalclaw", - "tm:nightslash", "tm:ominouswind", "tm:pounce", "tm:protect", "tm:psychocut", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:rocksmash", @@ -155,7 +145,6 @@ "tm:scaryface", "tm:silverwind", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:steelbeam", "tm:steelwing", @@ -173,8 +162,36 @@ "tm:trailblaze", "tm:uturn", "tm:vacuumwave", - "tm:wingattack", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:psychocut", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:superpower", + "tutor:swift", + "tutor:tailwind", + "tutor:vacuumwave", + "tutor:xscissor" ], "preEvolution": "scyther", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sentret.json b/common/src/main/resources/data/cobblemon/species/generation2/sentret.json index 903232b209..9c26d7eca1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sentret.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sentret.json @@ -88,7 +88,6 @@ "egg:tidyup", "tm:amnesia", "tm:aquatail", - "tm:assist", "tm:assurance", "tm:babydolleyes", "tm:batonpass", @@ -102,7 +101,6 @@ "tm:chillingwater", "tm:covet", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:echoedvoice", @@ -114,10 +112,7 @@ "tm:fling", "tm:focusenergy", "tm:focuspunch", - "tm:followme", - "tm:foresight", "tm:furycutter", - "tm:furyswipes", "tm:grassknot", "tm:growl", "tm:headbutt", @@ -129,25 +124,19 @@ "tm:irontail", "tm:knockoff", "tm:lastresort", - "tm:mefirst", "tm:naturalgift", "tm:playrough", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", "tm:reversal", "tm:rollout", - "tm:scratch", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slam", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", @@ -163,13 +152,45 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:tidyup", "tm:trailblaze", "tm:trick", "tm:uproar", "tm:uturn", "tm:waterpulse", - "tm:workup" + "tm:workup", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:covet", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:playrough", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json b/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json index 942483e4f5..735d12c46e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/shuckle.json @@ -99,28 +99,21 @@ "egg:knockoff", "egg:sweetscent", "egg:toxic", - "tm:acid", - "tm:acupressure", "tm:afteryou", "tm:ancientpower", - "tm:bide", "tm:bind", "tm:bodyslam", "tm:bugbite", "tm:bulldoze", - "tm:constrict", "tm:covet", - "tm:defensecurl", "tm:dig", "tm:earthpower", "tm:earthquake", "tm:encore", "tm:endure", "tm:facade", - "tm:finalgambit", "tm:flash", "tm:gastroacid", - "tm:guardsplit", "tm:gyroball", "tm:headbutt", "tm:helpinghand", @@ -130,8 +123,6 @@ "tm:meteorbeam", "tm:mudshot", "tm:mudslap", - "tm:powersplit", - "tm:powertrick", "tm:protect", "tm:rest", "tm:reversal", @@ -139,13 +130,11 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:safeguard", "tm:sandstorm", "tm:sandtomb", - "tm:shellsmash", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", @@ -153,19 +142,40 @@ "tm:smackdown", "tm:stealthrock", "tm:steelroller", - "tm:stickyweb", "tm:stoneedge", "tm:strength", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:terablast", "tm:toxic", "tm:venoshock", - "tm:withdraw", - "tm:wrap" + "tutor:afteryou", + "tutor:ancientpower", + "tutor:bind", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:covet", + "tutor:earthpower", + "tutor:gastroacid", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:knockoff", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stoneedge", + "tutor:stringshot", + "tutor:trick" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json b/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json index 7fb0f990cc..ac53aeb31e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/skarmory.json @@ -110,23 +110,19 @@ "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:autotomize", "tm:bodypress", "tm:bravebird", "tm:curse", "tm:cut", "tm:darkpulse", "tm:defog", - "tm:drillpeck", "tm:drillrun", "tm:dualwingbeat", "tm:endure", "tm:facade", - "tm:feint", "tm:flash", "tm:flashcannon", "tm:fly", - "tm:furyattack", "tm:furycutter", "tm:gigaimpact", "tm:guardswap", @@ -135,16 +131,12 @@ "tm:icywind", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:metalclaw", "tm:metalsound", - "tm:nightslash", "tm:ominouswind", "tm:payback", - "tm:peck", "tm:pluck", "tm:protect", - "tm:pursuit", "tm:rest", "tm:reversal", "tm:roar", @@ -152,12 +144,10 @@ "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:skyattack", "tm:skydrop", - "tm:slash", "tm:sleeptalk", "tm:spikes", "tm:stealthrock", @@ -174,9 +164,34 @@ "tm:thief", "tm:torment", "tm:twister", - "tm:whirlwind", - "tm:wingattack", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:darkpulse", + "tutor:defog", + "tutor:drillrun", + "tutor:dualwingbeat", + "tutor:flashcannon", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:ominouswind", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:xscissor" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json b/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json index 11e66e60b5..d0a2240761 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json @@ -90,17 +90,12 @@ "egg:strengthsap", "egg:switcheroo", "egg:worryseed", - "tm:absorb", "tm:acrobatics", "tm:aerialace", - "tm:aromatherapy", "tm:batonpass", "tm:bounce", "tm:bulletseed", "tm:charm", - "tm:confusion", - "tm:cottonguard", - "tm:cottonspore", "tm:dazzlinggleam", "tm:doubleedge", "tm:encore", @@ -108,7 +103,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", "tm:fling", "tm:gigadrain", @@ -118,42 +112,44 @@ "tm:helpinghand", "tm:infestation", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:lunge", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:payday", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:ragepowder", "tm:raindance", "tm:reflect", "tm:rest", "tm:seedbomb", "tm:silverwind", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", - "tm:splash", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:switcheroo", "tm:swordsdance", "tm:synthesis", - "tm:tackle", - "tm:tailwhip", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", "tm:uturn", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:bounce", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:tailwind", + "tutor:worryseed" ], "preEvolution": "hoppip", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json index ac68a0a43b..a772adea60 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/slowking.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/slowking.json @@ -115,8 +115,6 @@ "tm:amnesia", "tm:aquatail", "tm:avalanche", - "tm:belch", - "tm:bellydrum", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -125,11 +123,8 @@ "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:chillyreception", - "tm:confusion", "tm:curse", "tm:dig", - "tm:disable", "tm:dive", "tm:drainpunch", "tm:dreameater", @@ -150,10 +145,8 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:hail", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hydropump", "tm:hyperbeam", @@ -168,13 +161,11 @@ "tm:lightscreen", "tm:liquidation", "tm:magiccoat", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:muddywater", "tm:mudshot", - "tm:mudsport", "tm:nastyplot", "tm:payday", "tm:powergem", @@ -200,11 +191,9 @@ "tm:shadowball", "tm:signalbeam", "tm:skillswap", - "tm:slackoff", "tm:sleeptalk", "tm:snore", "tm:snowscape", - "tm:stomp", "tm:storedpower", "tm:strength", "tm:substitute", @@ -212,7 +201,6 @@ "tm:surf", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -221,15 +209,53 @@ "tm:triattack", "tm:trick", "tm:trickroom", - "tm:trumpcard", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", "tm:wonderroom", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:dive", + "tutor:drainpunch", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snore", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "slowpoke", "evolutions": [], @@ -319,12 +345,9 @@ "egg:bellydrum", "egg:block", "egg:stomp", - "tm:acid", "tm:acidspray", "tm:amnesia", "tm:avalanche", - "tm:belch", - "tm:bellydrum", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -333,15 +356,11 @@ "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:chillyreception", - "tm:confusion", "tm:curse", "tm:dig", - "tm:disable", "tm:dive", "tm:drainpunch", "tm:earthquake", - "tm:eeriespell", "tm:endure", "tm:expandingforce", "tm:facade", @@ -354,11 +373,9 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:hail", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hex", "tm:hydropump", @@ -394,13 +411,11 @@ "tm:scaryface", "tm:shadowball", "tm:skillswap", - "tm:slackoff", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snarl", "tm:snowscape", - "tm:stomp", "tm:stompingtantrum", "tm:storedpower", "tm:substitute", @@ -408,7 +423,6 @@ "tm:surf", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -426,8 +440,41 @@ "tm:weatherball", "tm:whirlpool", "tm:wonderroom", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:dive", + "tutor:drainpunch", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:liquidation", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spikes", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "slowpoke galarian", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation2/slugma.json b/common/src/main/resources/data/cobblemon/species/generation2/slugma.json index f69bfe655c..1f0cee9c1d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/slugma.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/slugma.json @@ -105,36 +105,28 @@ "egg:spitup", "egg:stockpile", "egg:swallow", - "tm:acidarmor", "tm:afteryou", "tm:amnesia", "tm:ancientpower", "tm:bodyslam", "tm:bulldoze", - "tm:clearsmog", "tm:curse", "tm:earthpower", "tm:earthquake", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:guardswap", - "tm:harden", "tm:heatcrash", "tm:heatwave", "tm:highhorsepower", "tm:incinerate", - "tm:inferno", "tm:infestation", "tm:irondefense", - "tm:lavaplume", "tm:lightscreen", - "tm:memento", "tm:mudshot", "tm:mudslap", "tm:naturepower", @@ -142,33 +134,42 @@ "tm:painsplit", "tm:powergem", "tm:protect", - "tm:recover", "tm:reflect", "tm:rest", "tm:rockblast", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", "tm:selfdestruct", "tm:sleeptalk", "tm:smackdown", - "tm:smog", - "tm:smokescreen", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:takedown", "tm:temperflare", "tm:terablast", "tm:willowisp", - "tm:yawn" + "tutor:afteryou", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:highhorsepower", + "tutor:irondefense", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/smeargle.json b/common/src/main/resources/data/cobblemon/species/generation2/smeargle.json index 1072fce932..c08f6f2c80 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/smeargle.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/smeargle.json @@ -55,8 +55,7 @@ } }, "moves": [ - "1:sketch", - "tm:sketch" + "1:sketch" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json index bb29f04e48..1396b8d791 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/smoochum.json @@ -91,8 +91,6 @@ "tm:calmmind", "tm:captivate", "tm:charm", - "tm:confusion", - "tm:copycat", "tm:covet", "tm:drainingkiss", "tm:dreameater", @@ -100,7 +98,6 @@ "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:flash", "tm:fling", @@ -108,28 +105,19 @@ "tm:grassknot", "tm:hail", "tm:healbell", - "tm:heartstamp", "tm:helpinghand", "tm:icebeam", "tm:icepunch", "tm:icywind", - "tm:lick", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:miracleeye", "tm:mudslap", "tm:nastyplot", "tm:payback", - "tm:perishsong", - "tm:pound", - "tm:powdersnow", "tm:protect", "tm:psychic", "tm:psychup", @@ -141,22 +129,41 @@ "tm:roleplay", "tm:shadowball", "tm:signalbeam", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:storedpower", "tm:substitute", - "tm:sweetkiss", "tm:terablast", "tm:thief", "tm:trick", "tm:trickroom", "tm:uproar", - "tm:wakeupslap", "tm:waterpulse", - "tm:wish", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:calmmind", + "tutor:covet", + "tutor:healbell", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json index 70af970148..11a6e92b42 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sneasel.json @@ -99,34 +99,24 @@ "egg:spite", "tm:aerialace", "tm:agility", - "tm:assist", "tm:avalanche", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:brickbreak", "tm:calmmind", - "tm:counter", - "tm:crushclaw", "tm:cut", "tm:darkpulse", "tm:dig", - "tm:doublehit", "tm:dreameater", "tm:embargo", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:falseswipe", - "tm:feint", - "tm:feintattack", "tm:fling", "tm:focuspunch", - "tm:foresight", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:hail", "tm:headbutt", @@ -134,15 +124,12 @@ "tm:honeclaws", "tm:icebeam", "tm:icepunch", - "tm:iceshard", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:irontail", "tm:knockoff", "tm:laserfocus", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -154,20 +141,15 @@ "tm:poweruppunch", "tm:protect", "tm:psychocut", - "tm:punishment", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", "tm:reversal", "tm:rocksmash", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -189,7 +171,39 @@ "tm:tripleaxel", "tm:upperhand", "tm:waterpulse", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:psychocut", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:tripleaxel", + "tutor:waterpulse", + "tutor:xscissor" ], "evolutions": [ { @@ -275,14 +289,10 @@ "tm:calmmind", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:dig", - "tm:doublehit", "tm:endure", "tm:facade", - "tm:fakeout", "tm:falseswipe", - "tm:feint", "tm:fling", "tm:focusblast", "tm:focusenergy", @@ -293,26 +303,20 @@ "tm:honeclaws", "tm:irontail", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:metalclaw", "tm:nastyplot", - "tm:nightslash", "tm:poisonjab", "tm:poisontail", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:reversal", "tm:rocksmash", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -320,7 +324,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -332,7 +335,32 @@ "tm:trailblaze", "tm:vacuumwave", "tm:venoshock", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bulkup", + "tutor:calmmind", + "tutor:coaching", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:irontail", + "tutor:lashout", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:vacuumwave", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json b/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json index 246f627111..fa60252a64 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/snubbull.json @@ -98,14 +98,12 @@ "egg:retaliate", "egg:smellingsalts", "egg:snore", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", "tm:closecombat", - "tm:counter", "tm:covet", "tm:crunch", "tm:curse", @@ -118,14 +116,12 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:fireblast", "tm:firefang", "tm:firepunch", "tm:flamethrower", "tm:fling", "tm:focuspunch", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -135,21 +131,17 @@ "tm:incinerate", "tm:lashout", "tm:lastresort", - "tm:lick", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mimic", "tm:mudslap", "tm:overheat", "tm:payback", "tm:playrough", "tm:poweruppunch", - "tm:present", "tm:protect", "tm:psychicfangs", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -161,7 +153,6 @@ "tm:shockwave", "tm:sleeptalk", "tm:sludgebomb", - "tm:smellingsalts", "tm:snarl", "tm:snore", "tm:solarbeam", @@ -172,8 +163,6 @@ "tm:sunnyday", "tm:superfang", "tm:superpower", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:temperflare", @@ -189,7 +178,45 @@ "tm:uproar", "tm:waterpulse", "tm:wildcharge", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icefang", + "tutor:icepunch", + "tutor:lashout", + "tutor:lastresort", + "tutor:lowkick", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snore", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json index 68aa24bc8b..e4561d8f7c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/spinarak.json @@ -96,7 +96,6 @@ "egg:ragepowder", "egg:sonicboom", "egg:twineedle", - "tm:absorb", "tm:acidspray", "tm:agility", "tm:assurance", @@ -104,16 +103,13 @@ "tm:bounce", "tm:bugbite", "tm:bugbuzz", - "tm:constrict", "tm:crosspoison", "tm:dig", - "tm:disable", "tm:electroweb", "tm:endure", "tm:facade", "tm:flash", "tm:foulplay", - "tm:furyswipes", "tm:gigadrain", "tm:hex", "tm:honeclaws", @@ -123,29 +119,21 @@ "tm:lunge", "tm:megahorn", "tm:nightshade", - "tm:nightslash", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:pounce", "tm:protect", "tm:psychic", - "tm:pursuit", - "tm:ragepowder", "tm:rest", "tm:scaryface", "tm:screech", - "tm:shadowsneak", "tm:signalbeam", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:solarbeam", - "tm:sonicboom", - "tm:spiderweb", "tm:spite", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -155,11 +143,29 @@ "tm:thief", "tm:toxic", "tm:toxicspikes", - "tm:toxicthread", "tm:trailblaze", - "tm:twineedle", "tm:venoshock", - "tm:xscissor" + "tm:xscissor", + "tutor:bounce", + "tutor:bugbite", + "tutor:electroweb", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:knockoff", + "tutor:leechlife", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/stantler.json b/common/src/main/resources/data/cobblemon/species/generation2/stantler.json index b8908a8a1b..4083c7d108 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/stantler.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/stantler.json @@ -97,8 +97,6 @@ "egg:swagger", "egg:thrash", "tm:agility", - "tm:astonish", - "tm:bite", "tm:bodyslam", "tm:bounce", "tm:bulldoze", @@ -108,16 +106,13 @@ "tm:confuseray", "tm:curse", "tm:dig", - "tm:disable", "tm:doubleedge", - "tm:doublekick", "tm:dreameater", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:energyball", "tm:entrainment", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:futuresight", @@ -126,32 +121,24 @@ "tm:headbutt", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:irontail", - "tm:jumpkick", "tm:lastresort", - "tm:leer", "tm:lightscreen", "tm:lunge", "tm:magicroom", - "tm:mefirst", "tm:megahorn", - "tm:mudsport", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:psyshieldbash", "tm:psyshock", - "tm:rage", "tm:raindance", "tm:reflect", "tm:rest", "tm:retaliate", "tm:roar", "tm:roleplay", - "tm:sandattack", "tm:scaryface", "tm:shadowball", "tm:shockwave", @@ -160,18 +147,15 @@ "tm:sleeptalk", "tm:solarbeam", "tm:spite", - "tm:stomp", "tm:storedpower", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", @@ -182,7 +166,38 @@ "tm:uproar", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:lastresort", + "tutor:magicroom", + "tutor:megahorn", + "tutor:psychic", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json index 0b13b3799f..e19ae99599 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/steelix.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/steelix.json @@ -115,7 +115,6 @@ "egg:wideguard", "tm:ancientpower", "tm:aquatail", - "tm:autotomize", "tm:bind", "tm:block", "tm:bodypress", @@ -127,10 +126,8 @@ "tm:curse", "tm:cut", "tm:darkpulse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", @@ -141,13 +138,10 @@ "tm:explosion", "tm:facade", "tm:firefang", - "tm:flail", "tm:flashcannon", "tm:gigaimpact", "tm:gyroball", - "tm:harden", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:highhorsepower", "tm:hyperbeam", @@ -159,14 +153,12 @@ "tm:magnetrise", "tm:meteorbeam", "tm:mudslap", - "tm:mudsport", "tm:naturepower", "tm:payback", "tm:powershift", "tm:protect", "tm:psychicfangs", "tm:psychup", - "tm:rage", "tm:rest", "tm:roar", "tm:rockblast", @@ -174,17 +166,14 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", - "tm:rototiller", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", "tm:scorchingsands", "tm:screech", "tm:selfdestruct", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -195,13 +184,48 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:taunt", "tm:terablast", "tm:thunderfang", "tm:torment", "tm:twister", - "tm:wideguard" + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:drillrun", + "tutor:earthpower", + "tutor:firefang", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icefang", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderfang", + "tutor:twister" ], "preEvolution": "onix", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json index 80bd7d179d..a62a328059 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json @@ -104,11 +104,8 @@ "tm:brickbreak", "tm:bulldoze", "tm:calmmind", - "tm:copycat", - "tm:counter", "tm:covet", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:drainpunch", @@ -119,18 +116,13 @@ "tm:explosion", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:firepunch", - "tm:flail", "tm:fling", "tm:focuspunch", "tm:foulplay", "tm:gigaimpact", "tm:grassknot", - "tm:hammerarm", - "tm:harden", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", @@ -141,7 +133,6 @@ "tm:megakick", "tm:megapunch", "tm:meteorbeam", - "tm:mimic", "tm:mudshot", "tm:mudslap", "tm:naturepower", @@ -154,14 +145,12 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:roleplay", "tm:rollout", "tm:sandstorm", "tm:sandtomb", "tm:selfdestruct", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:spikes", @@ -174,13 +163,43 @@ "tm:sunnyday", "tm:takedown", "tm:taunt", - "tm:tearfullook", "tm:terablast", "tm:thief", "tm:thunderpunch", "tm:torment", "tm:trailblaze", - "tm:woodhammer" + "tutor:afteryou", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:covet", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:thunderpunch" ], "preEvolution": "bonsly", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/suicune.json b/common/src/main/resources/data/cobblemon/species/generation2/suicune.json index 1244cac59b..1660731c77 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/suicune.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/suicune.json @@ -79,13 +79,10 @@ "78:blizzard", "tm:agility", "tm:airslash", - "tm:aurorabeam", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bubblebeam", "tm:calmmind", "tm:chillingwater", "tm:crunch", @@ -93,11 +90,8 @@ "tm:dive", "tm:doubleedge", "tm:endure", - "tm:extrasensory", - "tm:extremespeed", "tm:facade", "tm:gigaimpact", - "tm:gust", "tm:hail", "tm:headbutt", "tm:helpinghand", @@ -109,10 +103,7 @@ "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:liquidation", - "tm:mirrorcoat", - "tm:mist", "tm:ominouswind", "tm:protect", "tm:quash", @@ -124,7 +115,6 @@ "tm:sandstorm", "tm:scald", "tm:shadowball", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:snarl", @@ -137,10 +127,31 @@ "tm:terablast", "tm:trailblaze", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:calmmind", + "tutor:dive", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:ominouswind", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:tailwind", + "tutor:waterpulse" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json b/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json index e2fa34c620..9d8a367d3a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json @@ -103,9 +103,7 @@ "egg:morningsun", "egg:naturalgift", "egg:sweetscent", - "tm:absorb", "tm:afteryou", - "tm:bide", "tm:bulletseed", "tm:curse", "tm:cut", @@ -118,32 +116,22 @@ "tm:energyball", "tm:facade", "tm:flash", - "tm:flowershield", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:hyperbeam", - "tm:ingrain", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:megadrain", - "tm:morningsun", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", - "tm:pound", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", @@ -152,15 +140,30 @@ "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:trailblaze", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "sunkern", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json b/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json index 51c392c0a6..aa36a9ab3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json @@ -97,9 +97,7 @@ "egg:morningsun", "egg:naturalgift", "egg:sweetscent", - "tm:absorb", "tm:afteryou", - "tm:bide", "tm:bulletseed", "tm:curse", "tm:cut", @@ -113,22 +111,15 @@ "tm:flash", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", - "tm:ingrain", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:megadrain", - "tm:morningsun", "tm:naturalgift", "tm:naturepower", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", @@ -136,14 +127,24 @@ "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:trailblaze", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:earthpower", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/swinub.json b/common/src/main/resources/data/cobblemon/species/generation2/swinub.json index 4e4b4fda3e..dce47553ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/swinub.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/swinub.json @@ -102,7 +102,6 @@ "tm:ancientpower", "tm:avalanche", "tm:babydolleyes", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:bulldoze", @@ -115,26 +114,16 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", - "tm:freezedry", "tm:hail", "tm:haze", "tm:headbutt", "tm:highhorsepower", "tm:icebeam", "tm:icefang", - "tm:iceshard", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", - "tm:mist", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:odorsleuth", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -155,10 +144,27 @@ "tm:strength", "tm:substitute", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:trailblaze" + "tm:trailblaze", + "tutor:ancientpower", + "tutor:babydolleyes", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:highhorsepower", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json b/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json index abe14b2ee7..77ec91195b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/teddiursa.json @@ -110,17 +110,13 @@ "tm:aerialace", "tm:avalanche", "tm:babydolleyes", - "tm:bellydrum", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", - "tm:chipaway", "tm:closecombat", - "tm:counter", "tm:covet", - "tm:crosschop", "tm:crunch", "tm:cut", "tm:dig", @@ -129,13 +125,11 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:firepunch", "tm:fling", "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gunkshot", "tm:headbutt", "tm:helpinghand", @@ -143,16 +137,12 @@ "tm:hypervoice", "tm:icepunch", "tm:lastresort", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:metalclaw", "tm:metronome", - "tm:nightslash", "tm:payback", - "tm:playnice", "tm:playrough", "tm:poweruppunch", "tm:protect", @@ -163,11 +153,8 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:scratch", "tm:seedbomb", - "tm:seismictoss", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:snore", @@ -175,20 +162,45 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderpunch", "tm:torment", "tm:trailblaze", "tm:uproar", "tm:workup", - "tm:yawn" + "tutor:aerialace", + "tutor:babydolleyes", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:lastresort", + "tutor:lowkick", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snore", + "tutor:superpower", + "tutor:swift", + "tutor:thunderpunch", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/togepi.json b/common/src/main/resources/data/cobblemon/species/generation2/togepi.json index a7e37c7859..96ea56b0e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/togepi.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/togepi.json @@ -97,7 +97,6 @@ "tm:ancientpower", "tm:babydolleyes", "tm:batonpass", - "tm:bestow", "tm:bodyslam", "tm:charm", "tm:covet", @@ -109,42 +108,30 @@ "tm:encore", "tm:endeavor", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:flamethrower", "tm:flash", "tm:fling", - "tm:followme", - "tm:foresight", "tm:futuresight", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", "tm:hypervoice", "tm:incinerate", "tm:lastresort", - "tm:lifedew", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mirrormove", - "tm:morningsun", "tm:mudslap", "tm:mysticalfire", "tm:nastyplot", - "tm:peck", "tm:playrough", - "tm:pound", - "tm:present", "tm:protect", "tm:psychic", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", @@ -162,7 +149,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:telekinesis", "tm:terablast", @@ -171,10 +157,38 @@ "tm:trick", "tm:uproar", "tm:waterpulse", - "tm:wish", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:afteryou", + "tutor:ancientpower", + "tutor:babydolleyes", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json index 6c8fc304f6..adbe29989b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json @@ -101,7 +101,6 @@ "tm:ancientpower", "tm:babydolleyes", "tm:batonpass", - "tm:bestow", "tm:bodyslam", "tm:brickbreak", "tm:charm", @@ -117,21 +116,16 @@ "tm:encore", "tm:endeavor", "tm:endure", - "tm:extrasensory", "tm:facade", - "tm:fairywind", "tm:fireblast", "tm:flamethrower", "tm:flash", "tm:fling", "tm:fly", "tm:focuspunch", - "tm:followme", - "tm:foresight", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:heatwave", @@ -141,27 +135,19 @@ "tm:imprison", "tm:incinerate", "tm:lastresort", - "tm:lifedew", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mirrormove", - "tm:morningsun", "tm:mudslap", "tm:mysticalfire", "tm:nastyplot", "tm:ominouswind", - "tm:peck", "tm:playrough", - "tm:pound", - "tm:present", "tm:protect", "tm:psychic", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", @@ -184,7 +170,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:tailwind", "tm:telekinesis", @@ -195,10 +180,51 @@ "tm:twister", "tm:uproar", "tm:waterpulse", - "tm:wish", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:afteryou", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:babydolleyes", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:drainpunch", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:roost", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:twister", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "togepi", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/totodile.json b/common/src/main/resources/data/cobblemon/species/generation2/totodile.json index 9921f51e66..8a470763bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/totodile.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/totodile.json @@ -104,16 +104,12 @@ "egg:watersport", "tm:aerialace", "tm:ancientpower", - "tm:aquajet", "tm:aquatail", - "tm:bite", "tm:blizzard", "tm:block", "tm:breakingswipe", "tm:brickbreak", "tm:chillingwater", - "tm:chipaway", - "tm:counter", "tm:crunch", "tm:curse", "tm:cut", @@ -126,8 +122,6 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:flail", - "tm:flatter", "tm:fling", "tm:flipturn", "tm:focuspunch", @@ -140,7 +134,6 @@ "tm:icepunch", "tm:icywind", "tm:irontail", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:megakick", @@ -148,19 +141,15 @@ "tm:metalclaw", "tm:muddywater", "tm:mudslap", - "tm:mudsport", "tm:poweruppunch", "tm:protect", - "tm:rage", "tm:raindance", "tm:rest", "tm:rockslide", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:spite", "tm:substitute", @@ -170,16 +159,38 @@ "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:trailblaze", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:superpower", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json index 2084dab62d..fc76ea568d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/typhlosion.json @@ -108,49 +108,35 @@ "tm:burningjealousy", "tm:burnup", "tm:covet", - "tm:crushclaw", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:earthquake", - "tm:ember", "tm:endeavor", "tm:endure", - "tm:eruption", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firefang", "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:foresight", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:gyroball", "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:incinerate", - "tm:inferno", "tm:ironhead", "tm:laserfocus", - "tm:lavaplume", - "tm:leer", "tm:lowkick", "tm:megakick", "tm:megapunch", @@ -160,7 +146,6 @@ "tm:playrough", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:roar", @@ -173,24 +158,56 @@ "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", - "tm:smokescreen", "tm:solarbeam", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:thunderpunch", "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:blastburn", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:covet", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "quilava", "evolutions": [], @@ -264,45 +281,30 @@ "tm:calmmind", "tm:confuseray", "tm:covet", - "tm:crushclaw", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:earthquake", - "tm:ember", "tm:endeavor", "tm:endure", - "tm:eruption", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firefang", "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:focusblast", "tm:focuspunch", - "tm:foresight", - "tm:furyswipes", "tm:gigaimpact", "tm:gyroball", "tm:heatwave", "tm:hex", - "tm:howl", "tm:hyperbeam", - "tm:infernalparade", - "tm:inferno", "tm:ironhead", "tm:irontail", - "tm:lavaplume", - "tm:leer", "tm:lowkick", "tm:mysticalfire", "tm:nightshade", @@ -311,7 +313,6 @@ "tm:playrough", "tm:poltergeist", "tm:protect", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:roar", @@ -321,22 +322,54 @@ "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", - "tm:smokescreen", "tm:solarbeam", "tm:spite", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:thunderpunch", "tm:wildcharge", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:blastburn", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:covet", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:lowkick", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:playrough", + "tutor:poltergeist", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:thunderpunch", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "quilava", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json b/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json index c935ca63e5..3092ff511a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/tyranitar.json @@ -112,7 +112,6 @@ "tm:aquatail", "tm:assurance", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodypress", @@ -121,7 +120,6 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:chipaway", "tm:crunch", "tm:curse", "tm:cut", @@ -165,7 +163,6 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:megakick", "tm:megapunch", @@ -177,7 +174,6 @@ "tm:powergem", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -188,7 +184,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:sandtomb", @@ -201,7 +196,6 @@ "tm:snarl", "tm:spite", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -209,17 +203,61 @@ "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", "tm:thunderwave", - "tm:torment" + "tm:torment", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch" ], "preEvolution": "pupitar", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json b/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json index e11d486370..645690e8e9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/tyrogue.json @@ -89,29 +89,19 @@ "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", - "tm:counter", "tm:covet", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", "tm:focusenergy", - "tm:foresight", "tm:headbutt", "tm:helpinghand", - "tm:highjumpkick", "tm:laserfocus", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:megakick", "tm:megapunch", - "tm:mindreader", "tm:protect", - "tm:pursuit", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:retaliate", "tm:rockslide", @@ -122,14 +112,28 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", "tm:upperhand", "tm:uproar", "tm:vacuumwave", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:swift", + "tutor:uproar", + "tutor:vacuumwave" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json index db9fa53d11..0233c6f7be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json @@ -104,34 +104,27 @@ "tm:assurance", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:calmmind", "tm:captivate", "tm:charm", "tm:confuseray", - "tm:copycat", "tm:covet", "tm:crunch", "tm:curse", "tm:cut", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:dreameater", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:faketears", - "tm:feintattack", - "tm:flail", "tm:flash", "tm:focusenergy", "tm:foulplay", "tm:gigaimpact", - "tm:growl", "tm:guardswap", "tm:headbutt", "tm:healbell", @@ -143,8 +136,6 @@ "tm:lashout", "tm:lastresort", "tm:lightscreen", - "tm:meanlook", - "tm:moonlight", "tm:mudslap", "tm:naturalgift", "tm:payback", @@ -153,15 +144,11 @@ "tm:protect", "tm:psychic", "tm:psychup", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", - "tm:sandattack", "tm:scaryface", "tm:screech", "tm:shadowball", @@ -175,25 +162,47 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swift", - "tm:synchronoise", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:throatchop", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:toxic", "tm:trailblaze", - "tm:trumpcard", "tm:weatherball", - "tm:wish", "tm:wonderroom", "tm:workup", - "tm:yawn" + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:focusenergy", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lastresort", + "tutor:mudslap", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:wonderroom" ], "preEvolution": "eevee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/unown.json b/common/src/main/resources/data/cobblemon/species/generation2/unown.json index 15137f9de8..6b8ca2cd9e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/unown.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/unown.json @@ -58,8 +58,7 @@ ] }, "moves": [ - "1:hiddenpower", - "tm:hiddenpower" + "1:hiddenpower" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json index 2e0297fb3c..c242f4384f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/ursaring.json @@ -105,17 +105,13 @@ "tm:aerialace", "tm:avalanche", "tm:babydolleyes", - "tm:bellydrum", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", - "tm:chipaway", "tm:closecombat", - "tm:counter", "tm:covet", - "tm:crosschop", "tm:crunch", "tm:cut", "tm:dig", @@ -124,16 +120,13 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:firepunch", "tm:fling", "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:gunkshot", - "tm:hammerarm", "tm:headbutt", "tm:helpinghand", "tm:highhorsepower", @@ -143,16 +136,12 @@ "tm:icepunch", "tm:laserfocus", "tm:lastresort", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:metalclaw", "tm:metronome", - "tm:nightslash", "tm:payback", - "tm:playnice", "tm:playrough", "tm:poweruppunch", "tm:protect", @@ -165,11 +154,8 @@ "tm:rocktomb", "tm:rollout", "tm:scaryface", - "tm:scratch", "tm:seedbomb", - "tm:seismictoss", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:snore", @@ -179,21 +165,53 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunderpunch", "tm:torment", "tm:trailblaze", "tm:uproar", "tm:workup", - "tm:yawn" + "tutor:aerialace", + "tutor:babydolleyes", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:uproar" ], "preEvolution": "teddiursa", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json b/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json index 2aef72f325..24a408a678 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json @@ -80,12 +80,8 @@ "1:amnesia", "tm:amnesia", "tm:charm", - "tm:counter", - "tm:destinybond", "tm:encore", - "tm:mirrorcoat", - "tm:safeguard", - "tm:splash" + "tm:safeguard" ], "preEvolution": "wynaut", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/wooper.json b/common/src/main/resources/data/cobblemon/species/generation2/wooper.json index d16c2993f0..f71743a407 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/wooper.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/wooper.json @@ -120,12 +120,10 @@ "tm:bodyslam", "tm:bulldoze", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:encore", @@ -143,16 +141,12 @@ "tm:infestation", "tm:irontail", "tm:liquidation", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:poweruppunch", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:rockslide", "tm:rocksmash", @@ -160,30 +154,46 @@ "tm:rollout", "tm:safeguard", "tm:sandstorm", - "tm:slam", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snowscape", "tm:spikes", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:surf", - "tm:swallow", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:toxic", "tm:trailblaze", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:yawn" + "tutor:afteryou", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:waterpulse" ], "evolutions": [ { @@ -269,11 +279,9 @@ "tm:bodyslam", "tm:bulldoze", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -284,33 +292,25 @@ "tm:hydropump", "tm:liquidation", "tm:lowkick", - "tm:mist", "tm:mudshot", "tm:mudslap", "tm:poisonjab", "tm:poisontail", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:rockslide", "tm:rocktomb", "tm:sandstorm", - "tm:slam", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:spikes", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:surf", - "tm:swallow", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:toxic", @@ -319,7 +319,25 @@ "tm:venoshock", "tm:waterfall", "tm:waterpulse", - "tm:yawn" + "tutor:afteryou", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation2/xatu.json b/common/src/main/resources/data/cobblemon/species/generation2/xatu.json index 6457f0b4e3..fea5aa8915 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/xatu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/xatu.json @@ -122,13 +122,11 @@ "tm:dazzlinggleam", "tm:defog", "tm:dreameater", - "tm:drillpeck", "tm:dualwingbeat", "tm:endure", "tm:expandingforce", "tm:facade", "tm:featherdance", - "tm:feintattack", "tm:flash", "tm:fly", "tm:foulplay", @@ -142,34 +140,25 @@ "tm:hyperbeam", "tm:imprison", "tm:laserfocus", - "tm:leer", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", - "tm:mefirst", - "tm:miracleeye", "tm:nightshade", "tm:ominouswind", "tm:painsplit", - "tm:peck", "tm:pluck", "tm:powerswap", "tm:protect", "tm:psychic", - "tm:psychoshift", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:roost", "tm:shadowball", "tm:signalbeam", "tm:silverwind", - "tm:simplebeam", "tm:skillswap", "tm:skyattack", "tm:sleeptalk", @@ -180,10 +169,8 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swift", - "tm:synchronoise", "tm:tailwind", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderwave", @@ -191,8 +178,40 @@ "tm:trickroom", "tm:twister", "tm:uturn", - "tm:wish", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:twister", + "tutor:zenheadbutt" ], "preEvolution": "natu", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation2/yanma.json b/common/src/main/resources/data/cobblemon/species/generation2/yanma.json index b42ad67ae0..5740fb1eb8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/yanma.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/yanma.json @@ -99,20 +99,15 @@ "tm:bugbite", "tm:bugbuzz", "tm:defog", - "tm:detect", "tm:doubleedge", "tm:doubleteam", "tm:dreameater", "tm:endure", "tm:facade", - "tm:feint", - "tm:feintattack", "tm:flash", - "tm:foresight", "tm:gigadrain", "tm:gust", "tm:headbutt", - "tm:hypnosis", "tm:leechlife", "tm:lunge", "tm:ominouswind", @@ -121,8 +116,6 @@ "tm:psychic", "tm:psychicnoise", "tm:psychup", - "tm:pursuit", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:roost", @@ -134,24 +127,38 @@ "tm:skittersmack", "tm:sleeptalk", "tm:solarbeam", - "tm:sonicboom", "tm:steelwing", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:bugbite", + "tutor:defog", + "tutor:gigadrain", + "tutor:leechlife", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/absol.json b/common/src/main/resources/data/cobblemon/species/generation3/absol.json index 9ea7fd959b..812fbc7762 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/absol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/absol.json @@ -95,7 +95,6 @@ "tm:airslash", "tm:assurance", "tm:batonpass", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:bounce", @@ -106,7 +105,6 @@ "tm:curse", "tm:cut", "tm:darkpulse", - "tm:detect", "tm:doubleedge", "tm:doubleteam", "tm:dreameater", @@ -114,8 +112,6 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", - "tm:feintattack", "tm:fireblast", "tm:flamethrower", "tm:flash", @@ -135,24 +131,15 @@ "tm:irontail", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:magiccoat", - "tm:meanlook", - "tm:mefirst", "tm:megahorn", "tm:mudslap", - "tm:nightslash", "tm:payback", - "tm:perishsong", "tm:playrough", "tm:protect", "tm:psychocut", "tm:psychup", - "tm:punishment", - "tm:pursuit", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:retaliate", "tm:rockslide", @@ -160,11 +147,9 @@ "tm:rocktomb", "tm:roleplay", "tm:sandstorm", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -188,7 +173,49 @@ "tm:waterpulse", "tm:willowisp", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bounce", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:falseswipe", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:megahorn", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/aggron.json b/common/src/main/resources/data/cobblemon/species/generation3/aggron.json index 4d4d466831..75ff06e6f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/aggron.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/aggron.json @@ -101,7 +101,6 @@ "tm:aerialace", "tm:ancientpower", "tm:aquatail", - "tm:autotomize", "tm:avalanche", "tm:blizzard", "tm:block", @@ -118,7 +117,6 @@ "tm:doubleedge", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:earthpower", "tm:earthquake", @@ -134,9 +132,7 @@ "tm:focuspunch", "tm:furycutter", "tm:gigaimpact", - "tm:harden", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:highhorsepower", "tm:honeclaws", @@ -153,7 +149,6 @@ "tm:magnetrise", "tm:megakick", "tm:megapunch", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:meteorbeam", @@ -182,13 +177,11 @@ "tm:sleeptalk", "tm:smackdown", "tm:smartstrike", - "tm:smellingsalts", "tm:solarbeam", "tm:spite", "tm:stealthrock", "tm:steelbeam", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -196,7 +189,6 @@ "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -206,7 +198,53 @@ "tm:thunderwave", "tm:uproar", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "lairon", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json index e6a82e2e93..0210db4bcf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json @@ -100,23 +100,19 @@ "tm:aerialace", "tm:agility", "tm:alluringvoice", - "tm:astonish", "tm:bodyslam", "tm:bravebird", "tm:breakingswipe", "tm:bulldoze", - "tm:cottonguard", "tm:dazzlinggleam", "tm:defog", "tm:disarmingvoice", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dreameater", "tm:dualwingbeat", "tm:earthquake", @@ -129,9 +125,7 @@ "tm:firespin", "tm:flamethrower", "tm:fly", - "tm:furyattack", "tm:gigaimpact", - "tm:growl", "tm:haze", "tm:healbell", "tm:heatwave", @@ -143,29 +137,20 @@ "tm:icebeam", "tm:incinerate", "tm:irontail", - "tm:mirrormove", - "tm:mist", - "tm:moonblast", "tm:naturalgift", "tm:ominouswind", "tm:outrage", - "tm:peck", - "tm:perishsong", "tm:playrough", "tm:pluck", "tm:powerswap", "tm:protect", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:refresh", "tm:rest", "tm:roar", "tm:rocksmash", "tm:roost", "tm:round", "tm:safeguard", - "tm:sing", "tm:skyattack", "tm:sleeptalk", "tm:snowscape", @@ -182,7 +167,36 @@ "tm:twister", "tm:weatherball", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:irontail", + "tutor:ominouswind", + "tutor:outrage", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:wonderroom" ], "preEvolution": "swablu", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/anorith.json b/common/src/main/resources/data/cobblemon/species/generation3/anorith.json index dbfce93a64..e704e1c067 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/anorith.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/anorith.json @@ -101,13 +101,11 @@ "egg:waterpulse", "tm:aerialace", "tm:ancientpower", - "tm:aquajet", "tm:bodyslam", "tm:brickbreak", "tm:brine", "tm:bugbite", "tm:crosspoison", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", @@ -116,7 +114,6 @@ "tm:facade", "tm:falseswipe", "tm:furycutter", - "tm:harden", "tm:headbutt", "tm:honeclaws", "tm:irondefense", @@ -125,20 +122,15 @@ "tm:meteorbeam", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockblast", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", - "tm:scratch", "tm:screech", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -148,9 +140,26 @@ "tm:sunnyday", "tm:swordsdance", "tm:terablast", - "tm:watergun", "tm:waterpulse", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bugbite", + "tutor:earthpower", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:irondefense", + "tutor:knockoff", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stringshot", + "tutor:waterpulse", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json b/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json index c8cc91fb04..bbf86bfc7a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/armaldo.json @@ -100,7 +100,6 @@ "egg:waterpulse", "tm:aerialace", "tm:ancientpower", - "tm:aquajet", "tm:aquatail", "tm:block", "tm:bodyslam", @@ -110,7 +109,6 @@ "tm:bugbite", "tm:bulldoze", "tm:crosspoison", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", @@ -122,7 +120,6 @@ "tm:flashcannon", "tm:furycutter", "tm:gigaimpact", - "tm:harden", "tm:headbutt", "tm:honeclaws", "tm:hyperbeam", @@ -135,21 +132,16 @@ "tm:meteorbeam", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockblast", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -163,9 +155,39 @@ "tm:superpower", "tm:swordsdance", "tm:terablast", - "tm:watergun", "tm:waterpulse", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:stringshot", + "tutor:superpower", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "anorith", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/aron.json b/common/src/main/resources/data/cobblemon/species/generation3/aron.json index b13b305163..4d25333cd6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/aron.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/aron.json @@ -100,7 +100,6 @@ "egg:stomp", "tm:aerialace", "tm:ancientpower", - "tm:autotomize", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -108,23 +107,19 @@ "tm:cut", "tm:dig", "tm:doubleedge", - "tm:dragonrush", "tm:earthpower", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", "tm:furycutter", - "tm:harden", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:honeclaws", "tm:irondefense", "tm:ironhead", "tm:irontail", "tm:magnetrise", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:mudslap", @@ -143,21 +138,43 @@ "tm:shadowclaw", "tm:shockwave", "tm:sleeptalk", - "tm:smellingsalts", "tm:spite", "tm:stealthrock", "tm:steelbeam", "tm:steelroller", - "tm:stomp", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:uproar", - "tm:waterpulse" + "tm:waterpulse", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:furycutter", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:superpower", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/azurill.json b/common/src/main/resources/data/cobblemon/species/generation3/azurill.json index 09b1198e8a..d883953832 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/azurill.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/azurill.json @@ -82,17 +82,11 @@ "egg:tickle", "egg:watersport", "tm:alluringvoice", - "tm:aquajet", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:bounce", "tm:brutalswing", - "tm:bubble", - "tm:bubblebeam", - "tm:camouflage", "tm:charm", - "tm:copycat", "tm:covet", "tm:drainingkiss", "tm:encore", @@ -109,29 +103,28 @@ "tm:lightscreen", "tm:mudshot", "tm:mudslap", - "tm:perishsong", - "tm:present", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rollout", - "tm:sing", - "tm:slam", "tm:sleeptalk", - "tm:soak", - "tm:splash", "tm:substitute", - "tm:supersonic", "tm:surf", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:waterfall", - "tm:watergun", - "tm:watersport", - "tm:workup" + "tm:workup", + "tutor:bounce", + "tutor:covet", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rollout", + "tutor:sleeptalk" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/bagon.json b/common/src/main/resources/data/cobblemon/species/generation3/bagon.json index 156579a0b6..8fdb059cea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/bagon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/bagon.json @@ -91,23 +91,17 @@ "egg:dragonrush", "egg:thrash", "egg:twister", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:crunch", "tm:cut", - "tm:defensecurl", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", @@ -124,11 +118,9 @@ "tm:incinerate", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:mudslap", "tm:outrage", "tm:protect", - "tm:rage", "tm:raindance", "tm:rest", "tm:roar", @@ -143,10 +135,29 @@ "tm:sunnyday", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:thunderfang", "tm:twister", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:firefang", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:thunderfang", + "tutor:twister", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json b/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json index 99a5054d03..3f0b3f098b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/baltoy.json @@ -100,7 +100,6 @@ "tm:bulldoze", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:dazzlinggleam", "tm:dig", @@ -112,26 +111,20 @@ "tm:endure", "tm:expandingforce", "tm:explosion", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:grassknot", "tm:gravity", - "tm:guardsplit", "tm:guardswap", "tm:gyroball", - "tm:harden", "tm:headbutt", - "tm:healblock", "tm:hex", "tm:icebeam", "tm:imprison", "tm:lightscreen", "tm:magiccoat", "tm:mudslap", - "tm:powersplit", "tm:powerswap", - "tm:powertrick", "tm:protect", "tm:psybeam", "tm:psychic", @@ -139,7 +132,6 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:rapidspin", "tm:recycle", "tm:reflect", "tm:rest", @@ -165,7 +157,35 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drillrun", + "tutor:earthpower", + "tutor:expandingforce", + "tutor:gravity", + "tutor:icebeam", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/banette.json b/common/src/main/resources/data/cobblemon/species/generation3/banette.json index 0f4a8b3e33..7d92438489 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/banette.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/banette.json @@ -82,7 +82,6 @@ "egg:pursuit", "egg:shadowsneak", "tm:allyswitch", - "tm:astonish", "tm:burningjealousy", "tm:calmmind", "tm:chargebeam", @@ -90,17 +89,13 @@ "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:encore", "tm:endure", "tm:facade", - "tm:feintattack", "tm:flash", "tm:fling", - "tm:foresight", "tm:foulplay", "tm:gigaimpact", "tm:grudge", @@ -129,7 +124,6 @@ "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:roleplay", @@ -137,7 +131,6 @@ "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:shockwave", "tm:skillswap", "tm:skittersmack", @@ -160,7 +153,42 @@ "tm:trailblaze", "tm:trick", "tm:trickroom", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:trick" ], "preEvolution": "shuppet", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/barboach.json b/common/src/main/resources/data/cobblemon/species/generation3/barboach.json index 00c200009f..344a0b2960 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/barboach.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/barboach.json @@ -109,8 +109,6 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", "tm:futuresight", "tm:hail", "tm:headbutt", @@ -120,12 +118,9 @@ "tm:icebeam", "tm:icywind", "tm:liquidation", - "tm:magnitude", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:outrage", "tm:protect", "tm:raindance", @@ -135,7 +130,6 @@ "tm:sandstorm", "tm:sleeptalk", "tm:snore", - "tm:spark", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -145,13 +139,32 @@ "tm:swift", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json index 0f93d31b61..0442fa4674 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json @@ -78,7 +78,6 @@ "35:bugbuzz", "37:rage", "40:quiverdance", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:aircutter", @@ -95,20 +94,13 @@ "tm:flash", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", - "tm:harden", "tm:hyperbeam", "tm:infestation", "tm:irondefense", "tm:laserfocus", - "tm:megadrain", - "tm:morningsun", "tm:ominouswind", - "tm:poisonsting", "tm:protect", "tm:psychic", - "tm:quiverdance", - "tm:rage", "tm:rest", "tm:roost", "tm:safeguard", @@ -120,17 +112,37 @@ "tm:solarbeam", "tm:stringshot", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:twister", "tm:uturn", "tm:venoshock", - "tm:whirlwind" + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:tailwind", + "tutor:twister" ], "preEvolution": "silcoon", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/beldum.json b/common/src/main/resources/data/cobblemon/species/generation3/beldum.json index 9d922bfa34..7b686a725c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/beldum.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/beldum.json @@ -83,10 +83,13 @@ "tm:irondefense", "tm:ironhead", "tm:steelbeam", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:irondefense", + "tutor:ironhead", + "tutor:steelbeam", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json index b6776861ff..c48339dfd2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/blaziken.json @@ -116,27 +116,20 @@ "tm:bulldoze", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:crushclaw", "tm:curse", "tm:cut", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:dualchop", "tm:earthquake", "tm:echoedvoice", - "tm:ember", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feint", "tm:fireblast", "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -146,12 +139,10 @@ "tm:focuspunch", "tm:furycutter", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:heatcrash", "tm:heatwave", "tm:helpinghand", - "tm:highjumpkick", "tm:honeclaws", "tm:hyperbeam", "tm:incinerate", @@ -162,15 +153,11 @@ "tm:lowsweep", "tm:megakick", "tm:megapunch", - "tm:mirrormove", "tm:mudslap", - "tm:nightslash", "tm:overheat", - "tm:peck", "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:rest", "tm:revenge", "tm:reversal", @@ -180,14 +167,9 @@ "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:sandattack", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", - "tm:skyuppercut", - "tm:slash", "tm:sleeptalk", - "tm:smellingsalts", "tm:solarbeam", "tm:stoneedge", "tm:strength", @@ -207,7 +189,43 @@ "tm:uturn", "tm:vacuumwave", "tm:willowisp", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:blastburn", + "tutor:bounce", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:dualchop", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:vacuumwave" ], "preEvolution": "combusken", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json index a7651f0f7f..28274c8309 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/breloom.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json @@ -104,7 +104,6 @@ "egg:swagger", "egg:wakeupslap", "egg:worryseed", - "tm:absorb", "tm:aerialace", "tm:bodyslam", "tm:brickbreak", @@ -113,28 +112,23 @@ "tm:bulletseed", "tm:charm", "tm:closecombat", - "tm:counter", "tm:cut", "tm:dig", "tm:drainpunch", - "tm:dynamicpunch", "tm:endure", "tm:energyball", "tm:facade", "tm:faketears", "tm:falseswipe", - "tm:feint", "tm:flash", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:forcepalm", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", - "tm:growth", "tm:gunkshot", "tm:headbutt", "tm:helpinghand", @@ -142,20 +136,15 @@ "tm:irontail", "tm:laserfocus", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:magicalleaf", - "tm:megadrain", "tm:megakick", "tm:megapunch", - "tm:mindreader", "tm:mudshot", "tm:mudslap", "tm:naturalgift", "tm:poisonjab", - "tm:poisonpowder", "tm:pounce", "tm:poweruppunch", "tm:protect", @@ -169,15 +158,12 @@ "tm:rocktomb", "tm:safeguard", "tm:seedbomb", - "tm:skyuppercut", "tm:sleeptalk", "tm:sludgebomb", "tm:snatch", "tm:solarbeam", - "tm:spore", "tm:stoneedge", "tm:strength", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:superpower", @@ -185,16 +171,47 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderpunch", "tm:toxic", "tm:venoshock", - "tm:wakeupslap", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:drainpunch", + "tutor:energyball", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:thunderpunch", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "shroomish", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json b/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json index 36f814efb0..2466a8f43c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cacnea.json @@ -111,31 +111,21 @@ "egg:smellingsalts", "egg:switcheroo", "egg:teeterdance", - "tm:absorb", - "tm:acid", - "tm:belch", "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:bulletseed", - "tm:cottonspore", - "tm:counter", "tm:curse", "tm:cut", "tm:darkpulse", - "tm:destinybond", "tm:dig", - "tm:disable", "tm:drainpunch", - "tm:dynamicpunch", "tm:encore", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", - "tm:feintattack", - "tm:fellstinger", "tm:flash", "tm:fling", "tm:focuspunch", @@ -143,40 +133,29 @@ "tm:furycutter", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", "tm:helpinghand", - "tm:ingrain", "tm:leafstorm", - "tm:leechseed", - "tm:leer", "tm:lowkick", "tm:magicalleaf", "tm:megapunch", "tm:nastyplot", "tm:naturepower", - "tm:needlearm", "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", - "tm:powertrip", "tm:poweruppunch", "tm:protect", "tm:raindance", "tm:rest", "tm:roleplay", - "tm:rototiller", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:seedbomb", "tm:skittersmack", "tm:sleeptalk", - "tm:smellingsalts", "tm:solarbeam", "tm:spikes", "tm:spite", @@ -184,11 +163,9 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:synthesis", "tm:takedown", - "tm:teeterdance", "tm:terablast", "tm:thief", "tm:throatchop", @@ -196,7 +173,35 @@ "tm:toxicspikes", "tm:trailblaze", "tm:venoshock", - "tm:worryseed" + "tm:worryseed", + "tutor:block", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:poisonjab", + "tutor:rest", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json index f8ba6a2666..b19efd8388 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cacturne.json @@ -116,32 +116,22 @@ "egg:smellingsalts", "egg:switcheroo", "egg:teeterdance", - "tm:absorb", - "tm:acid", - "tm:belch", "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:bulletseed", - "tm:cottonspore", - "tm:counter", "tm:curse", "tm:cut", "tm:darkpulse", - "tm:destinybond", "tm:dig", - "tm:disable", "tm:drainpunch", - "tm:dynamicpunch", "tm:embargo", "tm:encore", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", - "tm:feintattack", - "tm:fellstinger", "tm:flash", "tm:fling", "tm:focusblast", @@ -151,19 +141,14 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", "tm:helpinghand", "tm:hyperbeam", - "tm:ingrain", "tm:knockoff", "tm:lashout", "tm:leafstorm", - "tm:leechseed", - "tm:leer", "tm:lowkick", "tm:lunge", "tm:magicalleaf", @@ -171,12 +156,9 @@ "tm:megapunch", "tm:nastyplot", "tm:naturepower", - "tm:needlearm", "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", - "tm:powertrip", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -184,18 +166,14 @@ "tm:retaliate", "tm:revenge", "tm:roleplay", - "tm:rototiller", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:seedbomb", "tm:shadowball", "tm:skittersmack", "tm:sleeptalk", - "tm:smellingsalts", "tm:solarbeam", "tm:spikes", - "tm:spikyshield", "tm:spite", "tm:stompingtantrum", "tm:strength", @@ -204,12 +182,10 @@ "tm:sunnyday", "tm:superpower", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:synthesis", "tm:takedown", "tm:taunt", - "tm:teeterdance", "tm:terablast", "tm:thief", "tm:throatchop", @@ -218,7 +194,43 @@ "tm:trailblaze", "tm:venoshock", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:poisonjab", + "tutor:rest", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "cacnea", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json index 89a5d5180d..a6811b9ff9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json @@ -105,22 +105,17 @@ "tm:bulldoze", "tm:charm", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", "tm:earthquake", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", - "tm:eruption", "tm:explosion", "tm:facade", "tm:fireblast", "tm:firespin", - "tm:fissure", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flamewheel", @@ -128,22 +123,16 @@ "tm:flashcannon", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", - "tm:growth", "tm:headbutt", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", - "tm:howl", "tm:hyperbeam", "tm:incinerate", "tm:ironhead", "tm:lashout", - "tm:lavaplume", - "tm:magnitude", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:naturepower", @@ -164,24 +153,44 @@ "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swallow", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", "tm:trailblaze", "tm:willowisp", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:lashout", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:zenheadbutt" ], "preEvolution": "numel", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json b/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json index 8fc265950d..79adaf3cf9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/carvanha.json @@ -97,15 +97,12 @@ "egg:waterpulse", "tm:agility", "tm:ancientpower", - "tm:aquajet", "tm:assurance", - "tm:bite", "tm:blizzard", "tm:bounce", "tm:brine", "tm:crunch", "tm:darkpulse", - "tm:destinybond", "tm:dive", "tm:doubleedge", "tm:endure", @@ -118,14 +115,11 @@ "tm:icebeam", "tm:icefang", "tm:icywind", - "tm:leer", "tm:liquidation", "tm:mudslap", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -145,13 +139,35 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:torment", "tm:uproar", "tm:waterfall", "tm:waterpulse", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bounce", + "tutor:darkpulse", + "tutor:dive", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:liquidation", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:superfang", + "tutor:swift", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json b/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json index 4e00ebd804..df2d6aa44c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json @@ -79,13 +79,15 @@ "1:poisonsting", "tm:bugbite", "tm:electroweb", - "tm:harden", "tm:irondefense", - "tm:poisonsting", "tm:skittersmack", "tm:stringshot", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:electroweb", + "tutor:irondefense", + "tutor:skittersmack", + "tutor:stringshot" ], "preEvolution": "wurmple", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/castform.json b/common/src/main/resources/data/cobblemon/species/generation3/castform.json index d56426921d..0291198d50 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/castform.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/castform.json @@ -90,10 +90,7 @@ "tm:avalanche", "tm:blizzard", "tm:bodyslam", - "tm:clearsmog", "tm:cosmicpower", - "tm:disable", - "tm:ember", "tm:endure", "tm:energyball", "tm:facade", @@ -111,13 +108,10 @@ "tm:icywind", "tm:incinerate", "tm:lastresort", - "tm:luckychant", "tm:ominouswind", - "tm:powdersnow", "tm:protect", "tm:psychup", "tm:raindance", - "tm:reflecttype", "tm:rest", "tm:retaliate", "tm:sandstorm", @@ -128,17 +122,28 @@ "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:watergun", "tm:waterpulse", "tm:weatherball", - "tm:workup" + "tm:workup", + "tutor:energyball", + "tutor:flamethrower", + "tutor:icebeam", + "tutor:icywind", + "tutor:lastresort", + "tutor:ominouswind", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:waterpulse" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json index 0fb1cf3b58..f0289b9ff8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json @@ -104,18 +104,14 @@ "egg:recycle", "egg:wish", "tm:allyswitch", - "tm:astonish", "tm:batonpass", "tm:bind", "tm:calmmind", "tm:chargebeam", "tm:charm", - "tm:confusion", "tm:cosmicpower", - "tm:craftyshield", "tm:curse", "tm:dazzlinggleam", - "tm:disable", "tm:disarmingvoice", "tm:doubleedge", "tm:drainingkiss", @@ -124,22 +120,16 @@ "tm:encore", "tm:endure", "tm:energyball", - "tm:entrainment", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:faketears", "tm:flash", "tm:futuresight", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:healbell", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hypervoice", - "tm:hypnosis", "tm:icywind", "tm:imprison", "tm:knockoff", @@ -148,16 +138,13 @@ "tm:lightscreen", "tm:magiccoat", "tm:ominouswind", - "tm:perishsong", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicnoise", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -174,7 +161,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -184,10 +170,40 @@ "tm:trick", "tm:trickroom", "tm:uproar", - "tm:wish", - "tm:wrap", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icywind", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "chingling", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json b/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json index ffb94d80ca..1937951e65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/clamperl.json @@ -85,12 +85,9 @@ "egg:mudsport", "egg:refresh", "egg:supersonic", - "tm:aquaring", - "tm:barrier", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:clamp", "tm:confuseray", "tm:dive", "tm:endure", @@ -100,22 +97,24 @@ "tm:icywind", "tm:irondefense", "tm:muddywater", - "tm:mudsport", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:scald", - "tm:shellsmash", "tm:sleeptalk", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:dive", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:rest", + "tutor:sleeptalk", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/claydol.json b/common/src/main/resources/data/cobblemon/species/generation3/claydol.json index 9eb7a5f6b2..bdec8ef5d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/claydol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/claydol.json @@ -104,7 +104,6 @@ "tm:bulldoze", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:dazzlinggleam", "tm:dig", @@ -116,19 +115,15 @@ "tm:endure", "tm:expandingforce", "tm:explosion", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:guardsplit", "tm:guardswap", "tm:gyroball", - "tm:harden", "tm:headbutt", - "tm:healblock", "tm:hex", "tm:hyperbeam", "tm:icebeam", @@ -138,9 +133,7 @@ "tm:magiccoat", "tm:mudslap", "tm:nastyplot", - "tm:powersplit", "tm:powerswap", - "tm:powertrick", "tm:protect", "tm:psybeam", "tm:psychic", @@ -148,7 +141,6 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:rapidspin", "tm:recycle", "tm:reflect", "tm:rest", @@ -174,12 +166,44 @@ "tm:substitute", "tm:sunnyday", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drillrun", + "tutor:earthpower", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "baltoy", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json index 3710039c87..008bce278a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/combusken.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/combusken.json @@ -107,26 +107,19 @@ "tm:bulkup", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:crushclaw", "tm:curse", "tm:cut", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:dualchop", "tm:echoedvoice", - "tm:ember", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feint", "tm:fireblast", "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -135,7 +128,6 @@ "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:growl", "tm:headbutt", "tm:heatwave", "tm:helpinghand", @@ -146,27 +138,18 @@ "tm:lowsweep", "tm:megakick", "tm:megapunch", - "tm:mirrormove", - "tm:nightslash", "tm:overheat", - "tm:peck", "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:rest", "tm:revenge", "tm:reversal", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", - "tm:scratch", "tm:shadowclaw", - "tm:skyuppercut", - "tm:slash", "tm:sleeptalk", - "tm:smellingsalts", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -181,7 +164,32 @@ "tm:uproar", "tm:vacuumwave", "tm:willowisp", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bounce", + "tutor:bulkup", + "tutor:coaching", + "tutor:dualchop", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:lastresort", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:vacuumwave" ], "preEvolution": "torchic", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/corphish.json b/common/src/main/resources/data/cobblemon/species/generation3/corphish.json index 6fe3bb5932..2135a00c0a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/corphish.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/corphish.json @@ -87,20 +87,14 @@ "egg:switcheroo", "egg:trumpcard", "tm:ancientpower", - "tm:aquajet", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", - "tm:chipaway", - "tm:crabhammer", "tm:crunch", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:doublehit", "tm:dragondance", "tm:endeavor", "tm:endure", @@ -108,22 +102,17 @@ "tm:falseswipe", "tm:fling", "tm:furycutter", - "tm:guillotine", "tm:hail", - "tm:harden", "tm:honeclaws", "tm:hydropump", "tm:icebeam", "tm:icywind", "tm:irondefense", "tm:knockoff", - "tm:leer", "tm:liquidation", "tm:metalclaw", "tm:muddywater", "tm:mudshot", - "tm:mudsport", - "tm:nightslash", "tm:payback", "tm:protect", "tm:raindance", @@ -132,26 +121,38 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:strength", "tm:substitute", "tm:superpower", "tm:surf", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:trumpcard", - "tm:visegrip", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:xscissor" + "tm:xscissor", + "tutor:ancientpower", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:liquidation", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:superpower", + "tutor:waterpulse", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/cradily.json b/common/src/main/resources/data/cobblemon/species/generation3/cradily.json index e3828d6b85..052f1fa499 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cradily.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cradily.json @@ -101,11 +101,8 @@ "egg:recover", "egg:tickle", "egg:wringout", - "tm:acid", "tm:amnesia", "tm:ancientpower", - "tm:astonish", - "tm:barrier", "tm:bind", "tm:block", "tm:bodyslam", @@ -113,7 +110,6 @@ "tm:bulldoze", "tm:bulletseed", "tm:confuseray", - "tm:constrict", "tm:curse", "tm:dig", "tm:earthpower", @@ -130,17 +126,12 @@ "tm:headbutt", "tm:hyperbeam", "tm:infestation", - "tm:ingrain", - "tm:leechseed", - "tm:megadrain", "tm:meteorbeam", - "tm:mirrorcoat", "tm:mudshot", "tm:mudslap", "tm:painsplit", "tm:powerwhip", "tm:protect", - "tm:recover", "tm:rest", "tm:rockblast", "tm:rockpolish", @@ -154,22 +145,40 @@ "tm:sludgewave", "tm:smackdown", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stoneedge", "tm:strength", "tm:stringshot", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:swordsdance", "tm:synthesis", "tm:terablast", - "tm:tickle", "tm:worryseed", - "tm:wrap", - "tm:wringout" + "tutor:ancientpower", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:stringshot", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "lileep", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json b/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json index 3b369b7fb6..8c03ee96c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json @@ -89,24 +89,18 @@ "egg:switcheroo", "egg:trumpcard", "tm:ancientpower", - "tm:aquajet", "tm:avalanche", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", - "tm:chipaway", "tm:closecombat", - "tm:crabhammer", "tm:crunch", "tm:cut", "tm:darkpulse", "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doublehit", "tm:dragondance", "tm:endeavor", "tm:endure", @@ -115,9 +109,7 @@ "tm:fling", "tm:furycutter", "tm:gigaimpact", - "tm:guillotine", "tm:hail", - "tm:harden", "tm:hardpress", "tm:honeclaws", "tm:hydropump", @@ -127,15 +119,12 @@ "tm:irondefense", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:liquidation", "tm:metalclaw", "tm:muddywater", "tm:mudshot", - "tm:mudsport", "tm:nastyplot", "tm:naturepower", - "tm:nightslash", "tm:payback", "tm:protect", "tm:raindance", @@ -147,7 +136,6 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -158,19 +146,40 @@ "tm:superpower", "tm:surf", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:trumpcard", - "tm:visegrip", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:xscissor" + "tm:xscissor", + "tutor:ancientpower", + "tutor:darkpulse", + "tutor:dive", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:lashout", + "tutor:liquidation", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spite", + "tutor:superpower", + "tutor:swift", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "corphish", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json index 5e0aa874f1..a71fabfffd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json @@ -91,7 +91,6 @@ "egg:tickle", "egg:wakeupslap", "egg:wish", - "tm:assist", "tm:attract", "tm:babydolleyes", "tm:batonpass", @@ -101,27 +100,20 @@ "tm:captivate", "tm:chargebeam", "tm:charm", - "tm:copycat", "tm:cosmicpower", "tm:covet", "tm:dig", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleslap", "tm:drainingkiss", "tm:dreameater", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:flash", - "tm:foresight", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -132,7 +124,6 @@ "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:mudbomb", "tm:mudslap", "tm:nastyplot", "tm:payback", @@ -148,8 +139,6 @@ "tm:safeguard", "tm:shadowball", "tm:shockwave", - "tm:simplebeam", - "tm:sing", "tm:sleeptalk", "tm:solarbeam", "tm:stompingtantrum", @@ -157,21 +146,45 @@ "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:tackle", "tm:tailslap", - "tm:tailwhip", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:uproar", - "tm:wakeupslap", "tm:waterpulse", "tm:wildcharge", - "tm:wish", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "skitty", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json index 461b9b77ec..981b9d9089 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json @@ -100,7 +100,6 @@ "tm:imprison", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", @@ -118,13 +117,10 @@ "tm:psychic", "tm:psychicnoise", "tm:psychicterrain", - "tm:psychoboost", "tm:psychoshift", "tm:psychup", "tm:psyshock", - "tm:pursuit", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -152,7 +148,6 @@ "tm:switcheroo", "tm:takedown", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:throatchop", "tm:thunder", @@ -164,8 +159,55 @@ "tm:trickroom", "tm:waterpulse", "tm:wonderroom", - "tm:wrap", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -259,7 +301,6 @@ "tm:imprison", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", @@ -277,11 +318,9 @@ "tm:psychic", "tm:psychicnoise", "tm:psychicterrain", - "tm:psychoboost", "tm:psychoshift", "tm:psychup", "tm:psyshock", - "tm:pursuit", "tm:raindance", "tm:recycle", "tm:reflect", @@ -310,7 +349,6 @@ "tm:takedown", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:throatchop", "tm:thunder", @@ -322,9 +360,55 @@ "tm:trickroom", "tm:waterpulse", "tm:wonderroom", - "tm:wrap", - "tm:zapcannon", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -397,7 +481,6 @@ "tm:calmmind", "tm:chargebeam", "tm:cosmicpower", - "tm:counter", "tm:cut", "tm:darkpulse", "tm:drainpunch", @@ -424,7 +507,6 @@ "tm:irondefense", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", @@ -432,7 +514,6 @@ "tm:megakick", "tm:megapunch", "tm:meteorbeam", - "tm:mirrorcoat", "tm:nightshade", "tm:painsplit", "tm:poisonjab", @@ -442,12 +523,10 @@ "tm:psychic", "tm:psychicnoise", "tm:psychicterrain", - "tm:psychoboost", "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -477,7 +556,6 @@ "tm:takedown", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:throatchop", "tm:thunder", @@ -489,8 +567,57 @@ "tm:trickroom", "tm:waterpulse", "tm:wonderroom", - "tm:wrap", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -569,7 +696,6 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extremespeed", "tm:facade", "tm:firepunch", "tm:flash", @@ -588,7 +714,6 @@ "tm:imprison", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", @@ -606,13 +731,10 @@ "tm:psychic", "tm:psychicnoise", "tm:psychicterrain", - "tm:psychoboost", "tm:psychoshift", "tm:psychup", "tm:psyshock", - "tm:pursuit", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -651,8 +773,55 @@ "tm:trickroom", "tm:waterpulse", "tm:wonderroom", - "tm:wrap", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json index 5d678e2340..a01013fb02 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dusclops.json @@ -105,7 +105,6 @@ "egg:painsplit", "egg:pursuit", "tm:allyswitch", - "tm:astonish", "tm:bind", "tm:blizzard", "tm:bodyslam", @@ -115,22 +114,17 @@ "tm:confuseray", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:endure", "tm:facade", - "tm:feintattack", "tm:firepunch", "tm:flash", "tm:fling", "tm:focuspunch", - "tm:foresight", "tm:futuresight", "tm:gigaimpact", "tm:gravity", - "tm:grudge", "tm:haze", "tm:headbutt", "tm:helpinghand", @@ -142,11 +136,8 @@ "tm:imprison", "tm:infestation", "tm:leechlife", - "tm:leer", - "tm:meanlook", "tm:megakick", "tm:megapunch", - "tm:memento", "tm:metronome", "tm:nightshade", "tm:ominouswind", @@ -159,14 +150,11 @@ "tm:protect", "tm:psychic", "tm:psychup", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:revenge", "tm:rocksmash", "tm:shadowball", - "tm:shadowpunch", - "tm:shadowsneak", "tm:skillswap", "tm:skittersmack", "tm:sleeptalk", @@ -185,7 +173,40 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:leechlife", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "duskull", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/duskull.json b/common/src/main/resources/data/cobblemon/species/generation3/duskull.json index b3423d3a89..7cb79ca203 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/duskull.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/duskull.json @@ -102,26 +102,20 @@ "egg:painsplit", "egg:pursuit", "tm:allyswitch", - "tm:astonish", "tm:blizzard", "tm:calmmind", "tm:chargebeam", "tm:confuseray", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:endure", "tm:facade", - "tm:feintattack", "tm:flash", "tm:fling", - "tm:foresight", "tm:futuresight", "tm:gravity", - "tm:grudge", "tm:haze", "tm:headbutt", "tm:helpinghand", @@ -131,9 +125,6 @@ "tm:imprison", "tm:infestation", "tm:leechlife", - "tm:leer", - "tm:meanlook", - "tm:memento", "tm:nightshade", "tm:ominouswind", "tm:painsplit", @@ -143,12 +134,10 @@ "tm:protect", "tm:psychic", "tm:psychup", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:revenge", "tm:shadowball", - "tm:shadowsneak", "tm:skillswap", "tm:skittersmack", "tm:sleeptalk", @@ -165,7 +154,31 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:gravity", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:leechlife", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json index ba8dc5d20e..b8c456f8a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json @@ -83,7 +83,6 @@ "tm:aircutter", "tm:bugbite", "tm:bugbuzz", - "tm:confusion", "tm:defog", "tm:dualwingbeat", "tm:electroweb", @@ -93,21 +92,15 @@ "tm:flash", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", - "tm:harden", "tm:hyperbeam", "tm:infestation", "tm:irondefense", "tm:laserfocus", "tm:lightscreen", - "tm:moonlight", "tm:ominouswind", - "tm:poisonpowder", - "tm:poisonsting", "tm:protect", "tm:psybeam", "tm:psychic", - "tm:quiverdance", "tm:rest", "tm:roost", "tm:shadowball", @@ -121,7 +114,6 @@ "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", @@ -130,7 +122,30 @@ "tm:uturn", "tm:venomdrench", "tm:venoshock", - "tm:whirlwind" + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stringshot", + "tutor:tailwind", + "tutor:twister" ], "preEvolution": "cascoon", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/electrike.json b/common/src/main/resources/data/cobblemon/species/generation3/electrike.json index ccc40a962c..f8c8ca3b29 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/electrike.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/electrike.json @@ -85,33 +85,26 @@ "egg:spark", "egg:switcheroo", "tm:agility", - "tm:bite", "tm:bodyslam", "tm:charge", "tm:chargebeam", "tm:crunch", "tm:curse", - "tm:discharge", "tm:eerieimpulse", "tm:electroball", "tm:endure", "tm:facade", "tm:firefang", - "tm:flameburst", "tm:flamethrower", "tm:flash", "tm:headbutt", - "tm:howl", "tm:icefang", "tm:irontail", - "tm:leer", "tm:lightscreen", "tm:magnetrise", "tm:mudslap", - "tm:odorsleuth", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -120,12 +113,9 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:strength", "tm:substitute", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:terablast", "tm:thief", "tm:thunder", @@ -134,7 +124,26 @@ "tm:thunderwave", "tm:uproar", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:firefang", + "tutor:flamethrower", + "tutor:icefang", + "tutor:irontail", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json index 3b4cc7924a..139bedf57d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json @@ -90,22 +90,17 @@ "egg:synchronoise", "egg:takedown", "egg:whirlwind", - "tm:astonish", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bodyslam", - "tm:boomburst", "tm:brickbreak", "tm:bulldoze", - "tm:circlethrow", "tm:crunch", "tm:disarmingvoice", "tm:earthquake", "tm:echoedvoice", "tm:endeavor", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:faketears", "tm:fireblast", @@ -115,9 +110,7 @@ "tm:fling", "tm:focusblast", "tm:gigaimpact", - "tm:hammerarm", "tm:headbutt", - "tm:howl", "tm:hydropump", "tm:hyperbeam", "tm:hypervoice", @@ -132,7 +125,6 @@ "tm:mudslap", "tm:outrage", "tm:overheat", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -149,19 +141,14 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", - "tm:smokescreen", "tm:snore", "tm:solarbeam", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:surf", "tm:swagger", - "tm:synchronoise", "tm:takedown", "tm:taunt", "tm:terablast", @@ -172,9 +159,38 @@ "tm:uproar", "tm:waterpulse", "tm:whirlpool", - "tm:whirlwind", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stompingtantrum", + "tutor:terrainpulse", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "loudred", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/feebas.json b/common/src/main/resources/data/cobblemon/species/generation3/feebas.json index 26bfdbebfc..f4ccf516a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/feebas.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/feebas.json @@ -102,38 +102,39 @@ "tm:confuseray", "tm:dive", "tm:doubleedge", - "tm:dragonbreath", "tm:dragonpulse", "tm:endure", "tm:facade", - "tm:flail", "tm:hail", "tm:haze", - "tm:hypnosis", "tm:icebeam", "tm:icywind", "tm:irontail", "tm:lightscreen", - "tm:mirrorcoat", - "tm:mist", "tm:muddywater", "tm:mudshot", - "tm:mudsport", "tm:protect", "tm:raindance", "tm:rest", "tm:scaleshot", "tm:sleeptalk", - "tm:splash", "tm:substitute", "tm:surf", "tm:swift", - "tm:tackle", "tm:terablast", - "tm:tickle", "tm:waterfall", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:dive", + "tutor:dragonpulse", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/flygon.json b/common/src/main/resources/data/cobblemon/species/generation3/flygon.json index d0893215ca..b07dcb40ef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/flygon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/flygon.json @@ -117,11 +117,7 @@ "tm:aircutter", "tm:airslash", "tm:alluringvoice", - "tm:astonish", - "tm:bide", - "tm:bite", "tm:bodyslam", - "tm:boomburst", "tm:breakingswipe", "tm:brutalswing", "tm:bugbite", @@ -132,33 +128,25 @@ "tm:dig", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:dualwingbeat", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:facade", - "tm:feint", - "tm:feintattack", "tm:fireblast", "tm:firepunch", "tm:firespin", - "tm:firstimpression", - "tm:fissure", - "tm:flail", "tm:flamethrower", "tm:fly", "tm:focusenergy", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:headbutt", "tm:heatwave", "tm:helpinghand", @@ -176,13 +164,11 @@ "tm:poweruppunch", "tm:protect", "tm:psychicnoise", - "tm:quickattack", "tm:rest", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", @@ -192,7 +178,6 @@ "tm:silverwind", "tm:sleeptalk", "tm:solarbeam", - "tm:sonicboom", "tm:stealthrock", "tm:steelwing", "tm:stoneedge", @@ -201,7 +186,6 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:supersonic", "tm:swift", "tm:tailwind", "tm:takedown", @@ -211,7 +195,49 @@ "tm:twister", "tm:uproar", "tm:uturn", - "tm:vacuumwave" + "tm:vacuumwave", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:laserfocus", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:twister", + "tutor:uproar", + "tutor:vacuumwave" ], "preEvolution": "vibrava", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json index 907026cc98..bc0352772e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gardevoir.json @@ -126,10 +126,7 @@ "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:disarmingvoice", "tm:doubleteam", "tm:drainingkiss", @@ -148,36 +145,26 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:growl", - "tm:grudge", "tm:guardswap", "tm:headbutt", "tm:healbell", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:imprison", "tm:knockoff", "tm:laserfocus", - "tm:lifedew", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", "tm:megakick", "tm:megapunch", - "tm:memento", "tm:metronome", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:mysticalfire", "tm:nightshade", "tm:painsplit", @@ -195,7 +182,6 @@ "tm:rest", "tm:safeguard", "tm:shadowball", - "tm:shadowsneak", "tm:shockwave", "tm:signalbeam", "tm:skillswap", @@ -205,10 +191,8 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderbolt", @@ -220,9 +204,49 @@ "tm:tripleaxel", "tm:vacuumwave", "tm:willowisp", - "tm:wish", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mistyexplosion", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:tripleaxel", + "tutor:vacuumwave", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "kirlia", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json b/common/src/main/resources/data/cobblemon/species/generation3/glalie.json index 717d7d33eb..22f389a543 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/glalie.json @@ -94,10 +94,7 @@ "egg:iciclecrash", "egg:rollout", "egg:switcheroo", - "tm:astonish", "tm:avalanche", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -105,7 +102,6 @@ "tm:chillingwater", "tm:crunch", "tm:darkpulse", - "tm:disable", "tm:doubleteam", "tm:earthquake", "tm:endure", @@ -114,7 +110,6 @@ "tm:faketears", "tm:flash", "tm:foulplay", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", "tm:gyroball", @@ -126,17 +121,13 @@ "tm:iceball", "tm:icebeam", "tm:icefang", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:ironhead", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:payback", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -145,7 +136,6 @@ "tm:scaryface", "tm:selfdestruct", "tm:shadowball", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:snowscape", @@ -153,14 +143,35 @@ "tm:spite", "tm:steelroller", "tm:substitute", - "tm:switcheroo", "tm:takedown", "tm:taunt", "tm:terablast", "tm:torment", "tm:trailblaze", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:block", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:spite", + "tutor:steelroller", + "tutor:waterpulse" ], "preEvolution": "snorunt", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json index 506aedacda..ef6253241d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json @@ -100,9 +100,7 @@ "egg:supersonic", "tm:agility", "tm:amnesia", - "tm:aquaring", "tm:aquatail", - "tm:barrier", "tm:batonpass", "tm:bind", "tm:blizzard", @@ -110,10 +108,7 @@ "tm:bounce", "tm:brine", "tm:captivate", - "tm:clamp", - "tm:coil", "tm:confuseray", - "tm:confusion", "tm:dive", "tm:drainingkiss", "tm:endure", @@ -129,29 +124,41 @@ "tm:irondefense", "tm:muddywater", "tm:mudslap", - "tm:mudsport", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", - "tm:refresh", "tm:rest", "tm:safeguard", "tm:scald", "tm:scaleshot", "tm:shadowball", - "tm:shellsmash", "tm:signalbeam", "tm:sleeptalk", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bind", + "tutor:bounce", + "tutor:dive", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:waterpulse" ], "preEvolution": "clamperl", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/groudon.json b/common/src/main/resources/data/cobblemon/species/generation3/groudon.json index 18e01dba8a..3c1caadb4d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/groudon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/groudon.json @@ -91,19 +91,16 @@ "tm:earthpower", "tm:earthquake", "tm:endure", - "tm:eruption", "tm:facade", "tm:fireblast", "tm:firefang", "tm:firepunch", - "tm:fissure", "tm:flamethrower", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:furycutter", "tm:gigaimpact", - "tm:hammerarm", "tm:headbutt", "tm:heatcrash", "tm:heatwave", @@ -115,7 +112,6 @@ "tm:incinerate", "tm:ironhead", "tm:irontail", - "tm:lavaplume", "tm:megakick", "tm:megapunch", "tm:metalclaw", @@ -123,7 +119,6 @@ "tm:mudslap", "tm:overheat", "tm:poweruppunch", - "tm:precipiceblades", "tm:protect", "tm:rest", "tm:roar", @@ -159,7 +154,42 @@ "tm:thunderpunch", "tm:thunderwave", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json b/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json index 6a4039ed2e..7c778c3e7e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json @@ -104,7 +104,6 @@ "egg:slash", "egg:synthesis", "egg:worryseed", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:agility", @@ -113,13 +112,9 @@ "tm:brickbreak", "tm:bulletseed", "tm:crunch", - "tm:crushclaw", "tm:cut", - "tm:detect", "tm:dig", - "tm:doublekick", "tm:doubleteam", - "tm:dragonbreath", "tm:dragontail", "tm:drainpunch", "tm:endeavor", @@ -134,34 +129,22 @@ "tm:gigadrain", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", "tm:headbutt", "tm:helpinghand", "tm:irontail", - "tm:leafage", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", - "tm:megadrain", "tm:megakick", "tm:megapunch", - "tm:mudsport", "tm:naturalgift", "tm:naturepower", - "tm:nightslash", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", - "tm:razorwind", "tm:rest", "tm:rockslide", "tm:rocksmash", @@ -169,8 +152,6 @@ "tm:safeguard", "tm:screech", "tm:seedbomb", - "tm:slam", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:strength", @@ -188,7 +169,32 @@ "tm:vacuumwave", "tm:workup", "tm:worryseed", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:irontail", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:thunderpunch", + "tutor:vacuumwave", + "tutor:worryseed", + "tutor:xscissor" ], "preEvolution": "treecko", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json b/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json index 64ff334268..9c8e9c7cfe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json @@ -94,7 +94,6 @@ "egg:zenheadbutt", "tm:allyswitch", "tm:amnesia", - "tm:belch", "tm:bodypress", "tm:bodyslam", "tm:bounce", @@ -104,7 +103,6 @@ "tm:chargebeam", "tm:chillingwater", "tm:confuseray", - "tm:confusion", "tm:covet", "tm:dazzlinggleam", "tm:dig", @@ -116,7 +114,6 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:firepunch", "tm:flash", @@ -127,7 +124,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -141,18 +137,15 @@ "tm:lightscreen", "tm:lowkick", "tm:lowsweep", - "tm:luckychant", "tm:lunge", "tm:magiccoat", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mirrorcoat", "tm:mudshot", "tm:mudslap", "tm:nastyplot", "tm:nightshade", - "tm:odorsleuth", "tm:payback", "tm:powergem", "tm:poweruppunch", @@ -163,7 +156,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:recycle", "tm:reflect", @@ -173,14 +165,12 @@ "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:sleeptalk", "tm:snarl", "tm:snatch", "tm:snore", "tm:snowscape", - "tm:splash", "tm:stompingtantrum", "tm:storedpower", "tm:substitute", @@ -188,7 +178,6 @@ "tm:swift", "tm:takedown", "tm:taunt", - "tm:teeterdance", "tm:telekinesis", "tm:terablast", "tm:thief", @@ -199,8 +188,54 @@ "tm:trick", "tm:trickroom", "tm:uproar", - "tm:whirlwind", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bounce", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:snore", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "spoink", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json b/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json index a690d756e6..db27176e5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json @@ -91,16 +91,12 @@ "egg:mudslap", "egg:smog", "egg:stuffcheeks", - "tm:acidarmor", "tm:acidspray", "tm:amnesia", - "tm:belch", "tm:bodyslam", "tm:bulletseed", - "tm:clearsmog", "tm:corrosivegas", "tm:curse", - "tm:destinybond", "tm:dreameater", "tm:encore", "tm:endure", @@ -119,9 +115,7 @@ "tm:mudshot", "tm:mudslap", "tm:painsplit", - "tm:poisongas", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -133,19 +127,13 @@ "tm:shadowball", "tm:shockwave", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", "tm:snatch", "tm:solarbeam", - "tm:spitup", - "tm:stockpile", "tm:strength", - "tm:stuffcheeks", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:swordsdance", "tm:takedown", "tm:terablast", @@ -157,8 +145,29 @@ "tm:venomdrench", "tm:venoshock", "tm:waterpulse", - "tm:wringout", - "tm:yawn" + "tutor:corrosivegas", + "tutor:firepunch", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:thunderpunch", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json b/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json index 8c303ad8c3..2af74af976 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json @@ -99,44 +99,30 @@ "egg:helpinghand", "egg:wakeupslap", "egg:wideguard", - "tm:armthrust", "tm:assurance", - "tm:bellydrum", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:brine", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:chillingwater", - "tm:chipaway", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:crosschop", "tm:curse", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:earthquake", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", - "tm:feintattack", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:forcepalm", - "tm:foresight", "tm:gigaimpact", "tm:headbutt", - "tm:headlongrush", "tm:heavyslam", "tm:helpinghand", "tm:hyperbeam", @@ -165,12 +151,9 @@ "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:sandattack", "tm:scaryface", - "tm:seismictoss", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -179,7 +162,6 @@ "tm:superpower", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -189,11 +171,38 @@ "tm:upperhand", "tm:vacuumwave", "tm:vitalthrow", - "tm:wakeupslap", - "tm:whirlwind", - "tm:wideguard", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:ironhead", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:vacuumwave", + "tutor:zenheadbutt" ], "preEvolution": "makuhita", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json index 2e44fe434b..93e2cc87fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/huntail.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/huntail.json @@ -98,24 +98,18 @@ "egg:mudsport", "egg:refresh", "egg:supersonic", - "tm:aquaring", "tm:aquatail", - "tm:barrier", "tm:batonpass", "tm:bind", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:bounce", "tm:brine", - "tm:clamp", - "tm:coil", "tm:confuseray", "tm:crunch", "tm:dive", "tm:endure", "tm:facade", - "tm:feintattack", "tm:flipturn", "tm:gigaimpact", "tm:hail", @@ -128,29 +122,43 @@ "tm:irondefense", "tm:muddywater", "tm:mudslap", - "tm:mudsport", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rocktomb", "tm:scald", "tm:scaleshot", "tm:scaryface", "tm:screech", - "tm:shellsmash", "tm:sleeptalk", "tm:snatch", "tm:substitute", "tm:suckerpunch", "tm:superfang", - "tm:supersonic", "tm:surf", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bind", + "tutor:bounce", + "tutor:dive", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:mudslap", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:waterpulse" ], "preEvolution": "clamperl", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json index c2b39e28f8..27d758cc2f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/illumise.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/illumise.json @@ -101,7 +101,6 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:aromatherapy", "tm:attract", "tm:batonpass", "tm:brickbreak", @@ -122,11 +121,9 @@ "tm:facade", "tm:faketears", "tm:flash", - "tm:flatter", "tm:fling", "tm:focuspunch", "tm:gigadrain", - "tm:growth", "tm:helpinghand", "tm:icepunch", "tm:infestation", @@ -134,16 +131,13 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:moonlight", "tm:mudslap", "tm:ominouswind", - "tm:playnice", "tm:playrough", "tm:pounce", "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:roost", @@ -157,9 +151,7 @@ "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -172,8 +164,35 @@ "tm:trick", "tm:uturn", "tm:waterpulse", - "tm:wish", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:playrough", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json b/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json index d075fb0795..18e79870e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json @@ -76,10 +76,8 @@ "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", "tm:cosmicpower", "tm:dazzlinggleam", - "tm:doomdesire", "tm:doubleedge", "tm:drainpunch", "tm:dreameater", @@ -98,7 +96,6 @@ "tm:grassknot", "tm:gravity", "tm:headbutt", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", @@ -107,16 +104,13 @@ "tm:irondefense", "tm:ironhead", "tm:lastresort", - "tm:lifedew", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", "tm:megakick", "tm:megapunch", "tm:metalsound", "tm:meteorbeam", - "tm:meteormash", "tm:metronome", "tm:mudslap", "tm:playrough", @@ -130,7 +124,6 @@ "tm:raindance", "tm:recycle", "tm:reflect", - "tm:refresh", "tm:rest", "tm:safeguard", "tm:sandstorm", @@ -155,8 +148,48 @@ "tm:trickroom", "tm:uturn", "tm:waterpulse", - "tm:wish", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json b/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json index e71785632d..39034f7cb3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json @@ -96,24 +96,17 @@ "tm:afteryou", "tm:ancientpower", "tm:aquatail", - "tm:astonish", "tm:bind", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", - "tm:camouflage", "tm:chargebeam", "tm:cut", "tm:detect", "tm:dig", - "tm:disable", - "tm:dizzypunch", "tm:drainpunch", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", - "tm:feintattack", "tm:fireblast", "tm:firepunch", "tm:flamethrower", @@ -122,7 +115,6 @@ "tm:focuspunch", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", "tm:grassknot", "tm:headbutt", "tm:honeclaws", @@ -133,7 +125,6 @@ "tm:irontail", "tm:knockoff", "tm:lastresort", - "tm:lick", "tm:lowkick", "tm:magiccoat", "tm:megakick", @@ -146,7 +137,6 @@ "tm:psybeam", "tm:psychup", "tm:raindance", - "tm:recover", "tm:recycle", "tm:rest", "tm:retaliate", @@ -156,14 +146,11 @@ "tm:roleplay", "tm:rollout", "tm:scaleshot", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:shockwave", "tm:skillswap", - "tm:slash", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", @@ -173,8 +160,6 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swift", - "tm:synchronoise", - "tm:tailwhip", "tm:terablast", "tm:thief", "tm:thunder", @@ -185,7 +170,49 @@ "tm:trickroom", "tm:waterpulse", "tm:wonderroom", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:afteryou", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bind", + "tutor:chargebeam", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stealthrock", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json index 07c5c88f38..52a1b61591 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kirlia.json @@ -116,10 +116,7 @@ "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:disarmingvoice", "tm:doubleteam", "tm:drainingkiss", @@ -134,28 +131,20 @@ "tm:fling", "tm:futuresight", "tm:grassknot", - "tm:growl", - "tm:grudge", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:imprison", "tm:knockoff", - "tm:lifedew", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", "tm:megakick", "tm:megapunch", - "tm:memento", "tm:metronome", "tm:mistyterrain", "tm:mysticalfire", @@ -172,7 +161,6 @@ "tm:rest", "tm:safeguard", "tm:shadowball", - "tm:shadowsneak", "tm:shockwave", "tm:signalbeam", "tm:skillswap", @@ -182,10 +170,8 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderbolt", @@ -197,7 +183,41 @@ "tm:tripleaxel", "tm:willowisp", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:tripleaxel", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "ralts", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json b/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json index ddf59df9cd..02cc774e74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json @@ -74,7 +74,6 @@ "81:doubleedge", "90:waterspout", "tm:ancientpower", - "tm:aquaring", "tm:aquatail", "tm:avalanche", "tm:blizzard", @@ -102,7 +101,6 @@ "tm:ironhead", "tm:liquidation", "tm:muddywater", - "tm:originpulse", "tm:protect", "tm:raindance", "tm:rest", @@ -112,7 +110,6 @@ "tm:rocktomb", "tm:safeguard", "tm:scaryface", - "tm:sheercold", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -126,8 +123,28 @@ "tm:thunderwave", "tm:waterfall", "tm:waterpulse", - "tm:waterspout", - "tm:whirlpool" + "tm:whirlpool", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:dive", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:liquidation", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:thunderbolt", + "tutor:waterpulse" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lairon.json b/common/src/main/resources/data/cobblemon/species/generation3/lairon.json index df5bdbe79a..8c634b7a38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lairon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lairon.json @@ -100,7 +100,6 @@ "egg:stomp", "tm:aerialace", "tm:ancientpower", - "tm:autotomize", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -108,23 +107,19 @@ "tm:cut", "tm:dig", "tm:doubleedge", - "tm:dragonrush", "tm:earthpower", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", "tm:furycutter", - "tm:harden", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:honeclaws", "tm:irondefense", "tm:ironhead", "tm:irontail", "tm:magnetrise", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:mudslap", @@ -145,23 +140,47 @@ "tm:shadowclaw", "tm:shockwave", "tm:sleeptalk", - "tm:smellingsalts", "tm:spite", "tm:stealthrock", "tm:steelbeam", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:uproar", - "tm:waterpulse" + "tm:waterpulse", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:furycutter", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "aron", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/latias.json b/common/src/main/resources/data/cobblemon/species/generation3/latias.json index 725a612439..2e5b6d1433 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/latias.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/latias.json @@ -93,7 +93,6 @@ "tm:chargebeam", "tm:charm", "tm:chillingwater", - "tm:confusion", "tm:covet", "tm:cut", "tm:defog", @@ -101,7 +100,6 @@ "tm:dive", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -119,9 +117,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:guardsplit", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:honeclaws", "tm:hyperbeam", @@ -133,21 +128,15 @@ "tm:liquidation", "tm:magiccoat", "tm:magicroom", - "tm:mistball", "tm:mysticalfire", "tm:outrage", "tm:protect", "tm:psychic", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:reflect", - "tm:reflecttype", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", @@ -180,11 +169,54 @@ "tm:twister", "tm:waterfall", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:wish", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:defog", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mysticalfire", + "tutor:outrage", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:roleplay", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:twister", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/latios.json b/common/src/main/resources/data/cobblemon/species/generation3/latios.json index 83ac72031c..e0670ee8b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/latios.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/latios.json @@ -91,13 +91,11 @@ "tm:calmmind", "tm:chargebeam", "tm:chillingwater", - "tm:confusion", "tm:cut", "tm:defog", "tm:dive", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -115,8 +113,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:healblock", - "tm:healpulse", "tm:helpinghand", "tm:honeclaws", "tm:hyperbeam", @@ -126,24 +122,17 @@ "tm:lastresort", "tm:lightscreen", "tm:liquidation", - "tm:lusterpurge", "tm:magiccoat", - "tm:memento", "tm:mysticalfire", "tm:outrage", - "tm:powersplit", "tm:protect", "tm:psychic", "tm:psychicnoise", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:reflect", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", @@ -154,7 +143,6 @@ "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:simplebeam", "tm:sleeptalk", "tm:solarbeam", "tm:steelwing", @@ -177,7 +165,51 @@ "tm:waterpulse", "tm:weatherball", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:defog", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:flipturn", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:mysticalfire", + "tutor:outrage", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:twister", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lileep.json b/common/src/main/resources/data/cobblemon/species/generation3/lileep.json index 673a10aca8..61593a7d58 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lileep.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lileep.json @@ -99,17 +99,13 @@ "egg:recover", "egg:tickle", "egg:wringout", - "tm:acid", "tm:amnesia", "tm:ancientpower", - "tm:astonish", - "tm:barrier", "tm:bind", "tm:bodyslam", "tm:brine", "tm:bulletseed", "tm:confuseray", - "tm:constrict", "tm:curse", "tm:earthpower", "tm:endure", @@ -120,15 +116,11 @@ "tm:gigadrain", "tm:grassknot", "tm:infestation", - "tm:ingrain", - "tm:megadrain", "tm:meteorbeam", - "tm:mirrorcoat", "tm:mudshot", "tm:mudslap", "tm:painsplit", "tm:protect", - "tm:recover", "tm:rest", "tm:rockblast", "tm:rockpolish", @@ -140,20 +132,32 @@ "tm:sludgebomb", "tm:smackdown", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stringshot", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:swordsdance", "tm:synthesis", "tm:terablast", - "tm:tickle", "tm:worryseed", - "tm:wrap", - "tm:wringout" + "tutor:ancientpower", + "tutor:bind", + "tutor:earthpower", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:stringshot", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json index 5a0d5ee9ca..e188f09e80 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/linoone.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/linoone.json @@ -102,8 +102,6 @@ "egg:simplebeam", "egg:tickle", "tm:babydolleyes", - "tm:bellydrum", - "tm:bestow", "tm:blizzard", "tm:bodyslam", "tm:chargebeam", @@ -114,15 +112,11 @@ "tm:doubleedge", "tm:echoedvoice", "tm:endure", - "tm:extremespeed", "tm:facade", - "tm:flail", "tm:fling", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:headbutt", "tm:helpinghand", @@ -135,26 +129,19 @@ "tm:lastresort", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:odorsleuth", "tm:pinmissile", "tm:playrough", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", "tm:roar", "tm:rocksmash", "tm:rollout", - "tm:rototiller", - "tm:sandattack", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:simplebeam", - "tm:slash", "tm:sleeptalk", "tm:stompingtantrum", "tm:strength", @@ -163,10 +150,7 @@ "tm:superfang", "tm:surf", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", @@ -174,11 +158,40 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:trick", "tm:waterpulse", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:covet", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:trick", + "tutor:waterpulse" ], "preEvolution": "zigzagoon", "evolutions": [], @@ -236,14 +249,12 @@ "tm:blizzard", "tm:bodypress", "tm:bodyslam", - "tm:counter", "tm:dig", "tm:doubleedge", "tm:endure", "tm:facade", "tm:faketears", "tm:fling", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", @@ -257,19 +268,13 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:lick", "tm:mudshot", - "tm:nightslash", - "tm:partingshot", "tm:payback", "tm:pinmissile", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:sandattack", "tm:scaryface", "tm:screech", "tm:seedbomb", @@ -282,8 +287,6 @@ "tm:sunnyday", "tm:surf", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -294,7 +297,29 @@ "tm:thunderwave", "tm:trick", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:babydolleyes", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:trick" ], "preEvolution": "zigzagoon galarian", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lombre.json b/common/src/main/resources/data/cobblemon/species/generation3/lombre.json index ba2452f157..13664b42d8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lombre.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lombre.json @@ -109,16 +109,11 @@ "egg:synthesis", "egg:teeterdance", "egg:tickle", - "tm:absorb", - "tm:astonish", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", - "tm:bubble", - "tm:bubblebeam", "tm:bulletseed", "tm:chillingwater", - "tm:counter", "tm:disarmingvoice", "tm:dive", "tm:doubleedge", @@ -128,17 +123,13 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fakeout", "tm:firepunch", - "tm:flail", "tm:flash", "tm:fling", - "tm:furyswipes", "tm:gigadrain", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:hail", "tm:headbutt", "tm:honeclaws", @@ -148,13 +139,10 @@ "tm:icepunch", "tm:icywind", "tm:knockoff", - "tm:leechseed", "tm:magicalleaf", - "tm:megadrain", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mist", "tm:muddywater", "tm:mudshot", "tm:naturalgift", @@ -162,7 +150,6 @@ "tm:poweruppunch", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:rocksmash", "tm:seedbomb", @@ -172,24 +159,40 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:takedown", - "tm:teeterdance", "tm:terablast", "tm:thief", "tm:thunderpunch", - "tm:tickle", "tm:trailblaze", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:dive", + "tutor:drainpunch", + "tutor:energyball", + "tutor:firepunch", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "lotad", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lotad.json b/common/src/main/resources/data/cobblemon/species/generation3/lotad.json index d408c4de9c..94c794dcb0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lotad.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lotad.json @@ -107,42 +107,31 @@ "egg:synthesis", "egg:teeterdance", "egg:tickle", - "tm:absorb", - "tm:astonish", "tm:blizzard", "tm:bodyslam", - "tm:bubble", - "tm:bubblebeam", "tm:bulletseed", "tm:chillingwater", - "tm:counter", "tm:disarmingvoice", "tm:doubleedge", "tm:echoedvoice", "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:gigadrain", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:hail", "tm:headbutt", "tm:icebeam", "tm:icywind", - "tm:leechseed", "tm:magicalleaf", - "tm:megadrain", - "tm:mist", "tm:muddywater", "tm:naturalgift", "tm:naturepower", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:seedbomb", "tm:sleeptalk", @@ -150,21 +139,30 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:takedown", - "tm:teeterdance", "tm:terablast", "tm:thief", - "tm:tickle", "tm:trailblaze", "tm:uproar", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:icebeam", + "tutor:icywind", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json index 7079e4b7a6..30b37b207c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json @@ -83,28 +83,22 @@ "egg:synchronoise", "egg:takedown", "egg:whirlwind", - "tm:astonish", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:circlethrow", "tm:disarmingvoice", "tm:earthquake", "tm:echoedvoice", "tm:endeavor", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:faketears", "tm:fireblast", "tm:firepunch", "tm:flamethrower", "tm:fling", - "tm:hammerarm", "tm:headbutt", - "tm:howl", "tm:hypervoice", "tm:icebeam", "tm:icepunch", @@ -115,7 +109,6 @@ "tm:megapunch", "tm:mudslap", "tm:overheat", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -131,18 +124,13 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", - "tm:smokescreen", "tm:snore", "tm:solarbeam", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swagger", - "tm:synchronoise", "tm:takedown", "tm:taunt", "tm:terablast", @@ -150,9 +138,31 @@ "tm:torment", "tm:uproar", "tm:waterpulse", - "tm:whirlwind", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stompingtantrum", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "whismur", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json b/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json index 276d726051..a6e343d6af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ludicolo.json @@ -110,17 +110,12 @@ "egg:synthesis", "egg:teeterdance", "egg:tickle", - "tm:absorb", "tm:amnesia", - "tm:astonish", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", - "tm:bubble", - "tm:bubblebeam", "tm:bulletseed", "tm:chillingwater", - "tm:counter", "tm:disarmingvoice", "tm:dive", "tm:doubleedge", @@ -130,20 +125,16 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fakeout", "tm:firepunch", - "tm:flail", "tm:flash", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:furyswipes", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:hail", "tm:headbutt", "tm:honeclaws", @@ -156,13 +147,10 @@ "tm:icywind", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", - "tm:megadrain", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mist", "tm:muddywater", "tm:mudshot", "tm:naturalgift", @@ -170,7 +158,6 @@ "tm:poweruppunch", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:rockclimb", "tm:rocksmash", @@ -181,25 +168,45 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", "tm:takedown", - "tm:teeterdance", "tm:terablast", "tm:thief", "tm:thunderpunch", - "tm:tickle", "tm:trailblaze", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:dive", + "tutor:drainpunch", + "tutor:energyball", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "lombre", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json b/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json index dcb628ece5..f1b82ff120 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/lunatone.json @@ -104,7 +104,6 @@ "tm:bulldoze", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:dreameater", "tm:earthpower", @@ -120,11 +119,8 @@ "tm:gravity", "tm:gyroball", "tm:hail", - "tm:harden", - "tm:healblock", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icywind", "tm:ironhead", @@ -133,8 +129,6 @@ "tm:magiccoat", "tm:magicroom", "tm:meteorbeam", - "tm:moonblast", - "tm:moonlight", "tm:nastyplot", "tm:painsplit", "tm:powergem", @@ -144,7 +138,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:recycle", "tm:reflect", @@ -152,7 +145,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:safeguard", @@ -170,12 +162,46 @@ "tm:storedpower", "tm:substitute", "tm:swift", - "tm:tackle", "tm:telekinesis", "tm:terablast", "tm:trickroom", "tm:weatherball", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rollout", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json b/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json index 0befa0a039..c94b44755a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/luvdisc.json @@ -103,8 +103,6 @@ "egg:supersonic", "egg:watersport", "tm:agility", - "tm:aquajet", - "tm:aquaring", "tm:attract", "tm:babydolleyes", "tm:blizzard", @@ -116,19 +114,13 @@ "tm:drainingkiss", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:flail", "tm:flipturn", "tm:hail", - "tm:healpulse", - "tm:heartstamp", "tm:hydropump", "tm:icebeam", "tm:icywind", "tm:liquidation", - "tm:luckychant", - "tm:mudsport", "tm:protect", "tm:psychup", "tm:raindance", @@ -137,22 +129,26 @@ "tm:scaleshot", "tm:sleeptalk", "tm:snowscape", - "tm:soak", - "tm:splash", "tm:substitute", - "tm:supersonic", "tm:surf", - "tm:sweetkiss", - "tm:tackle", "tm:takedown", "tm:tearfullook", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:wish" + "tutor:babydolleyes", + "tutor:bounce", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:waterpulse" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json b/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json index 7afba6a3d9..c50b372bfd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/makuhita.json @@ -95,39 +95,26 @@ "egg:helpinghand", "egg:wakeupslap", "egg:wideguard", - "tm:armthrust", "tm:assurance", - "tm:bellydrum", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:chillingwater", - "tm:chipaway", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:crosschop", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:earthquake", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", - "tm:feintattack", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:forcepalm", - "tm:foresight", "tm:headbutt", "tm:heavyslam", "tm:helpinghand", @@ -153,11 +140,8 @@ "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:sandattack", - "tm:seismictoss", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -166,7 +150,6 @@ "tm:superpower", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -175,11 +158,33 @@ "tm:upperhand", "tm:vacuumwave", "tm:vitalthrow", - "tm:wakeupslap", - "tm:whirlwind", - "tm:wideguard", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:thunderpunch", + "tutor:vacuumwave", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json b/common/src/main/resources/data/cobblemon/species/generation3/manectric.json index 8d584b7640..0073436c13 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/manectric.json @@ -88,39 +88,32 @@ "egg:spark", "egg:switcheroo", "tm:agility", - "tm:bite", "tm:bodyslam", "tm:charge", "tm:chargebeam", "tm:crunch", "tm:curse", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:endure", "tm:facade", "tm:firefang", - "tm:flameburst", "tm:flamethrower", "tm:flash", "tm:gigaimpact", "tm:headbutt", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:icefang", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:magnetrise", "tm:mudslap", - "tm:odorsleuth", "tm:overheat", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -130,12 +123,9 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:strength", "tm:substitute", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:terablast", "tm:thief", "tm:thunder", @@ -144,7 +134,30 @@ "tm:thunderwave", "tm:uproar", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irontail", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "electrike", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json b/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json index 756ab9f73e..a058df58dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json @@ -115,15 +115,11 @@ "tm:ancientpower", "tm:aquatail", "tm:avalanche", - "tm:barrier", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dig", "tm:dive", @@ -136,8 +132,6 @@ "tm:facade", "tm:fling", "tm:focuspunch", - "tm:foresight", - "tm:growl", "tm:hail", "tm:headbutt", "tm:helpinghand", @@ -150,47 +144,60 @@ "tm:lowkick", "tm:megakick", "tm:megapunch", - "tm:mirrorcoat", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:poweruppunch", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:roar", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandtomb", "tm:screech", "tm:sleeptalk", - "tm:sludge", "tm:sludgewave", "tm:stealthrock", - "tm:stomp", "tm:strength", "tm:substitute", "tm:superpower", - "tm:supersonic", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:whirlpool", - "tm:wideguard", "tm:workup", - "tm:yawn" + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:superpower", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "mudkip", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json index 4236aab7af..e3b26fc80f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/masquerain.json @@ -118,11 +118,8 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:aquajet", "tm:batonpass", "tm:blizzard", - "tm:bubble", - "tm:bubblebeam", "tm:bugbite", "tm:bugbuzz", "tm:chillingwater", @@ -131,13 +128,10 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fellstinger", "tm:flash", - "tm:foresight", "tm:foulplay", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:haze", "tm:helpinghand", "tm:hurricane", @@ -149,18 +143,13 @@ "tm:leechlife", "tm:liquidation", "tm:lunge", - "tm:mindreader", - "tm:mist", "tm:mudshot", "tm:mudslap", "tm:ominouswind", "tm:pounce", - "tm:powersplit", "tm:protect", "tm:psybeam", "tm:psychup", - "tm:quickattack", - "tm:quiverdance", "tm:raindance", "tm:rest", "tm:roost", @@ -170,17 +159,13 @@ "tm:silverwind", "tm:skittersmack", "tm:sleeptalk", - "tm:soak", "tm:solarbeam", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:supersonic", "tm:surf", - "tm:sweetscent", "tm:swift", "tm:tailwind", "tm:takedown", @@ -189,11 +174,36 @@ "tm:twister", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", - "tm:whirlwind" + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:leechlife", + "tutor:liquidation", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "surskit", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json index dfde2ca19f..647e1afd24 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json @@ -98,9 +98,7 @@ "egg:tickle", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -112,10 +110,8 @@ "tm:embargo", "tm:endure", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:falseswipe", - "tm:feintattack", "tm:fireblast", "tm:firefang", "tm:flamethrower", @@ -126,7 +122,6 @@ "tm:foulplay", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:guardswap", "tm:headbutt", "tm:helpinghand", @@ -144,50 +139,79 @@ "tm:magnetrise", "tm:megakick", "tm:megapunch", - "tm:metalburst", "tm:mistyterrain", "tm:mudslap", "tm:painsplit", "tm:payback", "tm:playrough", - "tm:poisonfang", "tm:poweruppunch", "tm:protect", "tm:psychicfangs", - "tm:punishment", "tm:raindance", "tm:rest", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:sandstorm", - "tm:seismictoss", "tm:shadowball", - "tm:slam", "tm:sleeptalk", "tm:sludgebomb", "tm:snatch", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", "tm:steelbeam", - "tm:stockpile", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:superfang", - "tm:swallow", - "tm:sweetscent", "tm:swordsdance", "tm:taunt", "tm:terablast", "tm:thunderfang", "tm:thunderpunch", - "tm:tickle", "tm:torment", - "tm:visegrip" + "tutor:ancientpower", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:falseswipe", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderfang", + "tutor:thunderpunch" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json index 02fe0306b3..417ba79030 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json @@ -99,45 +99,32 @@ "egg:quickguard", "egg:secretpower", "egg:thunderpunch", - "tm:acupressure", "tm:aerialace", "tm:aurasphere", - "tm:axekick", "tm:batonpass", - "tm:bide", "tm:blazekick", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", - "tm:bulletpunch", "tm:calmmind", "tm:closecombat", - "tm:confusion", - "tm:counter", - "tm:detect", "tm:drainpunch", "tm:dreameater", - "tm:dynamicpunch", "tm:endure", "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", - "tm:feint", "tm:firepunch", "tm:flash", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:forcepalm", - "tm:foresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", "tm:guardswap", "tm:headbutt", "tm:helpinghand", - "tm:highjumpkick", "tm:hyperbeam", "tm:icepunch", "tm:imprison", @@ -146,7 +133,6 @@ "tm:lowkick", "tm:lowsweep", "tm:magiccoat", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", @@ -156,7 +142,6 @@ "tm:poisonjab", "tm:pound", "tm:powerswap", - "tm:powertrick", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -165,9 +150,7 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:quickguard", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -200,7 +183,42 @@ "tm:upperhand", "tm:vacuumwave", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:calmmind", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:vacuumwave", + "tutor:zenheadbutt" ], "preEvolution": "meditite", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/meditite.json b/common/src/main/resources/data/cobblemon/species/generation3/meditite.json index d1d27baeca..149134ee6e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/meditite.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/meditite.json @@ -96,46 +96,33 @@ "egg:quickguard", "egg:secretpower", "egg:thunderpunch", - "tm:acupressure", "tm:aerialace", "tm:batonpass", - "tm:bide", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", - "tm:bulletpunch", "tm:calmmind", "tm:closecombat", - "tm:confusion", - "tm:counter", - "tm:detect", "tm:drainpunch", "tm:dreameater", - "tm:dynamicpunch", "tm:endure", "tm:expandingforce", "tm:facade", - "tm:fakeout", - "tm:feint", "tm:firepunch", "tm:flash", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:forcepalm", - "tm:foresight", "tm:grassknot", "tm:guardswap", "tm:headbutt", "tm:helpinghand", - "tm:highjumpkick", "tm:icepunch", "tm:imprison", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", "tm:magiccoat", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", @@ -145,7 +132,6 @@ "tm:poisonjab", "tm:pound", "tm:powerswap", - "tm:powertrick", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -154,9 +140,7 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:quickguard", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -188,7 +172,36 @@ "tm:trickroom", "tm:upperhand", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:calmmind", + "tutor:drainpunch", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json index efcc1ebb84..8a04ccc546 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/metagross.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/metagross.json @@ -105,8 +105,6 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:bulletpunch", - "tm:confusion", "tm:cosmicpower", "tm:cut", "tm:doubleedge", @@ -124,7 +122,6 @@ "tm:grassknot", "tm:gravity", "tm:gyroball", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -140,8 +137,6 @@ "tm:magnetrise", "tm:metalclaw", "tm:meteorbeam", - "tm:meteormash", - "tm:miracleeye", "tm:mudslap", "tm:poweruppunch", "tm:protect", @@ -151,7 +146,6 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:pursuit", "tm:raindance", "tm:reflect", "tm:rest", @@ -177,14 +171,54 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:thunderpunch", "tm:trailblaze", "tm:trick", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:block", + "tutor:bulldoze", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:zenheadbutt" ], "preEvolution": "metang", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/metang.json b/common/src/main/resources/data/cobblemon/species/generation3/metang.json index 10ca7d62a4..b05b318483 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/metang.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/metang.json @@ -100,8 +100,6 @@ "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:bulletpunch", - "tm:confusion", "tm:cosmicpower", "tm:cut", "tm:doubleedge", @@ -132,8 +130,6 @@ "tm:magnetrise", "tm:metalclaw", "tm:meteorbeam", - "tm:meteormash", - "tm:miracleeye", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -141,7 +137,6 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:pursuit", "tm:raindance", "tm:reflect", "tm:rest", @@ -164,14 +159,47 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:thunderpunch", "tm:trailblaze", "tm:trick", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:zenheadbutt" ], "preEvolution": "beldum", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json index 30756871e7..652fb26051 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mightyena.json @@ -103,9 +103,7 @@ "egg:mefirst", "egg:poisonfang", "tm:assurance", - "tm:astonish", "tm:beatup", - "tm:bite", "tm:bodyslam", "tm:charm", "tm:covet", @@ -122,7 +120,6 @@ "tm:gigaimpact", "tm:headbutt", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:icefang", @@ -130,14 +127,10 @@ "tm:irontail", "tm:laserfocus", "tm:lashout", - "tm:leer", - "tm:mefirst", "tm:mudslap", "tm:nastyplot", - "tm:odorsleuth", "tm:payback", "tm:playrough", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", "tm:raindance", @@ -145,7 +138,6 @@ "tm:retaliate", "tm:roar", "tm:rocksmash", - "tm:sandattack", "tm:scaryface", "tm:shadowball", "tm:sleeptalk", @@ -158,7 +150,6 @@ "tm:sunnyday", "tm:superfang", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -168,7 +159,34 @@ "tm:torment", "tm:trailblaze", "tm:uproar", - "tm:yawn" + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lashout", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:uproar" ], "preEvolution": "poochyena", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json b/common/src/main/resources/data/cobblemon/species/generation3/milotic.json index 8471730554..dd5d00a11b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/milotic.json @@ -112,7 +112,6 @@ "egg:mudsport", "egg:tickle", "tm:alluringvoice", - "tm:aquaring", "tm:aquatail", "tm:attract", "tm:avalanche", @@ -125,12 +124,10 @@ "tm:bulldoze", "tm:captivate", "tm:chillingwater", - "tm:coil", "tm:confuseray", "tm:disarmingvoice", "tm:dive", "tm:doubleedge", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragondance", "tm:dragonpulse", @@ -138,7 +135,6 @@ "tm:drainingkiss", "tm:endure", "tm:facade", - "tm:flail", "tm:flipturn", "tm:gigaimpact", "tm:hail", @@ -146,49 +142,59 @@ "tm:helpinghand", "tm:hydropump", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icywind", "tm:imprison", "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:lifedew", "tm:lightscreen", "tm:magiccoat", - "tm:mirrorcoat", - "tm:mist", "tm:muddywater", "tm:mudshot", - "tm:mudsport", "tm:protect", "tm:psychup", "tm:raindance", - "tm:recover", - "tm:refresh", "tm:rest", "tm:safeguard", "tm:scald", "tm:scaleshot", "tm:skittersmack", "tm:sleeptalk", - "tm:splash", "tm:substitute", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:tripleaxel", "tm:twister", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:wrap" + "tutor:aquatail", + "tutor:bind", + "tutor:bulldoze", + "tutor:dive", + "tutor:dragonpulse", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:rest", + "tutor:scaleshot", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tripleaxel", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "feebas", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/minun.json b/common/src/main/resources/data/cobblemon/species/generation3/minun.json index 5f3446f31e..32cbd9921a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/minun.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/minun.json @@ -103,9 +103,7 @@ "tm:charge", "tm:chargebeam", "tm:charm", - "tm:copycat", "tm:covet", - "tm:discharge", "tm:echoedvoice", "tm:electricterrain", "tm:electroball", @@ -113,55 +111,64 @@ "tm:encore", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:faketears", "tm:flash", "tm:fling", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:irontail", "tm:lastresort", "tm:lightscreen", - "tm:luckychant", "tm:magnetrise", "tm:megakick", "tm:megapunch", "tm:mudslap", "tm:nastyplot", - "tm:nuzzle", - "tm:playnice", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", "tm:rollout", "tm:shockwave", "tm:signalbeam", - "tm:sing", "tm:sleeptalk", - "tm:spark", "tm:substitute", "tm:superfang", - "tm:sweetkiss", "tm:swift", - "tm:switcheroo", - "tm:tearfullook", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", "tm:trailblaze", - "tm:trumpcard", "tm:uproar", "tm:voltswitch", "tm:wildcharge", - "tm:wish" + "tutor:chargebeam", + "tutor:covet", + "tutor:electroweb", + "tutor:endeavor", + "tutor:helpinghand", + "tutor:irontail", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json b/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json index 20ff0dfe2d..3d0ae00bfd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mudkip.json @@ -109,13 +109,9 @@ "tm:ancientpower", "tm:aquatail", "tm:avalanche", - "tm:barrier", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dig", "tm:dive", @@ -125,8 +121,6 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:foresight", - "tm:growl", "tm:hail", "tm:headbutt", "tm:hydropump", @@ -136,44 +130,53 @@ "tm:irontail", "tm:liquidation", "tm:lowkick", - "tm:mirrorcoat", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:roar", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:screech", "tm:sleeptalk", - "tm:sludge", "tm:sludgewave", - "tm:stomp", "tm:strength", "tm:substitute", "tm:superpower", - "tm:supersonic", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:whirlpool", - "tm:wideguard", "tm:workup", - "tm:yawn" + "tutor:ancientpower", + "tutor:aquatail", + "tutor:dive", + "tutor:earthpower", + "tutor:endeavor", + "tutor:iceball", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nincada.json b/common/src/main/resources/data/cobblemon/species/generation3/nincada.json index 6abae84a84..50a3036229 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nincada.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nincada.json @@ -87,9 +87,7 @@ "egg:flail", "egg:gust", "egg:nightslash", - "tm:absorb", "tm:aerialace", - "tm:bide", "tm:bugbite", "tm:bugbuzz", "tm:cut", @@ -97,26 +95,16 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", - "tm:finalgambit", - "tm:flail", "tm:flash", "tm:furycutter", - "tm:furyswipes", "tm:gigadrain", - "tm:gust", - "tm:harden", "tm:honeclaws", "tm:leechlife", "tm:metalclaw", - "tm:mindreader", "tm:mudslap", - "tm:nightslash", "tm:protect", "tm:rest", - "tm:sandattack", "tm:sandstorm", - "tm:scratch", "tm:shadowball", "tm:silverwind", "tm:skittersmack", @@ -128,7 +116,21 @@ "tm:substitute", "tm:sunnyday", "tm:terablast", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bugbite", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:leechlife", + "tutor:mudslap", + "tutor:rest", + "tutor:shadowball", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stringshot", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ninjask.json b/common/src/main/resources/data/cobblemon/species/generation3/ninjask.json index 4cfd328886..f76760af60 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ninjask.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ninjask.json @@ -87,14 +87,12 @@ "egg:flail", "egg:gust", "egg:nightslash", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:agility", "tm:aircutter", "tm:airslash", "tm:batonpass", - "tm:bide", "tm:bugbite", "tm:bugbuzz", "tm:cut", @@ -105,36 +103,25 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", - "tm:finalgambit", - "tm:flail", "tm:flash", "tm:furycutter", - "tm:furyswipes", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", - "tm:harden", "tm:honeclaws", "tm:hyperbeam", "tm:laserfocus", "tm:leechlife", "tm:metalclaw", - "tm:mindreader", "tm:mudslap", - "tm:nightslash", "tm:ominouswind", "tm:protect", "tm:rest", "tm:roost", - "tm:sandattack", "tm:sandstorm", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:silverwind", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:spite", @@ -148,7 +135,31 @@ "tm:thief", "tm:uproar", "tm:uturn", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stringshot", + "tutor:swift", + "tutor:uproar", + "tutor:xscissor" ], "preEvolution": "nincada", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json b/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json index 8c82541dfe..c1a2c98d1e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nosepass.json @@ -113,7 +113,6 @@ "tm:bulldoze", "tm:curse", "tm:dazzlinggleam", - "tm:discharge", "tm:doubleedge", "tm:earthpower", "tm:earthquake", @@ -123,18 +122,14 @@ "tm:firepunch", "tm:flashcannon", "tm:gravity", - "tm:harden", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", "tm:icepunch", "tm:irondefense", - "tm:lockon", "tm:magiccoat", "tm:magnetrise", - "tm:magnitude", "tm:meteorbeam", "tm:painsplit", "tm:powergem", @@ -145,7 +140,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", @@ -154,7 +148,6 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:spark", "tm:stealthrock", "tm:steelbeam", "tm:stompingtantrum", @@ -162,7 +155,6 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -172,8 +164,35 @@ "tm:thunderwave", "tm:torment", "tm:voltswitch", - "tm:wideguard", - "tm:zapcannon" + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:gravity", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:icepunch", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:powershift", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:thunderpunch" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/numel.json b/common/src/main/resources/data/cobblemon/species/generation3/numel.json index 665ca795d5..45c9005f11 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/numel.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/numel.json @@ -113,40 +113,31 @@ "tm:bulldoze", "tm:charm", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", "tm:earthquake", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", "tm:fireblast", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flamewheel", "tm:flareblitz", "tm:flashcannon", "tm:focusenergy", - "tm:growl", - "tm:growth", "tm:headbutt", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", - "tm:howl", "tm:incinerate", "tm:ironhead", "tm:lashout", - "tm:lavaplume", - "tm:magnitude", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:naturepower", @@ -163,24 +154,42 @@ "tm:scaryface", "tm:scorchingsands", "tm:sleeptalk", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swallow", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", "tm:trailblaze", "tm:willowisp", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:ironhead", + "tutor:lashout", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json index 63161cf672..cf9bb496ee 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/nuzleaf.json @@ -93,13 +93,10 @@ "egg:razorwind", "egg:takedown", "egg:worryseed", - "tm:absorb", "tm:aircutter", "tm:amnesia", "tm:assurance", - "tm:astonish", "tm:beatup", - "tm:bide", "tm:bodyslam", "tm:brickbreak", "tm:bulletseed", @@ -115,11 +112,8 @@ "tm:endure", "tm:energyball", "tm:explosion", - "tm:extrasensory", "tm:facade", - "tm:fakeout", "tm:falseswipe", - "tm:feintattack", "tm:flash", "tm:fling", "tm:foulplay", @@ -128,32 +122,23 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:harden", "tm:headbutt", "tm:knockoff", "tm:lashout", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", - "tm:megadrain", "tm:megakick", "tm:nastyplot", "tm:naturepower", - "tm:nightslash", "tm:payback", - "tm:pound", "tm:powerswap", "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:raindance", - "tm:razorleaf", - "tm:razorwind", "tm:rest", "tm:retaliate", "tm:rockslide", @@ -177,7 +162,6 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -185,7 +169,35 @@ "tm:trailblaze", "tm:uproar", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:aircutter", + "tutor:darkpulse", + "tutor:defog", + "tutor:endeavor", + "tutor:energyball", + "tutor:falseswipe", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:uproar", + "tutor:worryseed" ], "preEvolution": "seedot", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json index cab57bdcc4..9204414367 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/pelipper.json @@ -120,7 +120,6 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:aquaring", "tm:blizzard", "tm:bodyslam", "tm:bravebird", @@ -135,9 +134,7 @@ "tm:fling", "tm:fly", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", - "tm:gust", "tm:hail", "tm:helpinghand", "tm:hurricane", @@ -147,14 +144,11 @@ "tm:icywind", "tm:knockoff", "tm:liquidation", - "tm:mist", "tm:muddywater", "tm:ominouswind", "tm:payback", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:roost", @@ -164,14 +158,9 @@ "tm:skydrop", "tm:sleeptalk", "tm:snowscape", - "tm:soak", - "tm:spitup", "tm:steelwing", - "tm:stockpile", "tm:substitute", - "tm:supersonic", "tm:surf", - "tm:swallow", "tm:swift", "tm:tailwind", "tm:takedown", @@ -180,13 +169,32 @@ "tm:twister", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:wideguard", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "wingull", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json index 396b196f28..068beb179b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json @@ -99,13 +99,10 @@ "tm:agility", "tm:alluringvoice", "tm:batonpass", - "tm:bestow", "tm:charge", "tm:chargebeam", "tm:charm", - "tm:copycat", "tm:covet", - "tm:discharge", "tm:echoedvoice", "tm:eerieimpulse", "tm:electricterrain", @@ -114,45 +111,34 @@ "tm:encore", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:faketears", "tm:flash", "tm:fling", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:irontail", "tm:lastresort", "tm:lightscreen", - "tm:luckychant", "tm:magnetrise", "tm:megakick", "tm:megapunch", "tm:mudslap", "tm:nastyplot", - "tm:nuzzle", - "tm:playnice", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", "tm:rollout", "tm:shockwave", "tm:signalbeam", - "tm:sing", "tm:skillswap", "tm:sleeptalk", - "tm:spark", "tm:substitute", "tm:superfang", - "tm:sweetkiss", "tm:swift", - "tm:switcheroo", - "tm:tearfullook", "tm:terablast", "tm:thunder", "tm:thunderbolt", @@ -162,7 +148,29 @@ "tm:uproar", "tm:voltswitch", "tm:wildcharge", - "tm:wish" + "tutor:chargebeam", + "tutor:covet", + "tutor:electroweb", + "tutor:endeavor", + "tutor:helpinghand", + "tutor:irontail", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json index edf100b01c..c8826776f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/poochyena.json @@ -87,9 +87,7 @@ "egg:mefirst", "egg:poisonfang", "tm:assurance", - "tm:astonish", "tm:beatup", - "tm:bite", "tm:charm", "tm:covet", "tm:crunch", @@ -104,20 +102,15 @@ "tm:foulplay", "tm:headbutt", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:icefang", "tm:incinerate", "tm:irontail", "tm:lashout", - "tm:leer", - "tm:mefirst", "tm:mudslap", "tm:nastyplot", - "tm:odorsleuth", "tm:payback", "tm:playrough", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", "tm:raindance", @@ -125,7 +118,6 @@ "tm:retaliate", "tm:roar", "tm:rocksmash", - "tm:sandattack", "tm:scaryface", "tm:shadowball", "tm:sleeptalk", @@ -137,7 +129,6 @@ "tm:sunnyday", "tm:superfang", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -146,7 +137,30 @@ "tm:torment", "tm:trailblaze", "tm:uproar", - "tm:yawn" + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irontail", + "tutor:lashout", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderfang", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/ralts.json b/common/src/main/resources/data/cobblemon/species/generation3/ralts.json index 20ab75d5ee..4a38a33093 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/ralts.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/ralts.json @@ -118,10 +118,7 @@ "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:disarmingvoice", "tm:doubleteam", "tm:drainingkiss", @@ -136,27 +133,19 @@ "tm:fling", "tm:futuresight", "tm:grassknot", - "tm:growl", - "tm:grudge", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hypervoice", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:imprison", "tm:knockoff", - "tm:lifedew", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", "tm:megakick", "tm:megapunch", - "tm:memento", "tm:metronome", "tm:mistyterrain", "tm:mysticalfire", @@ -173,7 +162,6 @@ "tm:rest", "tm:safeguard", "tm:shadowball", - "tm:shadowsneak", "tm:shockwave", "tm:signalbeam", "tm:skillswap", @@ -183,10 +171,8 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderbolt", @@ -197,7 +183,39 @@ "tm:trickroom", "tm:willowisp", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json b/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json index 37f32f4724..b57d7d1845 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/rayquaza.json @@ -93,7 +93,6 @@ "tm:dive", "tm:doubleedge", "tm:dracometeor", - "tm:dragonascent", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -104,7 +103,6 @@ "tm:echoedvoice", "tm:endure", "tm:energyball", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:flamethrower", @@ -162,7 +160,45 @@ "tm:uturn", "tm:waterfall", "tm:whirlpool", - "tm:wildcharge" + "tm:wildcharge", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bind", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonascent", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:flamethrower", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:twister", + "tutor:wildcharge" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/regice.json b/common/src/main/resources/data/cobblemon/species/generation3/regice.json index 769554978f..1e9ca650ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/regice.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/regice.json @@ -96,7 +96,6 @@ "tm:gigaimpact", "tm:gravity", "tm:hail", - "tm:hammerarm", "tm:headbutt", "tm:heavyslam", "tm:hyperbeam", @@ -106,7 +105,6 @@ "tm:iciclespear", "tm:icywind", "tm:ironhead", - "tm:lockon", "tm:megakick", "tm:megapunch", "tm:poweruppunch", @@ -125,7 +123,6 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snowscape", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", @@ -135,7 +132,30 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:zapcannon" + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:ironhead", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/regirock.json b/common/src/main/resources/data/cobblemon/species/generation3/regirock.json index aa8a69342c..481125e748 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/regirock.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/regirock.json @@ -95,7 +95,6 @@ "tm:focuspunch", "tm:gigaimpact", "tm:gravity", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -103,7 +102,6 @@ "tm:icepunch", "tm:irondefense", "tm:ironhead", - "tm:lockon", "tm:megakick", "tm:megapunch", "tm:meteorbeam", @@ -116,7 +114,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:safeguard", @@ -127,7 +124,6 @@ "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -140,7 +136,34 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:zapcannon" + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/registeel.json b/common/src/main/resources/data/cobblemon/species/generation3/registeel.json index 4a197eb04b..d0349d8a7b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/registeel.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/registeel.json @@ -94,7 +94,6 @@ "tm:focuspunch", "tm:gigaimpact", "tm:gravity", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -104,7 +103,6 @@ "tm:icespinner", "tm:irondefense", "tm:ironhead", - "tm:lockon", "tm:magnetrise", "tm:megakick", "tm:megapunch", @@ -131,7 +129,6 @@ "tm:stealthrock", "tm:steelbeam", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", @@ -143,7 +140,34 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:zapcannon" + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json index b949339c87..94878fb704 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json @@ -113,24 +113,19 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:flail", "tm:gigaimpact", "tm:hail", - "tm:harden", "tm:headbutt", - "tm:headsmash", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", "tm:icywind", "tm:irondefense", "tm:liquidation", - "tm:magnitude", "tm:meteorbeam", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:protect", "tm:psychup", "tm:raindance", @@ -144,7 +139,6 @@ "tm:sandstorm", "tm:scald", "tm:scaleshot", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:snore", @@ -153,16 +147,38 @@ "tm:stoneedge", "tm:substitute", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:dive", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:liquidation", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/roselia.json b/common/src/main/resources/data/cobblemon/species/generation3/roselia.json index f6154e36d4..dbfe021d17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/roselia.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/roselia.json @@ -111,57 +111,40 @@ "egg:razorleaf", "egg:sleeppowder", "egg:synthesis", - "tm:absorb", - "tm:aromatherapy", "tm:bodyslam", "tm:bulletseed", - "tm:cottonspore", "tm:covet", "tm:cut", "tm:dazzlinggleam", "tm:endure", "tm:energyball", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:furycutter", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", - "tm:growth", - "tm:ingrain", "tm:leafstorm", - "tm:leechseed", - "tm:lifedew", "tm:magicalleaf", - "tm:megadrain", - "tm:mindreader", "tm:mudslap", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:powerwhip", "tm:protect", "tm:psychup", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:seedbomb", "tm:shadowball", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", "tm:spikes", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", @@ -170,9 +153,27 @@ "tm:toxicspikes", "tm:uproar", "tm:venoshock", - "tm:watersport", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:swift", + "tutor:synthesis", + "tutor:uproar", + "tutor:worryseed" ], "preEvolution": "budew", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json index 48945e0c1e..bde06bc366 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sableye.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sableye.json @@ -103,7 +103,6 @@ "egg:torment", "tm:aerialace", "tm:allyswitch", - "tm:astonish", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", @@ -113,9 +112,7 @@ "tm:cut", "tm:darkpulse", "tm:dazzlinggleam", - "tm:detect", "tm:dig", - "tm:disable", "tm:drainpunch", "tm:dreameater", "tm:embargo", @@ -123,18 +120,12 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fakeout", - "tm:feint", - "tm:feintattack", "tm:firepunch", "tm:flash", - "tm:flatter", "tm:fling", "tm:focuspunch", - "tm:foresight", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", "tm:gigadrain", "tm:gigaimpact", "tm:gravity", @@ -150,18 +141,14 @@ "tm:incinerate", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", "tm:magiccoat", - "tm:meanlook", "tm:megakick", "tm:megapunch", - "tm:metalburst", "tm:metalclaw", "tm:metronome", - "tm:moonlight", "tm:mudshot", "tm:mudslap", "tm:nastyplot", @@ -178,20 +165,16 @@ "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:punishment", "tm:quash", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:retaliate", "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:shockwave", "tm:signalbeam", "tm:skillswap", @@ -216,7 +199,57 @@ "tm:willowisp", "tm:wonderroom", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bulkup", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json b/common/src/main/resources/data/cobblemon/species/generation3/salamence.json index 3c5e36c487..ad9ebf3bbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/salamence.json @@ -103,7 +103,6 @@ "tm:aerialace", "tm:airslash", "tm:aquatail", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", @@ -111,21 +110,16 @@ "tm:bulldoze", "tm:crunch", "tm:cut", - "tm:defensecurl", "tm:defog", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:dualwingbeat", "tm:earthquake", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", @@ -149,13 +143,11 @@ "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:mudslap", "tm:ominouswind", "tm:outrage", "tm:protect", "tm:psychicfangs", - "tm:rage", "tm:raindance", "tm:rest", "tm:roar", @@ -177,10 +169,46 @@ "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:thunderfang", "tm:twister", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:firefang", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:roost", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderfang", + "tutor:twister", + "tutor:zenheadbutt" ], "preEvolution": "shelgon", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json index 5c8799de32..d29937248b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sceptile.json @@ -107,7 +107,6 @@ "egg:slash", "egg:synthesis", "egg:worryseed", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:agility", @@ -120,14 +119,10 @@ "tm:bulletseed", "tm:crosspoison", "tm:crunch", - "tm:crushclaw", "tm:cut", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:doubleteam", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -151,7 +146,6 @@ "tm:gigaimpact", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", "tm:headbutt", @@ -160,29 +154,18 @@ "tm:hyperbeam", "tm:irontail", "tm:laserfocus", - "tm:leafage", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", - "tm:megadrain", "tm:megakick", "tm:megapunch", - "tm:mudsport", "tm:naturalgift", "tm:naturepower", - "tm:nightslash", "tm:outrage", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", - "tm:razorwind", "tm:rest", "tm:roar", "tm:rockclimb", @@ -193,9 +176,6 @@ "tm:scaleshot", "tm:screech", "tm:seedbomb", - "tm:shedtail", - "tm:slam", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", @@ -215,7 +195,42 @@ "tm:vacuumwave", "tm:workup", "tm:worryseed", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:energyball", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:frenzyplant", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:vacuumwave", + "tutor:worryseed", + "tutor:xscissor" ], "preEvolution": "grovyle", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json b/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json index 46f27a0b21..0706b87e46 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json @@ -100,26 +100,20 @@ "egg:waterpulse", "egg:watersport", "egg:yawn", - "tm:aquaring", "tm:aquatail", - "tm:aurorabeam", "tm:babydolleyes", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:brine", "tm:bulldoze", "tm:curse", - "tm:defensecurl", "tm:dive", "tm:earthquake", "tm:echoedvoice", "tm:encore", "tm:endure", "tm:facade", - "tm:fissure", "tm:frostbreath", - "tm:growl", "tm:hail", "tm:headbutt", "tm:iceball", @@ -128,7 +122,6 @@ "tm:icywind", "tm:irontail", "tm:mudslap", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -137,26 +130,38 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:snore", - "tm:spitup", "tm:steelroller", - "tm:stockpile", "tm:strength", "tm:substitute", "tm:superfang", "tm:surf", "tm:swagger", - "tm:swallow", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:yawn" + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:bulldoze", + "tutor:dive", + "tutor:iceball", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snore", + "tutor:steelroller", + "tutor:superfang", + "tutor:waterpulse" ], "preEvolution": "spheal", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/seedot.json b/common/src/main/resources/data/cobblemon/species/generation3/seedot.json index 1a78cbc584..5dc54f87b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seedot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seedot.json @@ -84,11 +84,8 @@ "egg:razorwind", "egg:takedown", "egg:worryseed", - "tm:absorb", "tm:amnesia", - "tm:astonish", "tm:beatup", - "tm:bide", "tm:bodyslam", "tm:bulletseed", "tm:curse", @@ -107,22 +104,15 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:harden", "tm:headbutt", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", - "tm:megadrain", "tm:nastyplot", "tm:naturepower", - "tm:nightslash", "tm:payback", "tm:powerswap", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:retaliate", "tm:rocksmash", @@ -137,11 +127,28 @@ "tm:suckerpunch", "tm:sunnyday", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:trailblaze", - "tm:worryseed" + "tm:worryseed", + "tutor:defog", + "tutor:endeavor", + "tutor:energyball", + "tutor:falseswipe", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json index db78bc9ac6..12bc5390bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json @@ -97,15 +97,12 @@ "tm:acidspray", "tm:aquatail", "tm:assurance", - "tm:belch", "tm:bind", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:coil", "tm:crunch", "tm:curse", "tm:darkpulse", @@ -115,15 +112,12 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:feint", - "tm:finalgambit", "tm:firefang", "tm:flamethrower", "tm:furycutter", "tm:gastroacid", "tm:gigadrain", "tm:gigaimpact", - "tm:glare", "tm:gunkshot", "tm:haze", "tm:headbutt", @@ -135,17 +129,13 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:lick", - "tm:nightslash", "tm:payback", - "tm:poisonfang", "tm:poisonjab", "tm:poisontail", "tm:pounce", "tm:powerwhip", "tm:protect", "tm:psychicfangs", - "tm:punishment", "tm:raindance", "tm:rest", "tm:retaliate", @@ -160,15 +150,11 @@ "tm:sludgewave", "tm:snarl", "tm:snatch", - "tm:spitup", - "tm:stockpile", "tm:strength", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:swagger", - "tm:swallow", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -180,10 +166,42 @@ "tm:trailblaze", "tm:venomdrench", "tm:venoshock", - "tm:wrap", - "tm:wringout", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bind", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:furycutter", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json index 9d83103c2f..9741552504 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json @@ -101,10 +101,8 @@ "egg:waterpulse", "tm:agility", "tm:ancientpower", - "tm:aquajet", "tm:assurance", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bounce", "tm:brine", @@ -112,13 +110,11 @@ "tm:closecombat", "tm:crunch", "tm:darkpulse", - "tm:destinybond", "tm:dive", "tm:doubleedge", "tm:earthquake", "tm:endure", "tm:facade", - "tm:feint", "tm:flipturn", "tm:focusenergy", "tm:furycutter", @@ -129,16 +125,12 @@ "tm:icebeam", "tm:icefang", "tm:icywind", - "tm:leer", "tm:liquidation", "tm:mudslap", - "tm:nightslash", "tm:payback", - "tm:poisonfang", "tm:poisonjab", "tm:protect", "tm:psychicfangs", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -149,8 +141,6 @@ "tm:scaleshot", "tm:scaryface", "tm:screech", - "tm:skullbash", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:spite", @@ -164,13 +154,40 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:torment", "tm:uproar", "tm:waterfall", "tm:waterpulse", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bounce", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:dive", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:liquidation", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:superfang", + "tutor:swift", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "carvanha", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shedinja.json b/common/src/main/resources/data/cobblemon/species/generation3/shedinja.json index 6547e0b088..18bd488a92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shedinja.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shedinja.json @@ -89,11 +89,9 @@ "egg:flail", "egg:gust", "egg:nightslash", - "tm:absorb", "tm:aerialace", "tm:agility", "tm:allyswitch", - "tm:bide", "tm:bugbite", "tm:bugbuzz", "tm:confuseray", @@ -103,36 +101,23 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", - "tm:finalgambit", - "tm:flail", "tm:flash", "tm:furycutter", - "tm:furyswipes", "tm:gigadrain", "tm:gigaimpact", - "tm:grudge", - "tm:gust", - "tm:harden", - "tm:healblock", "tm:hex", "tm:honeclaws", "tm:hyperbeam", "tm:leechlife", "tm:metalclaw", - "tm:mindreader", "tm:mudslap", - "tm:nightslash", "tm:phantomforce", "tm:poltergeist", "tm:protect", "tm:rest", - "tm:sandattack", "tm:sandstorm", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:skittersmack", "tm:sleeptalk", "tm:solarbeam", @@ -147,7 +132,30 @@ "tm:thief", "tm:trick", "tm:willowisp", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:block", + "tutor:bugbite", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:leechlife", + "tutor:mudslap", + "tutor:poltergeist", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:trick", + "tutor:xscissor" ], "preEvolution": "nincada", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json b/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json index e0f3b7495b..8ee26cd734 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json @@ -92,23 +92,17 @@ "egg:dragonrush", "egg:thrash", "egg:twister", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:crunch", "tm:cut", - "tm:defensecurl", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", @@ -125,11 +119,9 @@ "tm:incinerate", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:mudslap", "tm:outrage", "tm:protect", - "tm:rage", "tm:raindance", "tm:rest", "tm:roar", @@ -146,10 +138,30 @@ "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:thunderfang", "tm:twister", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:firefang", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:thunderfang", + "tutor:twister", + "tutor:zenheadbutt" ], "preEvolution": "bagon", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json index 9f261fd460..763fcf456f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shiftry.json @@ -101,15 +101,12 @@ "egg:razorwind", "egg:takedown", "egg:worryseed", - "tm:absorb", "tm:aerialace", "tm:aircutter", "tm:airslash", "tm:amnesia", "tm:assurance", - "tm:astonish", "tm:beatup", - "tm:bide", "tm:bodyslam", "tm:bounce", "tm:brickbreak", @@ -128,11 +125,8 @@ "tm:endure", "tm:energyball", "tm:explosion", - "tm:extrasensory", "tm:facade", - "tm:fakeout", "tm:falseswipe", - "tm:feintattack", "tm:flash", "tm:fling", "tm:focusblast", @@ -143,8 +137,6 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:harden", "tm:headbutt", "tm:heatwave", "tm:hex", @@ -156,28 +148,20 @@ "tm:lashout", "tm:leafblade", "tm:leafstorm", - "tm:leaftornado", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", - "tm:megadrain", "tm:megakick", "tm:nastyplot", "tm:naturepower", - "tm:nightslash", "tm:ominouswind", "tm:payback", "tm:petalblizzard", - "tm:pound", "tm:powerswap", "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:raindance", - "tm:razorleaf", - "tm:razorwind", "tm:rest", "tm:retaliate", "tm:revenge", @@ -205,7 +189,6 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:taunt", @@ -220,10 +203,50 @@ "tm:uproar", "tm:vacuumwave", "tm:weatherball", - "tm:whirlwind", "tm:willowisp", "tm:worryseed", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bounce", + "tutor:darkpulse", + "tutor:defog", + "tutor:endeavor", + "tutor:energyball", + "tutor:falseswipe", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:ominouswind", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spikes", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:tailwind", + "tutor:throatchop", + "tutor:twister", + "tutor:uproar", + "tutor:vacuumwave", + "tutor:worryseed", + "tutor:xscissor" ], "preEvolution": "nuzleaf", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json b/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json index 51ad73cf26..65e48b9243 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shroomish.json @@ -88,7 +88,6 @@ "egg:swagger", "egg:wakeupslap", "egg:worryseed", - "tm:absorb", "tm:bodyslam", "tm:bulletseed", "tm:charm", @@ -102,15 +101,11 @@ "tm:gigadrain", "tm:grassknot", "tm:grassyterrain", - "tm:growth", "tm:gunkshot", "tm:headbutt", "tm:helpinghand", - "tm:leechseed", "tm:magicalleaf", - "tm:megadrain", "tm:naturalgift", - "tm:poisonpowder", "tm:pounce", "tm:protect", "tm:raindance", @@ -121,21 +116,33 @@ "tm:sludgebomb", "tm:snatch", "tm:solarbeam", - "tm:spore", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:swagger", "tm:swift", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:toxic", "tm:venoshock", - "tm:wakeupslap", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:drainpunch", + "tutor:energyball", + "tutor:falseswipe", + "tutor:gigadrain", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:swift", + "tutor:synthesis", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json b/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json index ad8d1addb9..ee9e68a3bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json @@ -84,23 +84,18 @@ "egg:pursuit", "egg:shadowsneak", "tm:allyswitch", - "tm:astonish", "tm:calmmind", "tm:chargebeam", "tm:confuseray", "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:encore", "tm:endure", "tm:facade", - "tm:feintattack", "tm:flash", - "tm:foresight", "tm:foulplay", "tm:grudge", "tm:gunkshot", @@ -125,14 +120,12 @@ "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:roleplay", "tm:scaryface", "tm:screech", "tm:shadowball", - "tm:shadowsneak", "tm:shockwave", "tm:skillswap", "tm:skittersmack", @@ -152,7 +145,36 @@ "tm:torment", "tm:trick", "tm:trickroom", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icywind", + "tutor:lashout", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json b/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json index 43c9b0de4e..9f2430ff66 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json @@ -79,13 +79,15 @@ "1:poisonsting", "tm:bugbite", "tm:electroweb", - "tm:harden", "tm:irondefense", - "tm:poisonsting", "tm:skittersmack", "tm:stringshot", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:electroweb", + "tutor:irondefense", + "tutor:skittersmack", + "tutor:stringshot" ], "preEvolution": "wurmple", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/skitty.json b/common/src/main/resources/data/cobblemon/species/generation3/skitty.json index 22211aaa49..b446b36275 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/skitty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/skitty.json @@ -87,7 +87,6 @@ "egg:tickle", "egg:wakeupslap", "egg:wish", - "tm:assist", "tm:attract", "tm:babydolleyes", "tm:batonpass", @@ -97,26 +96,20 @@ "tm:captivate", "tm:chargebeam", "tm:charm", - "tm:copycat", "tm:cosmicpower", "tm:covet", "tm:dig", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleslap", "tm:drainingkiss", "tm:dreameater", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:flash", - "tm:foresight", "tm:furyswipes", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -125,7 +118,6 @@ "tm:icywind", "tm:irontail", "tm:lastresort", - "tm:mudbomb", "tm:mudslap", "tm:nastyplot", "tm:payback", @@ -140,28 +132,45 @@ "tm:safeguard", "tm:shadowball", "tm:shockwave", - "tm:simplebeam", - "tm:sing", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:tackle", "tm:tailslap", - "tm:tailwhip", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:uproar", - "tm:wakeupslap", "tm:waterpulse", "tm:wildcharge", - "tm:wish", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/slaking.json b/common/src/main/resources/data/cobblemon/species/generation3/slaking.json index d2bd1753b6..145693f417 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/slaking.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/slaking.json @@ -113,10 +113,7 @@ "tm:bulkup", "tm:bulldoze", "tm:chillingwater", - "tm:chipaway", - "tm:counter", "tm:covet", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", @@ -128,20 +125,16 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:gunkshot", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -164,15 +157,12 @@ "tm:metronome", "tm:mudshot", "tm:mudslap", - "tm:nightslash", "tm:outrage", "tm:playrough", "tm:poisonjab", "tm:pounce", "tm:poweruppunch", "tm:protect", - "tm:punishment", - "tm:pursuit", "tm:quash", "tm:raindance", "tm:rest", @@ -184,13 +174,10 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slackoff", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:snore", @@ -210,14 +197,60 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", "tm:uproar", "tm:wildcharge", "tm:workup", "tm:xscissor", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:afteryou", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge", + "tutor:xscissor", + "tutor:zenheadbutt" ], "preEvolution": "vigoroth", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json b/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json index d7213aaa51..a11ba4558e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json @@ -103,26 +103,20 @@ "tm:brickbreak", "tm:bulkup", "tm:chillingwater", - "tm:chipaway", - "tm:counter", "tm:covet", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:encore", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focuspunch", "tm:furycutter", "tm:gunkshot", - "tm:hammerarm", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", @@ -136,25 +130,20 @@ "tm:metronome", "tm:mudshot", "tm:mudslap", - "tm:nightslash", "tm:playrough", "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:scratch", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slackoff", - "tm:slash", "tm:sleeptalk", "tm:snore", "tm:solarbeam", @@ -169,11 +158,41 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:tickle", "tm:workup", "tm:xscissor", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:afteryou", + "tutor:bulkup", + "tutor:covet", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:mudslap", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snore", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json b/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json index 8e3c1dd48c..bf536890d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json @@ -91,16 +91,12 @@ "egg:iciclecrash", "egg:rollout", "egg:switcheroo", - "tm:astonish", "tm:avalanche", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodyslam", "tm:chillingwater", "tm:crunch", - "tm:disable", "tm:doubleteam", "tm:endure", "tm:facade", @@ -113,14 +109,10 @@ "tm:hex", "tm:icebeam", "tm:icefang", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", - "tm:leer", "tm:lightscreen", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -132,12 +124,23 @@ "tm:spikes", "tm:spite", "tm:substitute", - "tm:switcheroo", "tm:takedown", "tm:terablast", "tm:trailblaze", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:block", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:spite", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/solrock.json b/common/src/main/resources/data/cobblemon/species/generation3/solrock.json index 26c7bad7e5..b4a30b5b45 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/solrock.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/solrock.json @@ -102,7 +102,6 @@ "tm:bulldoze", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:dreameater", "tm:earthpower", @@ -120,12 +119,9 @@ "tm:grassknot", "tm:gravity", "tm:gyroball", - "tm:harden", - "tm:healblock", "tm:heatwave", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:incinerate", "tm:irondefense", "tm:ironhead", @@ -133,7 +129,6 @@ "tm:lightscreen", "tm:magiccoat", "tm:meteorbeam", - "tm:morningsun", "tm:overheat", "tm:painsplit", "tm:powerswap", @@ -142,7 +137,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:recycle", "tm:reflect", @@ -150,7 +144,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:safeguard", @@ -171,14 +164,49 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:telekinesis", "tm:terablast", "tm:trickroom", "tm:weatherball", "tm:willowisp", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rollout", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/spheal.json b/common/src/main/resources/data/cobblemon/species/generation3/spheal.json index 893b453b5d..4ac05df6bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/spheal.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/spheal.json @@ -99,26 +99,20 @@ "egg:waterpulse", "egg:watersport", "egg:yawn", - "tm:aquaring", "tm:aquatail", - "tm:aurorabeam", "tm:babydolleyes", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:brine", "tm:bulldoze", "tm:curse", - "tm:defensecurl", "tm:dive", "tm:earthquake", "tm:echoedvoice", "tm:encore", "tm:endure", "tm:facade", - "tm:fissure", "tm:frostbreath", - "tm:growl", "tm:hail", "tm:headbutt", "tm:iceball", @@ -126,7 +120,6 @@ "tm:icywind", "tm:irontail", "tm:mudslap", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -134,25 +127,37 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:snore", - "tm:spitup", "tm:steelroller", - "tm:stockpile", "tm:strength", "tm:substitute", "tm:superfang", "tm:surf", - "tm:swallow", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:yawn" + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:bulldoze", + "tutor:dive", + "tutor:iceball", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snore", + "tutor:steelroller", + "tutor:superfang", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/spinda.json b/common/src/main/resources/data/cobblemon/species/generation3/spinda.json index dfcd569b98..2e2ee42e7f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/spinda.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/spinda.json @@ -89,34 +89,25 @@ "egg:smellingsalts", "egg:spotlight", "egg:wish", - "tm:assist", "tm:batonpass", "tm:bodyslam", "tm:brickbreak", "tm:calmmind", - "tm:copycat", "tm:covet", "tm:dig", - "tm:disable", - "tm:dizzypunch", "tm:doubleedge", "tm:drainpunch", "tm:dreameater", "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feintattack", "tm:firepunch", - "tm:flail", "tm:flash", "tm:fling", "tm:focuspunch", - "tm:guardsplit", "tm:headbutt", "tm:helpinghand", "tm:hypervoice", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:lastresort", @@ -130,10 +121,8 @@ "tm:psybeam", "tm:psychic", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:raindance", - "tm:rapidspin", "tm:recycle", "tm:rest", "tm:retaliate", @@ -147,9 +136,7 @@ "tm:shockwave", "tm:skillswap", "tm:sleeptalk", - "tm:smellingsalts", "tm:snatch", - "tm:spotlight", "tm:stompingtantrum", "tm:strength", "tm:substitute", @@ -157,20 +144,52 @@ "tm:sunnyday", "tm:superpower", "tm:swift", - "tm:tackle", "tm:teeterdance", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderpunch", "tm:trick", "tm:trickroom", "tm:uproar", "tm:waterpulse", "tm:wildcharge", - "tm:wish", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:calmmind", + "tutor:covet", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:icywind", + "tutor:lastresort", + "tutor:lowkick", + "tutor:mudslap", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:swift", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/spoink.json b/common/src/main/resources/data/cobblemon/species/generation3/spoink.json index b11de574f5..d81bfaf64f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/spoink.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/spoink.json @@ -97,7 +97,6 @@ "tm:chargebeam", "tm:chillingwater", "tm:confuseray", - "tm:confusion", "tm:covet", "tm:dazzlinggleam", "tm:dreameater", @@ -105,13 +104,11 @@ "tm:endeavor", "tm:endure", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:flashcannon", "tm:futuresight", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -119,12 +116,9 @@ "tm:imprison", "tm:irontail", "tm:lightscreen", - "tm:luckychant", "tm:lunge", "tm:magiccoat", - "tm:mirrorcoat", "tm:nightshade", - "tm:odorsleuth", "tm:payback", "tm:powergem", "tm:protect", @@ -133,7 +127,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:recycle", "tm:reflect", @@ -142,14 +135,12 @@ "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:sleeptalk", "tm:snarl", "tm:snatch", "tm:snore", "tm:snowscape", - "tm:splash", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -165,8 +156,38 @@ "tm:trick", "tm:trickroom", "tm:uproar", - "tm:whirlwind", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bounce", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:healbell", + "tutor:helpinghand", + "tutor:icywind", + "tutor:irontail", + "tutor:magiccoat", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:snore", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/surskit.json b/common/src/main/resources/data/cobblemon/species/generation3/surskit.json index 1808c6b682..e9e0c3ea2e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/surskit.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/surskit.json @@ -101,19 +101,14 @@ "egg:psybeam", "tm:acrobatics", "tm:agility", - "tm:aquajet", "tm:batonpass", "tm:blizzard", - "tm:bubble", - "tm:bubblebeam", "tm:bugbite", "tm:bugbuzz", "tm:chillingwater", "tm:endure", "tm:facade", - "tm:fellstinger", "tm:flash", - "tm:foresight", "tm:gigadrain", "tm:haze", "tm:helpinghand", @@ -124,38 +119,44 @@ "tm:leechlife", "tm:liquidation", "tm:lunge", - "tm:mindreader", - "tm:mist", "tm:mudshot", "tm:mudslap", "tm:pounce", - "tm:powersplit", "tm:protect", "tm:psybeam", "tm:psychup", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:shadowball", "tm:signalbeam", "tm:skittersmack", "tm:sleeptalk", - "tm:soak", "tm:solarbeam", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:sweetscent", "tm:takedown", "tm:terablast", "tm:thief", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport" + "tutor:bugbite", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:leechlife", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swablu.json b/common/src/main/resources/data/cobblemon/species/generation3/swablu.json index 80eaf13f10..cd318ee090 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swablu.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swablu.json @@ -94,17 +94,13 @@ "tm:acrobatics", "tm:aerialace", "tm:agility", - "tm:astonish", "tm:bodyslam", "tm:bravebird", - "tm:cottonguard", "tm:dazzlinggleam", "tm:defog", "tm:disarmingvoice", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonpulse", - "tm:dragonrush", "tm:dreameater", "tm:dualwingbeat", "tm:echoedvoice", @@ -113,8 +109,6 @@ "tm:facade", "tm:featherdance", "tm:fly", - "tm:furyattack", - "tm:growl", "tm:haze", "tm:healbell", "tm:heatwave", @@ -122,26 +116,17 @@ "tm:hurricane", "tm:hypervoice", "tm:icebeam", - "tm:mirrormove", - "tm:mist", - "tm:moonblast", "tm:naturalgift", "tm:ominouswind", - "tm:peck", - "tm:perishsong", "tm:playrough", "tm:pluck", "tm:powerswap", "tm:protect", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:refresh", "tm:rest", "tm:roost", "tm:round", "tm:safeguard", - "tm:sing", "tm:skyattack", "tm:sleeptalk", "tm:solarbeam", @@ -154,7 +139,27 @@ "tm:terablast", "tm:thief", "tm:trailblaze", - "tm:twister" + "tm:twister", + "tutor:aerialace", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:healbell", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:ominouswind", + "tutor:playrough", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json index aae63a2921..66e45c4505 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json @@ -86,20 +86,16 @@ "egg:mudslap", "egg:smog", "egg:stuffcheeks", - "tm:acidarmor", "tm:acidspray", "tm:amnesia", - "tm:belch", "tm:block", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:bulletseed", - "tm:clearsmog", "tm:corrosivegas", "tm:curse", - "tm:destinybond", "tm:doubleedge", "tm:dreameater", "tm:earthquake", @@ -124,9 +120,7 @@ "tm:mudshot", "tm:mudslap", "tm:painsplit", - "tm:poisongas", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -138,19 +132,13 @@ "tm:shadowball", "tm:shockwave", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", "tm:snatch", "tm:solarbeam", - "tm:spitup", - "tm:stockpile", "tm:strength", - "tm:stuffcheeks", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:swordsdance", "tm:takedown", "tm:terablast", @@ -162,9 +150,36 @@ "tm:venomdrench", "tm:venoshock", "tm:waterpulse", - "tm:wringout", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulldoze", + "tutor:corrosivegas", + "tutor:firepunch", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:thunderpunch", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "gulpin", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json index 38cedf8e15..c7261d640e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swampert.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swampert.json @@ -116,9 +116,6 @@ "tm:ancientpower", "tm:aquatail", "tm:avalanche", - "tm:barrier", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -126,7 +123,6 @@ "tm:bulkup", "tm:bulldoze", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:darkestlariat", "tm:dig", @@ -142,11 +138,8 @@ "tm:flipturn", "tm:focusblast", "tm:focuspunch", - "tm:foresight", "tm:gigaimpact", - "tm:growl", "tm:hail", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:helpinghand", @@ -163,55 +156,79 @@ "tm:lowkick", "tm:megakick", "tm:megapunch", - "tm:mirrorcoat", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:outrage", "tm:poisonjab", "tm:poweruppunch", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:roar", "tm:rockclimb", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandtomb", "tm:scaryface", "tm:screech", "tm:sleeptalk", - "tm:sludge", "tm:sludgewave", "tm:smackdown", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:superpower", - "tm:supersonic", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:wideguard", "tm:workup", - "tm:yawn" + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "marshtomp", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json index d6c63d180e..4d706a1142 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swellow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json @@ -107,7 +107,6 @@ "tm:airslash", "tm:assurance", "tm:batonpass", - "tm:boomburst", "tm:bravebird", "tm:defog", "tm:doubleteam", @@ -119,23 +118,15 @@ "tm:fly", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", "tm:heatwave", "tm:hurricane", "tm:hyperbeam", "tm:laserfocus", - "tm:mirrormove", "tm:mudslap", "tm:ominouswind", - "tm:peck", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", - "tm:rage", "tm:raindance", - "tm:refresh", "tm:rest", "tm:reversal", "tm:roost", @@ -144,15 +135,30 @@ "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:tailwind", "tm:terablast", "tm:thief", "tm:twister", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:twister" ], "preEvolution": "taillow", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json index bf88968d59..f0ebd48ade 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/taillow.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/taillow.json @@ -104,7 +104,6 @@ "tm:airslash", "tm:assurance", "tm:batonpass", - "tm:boomburst", "tm:bravebird", "tm:defog", "tm:doubleteam", @@ -115,21 +114,13 @@ "tm:facade", "tm:fly", "tm:focusenergy", - "tm:growl", "tm:heatwave", "tm:hurricane", - "tm:mirrormove", "tm:mudslap", "tm:ominouswind", - "tm:peck", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", - "tm:rage", "tm:raindance", - "tm:refresh", "tm:rest", "tm:reversal", "tm:roost", @@ -138,15 +129,27 @@ "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:tailwind", "tm:terablast", "tm:thief", "tm:twister", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:heatwave", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:twister" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json index 83d955df5a..ad7f488c9c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/torchic.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/torchic.json @@ -97,28 +97,21 @@ "tm:batonpass", "tm:bodyslam", "tm:bounce", - "tm:counter", - "tm:crushclaw", "tm:curse", "tm:cut", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:echoedvoice", - "tm:ember", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feint", "tm:fireblast", "tm:firepledge", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", "tm:focusenergy", - "tm:growl", "tm:headbutt", "tm:heatwave", "tm:helpinghand", @@ -128,23 +121,15 @@ "tm:lowkick", "tm:megakick", "tm:megapunch", - "tm:mirrormove", - "tm:nightslash", "tm:overheat", - "tm:peck", "tm:protect", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", - "tm:scratch", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", - "tm:smellingsalts", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -156,7 +141,23 @@ "tm:terablast", "tm:uproar", "tm:willowisp", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bounce", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:lastresort", + "tutor:lowkick", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:swift", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json b/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json index d965580e7b..769864a450 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/torkoal.json @@ -109,24 +109,17 @@ "tm:bodyslam", "tm:bulldoze", "tm:burningjealousy", - "tm:clearsmog", "tm:curse", "tm:doubleedge", "tm:earthpower", "tm:earthquake", - "tm:ember", "tm:endure", - "tm:eruption", "tm:explosion", "tm:facade", "tm:fireblast", "tm:firespin", - "tm:fissure", - "tm:flail", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:gigaimpact", "tm:gyroball", @@ -137,14 +130,11 @@ "tm:helpinghand", "tm:hyperbeam", "tm:incinerate", - "tm:inferno", "tm:irondefense", "tm:irontail", - "tm:lavaplume", "tm:naturepower", "tm:overheat", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockslide", "tm:rocksmash", @@ -153,12 +143,8 @@ "tm:sandstorm", "tm:scorchingsands", "tm:selfdestruct", - "tm:shellsmash", - "tm:skullbash", "tm:sleeptalk", "tm:sludgebomb", - "tm:smog", - "tm:smokescreen", "tm:solarbeam", "tm:stealthrock", "tm:stompingtantrum", @@ -172,9 +158,31 @@ "tm:terablast", "tm:weatherball", "tm:willowisp", - "tm:withdraw", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:irontail", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/trapinch.json b/common/src/main/resources/data/cobblemon/species/generation3/trapinch.json index cb7cb23109..1fba42a182 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/trapinch.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/trapinch.json @@ -92,9 +92,6 @@ "egg:furycutter", "egg:gust", "egg:quickattack", - "tm:astonish", - "tm:bide", - "tm:bite", "tm:bodyslam", "tm:bugbite", "tm:bulldoze", @@ -104,27 +101,19 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:feint", - "tm:feintattack", - "tm:firstimpression", - "tm:fissure", - "tm:flail", "tm:focusenergy", "tm:furycutter", "tm:gigadrain", - "tm:gust", "tm:headbutt", "tm:hyperbeam", "tm:laserfocus", "tm:mudshot", "tm:mudslap", "tm:protect", - "tm:quickattack", "tm:rest", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", @@ -138,7 +127,25 @@ "tm:sunnyday", "tm:superpower", "tm:takedown", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:superpower" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/treecko.json b/common/src/main/resources/data/cobblemon/species/generation3/treecko.json index 23faf42c91..7d95798cbd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/treecko.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/treecko.json @@ -100,7 +100,6 @@ "egg:slash", "egg:synthesis", "egg:worryseed", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:agility", @@ -109,13 +108,9 @@ "tm:brickbreak", "tm:bulletseed", "tm:crunch", - "tm:crushclaw", "tm:cut", - "tm:detect", "tm:dig", - "tm:doublekick", "tm:doubleteam", - "tm:dragonbreath", "tm:dragontail", "tm:drainpunch", "tm:endeavor", @@ -128,32 +123,20 @@ "tm:gigadrain", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", "tm:headbutt", "tm:helpinghand", "tm:irontail", - "tm:leafage", "tm:leafstorm", - "tm:leechseed", - "tm:leer", "tm:lowkick", "tm:magicalleaf", - "tm:megadrain", "tm:megakick", "tm:megapunch", - "tm:mudsport", "tm:naturalgift", "tm:naturepower", - "tm:nightslash", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", - "tm:razorwind", "tm:rest", "tm:rockslide", "tm:rocksmash", @@ -161,8 +144,6 @@ "tm:safeguard", "tm:screech", "tm:seedbomb", - "tm:slam", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:strength", @@ -178,7 +159,28 @@ "tm:trailblaze", "tm:upperhand", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:irontail", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:thunderpunch", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/tropius.json b/common/src/main/resources/data/cobblemon/species/generation3/tropius.json index 372a6bf33a..97ba415e22 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/tropius.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/tropius.json @@ -88,7 +88,6 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:bestow", "tm:bodypress", "tm:bodyslam", "tm:brutalswing", @@ -100,7 +99,6 @@ "tm:defog", "tm:doubleedge", "tm:dragondance", - "tm:dragonhammer", "tm:dragonpulse", "tm:dragontail", "tm:dualwingbeat", @@ -115,8 +113,6 @@ "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", - "tm:growth", - "tm:gust", "tm:headbutt", "tm:helpinghand", "tm:hurricane", @@ -124,8 +120,6 @@ "tm:leafblade", "tm:leafstorm", "tm:leaftornado", - "tm:leechseed", - "tm:leer", "tm:magicalleaf", "tm:naturalgift", "tm:naturepower", @@ -134,8 +128,6 @@ "tm:petalblizzard", "tm:protect", "tm:raindance", - "tm:razorleaf", - "tm:razorwind", "tm:rest", "tm:roar", "tm:rocksmash", @@ -143,18 +135,15 @@ "tm:safeguard", "tm:seedbomb", "tm:silverwind", - "tm:slam", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", "tm:spite", "tm:steelwing", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:tailwind", @@ -163,10 +152,36 @@ "tm:trailblaze", "tm:twister", "tm:uturn", - "tm:whirlwind", - "tm:wideguard", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:defog", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:ominouswind", + "tutor:outrage", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:synthesis", + "tutor:tailwind", + "tutor:twister", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json b/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json index e4bf4de8d3..9283a92914 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/vibrava.json @@ -112,11 +112,7 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:astonish", - "tm:bide", - "tm:bite", "tm:bodyslam", - "tm:boomburst", "tm:bugbite", "tm:bugbuzz", "tm:bulldoze", @@ -124,27 +120,19 @@ "tm:defog", "tm:dig", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:dualwingbeat", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:facade", - "tm:feint", - "tm:feintattack", - "tm:firstimpression", - "tm:fissure", - "tm:flail", "tm:fly", "tm:focusenergy", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:headbutt", "tm:heatwave", "tm:hyperbeam", @@ -154,13 +142,11 @@ "tm:ominouswind", "tm:outrage", "tm:protect", - "tm:quickattack", "tm:rest", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", @@ -169,7 +155,6 @@ "tm:silverwind", "tm:sleeptalk", "tm:solarbeam", - "tm:sonicboom", "tm:stealthrock", "tm:steelwing", "tm:stoneedge", @@ -178,7 +163,6 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:supersonic", "tm:swift", "tm:tailwind", "tm:takedown", @@ -186,7 +170,41 @@ "tm:throatchop", "tm:twister", "tm:uproar", - "tm:uturn" + "tm:uturn", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scorchingsands", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:twister", + "tutor:uproar" ], "preEvolution": "trapinch", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json b/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json index 491fa27648..21f1781ff2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json @@ -98,10 +98,7 @@ "tm:bulkup", "tm:bulldoze", "tm:chillingwater", - "tm:chipaway", - "tm:counter", "tm:covet", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", @@ -113,19 +110,15 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gunkshot", - "tm:hammerarm", "tm:headbutt", "tm:helpinghand", "tm:honeclaws", @@ -144,13 +137,11 @@ "tm:metronome", "tm:mudshot", "tm:mudslap", - "tm:nightslash", "tm:outrage", "tm:playrough", "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -161,13 +152,10 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slackoff", - "tm:slash", "tm:sleeptalk", "tm:snore", "tm:solarbeam", @@ -185,13 +173,54 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", "tm:uproar", "tm:workup", "tm:xscissor", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:afteryou", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:xscissor", + "tutor:zenheadbutt" ], "preEvolution": "slakoth", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json index f40e1d626d..f7f58ca7fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/volbeat.json @@ -109,9 +109,7 @@ "tm:chargebeam", "tm:chillingwater", "tm:confuseray", - "tm:counter", "tm:dazzlinggleam", - "tm:dizzypunch", "tm:doubleedge", "tm:doubleteam", "tm:encore", @@ -130,7 +128,6 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:moonlight", "tm:mudslap", "tm:ominouswind", "tm:playnice", @@ -138,11 +135,9 @@ "tm:pounce", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:roost", - "tm:seismictoss", "tm:shadowball", "tm:shockwave", "tm:signalbeam", @@ -156,8 +151,6 @@ "tm:sunnyday", "tm:swagger", "tm:swift", - "tm:tackle", - "tm:tailglow", "tm:tailwind", "tm:takedown", "tm:taunt", @@ -170,7 +163,34 @@ "tm:trick", "tm:uturn", "tm:waterpulse", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:playrough", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json b/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json index a6f606e33f..eb03e70fb0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json @@ -106,8 +106,6 @@ "egg:thrash", "egg:tickle", "tm:amnesia", - "tm:aquaring", - "tm:astonish", "tm:avalanche", "tm:blizzard", "tm:bodypress", @@ -115,17 +113,13 @@ "tm:bounce", "tm:brine", "tm:bulldoze", - "tm:clearsmog", "tm:curse", - "tm:defensecurl", "tm:dive", "tm:doubleedge", "tm:earthquake", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fissure", - "tm:growl", "tm:hail", "tm:headbutt", "tm:heavyslam", @@ -133,7 +127,6 @@ "tm:hypervoice", "tm:icebeam", "tm:icywind", - "tm:mist", "tm:protect", "tm:raindance", "tm:rest", @@ -145,23 +138,31 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:snore", - "tm:soak", - "tm:splash", "tm:steelroller", "tm:strength", "tm:substitute", "tm:surf", "tm:swagger", "tm:terablast", - "tm:thrash", - "tm:tickle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:waterspout", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:bulldoze", + "tutor:dive", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:snore", + "tutor:steelroller", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json index ad20e229ac..9a3823be56 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json @@ -113,8 +113,6 @@ "egg:thrash", "egg:tickle", "tm:amnesia", - "tm:aquaring", - "tm:astonish", "tm:avalanche", "tm:blizzard", "tm:block", @@ -123,18 +121,14 @@ "tm:bounce", "tm:brine", "tm:bulldoze", - "tm:clearsmog", "tm:curse", - "tm:defensecurl", "tm:dive", "tm:doubleedge", "tm:earthquake", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fissure", "tm:gigaimpact", - "tm:growl", "tm:hail", "tm:headbutt", "tm:heavyslam", @@ -145,8 +139,6 @@ "tm:icywind", "tm:ironhead", "tm:liquidation", - "tm:mist", - "tm:nobleroar", "tm:protect", "tm:raindance", "tm:rest", @@ -158,23 +150,36 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:snore", - "tm:soak", - "tm:splash", "tm:steelroller", "tm:strength", "tm:substitute", "tm:surf", "tm:swagger", "tm:terablast", - "tm:thrash", - "tm:tickle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:waterspout", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bounce", + "tutor:bulldoze", + "tutor:dive", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:ironhead", + "tutor:liquidation", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:snore", + "tutor:steelroller", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "wailmer", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/walrein.json b/common/src/main/resources/data/cobblemon/species/generation3/walrein.json index 32863b2ceb..caa3ea90a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/walrein.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/walrein.json @@ -102,12 +102,9 @@ "egg:waterpulse", "egg:watersport", "egg:yawn", - "tm:aquaring", "tm:aquatail", - "tm:aurorabeam", "tm:avalanche", "tm:babydolleyes", - "tm:bellydrum", "tm:blizzard", "tm:block", "tm:bodypress", @@ -116,18 +113,15 @@ "tm:bulldoze", "tm:crunch", "tm:curse", - "tm:defensecurl", "tm:dive", "tm:earthquake", "tm:echoedvoice", "tm:encore", "tm:endure", "tm:facade", - "tm:fissure", "tm:frostbreath", "tm:furycutter", "tm:gigaimpact", - "tm:growl", "tm:hail", "tm:headbutt", "tm:heavyslam", @@ -142,7 +136,6 @@ "tm:irontail", "tm:liquidation", "tm:mudslap", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -151,28 +144,48 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:snore", - "tm:spitup", "tm:steelroller", - "tm:stockpile", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:superfang", "tm:surf", "tm:swagger", - "tm:swallow", "tm:swordsdance", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:yawn" + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:block", + "tutor:bulldoze", + "tutor:dive", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snore", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:waterpulse" ], "preEvolution": "sealeo", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json index 5726d61fdd..d90232caa9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/whiscash.json @@ -102,7 +102,6 @@ "egg:thrash", "tm:amnesia", "tm:aquatail", - "tm:belch", "tm:blizzard", "tm:bodyslam", "tm:bounce", @@ -116,8 +115,6 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", "tm:futuresight", "tm:gigaimpact", "tm:hail", @@ -129,12 +126,9 @@ "tm:icebeam", "tm:icywind", "tm:liquidation", - "tm:magnitude", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:outrage", "tm:protect", "tm:raindance", @@ -147,7 +141,6 @@ "tm:scaryface", "tm:sleeptalk", "tm:snore", - "tm:spark", "tm:spikes", "tm:stealthrock", "tm:stompingtantrum", @@ -159,15 +152,37 @@ "tm:swift", "tm:takedown", "tm:terablast", - "tm:thrash", - "tm:tickle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snore", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "barboach", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation3/whismur.json b/common/src/main/resources/data/cobblemon/species/generation3/whismur.json index e2f6c1de39..5f516526c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/whismur.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/whismur.json @@ -82,24 +82,19 @@ "egg:synchronoise", "egg:takedown", "egg:whirlwind", - "tm:astonish", "tm:blizzard", "tm:bodyslam", - "tm:circlethrow", "tm:disarmingvoice", "tm:echoedvoice", "tm:endeavor", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:faketears", "tm:fireblast", "tm:firepunch", "tm:flamethrower", "tm:fling", - "tm:hammerarm", "tm:headbutt", - "tm:howl", "tm:hypervoice", "tm:icebeam", "tm:icepunch", @@ -108,7 +103,6 @@ "tm:megakick", "tm:megapunch", "tm:mudslap", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", @@ -119,24 +113,36 @@ "tm:shadowball", "tm:shockwave", "tm:sleeptalk", - "tm:smellingsalts", - "tm:smokescreen", "tm:snore", "tm:solarbeam", - "tm:stomp", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swagger", - "tm:synchronoise", "tm:takedown", "tm:terablast", "tm:thunderpunch", "tm:uproar", "tm:waterpulse", - "tm:whirlwind", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:mudslap", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snore", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wingull.json b/common/src/main/resources/data/cobblemon/species/generation3/wingull.json index 45612befe7..97e106a386 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wingull.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wingull.json @@ -114,7 +114,6 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:aquaring", "tm:blizzard", "tm:bravebird", "tm:brine", @@ -126,8 +125,6 @@ "tm:facade", "tm:featherdance", "tm:fly", - "tm:growl", - "tm:gust", "tm:hail", "tm:helpinghand", "tm:hurricane", @@ -136,13 +133,10 @@ "tm:icywind", "tm:knockoff", "tm:liquidation", - "tm:mist", "tm:muddywater", "tm:ominouswind", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:roost", @@ -150,10 +144,8 @@ "tm:skyattack", "tm:sleeptalk", "tm:snowscape", - "tm:soak", "tm:steelwing", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:tailwind", @@ -163,12 +155,27 @@ "tm:twister", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:wideguard", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:shockwave", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json b/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json index e82e04ede0..daa5cc9de9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json @@ -66,11 +66,13 @@ "15:bugbite", "tm:bugbite", "tm:electroweb", - "tm:poisonsting", "tm:skittersmack", "tm:stringshot", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:electroweb", + "tutor:skittersmack", + "tutor:stringshot" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json b/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json index 86a78aff70..761ee00231 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json @@ -68,12 +68,8 @@ "1:amnesia", "tm:amnesia", "tm:charm", - "tm:counter", - "tm:destinybond", "tm:encore", - "tm:mirrorcoat", - "tm:safeguard", - "tm:splash" + "tm:safeguard" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json index 7deb5da064..e100d24693 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json @@ -100,36 +100,25 @@ "tm:agility", "tm:aurasphere", "tm:batonpass", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:closecombat", - "tm:counter", - "tm:crushclaw", "tm:curse", - "tm:detect", "tm:dig", - "tm:disable", "tm:doubleedge", - "tm:doublehit", - "tm:doublekick", "tm:embargo", "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", - "tm:finalgambit", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", @@ -144,23 +133,16 @@ "tm:irontail", "tm:knockoff", "tm:lastresort", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", "tm:megapunch", "tm:metalclaw", - "tm:nightslash", "tm:payback", "tm:poisonjab", - "tm:powertrip", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:retaliate", "tm:revenge", @@ -171,12 +153,10 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:scratch", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:strength", @@ -184,7 +164,6 @@ "tm:sunnyday", "tm:surf", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -198,7 +177,41 @@ "tm:upperhand", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json b/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json index 7636093c9d..b2cd438cc9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json @@ -92,8 +92,6 @@ "egg:simplebeam", "egg:tickle", "tm:babydolleyes", - "tm:bellydrum", - "tm:bestow", "tm:blizzard", "tm:bodyslam", "tm:chargebeam", @@ -104,13 +102,10 @@ "tm:doubleedge", "tm:echoedvoice", "tm:endure", - "tm:extremespeed", "tm:facade", - "tm:flail", "tm:fling", "tm:furycutter", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:headbutt", "tm:helpinghand", @@ -122,41 +117,57 @@ "tm:lastresort", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:odorsleuth", "tm:pinmissile", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", "tm:rocksmash", "tm:rollout", - "tm:sandattack", "tm:seedbomb", "tm:shadowball", "tm:shockwave", - "tm:simplebeam", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", "tm:superfang", "tm:surf", "tm:swift", - "tm:tackle", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:trick", "tm:waterpulse", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:covet", + "tutor:furycutter", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick", + "tutor:waterpulse" ], "evolutions": [ { @@ -224,7 +235,6 @@ "tm:babydolleyes", "tm:blizzard", "tm:bodyslam", - "tm:counter", "tm:dig", "tm:doubleedge", "tm:endure", @@ -241,18 +251,13 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:lick", "tm:mudshot", - "tm:partingshot", "tm:payback", "tm:pinmissile", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:sandattack", "tm:scaryface", "tm:screech", "tm:seedbomb", @@ -263,7 +268,6 @@ "tm:sunnyday", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -273,7 +277,24 @@ "tm:thunderwave", "tm:trick", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:babydolleyes", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json index 1bcc39abc1..793970304c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json @@ -113,9 +113,7 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", - "tm:growth", "tm:hail", "tm:hardpress", "tm:headbutt", @@ -123,28 +121,20 @@ "tm:hyperbeam", "tm:icebeam", "tm:icepunch", - "tm:iceshard", "tm:icespinner", "tm:iciclespear", "tm:icywind", - "tm:ingrain", "tm:irontail", - "tm:leafage", "tm:leafstorm", - "tm:leechseed", - "tm:leer", "tm:lowkick", "tm:magicalleaf", "tm:megakick", "tm:megapunch", - "tm:mist", "tm:mudslap", "tm:naturalgift", "tm:outrage", - "tm:powdersnow", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:rockclimb", "tm:rockslide", @@ -154,12 +144,9 @@ "tm:safeguard", "tm:scaryface", "tm:seedbomb", - "tm:sheercold", - "tm:skullbash", "tm:sleeptalk", "tm:snowscape", "tm:solarbeam", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", @@ -171,8 +158,35 @@ "tm:trailblaze", "tm:waterpulse", "tm:weatherball", - "tm:woodhammer", - "tm:worryseed" + "tm:worryseed", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:energyball", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:synthesis", + "tutor:waterpulse", + "tutor:worryseed" ], "preEvolution": "snover", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json b/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json index 73c8dfb5d4..a583490d1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json @@ -101,32 +101,26 @@ "tm:aerialace", "tm:agility", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:beatup", "tm:bounce", "tm:brickbreak", "tm:brutalswing", "tm:chillingwater", - "tm:counter", "tm:covet", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:doublehit", - "tm:doubleslap", "tm:dreameater", "tm:dualchop", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:firepunch", "tm:fling", "tm:focuspunch", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", @@ -144,29 +138,23 @@ "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:nastyplot", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", "tm:revenge", "tm:rocksmash", "tm:roleplay", - "tm:sandattack", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:snatch", @@ -176,9 +164,7 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -188,13 +174,48 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:tickle", "tm:trailblaze", "tm:tripleaxel", "tm:upperhand", "tm:uturn", "tm:waterpulse", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bounce", + "tutor:covet", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:tripleaxel", + "tutor:waterpulse" ], "preEvolution": "aipom", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/arceus.json b/common/src/main/resources/data/cobblemon/species/generation4/arceus.json index e6620e1cc1..00a3f198e7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/arceus.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/arceus.json @@ -102,7 +102,6 @@ "tm:electricterrain", "tm:endure", "tm:energyball", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:flamethrower", @@ -122,7 +121,6 @@ "tm:gunkshot", "tm:hail", "tm:headbutt", - "tm:healingwish", "tm:heatwave", "tm:heavyslam", "tm:hex", @@ -138,7 +136,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:judgment", "tm:laserfocus", "tm:lastresort", "tm:lightscreen", @@ -152,7 +149,6 @@ "tm:outrage", "tm:overheat", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poisonjab", "tm:powergem", @@ -161,13 +157,10 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:punishment", "tm:quash", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", @@ -179,7 +172,6 @@ "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", - "tm:seismictoss", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", @@ -220,7 +212,74 @@ "tm:willowisp", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:liquidation", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:ominouswind", + "tutor:outrage", + "tutor:poisonjab", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:trick", + "tutor:twister", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -333,7 +392,6 @@ "tm:electricterrain", "tm:endure", "tm:energyball", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:flamethrower", @@ -352,7 +410,6 @@ "tm:gunkshot", "tm:hail", "tm:headbutt", - "tm:healingwish", "tm:heatwave", "tm:heavyslam", "tm:hex", @@ -368,7 +425,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:judgment", "tm:laserfocus", "tm:lastresort", "tm:lightscreen", @@ -382,7 +438,6 @@ "tm:outrage", "tm:overheat", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poisonjab", "tm:powergem", @@ -391,13 +446,10 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:punishment", "tm:quash", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", @@ -409,7 +461,6 @@ "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", - "tm:seismictoss", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", @@ -450,7 +501,74 @@ "tm:willowisp", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:liquidation", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:ominouswind", + "tutor:outrage", + "tutor:poisonjab", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:trick", + "tutor:twister", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -620,7 +738,6 @@ "tm:electricterrain", "tm:endure", "tm:energyball", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:flamethrower", @@ -638,7 +755,6 @@ "tm:gravity", "tm:gunkshot", "tm:hail", - "tm:healingwish", "tm:heatwave", "tm:heavyslam", "tm:hex", @@ -654,7 +770,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:judgment", "tm:laserfocus", "tm:lastresort", "tm:lightscreen", @@ -668,7 +783,6 @@ "tm:outrage", "tm:overheat", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poisonjab", "tm:powergem", @@ -677,13 +791,10 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:punishment", "tm:quash", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", @@ -695,7 +806,6 @@ "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", - "tm:seismictoss", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", @@ -734,7 +844,71 @@ "tm:willowisp", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:liquidation", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:ominouswind", + "tutor:outrage", + "tutor:poisonjab", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:trick", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation4/azelf.json b/common/src/main/resources/data/cobblemon/species/generation4/azelf.json index 5754e6aca0..d360576504 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/azelf.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/azelf.json @@ -82,9 +82,7 @@ "tm:batonpass", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:dazzlinggleam", - "tm:detect", "tm:doubleedge", "tm:drainingkiss", "tm:drainpunch", @@ -95,7 +93,6 @@ "tm:energyball", "tm:expandingforce", "tm:explosion", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firepunch", @@ -120,7 +117,6 @@ "tm:magicroom", "tm:metronome", "tm:mudslap", - "tm:mysticalpower", "tm:nastyplot", "tm:naturalgift", "tm:payback", @@ -168,7 +164,51 @@ "tm:uturn", "tm:waterpulse", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:playrough", + "tutor:powershift", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stealthrock", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json b/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json index 71c0f460d7..8dd665d043 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bastiodon.json @@ -97,7 +97,6 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", - "tm:counter", "tm:curse", "tm:dig", "tm:doubleedge", @@ -106,13 +105,11 @@ "tm:endure", "tm:facade", "tm:fireblast", - "tm:fissure", "tm:flamethrower", "tm:flashcannon", "tm:focusenergy", "tm:foulplay", "tm:gigaimpact", - "tm:guardsplit", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -124,7 +121,6 @@ "tm:irontail", "tm:magiccoat", "tm:magnetrise", - "tm:metalburst", "tm:metalsound", "tm:meteorbeam", "tm:mudslap", @@ -159,7 +155,6 @@ "tm:substitute", "tm:sunnyday", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -167,7 +162,38 @@ "tm:thunderbolt", "tm:torment", "tm:trailblaze", - "tm:wideguard" + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:outrage", + "tutor:powershift", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderbolt" ], "preEvolution": "shieldon", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json b/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json index 3e2c6108d4..c437d3fa04 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bibarel.json @@ -100,7 +100,6 @@ "egg:skullbash", "egg:watersport", "tm:amnesia", - "tm:aquajet", "tm:aquatail", "tm:blizzard", "tm:bulldoze", @@ -109,7 +108,6 @@ "tm:crunch", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:dive", "tm:doubleedge", @@ -119,35 +117,27 @@ "tm:fling", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:hyperbeam", - "tm:hyperfang", "tm:icebeam", "tm:icywind", "tm:irontail", "tm:lastresort", "tm:liquidation", "tm:mudslap", - "tm:mudsport", - "tm:odorsleuth", "tm:pluck", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", "tm:rockclimb", "tm:rocksmash", "tm:rollout", - "tm:rototiller", "tm:scald", "tm:shadowball", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:stealthrock", "tm:stompingtantrum", @@ -159,7 +149,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -168,12 +157,37 @@ "tm:thunderbolt", "tm:thunderwave", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", "tm:workup", - "tm:yawn" + "tutor:aquatail", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:covet", + "tutor:dive", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:superpower", + "tutor:swift", + "tutor:thunderbolt", + "tutor:waterpulse" ], "preEvolution": "bidoof", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json b/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json index cecd41fd54..ad74184bc5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bidoof.json @@ -111,28 +111,21 @@ "tm:crunch", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:furycutter", - "tm:furyswipes", "tm:grassknot", - "tm:growl", "tm:headbutt", - "tm:hyperfang", "tm:icebeam", "tm:icywind", "tm:irontail", "tm:lastresort", "tm:mudslap", - "tm:mudsport", - "tm:odorsleuth", "tm:pluck", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -140,7 +133,6 @@ "tm:rollout", "tm:shadowball", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:stealthrock", "tm:substitute", @@ -148,7 +140,6 @@ "tm:superfang", "tm:superpower", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -156,9 +147,26 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:watersport", "tm:workup", - "tm:yawn" + "tutor:aquatail", + "tutor:chargebeam", + "tutor:covet", + "tutor:furycutter", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:superfang", + "tutor:superpower", + "tutor:thunderbolt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json b/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json index 11b178fab5..9e64ceea72 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bonsly.json @@ -101,11 +101,8 @@ "tm:brickbreak", "tm:bulldoze", "tm:calmmind", - "tm:copycat", - "tm:counter", "tm:covet", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", @@ -114,15 +111,11 @@ "tm:explosion", "tm:facade", "tm:faketears", - "tm:feintattack", - "tm:flail", "tm:foulplay", "tm:grassknot", - "tm:harden", "tm:headbutt", "tm:helpinghand", "tm:lowkick", - "tm:mimic", "tm:mudshot", "tm:mudslap", "tm:naturepower", @@ -133,14 +126,12 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:roleplay", "tm:rollout", "tm:sandstorm", "tm:sandtomb", "tm:selfdestruct", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:spikes", @@ -151,10 +142,29 @@ "tm:suckerpunch", "tm:sunnyday", "tm:takedown", - "tm:tearfullook", "tm:terablast", "tm:thief", - "tm:trailblaze" + "tm:trailblaze", + "tutor:afteryou", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:covet", + "tutor:earthpower", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json b/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json index f78fd9b003..b04a21afae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json @@ -112,15 +112,12 @@ "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:confusion", "tm:dreameater", "tm:earthquake", "tm:endure", "tm:expandingforce", "tm:explosion", - "tm:extrasensory", "tm:facade", - "tm:feintattack", "tm:flash", "tm:flashcannon", "tm:futuresight", @@ -130,12 +127,10 @@ "tm:guardswap", "tm:gyroball", "tm:hardpress", - "tm:healblock", "tm:heavyslam", "tm:helpinghand", "tm:hex", "tm:hyperbeam", - "tm:hypnosis", "tm:icespinner", "tm:imprison", "tm:irondefense", @@ -154,7 +149,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:recycle", "tm:reflect", @@ -181,7 +175,6 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -189,7 +182,40 @@ "tm:trickroom", "tm:weatherball", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "bronzor", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json b/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json index 056819f8f0..8708abb296 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json @@ -103,14 +103,11 @@ "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:confusion", "tm:dreameater", "tm:earthquake", "tm:endure", "tm:expandingforce", - "tm:extrasensory", "tm:facade", - "tm:feintattack", "tm:flash", "tm:flashcannon", "tm:futuresight", @@ -118,11 +115,9 @@ "tm:gravity", "tm:guardswap", "tm:gyroball", - "tm:healblock", "tm:heavyslam", "tm:helpinghand", "tm:hex", - "tm:hypnosis", "tm:icespinner", "tm:imprison", "tm:irondefense", @@ -137,7 +132,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:recycle", "tm:reflect", @@ -162,14 +156,42 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gravity", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:ironhead", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rollout", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/budew.json b/common/src/main/resources/data/cobblemon/species/generation4/budew.json index 8e6fbf15b6..742f1ae236 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/budew.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/budew.json @@ -95,26 +95,18 @@ "egg:razorleaf", "egg:sleeppowder", "egg:synthesis", - "tm:absorb", "tm:bulletseed", - "tm:cottonspore", "tm:covet", "tm:cut", "tm:dazzlinggleam", "tm:endure", "tm:energyball", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", - "tm:growth", "tm:leafstorm", - "tm:lifedew", - "tm:megadrain", - "tm:mindreader", "tm:mudslap", "tm:naturalgift", "tm:naturepower", @@ -122,16 +114,13 @@ "tm:protect", "tm:psychup", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:seedbomb", "tm:shadowball", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", "tm:spikes", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:swift", @@ -140,9 +129,24 @@ "tm:terablast", "tm:uproar", "tm:venoshock", - "tm:watersport", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:mudslap", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:swift", + "tutor:synthesis", + "tutor:uproar", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/buizel.json b/common/src/main/resources/data/cobblemon/species/generation4/buizel.json index 764329410f..9c52a8c17d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/buizel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/buizel.json @@ -112,11 +112,8 @@ "egg:slash", "egg:switcheroo", "tm:agility", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", "tm:batonpass", - "tm:bite", "tm:blizzard", "tm:brickbreak", "tm:brine", @@ -125,8 +122,6 @@ "tm:crunch", "tm:dig", "tm:dive", - "tm:doublehit", - "tm:doubleslap", "tm:echoedvoice", "tm:endure", "tm:facade", @@ -134,8 +129,6 @@ "tm:flipturn", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", - "tm:growl", "tm:hail", "tm:headbutt", "tm:helpinghand", @@ -149,29 +142,19 @@ "tm:liquidation", "tm:lowkick", "tm:lowsweep", - "tm:mefirst", "tm:mudslap", - "tm:odorsleuth", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roar", "tm:rocksmash", "tm:rocktomb", - "tm:slash", "tm:sleeptalk", - "tm:soak", - "tm:sonicboom", "tm:strength", "tm:substitute", "tm:surf", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:tailslap", "tm:tailwhip", "tm:takedown", @@ -179,11 +162,28 @@ "tm:terablast", "tm:thief", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:wavecrash", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bulkup", + "tutor:dive", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/buneary.json b/common/src/main/resources/data/cobblemon/species/generation4/buneary.json index 7204c6440f..6215da94af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/buneary.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/buneary.json @@ -125,41 +125,27 @@ "tm:bounce", "tm:chargebeam", "tm:charm", - "tm:circlethrow", - "tm:copycat", "tm:cosmicpower", "tm:covet", "tm:cut", - "tm:defensecurl", "tm:dig", - "tm:dizzypunch", - "tm:doublehit", - "tm:doublekick", "tm:drainpunch", "tm:encore", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:firepunch", - "tm:flail", - "tm:flatter", "tm:fling", "tm:focuspunch", - "tm:foresight", - "tm:frustration", "tm:grassknot", "tm:headbutt", "tm:healbell", - "tm:healingwish", "tm:helpinghand", "tm:hypervoice", "tm:icebeam", "tm:icepunch", "tm:irontail", - "tm:jumpkick", "tm:lastresort", "tm:lowkick", "tm:lowsweep", @@ -167,30 +153,21 @@ "tm:megakick", "tm:megapunch", "tm:mudslap", - "tm:mudsport", "tm:payback", "tm:playrough", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:rocksmash", "tm:shadowball", "tm:shockwave", - "tm:skyuppercut", "tm:sleeptalk", "tm:solarbeam", - "tm:splash", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", - "tm:switcheroo", - "tm:teeterdance", "tm:terablast", "tm:thunderbolt", "tm:thunderpunch", @@ -198,7 +175,38 @@ "tm:tripleaxel", "tm:uproar", "tm:waterpulse", - "tm:workup" + "tm:workup", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:bounce", + "tutor:chargebeam", + "tutor:covet", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:lastresort", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/burmy.json b/common/src/main/resources/data/cobblemon/species/generation4/burmy.json index b6fedecdab..c4754b0177 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/burmy.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/burmy.json @@ -68,8 +68,10 @@ "tm:bugbite", "tm:electroweb", "tm:stringshot", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:electroweb", + "tutor:stringshot" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json index b48f09292e..320282b120 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json @@ -98,7 +98,6 @@ "egg:stunspore", "tm:acidspray", "tm:bind", - "tm:bite", "tm:bugbite", "tm:bulletseed", "tm:crunch", @@ -106,7 +105,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:feintattack", "tm:flash", "tm:fling", "tm:furycutter", @@ -114,44 +112,46 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", - "tm:growth", "tm:hyperbeam", "tm:infestation", - "tm:ingrain", "tm:knockoff", - "tm:leaftornado", - "tm:leechseed", "tm:magicalleaf", "tm:mudslap", "tm:naturepower", "tm:payback", "tm:powerwhip", "tm:protect", - "tm:ragepowder", - "tm:razorleaf", "tm:rest", "tm:seedbomb", - "tm:slam", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:spitup", - "tm:stockpile", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:swallow", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:terablast", "tm:thief", "tm:throatchop", - "tm:vinewhip", "tm:worryseed", - "tm:wringout" + "tutor:bind", + "tutor:bugbite", + "tutor:energyball", + "tutor:furycutter", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:throatchop", + "tutor:worryseed" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json index 1ca0b38365..e514eb26c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chatot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chatot.json @@ -94,8 +94,6 @@ "tm:aerialace", "tm:agility", "tm:aircutter", - "tm:boomburst", - "tm:chatter", "tm:confide", "tm:defog", "tm:dualwingbeat", @@ -105,18 +103,14 @@ "tm:facade", "tm:featherdance", "tm:fly", - "tm:furyattack", "tm:growl", "tm:heatwave", "tm:hypervoice", - "tm:mimic", - "tm:mirrormove", "tm:mudslap", "tm:nastyplot", "tm:nightshade", "tm:ominouswind", "tm:partingshot", - "tm:peck", "tm:pluck", "tm:powershift", "tm:protect", @@ -125,14 +119,11 @@ "tm:roleplay", "tm:roost", "tm:round", - "tm:sing", "tm:skyattack", "tm:sleeptalk", "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:supersonic", - "tm:synchronoise", "tm:tailwind", "tm:taunt", "tm:terablast", @@ -141,7 +132,24 @@ "tm:twister", "tm:uproar", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:heatwave", + "tutor:hypervoice", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:powershift", + "tutor:rest", + "tutor:roleplay", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json index 05cb46c719..1a92f35da6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json @@ -90,41 +90,28 @@ "egg:rollout", "egg:sweetscent", "egg:tickle", - "tm:aromatherapy", "tm:bulletseed", "tm:dazzlinggleam", - "tm:defensecurl", "tm:drainingkiss", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:flowershield", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:laserfocus", - "tm:leafage", - "tm:leechseed", - "tm:luckychant", "tm:magicalleaf", - "tm:morningsun", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:playrough", "tm:pollenpuff", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:rollout", "tm:safeguard", @@ -134,15 +121,28 @@ "tm:solarblade", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:playrough", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "cherubi", "evolutions": [], @@ -187,26 +187,19 @@ "tm:energyball", "tm:facade", "tm:flash", - "tm:flowershield", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:healingwish", "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:laserfocus", - "tm:leafage", - "tm:leechseed", - "tm:luckychant", "tm:magicalleaf", - "tm:morningsun", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:playrough", "tm:pollenpuff", "tm:protect", @@ -223,12 +216,27 @@ "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:tickle", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:playrough", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [], "battleOnly": true diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json b/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json index a451ba98c8..ac92174e49 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json @@ -84,36 +84,24 @@ "egg:rollout", "egg:sweetscent", "egg:tickle", - "tm:aromatherapy", "tm:bulletseed", "tm:dazzlinggleam", - "tm:defensecurl", "tm:drainingkiss", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:flowershield", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", - "tm:leafage", - "tm:leechseed", - "tm:luckychant", "tm:magicalleaf", - "tm:morningsun", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", "tm:pollenpuff", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:rollout", "tm:safeguard", @@ -122,15 +110,24 @@ "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json index 576c59458e..6b55649458 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chimchar.json @@ -93,23 +93,18 @@ "egg:thunderpunch", "tm:acrobatics", "tm:agility", - "tm:assist", "tm:blazekick", "tm:brickbreak", "tm:bulkup", "tm:burningjealousy", - "tm:counter", "tm:covet", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:doublekick", - "tm:ember", "tm:encore", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:fireblast", "tm:firepledge", @@ -117,12 +112,10 @@ "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusenergy", "tm:focuspunch", - "tm:furyswipes", "tm:grassknot", "tm:gunkshot", "tm:headbutt", @@ -132,7 +125,6 @@ "tm:incinerate", "tm:irontail", "tm:knockoff", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:metronome", @@ -143,7 +135,6 @@ "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:quickguard", "tm:rest", "tm:rockclimb", "tm:rockslide", @@ -151,17 +142,13 @@ "tm:rocktomb", "tm:roleplay", "tm:rollout", - "tm:scratch", "tm:shadowclaw", - "tm:slackoff", "tm:sleeptalk", "tm:stealthrock", "tm:strength", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -175,7 +162,37 @@ "tm:vacuumwave", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:burningjealousy", + "tutor:covet", + "tutor:endeavor", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:swift", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:vacuumwave", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/chingling.json b/common/src/main/resources/data/cobblemon/species/generation4/chingling.json index 3f3cb184c3..c16a9232a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/chingling.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/chingling.json @@ -99,32 +99,26 @@ "egg:recycle", "egg:wish", "tm:allyswitch", - "tm:astonish", "tm:batonpass", "tm:bind", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:curse", "tm:dazzlinggleam", - "tm:disable", "tm:doubleedge", "tm:dreameater", "tm:echoedvoice", "tm:endure", "tm:energyball", - "tm:entrainment", "tm:facade", "tm:flash", "tm:futuresight", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:healbell", "tm:helpinghand", "tm:hypervoice", - "tm:hypnosis", "tm:icywind", "tm:knockoff", "tm:lastresort", @@ -137,7 +131,6 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -160,10 +153,36 @@ "tm:trick", "tm:trickroom", "tm:uproar", - "tm:wish", - "tm:wrap", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icywind", + "tutor:knockoff", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:telekinesis", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/combee.json b/common/src/main/resources/data/cobblemon/species/generation4/combee.json index d3477168f9..4d1f0de8ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/combee.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/combee.json @@ -90,15 +90,19 @@ "tm:bugbite", "tm:bugbuzz", "tm:endeavor", - "tm:gust", "tm:lunge", "tm:ominouswind", "tm:skittersmack", "tm:sleeptalk", "tm:stringshot", "tm:strugglebug", - "tm:sweetscent", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:endeavor", + "tutor:ominouswind", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json b/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json index 8bdda0049c..f792da95c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cranidos.json @@ -95,7 +95,6 @@ "tm:blizzard", "tm:bodyslam", "tm:bulldoze", - "tm:chipaway", "tm:crunch", "tm:curse", "tm:dig", @@ -112,19 +111,15 @@ "tm:flamethrower", "tm:fling", "tm:focusenergy", - "tm:hammerarm", "tm:headbutt", - "tm:headsmash", "tm:icebeam", "tm:incinerate", "tm:ironhead", "tm:irontail", - "tm:leer", "tm:mudslap", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:roar", @@ -138,11 +133,9 @@ "tm:scaryface", "tm:screech", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -153,14 +146,37 @@ "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:trailblaze", "tm:uproar", - "tm:whirlwind", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:icebeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json b/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json index a3ec800d89..a7c6374922 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json @@ -64,12 +64,10 @@ "72:lunardance", "72:lunarblessing", "tm:allyswitch", - "tm:aurorabeam", "tm:bodyslam", "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:confusion", "tm:dazzlinggleam", "tm:doubleteam", "tm:dreameater", @@ -89,13 +87,8 @@ "tm:icebeam", "tm:icywind", "tm:lightscreen", - "tm:lunarblessing", - "tm:lunardance", "tm:magiccoat", "tm:magicroom", - "tm:mist", - "tm:moonblast", - "tm:moonlight", "tm:mudslap", "tm:powergem", "tm:powershift", @@ -105,7 +98,6 @@ "tm:psychic", "tm:psychicterrain", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", @@ -117,7 +109,6 @@ "tm:shadowball", "tm:signalbeam", "tm:skillswap", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:storedpower", @@ -131,7 +122,37 @@ "tm:thunderwave", "tm:trick", "tm:trickroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:expandingforce", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:powershift", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json b/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json index b6b4f4d76f..7834265ec4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json @@ -101,34 +101,23 @@ "egg:vacuumwave", "egg:wakeupslap", "tm:acidspray", - "tm:acupressure", "tm:aerialace", "tm:assurance", - "tm:astonish", "tm:batonpass", - "tm:belch", "tm:bounce", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:chillingwater", "tm:coaching", - "tm:counter", - "tm:crosschop", "tm:dig", "tm:drainpunch", "tm:dualchop", - "tm:dynamicpunch", "tm:earthquake", "tm:embargo", "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", - "tm:feintattack", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:focuspunch", @@ -143,21 +132,15 @@ "tm:lashout", "tm:lowkick", "tm:lowsweep", - "tm:meditate", - "tm:mefirst", "tm:megakick", "tm:megapunch", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:nastyplot", "tm:payback", "tm:poisonjab", - "tm:poisonsting", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -175,7 +158,6 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smellingsalts", "tm:snatch", "tm:spite", "tm:strength", @@ -195,9 +177,42 @@ "tm:vacuumwave", "tm:venomdrench", "tm:venoshock", - "tm:wakeupslap", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bounce", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderpunch", + "tutor:vacuumwave", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json b/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json index 507b6918f2..7e8aac6516 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json @@ -80,15 +80,12 @@ "tm:curse", "tm:cut", "tm:darkpulse", - "tm:darkvoid", - "tm:disable", "tm:doubleteam", "tm:drainpunch", "tm:dreameater", "tm:embargo", "tm:endure", "tm:facade", - "tm:feintattack", "tm:flash", "tm:fling", "tm:focusblast", @@ -99,7 +96,6 @@ "tm:headbutt", "tm:hex", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icywind", "tm:incinerate", @@ -107,7 +103,6 @@ "tm:lashout", "tm:lastresort", "tm:nastyplot", - "tm:nightmare", "tm:nightshade", "tm:ominouswind", "tm:payback", @@ -117,7 +112,6 @@ "tm:psychic", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -150,7 +144,40 @@ "tm:trick", "tm:willowisp", "tm:wonderroom", - "tm:xscissor" + "tm:xscissor", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:lastresort", + "tutor:ominouswind", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:trick", + "tutor:wonderroom", + "tutor:xscissor" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/dialga.json b/common/src/main/resources/data/cobblemon/species/generation4/dialga.json index 8eafa51521..e903b91024 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/dialga.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/dialga.json @@ -76,7 +76,6 @@ "tm:bulldoze", "tm:cut", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -104,7 +103,6 @@ "tm:ironhead", "tm:irontail", "tm:magnetrise", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:outrage", @@ -115,7 +113,6 @@ "tm:raindance", "tm:rest", "tm:roar", - "tm:roaroftime", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", @@ -125,7 +122,6 @@ "tm:scaryface", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:stealthrock", "tm:steelbeam", @@ -142,7 +138,41 @@ "tm:thunderwave", "tm:trick", "tm:trickroom", - "tm:twister" + "tm:twister", + "tutor:ancientpower", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:magnetrise", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick", + "tutor:twister" ], "evolutions": [], "forms": [ @@ -196,7 +226,6 @@ "tm:bulkup", "tm:bulldoze", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -217,7 +246,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:outrage", @@ -228,7 +256,6 @@ "tm:raindance", "tm:rest", "tm:roar", - "tm:roaroftime", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", @@ -236,7 +263,6 @@ "tm:scaleshot", "tm:scaryface", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:stealthrock", "tm:steelbeam", @@ -251,7 +277,37 @@ "tm:thunderbolt", "tm:thunderwave", "tm:trick", - "tm:trickroom" + "tm:trickroom", + "tutor:ancientpower", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json index 206a394da2..24e2eec59e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json @@ -102,12 +102,10 @@ "egg:slash", "egg:twineedle", "egg:whirlwind", - "tm:acupressure", "tm:aerialace", "tm:agility", "tm:aquatail", "tm:assurance", - "tm:bite", "tm:brickbreak", "tm:brutalswing", "tm:bugbite", @@ -123,8 +121,6 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", - "tm:fellstinger", "tm:firefang", "tm:flash", "tm:fling", @@ -140,17 +136,12 @@ "tm:knockoff", "tm:lashout", "tm:leechlife", - "tm:leer", "tm:mudslap", - "tm:nightslash", "tm:payback", "tm:pinmissile", - "tm:poisonfang", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -159,13 +150,11 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandtomb", "tm:scaryface", "tm:screech", "tm:shadowball", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:snarl", @@ -183,11 +172,40 @@ "tm:torment", "tm:toxic", "tm:toxicspikes", - "tm:twineedle", "tm:venomdrench", "tm:venoshock", - "tm:whirlwind", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:falseswipe", + "tutor:firefang", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:irondefense", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:leechlife", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spikes", + "tutor:stompingtantrum", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:xscissor" ], "preEvolution": "skorupi", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json b/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json index 8f75cb7831..9a06e9b154 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drifblim.json @@ -108,19 +108,14 @@ "tm:airslash", "tm:allyswitch", "tm:amnesia", - "tm:astonish", "tm:batonpass", "tm:bind", "tm:bodyslam", "tm:brutalswing", "tm:calmmind", - "tm:clearsmog", - "tm:constrict", "tm:curse", "tm:cut", "tm:defog", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:endure", @@ -131,19 +126,15 @@ "tm:fly", "tm:focusenergy", "tm:gigaimpact", - "tm:gust", "tm:gyroball", "tm:haze", "tm:helpinghand", "tm:hex", "tm:hyperbeam", - "tm:hypnosis", "tm:icywind", "tm:imprison", "tm:knockoff", "tm:magiccoat", - "tm:memento", - "tm:minimize", "tm:nightshade", "tm:ominouswind", "tm:painsplit", @@ -164,14 +155,10 @@ "tm:skillswap", "tm:sleeptalk", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:storedpower", - "tm:strengthsap", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:swallow", "tm:swift", "tm:tailwind", "tm:telekinesis", @@ -184,7 +171,38 @@ "tm:trick", "tm:trickroom", "tm:weatherball", - "tm:willowisp" + "tm:willowisp", + "tutor:aerialace", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:defog", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:powershift", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick" ], "preEvolution": "drifloon", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json b/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json index 90124306dd..f4f4129a7c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drifloon.json @@ -105,18 +105,13 @@ "tm:aircutter", "tm:allyswitch", "tm:amnesia", - "tm:astonish", "tm:batonpass", "tm:bind", "tm:brutalswing", "tm:calmmind", - "tm:clearsmog", - "tm:constrict", "tm:curse", "tm:cut", "tm:defog", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:endure", @@ -125,18 +120,14 @@ "tm:flash", "tm:fly", "tm:focusenergy", - "tm:gust", "tm:gyroball", "tm:haze", "tm:helpinghand", "tm:hex", - "tm:hypnosis", "tm:icywind", "tm:imprison", "tm:knockoff", "tm:magiccoat", - "tm:memento", - "tm:minimize", "tm:nightshade", "tm:ominouswind", "tm:painsplit", @@ -156,13 +147,10 @@ "tm:skillswap", "tm:sleeptalk", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:storedpower", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:swallow", "tm:swift", "tm:tailwind", "tm:telekinesis", @@ -175,7 +163,35 @@ "tm:trick", "tm:trickroom", "tm:weatherball", - "tm:willowisp" + "tm:willowisp", + "tutor:aerialace", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:defog", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:icywind", + "tutor:knockoff", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json b/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json index ddf4e8e6ff..27b343c964 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/dusknoir.json @@ -106,7 +106,6 @@ "egg:painsplit", "egg:pursuit", "tm:allyswitch", - "tm:astonish", "tm:bind", "tm:blizzard", "tm:bodyslam", @@ -117,24 +116,19 @@ "tm:curse", "tm:darkestlariat", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:earthquake", "tm:embargo", "tm:endure", "tm:facade", - "tm:feintattack", "tm:firepunch", "tm:flash", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:foresight", "tm:futuresight", "tm:gigaimpact", "tm:gravity", - "tm:grudge", "tm:hardpress", "tm:haze", "tm:headbutt", @@ -148,11 +142,8 @@ "tm:infestation", "tm:laserfocus", "tm:leechlife", - "tm:leer", - "tm:meanlook", "tm:megakick", "tm:megapunch", - "tm:memento", "tm:metronome", "tm:nightshade", "tm:ominouswind", @@ -165,7 +156,6 @@ "tm:protect", "tm:psychic", "tm:psychup", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:revenge", @@ -173,8 +163,6 @@ "tm:rocksmash", "tm:rocktomb", "tm:shadowball", - "tm:shadowpunch", - "tm:shadowsneak", "tm:skillswap", "tm:skittersmack", "tm:sleeptalk", @@ -194,7 +182,43 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "dusclops", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json index c88f3dcaf3..16d24b0e17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/electivire.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/electivire.json @@ -91,7 +91,6 @@ "egg:karatechop", "egg:meditate", "egg:rollingkick", - "tm:barrier", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", @@ -99,13 +98,10 @@ "tm:charge", "tm:chargebeam", "tm:covet", - "tm:crosschop", "tm:darkestlariat", "tm:dig", - "tm:discharge", "tm:doubleedge", "tm:dualchop", - "tm:dynamicpunch", "tm:earthquake", "tm:eerieimpulse", "tm:electricterrain", @@ -113,30 +109,23 @@ "tm:electroweb", "tm:endure", "tm:facade", - "tm:feint", "tm:firepunch", "tm:flamethrower", "tm:flash", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:followme", "tm:gigaimpact", - "tm:hammerarm", "tm:headbutt", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", - "tm:iondeluge", "tm:irontail", - "tm:karatechop", "tm:knockoff", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", "tm:magnetrise", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metalsound", @@ -144,7 +133,6 @@ "tm:poweruppunch", "tm:protect", "tm:psychic", - "tm:quickattack", "tm:raindance", "tm:reflect", "tm:rest", @@ -153,7 +141,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rollingkick", "tm:screech", "tm:shockwave", "tm:signalbeam", @@ -170,14 +157,44 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:torment", "tm:trailblaze", "tm:uproar", "tm:voltswitch", "tm:weatherball", - "tm:wildcharge" + "tm:wildcharge", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:covet", + "tutor:dualchop", + "tutor:electroweb", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "electabuzz", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json index 0ab5cd6088..88d4013f2b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/empoleon.json @@ -119,17 +119,12 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:aquajet", - "tm:aquaring", "tm:avalanche", "tm:babydolleyes", - "tm:bide", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", "tm:charm", "tm:chillingwater", @@ -139,8 +134,6 @@ "tm:disarmingvoice", "tm:dive", "tm:doubleedge", - "tm:doublehit", - "tm:drillpeck", "tm:dualwingbeat", "tm:earthquake", "tm:echoedvoice", @@ -148,15 +141,12 @@ "tm:facade", "tm:falseswipe", "tm:featherdance", - "tm:flail", "tm:flashcannon", "tm:fling", "tm:flipturn", - "tm:furyattack", "tm:furycutter", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:hail", "tm:haze", "tm:headbutt", @@ -175,13 +165,8 @@ "tm:liquidation", "tm:metalclaw", "tm:metalsound", - "tm:mist", "tm:mudslap", - "tm:mudsport", - "tm:peck", "tm:pluck", - "tm:pound", - "tm:powertrip", "tm:protect", "tm:psychup", "tm:quash", @@ -204,12 +189,10 @@ "tm:steelwing", "tm:strength", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swagger", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:throatchop", @@ -217,15 +200,52 @@ "tm:uproar", "tm:vacuumwave", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", - "tm:wavecrash", "tm:weatherball", "tm:whirlpool", "tm:workup", - "tm:yawn" + "tutor:aerialace", + "tutor:aircutter", + "tutor:babydolleyes", + "tutor:bulldoze", + "tutor:covet", + "tutor:defog", + "tutor:dive", + "tutor:dualwingbeat", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:swift", + "tutor:throatchop", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:vacuumwave", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "prinplup", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json index 1060415100..37e2bb1429 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json @@ -114,15 +114,12 @@ "tm:acrobatics", "tm:agility", "tm:alluringvoice", - "tm:aquaring", "tm:aquatail", "tm:attract", - "tm:aurorabeam", "tm:babydolleyes", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", "tm:captivate", "tm:charm", "tm:chillingwater", @@ -132,10 +129,8 @@ "tm:dive", "tm:endure", "tm:facade", - "tm:flail", "tm:flash", "tm:flipturn", - "tm:gust", "tm:hail", "tm:helpinghand", "tm:hydropump", @@ -144,7 +139,6 @@ "tm:naturepower", "tm:ominouswind", "tm:payback", - "tm:pound", "tm:protect", "tm:psybeam", "tm:psychup", @@ -154,23 +148,36 @@ "tm:signalbeam", "tm:silverwind", "tm:sleeptalk", - "tm:soak", - "tm:splash", "tm:substitute", "tm:surf", - "tm:sweetkiss", "tm:swift", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", - "tm:tickle", "tm:twister", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:bounce", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dive", + "tutor:flipturn", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:ominouswind", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json index 98dbe74b3d..650d6938b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/floatzel.json @@ -107,11 +107,8 @@ "egg:slash", "egg:switcheroo", "tm:agility", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", "tm:batonpass", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", @@ -122,8 +119,6 @@ "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doublehit", - "tm:doubleslap", "tm:echoedvoice", "tm:endure", "tm:facade", @@ -132,9 +127,7 @@ "tm:focusblast", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", - "tm:growl", "tm:hail", "tm:headbutt", "tm:helpinghand", @@ -149,34 +142,24 @@ "tm:liquidation", "tm:lowkick", "tm:lowsweep", - "tm:mefirst", "tm:metronome", "tm:muddywater", "tm:mudslap", - "tm:odorsleuth", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roar", "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:snarl", - "tm:soak", - "tm:sonicboom", "tm:strength", "tm:substitute", "tm:surf", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:tailslap", "tm:tailwhip", "tm:takedown", @@ -185,11 +168,31 @@ "tm:thief", "tm:torment", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:wavecrash", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bulkup", + "tutor:dive", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:waterpulse" ], "preEvolution": "buizel", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json b/common/src/main/resources/data/cobblemon/species/generation4/froslass.json index c53050074b..83d512f098 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/froslass.json @@ -101,11 +101,8 @@ "egg:rollout", "egg:switcheroo", "tm:allyswitch", - "tm:astonish", "tm:auroraveil", "tm:avalanche", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -115,8 +112,6 @@ "tm:confuseray", "tm:crunch", "tm:curse", - "tm:destinybond", - "tm:disable", "tm:doubleteam", "tm:drainingkiss", "tm:dreameater", @@ -137,21 +132,17 @@ "tm:icebeam", "tm:icefang", "tm:icepunch", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:imprison", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:nightshade", "tm:ominouswind", "tm:painsplit", "tm:payback", "tm:poltergeist", - "tm:powdersnow", "tm:protect", "tm:psychic", "tm:psychup", @@ -171,7 +162,6 @@ "tm:spite", "tm:substitute", "tm:suckerpunch", - "tm:switcheroo", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -183,10 +173,38 @@ "tm:trailblaze", "tm:trick", "tm:tripleaxel", - "tm:wakeupslap", "tm:waterpulse", "tm:weatherball", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:block", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spikes", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:tripleaxel", + "tutor:waterpulse" ], "preEvolution": "snorunt", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json index 6a1d23c385..c9256d5341 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gabite.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gabite.json @@ -89,7 +89,6 @@ "egg:thrash", "egg:twister", "tm:aerialace", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:bulldoze", @@ -98,12 +97,9 @@ "tm:dig", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:dualchop", "tm:earthpower", @@ -133,14 +129,12 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", "tm:scaryface", "tm:scorchingsands", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:stealthrock", "tm:stoneedge", @@ -149,12 +143,37 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:thunderfang", - "tm:twister" + "tm:twister", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualchop", + "tutor:earthpower", + "tutor:falseswipe", + "tutor:firefang", + "tutor:flamethrower", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderfang", + "tutor:twister" ], "preEvolution": "gible", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gallade.json b/common/src/main/resources/data/cobblemon/species/generation4/gallade.json index 9f10c60cda..300bd79f03 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gallade.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gallade.json @@ -127,7 +127,6 @@ "tm:airslash", "tm:alluringvoice", "tm:allyswitch", - "tm:aquacutter", "tm:aurasphere", "tm:bodyslam", "tm:brickbreak", @@ -139,11 +138,8 @@ "tm:closecombat", "tm:coaching", "tm:confuseray", - "tm:confusion", "tm:cut", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:disarmingvoice", "tm:doubleteam", "tm:drainingkiss", @@ -158,7 +154,6 @@ "tm:expandingforce", "tm:facade", "tm:falseswipe", - "tm:feint", "tm:firepunch", "tm:flash", "tm:fling", @@ -168,39 +163,29 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", - "tm:grudge", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hex", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:imprison", "tm:knockoff", "tm:laserfocus", "tm:leafblade", - "tm:leer", - "tm:lifedew", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", "tm:megakick", "tm:megapunch", - "tm:memento", "tm:metronome", "tm:mistyterrain", "tm:mysticalfire", "tm:nightshade", - "tm:nightslash", "tm:painsplit", "tm:poisonjab", "tm:poweruppunch", @@ -211,7 +196,6 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:quickguard", "tm:raindance", "tm:recycle", "tm:reflect", @@ -222,15 +206,12 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sacredsword", "tm:safeguard", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:shockwave", "tm:signalbeam", "tm:skillswap", - "tm:slash", "tm:sleeptalk", "tm:snatch", "tm:solarblade", @@ -241,11 +222,9 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:synchronoise", "tm:takedown", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:throatchop", @@ -258,12 +237,67 @@ "tm:tripleaxel", "tm:upperhand", "tm:vacuumwave", - "tm:wideguard", "tm:willowisp", "tm:wonderroom", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:coaching", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:energyball", + "tutor:expandingforce", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:tripleaxel", + "tutor:vacuumwave", + "tutor:wonderroom", + "tutor:xscissor", + "tutor:zenheadbutt" ], "preEvolution": "kirlia", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json index d0a12aa499..3a8f5f7c34 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json @@ -98,7 +98,6 @@ "egg:twister", "tm:aerialace", "tm:aquatail", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", @@ -109,12 +108,9 @@ "tm:dig", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:dualchop", "tm:earthpower", @@ -149,14 +145,12 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", "tm:scaryface", "tm:scorchingsands", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:spikes", "tm:stealthrock", @@ -168,12 +162,44 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:thunderfang", - "tm:twister" + "tm:twister", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualchop", + "tutor:earthpower", + "tutor:falseswipe", + "tutor:firefang", + "tutor:flamethrower", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderfang", + "tutor:twister" ], "preEvolution": "gabite", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json index a31e39cc39..308d320dcc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json @@ -103,7 +103,6 @@ "egg:swallow", "egg:trumpcard", "egg:yawn", - "tm:acidarmor", "tm:amnesia", "tm:ancientpower", "tm:blizzard", @@ -112,8 +111,6 @@ "tm:brine", "tm:bulldoze", "tm:chillingwater", - "tm:clearsmog", - "tm:counter", "tm:curse", "tm:dig", "tm:dive", @@ -121,11 +118,9 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", "tm:flash", "tm:gigaimpact", "tm:hail", - "tm:harden", "tm:headbutt", "tm:helpinghand", "tm:hydropump", @@ -134,18 +129,12 @@ "tm:icywind", "tm:infestation", "tm:liquidation", - "tm:memento", - "tm:mirrorcoat", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:painsplit", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:rockblast", "tm:rockslide", @@ -155,30 +144,48 @@ "tm:sandtomb", "tm:skittersmack", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", "tm:snowscape", "tm:spikes", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:stringshot", "tm:substitute", "tm:surf", - "tm:swallow", "tm:takedown", "tm:terablast", - "tm:trumpcard", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:yawn" + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:stringshot", + "tutor:waterpulse" ], "preEvolution": "shellos", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gible.json b/common/src/main/resources/data/cobblemon/species/generation4/gible.json index ff68fa487d..42b2f2755e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gible.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gible.json @@ -87,19 +87,15 @@ "egg:metalclaw", "egg:thrash", "egg:twister", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:cut", "tm:dig", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:earthpower", "tm:earthquake", @@ -126,14 +122,12 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", "tm:scaryface", "tm:scorchingsands", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:stealthrock", "tm:stoneedge", @@ -142,12 +136,34 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:thunderfang", - "tm:twister" + "tm:twister", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:falseswipe", + "tutor:firefang", + "tutor:flamethrower", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:ironhead", + "tutor:irontail", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderfang", + "tutor:twister" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/giratina.json b/common/src/main/resources/data/cobblemon/species/generation4/giratina.json index f6d65db8d9..6082b32263 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/giratina.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/giratina.json @@ -73,9 +73,7 @@ "tm:cut", "tm:darkpulse", "tm:defog", - "tm:destinybond", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -116,12 +114,9 @@ "tm:scaryface", "tm:shadowball", "tm:shadowclaw", - "tm:shadowforce", - "tm:shadowsneak", "tm:shockwave", "tm:silverwind", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:spite", "tm:steelwing", @@ -137,7 +132,44 @@ "tm:thunderbolt", "tm:thunderwave", "tm:twister", - "tm:willowisp" + "tm:willowisp", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:energyball", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:ominouswind", + "tutor:outrage", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:twister" ], "evolutions": [], "forms": [ @@ -199,9 +231,7 @@ "tm:cut", "tm:darkpulse", "tm:defog", - "tm:destinybond", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -243,12 +273,9 @@ "tm:scaryface", "tm:shadowball", "tm:shadowclaw", - "tm:shadowforce", - "tm:shadowsneak", "tm:shockwave", "tm:silverwind", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:spite", "tm:steelwing", @@ -264,7 +291,45 @@ "tm:thunderbolt", "tm:thunderwave", "tm:twister", - "tm:willowisp" + "tm:willowisp", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:energyball", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:ironhead", + "tutor:irontail", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:outrage", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:twister" ], "evolutions": [], "battleOnly": false, diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json index 8c17a46041..db997ea46a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json @@ -103,33 +103,25 @@ "tm:auroraveil", "tm:avalanche", "tm:babydolleyes", - "tm:barrier", "tm:batonpass", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:calmmind", "tm:captivate", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:curse", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:faketears", - "tm:flail", "tm:focusenergy", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", "tm:gravity", - "tm:growl", "tm:hail", "tm:haze", "tm:headbutt", @@ -139,27 +131,22 @@ "tm:hypervoice", "tm:icebeam", "tm:icefang", - "tm:iceshard", "tm:iciclespear", "tm:icywind", "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:mirrorcoat", "tm:mudshot", "tm:mudslap", "tm:naturalgift", "tm:payday", "tm:powdersnow", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", "tm:rocksmash", - "tm:sandattack", "tm:shadowball", "tm:signalbeam", "tm:sleeptalk", @@ -169,20 +156,39 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:trailblaze", "tm:tripleaxel", - "tm:trumpcard", "tm:waterpulse", "tm:weatherball", - "tm:wish", "tm:workup", - "tm:yawn" + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tripleaxel", + "tutor:waterpulse" ], "preEvolution": "eevee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json index 908cbf188e..3abb2f746b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json @@ -78,10 +78,8 @@ "egg:tailwhip", "egg:wakeupslap", "tm:aerialace", - "tm:assist", "tm:assurance", "tm:attract", - "tm:bite", "tm:captivate", "tm:charm", "tm:covet", @@ -91,19 +89,13 @@ "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", - "tm:flail", "tm:flash", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", - "tm:growl", "tm:headbutt", "tm:honeclaws", "tm:hypervoice", - "tm:hypnosis", "tm:irontail", "tm:knockoff", "tm:lastresort", @@ -112,23 +104,18 @@ "tm:playrough", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:sandattack", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snatch", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:superfang", - "tm:tailwhip", "tm:taunt", "tm:terablast", "tm:thief", @@ -136,9 +123,28 @@ "tm:thunderbolt", "tm:torment", "tm:uturn", - "tm:wakeupslap", "tm:waterpulse", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:covet", + "tutor:foulplay", + "tutor:furycutter", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderbolt", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json index e6ccaa89fa..e6ac5420d4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json @@ -113,8 +113,6 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:counter", - "tm:crabhammer", "tm:crosspoison", "tm:crunch", "tm:cut", @@ -127,15 +125,11 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", - "tm:feintattack", "tm:firefang", "tm:fling", "tm:furycutter", "tm:gigaimpact", - "tm:guillotine", "tm:gunkshot", - "tm:harden", "tm:headbutt", "tm:highhorsepower", "tm:honeclaws", @@ -145,30 +139,23 @@ "tm:knockoff", "tm:lunge", "tm:metalclaw", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", - "tm:nightslash", "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:powershift", - "tm:powertrick", "tm:powerwhip", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", @@ -176,8 +163,6 @@ "tm:screech", "tm:skittersmack", "tm:skyattack", - "tm:skyuppercut", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:spikes", @@ -202,8 +187,46 @@ "tm:toxicspikes", "tm:uturn", "tm:venoshock", - "tm:wingattack", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:falseswipe", + "tutor:firefang", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:irontail", + "tutor:knockoff", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:skittersmack", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:trick", + "tutor:xscissor" ], "preEvolution": "gligar", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json index c3b098b0e2..7ff36257f2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/grotle.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/grotle.json @@ -92,9 +92,7 @@ "egg:tickle", "egg:wideguard", "egg:worryseed", - "tm:absorb", "tm:amnesia", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:bulletseed", @@ -112,22 +110,18 @@ "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", "tm:heavyslam", "tm:ironhead", "tm:irontail", "tm:leafage", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:megadrain", "tm:mudshot", "tm:mudslap", "tm:naturepower", "tm:protect", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:roar", @@ -136,31 +130,41 @@ "tm:safeguard", "tm:sandtomb", "tm:seedbomb", - "tm:shellsmash", "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swallow", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", - "tm:tickle", "tm:trailblaze", - "tm:wideguard", - "tm:withdraw", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:ironhead", + "tutor:irontail", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:superpower", + "tutor:synthesis", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "turtwig", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json index 2bf314266b..e9f965139d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/happiny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/happiny.json @@ -88,13 +88,9 @@ "egg:naturalgift", "egg:present", "egg:seismictoss", - "tm:aromatherapy", "tm:babydolleyes", "tm:charm", - "tm:copycat", - "tm:counter", "tm:covet", - "tm:defensecurl", "tm:disarmingvoice", "tm:dreameater", "tm:echoedvoice", @@ -114,20 +110,14 @@ "tm:lastresort", "tm:lightscreen", "tm:metronome", - "tm:minimize", - "tm:mudbomb", "tm:naturalgift", - "tm:pound", - "tm:present", "tm:protect", "tm:psychic", "tm:raindance", "tm:recycle", - "tm:refresh", "tm:rest", "tm:rollout", "tm:safeguard", - "tm:seismictoss", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", @@ -136,12 +126,27 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:takedown", "tm:terablast", "tm:thunderwave", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:covet", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icywind", + "tutor:lastresort", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/heatran.json b/common/src/main/resources/data/cobblemon/species/generation4/heatran.json index 775347fe34..575cb42346 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/heatran.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/heatran.json @@ -94,10 +94,7 @@ "tm:incinerate", "tm:irondefense", "tm:ironhead", - "tm:lavaplume", - "tm:leer", "tm:lunge", - "tm:magmastorm", "tm:metalclaw", "tm:metalsound", "tm:naturepower", @@ -130,7 +127,31 @@ "tm:taunt", "tm:terablast", "tm:torment", - "tm:willowisp" + "tm:willowisp", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json b/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json index c22d429261..7243c63476 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/hippopotas.json @@ -94,7 +94,6 @@ "egg:swallow", "egg:whirlwind", "tm:amnesia", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -107,13 +106,11 @@ "tm:endure", "tm:facade", "tm:firefang", - "tm:fissure", "tm:headbutt", "tm:helpinghand", "tm:highhorsepower", "tm:icefang", "tm:irontail", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", @@ -124,28 +121,38 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:slackoff", "tm:sleeptalk", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swallow", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderfang", - "tm:whirlwind", - "tm:yawn" + "tutor:bulldoze", + "tutor:earthpower", + "tutor:firefang", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:icefang", + "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderfang" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json index f09a341671..41e76dc881 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/hippowdon.json @@ -99,7 +99,6 @@ "egg:swallow", "egg:whirlwind", "tm:amnesia", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -112,7 +111,6 @@ "tm:endure", "tm:facade", "tm:firefang", - "tm:fissure", "tm:gigaimpact", "tm:hardpress", "tm:headbutt", @@ -124,7 +122,6 @@ "tm:icefang", "tm:ironhead", "tm:irontail", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", @@ -135,28 +132,42 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:slackoff", "tm:sleeptalk", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swallow", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderfang", - "tm:whirlwind", - "tm:yawn" + "tutor:bulldoze", + "tutor:earthpower", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:ironhead", + "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderfang" ], "preEvolution": "hippopotas", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json index 8e9593c22a..d016656711 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/honchkrow.json @@ -110,30 +110,24 @@ "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:astonish", "tm:beatup", "tm:bravebird", "tm:calmmind", "tm:chillingwater", - "tm:comeuppance", "tm:confuseray", "tm:darkpulse", "tm:defog", "tm:doubleedge", "tm:dreameater", - "tm:drillpeck", "tm:dualwingbeat", "tm:embargo", "tm:endeavor", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feintattack", - "tm:flatter", "tm:fly", "tm:foulplay", "tm:gigaimpact", - "tm:gust", "tm:haze", "tm:heatwave", "tm:helpinghand", @@ -143,23 +137,16 @@ "tm:icywind", "tm:incinerate", "tm:lashout", - "tm:meanlook", - "tm:mirrormove", "tm:mudslap", "tm:nastyplot", "tm:nightshade", - "tm:nightslash", "tm:ominouswind", "tm:payback", - "tm:peck", - "tm:perishsong", "tm:pluck", "tm:protect", "tm:psychic", "tm:psychicnoise", - "tm:psychoshift", "tm:psychup", - "tm:pursuit", "tm:quash", "tm:raindance", "tm:rest", @@ -190,8 +177,36 @@ "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:lashout", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "preEvolution": "murkrow", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json index 355548d273..a92a5f6af5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/infernape.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/infernape.json @@ -101,7 +101,6 @@ "tm:acrobatics", "tm:aerialace", "tm:agility", - "tm:assist", "tm:aurasphere", "tm:blastburn", "tm:blazekick", @@ -113,36 +112,29 @@ "tm:calmmind", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:covet", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:drainpunch", "tm:dualchop", "tm:earthquake", - "tm:ember", "tm:encore", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feint", "tm:fireblast", "tm:firepledge", "tm:firepunch", "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", @@ -156,10 +148,8 @@ "tm:knockoff", "tm:laserfocus", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:metronome", "tm:mudslap", "tm:nastyplot", @@ -168,9 +158,6 @@ "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:punishment", - "tm:quickguard", - "tm:ragingfury", "tm:rest", "tm:retaliate", "tm:reversal", @@ -183,20 +170,16 @@ "tm:rollout", "tm:scaryface", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", - "tm:slackoff", "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", "tm:stealthrock", "tm:stoneedge", "tm:strength", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -212,7 +195,51 @@ "tm:vacuumwave", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:blastburn", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:coaching", + "tutor:covet", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:vacuumwave", + "tutor:zenheadbutt" ], "preEvolution": "monferno", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json b/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json index 5098ff2f3d..478ee45bdd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/kricketot.json @@ -70,17 +70,18 @@ "1:tackle", "6:strugglebug", "16:bugbite", - "tm:bide", "tm:bugbite", "tm:endeavor", - "tm:growl", "tm:lunge", "tm:pound", "tm:skittersmack", "tm:stringshot", "tm:strugglebug", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:endeavor", + "tutor:skittersmack", + "tutor:stringshot" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json index 55f0424841..b48983d8a4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/kricketune.json @@ -84,10 +84,8 @@ "44:stickyweb", "46:bugbuzz", "50:perishsong", - "tm:absorb", "tm:aerialace", "tm:batonpass", - "tm:bide", "tm:brickbreak", "tm:bugbite", "tm:bugbuzz", @@ -97,13 +95,11 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:fellstinger", "tm:flash", "tm:focusenergy", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", - "tm:growl", "tm:healbell", "tm:helpinghand", "tm:honeclaws", @@ -114,8 +110,6 @@ "tm:laserfocus", "tm:leechlife", "tm:lunge", - "tm:nightslash", - "tm:perishsong", "tm:pounce", "tm:pound", "tm:poweruppunch", @@ -125,25 +119,44 @@ "tm:rocksmash", "tm:screech", "tm:silverwind", - "tm:sing", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", - "tm:stickyweb", "tm:strength", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:throatchop", "tm:trailblaze", "tm:uproar", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bugbite", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:rest", + "tutor:rocksmash", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:throatchop", + "tutor:uproar", + "tutor:xscissor" ], "preEvolution": "kricketot", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json index 4b5e405be7..5f69c4c6ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json @@ -103,34 +103,27 @@ "tm:alluringvoice", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:bulletseed", "tm:calmmind", "tm:captivate", "tm:charm", - "tm:copycat", "tm:covet", "tm:curse", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:echoedvoice", "tm:endure", "tm:energyball", "tm:facade", "tm:faketears", - "tm:flail", "tm:flash", "tm:focusenergy", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -143,7 +136,6 @@ "tm:leafage", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:mudshot", "tm:mudslap", @@ -151,15 +143,11 @@ "tm:naturepower", "tm:payday", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:razorleaf", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", "tm:rocksmash", - "tm:sandattack", "tm:seedbomb", "tm:shadowball", "tm:sleeptalk", @@ -171,21 +159,43 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:synchronoise", "tm:synthesis", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:trailblaze", - "tm:trumpcard", "tm:weatherball", - "tm:wish", "tm:workup", "tm:worryseed", "tm:xscissor", - "tm:yawn" + "tutor:aerialace", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:energyball", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:worryseed", + "tutor:xscissor" ], "preEvolution": "eevee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json index b35000e9d2..a5dbb45fab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lickilicky.json @@ -102,8 +102,6 @@ "egg:wringout", "tm:amnesia", "tm:aquatail", - "tm:belch", - "tm:bellydrum", "tm:bind", "tm:blizzard", "tm:block", @@ -112,12 +110,9 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:chipaway", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", - "tm:disable", "tm:dragontail", "tm:dreameater", "tm:earthquake", @@ -132,7 +127,6 @@ "tm:focuspunch", "tm:gigaimpact", "tm:gyroball", - "tm:hammerarm", "tm:headbutt", "tm:helpinghand", "tm:hydropump", @@ -144,9 +138,6 @@ "tm:incinerate", "tm:irontail", "tm:knockoff", - "tm:lick", - "tm:magnitude", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:muddywater", @@ -156,7 +147,6 @@ "tm:protect", "tm:psychup", "tm:raindance", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:rockclimb", @@ -169,33 +159,58 @@ "tm:selfdestruct", "tm:shadowball", "tm:shockwave", - "tm:slam", "tm:sleeptalk", - "tm:smellingsalts", "tm:snore", "tm:solarbeam", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:surf", "tm:swordsdance", "tm:terablast", "tm:terrainpulse", "tm:thief", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:waterpulse", "tm:whirlpool", "tm:workup", - "tm:wrap", - "tm:wringout", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snore", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "lickitung", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json index 39c4cbccc8..a547f23f11 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lopunny.json @@ -136,47 +136,32 @@ "tm:brutalswing", "tm:chargebeam", "tm:charm", - "tm:circlethrow", "tm:closecombat", - "tm:copycat", "tm:cosmicpower", "tm:covet", "tm:cut", - "tm:defensecurl", "tm:dig", - "tm:dizzypunch", - "tm:doublehit", - "tm:doublekick", "tm:drainpunch", "tm:encore", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:firepunch", - "tm:flail", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:foresight", - "tm:frustration", "tm:furycutter", "tm:gigaimpact", "tm:grassknot", "tm:headbutt", "tm:healbell", - "tm:healingwish", "tm:helpinghand", - "tm:highjumpkick", "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", "tm:icepunch", "tm:irontail", - "tm:jumpkick", "tm:laserfocus", "tm:lastresort", "tm:lowkick", @@ -184,35 +169,24 @@ "tm:magiccoat", "tm:megakick", "tm:megapunch", - "tm:mirrorcoat", "tm:mudslap", - "tm:mudsport", "tm:payback", "tm:playrough", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:reversal", "tm:rocksmash", - "tm:rototiller", "tm:shadowball", "tm:shockwave", - "tm:skyuppercut", "tm:sleeptalk", "tm:solarbeam", - "tm:splash", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", - "tm:switcheroo", - "tm:teeterdance", "tm:terablast", "tm:thunder", "tm:thunderbolt", @@ -222,7 +196,42 @@ "tm:uproar", "tm:uturn", "tm:waterpulse", - "tm:workup" + "tm:workup", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:bounce", + "tutor:chargebeam", + "tutor:covet", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "buneary", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json index 3824e85033..9e0b7ce17c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json @@ -102,67 +102,46 @@ "tm:aerialace", "tm:agility", "tm:aurasphere", - "tm:bite", "tm:blazekick", "tm:bodyslam", - "tm:bonerush", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:calmmind", - "tm:circlethrow", "tm:closecombat", "tm:coaching", - "tm:copycat", - "tm:counter", - "tm:crosschop", "tm:crunch", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:dragonpulse", "tm:drainpunch", "tm:dualchop", "tm:earthquake", "tm:endure", - "tm:extremespeed", "tm:facade", - "tm:feint", - "tm:finalgambit", "tm:flashcannon", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:followme", - "tm:forcepalm", - "tm:foresight", "tm:furycutter", "tm:gigaimpact", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", - "tm:highjumpkick", "tm:honeclaws", - "tm:howl", "tm:hyperbeam", "tm:icepunch", "tm:irondefense", "tm:irontail", "tm:laserfocus", - "tm:lifedew", "tm:lowkick", "tm:lowsweep", "tm:magnetrise", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:metalclaw", "tm:metalsound", - "tm:meteormash", "tm:metronome", - "tm:mindreader", "tm:nastyplot", "tm:payback", "tm:poisonjab", @@ -170,8 +149,6 @@ "tm:protect", "tm:psychic", "tm:psychup", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -187,7 +164,6 @@ "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:skyuppercut", "tm:sleeptalk", "tm:steelbeam", "tm:stoneedge", @@ -205,7 +181,46 @@ "tm:vacuumwave", "tm:waterpulse", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:coaching", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:stoneedge", + "tutor:swift", + "tutor:terrainpulse", + "tutor:thunderpunch", + "tutor:vacuumwave", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "riolu", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json index 892a6a7ab0..2134a5a97e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json @@ -117,15 +117,12 @@ "tm:aircutter", "tm:airslash", "tm:alluringvoice", - "tm:aquaring", "tm:aquatail", "tm:attract", - "tm:aurorabeam", "tm:babydolleyes", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", "tm:captivate", "tm:charm", "tm:chillingwater", @@ -136,11 +133,9 @@ "tm:encore", "tm:endure", "tm:facade", - "tm:flail", "tm:flash", "tm:flipturn", "tm:gigaimpact", - "tm:gust", "tm:hail", "tm:helpinghand", "tm:hydropump", @@ -149,7 +144,6 @@ "tm:icywind", "tm:ominouswind", "tm:payback", - "tm:pound", "tm:protect", "tm:psybeam", "tm:psychup", @@ -159,23 +153,39 @@ "tm:signalbeam", "tm:silverwind", "tm:sleeptalk", - "tm:soak", - "tm:splash", "tm:substitute", "tm:surf", - "tm:sweetkiss", "tm:swift", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", - "tm:tickle", "tm:twister", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aircutter", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:bounce", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dive", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:ominouswind", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "finneon", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json index 4a4d7acd79..3fe46875f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxio.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxio.json @@ -90,14 +90,11 @@ "egg:shockwave", "egg:takedown", "tm:babydolleyes", - "tm:bite", "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:crunch", - "tm:discharge", "tm:doubleedge", - "tm:doublekick", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -110,17 +107,13 @@ "tm:furycutter", "tm:headbutt", "tm:helpinghand", - "tm:howl", "tm:icefang", "tm:irontail", - "tm:leer", "tm:lightscreen", "tm:magnetrise", - "tm:nightslash", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -130,24 +123,42 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderfang", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:firefang", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:icefang", + "tutor:irontail", + "tutor:magnetrise", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:wildcharge" ], "preEvolution": "shinx", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json index bfefe0de14..7a07aa51a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json @@ -86,15 +86,12 @@ "egg:takedown", "tm:agility", "tm:babydolleyes", - "tm:bite", "tm:bodyslam", "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:crunch", - "tm:discharge", "tm:doubleedge", - "tm:doublekick", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -108,19 +105,15 @@ "tm:gigaimpact", "tm:headbutt", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:icefang", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:magnetrise", - "tm:nightslash", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -130,7 +123,6 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -138,7 +130,6 @@ "tm:superpower", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -146,11 +137,36 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderfang", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:firefang", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:irontail", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:wildcharge" ], "preEvolution": "luxio", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json index 9b890fae8b..531874db41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json @@ -93,39 +93,28 @@ "egg:karatechop", "egg:machpunch", "tm:acidspray", - "tm:barrier", - "tm:belch", - "tm:bellydrum", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:burningjealousy", - "tm:clearsmog", "tm:confuseray", "tm:covet", - "tm:crosschop", "tm:curse", "tm:doubleedge", "tm:dualchop", - "tm:dynamicpunch", "tm:earthquake", - "tm:ember", "tm:endure", "tm:facade", - "tm:feintattack", "tm:fireblast", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:followme", "tm:gigaimpact", "tm:headbutt", "tm:heatcrash", @@ -135,13 +124,9 @@ "tm:hypervoice", "tm:incinerate", "tm:irontail", - "tm:karatechop", "tm:knockoff", - "tm:lavaplume", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:megakick", "tm:megapunch", "tm:metronome", @@ -162,8 +147,6 @@ "tm:scorchingsands", "tm:screech", "tm:sleeptalk", - "tm:smog", - "tm:smokescreen", "tm:solarbeam", "tm:stompingtantrum", "tm:strength", @@ -179,7 +162,35 @@ "tm:torment", "tm:uproar", "tm:weatherball", - "tm:willowisp" + "tm:willowisp", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:covet", + "tutor:dualchop", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mysticalfire", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar" ], "preEvolution": "magmar", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json index ace00bf86c..ebd69fbb77 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magnezone.json @@ -117,13 +117,11 @@ "egg:mirrorshot", "egg:sonicboom", "tm:allyswitch", - "tm:barrier", "tm:bodypress", "tm:bodyslam", "tm:charge", "tm:chargebeam", "tm:confuseray", - "tm:discharge", "tm:doubleedge", "tm:eerieimpulse", "tm:electricterrain", @@ -144,14 +142,9 @@ "tm:irondefense", "tm:ironhead", "tm:lightscreen", - "tm:lockon", "tm:magiccoat", - "tm:magnetbomb", - "tm:magneticflux", "tm:magnetrise", "tm:metalsound", - "tm:mirrorcoat", - "tm:mirrorshot", "tm:protect", "tm:raindance", "tm:recycle", @@ -165,26 +158,44 @@ "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", - "tm:sonicboom", - "tm:spark", "tm:steelbeam", "tm:steelroller", "tm:substitute", "tm:sunnyday", "tm:supercellslam", - "tm:supersonic", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:triattack", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rollout", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge" ], "preEvolution": "magneton", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json index 94f7eb36e9..128ce151c9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mamoswine.json @@ -110,7 +110,6 @@ "tm:ancientpower", "tm:avalanche", "tm:babydolleyes", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodypress", @@ -120,16 +119,11 @@ "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublehit", "tm:earthpower", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", - "tm:freezedry", - "tm:furyattack", "tm:furycutter", "tm:gigaimpact", "tm:hail", @@ -141,20 +135,12 @@ "tm:hyperbeam", "tm:icebeam", "tm:icefang", - "tm:iceshard", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:ironhead", "tm:knockoff", - "tm:mist", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:odorsleuth", - "tm:peck", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:reflect", @@ -178,12 +164,35 @@ "tm:strength", "tm:substitute", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:throatchop", - "tm:trailblaze" + "tm:trailblaze", + "tutor:ancientpower", + "tutor:babydolleyes", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:knockoff", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop" ], "preEvolution": "piloswine", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json b/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json index 6b4c017c7f..dcd17f9a08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json @@ -82,16 +82,12 @@ "61:dive", "69:raindance", "76:takeheart", - "tm:acidarmor", "tm:alluringvoice", "tm:ancientpower", - "tm:aquaring", "tm:batonpass", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:calmmind", "tm:charm", "tm:chillingwater", @@ -111,7 +107,6 @@ "tm:hail", "tm:haze", "tm:healbell", - "tm:heartswap", "tm:helpinghand", "tm:hydropump", "tm:hyperbeam", @@ -137,20 +132,42 @@ "tm:sleeptalk", "tm:storedpower", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", - "tm:tailglow", - "tm:takeheart", "tm:terablast", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bounce", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:energyball", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:lastresort", + "tutor:liquidation", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mantyke.json b/common/src/main/resources/data/cobblemon/species/generation4/mantyke.json index f0217a24ab..8ea069146a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mantyke.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mantyke.json @@ -110,11 +110,8 @@ "tm:aircutter", "tm:airslash", "tm:amnesia", - "tm:aquaring", "tm:blizzard", "tm:bounce", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", "tm:confuseray", "tm:dive", @@ -128,34 +125,41 @@ "tm:hydropump", "tm:icebeam", "tm:icywind", - "tm:mirrorcoat", "tm:mudslap", - "tm:mudsport", "tm:protect", "tm:raindance", "tm:rest", "tm:rockslide", "tm:scald", "tm:signalbeam", - "tm:slam", "tm:sleeptalk", - "tm:splash", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:twister", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:wideguard", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:bounce", + "tutor:bulldoze", + "tutor:dive", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json b/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json index 02a6171b26..aa34e37a27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json @@ -82,8 +82,6 @@ "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", - "tm:copycat", "tm:dazzlinggleam", "tm:doubleedge", "tm:drainingkiss", @@ -93,17 +91,14 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:firepunch", "tm:flash", - "tm:flatter", "tm:fling", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:headbutt", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", "tm:icebeam", @@ -113,11 +108,9 @@ "tm:knockoff", "tm:laserfocus", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", "tm:metronome", - "tm:mysticalpower", "tm:nastyplot", "tm:naturalgift", "tm:painsplit", @@ -161,7 +154,47 @@ "tm:uturn", "tm:waterpulse", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stealthrock", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json index 85ac8d5b93..1c0d693b10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json @@ -94,45 +94,34 @@ "egg:tickle", "egg:wakeupslap", "tm:allyswitch", - "tm:barrier", "tm:batonpass", "tm:brickbreak", "tm:calmmind", "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", - "tm:copycat", "tm:covet", "tm:dazzlinggleam", - "tm:doubleslap", "tm:drainpunch", "tm:dreameater", "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", "tm:flash", "tm:fling", "tm:focuspunch", "tm:futuresight", "tm:grassknot", "tm:headbutt", - "tm:healingwish", "tm:helpinghand", - "tm:hypnosis", "tm:icywind", "tm:infestation", "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:meditate", - "tm:mimic", "tm:mistyterrain", "tm:mudslap", "tm:nastyplot", - "tm:pound", - "tm:powersplit", "tm:protect", "tm:psybeam", "tm:psychic", @@ -157,20 +146,45 @@ "tm:suckerpunch", "tm:sunnyday", "tm:taunt", - "tm:teeterdance", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:trick", "tm:trickroom", "tm:uproar", - "tm:wakeupslap", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icywind", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar", + "tutor:wonderroom" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json index ad8f31bdde..175ab51a5a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json @@ -88,17 +88,14 @@ "egg:suckerpunch", "egg:wonderroom", "tm:allyswitch", - "tm:astonish", "tm:burningjealousy", "tm:calmmind", "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", "tm:drainingkiss", "tm:dreameater", "tm:echoedvoice", @@ -112,7 +109,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:grudge", "tm:headbutt", "tm:healbell", @@ -124,20 +120,15 @@ "tm:imprison", "tm:laserfocus", "tm:lashout", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", - "tm:mefirst", - "tm:memento", "tm:mysticalfire", "tm:nastyplot", "tm:nightshade", "tm:ominouswind", "tm:painsplit", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poltergeist", "tm:powergem", @@ -147,13 +138,11 @@ "tm:psychicnoise", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:rest", "tm:scaryface", "tm:screech", "tm:shadowball", - "tm:shadowsneak", "tm:shockwave", "tm:skillswap", "tm:sleeptalk", @@ -176,7 +165,44 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:laserfocus", + "tutor:lashout", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "misdreavus", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json index c10f1255bf..98a2cf6008 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/monferno.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/monferno.json @@ -93,41 +93,33 @@ "egg:thunderpunch", "tm:acrobatics", "tm:agility", - "tm:assist", "tm:blazekick", "tm:brickbreak", "tm:bulkup", "tm:burningjealousy", "tm:closecombat", - "tm:counter", "tm:covet", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:drainpunch", "tm:dualchop", - "tm:ember", "tm:encore", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feint", "tm:fireblast", "tm:firepledge", "tm:firepunch", "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:furyswipes", "tm:grassknot", "tm:gunkshot", "tm:headbutt", @@ -138,10 +130,8 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:metronome", "tm:mudslap", "tm:nastyplot", @@ -150,7 +140,6 @@ "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:quickguard", "tm:rest", "tm:retaliate", "tm:reversal", @@ -160,18 +149,14 @@ "tm:rocktomb", "tm:roleplay", "tm:rollout", - "tm:scratch", "tm:shadowclaw", - "tm:slackoff", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", "tm:strength", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -186,7 +171,40 @@ "tm:vacuumwave", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:burningjealousy", + "tutor:covet", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:swift", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:vacuumwave", + "tutor:zenheadbutt" ], "preEvolution": "chimchar", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json index 8e86ef5331..c0c84aa7e5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json @@ -82,8 +82,6 @@ "tm:airslash", "tm:bugbite", "tm:bugbuzz", - "tm:camouflage", - "tm:confusion", "tm:defog", "tm:dreameater", "tm:dualwingbeat", @@ -94,18 +92,15 @@ "tm:flash", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:hyperbeam", "tm:infestation", "tm:lunge", "tm:mudslap", "tm:ominouswind", - "tm:poisonpowder", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:quiverdance", "tm:raindance", "tm:rest", "tm:roost", @@ -120,13 +115,34 @@ "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:twister", "tm:uturn", - "tm:venoshock" + "tm:venoshock", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:mudslap", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:tailwind", + "tutor:twister" ], "preEvolution": "burmy", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json index 536d9cdb6a..5fed9031f0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/munchlax.json @@ -53,14 +53,14 @@ "moving": { "walk": { "walkSpeed": 0.118 - } - }, - "resting": { - "canSleep": true, - "willSleepOnBed": false, - "depth": "normal", - "light": "0-15" } + }, + "resting": { + "canSleep": true, + "willSleepOnBed": false, + "depth": "normal", + "light": "0-15" + } }, "drops": { "amount": 5, @@ -108,21 +108,15 @@ "egg:whirlwind", "tm:afteryou", "tm:amnesia", - "tm:belch", - "tm:bellydrum", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:charm", "tm:chillingwater", - "tm:chipaway", - "tm:counter", "tm:covet", "tm:crunch", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthquake", @@ -131,8 +125,6 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:fissure", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focuspunch", @@ -146,17 +138,14 @@ "tm:icywind", "tm:incinerate", "tm:lastresort", - "tm:lick", "tm:megakick", "tm:megapunch", "tm:metronome", "tm:mudslap", "tm:naturalgift", - "tm:odorsleuth", "tm:payday", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:recycle", "tm:rest", @@ -175,15 +164,12 @@ "tm:sleeptalk", "tm:snatch", "tm:solarbeam", - "tm:stockpile", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:swallow", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", @@ -191,9 +177,39 @@ "tm:thunderpunch", "tm:trailblaze", "tm:uproar", - "tm:whirlwind", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:bulldoze", + "tutor:covet", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:lastresort", + "tutor:mudslap", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json index 3f95638493..b336ac5dab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json @@ -94,17 +94,12 @@ "tm:agility", "tm:alluringvoice", "tm:babydolleyes", - "tm:bestow", - "tm:bide", - "tm:bite", "tm:charge", "tm:chargebeam", "tm:charm", "tm:covet", "tm:cut", - "tm:defensecurl", "tm:dig", - "tm:discharge", "tm:echoedvoice", "tm:eerieimpulse", "tm:electricterrain", @@ -115,20 +110,14 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:flail", "tm:flash", - "tm:flatter", "tm:fling", - "tm:followme", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:headbutt", "tm:helpinghand", "tm:hyperbeam", - "tm:hyperfang", - "tm:iondeluge", "tm:irontail", "tm:laserfocus", "tm:lastresort", @@ -136,10 +125,8 @@ "tm:magnetrise", "tm:mudshot", "tm:mudslap", - "tm:nuzzle", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -147,13 +134,10 @@ "tm:seedbomb", "tm:shockwave", "tm:sleeptalk", - "tm:spark", "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:sweetkiss", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", @@ -161,13 +145,41 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:uproar", "tm:uturn", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:aerialace", + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:covet", + "tutor:electroweb", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/palkia.json b/common/src/main/resources/data/cobblemon/species/generation4/palkia.json index 12e22c5e0a..692faae637 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/palkia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/palkia.json @@ -66,7 +66,6 @@ "88:hydropump", "tm:aerialace", "tm:ancientpower", - "tm:aquaring", "tm:aquatail", "tm:aurasphere", "tm:avalanche", @@ -82,7 +81,6 @@ "tm:cut", "tm:dive", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -126,10 +124,8 @@ "tm:scaryface", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snowscape", - "tm:spacialrend", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -147,7 +143,41 @@ "tm:twister", "tm:waterfall", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [], "forms": [ @@ -192,7 +222,6 @@ "88:hydropump", "tm:aerialace", "tm:ancientpower", - "tm:aquaring", "tm:aquatail", "tm:aurasphere", "tm:avalanche", @@ -205,7 +234,6 @@ "tm:bulldoze", "tm:chillingwater", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -241,10 +269,8 @@ "tm:scaleshot", "tm:scaryface", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snowscape", - "tm:spacialrend", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", @@ -260,7 +286,37 @@ "tm:trickroom", "tm:waterfall", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick", + "tutor:waterpulse" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation4/phione.json b/common/src/main/resources/data/cobblemon/species/generation4/phione.json index 2745830287..ea36064a44 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/phione.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/phione.json @@ -80,16 +80,12 @@ "61:dive", "69:raindance", "75:takeheart", - "tm:acidarmor", "tm:alluringvoice", "tm:ancientpower", - "tm:aquaring", "tm:batonpass", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:charm", "tm:chillingwater", "tm:covet", @@ -120,19 +116,34 @@ "tm:signalbeam", "tm:sleeptalk", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", - "tm:takeheart", "tm:terablast", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bounce", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:flipturn", + "tutor:healbell", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:lastresort", + "tutor:liquidation", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json index 3fd763bde9..b471285b37 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/piplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/piplup.json @@ -113,14 +113,10 @@ "egg:yawn", "tm:aerialace", "tm:agility", - "tm:aquaring", "tm:babydolleyes", - "tm:bide", "tm:blizzard", "tm:brickbreak", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:charm", "tm:chillingwater", "tm:covet", @@ -128,18 +124,13 @@ "tm:defog", "tm:disarmingvoice", "tm:dive", - "tm:doublehit", - "tm:drillpeck", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:featherdance", - "tm:flail", "tm:fling", "tm:flipturn", - "tm:furyattack", "tm:grassknot", - "tm:growl", "tm:hail", "tm:haze", "tm:headbutt", @@ -149,12 +140,7 @@ "tm:icespinner", "tm:icywind", "tm:liquidation", - "tm:mist", - "tm:mudsport", - "tm:peck", "tm:pluck", - "tm:pound", - "tm:powertrip", "tm:protect", "tm:psychup", "tm:quash", @@ -167,21 +153,36 @@ "tm:snore", "tm:snowscape", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swagger", "tm:swift", "tm:terablast", "tm:tripleaxel", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", "tm:workup", - "tm:yawn" + "tutor:aerialace", + "tutor:babydolleyes", + "tutor:covet", + "tutor:defog", + "tutor:dive", + "tutor:flipturn", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:rest", + "tutor:roost", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snore", + "tutor:swift", + "tutor:tripleaxel", + "tutor:waterpledge", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json index bdd36b1bc8..3e6742091e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/porygonz.json @@ -101,11 +101,7 @@ "tm:blizzard", "tm:charge", "tm:chargebeam", - "tm:conversion", - "tm:conversion2", "tm:darkpulse", - "tm:defensecurl", - "tm:discharge", "tm:doubleedge", "tm:dreameater", "tm:eerieimpulse", @@ -123,7 +119,6 @@ "tm:icywind", "tm:irontail", "tm:lastresort", - "tm:lockon", "tm:magiccoat", "tm:magnetrise", "tm:nastyplot", @@ -134,11 +129,9 @@ "tm:psychic", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:recycle", "tm:rest", "tm:shadowball", - "tm:sharpen", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -147,22 +140,48 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:triattack", "tm:trick", "tm:trickroom", "tm:uproar", "tm:wonderroom", - "tm:zapcannon", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:powershift", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "porygon2", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json index a0242399a7..f1f2a13095 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/prinplup.json @@ -113,14 +113,10 @@ "egg:yawn", "tm:aerialace", "tm:agility", - "tm:aquaring", "tm:babydolleyes", - "tm:bide", "tm:blizzard", "tm:brickbreak", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:charm", "tm:chillingwater", "tm:covet", @@ -129,18 +125,13 @@ "tm:disarmingvoice", "tm:dive", "tm:doubleedge", - "tm:doublehit", - "tm:drillpeck", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:featherdance", - "tm:flail", "tm:fling", "tm:flipturn", - "tm:furyattack", "tm:grassknot", - "tm:growl", "tm:hail", "tm:haze", "tm:headbutt", @@ -152,12 +143,7 @@ "tm:icywind", "tm:liquidation", "tm:metalclaw", - "tm:mist", - "tm:mudsport", - "tm:peck", "tm:pluck", - "tm:pound", - "tm:powertrip", "tm:protect", "tm:psychup", "tm:quash", @@ -173,23 +159,39 @@ "tm:snowscape", "tm:strength", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:tripleaxel", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", "tm:workup", - "tm:yawn" + "tutor:aerialace", + "tutor:babydolleyes", + "tutor:covet", + "tutor:defog", + "tutor:dive", + "tutor:flipturn", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snore", + "tutor:swift", + "tutor:tripleaxel", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "piplup", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/probopass.json b/common/src/main/resources/data/cobblemon/species/generation4/probopass.json index 4fb2d2075b..b671e932b3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/probopass.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/probopass.json @@ -119,7 +119,6 @@ "tm:bulldoze", "tm:curse", "tm:dazzlinggleam", - "tm:discharge", "tm:doubleedge", "tm:earthpower", "tm:earthquake", @@ -130,10 +129,8 @@ "tm:flashcannon", "tm:gigaimpact", "tm:gravity", - "tm:harden", "tm:hardpress", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", @@ -141,12 +138,8 @@ "tm:icepunch", "tm:irondefense", "tm:ironhead", - "tm:lockon", "tm:magiccoat", - "tm:magnetbomb", - "tm:magneticflux", "tm:magnetrise", - "tm:magnitude", "tm:metalsound", "tm:meteorbeam", "tm:painsplit", @@ -158,7 +151,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", @@ -167,7 +159,6 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:spark", "tm:stealthrock", "tm:steelbeam", "tm:steelroller", @@ -177,7 +168,6 @@ "tm:substitute", "tm:sunnyday", "tm:supercellslam", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -189,8 +179,41 @@ "tm:torment", "tm:triattack", "tm:voltswitch", - "tm:wideguard", - "tm:zapcannon" + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:powershift", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch" ], "preEvolution": "nosepass", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json index de87e9af3f..584513b864 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json @@ -80,10 +80,8 @@ "egg:tailwhip", "egg:wakeupslap", "tm:aerialace", - "tm:assist", "tm:assurance", "tm:attract", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:captivate", @@ -95,21 +93,15 @@ "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", - "tm:flail", "tm:flash", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:honeclaws", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:irontail", "tm:knockoff", "tm:lastresort", @@ -118,18 +110,14 @@ "tm:playrough", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", "tm:roar", "tm:rollout", - "tm:sandattack", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snatch", "tm:stompingtantrum", @@ -138,7 +126,6 @@ "tm:sunnyday", "tm:superfang", "tm:swagger", - "tm:tailwhip", "tm:taunt", "tm:terablast", "tm:thief", @@ -146,9 +133,33 @@ "tm:thunderbolt", "tm:torment", "tm:uturn", - "tm:wakeupslap", "tm:waterpulse", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:covet", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:thunderbolt", + "tutor:waterpulse" ], "preEvolution": "glameow", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json b/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json index ef9d0d8223..657ef5618a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rampardos.json @@ -101,7 +101,6 @@ "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:chipaway", "tm:crunch", "tm:curse", "tm:cut", @@ -124,9 +123,7 @@ "tm:focusenergy", "tm:focuspunch", "tm:gigaimpact", - "tm:hammerarm", "tm:headbutt", - "tm:headsmash", "tm:heavyslam", "tm:hyperbeam", "tm:icebeam", @@ -134,14 +131,12 @@ "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:mudslap", "tm:outrage", "tm:payback", "tm:powershift", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:roar", @@ -155,11 +150,9 @@ "tm:scaryface", "tm:screech", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -172,14 +165,43 @@ "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:trailblaze", "tm:uproar", - "tm:whirlwind", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:mudslap", + "tutor:outrage", + "tutor:powershift", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "cranidos", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json b/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json index 74248b9b2b..236a9fb149 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json @@ -74,9 +74,7 @@ "tm:brickbreak", "tm:bulldoze", "tm:confuseray", - "tm:crushgrip", "tm:darkestlariat", - "tm:dizzypunch", "tm:doubleedge", "tm:drainpunch", "tm:earthpower", @@ -87,10 +85,8 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:foresight", "tm:gigaimpact", "tm:gravity", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heatcrash", @@ -105,7 +101,6 @@ "tm:megapunch", "tm:naturepower", "tm:payback", - "tm:pound", "tm:powershift", "tm:poweruppunch", "tm:protect", @@ -122,7 +117,6 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -135,8 +129,35 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:wideguard", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:ironhead", + "tutor:knockoff", + "tutor:powershift", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json index 7f4009b266..df25a6b37d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rhyperior.json @@ -111,16 +111,12 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:chipaway", - "tm:counter", "tm:crunch", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", "tm:doubleedge", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:drillrun", "tm:earthpower", @@ -136,18 +132,13 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:furyattack", "tm:furycutter", "tm:gigaimpact", - "tm:guardsplit", - "tm:hammerarm", "tm:headbutt", "tm:heatcrash", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", - "tm:hornattack", - "tm:horndrill", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", @@ -158,11 +149,9 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:magnitude", "tm:megahorn", "tm:megakick", "tm:megapunch", - "tm:metalburst", "tm:metalclaw", "tm:meteorbeam", "tm:mudshot", @@ -183,20 +172,16 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rockwrecker", "tm:rollout", - "tm:rototiller", "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", "tm:shadowclaw", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:smartstrike", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -206,8 +191,6 @@ "tm:superpower", "tm:surf", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:temperflare", "tm:terablast", @@ -216,7 +199,53 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:uproar" + "tm:uproar", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:drillrun", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:megahorn", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar" ], "preEvolution": "rhydon", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json index 8cffebac3d..ee23d45f9d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/riolu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/riolu.json @@ -92,39 +92,25 @@ "egg:skyuppercut", "tm:aerialace", "tm:agility", - "tm:bite", "tm:blazekick", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", - "tm:circlethrow", "tm:closecombat", "tm:coaching", - "tm:copycat", - "tm:counter", - "tm:crosschop", "tm:crunch", - "tm:detect", "tm:dig", "tm:drainpunch", "tm:dualchop", "tm:earthquake", "tm:endure", "tm:facade", - "tm:feint", - "tm:finalgambit", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:followme", - "tm:forcepalm", - "tm:foresight", "tm:furycutter", "tm:headbutt", "tm:helpinghand", - "tm:highjumpkick", - "tm:howl", "tm:icepunch", "tm:irontail", "tm:laserfocus", @@ -135,15 +121,12 @@ "tm:megapunch", "tm:metalclaw", "tm:meteormash", - "tm:mindreader", "tm:nastyplot", "tm:payback", "tm:poisonjab", "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -155,7 +138,6 @@ "tm:roleplay", "tm:screech", "tm:shadowclaw", - "tm:skyuppercut", "tm:sleeptalk", "tm:strength", "tm:substitute", @@ -169,7 +151,32 @@ "tm:upperhand", "tm:vacuumwave", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderpunch", + "tutor:vacuumwave", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/roserade.json b/common/src/main/resources/data/cobblemon/species/generation4/roserade.json index 4fb1482e2c..7508f27c17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/roserade.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/roserade.json @@ -113,61 +113,44 @@ "egg:razorleaf", "egg:sleeppowder", "egg:synthesis", - "tm:absorb", - "tm:aromatherapy", "tm:bodyslam", "tm:bulletseed", - "tm:cottonspore", "tm:covet", "tm:cut", "tm:dazzlinggleam", "tm:endure", "tm:energyball", - "tm:extrasensory", "tm:facade", "tm:flash", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:hyperbeam", - "tm:ingrain", "tm:laserfocus", "tm:leafstorm", - "tm:leechseed", - "tm:lifedew", "tm:magicalleaf", - "tm:megadrain", - "tm:mindreader", "tm:mudslap", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:powerwhip", "tm:protect", "tm:psychup", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:seedbomb", "tm:shadowball", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", "tm:spikes", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", @@ -177,9 +160,30 @@ "tm:uproar", "tm:venomdrench", "tm:venoshock", - "tm:watersport", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:swift", + "tutor:synthesis", + "tutor:uproar", + "tutor:worryseed" ], "preEvolution": "roselia", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rotom.json b/common/src/main/resources/data/cobblemon/species/generation4/rotom.json index 7c0927ae1f..f2ffc0f094 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/rotom.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/rotom.json @@ -62,12 +62,10 @@ "50:discharge", "55:uproar", "tm:allyswitch", - "tm:astonish", "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:darkpulse", - "tm:discharge", "tm:doubleteam", "tm:dreameater", "tm:eerieimpulse", @@ -108,12 +106,35 @@ "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:trick", "tm:uproar", "tm:voltswitch", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar" ], "evolutions": [], "forms": [ @@ -158,12 +179,10 @@ "55:uproar", "form_change:overheat", "tm:allyswitch", - "tm:astonish", "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:darkpulse", - "tm:discharge", "tm:doubleteam", "tm:dreameater", "tm:eerieimpulse", @@ -205,12 +224,35 @@ "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:trick", "tm:uproar", "tm:voltswitch", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar" ], "evolutions": [], "battleOnly": false @@ -256,12 +298,10 @@ "55:uproar", "form_change:hydropump", "tm:allyswitch", - "tm:astonish", "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:darkpulse", - "tm:discharge", "tm:doubleteam", "tm:dreameater", "tm:eerieimpulse", @@ -303,12 +343,35 @@ "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:trick", "tm:uproar", "tm:voltswitch", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar" ], "evolutions": [], "battleOnly": false @@ -354,13 +417,11 @@ "55:uproar", "form_change:blizzard", "tm:allyswitch", - "tm:astonish", "tm:blizzard", "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:darkpulse", - "tm:discharge", "tm:doubleteam", "tm:dreameater", "tm:eerieimpulse", @@ -401,12 +462,35 @@ "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:trick", "tm:uproar", "tm:voltswitch", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar" ], "evolutions": [], "battleOnly": false @@ -453,12 +537,10 @@ "form_change:airslash", "tm:airslash", "tm:allyswitch", - "tm:astonish", "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:darkpulse", - "tm:discharge", "tm:doubleteam", "tm:dreameater", "tm:eerieimpulse", @@ -499,12 +581,35 @@ "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:trick", "tm:uproar", "tm:voltswitch", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar" ], "evolutions": [], "battleOnly": false @@ -550,12 +655,10 @@ "55:uproar", "form_change:leafstorm", "tm:allyswitch", - "tm:astonish", "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:darkpulse", - "tm:discharge", "tm:doubleteam", "tm:dreameater", "tm:eerieimpulse", @@ -597,12 +700,35 @@ "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:trick", "tm:uproar", "tm:voltswitch", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json b/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json index ca85074aeb..da1e556eec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json @@ -77,14 +77,11 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", - "tm:healingwish", "tm:hyperbeam", "tm:laserfocus", "tm:lastresort", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:naturalgift", "tm:naturepower", @@ -97,13 +94,10 @@ "tm:rest", "tm:safeguard", "tm:seedbomb", - "tm:seedflare", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", @@ -112,7 +106,32 @@ "tm:terablast", "tm:trailblaze", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aircutter", + "tutor:babydolleyes", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:ominouswind", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:tailwind", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -186,14 +205,12 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", "tm:healingwish", "tm:hyperbeam", "tm:laserfocus", "tm:lastresort", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:naturalgift", "tm:naturepower", @@ -203,17 +220,13 @@ "tm:protect", "tm:psychic", "tm:psychup", - "tm:quickattack", "tm:rest", "tm:safeguard", "tm:seedbomb", - "tm:seedflare", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", @@ -222,7 +235,32 @@ "tm:terablast", "tm:trailblaze", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aircutter", + "tutor:babydolleyes", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:ominouswind", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:tailwind", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json index eaa4486b6e..c2d7f013a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json @@ -101,7 +101,6 @@ "egg:swallow", "egg:trumpcard", "egg:yawn", - "tm:acidarmor", "tm:amnesia", "tm:ancientpower", "tm:blizzard", @@ -109,16 +108,12 @@ "tm:brine", "tm:bulldoze", "tm:chillingwater", - "tm:clearsmog", - "tm:counter", "tm:curse", "tm:dive", "tm:earthpower", "tm:endure", "tm:facade", - "tm:fissure", "tm:hail", - "tm:harden", "tm:headbutt", "tm:helpinghand", "tm:hydropump", @@ -126,42 +121,47 @@ "tm:icywind", "tm:infestation", "tm:liquidation", - "tm:memento", - "tm:mirrorcoat", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:painsplit", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:rockslide", "tm:rocktomb", "tm:sandstorm", "tm:skittersmack", "tm:sleeptalk", - "tm:sludge", "tm:snowscape", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stoneedge", "tm:stringshot", "tm:substitute", "tm:surf", - "tm:swallow", "tm:takedown", "tm:terablast", - "tm:trumpcard", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:yawn" + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:stringshot", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json b/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json index db379c7cae..31df743ad5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shieldon.json @@ -92,7 +92,6 @@ "tm:blizzard", "tm:bodyslam", "tm:bulldoze", - "tm:counter", "tm:curse", "tm:dig", "tm:doubleedge", @@ -101,11 +100,9 @@ "tm:endure", "tm:facade", "tm:fireblast", - "tm:fissure", "tm:flamethrower", "tm:flashcannon", "tm:focusenergy", - "tm:guardsplit", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -115,7 +112,6 @@ "tm:ironhead", "tm:irontail", "tm:magnetrise", - "tm:metalburst", "tm:metalsound", "tm:mudslap", "tm:powergem", @@ -145,7 +141,6 @@ "tm:substitute", "tm:sunnyday", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -153,7 +148,30 @@ "tm:thunderbolt", "tm:torment", "tm:trailblaze", - "tm:wideguard" + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:icebeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderbolt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json index 194929984c..eff44d4921 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shinx.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shinx.json @@ -84,14 +84,11 @@ "egg:shockwave", "egg:takedown", "tm:babydolleyes", - "tm:bite", "tm:charge", "tm:chargebeam", "tm:confuseray", "tm:crunch", - "tm:discharge", "tm:doubleedge", - "tm:doublekick", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -104,17 +101,13 @@ "tm:furycutter", "tm:headbutt", "tm:helpinghand", - "tm:howl", "tm:icefang", "tm:irontail", - "tm:leer", "tm:lightscreen", "tm:magnetrise", - "tm:nightslash", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -124,24 +117,42 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderfang", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:firefang", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:icefang", + "tutor:irontail", + "tutor:magnetrise", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json index 5e8cfc3804..0598140b10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json @@ -98,12 +98,10 @@ "egg:slash", "egg:twineedle", "egg:whirlwind", - "tm:acupressure", "tm:aerialace", "tm:agility", "tm:aquatail", "tm:assurance", - "tm:bite", "tm:brickbreak", "tm:bugbite", "tm:bugbuzz", @@ -116,8 +114,6 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", - "tm:fellstinger", "tm:flash", "tm:fling", "tm:furycutter", @@ -126,27 +122,20 @@ "tm:infestation", "tm:irontail", "tm:knockoff", - "tm:leer", "tm:mudslap", - "tm:nightslash", "tm:payback", "tm:pinmissile", - "tm:poisonfang", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:scaryface", "tm:screech", "tm:shadowball", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:strength", @@ -160,10 +149,26 @@ "tm:torment", "tm:toxic", "tm:toxicspikes", - "tm:twineedle", "tm:venoshock", - "tm:whirlwind", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bugbite", + "tutor:darkpulse", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:irontail", + "tutor:knockoff", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json index 9f5150ec61..e2c3ef6cf8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json @@ -86,9 +86,6 @@ "egg:smog", "tm:acidspray", "tm:assurance", - "tm:astonish", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:burningjealousy", "tm:corrosivegas", @@ -102,15 +99,12 @@ "tm:endure", "tm:explosion", "tm:facade", - "tm:feint", "tm:fireblast", "tm:firespin", - "tm:flameburst", "tm:flamethrower", "tm:focusenergy", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:gunkshot", "tm:haze", @@ -123,33 +117,23 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:memento", "tm:nastyplot", - "tm:nightslash", "tm:payback", "tm:playrough", - "tm:poisongas", "tm:poisonjab", "tm:poisontail", "tm:protect", - "tm:punishment", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:roar", "tm:rocksmash", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", - "tm:smokescreen", "tm:snarl", "tm:snatch", "tm:strength", @@ -170,7 +154,38 @@ "tm:toxicspikes", "tm:trailblaze", "tm:venomdrench", - "tm:venoshock" + "tm:venoshock", + "tutor:burningjealousy", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:defog", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spikes", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:swift", + "tutor:throatchop" ], "preEvolution": "stunky", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/snover.json b/common/src/main/resources/data/cobblemon/species/generation4/snover.json index 7e5ad05794..35d05de4f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/snover.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/snover.json @@ -100,43 +100,30 @@ "tm:frostbreath", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", - "tm:growth", "tm:hail", "tm:headbutt", "tm:helpinghand", "tm:icebeam", "tm:icepunch", - "tm:iceshard", "tm:icespinner", "tm:iciclespear", "tm:icywind", - "tm:ingrain", "tm:irontail", - "tm:leafage", "tm:leafstorm", - "tm:leechseed", - "tm:leer", "tm:magicalleaf", "tm:megapunch", - "tm:mist", "tm:mudslap", "tm:naturalgift", - "tm:powdersnow", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:roleplay", "tm:safeguard", "tm:seedbomb", - "tm:sheercold", - "tm:skullbash", "tm:sleeptalk", "tm:snowscape", "tm:solarbeam", - "tm:stomp", "tm:substitute", "tm:swagger", "tm:swordsdance", @@ -146,8 +133,24 @@ "tm:trailblaze", "tm:waterpulse", "tm:weatherball", - "tm:woodhammer", - "tm:worryseed" + "tm:worryseed", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:rest", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:waterpulse", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json index 79d87970f1..e29eada1d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json @@ -95,28 +95,21 @@ "tm:confuseray", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:endure", "tm:facade", - "tm:feintattack", "tm:flash", "tm:foulplay", "tm:gigaimpact", - "tm:grudge", "tm:helpinghand", "tm:hex", "tm:hyperbeam", - "tm:hypnosis", "tm:icywind", "tm:imprison", "tm:infestation", "tm:lashout", - "tm:memento", "tm:nastyplot", - "tm:nightmare", "tm:nightshade", "tm:ominouswind", "tm:painsplit", @@ -127,7 +120,6 @@ "tm:psybeam", "tm:psychic", "tm:psyshock", - "tm:pursuit", "tm:quash", "tm:raindance", "tm:rest", @@ -135,12 +127,10 @@ "tm:rocktomb", "tm:scaryface", "tm:shadowball", - "tm:shadowsneak", "tm:shockwave", "tm:silverwind", "tm:skillswap", "tm:sleeptalk", - "tm:smokescreen", "tm:snarl", "tm:snatch", "tm:spite", @@ -157,7 +147,33 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:lashout", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json index 1299075ce9..7d1356f026 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staraptor.json @@ -104,11 +104,9 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:astonish", "tm:bravebird", "tm:closecombat", "tm:defog", - "tm:detect", "tm:doubleedge", "tm:doubleteam", "tm:dualwingbeat", @@ -117,29 +115,21 @@ "tm:endure", "tm:facade", "tm:featherdance", - "tm:finalgambit", "tm:fly", - "tm:foresight", - "tm:furyattack", "tm:gigaimpact", - "tm:growl", "tm:heatwave", "tm:helpinghand", "tm:hurricane", "tm:hyperbeam", "tm:laserfocus", - "tm:mirrormove", "tm:ominouswind", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", "tm:revenge", "tm:roost", - "tm:sandattack", "tm:skyattack", "tm:sleeptalk", "tm:steelwing", @@ -147,7 +137,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -155,9 +144,26 @@ "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "preEvolution": "staravia", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json index 2a59d26402..8b2ce337cb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/staravia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/staravia.json @@ -103,10 +103,8 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:astonish", "tm:bravebird", "tm:defog", - "tm:detect", "tm:doubleedge", "tm:doubleteam", "tm:dualwingbeat", @@ -115,32 +113,23 @@ "tm:endure", "tm:facade", "tm:featherdance", - "tm:finalgambit", "tm:fly", - "tm:foresight", - "tm:furyattack", - "tm:growl", "tm:heatwave", "tm:helpinghand", "tm:hurricane", - "tm:mirrormove", "tm:ominouswind", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", "tm:revenge", "tm:roost", - "tm:sandattack", "tm:sleeptalk", "tm:steelwing", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -148,9 +137,22 @@ "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "preEvolution": "starly", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/starly.json b/common/src/main/resources/data/cobblemon/species/generation4/starly.json index 86d6480528..989cf6bd6c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/starly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/starly.json @@ -100,10 +100,8 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:astonish", "tm:bravebird", "tm:defog", - "tm:detect", "tm:doubleedge", "tm:doubleteam", "tm:dualwingbeat", @@ -112,31 +110,22 @@ "tm:endure", "tm:facade", "tm:featherdance", - "tm:finalgambit", "tm:fly", - "tm:foresight", - "tm:furyattack", - "tm:growl", "tm:heatwave", "tm:helpinghand", "tm:hurricane", - "tm:mirrormove", "tm:ominouswind", "tm:pluck", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:revenge", "tm:roost", - "tm:sandattack", "tm:sleeptalk", "tm:steelwing", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -144,9 +133,22 @@ "tm:twister", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:ominouswind", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/stunky.json b/common/src/main/resources/data/cobblemon/species/generation4/stunky.json index c453830796..cb06c0093e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/stunky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/stunky.json @@ -85,9 +85,6 @@ "egg:smog", "tm:acidspray", "tm:assurance", - "tm:astonish", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:corrosivegas", "tm:crunch", @@ -99,14 +96,11 @@ "tm:endure", "tm:explosion", "tm:facade", - "tm:feint", "tm:fireblast", - "tm:flameburst", "tm:flamethrower", "tm:focusenergy", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", "tm:gunkshot", "tm:haze", "tm:headbutt", @@ -117,33 +111,23 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:memento", "tm:nastyplot", - "tm:nightslash", "tm:payback", "tm:playrough", - "tm:poisongas", "tm:poisonjab", "tm:poisontail", "tm:protect", - "tm:punishment", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:roar", "tm:rocksmash", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", - "tm:smokescreen", "tm:snarl", "tm:snatch", "tm:substitute", @@ -162,7 +146,33 @@ "tm:toxicspikes", "tm:trailblaze", "tm:venomdrench", - "tm:venoshock" + "tm:venoshock", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:defog", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spikes", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json index 9d47d6866c..fded757750 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/tangrowth.json @@ -91,7 +91,6 @@ "egg:ragepowder", "egg:wakeupslap", "egg:wringout", - "tm:absorb", "tm:aerialace", "tm:amnesia", "tm:ancientpower", @@ -102,15 +101,12 @@ "tm:brutalswing", "tm:bulldoze", "tm:bulletseed", - "tm:confusion", - "tm:constrict", "tm:cut", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:fling", "tm:focusblast", @@ -119,27 +115,21 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", "tm:hyperbeam", "tm:infestation", - "tm:ingrain", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", - "tm:megadrain", "tm:mudslap", "tm:naturalgift", "tm:naturepower", "tm:painsplit", "tm:payback", "tm:poisonjab", - "tm:poisonpowder", "tm:powerswap", "tm:powerwhip", "tm:protect", "tm:psychup", - "tm:ragepowder", "tm:reflect", "tm:rest", "tm:rockslide", @@ -147,26 +137,44 @@ "tm:rocktomb", "tm:seedbomb", "tm:shockwave", - "tm:slam", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", "tm:solarblade", "tm:stompingtantrum", "tm:strength", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:swordsdance", "tm:synthesis", "tm:terablast", "tm:thief", - "tm:tickle", - "tm:vinewhip", - "tm:wakeupslap", "tm:worryseed", - "tm:wringout" + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stompingtantrum", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "tangela", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json index fb19337469..5e1e0d663f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json @@ -110,7 +110,6 @@ "tm:aurasphere", "tm:babydolleyes", "tm:batonpass", - "tm:bestow", "tm:bodyslam", "tm:brickbreak", "tm:charm", @@ -126,22 +125,16 @@ "tm:encore", "tm:endeavor", "tm:endure", - "tm:extrasensory", - "tm:extremespeed", "tm:facade", - "tm:fairywind", "tm:fireblast", "tm:flamethrower", "tm:flash", "tm:fling", "tm:fly", "tm:focuspunch", - "tm:followme", - "tm:foresight", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:heatwave", @@ -152,28 +145,20 @@ "tm:incinerate", "tm:laserfocus", "tm:lastresort", - "tm:lifedew", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mirrormove", - "tm:morningsun", "tm:mudslap", "tm:mysticalfire", "tm:nastyplot", "tm:ominouswind", - "tm:peck", "tm:playrough", "tm:pluck", - "tm:pound", - "tm:present", "tm:protect", "tm:psychic", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", @@ -197,7 +182,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:tailwind", "tm:telekinesis", @@ -208,10 +192,54 @@ "tm:twister", "tm:uproar", "tm:waterpulse", - "tm:wish", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:afteryou", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:babydolleyes", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:drainpunch", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:roost", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:twister", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "togetic", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json index a3e5ee6016..ae4371c169 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/torterra.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/torterra.json @@ -96,9 +96,7 @@ "egg:tickle", "egg:wideguard", "egg:worryseed", - "tm:absorb", "tm:amnesia", - "tm:bite", "tm:block", "tm:bodypress", "tm:bodyslam", @@ -121,10 +119,8 @@ "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:hardpress", "tm:headbutt", - "tm:headlongrush", "tm:heavyslam", "tm:highhorsepower", "tm:hyperbeam", @@ -134,16 +130,13 @@ "tm:irontail", "tm:leafage", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:megadrain", "tm:mudshot", "tm:mudslap", "tm:naturepower", "tm:outrage", "tm:protect", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:roar", @@ -159,34 +152,55 @@ "tm:scaryface", "tm:scorchingsands", "tm:seedbomb", - "tm:shellsmash", "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swallow", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", - "tm:tickle", "tm:trailblaze", - "tm:wideguard", - "tm:withdraw", - "tm:woodhammer", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:energyball", + "tutor:frenzyplant", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:synthesis", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "grotle", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json index 3689252675..f7b99d06e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json @@ -96,39 +96,28 @@ "egg:vacuumwave", "egg:wakeupslap", "tm:acidspray", - "tm:acupressure", "tm:aerialace", "tm:assurance", - "tm:astonish", "tm:batonpass", - "tm:belch", "tm:bounce", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", "tm:chillingwater", "tm:closecombat", "tm:coaching", "tm:corrosivegas", - "tm:counter", - "tm:crosschop", "tm:crosspoison", "tm:cut", "tm:darkpulse", "tm:dig", "tm:drainpunch", "tm:dualchop", - "tm:dynamicpunch", "tm:earthquake", "tm:embargo", "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", - "tm:feintattack", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:focuspunch", @@ -145,21 +134,15 @@ "tm:lashout", "tm:lowkick", "tm:lowsweep", - "tm:meditate", - "tm:mefirst", "tm:megakick", "tm:megapunch", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", "tm:nastyplot", "tm:payback", "tm:poisonjab", - "tm:poisonsting", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -177,7 +160,6 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smellingsalts", "tm:snatch", "tm:spite", "tm:stoneedge", @@ -200,9 +182,48 @@ "tm:vacuumwave", "tm:venomdrench", "tm:venoshock", - "tm:wakeupslap", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bounce", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spite", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:vacuumwave", + "tutor:xscissor" ], "preEvolution": "croagunk", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json index c50fc78a19..371b672ff5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/turtwig.json @@ -95,9 +95,7 @@ "egg:tickle", "egg:wideguard", "egg:worryseed", - "tm:absorb", "tm:amnesia", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:bulletseed", @@ -115,22 +113,18 @@ "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", "tm:heavyslam", "tm:ironhead", "tm:irontail", "tm:leafage", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:megadrain", "tm:mudshot", "tm:mudslap", "tm:naturepower", "tm:protect", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:roar", @@ -139,31 +133,41 @@ "tm:safeguard", "tm:sandtomb", "tm:seedbomb", - "tm:shellsmash", "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swallow", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", - "tm:tickle", "tm:trailblaze", - "tm:wideguard", - "tm:withdraw", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:ironhead", + "tutor:irontail", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:superpower", + "tutor:synthesis", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/uxie.json b/common/src/main/resources/data/cobblemon/species/generation4/uxie.json index 97fbf14fe4..30530c2cec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/uxie.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/uxie.json @@ -80,7 +80,6 @@ "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:confusion", "tm:dazzlinggleam", "tm:drainingkiss", "tm:drainpunch", @@ -89,10 +88,8 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:firepunch", - "tm:flail", "tm:flash", "tm:fling", "tm:foulplay", @@ -112,10 +109,8 @@ "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:memento", "tm:metronome", "tm:mudslap", - "tm:mysticalpower", "tm:nastyplot", "tm:naturalgift", "tm:painsplit", @@ -161,8 +156,51 @@ "tm:uturn", "tm:waterpulse", "tm:wonderroom", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:painsplit", + "tutor:playrough", + "tutor:powershift", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stealthrock", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json index da15c550de..89f8405dab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/vespiquen.json @@ -109,10 +109,7 @@ "tm:aerialace", "tm:agility", "tm:airslash", - "tm:aromatherapy", - "tm:aromaticmist", "tm:assurance", - "tm:attackorder", "tm:beatup", "tm:bugbite", "tm:bugbuzz", @@ -120,21 +117,15 @@ "tm:confuseray", "tm:crosspoison", "tm:cut", - "tm:defendorder", "tm:defog", - "tm:destinybond", "tm:dualwingbeat", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fellstinger", "tm:flash", "tm:fling", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", - "tm:gust", - "tm:healorder", "tm:helpinghand", "tm:hex", "tm:honeclaws", @@ -145,14 +136,12 @@ "tm:lunge", "tm:ominouswind", "tm:pinmissile", - "tm:poisonsting", "tm:pollenpuff", "tm:pounce", "tm:powergem", "tm:powershift", "tm:protect", "tm:psychicnoise", - "tm:pursuit", "tm:quash", "tm:raindance", "tm:rest", @@ -164,7 +153,6 @@ "tm:signalbeam", "tm:silverwind", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:spikes", @@ -174,7 +162,6 @@ "tm:substitute", "tm:sunnyday", "tm:swagger", - "tm:sweetscent", "tm:swift", "tm:takedown", "tm:taunt", @@ -184,7 +171,31 @@ "tm:toxicspikes", "tm:uturn", "tm:venoshock", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:ominouswind", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:stringshot", + "tutor:swift", + "tutor:xscissor" ], "preEvolution": "combee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json index a4cd77a4af..efb97b438b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json @@ -103,38 +103,28 @@ "egg:spite", "tm:aerialace", "tm:agility", - "tm:assist", "tm:assurance", "tm:avalanche", "tm:batonpass", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:brickbreak", "tm:calmmind", "tm:chillingwater", - "tm:counter", - "tm:crushclaw", "tm:cut", "tm:darkpulse", "tm:dig", - "tm:doublehit", "tm:dreameater", "tm:embargo", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:falseswipe", - "tm:feint", - "tm:feintattack", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:foresight", "tm:foulplay", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:hail", "tm:headbutt", @@ -143,16 +133,13 @@ "tm:hyperbeam", "tm:icebeam", "tm:icepunch", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:irontail", "tm:knockoff", "tm:laserfocus", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -160,15 +147,11 @@ "tm:metalclaw", "tm:metronome", "tm:nastyplot", - "tm:nightslash", "tm:payback", "tm:poisonjab", "tm:poweruppunch", "tm:protect", "tm:psychocut", - "tm:punishment", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -176,11 +159,9 @@ "tm:reversal", "tm:rocksmash", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -202,7 +183,40 @@ "tm:tripleaxel", "tm:upperhand", "tm:waterpulse", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:psychocut", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:tripleaxel", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "sneasel", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json index edc3e81463..651be2f122 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json @@ -78,7 +78,6 @@ "tm:bugbuzz", "tm:bulletseed", "tm:captivate", - "tm:confusion", "tm:dig", "tm:dreameater", "tm:dualwingbeat", @@ -87,13 +86,11 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", - "tm:growth", "tm:hyperbeam", "tm:infestation", "tm:leafstorm", @@ -101,9 +98,7 @@ "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:quiverdance", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", @@ -119,13 +114,34 @@ "tm:suckerpunch", "tm:sunnyday", "tm:synthesis", - "tm:tackle", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:uproar", "tm:venoshock", - "tm:worryseed" + "tm:worryseed", + "tutor:bugbite", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:synthesis", + "tutor:telekinesis", + "tutor:uproar", + "tutor:worryseed" ], "preEvolution": "burmy", "evolutions": [], @@ -184,7 +200,6 @@ "tm:bugbuzz", "tm:bulldoze", "tm:captivate", - "tm:confusion", "tm:dig", "tm:dreameater", "tm:dualwingbeat", @@ -194,12 +209,9 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", "tm:flash", "tm:gigadrain", "tm:gigaimpact", - "tm:harden", "tm:hyperbeam", "tm:infestation", "tm:mudslap", @@ -207,7 +219,6 @@ "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:quiverdance", "tm:raindance", "tm:rest", "tm:rockblast", @@ -227,12 +238,33 @@ "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:tackle", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:uproar", - "tm:venoshock" + "tm:venoshock", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:electroweb", + "tutor:endeavor", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:uproar" ], "preEvolution": "burmy", "evolutions": [], @@ -292,7 +324,6 @@ "tm:bugbite", "tm:bugbuzz", "tm:captivate", - "tm:confusion", "tm:dig", "tm:dreameater", "tm:dualwingbeat", @@ -300,7 +331,6 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:flash", "tm:flashcannon", "tm:gigadrain", @@ -312,14 +342,11 @@ "tm:irondefense", "tm:ironhead", "tm:magnetrise", - "tm:metalburst", "tm:metalsound", - "tm:mirrorshot", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:quiverdance", "tm:raindance", "tm:rest", "tm:safeguard", @@ -335,12 +362,34 @@ "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:tackle", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:uproar", - "tm:venoshock" + "tm:venoshock", + "tutor:bugbite", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magnetrise", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:uproar" ], "preEvolution": "burmy", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json b/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json index edde9fcea6..39e788fbd9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/yanmega.json @@ -105,35 +105,26 @@ "tm:bugbuzz", "tm:crunch", "tm:defog", - "tm:detect", "tm:doubleedge", "tm:doubleteam", "tm:dreameater", "tm:dualwingbeat", "tm:endure", "tm:facade", - "tm:feint", - "tm:feintattack", "tm:flash", - "tm:foresight", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:headbutt", "tm:hyperbeam", - "tm:hypnosis", "tm:laserfocus", "tm:leechlife", "tm:lunge", - "tm:nightslash", "tm:ominouswind", "tm:pounce", "tm:protect", "tm:psychic", "tm:psychicnoise", "tm:psychup", - "tm:pursuit", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:roost", @@ -144,27 +135,44 @@ "tm:signalbeam", "tm:silverwind", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", - "tm:sonicboom", "tm:steelwing", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", "tm:uproar", "tm:uturn", - "tm:whirlwind", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar" ], "preEvolution": "yanma", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json b/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json index 797d69e4cf..e130dc93df 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json @@ -78,13 +78,9 @@ "egg:guardsplit", "egg:mindreader", "egg:pursuit", - "tm:absorb", - "tm:acid", - "tm:acidarmor", "tm:acidspray", "tm:agility", "tm:batonpass", - "tm:bide", "tm:bodyslam", "tm:bugbite", "tm:bugbuzz", @@ -96,29 +92,20 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:feint", - "tm:finalgambit", "tm:focusblast", "tm:gastroacid", "tm:gigadrain", "tm:gigaimpact", - "tm:guardsplit", "tm:guardswap", "tm:hyperbeam", "tm:infestation", "tm:knockoff", "tm:laserfocus", "tm:leechlife", - "tm:mefirst", - "tm:megadrain", - "tm:mindreader", "tm:mudshot", "tm:powerswap", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", - "tm:recover", "tm:rest", "tm:reversal", "tm:sandstorm", @@ -136,8 +123,23 @@ "tm:uturn", "tm:venomdrench", "tm:venoshock", - "tm:watershuriken", - "tm:yawn" + "tutor:bugbite", + "tutor:drainpunch", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:rest", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:swift" ], "preEvolution": "shelmet", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json b/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json index dc34e49936..16d2888c17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/alomomola.json @@ -111,8 +111,6 @@ "egg:wakeupslap", "tm:acrobatics", "tm:alluringvoice", - "tm:aquajet", - "tm:aquaring", "tm:batonpass", "tm:blizzard", "tm:bodyslam", @@ -121,14 +119,11 @@ "tm:calmmind", "tm:chillingwater", "tm:dive", - "tm:doubleslap", "tm:endure", "tm:facade", "tm:flipturn", "tm:gigaimpact", "tm:hail", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hydropump", "tm:hyperbeam", @@ -137,17 +132,12 @@ "tm:lightscreen", "tm:liquidation", "tm:magiccoat", - "tm:mirrorcoat", - "tm:mist", "tm:mistyterrain", "tm:painsplit", - "tm:playnice", "tm:playrough", - "tm:pound", "tm:protect", "tm:psychic", "tm:raindance", - "tm:refresh", "tm:rest", "tm:safeguard", "tm:scald", @@ -156,20 +146,35 @@ "tm:skillswap", "tm:sleeptalk", "tm:snowscape", - "tm:soak", "tm:substitute", "tm:surf", "tm:takedown", "tm:terablast", - "tm:tickle", - "tm:wakeupslap", "tm:waterfall", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:wideguard", - "tm:wish", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:calmmind", + "tutor:dive", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json index efb2de2de7..35dccc1237 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json @@ -91,18 +91,12 @@ "egg:poisonpowder", "egg:rollout", "egg:worryseed", - "tm:absorb", "tm:afteryou", - "tm:astonish", - "tm:bide", "tm:bodyslam", "tm:bulletseed", - "tm:clearsmog", - "tm:defensecurl", "tm:endure", "tm:energyball", "tm:facade", - "tm:feintattack", "tm:flash", "tm:foulplay", "tm:gastroacid", @@ -110,19 +104,14 @@ "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", - "tm:growth", "tm:hex", "tm:hyperbeam", - "tm:ingrain", "tm:leafstorm", "tm:magicalleaf", - "tm:megadrain", "tm:naturepower", "tm:payback", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:ragepowder", "tm:raindance", "tm:rest", "tm:rollout", @@ -131,17 +120,30 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:spore", "tm:stompingtantrum", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:synthesis", "tm:terablast", "tm:toxic", "tm:venoshock", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:energyball", + "tutor:foulplay", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stompingtantrum", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "foongus", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/archen.json b/common/src/main/resources/data/cobblemon/species/generation5/archen.json index d94ef62945..a0e5f047f2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/archen.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/archen.json @@ -109,7 +109,6 @@ "tm:ancientpower", "tm:aquatail", "tm:assurance", - "tm:bite", "tm:bounce", "tm:bulldoze", "tm:crunch", @@ -117,7 +116,6 @@ "tm:defog", "tm:dig", "tm:doubleteam", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dualwingbeat", @@ -126,26 +124,21 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:headsmash", "tm:heatwave", "tm:honeclaws", "tm:irondefense", "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:meteorbeam", "tm:pluck", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:roar", "tm:rockblast", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:roost", "tm:sandstorm", @@ -158,16 +151,42 @@ "tm:stoneedge", "tm:substitute", "tm:swift", - "tm:switcheroo", "tm:tailwind", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:torment", "tm:uproar", "tm:uturn", - "tm:wingattack", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:defog", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:endeavor", + "tutor:heatwave", + "tutor:irondefense", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/archeops.json b/common/src/main/resources/data/cobblemon/species/generation5/archeops.json index 883f68adb9..fc361ff8d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/archeops.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/archeops.json @@ -108,7 +108,6 @@ "tm:ancientpower", "tm:aquatail", "tm:assurance", - "tm:bite", "tm:bounce", "tm:bulldoze", "tm:crunch", @@ -116,7 +115,6 @@ "tm:defog", "tm:dig", "tm:doubleteam", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -129,7 +127,6 @@ "tm:fly", "tm:focusblast", "tm:gigaimpact", - "tm:headsmash", "tm:heatwave", "tm:honeclaws", "tm:hyperbeam", @@ -137,20 +134,16 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:meteorbeam", "tm:outrage", "tm:pluck", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:roar", "tm:rockblast", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:roost", "tm:sandstorm", @@ -164,16 +157,46 @@ "tm:stoneedge", "tm:substitute", "tm:swift", - "tm:switcheroo", "tm:tailwind", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:torment", "tm:uproar", "tm:uturn", - "tm:wingattack", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:defog", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:shadowclaw", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "archen", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/audino.json b/common/src/main/resources/data/cobblemon/species/generation5/audino.json index 99caa01f15..2c530ddf67 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/audino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/audino.json @@ -93,7 +93,6 @@ "tm:amnesia", "tm:attract", "tm:babydolleyes", - "tm:bestow", "tm:blizzard", "tm:bodyslam", "tm:calmmind", @@ -103,14 +102,12 @@ "tm:dig", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleslap", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", "tm:echoedvoice", "tm:encore", "tm:endure", - "tm:entrainment", "tm:facade", "tm:fireblast", "tm:firepunch", @@ -121,10 +118,7 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:healbell", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", @@ -136,17 +130,13 @@ "tm:knockoff", "tm:laserfocus", "tm:lastresort", - "tm:lifedew", "tm:lightscreen", "tm:lowkick", - "tm:luckychant", "tm:magiccoat", "tm:megakick", "tm:megapunch", "tm:mistyterrain", "tm:painsplit", - "tm:playnice", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -154,7 +144,6 @@ "tm:psyshock", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roleplay", @@ -162,7 +151,6 @@ "tm:secretpower", "tm:shadowball", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:sleeptalk", "tm:snatch", @@ -171,7 +159,6 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:sweetkiss", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -183,10 +170,52 @@ "tm:trickroom", "tm:uproar", "tm:wildcharge", - "tm:wish", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stompingtantrum", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/axew.json b/common/src/main/resources/data/cobblemon/species/generation5/axew.json index ff5784cb0e..bf4c1c4975 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/axew.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/axew.json @@ -99,11 +99,9 @@ "tm:aerialace", "tm:aquatail", "tm:assurance", - "tm:bite", "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:counter", "tm:crunch", "tm:cut", "tm:dig", @@ -113,32 +111,25 @@ "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:dualchop", "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:firstimpression", "tm:fling", "tm:focusenergy", "tm:gigaimpact", - "tm:guillotine", - "tm:harden", "tm:honeclaws", "tm:incinerate", "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", - "tm:nightslash", "tm:outrage", "tm:payback", "tm:poisonjab", "tm:protect", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -146,10 +137,8 @@ "tm:rocktomb", "tm:scaleshot", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:stompingtantrum", @@ -164,7 +153,33 @@ "tm:taunt", "tm:terablast", "tm:trailblaze", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualchop", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json index 28c8e1a5a6..8ad0d23960 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/basculin.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/basculin.json @@ -104,16 +104,12 @@ "egg:headsmash", "egg:rage", "tm:agility", - "tm:aquajet", "tm:aquatail", "tm:assurance", - "tm:bite", "tm:blizzard", "tm:bounce", "tm:brine", - "tm:bubblebeam", "tm:chillingwater", - "tm:chipaway", "tm:crunch", "tm:cut", "tm:dive", @@ -121,13 +117,10 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:finalgambit", - "tm:flail", "tm:flipturn", "tm:gigaimpact", "tm:hail", "tm:headbutt", - "tm:headsmash", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", @@ -138,7 +131,6 @@ "tm:mudshot", "tm:protect", "tm:psychicfangs", - "tm:rage", "tm:raindance", "tm:rest", "tm:revenge", @@ -147,23 +139,36 @@ "tm:scaryface", "tm:sleeptalk", "tm:snowscape", - "tm:soak", "tm:substitute", "tm:superpower", "tm:surf", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:wavecrash", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bounce", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:liquidation", + "tutor:psychic", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:swift", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -231,9 +236,7 @@ "egg:endeavor", "egg:lastrespects", "tm:agility", - "tm:aquajet", "tm:aquatail", - "tm:bite", "tm:blizzard", "tm:chillingwater", "tm:crunch", @@ -241,15 +244,12 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:flipturn", "tm:headbutt", - "tm:headsmash", "tm:hydropump", "tm:icebeam", "tm:icefang", "tm:icywind", - "tm:lastrespects", "tm:liquidation", "tm:muddywater", "tm:mudshot", @@ -261,22 +261,31 @@ "tm:scaryface", "tm:sleeptalk", "tm:snowscape", - "tm:soak", "tm:substitute", "tm:surf", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:wavecrash", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:endeavor", + "tutor:flipturn", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:liquidation", + "tutor:psychic", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:swift", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/beartic.json b/common/src/main/resources/data/cobblemon/species/generation5/beartic.json index 89e68a89b5..0a243315b8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/beartic.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/beartic.json @@ -102,10 +102,8 @@ "egg:nightslash", "egg:yawn", "tm:aerialace", - "tm:aquajet", "tm:assurance", "tm:avalanche", - "tm:bide", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -129,15 +127,12 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:frostbreath", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:hail", "tm:hardpress", "tm:heavyslam", @@ -146,7 +141,6 @@ "tm:icebeam", "tm:icefang", "tm:icepunch", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:liquidation", @@ -156,10 +150,7 @@ "tm:metalclaw", "tm:mudshot", "tm:mudslap", - "tm:nightslash", - "tm:playnice", "tm:playrough", - "tm:powdersnow", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -171,8 +162,6 @@ "tm:rocktomb", "tm:scaryface", "tm:shadowclaw", - "tm:sheercold", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snowscape", @@ -187,12 +176,38 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:trailblaze", "tm:waterpulse", "tm:xscissor", - "tm:yawn" + "tutor:aerialace", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:dive", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "cubchoo", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json b/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json index af15546d3d..85e46c8bc4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/beheeyem.json @@ -100,15 +100,10 @@ "tm:afteryou", "tm:agility", "tm:allyswitch", - "tm:astonish", - "tm:barrier", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:echoedvoice", "tm:embargo", @@ -121,20 +116,15 @@ "tm:futuresight", "tm:gigaimpact", "tm:gravity", - "tm:growl", - "tm:guardsplit", "tm:guardswap", "tm:headbutt", - "tm:healblock", "tm:hyperbeam", "tm:imprison", "tm:lightscreen", "tm:magiccoat", "tm:meteorbeam", - "tm:miracleeye", "tm:nastyplot", "tm:painsplit", - "tm:powersplit", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -143,7 +133,6 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -155,16 +144,13 @@ "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:sleeptalk", "tm:snatch", "tm:steelwing", "tm:storedpower", "tm:substitute", - "tm:synchronoise", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderbolt", @@ -174,7 +160,39 @@ "tm:trickroom", "tm:uproar", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "elgyem", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json index 5993fd725e..f47c046760 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json @@ -98,7 +98,6 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", "tm:flashcannon", "tm:fling", "tm:focusblast", @@ -106,7 +105,6 @@ "tm:furycutter", "tm:gigaimpact", "tm:grassknot", - "tm:guillotine", "tm:headbutt", "tm:honeclaws", "tm:hyperbeam", @@ -114,22 +112,16 @@ "tm:ironhead", "tm:laserfocus", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:magnetrise", - "tm:meanlook", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", - "tm:nightslash", "tm:payback", "tm:poisonjab", "tm:poweruppunch", "tm:protect", "tm:psychocut", - "tm:pursuit", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -141,10 +133,8 @@ "tm:roleplay", "tm:sandstorm", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -162,7 +152,38 @@ "tm:throatchop", "tm:thunderwave", "tm:torment", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:darkpulse", + "tutor:dualchop", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:psychocut", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:xscissor" ], "preEvolution": "pawniard", "evolutions": [ @@ -177,7 +198,7 @@ "requirements": [ { "variant": "defeat", - "target": "bisharp held_item=cobblemon:leaders_crest", + "target": "bisharp held_item=cobblemon:kings_rock", "amount": 3 } ] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json b/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json index 6411781127..a847fd39a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json @@ -86,9 +86,7 @@ "tm:bounce", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:doubleedge", - "tm:doublekick", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -96,45 +94,52 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:feint", "tm:flamecharge", "tm:flash", "tm:helpinghand", "tm:lightscreen", "tm:lowkick", "tm:magnetrise", - "tm:mefirst", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:rage", "tm:raindance", "tm:rest", "tm:risingvoltage", - "tm:sandattack", "tm:screech", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", "tm:smartstrike", "tm:snatch", - "tm:spark", - "tm:stomp", "tm:substitute", "tm:sunnyday", "tm:supercellslam", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", "tm:trailblaze", "tm:uproar", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:bounce", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:endeavor", + "tutor:helpinghand", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json index fd7ad2021d..7e5f628a1f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/boldore.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/boldore.json @@ -106,7 +106,6 @@ "egg:magnitude", "egg:takedown", "egg:wideguard", - "tm:autotomize", "tm:block", "tm:bodypress", "tm:bulldoze", @@ -118,12 +117,9 @@ "tm:facade", "tm:flashcannon", "tm:gravity", - "tm:harden", "tm:headbutt", "tm:heavyslam", "tm:irondefense", - "tm:lockon", - "tm:magnitude", "tm:meteorbeam", "tm:mudslap", "tm:naturepower", @@ -135,7 +131,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:sleeptalk", @@ -145,10 +140,23 @@ "tm:stoneedge", "tm:strength", "tm:substitute", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:wideguard" + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:gravity", + "tutor:irondefense", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge" ], "preEvolution": "roggenrola", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json index 49ecb67028..4b74a09ef4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bouffalant.json @@ -95,26 +95,20 @@ "tm:aerialace", "tm:amnesia", "tm:assurance", - "tm:belch", "tm:bodyslam", "tm:bulldoze", "tm:closecombat", - "tm:cottonguard", "tm:cut", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", "tm:focusenergy", - "tm:furyattack", "tm:gigaimpact", "tm:headbutt", - "tm:headcharge", "tm:highhorsepower", - "tm:hornattack", "tm:ironhead", "tm:lashout", - "tm:leer", "tm:megahorn", "tm:mudshot", "tm:mudslap", @@ -122,8 +116,6 @@ "tm:payback", "tm:poisonjab", "tm:protect", - "tm:pursuit", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -134,10 +126,8 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:skullbash", "tm:sleeptalk", "tm:smartstrike", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -146,15 +136,36 @@ "tm:superpower", "tm:surf", "tm:swordsdance", - "tm:tackle", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:uproar", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:ironhead", + "tutor:lashout", + "tutor:megahorn", + "tutor:mudslap", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json index c013356a4e..d03509ce88 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/braviary.json @@ -109,7 +109,6 @@ "tm:bravebird", "tm:bulkup", "tm:closecombat", - "tm:crushclaw", "tm:cut", "tm:defog", "tm:doubleedge", @@ -118,7 +117,6 @@ "tm:facade", "tm:featherdance", "tm:fly", - "tm:furyattack", "tm:gigaimpact", "tm:heatwave", "tm:helpinghand", @@ -127,9 +125,7 @@ "tm:hyperbeam", "tm:ironhead", "tm:laserfocus", - "tm:leer", "tm:metalclaw", - "tm:peck", "tm:pluck", "tm:protect", "tm:raindance", @@ -144,7 +140,6 @@ "tm:shadowclaw", "tm:skyattack", "tm:skydrop", - "tm:slash", "tm:sleeptalk", "tm:steelwing", "tm:strength", @@ -155,12 +150,31 @@ "tm:tailwind", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bulkup", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:shadowclaw", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:swift", + "tutor:tailwind", + "tutor:zenheadbutt" ], "preEvolution": "rufflet", "evolutions": [], @@ -255,18 +269,15 @@ "tm:calmmind", "tm:closecombat", "tm:confuseray", - "tm:crushclaw", "tm:dazzlinggleam", "tm:defog", "tm:doubleedge", "tm:dualwingbeat", "tm:endure", - "tm:esperwing", "tm:expandingforce", "tm:facade", "tm:featherdance", "tm:fly", - "tm:furyattack", "tm:futuresight", "tm:gigaimpact", "tm:heatwave", @@ -276,12 +287,10 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icywind", - "tm:leer", "tm:metalclaw", "tm:mysticalfire", "tm:nightshade", "tm:ominouswind", - "tm:peck", "tm:powershift", "tm:protect", "tm:psybeam", @@ -301,7 +310,6 @@ "tm:shadowball", "tm:shadowclaw", "tm:skyattack", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:storedpower", @@ -312,12 +320,41 @@ "tm:tailwind", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:uturn", "tm:vacuumwave", - "tm:whirlwind", - "tm:wingattack", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bulkup", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:mysticalfire", + "tutor:ominouswind", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:superpower", + "tutor:swift", + "tutor:tailwind", + "tutor:vacuumwave", + "tutor:zenheadbutt" ], "preEvolution": "rufflet", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json b/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json index 2ff26e8d2d..70748caf49 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/carracosta.json @@ -105,10 +105,7 @@ "egg:slam", "egg:waterpulse", "tm:ancientpower", - "tm:aquajet", "tm:aquatail", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -122,7 +119,6 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:flail", "tm:focusblast", "tm:gigaimpact", "tm:guardswap", @@ -147,13 +143,10 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", "tm:scald", - "tm:shellsmash", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -164,12 +157,36 @@ "tm:surf", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:wideguard", - "tm:withdraw", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:superpower", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "tirtouga", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json b/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json index 51c8aea8ee..bfcc2a66b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/chandelure.json @@ -101,26 +101,20 @@ "egg:clearsmog", "egg:haze", "egg:powersplit", - "tm:acid", - "tm:acidarmor", "tm:allyswitch", - "tm:astonish", "tm:burningjealousy", "tm:calmmind", "tm:captivate", - "tm:clearsmog", "tm:confuseray", "tm:curse", "tm:darkpulse", "tm:dreameater", "tm:embargo", - "tm:ember", "tm:endure", "tm:energyball", "tm:facade", "tm:fireblast", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -132,18 +126,14 @@ "tm:hyperbeam", "tm:imprison", "tm:incinerate", - "tm:inferno", "tm:laserfocus", "tm:lashout", - "tm:memento", - "tm:minimize", "tm:mysticalfire", "tm:nightshade", "tm:overheat", "tm:painsplit", "tm:payback", "tm:poltergeist", - "tm:powersplit", "tm:protect", "tm:psychic", "tm:psychup", @@ -153,7 +143,6 @@ "tm:shockwave", "tm:skittersmack", "tm:sleeptalk", - "tm:smog", "tm:solarbeam", "tm:spite", "tm:substitute", @@ -166,7 +155,30 @@ "tm:trailblaze", "tm:trick", "tm:trickroom", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:energyball", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:lashout", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:telekinesis", + "tutor:trick" ], "preEvolution": "lampent", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json index b21988bb0c..9c6bef0a70 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json @@ -100,19 +100,16 @@ "tm:dazzlinggleam", "tm:dig", "tm:doubleedge", - "tm:doubleslap", "tm:echoedvoice", "tm:encore", "tm:endeavor", "tm:endure", "tm:facade", "tm:faketears", - "tm:flail", "tm:fling", "tm:focusblast", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:helpinghand", "tm:hyperbeam", @@ -125,7 +122,6 @@ "tm:lightscreen", "tm:mudslap", "tm:playrough", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", @@ -134,29 +130,50 @@ "tm:safeguard", "tm:seedbomb", "tm:shockwave", - "tm:sing", - "tm:slam", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", "tm:superfang", "tm:swift", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", - "tm:tidyup", "tm:trailblaze", "tm:tripleaxel", "tm:uproar", "tm:uturn", - "tm:wakeupslap", - "tm:workup" + "tm:workup", + "tutor:afteryou", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:tripleaxel", + "tutor:uproar" ], "preEvolution": "minccino", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json b/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json index 19078b1224..4efe9e8b09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json @@ -84,7 +84,6 @@ "tm:coaching", "tm:cut", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:facade", "tm:falseswipe", @@ -98,17 +97,13 @@ "tm:irondefense", "tm:ironhead", "tm:laserfocus", - "tm:leer", "tm:magnetrise", "tm:megahorn", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:poisonjab", "tm:protect", "tm:psychup", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:reflect", "tm:rest", @@ -118,7 +113,6 @@ "tm:roar", "tm:rockpolish", "tm:rocksmash", - "tm:sacredsword", "tm:safeguard", "tm:sandstorm", "tm:scaryface", @@ -142,7 +136,34 @@ "tm:voltswitch", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:bounce", + "tutor:calmmind", + "tutor:coaching", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:vacuumwave", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json b/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json index 7f344cfe2d..1502656ce0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cofagrigus.json @@ -93,15 +93,11 @@ "egg:nightmare", "tm:afteryou", "tm:allyswitch", - "tm:astonish", "tm:block", "tm:bodypress", "tm:calmmind", - "tm:craftyshield", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:endure", @@ -111,11 +107,8 @@ "tm:flash", "tm:gigaimpact", "tm:grassknot", - "tm:grudge", - "tm:guardsplit", "tm:guardswap", "tm:haze", - "tm:healblock", "tm:hex", "tm:hyperbeam", "tm:imprison", @@ -123,17 +116,13 @@ "tm:irondefense", "tm:knockoff", "tm:magiccoat", - "tm:meanlook", - "tm:memento", "tm:nastyplot", - "tm:nightmare", "tm:nightshade", "tm:ominouswind", "tm:painsplit", "tm:payback", "tm:phantomforce", "tm:poltergeist", - "tm:powersplit", "tm:powerswap", "tm:protect", "tm:psychic", @@ -160,7 +149,36 @@ "tm:trickroom", "tm:willowisp", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:energyball", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:knockoff", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spikes", + "tutor:spite", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "yamask", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json index d7cc9aeffd..515832f890 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/conkeldurr.json @@ -100,25 +100,19 @@ "egg:slam", "egg:smellingsalts", "egg:wideguard", - "tm:bide", "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", "tm:bulldoze", - "tm:chipaway", "tm:closecombat", "tm:coaching", - "tm:cometpunch", - "tm:counter", "tm:curse", "tm:defog", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:earthquake", "tm:endure", "tm:facade", @@ -127,26 +121,20 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:forcepalm", - "tm:foresight", "tm:gigaimpact", "tm:grassknot", - "tm:hammerarm", "tm:hardpress", "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", "tm:icepunch", "tm:knockoff", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:megakick", "tm:megapunch", "tm:payback", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -157,13 +145,10 @@ "tm:rockblast", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:scaryface", - "tm:slam", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -176,9 +161,32 @@ "tm:thief", "tm:thunderpunch", "tm:upperhand", - "tm:wakeupslap", - "tm:wideguard", - "tm:workup" + "tm:workup", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:defog", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderpunch" ], "preEvolution": "gurdurr", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json b/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json index 5c3f5abebe..3fde21d379 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cottonee.json @@ -99,12 +99,9 @@ "egg:switcheroo", "egg:tickle", "egg:worryseed", - "tm:absorb", "tm:beatup", "tm:captivate", "tm:charm", - "tm:cottonguard", - "tm:cottonspore", "tm:covet", "tm:dazzlinggleam", "tm:defog", @@ -114,39 +111,41 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:flash", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", - "tm:leechseed", - "tm:megadrain", - "tm:memento", "tm:mistyterrain", "tm:naturalgift", "tm:naturepower", - "tm:poisonpowder", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:taunt", "tm:terablast", - "tm:tickle", - "tm:worryseed" + "tm:worryseed", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json index 869158e266..bfc0f4b7d8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/crustle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/crustle.json @@ -91,15 +91,12 @@ "tm:bodypress", "tm:bugbite", "tm:bulldoze", - "tm:counter", "tm:curse", "tm:cut", "tm:dig", "tm:earthquake", "tm:endure", "tm:facade", - "tm:feintattack", - "tm:flail", "tm:furycutter", "tm:gigaimpact", "tm:heavyslam", @@ -109,7 +106,6 @@ "tm:knockoff", "tm:meteorbeam", "tm:naturepower", - "tm:nightslash", "tm:poisonjab", "tm:protect", "tm:rest", @@ -118,15 +114,10 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rockwrecker", - "tm:rototiller", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:shadowclaw", - "tm:shellsmash", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", @@ -140,9 +131,29 @@ "tm:substitute", "tm:swordsdance", "tm:terablast", - "tm:wideguard", - "tm:withdraw", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:block", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:knockoff", + "tutor:meteorbeam", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:xscissor" ], "preEvolution": "dwebble", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json index 30c1109c90..a164e19261 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cryogonal.json @@ -96,10 +96,8 @@ "egg:auroraveil", "egg:explosion", "egg:frostbreath", - "tm:acidarmor", "tm:acrobatics", "tm:ancientpower", - "tm:aurorabeam", "tm:auroraveil", "tm:avalanche", "tm:bind", @@ -112,14 +110,12 @@ "tm:explosion", "tm:facade", "tm:flashcannon", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", "tm:hail", "tm:haze", "tm:hyperbeam", "tm:icebeam", - "tm:iceshard", "tm:icespinner", "tm:iciclespear", "tm:icywind", @@ -127,21 +123,14 @@ "tm:laserfocus", "tm:lightscreen", "tm:magiccoat", - "tm:mist", - "tm:nightslash", "tm:poisonjab", "tm:protect", "tm:raindance", - "tm:rapidspin", - "tm:recover", "tm:reflect", "tm:rest", "tm:scaryface", "tm:selfdestruct", - "tm:sharpen", - "tm:sheercold", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:solarbeam", @@ -149,7 +138,24 @@ "tm:takedown", "tm:terablast", "tm:tripleaxel", - "tm:waterpulse" + "tm:waterpulse", + "tutor:ancientpower", + "tutor:bind", + "tutor:defog", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:poisonjab", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:tripleaxel", + "tutor:waterpulse" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json b/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json index b0453bd0b6..ccaf6485bf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cubchoo.json @@ -95,7 +95,6 @@ "tm:aerialace", "tm:assurance", "tm:avalanche", - "tm:bide", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -112,13 +111,10 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:fling", "tm:focuspunch", "tm:frostbreath", - "tm:furyswipes", "tm:grassknot", - "tm:growl", "tm:hail", "tm:heavyslam", "tm:honeclaws", @@ -134,10 +130,7 @@ "tm:metalclaw", "tm:mudshot", "tm:mudslap", - "tm:nightslash", - "tm:playnice", "tm:playrough", - "tm:powdersnow", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -146,8 +139,6 @@ "tm:rocksmash", "tm:rocktomb", "tm:shadowclaw", - "tm:sheercold", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snowscape", @@ -159,11 +150,31 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:trailblaze", "tm:waterpulse", "tm:xscissor", - "tm:yawn" + "tutor:aerialace", + "tutor:bulldoze", + "tutor:covet", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:superpower", + "tutor:waterpulse", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json index e7f8ab71fd..2157f372fa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/darmanitan.json @@ -98,8 +98,6 @@ "egg:hammerarm", "egg:takedown", "egg:yawn", - "tm:bellydrum", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -108,12 +106,10 @@ "tm:burningjealousy", "tm:dig", "tm:earthquake", - "tm:ember", "tm:encore", "tm:endeavor", "tm:endure", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firefang", @@ -121,7 +117,6 @@ "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusblast", @@ -132,7 +127,6 @@ "tm:grassknot", "tm:guardswap", "tm:gyroball", - "tm:hammerarm", "tm:headbutt", "tm:heatwave", "tm:hyperbeam", @@ -150,7 +144,6 @@ "tm:poweruppunch", "tm:protect", "tm:psychic", - "tm:rage", "tm:rest", "tm:reversal", "tm:roar", @@ -168,20 +161,47 @@ "tm:sunnyday", "tm:superpower", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:torment", "tm:trick", "tm:uproar", "tm:uturn", "tm:willowisp", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:endeavor", + "tutor:expandingforce", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lashout", + "tutor:mysticalfire", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stoneedge", + "tutor:superpower", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "darumaka", "evolutions": [], @@ -242,8 +262,6 @@ "44:flareblitz", "50:thrash", "56:superpower", - "tm:bellydrum", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -252,7 +270,6 @@ "tm:burningjealousy", "tm:dig", "tm:earthquake", - "tm:ember", "tm:encore", "tm:endeavor", "tm:endure", @@ -276,7 +293,6 @@ "tm:grassknot", "tm:guardswap", "tm:gyroball", - "tm:hammerarm", "tm:headbutt", "tm:heatwave", "tm:hyperbeam", @@ -294,7 +310,6 @@ "tm:poweruppunch", "tm:protect", "tm:psychic", - "tm:rage", "tm:rest", "tm:reversal", "tm:roar", @@ -312,12 +327,10 @@ "tm:sunnyday", "tm:superpower", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:torment", "tm:trick", "tm:uproar", @@ -325,7 +338,37 @@ "tm:willowisp", "tm:workup", "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:endeavor", + "tutor:expandingforce", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lashout", + "tutor:mysticalfire", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stoneedge", + "tutor:superpower", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": true @@ -389,8 +432,6 @@ "egg:takedown", "egg:yawn", "tm:avalanche", - "tm:bellydrum", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -408,24 +449,20 @@ "tm:firepunch", "tm:firespin", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:freezedry", "tm:gigaimpact", "tm:grassknot", "tm:gyroball", - "tm:hammerarm", "tm:headbutt", "tm:heatwave", "tm:hyperbeam", "tm:icebeam", "tm:icefang", "tm:icepunch", - "tm:iciclecrash", "tm:incinerate", "tm:irondefense", "tm:ironhead", @@ -434,7 +471,6 @@ "tm:megapunch", "tm:overheat", "tm:payback", - "tm:powdersnow", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -448,18 +484,40 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:uproar", "tm:uturn", "tm:willowisp", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lashout", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "darumaka galarian", "evolutions": [], @@ -521,8 +579,6 @@ "50:thrash", "56:superpower", "tm:avalanche", - "tm:bellydrum", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -557,7 +613,6 @@ "tm:icebeam", "tm:icefang", "tm:icepunch", - "tm:iciclecrash", "tm:incinerate", "tm:irondefense", "tm:ironhead", @@ -566,7 +621,6 @@ "tm:megapunch", "tm:overheat", "tm:payback", - "tm:powdersnow", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -580,18 +634,41 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:uproar", "tm:uturn", "tm:willowisp", "tm:workup", "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lashout", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": true, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json b/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json index 1d54407c2c..ac3cd9d53e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json @@ -93,15 +93,11 @@ "egg:hammerarm", "egg:takedown", "egg:yawn", - "tm:bellydrum", - "tm:bite", "tm:brickbreak", "tm:dig", - "tm:ember", "tm:encore", "tm:endeavor", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firefang", @@ -109,14 +105,12 @@ "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusenergy", "tm:focuspunch", "tm:grassknot", "tm:gyroball", - "tm:hammerarm", "tm:headbutt", "tm:heatwave", "tm:incinerate", @@ -125,7 +119,6 @@ "tm:overheat", "tm:poweruppunch", "tm:protect", - "tm:rage", "tm:rest", "tm:roar", "tm:rockslide", @@ -139,18 +132,31 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:uproar", "tm:uturn", "tm:willowisp", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:heatwave", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:superpower", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { @@ -223,8 +229,6 @@ "egg:takedown", "egg:yawn", "tm:avalanche", - "tm:bellydrum", - "tm:bite", "tm:blizzard", "tm:brickbreak", "tm:dig", @@ -236,15 +240,12 @@ "tm:firepunch", "tm:firespin", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fling", "tm:focusenergy", "tm:focuspunch", - "tm:freezedry", "tm:grassknot", "tm:gyroball", - "tm:hammerarm", "tm:headbutt", "tm:heatwave", "tm:icebeam", @@ -254,7 +255,6 @@ "tm:megakick", "tm:megapunch", "tm:overheat", - "tm:powdersnow", "tm:poweruppunch", "tm:protect", "tm:rest", @@ -265,18 +265,30 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:uproar", "tm:uturn", "tm:willowisp", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:heatwave", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json index 950d4b8c90..29202bebf9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/deerling.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/deerling.json @@ -92,49 +92,39 @@ "egg:synthesis", "egg:worryseed", "tm:agility", - "tm:aromatherapy", "tm:batonpass", "tm:bodyslam", "tm:bounce", "tm:bulldoze", "tm:bulletseed", - "tm:camouflage", "tm:charm", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:echoedvoice", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:flash", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:headbutt", "tm:helpinghand", - "tm:jumpkick", "tm:lastresort", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", "tm:naturalgift", "tm:naturepower", - "tm:odorsleuth", "tm:playrough", "tm:protect", "tm:raindance", "tm:rest", "tm:retaliate", "tm:safeguard", - "tm:sandattack", "tm:seedbomb", "tm:shadowball", "tm:sleeptalk", @@ -142,7 +132,6 @@ "tm:substitute", "tm:sunnyday", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderwave", @@ -150,7 +139,25 @@ "tm:wildcharge", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:wildcharge", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/deino.json b/common/src/main/resources/data/cobblemon/species/generation5/deino.json index e7698619a3..7e6143b48b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/deino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/deino.json @@ -86,19 +86,12 @@ "egg:headsmash", "tm:aquatail", "tm:assurance", - "tm:astonish", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:crunch", "tm:darkpulse", - "tm:doublehit", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:earthpower", "tm:endure", @@ -106,7 +99,6 @@ "tm:firefang", "tm:focusenergy", "tm:headbutt", - "tm:headsmash", "tm:hypervoice", "tm:icefang", "tm:incinerate", @@ -121,7 +113,6 @@ "tm:scaryface", "tm:screech", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:snarl", "tm:spite", @@ -129,7 +120,6 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -138,7 +128,26 @@ "tm:thunderwave", "tm:torment", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:focusenergy", + "tutor:hypervoice", + "tutor:icefang", + "tutor:outrage", + "tutor:rest", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:superpower", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json index dcb21eb797..cc49c9aceb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dewott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dewott.json @@ -104,8 +104,6 @@ "egg:trumpcard", "tm:aerialace", "tm:airslash", - "tm:aquacutter", - "tm:aquajet", "tm:aquatail", "tm:assurance", "tm:avalanche", @@ -113,10 +111,8 @@ "tm:brickbreak", "tm:brine", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:cut", - "tm:detect", "tm:dig", "tm:dive", "tm:encore", @@ -136,7 +132,6 @@ "tm:irontail", "tm:knockoff", "tm:liquidation", - "tm:nightslash", "tm:protect", "tm:raindance", "tm:razorshell", @@ -144,31 +139,46 @@ "tm:retaliate", "tm:revenge", "tm:rocksmash", - "tm:sacredsword", "tm:screech", "tm:sleeptalk", "tm:snowscape", - "tm:soak", "tm:substitute", "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:trumpcard", "tm:vacuumwave", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:covet", + "tutor:dive", + "tutor:falseswipe", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:swift", + "tutor:vacuumwave", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "oshawott", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json b/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json index ea8cdf74f4..91362a5f9e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json @@ -87,7 +87,6 @@ "tm:aerialace", "tm:brickbreak", "tm:bulldoze", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", @@ -97,9 +96,7 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", "tm:fling", - "tm:furyswipes", "tm:helpinghand", "tm:highhorsepower", "tm:honeclaws", @@ -108,10 +105,8 @@ "tm:metalsound", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:poisonjab", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockclimb", "tm:rockslide", @@ -120,21 +115,35 @@ "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", - "tm:skullbash", - "tm:slash", "tm:sleeptalk", "tm:stealthrock", "tm:stompingtantrum", "tm:strength", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:swordsdance", "tm:takedown", "tm:terablast", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:drillrun", + "tutor:earthpower", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:irondefense", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json b/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json index 81e0c90091..8b88b35243 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json @@ -93,26 +93,21 @@ "egg:suckerpunch", "tm:aerialace", "tm:aquatail", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:chargebeam", - "tm:chipaway", "tm:crunch", - "tm:crushclaw", "tm:cut", "tm:darkpulse", "tm:dig", "tm:dracometeor", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:dualwingbeat", "tm:earthquake", "tm:endure", "tm:facade", - "tm:feintattack", "tm:firefang", "tm:firepunch", "tm:flamethrower", @@ -120,7 +115,6 @@ "tm:fling", "tm:focusblast", "tm:gigaimpact", - "tm:glare", "tm:gunkshot", "tm:heatwave", "tm:honeclaws", @@ -129,16 +123,13 @@ "tm:ironhead", "tm:irontail", "tm:lashout", - "tm:leer", "tm:megapunch", "tm:metalclaw", - "tm:nightslash", "tm:outrage", "tm:payback", "tm:poisontail", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -150,10 +141,8 @@ "tm:rocktomb", "tm:scaleshot", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:smackdown", @@ -171,7 +160,43 @@ "tm:terablast", "tm:thunderfang", "tm:thunderpunch", - "tm:torment" + "tm:torment", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:lashout", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:thunderfang", + "tutor:thunderpunch" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json b/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json index 4e85d93b46..e27bd528e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json @@ -112,11 +112,8 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:aquajet", - "tm:aquaring", "tm:bravebird", "tm:brine", - "tm:bubblebeam", "tm:chillingwater", "tm:defog", "tm:disarmingvoice", @@ -127,17 +124,12 @@ "tm:facade", "tm:featherdance", "tm:fly", - "tm:gust", "tm:hail", "tm:helpinghand", "tm:hurricane", "tm:icebeam", "tm:icywind", "tm:liquidation", - "tm:luckychant", - "tm:mefirst", - "tm:mirrormove", - "tm:mudsport", "tm:pluck", "tm:protect", "tm:raindance", @@ -151,11 +143,23 @@ "tm:tailwind", "tm:terablast", "tm:trailblaze", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dive", + "tutor:endeavor", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json index 1b4deed5c7..5fc68f4bf5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json @@ -84,14 +84,11 @@ "egg:confuseray", "egg:healblock", "egg:secretpower", - "tm:acidarmor", "tm:afteryou", "tm:allyswitch", - "tm:astonish", "tm:calmmind", "tm:charm", "tm:confuseray", - "tm:confusion", "tm:dreameater", "tm:embargo", "tm:encore", @@ -107,7 +104,6 @@ "tm:gravity", "tm:guardswap", "tm:gyroball", - "tm:healblock", "tm:helpinghand", "tm:imprison", "tm:infestation", @@ -123,9 +119,7 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:rockslide", @@ -152,7 +146,37 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gravity", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:steelroller", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "solosis", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/durant.json b/common/src/main/resources/data/cobblemon/species/generation5/durant.json index 915c7ea459..2e443ec160 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/durant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/durant.json @@ -89,7 +89,6 @@ "tm:agility", "tm:batonpass", "tm:beatup", - "tm:bite", "tm:bugbite", "tm:crunch", "tm:cut", @@ -97,21 +96,15 @@ "tm:endeavor", "tm:endure", "tm:energyball", - "tm:entrainment", "tm:facade", - "tm:feintattack", - "tm:firstimpression", - "tm:flail", "tm:flashcannon", "tm:furycutter", "tm:gigaimpact", - "tm:guillotine", "tm:helpinghand", "tm:honeclaws", "tm:infestation", "tm:irondefense", "tm:ironhead", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:protect", @@ -122,7 +115,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:screech", "tm:shadowclaw", @@ -138,8 +130,29 @@ "tm:terablast", "tm:thunderfang", "tm:thunderwave", - "tm:visegrip", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bugbite", + "tutor:endeavor", + "tutor:energyball", + "tutor:flashcannon", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:ironhead", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderfang", + "tutor:xscissor" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json index a4305dc873..1e8c1be2ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/dwebble.json @@ -90,21 +90,17 @@ "tm:block", "tm:bugbite", "tm:bulldoze", - "tm:counter", "tm:curse", "tm:cut", "tm:dig", "tm:earthquake", "tm:endure", "tm:facade", - "tm:feintattack", - "tm:flail", "tm:furycutter", "tm:honeclaws", "tm:irondefense", "tm:knockoff", "tm:naturepower", - "tm:nightslash", "tm:poisonjab", "tm:protect", "tm:rest", @@ -113,15 +109,10 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rockwrecker", - "tm:rototiller", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:shadowclaw", - "tm:shellsmash", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", @@ -133,9 +124,25 @@ "tm:substitute", "tm:swordsdance", "tm:terablast", - "tm:wideguard", - "tm:withdraw", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:block", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:furycutter", + "tutor:irondefense", + "tutor:knockoff", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json index af49cf362b..cf2e95100e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json @@ -82,7 +82,6 @@ "64:gastroacid", "69:zapcannon", "74:thrash", - "tm:acid", "tm:acidspray", "tm:acrobatics", "tm:aquatail", @@ -91,9 +90,7 @@ "tm:bounce", "tm:charge", "tm:chargebeam", - "tm:coil", "tm:crunch", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -118,13 +115,10 @@ "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", - "tm:spark", "tm:substitute", "tm:superfang", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", @@ -133,7 +127,27 @@ "tm:uturn", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:aquatail", + "tutor:bind", + "tutor:bounce", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:flashcannon", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:irontail", + "tutor:knockoff", + "tutor:magnetrise", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:wildcharge" ], "preEvolution": "tynamo", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json index 42cdf3d4dc..8d7d7f3cc3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json @@ -79,7 +79,6 @@ "1:tackle", "1:spark", "5:wildcharge", - "tm:acid", "tm:acidspray", "tm:acrobatics", "tm:aquatail", @@ -93,12 +92,9 @@ "tm:charge", "tm:chargebeam", "tm:closecombat", - "tm:coil", "tm:confuseray", "tm:crunch", - "tm:crushclaw", "tm:cut", - "tm:discharge", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -123,7 +119,6 @@ "tm:hex", "tm:honeclaws", "tm:hyperbeam", - "tm:iondeluge", "tm:irontail", "tm:knockoff", "tm:lightscreen", @@ -143,7 +138,6 @@ "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", - "tm:spark", "tm:stompingtantrum", "tm:strength", "tm:substitute", @@ -152,10 +146,8 @@ "tm:superfang", "tm:superpower", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", @@ -165,8 +157,46 @@ "tm:uturn", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bind", + "tutor:bounce", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:electroweb", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:magnetrise", + "tutor:outrage", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "eelektrik", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json b/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json index b47a036b16..814542bf25 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/elgyem.json @@ -99,15 +99,10 @@ "tm:afteryou", "tm:agility", "tm:allyswitch", - "tm:astonish", - "tm:barrier", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:echoedvoice", "tm:embargo", @@ -117,19 +112,14 @@ "tm:facade", "tm:flash", "tm:gravity", - "tm:growl", - "tm:guardsplit", "tm:guardswap", "tm:headbutt", - "tm:healblock", "tm:imprison", "tm:lightscreen", "tm:magiccoat", "tm:meteorbeam", - "tm:miracleeye", "tm:nastyplot", "tm:painsplit", - "tm:powersplit", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -137,7 +127,6 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -149,16 +138,13 @@ "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:sleeptalk", "tm:snatch", "tm:steelwing", "tm:storedpower", "tm:substitute", - "tm:synchronoise", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderbolt", @@ -167,7 +153,36 @@ "tm:trickroom", "tm:uproar", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gravity", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/emboar.json b/common/src/main/resources/data/cobblemon/species/generation5/emboar.json index 6f52a9cace..a80037c983 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/emboar.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/emboar.json @@ -101,7 +101,6 @@ "egg:superpower", "egg:thrash", "egg:yawn", - "tm:armthrust", "tm:assurance", "tm:blastburn", "tm:block", @@ -110,18 +109,15 @@ "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:burnup", "tm:closecombat", "tm:coaching", "tm:covet", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:drainpunch", "tm:earthquake", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", @@ -138,9 +134,7 @@ "tm:gigaimpact", "tm:grassknot", "tm:gyroball", - "tm:hammerarm", "tm:hardpress", - "tm:headsmash", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", @@ -153,9 +147,7 @@ "tm:knockoff", "tm:lowkick", "tm:lowsweep", - "tm:magnitude", "tm:mudslap", - "tm:odorsleuth", "tm:overheat", "tm:poisonjab", "tm:poweruppunch", @@ -171,7 +163,6 @@ "tm:scaryface", "tm:sleeptalk", "tm:smackdown", - "tm:smog", "tm:solarbeam", "tm:stompingtantrum", "tm:stoneedge", @@ -180,20 +171,51 @@ "tm:suckerpunch", "tm:sunnyday", "tm:superpower", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:thunderpunch", "tm:trailblaze", "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:blastburn", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:covet", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "pignite", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json index d5ae6c9a48..4bffbef956 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/emolga.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/emolga.json @@ -90,7 +90,6 @@ "tm:aerialace", "tm:agility", "tm:airslash", - "tm:astonish", "tm:batonpass", "tm:charge", "tm:chargebeam", @@ -98,7 +97,6 @@ "tm:covet", "tm:cut", "tm:defog", - "tm:discharge", "tm:doubleteam", "tm:dualwingbeat", "tm:eerieimpulse", @@ -111,15 +109,11 @@ "tm:flash", "tm:fling", "tm:helpinghand", - "tm:iondeluge", "tm:irontail", "tm:knockoff", "tm:lastresort", "tm:lightscreen", - "tm:nuzzle", "tm:protect", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -128,22 +122,39 @@ "tm:signalbeam", "tm:sleeptalk", "tm:solarbeam", - "tm:spark", "tm:speedswap", "tm:substitute", "tm:swift", - "tm:tailwhip", "tm:tailwind", "tm:taunt", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", - "tm:tickle", "tm:uturn", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:aerialace", + "tutor:chargebeam", + "tutor:covet", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:energyball", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:rest", + "tutor:risingvoltage", + "tutor:roost", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json index 9848625396..9293f32d1f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json @@ -102,7 +102,6 @@ "tm:bugbite", "tm:bugbuzz", "tm:closecombat", - "tm:counter", "tm:cut", "tm:doubleedge", "tm:drillrun", @@ -111,31 +110,20 @@ "tm:energyball", "tm:facade", "tm:falseswipe", - "tm:feintattack", - "tm:fellstinger", - "tm:flail", "tm:focusblast", - "tm:furyattack", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", "tm:headbutt", - "tm:hornattack", "tm:hyperbeam", "tm:infestation", "tm:irondefense", "tm:ironhead", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:megahorn", - "tm:metalburst", - "tm:nightslash", - "tm:peck", "tm:poisonjab", "tm:protect", - "tm:pursuit", - "tm:quickguard", "tm:raindance", "tm:razorshell", "tm:rest", @@ -145,7 +133,6 @@ "tm:scaryface", "tm:screech", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:steelbeam", @@ -155,8 +142,28 @@ "tm:takedown", "tm:taunt", "tm:terablast", - "tm:twineedle", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bugbite", + "tutor:drillrun", + "tutor:energyball", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:xscissor" ], "preEvolution": "karrablast", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json index bd1f1957df..88d24d0bd7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json @@ -93,7 +93,6 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", @@ -103,15 +102,12 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", "tm:fling", "tm:focusblast", - "tm:furyswipes", "tm:gigaimpact", "tm:helpinghand", "tm:highhorsepower", "tm:honeclaws", - "tm:horndrill", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", @@ -120,38 +116,55 @@ "tm:metalsound", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:poisonjab", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockblast", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rototiller", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", - "tm:skullbash", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:stealthrock", "tm:steelbeam", "tm:stompingtantrum", "tm:strength", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:swordsdance", "tm:takedown", "tm:terablast", "tm:throatchop", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:drillrun", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:throatchop", + "tutor:xscissor" ], "preEvolution": "drilbur", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json b/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json index ca96e2b5d2..af9b42f854 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ferroseed.json @@ -104,16 +104,12 @@ "tm:gigadrain", "tm:gravity", "tm:gyroball", - "tm:harden", "tm:honeclaws", - "tm:ingrain", "tm:irondefense", "tm:ironhead", "tm:knockoff", - "tm:leechseed", "tm:magnetrise", "tm:metalclaw", - "tm:mirrorshot", "tm:naturepower", "tm:payback", "tm:pinmissile", @@ -135,12 +131,32 @@ "tm:steelroller", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:terablast", "tm:thunderbolt", "tm:thunderwave", "tm:toxic", - "tm:worryseed" + "tm:worryseed", + "tutor:endeavor", + "tutor:energyball", + "tutor:flashcannon", + "tutor:gigadrain", + "tutor:gravity", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:thunderbolt", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json b/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json index b360d1dc49..f2e4a160e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/ferrothorn.json @@ -120,18 +120,14 @@ "tm:grassknot", "tm:gravity", "tm:gyroball", - "tm:harden", "tm:heavyslam", "tm:honeclaws", "tm:hyperbeam", - "tm:ingrain", "tm:irondefense", "tm:ironhead", "tm:knockoff", - "tm:leechseed", "tm:magnetrise", "tm:metalclaw", - "tm:mirrorshot", "tm:naturepower", "tm:payback", "tm:pinmissile", @@ -158,13 +154,39 @@ "tm:substitute", "tm:sunnyday", "tm:swordsdance", - "tm:tackle", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", "tm:toxic", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:block", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:energyball", + "tutor:flashcannon", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:thunderbolt", + "tutor:worryseed" ], "preEvolution": "ferroseed", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json b/common/src/main/resources/data/cobblemon/species/generation5/foongus.json index 3eb0497622..06a0e86f3b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/foongus.json @@ -89,35 +89,24 @@ "egg:poisonpowder", "egg:rollout", "egg:worryseed", - "tm:absorb", "tm:afteryou", - "tm:astonish", - "tm:bide", "tm:bodyslam", "tm:bulletseed", - "tm:clearsmog", - "tm:defensecurl", "tm:endure", "tm:energyball", "tm:facade", - "tm:feintattack", "tm:flash", "tm:foulplay", "tm:gastroacid", "tm:gigadrain", "tm:grassknot", "tm:grassyterrain", - "tm:growth", - "tm:ingrain", "tm:leafstorm", "tm:magicalleaf", - "tm:megadrain", "tm:naturepower", "tm:payback", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:ragepowder", "tm:raindance", "tm:rest", "tm:rollout", @@ -125,16 +114,26 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:spore", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:synthesis", "tm:terablast", "tm:toxic", "tm:venoshock", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:energyball", + "tutor:foulplay", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json b/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json index a1581a04b5..a774b2170f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json @@ -99,11 +99,9 @@ "tm:aerialace", "tm:aquatail", "tm:assurance", - "tm:bite", "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:counter", "tm:crunch", "tm:cut", "tm:dig", @@ -113,33 +111,26 @@ "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:dualchop", "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:firstimpression", "tm:fling", "tm:focusenergy", "tm:gigaimpact", - "tm:guillotine", - "tm:harden", "tm:honeclaws", "tm:incinerate", "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:lowkick", - "tm:nightslash", "tm:outrage", "tm:payback", "tm:poisonjab", "tm:protect", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -147,10 +138,8 @@ "tm:rocktomb", "tm:scaleshot", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:stompingtantrum", @@ -165,7 +154,34 @@ "tm:taunt", "tm:terablast", "tm:trailblaze", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualchop", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:xscissor" ], "preEvolution": "axew", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/frillish.json b/common/src/main/resources/data/cobblemon/species/generation5/frillish.json index e2db1e909f..a1bd0c3335 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/frillish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/frillish.json @@ -99,18 +99,12 @@ "egg:painsplit", "egg:strengthsap", "egg:wringout", - "tm:absorb", - "tm:acidarmor", "tm:bind", "tm:blizzard", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:confuseray", - "tm:constrict", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", "tm:dive", "tm:dreameater", "tm:endure", @@ -125,17 +119,14 @@ "tm:icywind", "tm:imprison", "tm:magiccoat", - "tm:mist", "tm:nightshade", "tm:ominouswind", "tm:painsplit", - "tm:poisonsting", "tm:poltergeist", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", - "tm:recover", "tm:rest", "tm:safeguard", "tm:scald", @@ -145,7 +136,6 @@ "tm:sludgebomb", "tm:sludgewave", "tm:spite", - "tm:strengthsap", "tm:substitute", "tm:surf", "tm:taunt", @@ -153,13 +143,30 @@ "tm:trick", "tm:trickroom", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:waterspout", "tm:whirlpool", "tm:willowisp", - "tm:wringout" + "tutor:bind", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:energyball", + "tutor:gigadrain", + "tutor:icebeam", + "tutor:icywind", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:trick", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json b/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json index 09e724af00..17c74a5bd8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/galvantula.json @@ -103,25 +103,20 @@ "egg:poisonsting", "egg:pursuit", "egg:strugglebug", - "tm:absorb", "tm:agility", "tm:bounce", "tm:bugbite", "tm:bugbuzz", - "tm:camouflage", "tm:charge", "tm:chargebeam", "tm:crosspoison", "tm:cut", - "tm:disable", - "tm:discharge", "tm:doubleteam", "tm:electroball", "tm:electroweb", "tm:endure", "tm:energyball", "tm:facade", - "tm:feintattack", "tm:flash", "tm:furycutter", "tm:gastroacid", @@ -136,10 +131,8 @@ "tm:magnetrise", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:pounce", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -147,11 +140,8 @@ "tm:shockwave", "tm:signalbeam", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:speedswap", - "tm:spiderweb", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -165,7 +155,34 @@ "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tm:xscissor" + "tm:xscissor", + "tutor:bounce", + "tutor:bugbite", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:energyball", + "tutor:furycutter", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:leechlife", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:xscissor" ], "preEvolution": "joltik", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json index c972b241a8..d8b996c458 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json @@ -105,16 +105,12 @@ "egg:sandattack", "tm:acidspray", "tm:amnesia", - "tm:autotomize", - "tm:belch", "tm:bodypress", "tm:bodyslam", - "tm:clearsmog", "tm:corrosivegas", "tm:crosspoison", "tm:curse", "tm:darkpulse", - "tm:doubleslap", "tm:drainpunch", "tm:endure", "tm:explosion", @@ -128,11 +124,8 @@ "tm:hyperbeam", "tm:infestation", "tm:metalclaw", - "tm:mudsport", "tm:painsplit", "tm:payback", - "tm:poisongas", - "tm:pound", "tm:protect", "tm:psychic", "tm:raindance", @@ -141,23 +134,19 @@ "tm:rockblast", "tm:rockpolish", "tm:rollout", - "tm:sandattack", "tm:screech", "tm:seedbomb", "tm:selfdestruct", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", "tm:smackdown", "tm:solarbeam", "tm:spikes", "tm:spite", - "tm:stockpile", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:takedown", "tm:terablast", "tm:thief", @@ -165,7 +154,26 @@ "tm:toxic", "tm:toxicspikes", "tm:venomdrench", - "tm:venoshock" + "tm:venoshock", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:thunderbolt" ], "preEvolution": "trubbish", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation5/genesect.json b/common/src/main/resources/data/cobblemon/species/generation5/genesect.json index ced797921c..64aed2948f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/genesect.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/genesect.json @@ -80,7 +80,6 @@ "tm:energyball", "tm:explosion", "tm:facade", - "tm:fellstinger", "tm:flamecharge", "tm:flamethrower", "tm:flash", @@ -100,15 +99,12 @@ "tm:lastresort", "tm:leechlife", "tm:lightscreen", - "tm:lockon", "tm:magiccoat", - "tm:magnetbomb", "tm:magnetrise", "tm:metalclaw", "tm:metalsound", "tm:protect", "tm:psychic", - "tm:quickattack", "tm:recycle", "tm:reflect", "tm:rest", @@ -118,15 +114,12 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:simplebeam", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:steelbeam", "tm:strugglebug", "tm:substitute", "tm:swift", - "tm:technoblast", "tm:telekinesis", "tm:terablast", "tm:thunder", @@ -135,8 +128,42 @@ "tm:triattack", "tm:uturn", "tm:xscissor", - "tm:zapcannon", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bugbite", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lastresort", + "tutor:leechlife", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json b/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json index 8a1580b6a5..01524a4ba9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json @@ -106,7 +106,6 @@ "egg:magnitude", "egg:takedown", "egg:wideguard", - "tm:autotomize", "tm:block", "tm:bodypress", "tm:bulldoze", @@ -119,15 +118,12 @@ "tm:flashcannon", "tm:gigaimpact", "tm:gravity", - "tm:harden", "tm:headbutt", "tm:heavyslam", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", "tm:laserfocus", - "tm:lockon", - "tm:magnitude", "tm:meteorbeam", "tm:mudslap", "tm:naturepower", @@ -139,7 +135,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:selfdestruct", @@ -152,12 +147,31 @@ "tm:strength", "tm:substitute", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:throatchop", "tm:weatherball", - "tm:wideguard" + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop" ], "preEvolution": "boldore", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/golett.json b/common/src/main/resources/data/cobblemon/species/generation5/golett.json index 6fabb49d00..36c3d2899a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/golett.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/golett.json @@ -97,18 +97,15 @@ "56:dynamicpunch", "egg:magnitude", "tm:allyswitch", - "tm:astonish", "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:confuseray", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -121,7 +118,6 @@ "tm:grassknot", "tm:gravity", "tm:gyroball", - "tm:hammerarm", "tm:heavyslam", "tm:helpinghand", "tm:hex", @@ -134,14 +130,12 @@ "tm:lowkick", "tm:lowsweep", "tm:magiccoat", - "tm:magnitude", "tm:megakick", "tm:megapunch", "tm:mudslap", "tm:nightshade", "tm:phantomforce", "tm:poltergeist", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -159,7 +153,6 @@ "tm:scorchingsands", "tm:selfdestruct", "tm:shadowball", - "tm:shadowpunch", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -174,7 +167,40 @@ "tm:telekinesis", "tm:terablast", "tm:thief", - "tm:thunderpunch" + "tm:thunderpunch", + "tutor:allyswitch", + "tutor:block", + "tutor:bulldoze", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gravity", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:telekinesis", + "tutor:thunderpunch" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json index 90b3d5d10e..938ef08d55 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/golurk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/golurk.json @@ -104,7 +104,6 @@ "64:dynamicpunch", "egg:magnitude", "tm:allyswitch", - "tm:astonish", "tm:block", "tm:bodypress", "tm:bodyslam", @@ -115,11 +114,9 @@ "tm:confuseray", "tm:curse", "tm:darkestlariat", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -135,7 +132,6 @@ "tm:grassknot", "tm:gravity", "tm:gyroball", - "tm:hammerarm", "tm:hardpress", "tm:heatcrash", "tm:heavyslam", @@ -152,14 +148,12 @@ "tm:lowkick", "tm:lowsweep", "tm:magiccoat", - "tm:magnitude", "tm:megakick", "tm:megapunch", "tm:mudslap", "tm:nightshade", "tm:phantomforce", "tm:poltergeist", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -177,7 +171,6 @@ "tm:scorchingsands", "tm:selfdestruct", "tm:shadowball", - "tm:shadowpunch", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -197,7 +190,49 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:trick", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:block", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:mudslap", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:zenheadbutt" ], "preEvolution": "golett", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json index ff32ef82cd..069e696af2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json @@ -92,21 +92,16 @@ "tm:calmmind", "tm:captivate", "tm:charm", - "tm:confusion", "tm:covet", "tm:darkpulse", - "tm:doubleslap", "tm:dreameater", "tm:embargo", "tm:endure", "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:flash", - "tm:flatter", "tm:fling", "tm:foulplay", "tm:futuresight", @@ -114,21 +109,13 @@ "tm:gravity", "tm:guardswap", "tm:healbell", - "tm:healblock", - "tm:healpulse", "tm:helpinghand", - "tm:hypnosis", "tm:imprison", "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", - "tm:miracleeye", - "tm:mirrorcoat", "tm:nastyplot", "tm:payback", - "tm:playnice", - "tm:pound", "tm:protect", "tm:psybeam", "tm:psychic", @@ -159,11 +146,39 @@ "tm:thief", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:trick", "tm:trickroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json index 1bc1490b05..0d372782a0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json @@ -96,22 +96,17 @@ "tm:calmmind", "tm:captivate", "tm:charm", - "tm:confusion", "tm:cosmicpower", "tm:covet", "tm:darkpulse", - "tm:doubleslap", "tm:dreameater", "tm:embargo", "tm:endure", "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:flash", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:foulplay", @@ -121,25 +116,17 @@ "tm:gravity", "tm:guardswap", "tm:healbell", - "tm:healblock", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:laserfocus", "tm:lightscreen", "tm:lowsweep", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", "tm:metronome", - "tm:miracleeye", - "tm:mirrorcoat", "tm:nastyplot", "tm:payback", - "tm:playnice", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -171,11 +158,42 @@ "tm:thief", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:trick", "tm:trickroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:zenheadbutt" ], "preEvolution": "gothorita", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json index 92a9c68cf8..0e4852a9ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json @@ -93,21 +93,16 @@ "tm:calmmind", "tm:captivate", "tm:charm", - "tm:confusion", "tm:covet", "tm:darkpulse", - "tm:doubleslap", "tm:dreameater", "tm:embargo", "tm:endure", "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:flash", - "tm:flatter", "tm:fling", "tm:foulplay", "tm:futuresight", @@ -115,22 +110,14 @@ "tm:gravity", "tm:guardswap", "tm:healbell", - "tm:healblock", - "tm:healpulse", "tm:helpinghand", - "tm:hypnosis", "tm:imprison", "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", "tm:metronome", - "tm:miracleeye", - "tm:mirrorcoat", "tm:nastyplot", "tm:payback", - "tm:playnice", - "tm:pound", "tm:protect", "tm:psybeam", "tm:psychic", @@ -161,11 +148,39 @@ "tm:thief", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:trick", "tm:trickroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:zenheadbutt" ], "preEvolution": "gothita", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json index 7a98160f6c..17f100439f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/gurdurr.json @@ -99,23 +99,17 @@ "egg:slam", "egg:smellingsalts", "egg:wideguard", - "tm:bide", "tm:block", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", - "tm:chipaway", "tm:closecombat", "tm:coaching", - "tm:cometpunch", - "tm:counter", "tm:curse", "tm:defog", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:endure", "tm:facade", "tm:firepunch", @@ -123,23 +117,17 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:forcepalm", - "tm:foresight", "tm:grassknot", - "tm:hammerarm", "tm:helpinghand", "tm:highhorsepower", "tm:icepunch", "tm:knockoff", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:megakick", "tm:megapunch", "tm:payback", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -149,13 +137,10 @@ "tm:reversal", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:scaryface", - "tm:slam", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:stoneedge", "tm:strength", "tm:substitute", @@ -166,9 +151,28 @@ "tm:terablast", "tm:thief", "tm:thunderpunch", - "tm:wakeupslap", - "tm:wideguard", - "tm:workup" + "tm:workup", + "tutor:block", + "tutor:bulkup", + "tutor:coaching", + "tutor:defog", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderpunch" ], "preEvolution": "timburr", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json b/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json index 1f901a8ee1..9ad83a6746 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json @@ -99,14 +99,12 @@ "tm:aerialace", "tm:aquatail", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", "tm:closecombat", - "tm:counter", "tm:crunch", "tm:cut", "tm:dig", @@ -116,7 +114,6 @@ "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:dualchop", "tm:earthquake", @@ -124,31 +121,25 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:firstimpression", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:gigaimpact", "tm:grassknot", - "tm:guillotine", - "tm:harden", "tm:honeclaws", "tm:hyperbeam", "tm:incinerate", "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:nightslash", "tm:outrage", "tm:payback", "tm:poisonjab", "tm:protect", "tm:psychocut", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -157,10 +148,8 @@ "tm:rocktomb", "tm:scaleshot", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:stompingtantrum", @@ -175,7 +164,37 @@ "tm:taunt", "tm:terablast", "tm:trailblaze", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualchop", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:xscissor" ], "preEvolution": "fraxure", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json b/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json index 89ee24b9aa..3f7b023213 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/heatmor.json @@ -100,7 +100,6 @@ "egg:wrap", "tm:aerialace", "tm:amnesia", - "tm:belch", "tm:bind", "tm:bodyslam", "tm:brutalswing", @@ -112,34 +111,25 @@ "tm:drainpunch", "tm:endure", "tm:facade", - "tm:feintattack", "tm:fireblast", - "tm:firelash", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamethrower", "tm:flareblitz", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:furyswipes", "tm:gastroacid", "tm:gigadrain", "tm:gigaimpact", "tm:heatwave", "tm:honeclaws", "tm:incinerate", - "tm:inferno", "tm:knockoff", - "tm:lick", "tm:lowkick", - "tm:nightslash", - "tm:odorsleuth", "tm:overheat", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:recycle", "tm:rest", @@ -147,27 +137,46 @@ "tm:rocktomb", "tm:scorchingsands", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", - "tm:spitup", - "tm:stockpile", "tm:stompingtantrum", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:superpower", - "tm:swallow", - "tm:tackle", "tm:taunt", "tm:terablast", "tm:thief", "tm:throatchop", "tm:thunderpunch", - "tm:tickle", "tm:willowisp", - "tm:wrap" + "tutor:aerialace", + "tutor:bind", + "tutor:bugbite", + "tutor:burningjealousy", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:knockoff", + "tutor:lowkick", + "tutor:recycle", + "tutor:rest", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderpunch" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json index 5680b2cfa9..ab78690d08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/herdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/herdier.json @@ -92,7 +92,6 @@ "tm:aerialace", "tm:afteryou", "tm:babydolleyes", - "tm:bite", "tm:charm", "tm:covet", "tm:crunch", @@ -102,19 +101,14 @@ "tm:firefang", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:icefang", "tm:lastresort", - "tm:leer", - "tm:lick", "tm:mudslap", - "tm:odorsleuth", "tm:payback", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -122,7 +116,6 @@ "tm:roar", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", @@ -131,7 +124,6 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderbolt", @@ -140,7 +132,29 @@ "tm:uproar", "tm:wildcharge", "tm:workup", - "tm:yawn" + "tutor:aerialace", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:covet", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icefang", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "lillipup", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json b/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json index df3c92995c..20b62c4a35 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/hydreigon.json @@ -102,10 +102,7 @@ "tm:acrobatics", "tm:aquatail", "tm:assurance", - "tm:astonish", "tm:beatup", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", @@ -113,14 +110,10 @@ "tm:crunch", "tm:darkpulse", "tm:defog", - "tm:doublehit", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:dualwingbeat", "tm:earthpower", @@ -138,7 +131,6 @@ "tm:focusenergy", "tm:gigaimpact", "tm:headbutt", - "tm:headsmash", "tm:heatwave", "tm:helpinghand", "tm:hydropump", @@ -166,7 +158,6 @@ "tm:screech", "tm:shockwave", "tm:signalbeam", - "tm:slam", "tm:sleeptalk", "tm:snarl", "tm:spite", @@ -179,7 +170,6 @@ "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:taunt", @@ -192,7 +182,46 @@ "tm:triattack", "tm:uturn", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irontail", + "tutor:lashout", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:tailwind", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "preEvolution": "zweilous", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json b/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json index eb01b46ecb..7867e607af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/jellicent.json @@ -105,18 +105,12 @@ "egg:painsplit", "egg:strengthsap", "egg:wringout", - "tm:absorb", - "tm:acidarmor", "tm:bind", "tm:blizzard", "tm:brine", - "tm:bubble", - "tm:bubblebeam", "tm:confuseray", - "tm:constrict", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", "tm:dive", "tm:dreameater", "tm:endure", @@ -133,18 +127,15 @@ "tm:icywind", "tm:imprison", "tm:magiccoat", - "tm:mist", "tm:muddywater", "tm:nightshade", "tm:ominouswind", "tm:painsplit", - "tm:poisonsting", "tm:poltergeist", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", - "tm:recover", "tm:rest", "tm:safeguard", "tm:scald", @@ -154,7 +145,6 @@ "tm:sludgebomb", "tm:sludgewave", "tm:spite", - "tm:strengthsap", "tm:substitute", "tm:surf", "tm:taunt", @@ -162,13 +152,32 @@ "tm:trick", "tm:trickroom", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:waterspout", "tm:whirlpool", "tm:willowisp", - "tm:wringout" + "tutor:bind", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:trick", + "tutor:waterpulse" ], "preEvolution": "frillish", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/joltik.json b/common/src/main/resources/data/cobblemon/species/generation5/joltik.json index f68e33986a..0c7df89965 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/joltik.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/joltik.json @@ -96,24 +96,19 @@ "egg:poisonsting", "egg:pursuit", "egg:strugglebug", - "tm:absorb", "tm:agility", "tm:bounce", "tm:bugbite", "tm:bugbuzz", - "tm:camouflage", "tm:chargebeam", "tm:crosspoison", "tm:cut", - "tm:disable", - "tm:discharge", "tm:doubleteam", "tm:electroball", "tm:electroweb", "tm:endure", "tm:energyball", "tm:facade", - "tm:feintattack", "tm:flash", "tm:furycutter", "tm:gastroacid", @@ -126,10 +121,8 @@ "tm:magnetrise", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:pounce", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -138,10 +131,8 @@ "tm:shockwave", "tm:signalbeam", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:speedswap", - "tm:spiderweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -154,7 +145,31 @@ "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tm:xscissor" + "tm:xscissor", + "tutor:bounce", + "tutor:bugbite", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:energyball", + "tutor:furycutter", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:leechlife", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json index e4d3f7ebe3..5bbb4226d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json @@ -84,7 +84,6 @@ "tm:aerialace", "tm:bugbite", "tm:bugbuzz", - "tm:counter", "tm:cut", "tm:doubleedge", "tm:drillrun", @@ -93,36 +92,42 @@ "tm:energyball", "tm:facade", "tm:falseswipe", - "tm:feintattack", - "tm:flail", - "tm:furyattack", "tm:furycutter", "tm:gigadrain", "tm:headbutt", - "tm:hornattack", "tm:infestation", "tm:irondefense", "tm:knockoff", - "tm:leer", "tm:megahorn", - "tm:nightslash", - "tm:peck", "tm:poisonjab", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:scaryface", "tm:screech", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:strugglebug", "tm:substitute", "tm:swordsdance", "tm:takedown", "tm:terablast", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bugbite", + "tutor:drillrun", + "tutor:energyball", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:irondefense", + "tutor:knockoff", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json b/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json index 169e71861c..1c6adff680 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json @@ -14,7 +14,7 @@ "mythical" ], "aspects": [ - "sword-form-ordinary" + "ordinary-form" ], "abilities": [ "justified", @@ -63,13 +63,11 @@ "form_change:secretsword", "tm:aerialace", "tm:airslash", - "tm:aquajet", "tm:aquatail", "tm:aurasphere", "tm:batonpass", "tm:bounce", "tm:brickbreak", - "tm:bubblebeam", "tm:calmmind", "tm:chillingwater", "tm:closecombat", @@ -77,7 +75,6 @@ "tm:covet", "tm:cut", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:facade", "tm:falseswipe", @@ -90,7 +87,6 @@ "tm:hyperbeam", "tm:icywind", "tm:lastresort", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:megahorn", @@ -99,7 +95,6 @@ "tm:poisonjab", "tm:protect", "tm:psychup", - "tm:quickguard", "tm:raindance", "tm:reflect", "tm:rest", @@ -108,9 +103,7 @@ "tm:reversal", "tm:roar", "tm:rocksmash", - "tm:sacredsword", "tm:safeguard", - "tm:secretsword", "tm:sleeptalk", "tm:smartstrike", "tm:stoneedge", @@ -129,7 +122,35 @@ "tm:vacuumwave", "tm:waterpulse", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bounce", + "tutor:calmmind", + "tutor:coaching", + "tutor:covet", + "tutor:falseswipe", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:lastresort", + "tutor:liquidation", + "tutor:lowkick", + "tutor:megahorn", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:secretsword", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:vacuumwave", + "tutor:waterpulse", + "tutor:xscissor" ], "evolutions": [], "forms": [ @@ -148,7 +169,7 @@ "mythical" ], "aspects": [ - "sword-form-resolute" + "resolute-form" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation5/klang.json b/common/src/main/resources/data/cobblemon/species/generation5/klang.json index 1ba98f2b51..bbfe352b90 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/klang.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/klang.json @@ -87,23 +87,18 @@ "54:hyperbeam", "tm:allyswitch", "tm:assurance", - "tm:autotomize", "tm:bind", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:endure", "tm:facade", "tm:flashcannon", - "tm:geargrind", "tm:gravity", "tm:hyperbeam", "tm:irondefense", - "tm:lockon", "tm:magiccoat", "tm:magnetrise", "tm:metalsound", - "tm:mirrorshot", "tm:powergem", "tm:protect", "tm:recycle", @@ -113,7 +108,6 @@ "tm:rocksmash", "tm:sandstorm", "tm:screech", - "tm:shiftgear", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -123,13 +117,32 @@ "tm:telekinesis", "tm:terablast", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:uproar", - "tm:visegrip", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:allyswitch", + "tutor:bind", + "tutor:chargebeam", + "tutor:flashcannon", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "klink", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/klink.json b/common/src/main/resources/data/cobblemon/species/generation5/klink.json index d3bbf6222f..e658823a66 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/klink.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/klink.json @@ -86,23 +86,18 @@ "44:zapcannon", "48:hyperbeam", "tm:assurance", - "tm:autotomize", "tm:bind", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:endure", "tm:facade", "tm:flashcannon", - "tm:geargrind", "tm:gravity", "tm:hyperbeam", "tm:irondefense", - "tm:lockon", "tm:magiccoat", "tm:magnetrise", "tm:metalsound", - "tm:mirrorshot", "tm:powergem", "tm:protect", "tm:recycle", @@ -112,7 +107,6 @@ "tm:rocksmash", "tm:sandstorm", "tm:screech", - "tm:shiftgear", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -122,13 +116,31 @@ "tm:telekinesis", "tm:terablast", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:uproar", - "tm:visegrip", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:bind", + "tutor:chargebeam", + "tutor:flashcannon", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json b/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json index d78cb38493..71fadfc833 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/klinklang.json @@ -90,27 +90,20 @@ "64:electricterrain", "tm:allyswitch", "tm:assurance", - "tm:autotomize", "tm:bind", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:electricterrain", "tm:endure", "tm:facade", "tm:flashcannon", - "tm:geargrind", - "tm:gearup", "tm:gigaimpact", "tm:gravity", "tm:hyperbeam", "tm:irondefense", - "tm:lockon", "tm:magiccoat", - "tm:magneticflux", "tm:magnetrise", "tm:metalsound", - "tm:mirrorshot", "tm:powergem", "tm:protect", "tm:recycle", @@ -120,7 +113,6 @@ "tm:rocksmash", "tm:sandstorm", "tm:screech", - "tm:shiftgear", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -131,14 +123,35 @@ "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:trickroom", "tm:uproar", - "tm:visegrip", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:allyswitch", + "tutor:bind", + "tutor:chargebeam", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "klang", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json index 4d14a47553..4a6806ea9d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json @@ -101,13 +101,11 @@ "tm:aquatail", "tm:assurance", "tm:beatup", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:counter", "tm:crunch", "tm:curse", "tm:cut", @@ -134,21 +132,15 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:meanlook", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:mudshot", "tm:mudslap", "tm:payback", - "tm:powertrip", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:rage", "tm:rest", "tm:retaliate", "tm:revenge", @@ -156,7 +148,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", @@ -179,9 +170,40 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderfang", - "tm:torment" + "tm:torment", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderfang" ], "preEvolution": "sandile", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json index 84976c52ad..f3fdf37c46 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json @@ -102,7 +102,6 @@ "tm:aquatail", "tm:assurance", "tm:beatup", - "tm:bite", "tm:block", "tm:bodyslam", "tm:breakingswipe", @@ -111,7 +110,6 @@ "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:counter", "tm:crunch", "tm:curse", "tm:cut", @@ -145,22 +143,16 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:meanlook", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:mudshot", "tm:mudslap", "tm:outrage", "tm:payback", - "tm:powertrip", "tm:poweruppunch", "tm:protect", - "tm:pursuit", - "tm:rage", "tm:rest", "tm:retaliate", "tm:revenge", @@ -168,7 +160,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", @@ -193,10 +184,51 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunderfang", - "tm:torment" + "tm:torment", + "tutor:aerialace", + "tutor:aquatail", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderfang" ], "preEvolution": "krokorok", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json b/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json index 77a6db3d1d..5ab0afe2ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json @@ -76,12 +76,10 @@ "tm:brutalswing", "tm:cut", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:dualwingbeat", "tm:earthpower", @@ -93,9 +91,7 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:freezedry", "tm:gigaimpact", - "tm:glaciate", "tm:hail", "tm:helpinghand", "tm:honeclaws", @@ -109,7 +105,6 @@ "tm:ironhead", "tm:laserfocus", "tm:lightscreen", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -127,9 +122,7 @@ "tm:scaryface", "tm:shadowball", "tm:shadowclaw", - "tm:sheercold", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:steelwing", @@ -141,7 +134,38 @@ "tm:takedown", "tm:terablast", "tm:weatherball", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -211,12 +235,10 @@ "tm:brutalswing", "tm:cut", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:dualwingbeat", "tm:earthpower", @@ -228,8 +250,6 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:freezedry", - "tm:fusionflare", "tm:gigaimpact", "tm:hail", "tm:helpinghand", @@ -237,7 +257,6 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", - "tm:iceburn", "tm:icefang", "tm:iciclespear", "tm:icywind", @@ -245,7 +264,6 @@ "tm:ironhead", "tm:laserfocus", "tm:lightscreen", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -263,9 +281,7 @@ "tm:scaryface", "tm:shadowball", "tm:shadowclaw", - "tm:sheercold", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:steelwing", @@ -277,7 +293,38 @@ "tm:takedown", "tm:terablast", "tm:weatherball", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -348,12 +395,10 @@ "tm:brutalswing", "tm:cut", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:dualwingbeat", "tm:earthpower", @@ -365,9 +410,6 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:freezedry", - "tm:freezeshock", - "tm:fusionbolt", "tm:gigaimpact", "tm:hail", "tm:helpinghand", @@ -382,7 +424,6 @@ "tm:ironhead", "tm:laserfocus", "tm:lightscreen", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -400,9 +441,7 @@ "tm:scaryface", "tm:shadowball", "tm:shadowclaw", - "tm:sheercold", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:steelwing", @@ -414,7 +453,38 @@ "tm:takedown", "tm:terablast", "tm:weatherball", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lampent.json b/common/src/main/resources/data/cobblemon/species/generation5/lampent.json index ec9b11ce53..e50c4ff2b7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lampent.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lampent.json @@ -99,26 +99,20 @@ "egg:clearsmog", "egg:haze", "egg:powersplit", - "tm:acid", - "tm:acidarmor", "tm:allyswitch", - "tm:astonish", "tm:burningjealousy", "tm:calmmind", "tm:captivate", - "tm:clearsmog", "tm:confuseray", "tm:curse", "tm:darkpulse", "tm:dreameater", "tm:embargo", - "tm:ember", "tm:endure", "tm:energyball", "tm:facade", "tm:fireblast", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -128,17 +122,13 @@ "tm:hex", "tm:imprison", "tm:incinerate", - "tm:inferno", "tm:lashout", - "tm:memento", - "tm:minimize", "tm:mysticalfire", "tm:nightshade", "tm:overheat", "tm:painsplit", "tm:payback", "tm:poltergeist", - "tm:powersplit", "tm:protect", "tm:psychic", "tm:psychup", @@ -148,7 +138,6 @@ "tm:shockwave", "tm:skittersmack", "tm:sleeptalk", - "tm:smog", "tm:solarbeam", "tm:spite", "tm:substitute", @@ -160,7 +149,27 @@ "tm:thief", "tm:trick", "tm:trickroom", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:energyball", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:lashout", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:telekinesis", + "tutor:trick" ], "preEvolution": "litwick", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/landorus.json b/common/src/main/resources/data/cobblemon/species/generation5/landorus.json index de29045674..9c137c586e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/landorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/landorus.json @@ -78,20 +78,16 @@ "tm:earthquake", "tm:endure", "tm:explosion", - "tm:extrasensory", "tm:facade", - "tm:fissure", "tm:fling", "tm:fly", "tm:focusblast", "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:hammerarm", "tm:hyperbeam", "tm:imprison", "tm:irontail", - "tm:leer", "tm:mudshot", "tm:mudslap", "tm:nastyplot", @@ -99,16 +95,13 @@ "tm:payback", "tm:protect", "tm:psychic", - "tm:punishment", "tm:raindance", "tm:rest", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:roleplay", - "tm:sandsearstorm", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", @@ -130,7 +123,31 @@ "tm:taunt", "tm:terablast", "tm:uturn", - "tm:weatherball" + "tm:weatherball", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:defog", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:mudslap", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json b/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json index 123b3e6e1c..dbb33bd848 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/larvesta.json @@ -89,7 +89,6 @@ "egg:harden", "egg:morningsun", "egg:thrash", - "tm:absorb", "tm:acrobatics", "tm:amnesia", "tm:bodyslam", @@ -97,25 +96,20 @@ "tm:bugbuzz", "tm:calmmind", "tm:doubleedge", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", - "tm:foresight", "tm:gigadrain", - "tm:harden", "tm:heatwave", "tm:incinerate", "tm:leechlife", "tm:lightscreen", "tm:lunge", "tm:magnetrise", - "tm:morningsun", "tm:overheat", "tm:pounce", "tm:protect", @@ -133,12 +127,26 @@ "tm:sunnyday", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:trailblaze", "tm:uturn", "tm:wildcharge", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bugbite", + "tutor:calmmind", + "tutor:flamethrower", + "tutor:gigadrain", + "tutor:heatwave", + "tutor:leechlife", + "tutor:magnetrise", + "tutor:psychic", + "tutor:rest", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json index 8c4195cfac..b95ff4b421 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json @@ -103,23 +103,18 @@ "tm:bugbuzz", "tm:bulletseed", "tm:calmmind", - "tm:camouflage", "tm:charm", "tm:cut", "tm:dreameater", "tm:electroweb", "tm:endure", "tm:energyball", - "tm:entrainment", "tm:facade", "tm:falseswipe", - "tm:fellstinger", - "tm:flail", "tm:flash", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", "tm:healbell", @@ -136,8 +131,6 @@ "tm:lunge", "tm:magicalleaf", "tm:magiccoat", - "tm:mefirst", - "tm:mindreader", "tm:naturepower", "tm:payback", "tm:poisonjab", @@ -145,8 +138,6 @@ "tm:pounce", "tm:protect", "tm:raindance", - "tm:razorleaf", - "tm:razorwind", "tm:reflect", "tm:rest", "tm:retaliate", @@ -156,27 +147,54 @@ "tm:shadowclaw", "tm:signalbeam", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:snore", "tm:solarbeam", "tm:steelwing", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:switcheroo", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:throatchop", "tm:trailblaze", "tm:tripleaxel", "tm:worryseed", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:calmmind", + "tutor:electroweb", + "tutor:energyball", + "tutor:falseswipe", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:poisonjab", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stringshot", + "tutor:synthesis", + "tutor:throatchop", + "tutor:tripleaxel", + "tutor:worryseed", + "tutor:xscissor" ], "preEvolution": "swadloon", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json index 5e6a26ec51..4c364ab1d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json @@ -87,13 +87,11 @@ "egg:slash", "egg:yawn", "tm:aerialace", - "tm:assist", "tm:assurance", "tm:batonpass", "tm:burningjealousy", "tm:captivate", "tm:charm", - "tm:copycat", "tm:covet", "tm:cut", "tm:darkpulse", @@ -104,14 +102,10 @@ "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:foulplay", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:honeclaws", "tm:hyperbeam", @@ -121,27 +115,21 @@ "tm:laserfocus", "tm:lashout", "tm:nastyplot", - "tm:nightslash", "tm:payback", "tm:payday", "tm:playrough", "tm:protect", "tm:psychocut", "tm:psychup", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:rocksmash", "tm:roleplay", - "tm:sandattack", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -158,7 +146,36 @@ "tm:torment", "tm:trick", "tm:uturn", - "tm:yawn" + "tutor:aerialace", + "tutor:burningjealousy", + "tutor:covet", + "tutor:darkpulse", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:playrough", + "tutor:psychocut", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:trick" ], "preEvolution": "purrloin", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json index e3aa33d708..03186770de 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json @@ -98,11 +98,8 @@ "egg:naturalgift", "egg:sweetscent", "egg:worryseed", - "tm:absorb", "tm:afteryou", "tm:alluringvoice", - "tm:aromatherapy", - "tm:bide", "tm:bulletseed", "tm:charm", "tm:covet", @@ -111,55 +108,59 @@ "tm:encore", "tm:endure", "tm:energyball", - "tm:entrainment", "tm:facade", "tm:flash", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:healbell", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", - "tm:ingrain", "tm:laserfocus", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:megadrain", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:pollenpuff", "tm:protect", "tm:psychup", - "tm:quiverdance", "tm:rest", "tm:roleplay", "tm:safeguard", "tm:seedbomb", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", - "tm:teeterdance", "tm:terablast", "tm:trailblaze", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:covet", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:rest", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "petilil", "evolutions": [], @@ -253,15 +254,11 @@ "egg:naturalgift", "egg:sweetscent", "egg:worryseed", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:afteryou", "tm:airslash", - "tm:aromatherapy", - "tm:axekick", "tm:babydolleyes", - "tm:bide", "tm:brickbreak", "tm:bulletseed", "tm:charm", @@ -271,29 +268,22 @@ "tm:encore", "tm:endure", "tm:energyball", - "tm:entrainment", "tm:facade", "tm:focusenergy", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:healingwish", "tm:helpinghand", "tm:hurricane", "tm:hyperbeam", "tm:icespinner", - "tm:ingrain", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", - "tm:megadrain", "tm:megakick", "tm:metronome", "tm:naturalgift", @@ -306,26 +296,44 @@ "tm:rest", "tm:rocksmash", "tm:seedbomb", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:takedown", - "tm:teeterdance", "tm:terablast", "tm:trailblaze", "tm:tripleaxel", "tm:upperhand", "tm:vacuumwave", - "tm:victorydance", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:coaching", + "tutor:defog", + "tutor:energyball", + "tutor:focusenergy", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:tripleaxel", + "tutor:vacuumwave", + "tutor:worryseed" ], "preEvolution": "petilil", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json index e093ef34d3..d90c5d5544 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lillipup.json @@ -91,7 +91,6 @@ "tm:aerialace", "tm:afteryou", "tm:babydolleyes", - "tm:bite", "tm:charm", "tm:covet", "tm:crunch", @@ -101,19 +100,14 @@ "tm:firefang", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:icefang", "tm:lastresort", - "tm:leer", - "tm:lick", "tm:mudslap", - "tm:odorsleuth", "tm:payback", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -121,14 +115,12 @@ "tm:roar", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", "tm:snarl", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderbolt", @@ -137,7 +129,29 @@ "tm:uproar", "tm:wildcharge", "tm:workup", - "tm:yawn" + "tutor:aerialace", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:covet", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icefang", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/litwick.json b/common/src/main/resources/data/cobblemon/species/generation5/litwick.json index 03ef0bfde9..ef1f252b80 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/litwick.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/litwick.json @@ -97,26 +97,20 @@ "egg:clearsmog", "egg:haze", "egg:powersplit", - "tm:acid", - "tm:acidarmor", "tm:allyswitch", - "tm:astonish", "tm:burningjealousy", "tm:calmmind", "tm:captivate", - "tm:clearsmog", "tm:confuseray", "tm:curse", "tm:darkpulse", "tm:dreameater", "tm:embargo", - "tm:ember", "tm:endure", "tm:energyball", "tm:facade", "tm:fireblast", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -126,16 +120,12 @@ "tm:hex", "tm:imprison", "tm:incinerate", - "tm:inferno", - "tm:memento", - "tm:minimize", "tm:mysticalfire", "tm:nightshade", "tm:overheat", "tm:painsplit", "tm:payback", "tm:poltergeist", - "tm:powersplit", "tm:protect", "tm:psychic", "tm:psychup", @@ -145,7 +135,6 @@ "tm:shockwave", "tm:skittersmack", "tm:sleeptalk", - "tm:smog", "tm:solarbeam", "tm:spite", "tm:substitute", @@ -157,7 +146,26 @@ "tm:thief", "tm:trick", "tm:trickroom", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:energyball", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:telekinesis", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json index ea99cc2281..64efb7a327 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json @@ -107,7 +107,6 @@ "tm:assurance", "tm:attract", "tm:block", - "tm:bonerush", "tm:bravebird", "tm:cut", "tm:darkpulse", @@ -119,13 +118,9 @@ "tm:facade", "tm:faketears", "tm:featherdance", - "tm:feintattack", - "tm:flatter", "tm:fly", "tm:foulplay", - "tm:furyattack", "tm:gigaimpact", - "tm:gust", "tm:heatwave", "tm:hurricane", "tm:hyperbeam", @@ -133,15 +128,11 @@ "tm:irondefense", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:meanlook", - "tm:mirrormove", "tm:nastyplot", "tm:payback", "tm:pluck", "tm:protect", "tm:psychup", - "tm:punishment", "tm:raindance", "tm:rest", "tm:retaliate", @@ -170,7 +161,32 @@ "tm:toxic", "tm:uproar", "tm:uturn", - "tm:whirlwind" + "tutor:aerialace", + "tutor:aircutter", + "tutor:block", + "tutor:darkpulse", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:knockoff", + "tutor:lashout", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:shadowball", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:uproar" ], "preEvolution": "vullaby", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json index 96055e05c1..466b24b469 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/maractus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/maractus.json @@ -91,15 +91,11 @@ "egg:leechseed", "egg:woodhammer", "egg:worryseed", - "tm:absorb", - "tm:acupressure", "tm:aerialace", "tm:afteryou", "tm:assurance", "tm:bounce", "tm:bulletseed", - "tm:cottonguard", - "tm:cottonspore", "tm:drainpunch", "tm:endeavor", "tm:endure", @@ -107,22 +103,14 @@ "tm:facade", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:hypervoice", - "tm:ingrain", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", - "tm:megadrain", "tm:naturepower", - "tm:needlearm", - "tm:peck", "tm:petalblizzard", - "tm:petaldance", "tm:pinmissile", "tm:poisonjab", "tm:protect", @@ -134,18 +122,36 @@ "tm:sleeptalk", "tm:solarbeam", "tm:spikes", - "tm:spikyshield", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:sweetscent", "tm:synthesis", "tm:terablast", "tm:throatchop", "tm:uproar", "tm:weatherball", - "tm:woodhammer", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:afteryou", + "tutor:bounce", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:poisonjab", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:suckerpunch", + "tutor:synthesis", + "tutor:throatchop", + "tutor:uproar", + "tutor:worryseed" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json b/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json index 35cda9d307..9f7861a61f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json @@ -71,7 +71,6 @@ "tm:charm", "tm:closecombat", "tm:coaching", - "tm:confusion", "tm:covet", "tm:dazzlinggleam", "tm:disarmingvoice", @@ -108,7 +107,6 @@ "tm:magicroom", "tm:metronome", "tm:payback", - "tm:perishsong", "tm:playrough", "tm:poweruppunch", "tm:protect", @@ -116,10 +114,8 @@ "tm:psychic", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:recycle", - "tm:relicsong", "tm:rest", "tm:retaliate", "tm:reversal", @@ -131,7 +127,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:snatch", @@ -141,7 +136,6 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:teeterdance", "tm:telekinesis", "tm:terablast", "tm:thunder", @@ -152,10 +146,55 @@ "tm:trickroom", "tm:tripleaxel", "tm:uturn", - "tm:wakeupslap", "tm:wonderroom", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:coaching", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:energyball", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:relicsong", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:tripleaxel", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json b/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json index 21cbdb4db5..8cbc479675 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json @@ -97,40 +97,28 @@ "tm:calmmind", "tm:closecombat", "tm:coaching", - "tm:detect", "tm:dig", - "tm:doubleslap", "tm:drainpunch", "tm:dualchop", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:forcepalm", - "tm:furyswipes", "tm:grassknot", "tm:helpinghand", - "tm:highjumpkick", "tm:honeclaws", - "tm:jumpkick", "tm:knockoff", "tm:lowkick", "tm:lowsweep", - "tm:meditate", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:payback", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -140,7 +128,6 @@ "tm:rocktomb", "tm:roleplay", "tm:sleeptalk", - "tm:smellingsalts", "tm:stoneedge", "tm:strength", "tm:substitute", @@ -153,8 +140,27 @@ "tm:trailblaze", "tm:upperhand", "tm:uturn", - "tm:vitalthrow", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bounce", + "tutor:bulkup", + "tutor:calmmind", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:swift" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json index c732881550..18f9742f4e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json @@ -103,45 +103,33 @@ "tm:calmmind", "tm:closecombat", "tm:coaching", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:doubleslap", "tm:drainpunch", "tm:dualchop", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:feint", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:forcepalm", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", - "tm:highjumpkick", "tm:honeclaws", "tm:hyperbeam", "tm:icespinner", - "tm:jumpkick", "tm:knockoff", "tm:laserfocus", "tm:lowkick", "tm:lowsweep", - "tm:meditate", - "tm:mefirst", "tm:megakick", "tm:megapunch", "tm:payback", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -151,7 +139,6 @@ "tm:rocktomb", "tm:roleplay", "tm:sleeptalk", - "tm:smellingsalts", "tm:stoneedge", "tm:strength", "tm:substitute", @@ -166,9 +153,32 @@ "tm:upperhand", "tm:uturn", "tm:vacuumwave", - "tm:vitalthrow", - "tm:wideguard", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bounce", + "tutor:bulkup", + "tutor:calmmind", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:swift", + "tutor:tripleaxel", + "tutor:vacuumwave" ], "preEvolution": "mienfoo", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json b/common/src/main/resources/data/cobblemon/species/generation5/minccino.json index 812df62d30..35d1444075 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/minccino.json @@ -97,17 +97,14 @@ "tm:covet", "tm:dazzlinggleam", "tm:dig", - "tm:doubleslap", "tm:echoedvoice", "tm:encore", "tm:endeavor", "tm:endure", "tm:facade", "tm:faketears", - "tm:flail", "tm:fling", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:helpinghand", "tm:hypervoice", @@ -116,7 +113,6 @@ "tm:lastresort", "tm:mudslap", "tm:playrough", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", @@ -124,28 +120,46 @@ "tm:safeguard", "tm:seedbomb", "tm:shockwave", - "tm:sing", - "tm:slam", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", "tm:superfang", "tm:swift", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", - "tm:tidyup", "tm:trailblaze", "tm:tripleaxel", "tm:uproar", "tm:uturn", - "tm:wakeupslap", - "tm:workup" + "tm:workup", + "tutor:afteryou", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:tripleaxel", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/munna.json b/common/src/main/resources/data/cobblemon/species/generation5/munna.json index f4700498b5..1d40c37c20 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/munna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/munna.json @@ -84,12 +84,10 @@ "tm:afteryou", "tm:allyswitch", "tm:amnesia", - "tm:barrier", "tm:calmmind", "tm:chargebeam", "tm:curse", "tm:dazzlinggleam", - "tm:defensecurl", "tm:dreameater", "tm:endure", "tm:energyball", @@ -101,16 +99,10 @@ "tm:guardswap", "tm:gyroball", "tm:healbell", - "tm:healingwish", "tm:helpinghand", - "tm:hypnosis", "tm:imprison", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", - "tm:moonblast", - "tm:moonlight", - "tm:nightmare", "tm:painsplit", "tm:powerswap", "tm:protect", @@ -118,7 +110,6 @@ "tm:psychic", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:reflect", "tm:rest", @@ -131,11 +122,9 @@ "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:sonicboom", "tm:storedpower", "tm:substitute", "tm:swift", - "tm:synchronoise", "tm:telekinesis", "tm:terablast", "tm:thunderwave", @@ -144,8 +133,33 @@ "tm:trickroom", "tm:wonderroom", "tm:worryseed", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json index 39c5480dc5..f3cda7fe05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json @@ -85,12 +85,10 @@ "tm:afteryou", "tm:allyswitch", "tm:amnesia", - "tm:barrier", "tm:calmmind", "tm:chargebeam", "tm:curse", "tm:dazzlinggleam", - "tm:defensecurl", "tm:dreameater", "tm:endure", "tm:energyball", @@ -103,18 +101,12 @@ "tm:guardswap", "tm:gyroball", "tm:healbell", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", "tm:mistyexplosion", - "tm:moonblast", - "tm:moonlight", - "tm:nightmare", "tm:painsplit", "tm:powerswap", "tm:protect", @@ -123,7 +115,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:reflect", "tm:rest", @@ -136,11 +127,9 @@ "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:sonicboom", "tm:storedpower", "tm:substitute", "tm:swift", - "tm:synchronoise", "tm:telekinesis", "tm:terablast", "tm:thunderwave", @@ -149,8 +138,36 @@ "tm:trickroom", "tm:wonderroom", "tm:worryseed", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magiccoat", + "tutor:mistyexplosion", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "munna", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json index 5ae45463c2..875c78cf09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/oshawott.json @@ -106,18 +106,14 @@ "egg:trumpcard", "tm:aerialace", "tm:airslash", - "tm:aquacutter", - "tm:aquajet", "tm:aquatail", "tm:assurance", "tm:avalanche", "tm:blizzard", "tm:brine", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:cut", - "tm:detect", "tm:dig", "tm:dive", "tm:encore", @@ -137,7 +133,6 @@ "tm:irontail", "tm:knockoff", "tm:liquidation", - "tm:nightslash", "tm:protect", "tm:raindance", "tm:razorshell", @@ -145,30 +140,44 @@ "tm:retaliate", "tm:revenge", "tm:rocksmash", - "tm:sacredsword", "tm:screech", "tm:sleeptalk", "tm:snowscape", - "tm:soak", "tm:substitute", "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:trumpcard", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:covet", + "tutor:dive", + "tutor:falseswipe", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json b/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json index 1b65158aac..cef3563594 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json @@ -95,37 +95,27 @@ "egg:snore", "egg:toxic", "egg:waterpulse", - "tm:acid", "tm:afteryou", - "tm:aquaring", "tm:bounce", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", "tm:earthpower", "tm:echoedvoice", "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:focuspunch", "tm:gastroacid", - "tm:growl", "tm:hail", "tm:hydropump", "tm:hypervoice", "tm:icywind", "tm:infestation", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:powerwhip", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rocksmash", "tm:round", @@ -137,14 +127,31 @@ "tm:snore", "tm:stealthrock", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:terablast", "tm:toxic", "tm:uproar", "tm:venomdrench", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:afteryou", + "tutor:bounce", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:hypervoice", + "tutor:icywind", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snore", + "tutor:stealthrock", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "tympole", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json b/common/src/main/resources/data/cobblemon/species/generation5/panpour.json index ef7f12bd68..86280e81a1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/panpour.json @@ -92,10 +92,7 @@ "egg:roleplay", "egg:tickle", "tm:acrobatics", - "tm:aquaring", "tm:aquatail", - "tm:astonish", - "tm:bite", "tm:blizzard", "tm:brine", "tm:covet", @@ -110,7 +107,6 @@ "tm:fling", "tm:flipturn", "tm:focuspunch", - "tm:furyswipes", "tm:gastroacid", "tm:grassknot", "tm:gunkshot", @@ -123,15 +119,11 @@ "tm:icywind", "tm:irontail", "tm:knockoff", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:lowsweep", - "tm:mudsport", "tm:nastyplot", "tm:naturalgift", "tm:payback", - "tm:playnice", "tm:protect", "tm:raindance", "tm:recycle", @@ -140,7 +132,6 @@ "tm:rocktomb", "tm:roleplay", "tm:scald", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:substitute", @@ -149,15 +140,37 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:tickle", "tm:torment", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", - "tm:workup" + "tm:workup", + "tutor:aquatail", + "tutor:covet", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:recycle", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:swift", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json b/common/src/main/resources/data/cobblemon/species/generation5/pansage.json index c6815fec46..d16076c6e6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pansage.json @@ -93,8 +93,6 @@ "egg:spikyshield", "egg:tickle", "tm:acrobatics", - "tm:astonish", - "tm:bite", "tm:bulletseed", "tm:covet", "tm:crunch", @@ -108,12 +106,10 @@ "tm:flash", "tm:fling", "tm:focuspunch", - "tm:furyswipes", "tm:gastroacid", "tm:gigadrain", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:gunkshot", "tm:helpinghand", @@ -121,9 +117,6 @@ "tm:irontail", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", @@ -131,19 +124,16 @@ "tm:naturalgift", "tm:naturepower", "tm:payback", - "tm:playnice", "tm:protect", "tm:recycle", "tm:rest", "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:scratch", "tm:seedbomb", "tm:shadowclaw", "tm:sleeptalk", "tm:solarbeam", - "tm:spikyshield", "tm:substitute", "tm:sunnyday", "tm:swift", @@ -151,12 +141,35 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:tickle", "tm:torment", "tm:uproar", - "tm:vinewhip", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:covet", + "tutor:endeavor", + "tutor:energyball", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:recycle", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:uproar", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json b/common/src/main/resources/data/cobblemon/species/generation5/pansear.json index a41798d6fa..020ae17e6a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pansear.json @@ -95,9 +95,6 @@ "egg:tickle", "tm:acrobatics", "tm:amnesia", - "tm:astonish", - "tm:belch", - "tm:bite", "tm:burningjealousy", "tm:covet", "tm:crunch", @@ -111,13 +108,11 @@ "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", "tm:fling", "tm:focuspunch", - "tm:furyswipes", "tm:gastroacid", "tm:grassknot", "tm:gunkshot", @@ -127,22 +122,18 @@ "tm:incinerate", "tm:irontail", "tm:knockoff", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:lowsweep", "tm:nastyplot", "tm:naturalgift", "tm:overheat", "tm:payback", - "tm:playnice", "tm:protect", "tm:recycle", "tm:rest", "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:solarbeam", @@ -152,12 +143,32 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:tickle", "tm:torment", "tm:uproar", "tm:willowisp", "tm:workup", - "tm:yawn" + "tutor:burningjealousy", + "tutor:covet", + "tutor:endeavor", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:recycle", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:swift", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json index f5c8c3764b..0970e2e7ab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/patrat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/patrat.json @@ -95,56 +95,61 @@ "tm:aquatail", "tm:assurance", "tm:batonpass", - "tm:bide", - "tm:bite", "tm:bulletseed", "tm:covet", "tm:crunch", "tm:cut", - "tm:detect", "tm:dig", "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:fling", "tm:focusenergy", - "tm:foresight", "tm:grassknot", "tm:gunkshot", "tm:helpinghand", - "tm:hyperfang", - "tm:hypnosis", "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:leer", "tm:lowkick", - "tm:meanlook", "tm:nastyplot", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", "tm:revenge", - "tm:sandattack", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", "tm:superfang", "tm:swordsdance", - "tm:tackle", - "tm:tearfullook", "tm:terablast", "tm:thunderbolt", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:aquatail", + "tutor:covet", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:thunderbolt", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json b/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json index 2345e09a47..ff914c4603 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json @@ -96,34 +96,27 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", "tm:flashcannon", "tm:fling", "tm:foulplay", "tm:furycutter", "tm:grassknot", - "tm:guillotine", "tm:headbutt", "tm:honeclaws", "tm:irondefense", "tm:ironhead", "tm:laserfocus", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:magnetrise", - "tm:meanlook", "tm:metalclaw", "tm:metalsound", - "tm:nightslash", "tm:payback", "tm:poisonjab", "tm:poweruppunch", "tm:protect", "tm:psychocut", - "tm:pursuit", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -134,10 +127,8 @@ "tm:roleplay", "tm:sandstorm", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -154,7 +145,35 @@ "tm:thief", "tm:thunderwave", "tm:torment", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:darkpulse", + "tutor:dualchop", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:furycutter", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:psychocut", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/petilil.json b/common/src/main/resources/data/cobblemon/species/generation5/petilil.json index af461dabf0..99fd0871f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/petilil.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/petilil.json @@ -107,11 +107,8 @@ "egg:naturalgift", "egg:sweetscent", "egg:worryseed", - "tm:absorb", "tm:afteryou", - "tm:aromatherapy", "tm:babydolleyes", - "tm:bide", "tm:bulletseed", "tm:charm", "tm:covet", @@ -120,23 +117,16 @@ "tm:encore", "tm:endure", "tm:energyball", - "tm:entrainment", "tm:facade", "tm:flash", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", - "tm:growth", "tm:healbell", - "tm:healingwish", "tm:helpinghand", - "tm:ingrain", "tm:laserfocus", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", - "tm:megadrain", "tm:naturalgift", "tm:naturepower", "tm:pollenpuff", @@ -144,17 +134,29 @@ "tm:rest", "tm:safeguard", "tm:seedbomb", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:synthesis", "tm:terablast", "tm:trailblaze", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:covet", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:healbell", + "tutor:helpinghand", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pidove.json b/common/src/main/resources/data/cobblemon/species/generation5/pidove.json index b60a36db56..95b5fbd687 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pidove.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pidove.json @@ -98,9 +98,7 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:bestow", "tm:defog", - "tm:detect", "tm:dualwingbeat", "tm:echoedvoice", "tm:endure", @@ -108,19 +106,10 @@ "tm:featherdance", "tm:fly", "tm:focusenergy", - "tm:growl", - "tm:gust", "tm:heatwave", - "tm:hypnosis", - "tm:leer", - "tm:luckychant", - "tm:morningsun", - "tm:nightslash", "tm:pluck", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roost", "tm:skyattack", @@ -135,8 +124,20 @@ "tm:terablast", "tm:uproar", "tm:uturn", - "tm:wish", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:focusenergy", + "tutor:heatwave", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pignite.json b/common/src/main/resources/data/cobblemon/species/generation5/pignite.json index 8e99464cd4..6bfb866273 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pignite.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pignite.json @@ -99,23 +99,19 @@ "egg:superpower", "egg:thrash", "egg:yawn", - "tm:armthrust", "tm:assurance", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:burnup", "tm:closecombat", "tm:coaching", "tm:covet", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:drainpunch", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", @@ -131,7 +127,6 @@ "tm:focuspunch", "tm:grassknot", "tm:gyroball", - "tm:headsmash", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", @@ -142,9 +137,7 @@ "tm:knockoff", "tm:lowkick", "tm:lowsweep", - "tm:magnitude", "tm:mudslap", - "tm:odorsleuth", "tm:overheat", "tm:poisonjab", "tm:poweruppunch", @@ -158,7 +151,6 @@ "tm:rollout", "tm:scaryface", "tm:sleeptalk", - "tm:smog", "tm:solarbeam", "tm:stompingtantrum", "tm:stoneedge", @@ -167,20 +159,46 @@ "tm:suckerpunch", "tm:sunnyday", "tm:superpower", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:thunderpunch", "tm:trailblaze", "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:covet", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "tepig", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json b/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json index 4e73bec2fa..bb5c168508 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json @@ -85,12 +85,10 @@ "egg:slash", "egg:yawn", "tm:aerialace", - "tm:assist", "tm:assurance", "tm:batonpass", "tm:captivate", "tm:charm", - "tm:copycat", "tm:covet", "tm:cut", "tm:darkpulse", @@ -101,13 +99,9 @@ "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:foulplay", - "tm:furyswipes", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:honeclaws", "tm:hypervoice", @@ -115,24 +109,18 @@ "tm:knockoff", "tm:lashout", "tm:nastyplot", - "tm:nightslash", "tm:payback", "tm:payday", "tm:playrough", "tm:protect", "tm:psychup", - "tm:pursuit", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:roleplay", - "tm:sandattack", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -148,7 +136,28 @@ "tm:torment", "tm:trick", "tm:uturn", - "tm:yawn" + "tutor:aerialace", + "tutor:covet", + "tutor:darkpulse", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:playrough", + "tutor:rest", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json b/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json index f6bebdfe5d..289432d27e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json @@ -67,7 +67,6 @@ "80:outrage", "88:blueflare", "tm:ancientpower", - "tm:blueflare", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", @@ -77,18 +76,15 @@ "tm:defog", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:dualwingbeat", "tm:earthpower", "tm:echoedvoice", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firefang", @@ -99,7 +95,6 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:fusionflare", "tm:gigaimpact", "tm:heatcrash", "tm:heatwave", @@ -112,7 +107,6 @@ "tm:laserfocus", "tm:lightscreen", "tm:mysticalfire", - "tm:nobleroar", "tm:outrage", "tm:overheat", "tm:payback", @@ -132,7 +126,6 @@ "tm:scorchingsands", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:steelwing", @@ -146,7 +139,37 @@ "tm:terablast", "tm:weatherball", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:laserfocus", + "tutor:mysticalfire", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json index 0fcbbd2125..7be8f91fcc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json @@ -86,16 +86,12 @@ "egg:confuseray", "egg:healblock", "egg:secretpower", - "tm:acidarmor", "tm:afteryou", "tm:allyswitch", - "tm:astonish", "tm:bodyslam", "tm:calmmind", "tm:charm", "tm:confuseray", - "tm:confusion", - "tm:dizzypunch", "tm:drainpunch", "tm:dreameater", "tm:embargo", @@ -118,8 +114,6 @@ "tm:gravity", "tm:guardswap", "tm:gyroball", - "tm:hammerarm", - "tm:healblock", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", @@ -142,9 +136,7 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:rockslide", @@ -175,7 +167,48 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:steelroller", + "tutor:superpower", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "duosion", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json b/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json index 881aa017b8..f2a9a841ec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/roggenrola.json @@ -107,7 +107,6 @@ "egg:magnitude", "egg:takedown", "egg:wideguard", - "tm:autotomize", "tm:block", "tm:bodypress", "tm:bulldoze", @@ -119,12 +118,9 @@ "tm:facade", "tm:flashcannon", "tm:gravity", - "tm:harden", "tm:headbutt", "tm:heavyslam", "tm:irondefense", - "tm:lockon", - "tm:magnitude", "tm:meteorbeam", "tm:mudslap", "tm:naturepower", @@ -135,7 +131,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:sleeptalk", @@ -144,10 +139,22 @@ "tm:stoneedge", "tm:strength", "tm:substitute", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:wideguard" + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:gravity", + "tutor:irondefense", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json b/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json index a027b47154..105041acda 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json @@ -101,7 +101,6 @@ "tm:bravebird", "tm:bulkup", "tm:closecombat", - "tm:crushclaw", "tm:cut", "tm:defog", "tm:doubleedge", @@ -110,14 +109,11 @@ "tm:facade", "tm:featherdance", "tm:fly", - "tm:furyattack", "tm:heatwave", "tm:helpinghand", "tm:honeclaws", "tm:hurricane", - "tm:leer", "tm:ominouswind", - "tm:peck", "tm:pluck", "tm:protect", "tm:raindance", @@ -130,7 +126,6 @@ "tm:scaryface", "tm:shadowclaw", "tm:skydrop", - "tm:slash", "tm:sleeptalk", "tm:steelwing", "tm:strength", @@ -141,12 +136,27 @@ "tm:tailwind", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:uturn", - "tm:whirlwind", - "tm:wingattack", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bulkup", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:ominouswind", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:swift", + "tutor:tailwind", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json index 201f485d38..301670b9ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/samurott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/samurott.json @@ -105,8 +105,6 @@ "egg:trumpcard", "tm:aerialace", "tm:airslash", - "tm:aquacutter", - "tm:aquajet", "tm:aquatail", "tm:assurance", "tm:avalanche", @@ -117,10 +115,8 @@ "tm:brine", "tm:bulldoze", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:cut", - "tm:detect", "tm:dig", "tm:dive", "tm:drillrun", @@ -145,7 +141,6 @@ "tm:knockoff", "tm:liquidation", "tm:megahorn", - "tm:nightslash", "tm:protect", "tm:raindance", "tm:razorshell", @@ -153,37 +148,59 @@ "tm:retaliate", "tm:revenge", "tm:rocksmash", - "tm:sacredsword", "tm:scaryface", "tm:screech", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:snowscape", - "tm:soak", "tm:strength", "tm:substitute", "tm:superpower", "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:trumpcard", "tm:upperhand", "tm:vacuumwave", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:covet", + "tutor:dive", + "tutor:drillrun", + "tutor:falseswipe", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:megahorn", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:swift", + "tutor:vacuumwave", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "dewott", "evolutions": [], @@ -271,19 +288,14 @@ "egg:trumpcard", "tm:aerialace", "tm:airslash", - "tm:aquacutter", - "tm:aquajet", "tm:aquatail", "tm:avalanche", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:ceaselessedge", "tm:chillingwater", - "tm:copycat", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:drillrun", "tm:encore", @@ -307,7 +319,6 @@ "tm:lashout", "tm:liquidation", "tm:megahorn", - "tm:nightslash", "tm:protect", "tm:psychocut", "tm:raindance", @@ -315,37 +326,61 @@ "tm:rest", "tm:retaliate", "tm:rocksmash", - "tm:sacredsword", "tm:scaryface", "tm:screech", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:snarl", "tm:snowscape", - "tm:soak", "tm:substitute", "tm:suckerpunch", "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:throatchop", - "tm:trumpcard", "tm:upperhand", "tm:vacuumwave", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:drillrun", + "tutor:falseswipe", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:liquidation", + "tutor:megahorn", + "tutor:psychocut", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:vacuumwave", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "dewott", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sandile.json b/common/src/main/resources/data/cobblemon/species/generation5/sandile.json index 726446ea29..0944553448 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sandile.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sandile.json @@ -100,11 +100,9 @@ "tm:aquatail", "tm:assurance", "tm:beatup", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:counter", "tm:crunch", "tm:curse", "tm:cut", @@ -126,23 +124,16 @@ "tm:incinerate", "tm:irontail", "tm:lashout", - "tm:leer", - "tm:meanlook", - "tm:mefirst", "tm:mudshot", "tm:mudslap", "tm:payback", - "tm:powertrip", "tm:protect", - "tm:pursuit", - "tm:rage", "tm:rest", "tm:retaliate", "tm:roar", "tm:rockclimb", "tm:rockslide", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", @@ -163,9 +154,33 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderfang", - "tm:torment" + "tm:torment", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:focusenergy", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:irontail", + "tutor:lashout", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderfang" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json index 9f160d97e6..155a8bce10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json @@ -80,16 +80,13 @@ "45:endure", "50:reversal", "55:closecombat", - "tm:bide", "tm:block", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:dig", - "tm:doublekick", "tm:dualchop", "tm:earthquake", "tm:endure", @@ -103,10 +100,8 @@ "tm:grassknot", "tm:helpinghand", "tm:icepunch", - "tm:karatechop", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -116,7 +111,6 @@ "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -137,7 +131,32 @@ "tm:throatchop", "tm:thunderpunch", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:dualchop", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json index 18b4861571..6cff943bc4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawsbuck.json @@ -97,49 +97,39 @@ "egg:synthesis", "egg:worryseed", "tm:agility", - "tm:aromatherapy", "tm:batonpass", "tm:bodyslam", "tm:bounce", "tm:bulldoze", "tm:bulletseed", - "tm:camouflage", "tm:charm", "tm:curse", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:echoedvoice", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:flash", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:highhorsepower", - "tm:hornleech", "tm:hyperbeam", - "tm:jumpkick", "tm:lastresort", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", "tm:megahorn", "tm:naturalgift", "tm:naturepower", - "tm:odorsleuth", "tm:petalblizzard", "tm:playrough", "tm:protect", @@ -148,7 +138,6 @@ "tm:retaliate", "tm:rocksmash", "tm:safeguard", - "tm:sandattack", "tm:seedbomb", "tm:shadowball", "tm:sleeptalk", @@ -159,7 +148,6 @@ "tm:sunnyday", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:throatchop", @@ -168,7 +156,32 @@ "tm:wildcharge", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:megahorn", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:synthesis", + "tutor:throatchop", + "tutor:wildcharge", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "deerling", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json index 34ffcec5ce..2bdd8cdb30 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scolipede.json @@ -100,12 +100,10 @@ "tm:aquatail", "tm:assurance", "tm:batonpass", - "tm:bite", "tm:bugbite", "tm:bulldoze", "tm:crosspoison", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthquake", @@ -124,10 +122,8 @@ "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", - "tm:pursuit", "tm:rest", "tm:rockclimb", "tm:rockslide", @@ -143,7 +139,6 @@ "tm:snatch", "tm:solarbeam", "tm:spikes", - "tm:steamroller", "tm:steelroller", "tm:stompingtantrum", "tm:strength", @@ -157,10 +152,35 @@ "tm:throatchop", "tm:toxic", "tm:toxicspikes", - "tm:twineedle", "tm:venomdrench", "tm:venoshock", - "tm:xscissor" + "tm:xscissor", + "tutor:aquatail", + "tutor:bugbite", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:irontail", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:throatchop", + "tutor:xscissor" ], "preEvolution": "whirlipede", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json index 8767893bbe..7c1d3a1a92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json @@ -94,14 +94,11 @@ "tm:bodyslam", "tm:brickbreak", "tm:bulkup", - "tm:chipaway", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:crunch", "tm:curse", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:dragonclaw", @@ -114,9 +111,7 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:firepunch", "tm:fling", "tm:focusblast", @@ -125,9 +120,7 @@ "tm:gigaimpact", "tm:grassknot", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", - "tm:highjumpkick", "tm:hyperbeam", "tm:icepunch", "tm:incinerate", @@ -136,7 +129,6 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -147,7 +139,6 @@ "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -158,7 +149,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:scaryface", "tm:sleeptalk", "tm:sludgebomb", @@ -184,7 +174,43 @@ "tm:upperhand", "tm:uproar", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:coaching", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:stoneedge", + "tutor:superfang", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "scraggy", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json b/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json index b2b6d5feea..71c85807d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json @@ -92,14 +92,11 @@ "tm:beatup", "tm:brickbreak", "tm:bulkup", - "tm:chipaway", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:crunch", "tm:curse", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:dragonclaw", @@ -112,9 +109,7 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:firepunch", "tm:fling", "tm:focusblast", @@ -122,9 +117,7 @@ "tm:foulplay", "tm:grassknot", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", - "tm:highjumpkick", "tm:icepunch", "tm:incinerate", "tm:irondefense", @@ -132,7 +125,6 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -141,7 +133,6 @@ "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -151,7 +142,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:scaryface", "tm:sleeptalk", "tm:sludgebomb", @@ -175,7 +165,39 @@ "tm:upperhand", "tm:uproar", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:coaching", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:stoneedge", + "tutor:superfang", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json b/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json index 75a579da87..23c22c13f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json @@ -97,13 +97,9 @@ "egg:snore", "egg:toxic", "egg:waterpulse", - "tm:acid", "tm:afteryou", - "tm:aquaring", "tm:bounce", "tm:brickbreak", - "tm:bubble", - "tm:bubblebeam", "tm:bulldoze", "tm:dig", "tm:dive", @@ -114,14 +110,12 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:gastroacid", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:hail", "tm:hydropump", "tm:hyperbeam", @@ -134,19 +128,15 @@ "tm:lowkick", "tm:megakick", "tm:megapunch", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:payback", "tm:poisonjab", "tm:poweruppunch", "tm:powerwhip", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:rockslide", "tm:rocksmash", @@ -162,7 +152,6 @@ "tm:stompingtantrum", "tm:strength", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:terablast", "tm:toxic", @@ -170,7 +159,36 @@ "tm:venomdrench", "tm:venoshock", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:afteryou", + "tutor:bounce", + "tutor:bulldoze", + "tutor:dive", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snore", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "palpitoad", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/serperior.json b/common/src/main/resources/data/cobblemon/species/generation5/serperior.json index 0d8aeb0fda..141b1b516f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/serperior.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/serperior.json @@ -99,7 +99,6 @@ "tm:bulletseed", "tm:calmmind", "tm:captivate", - "tm:coil", "tm:cut", "tm:defog", "tm:doubleedge", @@ -113,32 +112,23 @@ "tm:gastroacid", "tm:gigadrain", "tm:gigaimpact", - "tm:glare", "tm:grassknot", "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:hyperbeam", "tm:irontail", "tm:knockoff", "tm:leafblade", "tm:leafstorm", - "tm:leaftornado", - "tm:leechseed", - "tm:leer", "tm:lightscreen", "tm:magicalleaf", - "tm:meanlook", - "tm:megadrain", - "tm:mirrorcoat", "tm:naturalgift", "tm:naturepower", "tm:outrage", "tm:petalblizzard", "tm:protect", - "tm:pursuit", "tm:reflect", "tm:rest", "tm:rocksmash", @@ -146,29 +136,52 @@ "tm:scaleshot", "tm:scaryface", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:torment", "tm:trailblaze", "tm:twister", - "tm:vinewhip", "tm:workup", "tm:worryseed", - "tm:wrap", - "tm:wringout" + "tutor:aerialace", + "tutor:aquatail", + "tutor:bind", + "tutor:calmmind", + "tutor:defog", + "tutor:dragonpulse", + "tutor:energyball", + "tutor:frenzyplant", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:outrage", + "tutor:rest", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:synthesis", + "tutor:twister", + "tutor:worryseed" ], "preEvolution": "servine", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/servine.json b/common/src/main/resources/data/cobblemon/species/generation5/servine.json index 0223dbaefa..b272c7e490 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/servine.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/servine.json @@ -94,7 +94,6 @@ "tm:bulletseed", "tm:calmmind", "tm:captivate", - "tm:coil", "tm:cut", "tm:defog", "tm:doubleedge", @@ -104,56 +103,63 @@ "tm:flash", "tm:gastroacid", "tm:gigadrain", - "tm:glare", "tm:grassknot", "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:irontail", "tm:knockoff", "tm:leafblade", "tm:leafstorm", - "tm:leaftornado", - "tm:leechseed", - "tm:leer", "tm:lightscreen", "tm:magicalleaf", - "tm:meanlook", - "tm:megadrain", - "tm:mirrorcoat", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", "tm:protect", - "tm:pursuit", "tm:reflect", "tm:rest", "tm:safeguard", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:torment", "tm:trailblaze", "tm:twister", - "tm:vinewhip", "tm:workup", "tm:worryseed", - "tm:wrap", - "tm:wringout" + "tutor:aerialace", + "tutor:aquatail", + "tutor:bind", + "tutor:calmmind", + "tutor:defog", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:synthesis", + "tutor:twister", + "tutor:worryseed" ], "preEvolution": "snivy", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json b/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json index 45b9aa02c4..2c40848c1b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json @@ -91,7 +91,6 @@ "tm:batonpass", "tm:bugbite", "tm:bugbuzz", - "tm:camouflage", "tm:charm", "tm:cut", "tm:dreameater", @@ -99,7 +98,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:gigadrain", "tm:grassknot", @@ -109,15 +107,11 @@ "tm:lunge", "tm:magicalleaf", "tm:magiccoat", - "tm:mefirst", - "tm:mindreader", "tm:naturepower", "tm:payback", "tm:pounce", "tm:protect", "tm:raindance", - "tm:razorleaf", - "tm:razorwind", "tm:rest", "tm:safeguard", "tm:screech", @@ -128,18 +122,32 @@ "tm:sleeptalk", "tm:snore", "tm:solarbeam", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:switcheroo", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:trailblaze", - "tm:worryseed" + "tm:worryseed", + "tutor:bugbite", + "tutor:electroweb", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:irondefense", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:rest", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stringshot", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json index 5cb624bf78..82ef45b2be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json @@ -78,11 +78,7 @@ "egg:guardsplit", "egg:mindreader", "egg:pursuit", - "tm:absorb", - "tm:acid", - "tm:acidarmor", "tm:batonpass", - "tm:bide", "tm:bodyslam", "tm:bugbite", "tm:bugbuzz", @@ -92,22 +88,15 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:feint", - "tm:finalgambit", "tm:gastroacid", "tm:gigadrain", - "tm:guardsplit", "tm:guardswap", "tm:infestation", "tm:leechlife", - "tm:megadrain", - "tm:mindreader", "tm:mudshot", "tm:mudslap", "tm:protect", - "tm:pursuit", "tm:raindance", - "tm:recover", "tm:rest", "tm:signalbeam", "tm:skittersmack", @@ -119,7 +108,18 @@ "tm:terablast", "tm:toxicspikes", "tm:venoshock", - "tm:yawn" + "tutor:bugbite", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:leechlife", + "tutor:mudslap", + "tutor:rest", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json b/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json index 1e6309f667..58a0d9e9b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sigilyph.json @@ -106,7 +106,6 @@ "tm:ancientpower", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:darkpulse", "tm:dazzlinggleam", @@ -123,28 +122,22 @@ "tm:futuresight", "tm:gigaimpact", "tm:gravity", - "tm:gust", "tm:heatwave", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icywind", "tm:imprison", "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:miracleeye", - "tm:mirrormove", "tm:pluck", "tm:powerswap", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:reflect", "tm:rest", @@ -163,7 +156,6 @@ "tm:storedpower", "tm:substitute", "tm:swift", - "tm:synchronoise", "tm:tailwind", "tm:telekinesis", "tm:terablast", @@ -171,8 +163,42 @@ "tm:thunderwave", "tm:trick", "tm:trickroom", - "tm:whirlwind", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aircutter", + "tutor:ancientpower", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json index 3e3c441857..be5a448c61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json @@ -86,10 +86,7 @@ "egg:roleplay", "egg:tickle", "tm:acrobatics", - "tm:aquaring", "tm:aquatail", - "tm:astonish", - "tm:bite", "tm:blizzard", "tm:brickbreak", "tm:brine", @@ -106,7 +103,6 @@ "tm:flipturn", "tm:focusblast", "tm:focuspunch", - "tm:furyswipes", "tm:gastroacid", "tm:gigaimpact", "tm:grassknot", @@ -121,15 +117,11 @@ "tm:icywind", "tm:irontail", "tm:knockoff", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:lowsweep", - "tm:mudsport", "tm:nastyplot", "tm:naturalgift", "tm:payback", - "tm:playnice", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -140,7 +132,6 @@ "tm:rocktomb", "tm:roleplay", "tm:scald", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:substitute", @@ -151,15 +142,42 @@ "tm:terablast", "tm:thief", "tm:throatchop", - "tm:tickle", "tm:torment", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", - "tm:workup" + "tm:workup", + "tutor:aquatail", + "tutor:covet", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "panpour", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json index 8efaaeb7d8..0728112f62 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json @@ -87,8 +87,6 @@ "egg:spikyshield", "egg:tickle", "tm:acrobatics", - "tm:astonish", - "tm:bite", "tm:brickbreak", "tm:bulletseed", "tm:covet", @@ -104,13 +102,11 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:furyswipes", "tm:gastroacid", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grasspledge", - "tm:grasswhistle", "tm:grassyglide", "tm:gunkshot", "tm:helpinghand", @@ -119,9 +115,6 @@ "tm:irontail", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", @@ -129,7 +122,6 @@ "tm:naturalgift", "tm:naturepower", "tm:payback", - "tm:playnice", "tm:poweruppunch", "tm:protect", "tm:recycle", @@ -138,12 +130,10 @@ "tm:rocksmash", "tm:rocktomb", "tm:roleplay", - "tm:scratch", "tm:seedbomb", "tm:shadowclaw", "tm:sleeptalk", "tm:solarbeam", - "tm:spikyshield", "tm:substitute", "tm:sunnyday", "tm:superpower", @@ -153,12 +143,40 @@ "tm:terablast", "tm:thief", "tm:throatchop", - "tm:tickle", "tm:torment", "tm:uproar", - "tm:vinewhip", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:covet", + "tutor:endeavor", + "tutor:energyball", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:throatchop", + "tutor:uproar", + "tutor:worryseed" ], "preEvolution": "pansage", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json index 4905b6a746..a1411b420f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json @@ -88,9 +88,6 @@ "egg:tickle", "tm:acrobatics", "tm:amnesia", - "tm:astonish", - "tm:belch", - "tm:bite", "tm:brickbreak", "tm:burningjealousy", "tm:covet", @@ -105,14 +102,12 @@ "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:furyswipes", "tm:gastroacid", "tm:gigaimpact", "tm:grassknot", @@ -124,15 +119,12 @@ "tm:incinerate", "tm:irontail", "tm:knockoff", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:lowsweep", "tm:nastyplot", "tm:naturalgift", "tm:overheat", "tm:payback", - "tm:playnice", "tm:poweruppunch", "tm:protect", "tm:recycle", @@ -142,7 +134,6 @@ "tm:rocktomb", "tm:roleplay", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:solarbeam", @@ -154,12 +145,38 @@ "tm:terablast", "tm:thief", "tm:throatchop", - "tm:tickle", "tm:torment", "tm:uproar", "tm:willowisp", "tm:workup", - "tm:yawn" + "tutor:burningjealousy", + "tutor:covet", + "tutor:endeavor", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:uproar" ], "preEvolution": "pansear", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/snivy.json b/common/src/main/resources/data/cobblemon/species/generation5/snivy.json index 3c493629b7..4e3f779e25 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/snivy.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/snivy.json @@ -95,7 +95,6 @@ "tm:bulletseed", "tm:calmmind", "tm:captivate", - "tm:coil", "tm:cut", "tm:defog", "tm:doubleedge", @@ -105,56 +104,63 @@ "tm:flash", "tm:gastroacid", "tm:gigadrain", - "tm:glare", "tm:grassknot", "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:irontail", "tm:knockoff", "tm:leafblade", "tm:leafstorm", - "tm:leaftornado", - "tm:leechseed", - "tm:leer", "tm:lightscreen", "tm:magicalleaf", - "tm:meanlook", - "tm:megadrain", - "tm:mirrorcoat", "tm:naturalgift", "tm:naturepower", "tm:petalblizzard", "tm:protect", - "tm:pursuit", "tm:reflect", "tm:rest", "tm:safeguard", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:torment", "tm:trailblaze", "tm:twister", - "tm:vinewhip", "tm:workup", "tm:worryseed", - "tm:wrap", - "tm:wringout" + "tutor:aerialace", + "tutor:aquatail", + "tutor:bind", + "tutor:calmmind", + "tutor:defog", + "tutor:energyball", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:synthesis", + "tutor:twister", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json b/common/src/main/resources/data/cobblemon/species/generation5/solosis.json index 06b5928af5..c023ce19d8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/solosis.json @@ -82,14 +82,11 @@ "egg:confuseray", "egg:healblock", "egg:secretpower", - "tm:acidarmor", "tm:afteryou", "tm:allyswitch", - "tm:astonish", "tm:calmmind", "tm:charm", "tm:confuseray", - "tm:confusion", "tm:dreameater", "tm:embargo", "tm:encore", @@ -105,7 +102,6 @@ "tm:gravity", "tm:guardswap", "tm:gyroball", - "tm:healblock", "tm:helpinghand", "tm:imprison", "tm:infestation", @@ -121,9 +117,7 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:rockslide", @@ -150,7 +144,37 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gravity", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:steelroller", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json index 73724df28b..0f42c13516 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stoutland.json @@ -95,7 +95,6 @@ "tm:aerialace", "tm:afteryou", "tm:babydolleyes", - "tm:bite", "tm:charm", "tm:covet", "tm:crunch", @@ -105,21 +104,16 @@ "tm:firefang", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:icefang", "tm:ironhead", "tm:lastresort", - "tm:leer", - "tm:lick", "tm:mudslap", - "tm:odorsleuth", "tm:payback", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -127,7 +121,6 @@ "tm:roar", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", @@ -138,7 +131,6 @@ "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", @@ -148,7 +140,33 @@ "tm:uproar", "tm:wildcharge", "tm:workup", - "tm:yawn" + "tutor:aerialace", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:covet", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:ironhead", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "herdier", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json index 2fca8dc875..8896809956 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json @@ -105,15 +105,11 @@ "egg:spite", "egg:yawn", "tm:aquatail", - "tm:astonish", - "tm:bide", "tm:bounce", "tm:bulldoze", - "tm:camouflage", "tm:charge", "tm:curse", "tm:dig", - "tm:discharge", "tm:earthpower", "tm:earthquake", "tm:eerieimpulse", @@ -122,24 +118,18 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", "tm:flash", "tm:foulplay", "tm:infestation", "tm:lashout", "tm:magnetrise", - "tm:mefirst", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:painsplit", "tm:payback", "tm:protect", "tm:raindance", - "tm:reflecttype", "tm:rest", "tm:revenge", "tm:rockslide", @@ -150,7 +140,6 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:spark", "tm:spite", "tm:stealthrock", "tm:stompingtantrum", @@ -158,16 +147,36 @@ "tm:substitute", "tm:suckerpunch", "tm:surf", - "tm:tackle", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:uproar", - "tm:watergun", "tm:waterpulse", - "tm:yawn" + "tutor:aquatail", + "tutor:bounce", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:electroweb", + "tutor:endeavor", + "tutor:foulplay", + "tutor:lashout", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [], "forms": [ @@ -225,11 +234,9 @@ "egg:reflecttype", "egg:spite", "egg:yawn", - "tm:astonish", "tm:bind", "tm:bounce", "tm:bulldoze", - "tm:counter", "tm:crunch", "tm:curse", "tm:dig", @@ -237,8 +244,6 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", "tm:flashcannon", "tm:foulplay", "tm:icefang", @@ -253,7 +258,6 @@ "tm:payback", "tm:protect", "tm:raindance", - "tm:reflecttype", "tm:rest", "tm:revenge", "tm:rockslide", @@ -264,7 +268,6 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:snaptrap", "tm:spite", "tm:stealthrock", "tm:steelbeam", @@ -273,13 +276,33 @@ "tm:substitute", "tm:suckerpunch", "tm:surf", - "tm:tackle", "tm:terablast", "tm:terrainpulse", "tm:thunderwave", "tm:uproar", - "tm:watergun", - "tm:yawn" + "tutor:bind", + "tutor:bounce", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:icefang", + "tutor:irondefense", + "tutor:lashout", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:terrainpulse", + "tutor:uproar" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json index 33581d4556..9278731032 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json @@ -93,7 +93,6 @@ "tm:batonpass", "tm:bugbite", "tm:bugbuzz", - "tm:camouflage", "tm:charm", "tm:cut", "tm:dreameater", @@ -101,11 +100,9 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", "tm:irondefense", @@ -113,15 +110,11 @@ "tm:lunge", "tm:magicalleaf", "tm:magiccoat", - "tm:mefirst", - "tm:mindreader", "tm:naturepower", "tm:payback", "tm:pounce", "tm:protect", "tm:raindance", - "tm:razorleaf", - "tm:razorwind", "tm:rest", "tm:safeguard", "tm:screech", @@ -131,18 +124,32 @@ "tm:sleeptalk", "tm:snore", "tm:solarbeam", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:switcheroo", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:trailblaze", - "tm:worryseed" + "tm:worryseed", + "tutor:bugbite", + "tutor:electroweb", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:irondefense", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:rest", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stringshot", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "sewaddle", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json index 8e9f1aa102..97b8ad1a70 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json @@ -118,11 +118,8 @@ "tm:aircutter", "tm:airslash", "tm:alluringvoice", - "tm:aquajet", - "tm:aquaring", "tm:bravebird", "tm:brine", - "tm:bubblebeam", "tm:chillingwater", "tm:defog", "tm:disarmingvoice", @@ -135,7 +132,6 @@ "tm:flipturn", "tm:fly", "tm:gigaimpact", - "tm:gust", "tm:hail", "tm:helpinghand", "tm:hurricane", @@ -145,10 +141,6 @@ "tm:icywind", "tm:knockoff", "tm:liquidation", - "tm:luckychant", - "tm:mefirst", - "tm:mirrormove", - "tm:mudsport", "tm:pluck", "tm:protect", "tm:raindance", @@ -163,12 +155,29 @@ "tm:tailwind", "tm:terablast", "tm:trailblaze", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:weatherball", "tm:whirlpool", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:waterpulse" ], "preEvolution": "ducklett", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json b/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json index 880a3ab5dc..a4808bcb94 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/swoobat.json @@ -107,7 +107,6 @@ "tm:captivate", "tm:chargebeam", "tm:charm", - "tm:confusion", "tm:defog", "tm:dreameater", "tm:dualwingbeat", @@ -119,14 +118,11 @@ "tm:facade", "tm:faketears", "tm:flash", - "tm:flatter", "tm:fly", "tm:futuresight", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:gyroball", - "tm:heartstamp", "tm:heatwave", "tm:helpinghand", "tm:hyperbeam", @@ -136,13 +132,11 @@ "tm:lightscreen", "tm:magiccoat", "tm:nastyplot", - "tm:odorsleuth", "tm:pluck", "tm:protect", "tm:psychic", "tm:psychicfangs", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", @@ -153,7 +147,6 @@ "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:skyattack", "tm:sleeptalk", @@ -162,9 +155,7 @@ "tm:storedpower", "tm:substitute", "tm:superfang", - "tm:supersonic", "tm:swift", - "tm:synchronoise", "tm:tailwind", "tm:taunt", "tm:telekinesis", @@ -177,7 +168,43 @@ "tm:uproar", "tm:uturn", "tm:venomdrench", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:afteryou", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:magiccoat", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "woobat", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tepig.json b/common/src/main/resources/data/cobblemon/species/generation5/tepig.json index 918be082d6..b47e244cf2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tepig.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tepig.json @@ -102,14 +102,11 @@ "egg:yawn", "tm:assurance", "tm:bodyslam", - "tm:burnup", "tm:covet", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", @@ -122,16 +119,13 @@ "tm:flareblitz", "tm:grassknot", "tm:gyroball", - "tm:headsmash", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", "tm:helpinghand", "tm:incinerate", "tm:irontail", - "tm:magnitude", "tm:mudslap", - "tm:odorsleuth", "tm:overheat", "tm:protect", "tm:rest", @@ -140,7 +134,6 @@ "tm:rocktomb", "tm:rollout", "tm:sleeptalk", - "tm:smog", "tm:solarbeam", "tm:stompingtantrum", "tm:strength", @@ -148,19 +141,33 @@ "tm:suckerpunch", "tm:sunnyday", "tm:superpower", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:trailblaze", "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:covet", + "tutor:endeavor", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json b/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json index f1877ff1f6..f67a531d8f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json @@ -83,7 +83,6 @@ "tm:coaching", "tm:cut", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -96,13 +95,10 @@ "tm:hyperbeam", "tm:ironhead", "tm:laserfocus", - "tm:leer", "tm:megahorn", "tm:poisonjab", "tm:protect", "tm:psychup", - "tm:quickattack", - "tm:quickguard", "tm:reflect", "tm:rest", "tm:retaliate", @@ -114,7 +110,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sacredsword", "tm:safeguard", "tm:sandstorm", "tm:scaryface", @@ -135,7 +130,33 @@ "tm:upperhand", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:coaching", + "tutor:earthpower", + "tutor:falseswipe", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/throh.json b/common/src/main/resources/data/cobblemon/species/generation5/throh.json index 9cdc0506c8..8eb0447197 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/throh.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/throh.json @@ -80,14 +80,12 @@ "45:endure", "50:reversal", "55:superpower", - "tm:bide", "tm:bind", "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:circlethrow", "tm:coaching", "tm:dig", "tm:earthquake", @@ -104,10 +102,8 @@ "tm:icepunch", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:matblock", "tm:megakick", "tm:megapunch", "tm:painsplit", @@ -124,11 +120,9 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:seismictoss", "tm:sleeptalk", "tm:stompingtantrum", "tm:stoneedge", - "tm:stormthrow", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -136,10 +130,33 @@ "tm:taunt", "tm:terablast", "tm:thunderpunch", - "tm:vitalthrow", - "tm:wideguard", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bind", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json b/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json index 312c06a74e..1e3c64e96f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json @@ -65,8 +65,6 @@ "tm:acrobatics", "tm:agility", "tm:assurance", - "tm:astonish", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -76,7 +74,6 @@ "tm:crunch", "tm:darkpulse", "tm:defog", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -91,14 +88,11 @@ "tm:foulplay", "tm:gigaimpact", "tm:grassknot", - "tm:hammerarm", - "tm:healblock", "tm:hyperbeam", "tm:incinerate", "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:nastyplot", "tm:payback", "tm:powershift", @@ -129,20 +123,46 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:torment", "tm:uproar", "tm:uturn", "tm:voltswitch", "tm:weatherball", - "tm:wildboltstorm", "tm:wildcharge", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulkup", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:defog", + "tutor:electroweb", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/timburr.json b/common/src/main/resources/data/cobblemon/species/generation5/timburr.json index 29cb13c625..4fd2aebc94 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/timburr.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/timburr.json @@ -98,23 +98,17 @@ "egg:slam", "egg:smellingsalts", "egg:wideguard", - "tm:bide", "tm:block", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", - "tm:chipaway", "tm:closecombat", "tm:coaching", - "tm:cometpunch", - "tm:counter", "tm:curse", "tm:defog", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:endure", "tm:facade", "tm:firepunch", @@ -122,22 +116,16 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:forcepalm", - "tm:foresight", "tm:grassknot", - "tm:hammerarm", "tm:helpinghand", "tm:icepunch", "tm:knockoff", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:megakick", "tm:megapunch", "tm:payback", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -147,13 +135,10 @@ "tm:reversal", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:scaryface", - "tm:slam", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:stoneedge", "tm:strength", "tm:substitute", @@ -164,9 +149,27 @@ "tm:terablast", "tm:thief", "tm:thunderpunch", - "tm:wakeupslap", - "tm:wideguard", - "tm:workup" + "tm:workup", + "tutor:block", + "tutor:bulkup", + "tutor:coaching", + "tutor:defog", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderpunch" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json b/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json index 0c79788a55..7976b1fc83 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tirtouga.json @@ -105,10 +105,7 @@ "egg:slam", "egg:waterpulse", "tm:ancientpower", - "tm:aquajet", "tm:aquatail", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -122,7 +119,6 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:flail", "tm:guardswap", "tm:hydropump", "tm:icebeam", @@ -141,13 +137,10 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", "tm:scald", - "tm:shellsmash", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -157,12 +150,31 @@ "tm:surf", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:wideguard", - "tm:withdraw", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:block", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:knockoff", + "tutor:liquidation", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json b/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json index 970e7dd615..b0b69b50ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json @@ -66,9 +66,6 @@ "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:astonish", - "tm:bite", - "tm:bleakwindstorm", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -79,7 +76,6 @@ "tm:defog", "tm:embargo", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:fling", "tm:fly", @@ -87,8 +83,6 @@ "tm:foulplay", "tm:gigaimpact", "tm:grassknot", - "tm:gust", - "tm:hammerarm", "tm:heatwave", "tm:hurricane", "tm:hyperbeam", @@ -97,7 +91,6 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:metronome", "tm:nastyplot", "tm:payback", @@ -127,11 +120,31 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:torment", "tm:uproar", "tm:uturn", - "tm:weatherball" + "tm:weatherball", + "tutor:aircutter", + "tutor:bulkup", + "tutor:darkpulse", + "tutor:defog", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:superpower", + "tutor:tailwind", + "tutor:uproar" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json index 38386ad4a5..9a59dcefbc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json @@ -102,9 +102,7 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:bestow", "tm:defog", - "tm:detect", "tm:dualwingbeat", "tm:echoedvoice", "tm:endure", @@ -112,19 +110,10 @@ "tm:featherdance", "tm:fly", "tm:focusenergy", - "tm:growl", - "tm:gust", "tm:heatwave", - "tm:hypnosis", - "tm:leer", - "tm:luckychant", - "tm:morningsun", - "tm:nightslash", "tm:pluck", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roost", "tm:skyattack", @@ -139,8 +128,20 @@ "tm:terablast", "tm:uproar", "tm:uturn", - "tm:wish", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:focusenergy", + "tutor:heatwave", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar" ], "preEvolution": "pidove", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json b/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json index c918f8dd3d..b9d1833060 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json @@ -103,13 +103,9 @@ "egg:sandattack", "tm:acidspray", "tm:amnesia", - "tm:autotomize", - "tm:belch", - "tm:clearsmog", "tm:corrosivegas", "tm:curse", "tm:darkpulse", - "tm:doubleslap", "tm:drainpunch", "tm:endure", "tm:explosion", @@ -118,37 +114,44 @@ "tm:gunkshot", "tm:haze", "tm:infestation", - "tm:mudsport", "tm:painsplit", "tm:payback", - "tm:poisongas", - "tm:pound", "tm:protect", "tm:raindance", "tm:recycle", "tm:rest", "tm:rockblast", "tm:rollout", - "tm:sandattack", "tm:seedbomb", "tm:selfdestruct", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", "tm:spikes", "tm:spite", - "tm:stockpile", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:takedown", "tm:terablast", "tm:thief", "tm:toxic", "tm:toxicspikes", "tm:venomdrench", - "tm:venoshock" + "tm:venoshock", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:gigadrain", + "tutor:gunkshot", + "tutor:painsplit", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tympole.json b/common/src/main/resources/data/cobblemon/species/generation5/tympole.json index 9331b03668..bea7c7be7d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tympole.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tympole.json @@ -94,33 +94,23 @@ "egg:snore", "egg:toxic", "egg:waterpulse", - "tm:acid", "tm:afteryou", - "tm:aquaring", "tm:bounce", - "tm:bubble", - "tm:bubblebeam", "tm:earthpower", "tm:echoedvoice", "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", - "tm:growl", "tm:hail", "tm:hydropump", "tm:hypervoice", "tm:icywind", "tm:infestation", - "tm:mist", - "tm:mudbomb", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:round", "tm:scald", @@ -130,14 +120,26 @@ "tm:sludgewave", "tm:snore", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:terablast", "tm:toxic", "tm:uproar", "tm:venomdrench", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:afteryou", + "tutor:bounce", + "tutor:earthpower", + "tutor:endeavor", + "tutor:hypervoice", + "tutor:icywind", + "tutor:mudslap", + "tutor:rest", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snore", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json b/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json index b6f0c7ea93..2abbdb5fb3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json @@ -76,10 +76,12 @@ "tm:knockoff", "tm:magnetrise", "tm:risingvoltage", - "tm:spark", - "tm:tackle", "tm:terablast", - "tm:thunderwave" + "tm:thunderwave", + "tutor:chargebeam", + "tutor:knockoff", + "tutor:magnetrise", + "tutor:risingvoltage" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json index 3b2f5e0605..fe9c0a2ad2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/unfezant.json @@ -102,10 +102,8 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:bestow", "tm:bravebird", "tm:defog", - "tm:detect", "tm:dualwingbeat", "tm:echoedvoice", "tm:endure", @@ -114,22 +112,13 @@ "tm:fly", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", - "tm:gust", "tm:heatwave", "tm:hurricane", "tm:hyperbeam", - "tm:hypnosis", - "tm:leer", - "tm:luckychant", - "tm:morningsun", - "tm:nightslash", "tm:pluck", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roost", "tm:skyattack", @@ -144,8 +133,22 @@ "tm:terablast", "tm:uproar", "tm:uturn", - "tm:wish", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar" ], "preEvolution": "tranquill", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json b/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json index 5d4ceecfd1..1b0c344c28 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json @@ -97,11 +97,8 @@ "egg:mirrorshot", "egg:naturalgift", "egg:powdersnow", - "tm:acidarmor", "tm:allyswitch", - "tm:astonish", "tm:auroraveil", - "tm:autotomize", "tm:avalanche", "tm:blizzard", "tm:endure", @@ -110,11 +107,8 @@ "tm:flashcannon", "tm:frostbreath", "tm:hail", - "tm:harden", "tm:hypervoice", "tm:icebeam", - "tm:iceshard", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:imprison", @@ -122,23 +116,31 @@ "tm:lightscreen", "tm:magiccoat", "tm:magnetrise", - "tm:mirrorcoat", - "tm:mirrorshot", - "tm:mist", "tm:naturalgift", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", "tm:selfdestruct", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:substitute", "tm:taunt", "tm:terablast", "tm:uproar", - "tm:waterpulse" + "tm:waterpulse", + "tutor:allyswitch", + "tutor:flashcannon", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "vanillite", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json b/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json index b1fd5d01e5..244ae45bd5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json @@ -96,11 +96,8 @@ "egg:mirrorshot", "egg:naturalgift", "egg:powdersnow", - "tm:acidarmor", "tm:allyswitch", - "tm:astonish", "tm:auroraveil", - "tm:autotomize", "tm:avalanche", "tm:blizzard", "tm:endure", @@ -109,11 +106,8 @@ "tm:flashcannon", "tm:frostbreath", "tm:hail", - "tm:harden", "tm:hypervoice", "tm:icebeam", - "tm:iceshard", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:imprison", @@ -121,23 +115,31 @@ "tm:lightscreen", "tm:magiccoat", "tm:magnetrise", - "tm:mirrorcoat", - "tm:mirrorshot", - "tm:mist", "tm:naturalgift", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", "tm:selfdestruct", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:substitute", "tm:taunt", "tm:terablast", "tm:uproar", - "tm:waterpulse" + "tm:waterpulse", + "tutor:allyswitch", + "tutor:flashcannon", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json b/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json index 8f0a740a4b..5970310701 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json @@ -100,11 +100,8 @@ "egg:mirrorshot", "egg:naturalgift", "egg:powdersnow", - "tm:acidarmor", "tm:allyswitch", - "tm:astonish", "tm:auroraveil", - "tm:autotomize", "tm:avalanche", "tm:beatup", "tm:blizzard", @@ -112,16 +109,12 @@ "tm:explosion", "tm:facade", "tm:flashcannon", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", "tm:hail", - "tm:harden", "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", - "tm:iceshard", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:imprison", @@ -129,16 +122,11 @@ "tm:lightscreen", "tm:magiccoat", "tm:magnetrise", - "tm:mirrorcoat", - "tm:mirrorshot", - "tm:mist", "tm:naturalgift", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", "tm:selfdestruct", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:substitute", @@ -146,7 +134,22 @@ "tm:terablast", "tm:uproar", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:allyswitch", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:uproar", + "tutor:waterpulse" ], "preEvolution": "vanillish", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/venipede.json b/common/src/main/resources/data/cobblemon/species/generation5/venipede.json index a98631d641..ba12624635 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/venipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/venipede.json @@ -89,9 +89,7 @@ "egg:steamroller", "egg:twineedle", "tm:agility", - "tm:bite", "tm:bugbite", - "tm:defensecurl", "tm:doubleedge", "tm:endeavor", "tm:endure", @@ -104,10 +102,8 @@ "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", - "tm:pursuit", "tm:rest", "tm:rockclimb", "tm:rocksmash", @@ -119,7 +115,6 @@ "tm:sludgebomb", "tm:solarbeam", "tm:spikes", - "tm:steamroller", "tm:steelroller", "tm:strugglebug", "tm:substitute", @@ -128,9 +123,22 @@ "tm:terablast", "tm:toxic", "tm:toxicspikes", - "tm:twineedle", "tm:venomdrench", - "tm:venoshock" + "tm:venoshock", + "tutor:bugbite", + "tutor:endeavor", + "tutor:furycutter", + "tutor:irondefense", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:steelroller" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/victini.json b/common/src/main/resources/data/cobblemon/species/generation5/victini.json index 6f5a5f6848..4baf6519c1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/victini.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/victini.json @@ -73,7 +73,6 @@ "tm:bounce", "tm:brickbreak", "tm:chargebeam", - "tm:confusion", "tm:dazzlinggleam", "tm:doubleedge", "tm:embargo", @@ -82,11 +81,9 @@ "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:finalgambit", "tm:fireblast", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -103,7 +100,6 @@ "tm:helpinghand", "tm:hyperbeam", "tm:incinerate", - "tm:inferno", "tm:laserfocus", "tm:lastresort", "tm:lightscreen", @@ -118,14 +114,12 @@ "tm:psychic", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:rocksmash", "tm:roleplay", "tm:safeguard", "tm:scorchingsands", - "tm:searingshot", "tm:shadowball", "tm:shockwave", "tm:signalbeam", @@ -148,11 +142,44 @@ "tm:trickroom", "tm:uproar", "tm:uturn", - "tm:vcreate", "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:mysticalfire", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/virizion.json b/common/src/main/resources/data/cobblemon/species/generation5/virizion.json index 9abd88732f..063aefc92d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/virizion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/virizion.json @@ -85,7 +85,6 @@ "tm:coaching", "tm:cut", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:energyball", "tm:facade", @@ -101,15 +100,12 @@ "tm:laserfocus", "tm:leafblade", "tm:leafstorm", - "tm:leer", "tm:lightscreen", "tm:magicalleaf", "tm:megahorn", "tm:naturepower", "tm:protect", "tm:psychup", - "tm:quickattack", - "tm:quickguard", "tm:reflect", "tm:rest", "tm:retaliate", @@ -117,7 +113,6 @@ "tm:reversal", "tm:roar", "tm:rocksmash", - "tm:sacredsword", "tm:safeguard", "tm:scaryface", "tm:seedbomb", @@ -142,7 +137,34 @@ "tm:workup", "tm:worryseed", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:bounce", + "tutor:calmmind", + "tutor:coaching", + "tutor:energyball", + "tutor:falseswipe", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:magicalleaf", + "tutor:megahorn", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:vacuumwave", + "tutor:worryseed", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json b/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json index 7434547f99..e2bce44a1a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/volcarona.json @@ -102,7 +102,6 @@ "egg:harden", "egg:morningsun", "egg:thrash", - "tm:absorb", "tm:acrobatics", "tm:aircutter", "tm:airslash", @@ -114,22 +113,16 @@ "tm:defog", "tm:doubleedge", "tm:dualwingbeat", - "tm:ember", "tm:endure", "tm:facade", - "tm:fierydance", "tm:fireblast", "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:fly", - "tm:foresight", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", - "tm:harden", "tm:heatwave", "tm:hurricane", "tm:hyperbeam", @@ -138,15 +131,12 @@ "tm:lightscreen", "tm:lunge", "tm:magnetrise", - "tm:morningsun", "tm:mysticalfire", "tm:overheat", "tm:poisonjab", "tm:pounce", "tm:protect", "tm:psychic", - "tm:quiverdance", - "tm:ragepowder", "tm:raindance", "tm:rest", "tm:roost", @@ -164,13 +154,35 @@ "tm:tailwind", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:trailblaze", "tm:uturn", - "tm:whirlwind", "tm:wildcharge", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aircutter", + "tutor:bugbite", + "tutor:calmmind", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:flamethrower", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:leechlife", + "tutor:magnetrise", + "tutor:mysticalfire", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:tailwind", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "larvesta", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json b/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json index df06fa20ae..565ddaa80c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json @@ -106,26 +106,18 @@ "tm:facade", "tm:faketears", "tm:featherdance", - "tm:feintattack", - "tm:flatter", "tm:fly", "tm:foulplay", - "tm:furyattack", - "tm:gust", "tm:heatwave", "tm:incinerate", "tm:irondefense", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:meanlook", - "tm:mirrormove", "tm:nastyplot", "tm:payback", "tm:pluck", "tm:protect", "tm:psychup", - "tm:punishment", "tm:raindance", "tm:rest", "tm:retaliate", @@ -152,7 +144,28 @@ "tm:toxic", "tm:uproar", "tm:uturn", - "tm:whirlwind" + "tutor:aircutter", + "tutor:block", + "tutor:darkpulse", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:foulplay", + "tutor:heatwave", + "tutor:irondefense", + "tutor:knockoff", + "tutor:lashout", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json index 8cc66e68d9..d2d933e4d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/watchog.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/watchog.json @@ -97,62 +97,49 @@ "tm:aquatail", "tm:assurance", "tm:batonpass", - "tm:bide", - "tm:bite", "tm:bulletseed", "tm:confuseray", "tm:covet", "tm:crunch", "tm:cut", - "tm:detect", "tm:dig", "tm:dreameater", "tm:endeavor", "tm:endure", "tm:facade", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:flash", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", "tm:helpinghand", "tm:hyperbeam", - "tm:hyperfang", - "tm:hypnosis", "tm:icepunch", "tm:irontail", "tm:knockoff", "tm:laserfocus", "tm:lastresort", - "tm:leer", "tm:lightscreen", "tm:lowkick", - "tm:meanlook", "tm:nastyplot", "tm:poweruppunch", "tm:protect", "tm:psychup", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", "tm:revenge", "tm:rocksmash", - "tm:rototiller", - "tm:sandattack", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:slam", "tm:sleeptalk", "tm:stompingtantrum", "tm:strength", @@ -161,15 +148,44 @@ "tm:superfang", "tm:swift", "tm:swordsdance", - "tm:tackle", - "tm:tearfullook", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:aquatail", + "tutor:covet", + "tutor:endeavor", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "preEvolution": "patrat", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json index 11ec065838..bb6cfcb637 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whimsicott.json @@ -105,12 +105,9 @@ "egg:switcheroo", "egg:tickle", "egg:worryseed", - "tm:absorb", "tm:beatup", "tm:captivate", "tm:charm", - "tm:cottonguard", - "tm:cottonspore", "tm:covet", "tm:dazzlinggleam", "tm:defog", @@ -120,53 +117,60 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:flash", "tm:fling", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:gust", "tm:helpinghand", "tm:hurricane", "tm:hyperbeam", - "tm:leechseed", "tm:lightscreen", - "tm:megadrain", - "tm:memento", "tm:mistyterrain", - "tm:moonblast", "tm:naturalgift", "tm:naturepower", "tm:playrough", - "tm:poisonpowder", "tm:protect", "tm:psychic", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", "tm:shadowball", "tm:sleeptalk", "tm:solarbeam", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:tailwind", "tm:taunt", "tm:terablast", "tm:thief", - "tm:tickle", "tm:trickroom", "tm:uturn", - "tm:worryseed" + "tm:worryseed", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:trick", + "tutor:worryseed" ], "preEvolution": "cottonee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json index 314db55c4c..5f315d6a99 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/whirlipede.json @@ -96,9 +96,7 @@ "egg:steamroller", "egg:twineedle", "tm:agility", - "tm:bite", "tm:bugbite", - "tm:defensecurl", "tm:doubleedge", "tm:endeavor", "tm:endure", @@ -111,10 +109,8 @@ "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", - "tm:pursuit", "tm:rest", "tm:rockclimb", "tm:rocksmash", @@ -126,7 +122,6 @@ "tm:sludgebomb", "tm:solarbeam", "tm:spikes", - "tm:steamroller", "tm:steelroller", "tm:strugglebug", "tm:substitute", @@ -135,9 +130,22 @@ "tm:terablast", "tm:toxic", "tm:toxicspikes", - "tm:twineedle", "tm:venomdrench", - "tm:venoshock" + "tm:venoshock", + "tutor:bugbite", + "tutor:endeavor", + "tutor:furycutter", + "tutor:irondefense", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:rollout", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:steelroller" ], "preEvolution": "venipede", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation5/woobat.json b/common/src/main/resources/data/cobblemon/species/generation5/woobat.json index e9f645dda5..27eaec8210 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/woobat.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/woobat.json @@ -105,7 +105,6 @@ "tm:captivate", "tm:chargebeam", "tm:charm", - "tm:confusion", "tm:defog", "tm:dreameater", "tm:dualwingbeat", @@ -117,13 +116,10 @@ "tm:facade", "tm:faketears", "tm:flash", - "tm:flatter", "tm:fly", "tm:futuresight", "tm:gigadrain", - "tm:gust", "tm:gyroball", - "tm:heartstamp", "tm:heatwave", "tm:helpinghand", "tm:imprison", @@ -131,12 +127,10 @@ "tm:lightscreen", "tm:magiccoat", "tm:nastyplot", - "tm:odorsleuth", "tm:pluck", "tm:protect", "tm:psychic", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", @@ -147,7 +141,6 @@ "tm:shadowball", "tm:shockwave", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:sleeptalk", "tm:speedswap", @@ -155,9 +148,7 @@ "tm:storedpower", "tm:substitute", "tm:superfang", - "tm:supersonic", "tm:swift", - "tm:synchronoise", "tm:tailwind", "tm:taunt", "tm:telekinesis", @@ -170,7 +161,39 @@ "tm:uproar", "tm:uturn", "tm:venomdrench", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:afteryou", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:magiccoat", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json index f57a292c92..8bbd8fd4e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/yamask.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/yamask.json @@ -95,14 +95,10 @@ "egg:nightmare", "tm:afteryou", "tm:allyswitch", - "tm:astonish", "tm:block", "tm:calmmind", - "tm:craftyshield", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:endure", @@ -110,26 +106,19 @@ "tm:facade", "tm:faketears", "tm:flash", - "tm:grudge", - "tm:guardsplit", "tm:haze", - "tm:healblock", "tm:hex", "tm:imprison", "tm:infestation", "tm:irondefense", "tm:knockoff", "tm:magiccoat", - "tm:meanlook", - "tm:memento", "tm:nastyplot", - "tm:nightmare", "tm:nightshade", "tm:ominouswind", "tm:painsplit", "tm:payback", "tm:poltergeist", - "tm:powersplit", "tm:protect", "tm:psychic", "tm:psychup", @@ -152,7 +141,33 @@ "tm:trickroom", "tm:willowisp", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:energyball", + "tutor:irondefense", + "tutor:knockoff", + "tutor:magiccoat", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spikes", + "tutor:spite", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { @@ -230,32 +245,24 @@ "52:destinybond", "egg:memento", "tm:allyswitch", - "tm:astonish", "tm:brutalswing", "tm:calmmind", - "tm:craftyshield", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:energyball", "tm:facade", "tm:faketears", - "tm:guardsplit", "tm:haze", "tm:hex", "tm:imprison", "tm:irondefense", - "tm:meanlook", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:payback", "tm:poltergeist", - "tm:powersplit", "tm:protect", "tm:psychic", "tm:raindance", @@ -266,7 +273,6 @@ "tm:sandstorm", "tm:shadowball", "tm:skillswap", - "tm:slam", "tm:sleeptalk", "tm:substitute", "tm:terablast", @@ -276,7 +282,24 @@ "tm:trickroom", "tm:willowisp", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:irondefense", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json index 3f29f21619..888df506d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json @@ -90,9 +90,7 @@ "tm:bulldoze", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:doubleedge", - "tm:doublekick", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -100,54 +98,67 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:feint", "tm:flamecharge", "tm:flash", "tm:gigaimpact", "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", - "tm:iondeluge", "tm:laserfocus", "tm:lightscreen", "tm:lowkick", "tm:magnetrise", - "tm:mefirst", "tm:overheat", "tm:protect", - "tm:pursuit", - "tm:quickattack", - "tm:rage", "tm:raindance", "tm:rest", "tm:risingvoltage", "tm:roar", "tm:rocksmash", - "tm:sandattack", "tm:screech", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", "tm:smartstrike", "tm:snatch", - "tm:spark", - "tm:stomp", "tm:substitute", "tm:sunnyday", "tm:supercellslam", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", "tm:trailblaze", "tm:uproar", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:allyswitch", + "tutor:bounce", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "blitzle", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json b/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json index 03cb4c3613..76bd79c9c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json @@ -69,7 +69,6 @@ "tm:ancientpower", "tm:bodypress", "tm:bodyslam", - "tm:boltstrike", "tm:breakingswipe", "tm:brickbreak", "tm:brutalswing", @@ -80,12 +79,10 @@ "tm:defog", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", "tm:dualwingbeat", "tm:earthpower", @@ -100,7 +97,6 @@ "tm:fly", "tm:focusblast", "tm:focuspunch", - "tm:fusionbolt", "tm:gigaimpact", "tm:haze", "tm:helpinghand", @@ -111,7 +107,6 @@ "tm:laserfocus", "tm:lightscreen", "tm:magnetrise", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -132,7 +127,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:stealthrock", "tm:steelwing", @@ -153,7 +147,44 @@ "tm:voltswitch", "tm:weatherball", "tm:wildcharge", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:chargebeam", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json index 663f3d2739..6fe17f802c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zoroark.json @@ -102,26 +102,20 @@ "tm:calmmind", "tm:captivate", "tm:confuseray", - "tm:copycat", - "tm:counter", "tm:covet", "tm:crunch", "tm:cut", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:embargo", "tm:encore", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:flamethrower", "tm:fling", "tm:focusblast", "tm:foulplay", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", @@ -134,23 +128,17 @@ "tm:knockoff", "tm:laserfocus", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", "tm:megapunch", - "tm:memento", "tm:nastyplot", - "tm:nightdaze", "tm:nightshade", - "tm:nightslash", "tm:painsplit", "tm:payback", "tm:protect", "tm:psychic", "tm:psychup", - "tm:punishment", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", @@ -158,7 +146,6 @@ "tm:roar", "tm:rocksmash", "tm:scaryface", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:skittersmack", @@ -180,7 +167,39 @@ "tm:torment", "tm:toxic", "tm:trick", - "tm:uturn" + "tm:uturn", + "tutor:aerialace", + "tutor:bounce", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lowkick", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:trick" ], "preEvolution": "zorua", "evolutions": [], @@ -252,20 +271,16 @@ "egg:memento", "tm:aerialace", "tm:agility", - "tm:bittermalice", "tm:bodyslam", "tm:brickbreak", "tm:burningjealousy", "tm:calmmind", - "tm:comeuppance", "tm:confuseray", "tm:crunch", "tm:curse", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:faketears", "tm:flamethrower", @@ -284,10 +299,8 @@ "tm:imprison", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:ominouswind", @@ -302,10 +315,8 @@ "tm:roar", "tm:rocksmash", "tm:scaryface", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", @@ -323,7 +334,38 @@ "tm:torment", "tm:trick", "tm:uturn", - "tm:willowisp" + "tm:willowisp", + "tutor:aerialace", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:ominouswind", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:trick" ], "preEvolution": "zorua hisuian", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json index 638f693fe3..7ce97571eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zorua.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zorua.json @@ -97,23 +97,17 @@ "tm:calmmind", "tm:captivate", "tm:confuseray", - "tm:copycat", - "tm:counter", "tm:covet", "tm:cut", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:embargo", "tm:encore", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:fling", "tm:foulplay", - "tm:furyswipes", "tm:grassknot", "tm:helpinghand", "tm:hex", @@ -123,24 +117,18 @@ "tm:incinerate", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:memento", "tm:nastyplot", - "tm:nightdaze", "tm:nightshade", "tm:painsplit", "tm:payback", "tm:protect", "tm:psychup", - "tm:punishment", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:retaliate", "tm:revenge", "tm:roar", "tm:scaryface", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:skittersmack", @@ -160,7 +148,30 @@ "tm:thief", "tm:torment", "tm:trick", - "tm:uturn" + "tm:uturn", + "tutor:bounce", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:lashout", + "tutor:painsplit", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:trick" ], "evolutions": [ { @@ -237,17 +248,13 @@ "egg:extrasensory", "egg:memento", "tm:agility", - "tm:bittermalice", "tm:burningjealousy", "tm:calmmind", - "tm:comeuppance", "tm:confuseray", "tm:curse", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:faketears", "tm:fling", @@ -261,8 +268,6 @@ "tm:imprison", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:painsplit", @@ -272,10 +277,8 @@ "tm:raindance", "tm:rest", "tm:roar", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", @@ -291,7 +294,28 @@ "tm:torment", "tm:trick", "tm:uturn", - "tm:willowisp" + "tm:willowisp", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:painsplit", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spite", + "tutor:swift", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json index cf55d47418..8878216bf9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zweilous.json @@ -87,20 +87,13 @@ "egg:headsmash", "tm:aquatail", "tm:assurance", - "tm:astonish", "tm:beatup", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:crunch", "tm:darkpulse", - "tm:doublehit", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:earthpower", "tm:endure", @@ -108,7 +101,6 @@ "tm:firefang", "tm:focusenergy", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", "tm:hypervoice", "tm:icefang", @@ -125,7 +117,6 @@ "tm:scaryface", "tm:screech", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:snarl", "tm:spite", @@ -134,7 +125,6 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -143,7 +133,29 @@ "tm:thunderwave", "tm:torment", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icefang", + "tutor:lashout", + "tutor:outrage", + "tutor:rest", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "preEvolution": "deino", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json index e368c7222b..ed39c1de94 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aegislash.json @@ -99,13 +99,11 @@ "tm:aerialace", "tm:afteryou", "tm:airslash", - "tm:autotomize", "tm:block", "tm:brickbreak", "tm:brutalswing", "tm:closecombat", "tm:cut", - "tm:destinybond", "tm:endure", "tm:facade", "tm:falseswipe", @@ -113,19 +111,14 @@ "tm:furycutter", "tm:gigaimpact", "tm:gyroball", - "tm:headsmash", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", - "tm:kingsshield", "tm:laserfocus", "tm:magnetrise", "tm:metalsound", - "tm:nightslash", - "tm:powertrick", "tm:protect", "tm:psychocut", - "tm:pursuit", "tm:raindance", "tm:reflect", "tm:rest", @@ -133,13 +126,10 @@ "tm:reversal", "tm:rockslide", "tm:rocksmash", - "tm:sacredsword", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:solarblade", "tm:spite", @@ -147,9 +137,30 @@ "tm:substitute", "tm:sunnyday", "tm:swordsdance", - "tm:tackle", "tm:terablast", - "tm:wideguard" + "tutor:aerialace", + "tutor:afteryou", + "tutor:block", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:spite", + "tutor:steelbeam", + "tutor:trick" ], "preEvolution": "doublade", "evolutions": [], @@ -207,7 +218,6 @@ "tm:aerialace", "tm:afteryou", "tm:airslash", - "tm:autotomize", "tm:block", "tm:brickbreak", "tm:brutalswing", @@ -221,19 +231,14 @@ "tm:furycutter", "tm:gigaimpact", "tm:gyroball", - "tm:headsmash", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", - "tm:kingsshield", "tm:laserfocus", "tm:magnetrise", "tm:metalsound", - "tm:nightslash", - "tm:powertrick", "tm:protect", "tm:psychocut", - "tm:pursuit", "tm:raindance", "tm:reflect", "tm:rest", @@ -241,13 +246,10 @@ "tm:reversal", "tm:rockslide", "tm:rocksmash", - "tm:sacredsword", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:solarblade", "tm:spite", @@ -255,9 +257,31 @@ "tm:substitute", "tm:sunnyday", "tm:swordsdance", - "tm:tackle", "tm:terablast", - "tm:wideguard" + "tm:wideguard", + "tutor:aerialace", + "tutor:afteryou", + "tutor:block", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:spite", + "tutor:steelbeam", + "tutor:trick" ], "evolutions": [], "battleOnly": true diff --git a/common/src/main/resources/data/cobblemon/species/generation6/amaura.json b/common/src/main/resources/data/cobblemon/species/generation6/amaura.json index ccdec2e40a..9a078fe1d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/amaura.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/amaura.json @@ -96,17 +96,14 @@ "egg:takedown", "tm:ancientpower", "tm:aquatail", - "tm:aurorabeam", "tm:auroraveil", "tm:avalanche", - "tm:barrier", "tm:blizzard", "tm:bodyslam", "tm:bulldoze", "tm:calmmind", "tm:chargebeam", "tm:darkpulse", - "tm:discharge", "tm:dragontail", "tm:dreameater", "tm:earthpower", @@ -116,9 +113,7 @@ "tm:facade", "tm:flash", "tm:flashcannon", - "tm:freezedry", "tm:frostbreath", - "tm:growl", "tm:hail", "tm:haze", "tm:hyperbeam", @@ -131,12 +126,9 @@ "tm:lightscreen", "tm:magnetrise", "tm:meteorbeam", - "tm:mirrorcoat", - "tm:mist", "tm:mudshot", "tm:naturepower", "tm:outrage", - "tm:powdersnow", "tm:protect", "tm:psychup", "tm:raindance", @@ -147,7 +139,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:round", "tm:safeguard", @@ -162,7 +153,34 @@ "tm:thunderwave", "tm:waterpulse", "tm:weatherball", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json index 8fe38c4832..79187cd49f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json @@ -86,8 +86,6 @@ "egg:wish", "tm:afteryou", "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", "tm:attract", "tm:calmmind", "tm:captivate", @@ -95,7 +93,6 @@ "tm:charm", "tm:covet", "tm:dazzlinggleam", - "tm:disable", "tm:disarmingvoice", "tm:drainingkiss", "tm:drainpunch", @@ -106,15 +103,12 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", - "tm:flail", "tm:flash", "tm:flashcannon", "tm:gigaimpact", "tm:gyroball", "tm:healbell", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:lightscreen", @@ -122,30 +116,47 @@ "tm:metronome", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:nastyplot", - "tm:odorsleuth", "tm:protect", "tm:psychic", "tm:psychup", "tm:psyshock", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:skillswap", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", - "tm:sweetscent", "tm:telekinesis", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:torment", "tm:trickroom", - "tm:wish" + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magiccoat", + "tutor:mistyexplosion", + "tutor:psychic", + "tutor:rest", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick" ], "preEvolution": "spritzee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json b/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json index c6cce2210d..b38e15bad0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aurorus.json @@ -96,17 +96,14 @@ "egg:takedown", "tm:ancientpower", "tm:aquatail", - "tm:aurorabeam", "tm:auroraveil", "tm:avalanche", - "tm:barrier", "tm:blizzard", "tm:bodyslam", "tm:bulldoze", "tm:calmmind", "tm:chargebeam", "tm:darkpulse", - "tm:discharge", "tm:dragontail", "tm:dreameater", "tm:earthpower", @@ -117,10 +114,8 @@ "tm:facade", "tm:flash", "tm:flashcannon", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", - "tm:growl", "tm:hail", "tm:haze", "tm:hyperbeam", @@ -134,12 +129,9 @@ "tm:lightscreen", "tm:magnetrise", "tm:meteorbeam", - "tm:mirrorcoat", - "tm:mist", "tm:mudshot", "tm:naturepower", "tm:outrage", - "tm:powdersnow", "tm:protect", "tm:psychic", "tm:psychup", @@ -151,7 +143,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:round", "tm:safeguard", @@ -167,7 +158,36 @@ "tm:thunderwave", "tm:waterpulse", "tm:weatherball", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "amaura", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json index 7ea07d2504..5d16f8cb4d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/avalugg.json @@ -112,8 +112,6 @@ "tm:afteryou", "tm:auroraveil", "tm:avalanche", - "tm:barrier", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodypress", @@ -132,7 +130,6 @@ "tm:gigaimpact", "tm:gyroball", "tm:hail", - "tm:harden", "tm:heavyslam", "tm:highhorsepower", "tm:hydropump", @@ -141,18 +138,12 @@ "tm:icebeam", "tm:icefang", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:irondefense", "tm:ironhead", - "tm:mirrorcoat", - "tm:mist", - "tm:powdersnow", "tm:protect", "tm:raindance", - "tm:rapidspin", - "tm:recover", "tm:rest", "tm:rockpolish", "tm:rockslide", @@ -160,8 +151,6 @@ "tm:rocktomb", "tm:safeguard", "tm:scaryface", - "tm:sharpen", - "tm:skullbash", "tm:sleeptalk", "tm:snowscape", "tm:stompingtantrum", @@ -170,10 +159,28 @@ "tm:substitute", "tm:superpower", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:wideguard" + "tutor:afteryou", + "tutor:block", + "tutor:bulldoze", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower" ], "preEvolution": "bergmite", "evolutions": [], @@ -249,8 +256,6 @@ "egg:sharpen", "tm:auroraveil", "tm:avalanche", - "tm:barrier", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -265,7 +270,6 @@ "tm:facade", "tm:gigaimpact", "tm:gyroball", - "tm:harden", "tm:hardpress", "tm:heavyslam", "tm:highhorsepower", @@ -279,15 +283,9 @@ "tm:irondefense", "tm:ironhead", "tm:meteorbeam", - "tm:mirrorcoat", - "tm:mist", - "tm:mountaingale", - "tm:powdersnow", "tm:powershift", "tm:protect", "tm:raindance", - "tm:rapidspin", - "tm:recover", "tm:rest", "tm:rockblast", "tm:rockslide", @@ -295,17 +293,33 @@ "tm:rocktomb", "tm:sandstorm", "tm:scaryface", - "tm:sharpen", "tm:sleeptalk", "tm:snowscape", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:wideguard" + "tutor:bulldoze", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:powershift", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge" ], "preEvolution": "bergmite", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json b/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json index 4a5a097cb2..cc776bb846 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json @@ -101,8 +101,6 @@ "tm:brutalswing", "tm:bulkup", "tm:bulldoze", - "tm:clamp", - "tm:crosschop", "tm:cut", "tm:dig", "tm:dive", @@ -118,7 +116,6 @@ "tm:fling", "tm:focusblast", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", @@ -136,7 +133,6 @@ "tm:mudshot", "tm:mudslap", "tm:naturepower", - "tm:nightslash", "tm:payback", "tm:poisonjab", "tm:poweruppunch", @@ -150,15 +146,10 @@ "tm:rocksmash", "tm:rocktomb", "tm:safeguard", - "tm:sandattack", "tm:sandstorm", "tm:scald", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:shellsmash", - "tm:skullbash", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -169,20 +160,49 @@ "tm:substitute", "tm:superpower", "tm:surf", - "tm:switcheroo", "tm:swordsdance", "tm:taunt", "tm:terablast", "tm:thief", - "tm:tickle", "tm:torment", "tm:uproar", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:whirlpool", - "tm:withdraw", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dive", + "tutor:dualchop", + "tutor:earthpower", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:superpower", + "tutor:uproar", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "binacle", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json index 00e35dd924..0df526dcd0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json @@ -104,8 +104,6 @@ "tm:afteryou", "tm:auroraveil", "tm:avalanche", - "tm:barrier", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:bulldoze", @@ -119,7 +117,6 @@ "tm:frostbreath", "tm:gyroball", "tm:hail", - "tm:harden", "tm:iceball", "tm:icebeam", "tm:icefang", @@ -127,28 +124,33 @@ "tm:iciclespear", "tm:icywind", "tm:irondefense", - "tm:mirrorcoat", - "tm:mist", - "tm:powdersnow", "tm:protect", "tm:raindance", - "tm:rapidspin", - "tm:recover", "tm:rest", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:safeguard", - "tm:sharpen", "tm:sleeptalk", "tm:snowscape", "tm:stoneedge", "tm:strength", "tm:substitute", - "tm:tackle", "tm:takedown", - "tm:terablast" + "tm:terablast", + "tutor:afteryou", + "tutor:bulldoze", + "tutor:iceball", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stoneedge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/binacle.json b/common/src/main/resources/data/cobblemon/species/generation6/binacle.json index 94ef4e74bb..d64725d1f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/binacle.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/binacle.json @@ -95,8 +95,6 @@ "tm:blizzard", "tm:brickbreak", "tm:bulldoze", - "tm:clamp", - "tm:crosschop", "tm:cut", "tm:dig", "tm:dualchop", @@ -108,7 +106,6 @@ "tm:falseswipe", "tm:fling", "tm:furycutter", - "tm:furyswipes", "tm:grassknot", "tm:helpinghand", "tm:honeclaws", @@ -120,7 +117,6 @@ "tm:mudshot", "tm:mudslap", "tm:naturepower", - "tm:nightslash", "tm:payback", "tm:poisonjab", "tm:poweruppunch", @@ -134,14 +130,10 @@ "tm:rocksmash", "tm:rocktomb", "tm:safeguard", - "tm:sandattack", "tm:sandstorm", "tm:scald", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:shellsmash", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -151,19 +143,39 @@ "tm:strength", "tm:substitute", "tm:surf", - "tm:switcheroo", "tm:swordsdance", "tm:taunt", "tm:terablast", "tm:thief", - "tm:tickle", "tm:torment", "tm:uproar", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:withdraw", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:dualchop", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:liquidation", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:uproar", + "tutor:waterpulse", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/braixen.json b/common/src/main/resources/data/cobblemon/species/generation6/braixen.json index 73f373754c..758285b7bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/braixen.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/braixen.json @@ -96,13 +96,11 @@ "tm:burningjealousy", "tm:calmmind", "tm:charm", - "tm:copycat", "tm:covet", "tm:cut", "tm:dreameater", "tm:echoedvoice", "tm:embargo", - "tm:ember", "tm:encore", "tm:endure", "tm:facade", @@ -117,15 +115,12 @@ "tm:grassknot", "tm:heatwave", "tm:helpinghand", - "tm:howl", - "tm:hypnosis", "tm:imprison", "tm:incinerate", "tm:irontail", "tm:laserfocus", "tm:lightscreen", "tm:lowkick", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", "tm:mudshot", @@ -141,7 +136,6 @@ "tm:recycle", "tm:rest", "tm:safeguard", - "tm:scratch", "tm:shockwave", "tm:skillswap", "tm:sleeptalk", @@ -151,7 +145,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -160,10 +153,38 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:wish", "tm:wonderroom", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:covet", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shockwave", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "fennekin", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json b/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json index 5791bb97dc..07214d6a73 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bunnelby.json @@ -110,30 +110,23 @@ "tm:bulkup", "tm:bulldoze", "tm:cut", - "tm:defensecurl", "tm:dig", - "tm:doublekick", - "tm:doubleslap", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:fling", "tm:grassknot", "tm:ironhead", "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:leer", "tm:mudshot", "tm:mudslap", "tm:naturepower", - "tm:odorsleuth", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:recycle", "tm:rest", "tm:rockslide", @@ -151,14 +144,33 @@ "tm:superfang", "tm:surf", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", "tm:torment", "tm:uturn", "tm:wildcharge", - "tm:workup" + "tm:workup", + "tutor:bounce", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:mudslap", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stoneedge", + "tutor:superfang", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/carbink.json b/common/src/main/resources/data/cobblemon/species/generation6/carbink.json index a29d083d54..aa0d87c630 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/carbink.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/carbink.json @@ -98,16 +98,13 @@ "tm:endure", "tm:explosion", "tm:facade", - "tm:flail", "tm:flash", "tm:flashcannon", "tm:gigaimpact", "tm:gravity", - "tm:guardsplit", "tm:guardswap", "tm:gyroball", "tm:hail", - "tm:harden", "tm:heavyslam", "tm:hyperbeam", "tm:irondefense", @@ -118,7 +115,6 @@ "tm:meteorbeam", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:naturepower", "tm:powergem", "tm:protect", @@ -130,12 +126,10 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:safeguard", "tm:sandstorm", "tm:sandtomb", - "tm:sharpen", "tm:skillswap", "tm:sleeptalk", "tm:smackdown", @@ -145,13 +139,43 @@ "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:terrainpulse", "tm:trickroom", - "tm:wonderroom" + "tm:wonderroom", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:mistyexplosion", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:telekinesis", + "tutor:terrainpulse", + "tutor:trick", + "tutor:wonderroom" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json index 96e17d3609..b42348981f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/chesnaught.json @@ -92,8 +92,6 @@ "egg:synthesis", "egg:wideguard", "tm:aerialace", - "tm:bellydrum", - "tm:bite", "tm:block", "tm:bodypress", "tm:bodyslam", @@ -106,7 +104,6 @@ "tm:crunch", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:dragonclaw", @@ -117,7 +114,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:feint", "tm:flash", "tm:fling", "tm:focusblast", @@ -129,9 +125,7 @@ "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:gyroball", - "tm:hammerarm", "tm:helpinghand", "tm:highhorsepower", "tm:honeclaws", @@ -141,7 +135,6 @@ "tm:irontail", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", @@ -149,14 +142,12 @@ "tm:mudshot", "tm:mudslap", "tm:naturepower", - "tm:needlearm", "tm:painsplit", "tm:payback", "tm:pinmissile", "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:reflect", "tm:rest", @@ -174,7 +165,6 @@ "tm:smackdown", "tm:solarbeam", "tm:spikes", - "tm:spikyshield", "tm:steelroller", "tm:stompingtantrum", "tm:stoneedge", @@ -186,18 +176,59 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thunderpunch", "tm:trailblaze", - "tm:vinewhip", - "tm:wideguard", - "tm:woodhammer", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:energyball", + "tutor:focuspunch", + "tutor:frenzyplant", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superfang", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:thunderpunch", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "quilladin", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/chespin.json b/common/src/main/resources/data/cobblemon/species/generation6/chespin.json index 1a8943a72b..085a0d5fbe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/chespin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/chespin.json @@ -87,15 +87,12 @@ "egg:synthesis", "egg:wideguard", "tm:aerialace", - "tm:bellydrum", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:bulletseed", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:drainpunch", "tm:dualchop", @@ -111,12 +108,10 @@ "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:helpinghand", "tm:ironhead", "tm:irontail", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:magicalleaf", "tm:metalclaw", @@ -128,7 +123,6 @@ "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:reflect", "tm:rest", @@ -151,17 +145,46 @@ "tm:superpower", "tm:swift", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderpunch", "tm:trailblaze", - "tm:vinewhip", - "tm:wideguard", - "tm:woodhammer", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:energyball", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:ironhead", + "tutor:irontail", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:thunderpunch", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json b/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json index d8b5240f76..89752f61ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json @@ -81,23 +81,17 @@ "egg:aquatail", "egg:bubblebeam", "egg:entrainment", - "tm:aquajet", "tm:aquatail", "tm:aurasphere", "tm:blizzard", "tm:bounce", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", - "tm:crabhammer", "tm:cut", "tm:darkpulse", "tm:dive", "tm:dragonpulse", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:flail", "tm:flashcannon", "tm:flipturn", "tm:helpinghand", @@ -118,7 +112,6 @@ "tm:sleeptalk", "tm:sludgewave", "tm:smackdown", - "tm:splash", "tm:substitute", "tm:surf", "tm:swordsdance", @@ -128,12 +121,27 @@ "tm:thief", "tm:uturn", "tm:venoshock", - "tm:visegrip", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:weatherball" + "tm:weatherball", + "tutor:aquatail", + "tutor:bounce", + "tutor:darkpulse", + "tutor:dive", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:terrainpulse", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json b/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json index ee37da360e..2876f28d67 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json @@ -85,29 +85,22 @@ "egg:aquatail", "egg:bubblebeam", "egg:entrainment", - "tm:aquajet", "tm:aquatail", "tm:aurasphere", "tm:blizzard", "tm:bodyslam", "tm:bounce", - "tm:bubble", - "tm:bubblebeam", "tm:chillingwater", - "tm:crabhammer", "tm:cut", "tm:darkpulse", "tm:dive", "tm:dragonpulse", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:flail", "tm:flashcannon", "tm:flipturn", "tm:focusblast", "tm:gigaimpact", - "tm:healpulse", "tm:helpinghand", "tm:honeclaws", "tm:hydropump", @@ -131,7 +124,6 @@ "tm:sludgebomb", "tm:sludgewave", "tm:smackdown", - "tm:splash", "tm:substitute", "tm:surf", "tm:swordsdance", @@ -141,12 +133,32 @@ "tm:thief", "tm:uturn", "tm:venoshock", - "tm:visegrip", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:weatherball" + "tm:weatherball", + "tutor:aquatail", + "tutor:bounce", + "tutor:darkpulse", + "tutor:dive", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:terrainpulse", + "tutor:waterpulse" ], "preEvolution": "clauncher", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json index 985539070e..7a80620c72 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json @@ -87,7 +87,6 @@ "tm:cut", "tm:dazzlinggleam", "tm:dig", - "tm:discharge", "tm:drainingkiss", "tm:eerieimpulse", "tm:electricterrain", @@ -95,7 +94,6 @@ "tm:electroweb", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:flash", "tm:fling", @@ -109,8 +107,6 @@ "tm:magnetrise", "tm:mistyterrain", "tm:naturalgift", - "tm:nuzzle", - "tm:paraboliccharge", "tm:playrough", "tm:protect", "tm:raindance", @@ -127,21 +123,43 @@ "tm:sunnyday", "tm:superfang", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", - "tm:tearfullook", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:trailblaze", "tm:uturn", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:electroweb", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:playrough", + "tutor:recycle", + "tutor:rest", + "tutor:risingvoltage", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snore", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json index 502a6cf1dd..8ef9affb23 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/delphox.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/delphox.json @@ -105,14 +105,12 @@ "tm:calmmind", "tm:charm", "tm:confuseray", - "tm:copycat", "tm:covet", "tm:cut", "tm:dazzlinggleam", "tm:dreameater", "tm:echoedvoice", "tm:embargo", - "tm:ember", "tm:encore", "tm:endure", "tm:expandingforce", @@ -132,17 +130,14 @@ "tm:heatwave", "tm:helpinghand", "tm:hex", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:imprison", "tm:incinerate", "tm:irontail", "tm:laserfocus", "tm:lightscreen", "tm:lowkick", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", "tm:metronome", @@ -167,7 +162,6 @@ "tm:roleplay", "tm:safeguard", "tm:scorchingsands", - "tm:scratch", "tm:shadowball", "tm:shockwave", "tm:signalbeam", @@ -179,8 +173,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", - "tm:tailwhip", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -189,10 +181,49 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:wish", "tm:wonderroom", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:blastburn", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:expandingforce", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:mysticalfire", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "braixen", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json index 5c3630fac2..439c8b831d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json @@ -78,7 +78,6 @@ "tm:charm", "tm:covet", "tm:dazzlinggleam", - "tm:diamondstorm", "tm:drainingkiss", "tm:earthpower", "tm:encore", @@ -87,16 +86,13 @@ "tm:explosion", "tm:facade", "tm:faketears", - "tm:flail", "tm:flash", "tm:flashcannon", "tm:gigaimpact", "tm:gravity", - "tm:guardsplit", "tm:guardswap", "tm:gyroball", "tm:hail", - "tm:harden", "tm:healbell", "tm:helpinghand", "tm:hyperbeam", @@ -107,7 +103,6 @@ "tm:meteorbeam", "tm:metronome", "tm:mistyexplosion", - "tm:moonblast", "tm:mysticalfire", "tm:naturepower", "tm:playrough", @@ -121,13 +116,11 @@ "tm:rest", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:safeguard", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:sharpen", "tm:skillswap", "tm:sleeptalk", "tm:smackdown", @@ -139,13 +132,48 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:terrainpulse", "tm:trickroom", - "tm:wonderroom" + "tm:wonderroom", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:mistyexplosion", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:terrainpulse", + "tutor:trick", + "tutor:wonderroom" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json index 45b23bf270..1fe057341e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json @@ -115,17 +115,13 @@ "tm:bulkup", "tm:bulldoze", "tm:cut", - "tm:defensecurl", "tm:dig", - "tm:doublekick", - "tm:doubleslap", "tm:earthpower", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", "tm:firepunch", - "tm:flail", "tm:fling", "tm:focuspunch", "tm:foulplay", @@ -133,7 +129,6 @@ "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", - "tm:hammerarm", "tm:highhorsepower", "tm:hyperbeam", "tm:icepunch", @@ -142,25 +137,21 @@ "tm:knockoff", "tm:laserfocus", "tm:lastresort", - "tm:leer", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:mudshot", "tm:mudslap", "tm:naturepower", - "tm:odorsleuth", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:recycle", "tm:rest", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:rototiller", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", @@ -177,7 +168,6 @@ "tm:superpower", "tm:surf", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -186,7 +176,45 @@ "tm:uproar", "tm:uturn", "tm:wildcharge", - "tm:workup" + "tm:workup", + "tutor:bounce", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:mudslap", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superfang", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "bunnelby", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json index 40f4882e87..ccf4c4896e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/doublade.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/doublade.json @@ -94,13 +94,11 @@ "egg:wideguard", "tm:aerialace", "tm:afteryou", - "tm:autotomize", "tm:block", "tm:brickbreak", "tm:brutalswing", "tm:closecombat", "tm:cut", - "tm:destinybond", "tm:endure", "tm:facade", "tm:falseswipe", @@ -112,11 +110,8 @@ "tm:laserfocus", "tm:magnetrise", "tm:metalsound", - "tm:nightslash", - "tm:powertrick", "tm:protect", "tm:psychocut", - "tm:pursuit", "tm:raindance", "tm:reflect", "tm:rest", @@ -124,21 +119,36 @@ "tm:reversal", "tm:rockslide", "tm:rocksmash", - "tm:sacredsword", "tm:screech", "tm:shadowclaw", - "tm:shadowsneak", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:solarblade", "tm:spite", "tm:steelbeam", "tm:substitute", "tm:swordsdance", - "tm:tackle", "tm:terablast", - "tm:wideguard" + "tutor:aerialace", + "tutor:afteryou", + "tutor:block", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:furycutter", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:spite", + "tutor:steelbeam", + "tutor:trick" ], "preEvolution": "honedge", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json index 6ef19e81d8..b5fcc81fd8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dragalge.json @@ -99,13 +99,9 @@ "egg:dragontail", "egg:haze", "egg:twister", - "tm:acid", - "tm:acidarmor", "tm:acidspray", "tm:aquatail", "tm:bounce", - "tm:bubble", - "tm:camouflage", "tm:chillingwater", "tm:dive", "tm:doubleteam", @@ -114,7 +110,6 @@ "tm:dragontail", "tm:endure", "tm:facade", - "tm:feintattack", "tm:flipturn", "tm:focusblast", "tm:gigaimpact", @@ -143,13 +138,10 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smokescreen", "tm:snowscape", "tm:spite", "tm:substitute", "tm:surf", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", @@ -161,9 +153,34 @@ "tm:venomdrench", "tm:venoshock", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bounce", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:mudslap", + "tutor:outrage", + "tutor:playrough", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:thunderbolt", + "tutor:twister", + "tutor:waterpulse" ], "preEvolution": "skrelp", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/espurr.json b/common/src/main/resources/data/cobblemon/species/generation6/espurr.json index 48d2289b00..72ceed06ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/espurr.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/espurr.json @@ -72,12 +72,9 @@ "egg:tickle", "egg:yawn", "tm:allyswitch", - "tm:assist", - "tm:barrier", "tm:calmmind", "tm:chargebeam", "tm:charm", - "tm:confusion", "tm:covet", "tm:cut", "tm:darkpulse", @@ -88,14 +85,12 @@ "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:flash", "tm:gravity", "tm:healbell", "tm:helpinghand", "tm:irontail", - "tm:leer", "tm:lightscreen", "tm:magiccoat", "tm:magicroom", @@ -115,7 +110,6 @@ "tm:rest", "tm:roleplay", "tm:safeguard", - "tm:scratch", "tm:shadowball", "tm:shockwave", "tm:signalbeam", @@ -129,14 +123,42 @@ "tm:terablast", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:trick", "tm:trickroom", "tm:wonderroom", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:darkpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:irontail", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json index d9cffa1f93..65d0caf865 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fennekin.json @@ -92,13 +92,11 @@ "tm:burningjealousy", "tm:calmmind", "tm:charm", - "tm:copycat", "tm:covet", "tm:cut", "tm:dreameater", "tm:echoedvoice", "tm:embargo", - "tm:ember", "tm:encore", "tm:endure", "tm:facade", @@ -112,13 +110,10 @@ "tm:grassknot", "tm:heatwave", "tm:helpinghand", - "tm:howl", - "tm:hypnosis", "tm:imprison", "tm:incinerate", "tm:irontail", "tm:lightscreen", - "tm:luckychant", "tm:magiccoat", "tm:magicroom", "tm:mudshot", @@ -133,7 +128,6 @@ "tm:raindance", "tm:rest", "tm:safeguard", - "tm:scratch", "tm:skillswap", "tm:sleeptalk", "tm:solarbeam", @@ -141,15 +135,31 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:wish", - "tm:workup" + "tm:workup", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:covet", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json b/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json index aeff8a7668..d0409115ef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/flabebe.json @@ -97,14 +97,11 @@ "tm:afteryou", "tm:alluringvoice", "tm:allyswitch", - "tm:aromatherapy", "tm:batonpass", "tm:calmmind", - "tm:camouflage", "tm:captivate", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:dazzlinggleam", "tm:disarmingvoice", @@ -114,7 +111,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", "tm:gigadrain", "tm:grassknot", @@ -122,19 +118,15 @@ "tm:healbell", "tm:helpinghand", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:mistyterrain", - "tm:moonblast", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:pollenpuff", "tm:protect", "tm:psychic", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", @@ -145,13 +137,28 @@ "tm:sunnyday", "tm:swift", "tm:synthesis", - "tm:tackle", - "tm:tearfullook", "tm:terablast", "tm:trailblaze", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:healbell", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json index fc51bd8c19..9c6ea01456 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json @@ -108,31 +108,22 @@ "tm:defog", "tm:doubleedge", "tm:dualwingbeat", - "tm:ember", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feint", "tm:fireblast", "tm:firespin", - "tm:flail", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", "tm:fly", - "tm:growl", "tm:heatwave", "tm:hurricane", "tm:incinerate", - "tm:mefirst", "tm:naturalgift", "tm:overheat", - "tm:peck", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roost", "tm:sleeptalk", @@ -142,7 +133,6 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:taunt", @@ -151,7 +141,19 @@ "tm:thief", "tm:uturn", "tm:willowisp", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:tailwind" ], "preEvolution": "fletchling", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json index 80364059ef..82a8b47e64 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/fletchling.json @@ -100,26 +100,18 @@ "tm:defog", "tm:doubleedge", "tm:dualwingbeat", - "tm:ember", "tm:endure", "tm:facade", "tm:featherdance", - "tm:flail", "tm:flamecharge", "tm:flareblitz", "tm:fly", - "tm:growl", "tm:heatwave", "tm:hurricane", - "tm:mefirst", "tm:naturalgift", "tm:overheat", - "tm:peck", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roost", "tm:sleeptalk", @@ -129,14 +121,24 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:heatwave", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:tailwind" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/floette.json b/common/src/main/resources/data/cobblemon/species/generation6/floette.json index 93cadbb40c..4b0af7f5b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/floette.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/floette.json @@ -96,14 +96,11 @@ "tm:afteryou", "tm:alluringvoice", "tm:allyswitch", - "tm:aromatherapy", "tm:batonpass", "tm:calmmind", - "tm:camouflage", "tm:captivate", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:dazzlinggleam", "tm:disarmingvoice", @@ -113,7 +110,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", "tm:gigadrain", "tm:grassknot", @@ -121,20 +117,16 @@ "tm:healbell", "tm:helpinghand", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:metronome", "tm:mistyterrain", - "tm:moonblast", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:pollenpuff", "tm:protect", "tm:psychic", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", @@ -146,14 +138,31 @@ "tm:sunnyday", "tm:swift", "tm:synthesis", - "tm:tackle", - "tm:tearfullook", "tm:terablast", "tm:trailblaze", "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:healbell", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:trick", + "tutor:worryseed" ], "preEvolution": "flabebe", "evolutions": [ @@ -348,14 +357,11 @@ "tm:afteryou", "tm:alluringvoice", "tm:allyswitch", - "tm:aromatherapy", "tm:batonpass", "tm:calmmind", - "tm:camouflage", "tm:captivate", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:dazzlinggleam", "tm:disarmingvoice", @@ -365,7 +371,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", "tm:gigadrain", "tm:grassknot", @@ -373,20 +378,16 @@ "tm:healbell", "tm:helpinghand", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:metronome", "tm:mistyterrain", - "tm:moonblast", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:pollenpuff", "tm:protect", "tm:psychic", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", @@ -398,14 +399,31 @@ "tm:sunnyday", "tm:swift", "tm:synthesis", - "tm:tackle", - "tm:tearfullook", "tm:terablast", "tm:trailblaze", "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:healbell", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:trick", + "tutor:worryseed" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation6/florges.json b/common/src/main/resources/data/cobblemon/species/generation6/florges.json index 3d6eb9b236..a52c05dfc3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/florges.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/florges.json @@ -101,14 +101,11 @@ "tm:afteryou", "tm:alluringvoice", "tm:allyswitch", - "tm:aromatherapy", "tm:batonpass", "tm:calmmind", - "tm:camouflage", "tm:captivate", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:covet", "tm:dazzlinggleam", "tm:defog", @@ -119,9 +116,7 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", - "tm:flowershield", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", @@ -130,22 +125,18 @@ "tm:helpinghand", "tm:hyperbeam", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:metronome", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:naturepower", "tm:petalblizzard", - "tm:petaldance", "tm:pollenpuff", "tm:protect", "tm:psychic", "tm:psychicnoise", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", @@ -157,14 +148,35 @@ "tm:sunnyday", "tm:swift", "tm:synthesis", - "tm:tackle", - "tm:tearfullook", "tm:terablast", "tm:trailblaze", "tm:trick", - "tm:vinewhip", - "tm:wish", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:mistyexplosion", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:trick", + "tutor:worryseed" ], "preEvolution": "floette", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation6/froakie.json b/common/src/main/resources/data/cobblemon/species/generation6/froakie.json index 27cee43c1a..49c26ac16a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/froakie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/froakie.json @@ -104,13 +104,9 @@ "egg:watersport", "tm:acrobatics", "tm:aerialace", - "tm:bestow", "tm:blizzard", "tm:bounce", - "tm:bubble", - "tm:camouflage", "tm:chillingwater", - "tm:counter", "tm:cut", "tm:dig", "tm:dive", @@ -121,21 +117,15 @@ "tm:falseswipe", "tm:fling", "tm:grassknot", - "tm:growl", "tm:helpinghand", "tm:hydropump", "tm:icebeam", "tm:icywind", - "tm:lick", "tm:liquidation", - "tm:mindreader", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -146,7 +136,6 @@ "tm:round", "tm:sleeptalk", "tm:smackdown", - "tm:smokescreen", "tm:snatch", "tm:snowscape", "tm:spikes", @@ -154,7 +143,6 @@ "tm:substitute", "tm:surf", "tm:swift", - "tm:switcheroo", "tm:takedown", "tm:taunt", "tm:terablast", @@ -163,11 +151,28 @@ "tm:trailblaze", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bounce", + "tutor:dive", + "tutor:falseswipe", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spikes", + "tutor:swift", + "tutor:waterpledge", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json b/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json index 4569dd8af4..34a0e3b946 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/frogadier.json @@ -102,13 +102,9 @@ "egg:watersport", "tm:acrobatics", "tm:aerialace", - "tm:bestow", "tm:blizzard", "tm:bounce", - "tm:bubble", - "tm:camouflage", "tm:chillingwater", - "tm:counter", "tm:cut", "tm:dig", "tm:dive", @@ -119,24 +115,18 @@ "tm:falseswipe", "tm:fling", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:helpinghand", "tm:hydropump", "tm:icebeam", "tm:icepunch", "tm:icywind", - "tm:lick", "tm:liquidation", "tm:lowkick", - "tm:mindreader", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -147,7 +137,6 @@ "tm:round", "tm:sleeptalk", "tm:smackdown", - "tm:smokescreen", "tm:snatch", "tm:snowscape", "tm:spikes", @@ -155,7 +144,6 @@ "tm:substitute", "tm:surf", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -165,11 +153,31 @@ "tm:trailblaze", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watersport", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bounce", + "tutor:dive", + "tutor:falseswipe", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spikes", + "tutor:swift", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "froakie", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json b/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json index 2d4a4d8c6e..d574d28e5c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json @@ -85,11 +85,9 @@ "egg:roleplay", "egg:workup", "tm:babydolleyes", - "tm:bite", "tm:captivate", "tm:chargebeam", "tm:charm", - "tm:cottonguard", "tm:darkpulse", "tm:dig", "tm:echoedvoice", @@ -99,31 +97,24 @@ "tm:flash", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:hypervoice", "tm:irontail", "tm:lastresort", - "tm:mimic", - "tm:odorsleuth", "tm:protect", "tm:raindance", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", "tm:rocksmash", "tm:roleplay", - "tm:sandattack", "tm:sleeptalk", "tm:snarl", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:surf", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thunderwave", @@ -131,7 +122,25 @@ "tm:uturn", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irontail", + "tutor:lastresort", + "tutor:rest", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:suckerpunch", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json b/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json index 410255c002..6d83ae7f0d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json @@ -88,7 +88,6 @@ "tm:bulkup", "tm:bulldoze", "tm:bulletseed", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthquake", @@ -101,17 +100,13 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:highhorsepower", - "tm:hornleech", "tm:hyperbeam", "tm:irontail", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", - "tm:milkdrink", "tm:mudshot", "tm:mudslap", "tm:naturepower", @@ -119,7 +114,6 @@ "tm:playrough", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:retaliate", "tm:roar", @@ -136,17 +130,42 @@ "tm:superpower", "tm:surf", "tm:synthesis", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:throatchop", "tm:trailblaze", - "tm:vinewhip", "tm:wildcharge", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:synthesis", + "tutor:throatchop", + "tutor:wildcharge", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "skiddo", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/goodra.json b/common/src/main/resources/data/cobblemon/species/generation6/goodra.json index 846c5f9c11..34b4c584ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/goodra.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/goodra.json @@ -89,25 +89,19 @@ "67:powerwhip", "egg:counter", "egg:lifedew", - "tm:absorb", - "tm:acidarmor", "tm:acidspray", "tm:aquatail", "tm:assurance", - "tm:bide", "tm:blizzard", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", - "tm:bubble", "tm:bulldoze", "tm:charm", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", @@ -115,10 +109,8 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:feint", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:focusblast", "tm:focuspunch", @@ -132,7 +124,6 @@ "tm:irontail", "tm:knockoff", "tm:laserfocus", - "tm:lifedew", "tm:megakick", "tm:megapunch", "tm:muddywater", @@ -157,17 +148,40 @@ "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:tackle", "tm:takedown", - "tm:tearfullook", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:toxic", - "tm:watergun", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:waterpulse" ], "preEvolution": "sliggoo", "evolutions": [], @@ -251,22 +265,16 @@ "67:heavyslam", "egg:counter", "egg:lifedew", - "tm:absorb", - "tm:acidarmor", "tm:acidspray", - "tm:bide", "tm:blizzard", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", - "tm:bubble", "tm:bulldoze", "tm:charm", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", @@ -274,10 +282,8 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:feint", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:flashcannon", "tm:gigaimpact", @@ -291,7 +297,6 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:lifedew", "tm:muddywater", "tm:mudshot", "tm:outrage", @@ -303,7 +308,6 @@ "tm:rocktomb", "tm:sandstorm", "tm:scaryface", - "tm:shelter", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", @@ -313,16 +317,38 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:tackle", "tm:takedown", - "tm:tearfullook", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:watergun", "tm:waterpulse", - "tm:weatherball" + "tm:weatherball", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:steelbeam", + "tutor:stompingtantrum", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:waterpulse" ], "preEvolution": "sliggoo hisuian", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation6/goomy.json b/common/src/main/resources/data/cobblemon/species/generation6/goomy.json index c095b5faf0..48b2664014 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/goomy.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/goomy.json @@ -82,24 +82,17 @@ "50:muddywater", "egg:counter", "egg:lifedew", - "tm:absorb", "tm:acidarmor", - "tm:bide", "tm:bodyslam", - "tm:bubble", "tm:charm", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonpulse", "tm:endure", "tm:facade", - "tm:flail", "tm:infestation", "tm:irontail", - "tm:lifedew", "tm:muddywater", "tm:mudshot", "tm:outrage", @@ -114,12 +107,22 @@ "tm:sludgewave", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderbolt", - "tm:watergun", - "tm:waterpulse" + "tm:waterpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:irontail", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:thunderbolt", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json index e7774ab8b0..6822764e7f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/gourgeist.json @@ -104,16 +104,12 @@ "egg:destinybond", "egg:disable", "tm:allyswitch", - "tm:astonish", - "tm:bestow", "tm:brutalswing", "tm:bulletseed", "tm:chargebeam", "tm:confuseray", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:endure", "tm:energyball", @@ -134,10 +130,8 @@ "tm:hyperbeam", "tm:imprison", "tm:incinerate", - "tm:leechseed", "tm:lightscreen", "tm:magiccoat", - "tm:moonblast", "tm:mysticalfire", "tm:nastyplot", "tm:naturepower", @@ -147,7 +141,6 @@ "tm:powerwhip", "tm:protect", "tm:psychic", - "tm:razorleaf", "tm:rest", "tm:rockslide", "tm:rocksmash", @@ -156,7 +149,6 @@ "tm:scaryface", "tm:seedbomb", "tm:shadowball", - "tm:shadowsneak", "tm:skillswap", "tm:skittersmack", "tm:sleeptalk", @@ -170,10 +162,39 @@ "tm:terablast", "tm:thief", "tm:trick", - "tm:trickortreat", "tm:trickroom", "tm:willowisp", - "tm:worryseed" + "tm:worryseed", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:energyball", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:magiccoat", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:synthesis", + "tutor:telekinesis", + "tutor:trick", + "tutor:worryseed" ], "preEvolution": "pumpkaboo", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json index dcf58e7992..c71f2990b7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json @@ -110,15 +110,11 @@ "egg:watersport", "tm:acrobatics", "tm:aerialace", - "tm:bestow", "tm:blizzard", "tm:bounce", "tm:brickbreak", "tm:brutalswing", - "tm:bubble", - "tm:camouflage", "tm:chillingwater", - "tm:counter", "tm:cut", "tm:darkpulse", "tm:dig", @@ -126,14 +122,11 @@ "tm:doubleteam", "tm:echoedvoice", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:falseswipe", - "tm:feintattack", "tm:fling", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:gunkshot", "tm:haze", "tm:helpinghand", @@ -143,20 +136,13 @@ "tm:icebeam", "tm:icepunch", "tm:icywind", - "tm:lick", "tm:liquidation", "tm:lowkick", "tm:lowsweep", - "tm:matblock", - "tm:mindreader", "tm:mudshot", "tm:mudslap", - "tm:mudsport", - "tm:nightslash", - "tm:pound", "tm:poweruppunch", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -165,11 +151,9 @@ "tm:rocktomb", "tm:roleplay", "tm:round", - "tm:shadowsneak", "tm:sleeptalk", "tm:sludgewave", "tm:smackdown", - "tm:smokescreen", "tm:snatch", "tm:snowscape", "tm:spikes", @@ -177,7 +161,6 @@ "tm:substitute", "tm:surf", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -188,13 +171,37 @@ "tm:upperhand", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:watershuriken", - "tm:watersport", "tm:weatherball", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:block", + "tutor:bounce", + "tutor:darkpulse", + "tutor:dive", + "tutor:falseswipe", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:liquidation", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spikes", + "tutor:swift", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "frogadier", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json index b9b8c737cb..8f007c286f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json @@ -107,10 +107,8 @@ "tm:bulkup", "tm:closecombat", "tm:coaching", - "tm:crosschop", "tm:cut", "tm:defog", - "tm:detect", "tm:dig", "tm:drainpunch", "tm:dualchop", @@ -118,40 +116,31 @@ "tm:encore", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:falseswipe", "tm:featherdance", - "tm:feint", "tm:firepunch", "tm:fling", "tm:fly", - "tm:flyingpress", "tm:focusblast", "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", - "tm:highjumpkick", "tm:honeclaws", "tm:hyperbeam", "tm:ironhead", - "tm:karatechop", "tm:laserfocus", "tm:lastresort", "tm:lowkick", "tm:lowsweep", "tm:lunge", - "tm:meanlook", - "tm:mefirst", "tm:megakick", "tm:megapunch", - "tm:mudsport", "tm:payback", "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -167,13 +156,11 @@ "tm:steelwing", "tm:stoneedge", "tm:strength", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -185,10 +172,44 @@ "tm:upperhand", "tm:uproar", "tm:uturn", - "tm:wingattack", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bounce", + "tutor:bulkup", + "tutor:coaching", + "tutor:defog", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json index 109b0435d9..63ac353605 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json @@ -76,19 +76,15 @@ "tm:breakingswipe", "tm:brutalswing", "tm:bulldoze", - "tm:camouflage", "tm:charge", "tm:chargebeam", "tm:cut", "tm:darkpulse", "tm:dig", - "tm:discharge", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:eerieimpulse", "tm:electricterrain", - "tm:electrify", "tm:electroball", "tm:electroweb", "tm:endure", @@ -97,7 +93,6 @@ "tm:flash", "tm:focusblast", "tm:gigaimpact", - "tm:glare", "tm:grassknot", "tm:hyperbeam", "tm:hypervoice", @@ -109,13 +104,9 @@ "tm:megakick", "tm:megapunch", "tm:mudslap", - "tm:paraboliccharge", - "tm:pound", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:risingvoltage", "tm:rockslide", @@ -130,17 +121,40 @@ "tm:sunnyday", "tm:surf", "tm:swift", - "tm:tailwhip", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:uturn", "tm:voltswitch", "tm:weatherball", - "tm:wildcharge" + "tm:wildcharge", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:electroweb", + "tutor:firepunch", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:lowkick", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "preEvolution": "helioptile", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json index 9ce3e0c644..c0c7b750d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json @@ -71,35 +71,27 @@ "tm:agility", "tm:allyswitch", "tm:bulldoze", - "tm:camouflage", "tm:charge", "tm:chargebeam", "tm:cut", "tm:darkpulse", "tm:dig", - "tm:dragonrush", "tm:dragontail", "tm:electricterrain", - "tm:electrify", "tm:electroball", "tm:electroweb", "tm:endure", "tm:facade", "tm:flash", - "tm:glare", "tm:grassknot", "tm:irontail", "tm:lightscreen", "tm:lowsweep", "tm:magnetrise", "tm:mudslap", - "tm:paraboliccharge", - "tm:pound", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:risingvoltage", "tm:rockslide", @@ -112,15 +104,31 @@ "tm:substitute", "tm:surf", "tm:swift", - "tm:tailwhip", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:uturn", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:irontail", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/honedge.json b/common/src/main/resources/data/cobblemon/species/generation6/honedge.json index 51c1f3ec4c..070d54ef8b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/honedge.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/honedge.json @@ -94,13 +94,11 @@ "egg:wideguard", "tm:aerialace", "tm:afteryou", - "tm:autotomize", "tm:block", "tm:brickbreak", "tm:brutalswing", "tm:closecombat", "tm:cut", - "tm:destinybond", "tm:endure", "tm:facade", "tm:falseswipe", @@ -112,11 +110,8 @@ "tm:laserfocus", "tm:magnetrise", "tm:metalsound", - "tm:nightslash", - "tm:powertrick", "tm:protect", "tm:psychocut", - "tm:pursuit", "tm:raindance", "tm:reflect", "tm:rest", @@ -124,21 +119,36 @@ "tm:reversal", "tm:rockslide", "tm:rocksmash", - "tm:sacredsword", "tm:screech", "tm:shadowclaw", - "tm:shadowsneak", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:solarblade", "tm:spite", "tm:steelbeam", "tm:substitute", "tm:swordsdance", - "tm:tackle", "tm:terablast", - "tm:wideguard" + "tutor:aerialace", + "tutor:afteryou", + "tutor:block", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:furycutter", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:spite", + "tutor:steelbeam", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json index cc74bc2ac8..c32258446f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json @@ -70,14 +70,11 @@ "75:psychic", "85:hyperspacehole", "tm:allyswitch", - "tm:astonish", "tm:block", "tm:brickbreak", "tm:calmmind", - "tm:confusion", "tm:covet", "tm:darkpulse", - "tm:destinybond", "tm:drainpunch", "tm:dreameater", "tm:dualchop", @@ -96,10 +93,8 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:guardsplit", "tm:gunkshot", "tm:hyperbeam", - "tm:hyperspacehole", "tm:icepunch", "tm:knockoff", "tm:laserfocus", @@ -110,7 +105,6 @@ "tm:magicroom", "tm:nastyplot", "tm:phantomforce", - "tm:powersplit", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -152,7 +146,49 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -201,14 +237,11 @@ "75:psychic", "85:hyperspacefury", "tm:allyswitch", - "tm:astonish", "tm:block", "tm:brickbreak", "tm:calmmind", - "tm:confusion", "tm:covet", "tm:darkpulse", - "tm:destinybond", "tm:drainpunch", "tm:dreameater", "tm:dualchop", @@ -227,10 +260,8 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:guardsplit", "tm:gunkshot", "tm:hyperbeam", - "tm:hyperspacefury", "tm:icepunch", "tm:knockoff", "tm:laserfocus", @@ -241,7 +272,6 @@ "tm:magicroom", "tm:nastyplot", "tm:phantomforce", - "tm:powersplit", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -283,7 +313,49 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:covet", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:energyball", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation6/inkay.json b/common/src/main/resources/data/cobblemon/species/generation6/inkay.json index 2ee0f8e572..0281140a23 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/inkay.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/inkay.json @@ -97,18 +97,13 @@ "egg:flatter", "egg:powersplit", "egg:simplebeam", - "tm:acupressure", "tm:aerialace", "tm:allyswitch", "tm:batonpass", "tm:bind", "tm:calmmind", - "tm:camouflage", - "tm:constrict", "tm:cut", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:embargo", "tm:endure", "tm:expandingforce", @@ -116,41 +111,33 @@ "tm:faketears", "tm:flamethrower", "tm:flash", - "tm:flatter", "tm:fling", "tm:foulplay", "tm:futuresight", "tm:gravity", "tm:guardswap", "tm:helpinghand", - "tm:hypnosis", "tm:knockoff", "tm:lashout", "tm:lightscreen", "tm:liquidation", "tm:lunge", "tm:nastyplot", - "tm:nightslash", "tm:payback", - "tm:peck", "tm:pluck", - "tm:powersplit", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:reflect", "tm:rest", "tm:retaliate", "tm:rockslide", "tm:roleplay", - "tm:simplebeam", "tm:skillswap", - "tm:slash", "tm:sleeptalk", "tm:snatch", "tm:spite", @@ -160,18 +147,41 @@ "tm:superpower", "tm:swagger", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:taunt", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:thunderbolt", - "tm:topsyturvy", "tm:torment", "tm:trick", "tm:trickroom", - "tm:wrap" + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:expandingforce", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gravity", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:lashout", + "tutor:liquidation", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:superpower", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/klefki.json b/common/src/main/resources/data/cobblemon/species/generation6/klefki.json index edfc212479..6726e791bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/klefki.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/klefki.json @@ -91,33 +91,26 @@ "egg:lockon", "egg:magnetrise", "egg:switcheroo", - "tm:astonish", "tm:calmmind", "tm:covet", - "tm:craftyshield", "tm:cut", "tm:dazzlinggleam", "tm:defog", "tm:drainingkiss", "tm:endure", "tm:facade", - "tm:fairylock", - "tm:fairywind", "tm:flashcannon", "tm:foulplay", "tm:gigaimpact", - "tm:healblock", "tm:hyperbeam", "tm:imprison", "tm:irondefense", "tm:lastresort", "tm:lightscreen", - "tm:lockon", "tm:magiccoat", "tm:magicroom", "tm:magnetrise", "tm:metalsound", - "tm:mirrorshot", "tm:mistyterrain", "tm:playrough", "tm:protect", @@ -138,13 +131,35 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:terablast", "tm:thief", "tm:thunderwave", "tm:torment", - "tm:trickroom" + "tm:trickroom", + "tutor:block", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:magnetrise", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:steelbeam", + "tutor:swift", + "tutor:trick" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json index 1f2dff32df..24f225b535 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json @@ -92,10 +92,8 @@ "tm:dig", "tm:doubleedge", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:fireblast", "tm:firefang", @@ -109,9 +107,7 @@ "tm:hypervoice", "tm:incinerate", "tm:irontail", - "tm:leer", "tm:mudslap", - "tm:nobleroar", "tm:overheat", "tm:payback", "tm:protect", @@ -129,7 +125,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -139,7 +134,24 @@ "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:yawn" + "tutor:bulldoze", + "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irontail", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:swift", + "tutor:thunderfang", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/malamar.json b/common/src/main/resources/data/cobblemon/species/generation6/malamar.json index 0d6d8b63d2..60cc9ae389 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/malamar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/malamar.json @@ -98,7 +98,6 @@ "egg:flatter", "egg:powersplit", "egg:simplebeam", - "tm:acupressure", "tm:aerialace", "tm:allyswitch", "tm:batonpass", @@ -106,12 +105,8 @@ "tm:block", "tm:brutalswing", "tm:calmmind", - "tm:camouflage", - "tm:constrict", "tm:cut", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:embargo", "tm:endure", "tm:expandingforce", @@ -119,7 +114,6 @@ "tm:faketears", "tm:flamethrower", "tm:flash", - "tm:flatter", "tm:fling", "tm:foulplay", "tm:futuresight", @@ -128,18 +122,14 @@ "tm:guardswap", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:knockoff", "tm:lashout", "tm:lightscreen", "tm:liquidation", "tm:lunge", "tm:nastyplot", - "tm:nightslash", "tm:payback", - "tm:peck", "tm:pluck", - "tm:powersplit", "tm:protect", "tm:psybeam", "tm:psychic", @@ -147,7 +137,6 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:reflect", "tm:rest", @@ -157,9 +146,7 @@ "tm:roleplay", "tm:scaryface", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", - "tm:slash", "tm:sleeptalk", "tm:snatch", "tm:spite", @@ -169,20 +156,48 @@ "tm:superpower", "tm:swagger", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:taunt", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:throatchop", "tm:thunderbolt", - "tm:topsyturvy", "tm:torment", "tm:trailblaze", "tm:trick", "tm:trickroom", - "tm:wrap" + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bind", + "tutor:block", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:expandingforce", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:lashout", + "tutor:liquidation", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:superpower", + "tutor:swift", + "tutor:telekinesis", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:trick" ], "preEvolution": "inkay", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json index cf25f25360..c4b090bbef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json @@ -79,13 +79,10 @@ "egg:yawn", "tm:alluringvoice", "tm:allyswitch", - "tm:assist", - "tm:barrier", "tm:batonpass", "tm:calmmind", "tm:chargebeam", "tm:charm", - "tm:confusion", "tm:covet", "tm:cut", "tm:darkpulse", @@ -97,7 +94,6 @@ "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:flash", "tm:gigaimpact", @@ -107,12 +103,9 @@ "tm:hyperbeam", "tm:imprison", "tm:irontail", - "tm:leer", "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", - "tm:miracleeye", "tm:mistyterrain", "tm:nastyplot", "tm:payback", @@ -126,14 +119,12 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:quickguard", "tm:raindance", "tm:recycle", "tm:reflect", "tm:rest", "tm:roleplay", "tm:safeguard", - "tm:scratch", "tm:shadowball", "tm:shockwave", "tm:signalbeam", @@ -150,15 +141,46 @@ "tm:terablast", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:trailblaze", "tm:trick", "tm:trickroom", "tm:wonderroom", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:darkpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "espurr", "evolutions": [], @@ -210,13 +232,10 @@ "egg:yawn", "tm:alluringvoice", "tm:allyswitch", - "tm:assist", - "tm:barrier", "tm:batonpass", "tm:calmmind", "tm:chargebeam", "tm:charm", - "tm:confusion", "tm:covet", "tm:cut", "tm:darkpulse", @@ -227,9 +246,7 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:flash", "tm:futuresight", @@ -239,12 +256,10 @@ "tm:helpinghand", "tm:hyperbeam", "tm:irontail", - "tm:leer", "tm:lightscreen", "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:mefirst", "tm:nastyplot", "tm:payback", "tm:payday", @@ -263,7 +278,6 @@ "tm:rest", "tm:roleplay", "tm:safeguard", - "tm:scratch", "tm:shadowball", "tm:shockwave", "tm:signalbeam", @@ -280,15 +294,47 @@ "tm:terablast", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:trailblaze", "tm:trick", "tm:trickroom", "tm:wonderroom", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:darkpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:playrough", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:suckerpunch", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "espurr", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation6/noibat.json b/common/src/main/resources/data/cobblemon/species/generation6/noibat.json index 34e3f9e901..f03d8dd5a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/noibat.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/noibat.json @@ -89,13 +89,11 @@ "egg:dragonrush", "egg:razorwind", "egg:switcheroo", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:agility", "tm:aircutter", "tm:airslash", - "tm:bite", "tm:brickbreak", "tm:cut", "tm:darkpulse", @@ -104,14 +102,12 @@ "tm:dracometeor", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrush", "tm:dreameater", "tm:dualwingbeat", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:fly", - "tm:gust", "tm:heatwave", "tm:hurricane", "tm:hypervoice", @@ -120,7 +116,6 @@ "tm:outrage", "tm:protect", "tm:psychic", - "tm:razorwind", "tm:rest", "tm:roost", "tm:screech", @@ -134,10 +129,7 @@ "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:supersonic", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:taunt", @@ -146,10 +138,34 @@ "tm:torment", "tm:uproar", "tm:uturn", - "tm:whirlwind", "tm:wildcharge", - "tm:wingattack", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:darkpulse", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:heatwave", + "tutor:hypervoice", + "tutor:irontail", + "tutor:leechlife", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:superfang", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar", + "tutor:wildcharge", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/noivern.json b/common/src/main/resources/data/cobblemon/species/generation6/noivern.json index 895a13b169..c0f9d38148 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/noivern.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/noivern.json @@ -93,15 +93,12 @@ "egg:dragonrush", "egg:razorwind", "egg:switcheroo", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:agility", "tm:aircutter", "tm:airslash", - "tm:bite", "tm:bodyslam", - "tm:boomburst", "tm:breakingswipe", "tm:brickbreak", "tm:cut", @@ -114,7 +111,6 @@ "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:dreameater", "tm:dualwingbeat", @@ -125,7 +121,6 @@ "tm:fly", "tm:focusblast", "tm:gigaimpact", - "tm:gust", "tm:heatwave", "tm:honeclaws", "tm:hurricane", @@ -134,12 +129,10 @@ "tm:irontail", "tm:laserfocus", "tm:leechlife", - "tm:moonlight", "tm:outrage", "tm:protect", "tm:psychic", "tm:psychicnoise", - "tm:razorwind", "tm:rest", "tm:roost", "tm:scaryface", @@ -154,10 +147,7 @@ "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:supersonic", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:taunt", @@ -167,10 +157,39 @@ "tm:uproar", "tm:uturn", "tm:waterpulse", - "tm:whirlwind", "tm:wildcharge", - "tm:wingattack", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:darkpulse", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:superfang", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:xscissor" ], "preEvolution": "noibat", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json index 5da9b473f4..754df0952d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json @@ -89,15 +89,12 @@ "egg:skyuppercut", "egg:stormthrow", "tm:aerialace", - "tm:armthrust", "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:circlethrow", "tm:coaching", - "tm:cometpunch", "tm:covet", "tm:crunch", "tm:cut", @@ -108,7 +105,6 @@ "tm:echoedvoice", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:falseswipe", "tm:firepunch", @@ -121,22 +117,16 @@ "tm:hypervoice", "tm:icepunch", "tm:ironhead", - "tm:karatechop", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:mefirst", "tm:megakick", "tm:megapunch", - "tm:partingshot", "tm:payback", - "tm:powertrip", "tm:poweruppunch", "tm:protect", "tm:quash", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -144,31 +134,60 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:seismictoss", "tm:shadowclaw", - "tm:skyuppercut", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:snatch", "tm:spite", "tm:stoneedge", - "tm:stormthrow", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:surf", "tm:swordsdance", - "tm:tackle", "tm:taunt", "tm:terablast", "tm:thunderpunch", "tm:torment", "tm:uproar", - "tm:vitalthrow", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:covet", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:ironhead", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spite", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json index 7c2ea0a002..898cbadf09 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json @@ -95,18 +95,14 @@ "egg:skyuppercut", "egg:stormthrow", "tm:aerialace", - "tm:armthrust", "tm:beatup", "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:bulletpunch", - "tm:circlethrow", "tm:closecombat", "tm:coaching", - "tm:cometpunch", "tm:covet", "tm:crunch", "tm:cut", @@ -121,7 +117,6 @@ "tm:embargo", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:falseswipe", "tm:firepunch", @@ -133,7 +128,6 @@ "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", - "tm:hammerarm", "tm:helpinghand", "tm:honeclaws", "tm:hyperbeam", @@ -141,26 +135,19 @@ "tm:icepunch", "tm:infestation", "tm:ironhead", - "tm:karatechop", "tm:knockoff", "tm:laserfocus", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:mefirst", "tm:megakick", "tm:megapunch", - "tm:nightslash", "tm:outrage", - "tm:partingshot", "tm:payback", "tm:poisonjab", - "tm:powertrip", "tm:poweruppunch", "tm:protect", "tm:quash", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -171,10 +158,7 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:seismictoss", "tm:shadowclaw", - "tm:skyuppercut", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:snarl", @@ -182,14 +166,12 @@ "tm:spite", "tm:stompingtantrum", "tm:stoneedge", - "tm:stormthrow", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:surf", "tm:swordsdance", - "tm:tackle", "tm:taunt", "tm:terablast", "tm:thief", @@ -197,10 +179,54 @@ "tm:thunderpunch", "tm:torment", "tm:uproar", - "tm:vitalthrow", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:covet", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:ironhead", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:xscissor", + "tutor:zenheadbutt" ], "preEvolution": "pancham", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/phantump.json b/common/src/main/resources/data/cobblemon/species/generation6/phantump.json index 547eadeddf..e3e349a605 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/phantump.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/phantump.json @@ -97,36 +97,24 @@ "egg:grudge", "egg:suckerpunch", "tm:allyswitch", - "tm:astonish", - "tm:bestow", - "tm:branchpoke", "tm:bulldoze", "tm:confuseray", "tm:curse", "tm:cut", "tm:darkpulse", - "tm:destinybond", "tm:dig", - "tm:disable", "tm:dreameater", "tm:endure", "tm:energyball", "tm:facade", - "tm:feintattack", - "tm:forestscurse", "tm:foulplay", "tm:gigadrain", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:grudge", "tm:hex", - "tm:hornleech", "tm:imprison", - "tm:ingrain", "tm:lashout", - "tm:leechseed", "tm:magicalleaf", "tm:magiccoat", "tm:naturepower", @@ -158,7 +146,6 @@ "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:tackle", "tm:telekinesis", "tm:terablast", "tm:thief", @@ -167,8 +154,36 @@ "tm:trickroom", "tm:venomdrench", "tm:willowisp", - "tm:woodhammer", - "tm:worryseed" + "tm:worryseed", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:lashout", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:trick", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json index 2f5222f4fe..dafad6150a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pumpkaboo.json @@ -98,15 +98,11 @@ "egg:destinybond", "egg:disable", "tm:allyswitch", - "tm:astonish", - "tm:bestow", "tm:bulletseed", "tm:chargebeam", "tm:confuseray", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dreameater", "tm:endure", "tm:energyball", @@ -124,7 +120,6 @@ "tm:hex", "tm:imprison", "tm:incinerate", - "tm:leechseed", "tm:lightscreen", "tm:magiccoat", "tm:mysticalfire", @@ -133,7 +128,6 @@ "tm:poltergeist", "tm:protect", "tm:psychic", - "tm:razorleaf", "tm:rest", "tm:rockslide", "tm:rocksmash", @@ -142,7 +136,6 @@ "tm:scaryface", "tm:seedbomb", "tm:shadowball", - "tm:shadowsneak", "tm:skillswap", "tm:skittersmack", "tm:sleeptalk", @@ -156,10 +149,37 @@ "tm:terablast", "tm:thief", "tm:trick", - "tm:trickortreat", "tm:trickroom", "tm:willowisp", - "tm:worryseed" + "tm:worryseed", + "tutor:allyswitch", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:energyball", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:magiccoat", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:synthesis", + "tutor:telekinesis", + "tutor:trick", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json index 099bc3be44..8721dac8ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json @@ -96,10 +96,8 @@ "tm:dig", "tm:doubleedge", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:fireblast", "tm:firefang", @@ -115,9 +113,7 @@ "tm:hypervoice", "tm:incinerate", "tm:irontail", - "tm:leer", "tm:mudslap", - "tm:nobleroar", "tm:overheat", "tm:payback", "tm:protect", @@ -135,7 +131,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:temperflare", @@ -146,7 +141,29 @@ "tm:wildcharge", "tm:willowisp", "tm:workup", - "tm:yawn" + "tutor:bounce", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:swift", + "tutor:thunderfang", + "tutor:wildcharge" ], "preEvolution": "litleo", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json b/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json index 9d5ba6d609..9980f74801 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/quilladin.json @@ -87,8 +87,6 @@ "egg:synthesis", "egg:wideguard", "tm:aerialace", - "tm:bellydrum", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", @@ -96,7 +94,6 @@ "tm:bulletseed", "tm:curse", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:drainpunch", "tm:dualchop", @@ -112,7 +109,6 @@ "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:gyroball", "tm:helpinghand", "tm:honeclaws", @@ -120,21 +116,18 @@ "tm:ironhead", "tm:irontail", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", "tm:metalclaw", "tm:mudshot", "tm:naturepower", - "tm:needlearm", "tm:painsplit", "tm:payback", "tm:pinmissile", "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:reflect", "tm:rest", @@ -158,18 +151,50 @@ "tm:superpower", "tm:swift", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thunderpunch", "tm:trailblaze", - "tm:vinewhip", - "tm:wideguard", - "tm:woodhammer", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:energyball", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superfang", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:thunderpunch", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "chespin", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json b/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json index aa72f8f60c..440fb5de88 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/scatterbug.json @@ -89,14 +89,12 @@ "egg:ragepowder", "egg:stunspore", "tm:bugbite", - "tm:poisonpowder", "tm:pounce", - "tm:ragepowder", "tm:stringshot", "tm:strugglebug", - "tm:stunspore", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:stringshot" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json b/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json index ef7f2a650f..f861a77147 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json @@ -84,7 +84,6 @@ "tm:bulkup", "tm:bulldoze", "tm:bulletseed", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:endeavor", @@ -95,15 +94,11 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", - "tm:hornleech", "tm:irontail", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", - "tm:milkdrink", "tm:mudshot", "tm:mudslap", "tm:naturepower", @@ -111,7 +106,6 @@ "tm:playrough", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:retaliate", "tm:roar", @@ -127,16 +121,35 @@ "tm:sunnyday", "tm:surf", "tm:synthesis", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:trailblaze", - "tm:vinewhip", "tm:wildcharge", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:irontail", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:synthesis", + "tutor:wildcharge", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json b/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json index 4b56e25bcd..b19a64599b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/skrelp.json @@ -98,13 +98,9 @@ "egg:dragontail", "egg:haze", "egg:twister", - "tm:acid", - "tm:acidarmor", "tm:acidspray", "tm:aquatail", "tm:bounce", - "tm:bubble", - "tm:camouflage", "tm:chillingwater", "tm:dive", "tm:doubleteam", @@ -112,7 +108,6 @@ "tm:dragontail", "tm:endure", "tm:facade", - "tm:feintattack", "tm:flipturn", "tm:gunkshot", "tm:hail", @@ -137,13 +132,10 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smokescreen", "tm:snowscape", "tm:spite", "tm:substitute", "tm:surf", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", @@ -154,9 +146,31 @@ "tm:venomdrench", "tm:venoshock", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bounce", + "tutor:dive", + "tutor:dragonpulse", + "tutor:flipturn", + "tutor:gunkshot", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:mudslap", + "tutor:outrage", + "tutor:playrough", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:thunderbolt", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json b/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json index 4f9b22d8ab..a55d109e7a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sliggoo.json @@ -84,27 +84,19 @@ "56:muddywater", "egg:counter", "egg:lifedew", - "tm:absorb", - "tm:acidarmor", "tm:acidspray", - "tm:bide", "tm:blizzard", "tm:bodyslam", - "tm:bubble", "tm:charm", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonpulse", "tm:endure", "tm:facade", - "tm:flail", "tm:icebeam", "tm:infestation", "tm:irontail", - "tm:lifedew", "tm:muddywater", "tm:mudshot", "tm:outrage", @@ -119,14 +111,25 @@ "tm:sludgewave", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:toxic", - "tm:watergun", - "tm:waterpulse" + "tm:waterpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:icebeam", + "tutor:irontail", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:thunderbolt", + "tutor:waterpulse" ], "preEvolution": "goomy", "evolutions": [ @@ -235,23 +238,16 @@ "56:muddywater", "egg:counter", "egg:lifedew", - "tm:absorb", - "tm:acidarmor", "tm:acidspray", - "tm:bide", "tm:blizzard", "tm:bodyslam", - "tm:bubble", "tm:charm", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonpulse", "tm:endure", "tm:facade", - "tm:flail", "tm:flashcannon", "tm:gyroball", "tm:heavyslam", @@ -259,7 +255,6 @@ "tm:icespinner", "tm:ironhead", "tm:irontail", - "tm:lifedew", "tm:muddywater", "tm:mudshot", "tm:outrage", @@ -269,7 +264,6 @@ "tm:rockslide", "tm:rocktomb", "tm:sandstorm", - "tm:shelter", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", @@ -277,13 +271,26 @@ "tm:steelbeam", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:watergun", - "tm:waterpulse" + "tm:waterpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:icebeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:steelbeam", + "tutor:thunderbolt", + "tutor:waterpulse" ], "preEvolution": "goomy", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json index 777654b7bb..4606ed11fb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json @@ -87,13 +87,8 @@ "egg:yawn", "tm:afteryou", "tm:amnesia", - "tm:aromatherapy", - "tm:bellydrum", "tm:calmmind", "tm:charm", - "tm:copycat", - "tm:cottonguard", - "tm:cottonspore", "tm:covet", "tm:dazzlinggleam", "tm:drainingkiss", @@ -103,7 +98,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:flamethrower", "tm:flash", @@ -116,7 +110,6 @@ "tm:magiccoat", "tm:metronome", "tm:mistyexplosion", - "tm:playnice", "tm:playrough", "tm:protect", "tm:psychic", @@ -126,19 +119,35 @@ "tm:round", "tm:safeguard", "tm:sleeptalk", - "tm:stickyweb", "tm:stringshot", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:sweetscent", - "tm:tackle", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:wish", - "tm:yawn" + "tutor:afteryou", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:flamethrower", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magiccoat", + "tutor:mistyexplosion", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:thunderbolt" ], "preEvolution": "swirlix", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json index 3e580ac782..a36035cb38 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spewpa.json @@ -88,16 +88,13 @@ "egg:ragepowder", "egg:stunspore", "tm:bugbite", - "tm:harden", "tm:irondefense", - "tm:poisonpowder", "tm:pounce", "tm:protect", - "tm:ragepowder", "tm:strugglebug", - "tm:stunspore", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:irondefense" ], "preEvolution": "scatterbug", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json index bcd8eee5e7..10d6e4dccc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json @@ -82,7 +82,6 @@ "egg:wish", "tm:afteryou", "tm:allyswitch", - "tm:aromatherapy", "tm:attract", "tm:calmmind", "tm:captivate", @@ -90,7 +89,6 @@ "tm:charm", "tm:covet", "tm:dazzlinggleam", - "tm:disable", "tm:disarmingvoice", "tm:drainingkiss", "tm:dreameater", @@ -100,9 +98,7 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", - "tm:flail", "tm:flash", "tm:flashcannon", "tm:gyroball", @@ -112,28 +108,42 @@ "tm:magiccoat", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:nastyplot", - "tm:odorsleuth", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:skillswap", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", - "tm:sweetscent", "tm:telekinesis", "tm:terablast", "tm:thunderbolt", "tm:torment", "tm:trickroom", - "tm:wish" + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:flashcannon", + "tutor:healbell", + "tutor:helpinghand", + "tutor:magiccoat", + "tutor:mistyexplosion", + "tutor:psychic", + "tutor:rest", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json index 888e87dc1e..8481a1af0d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json @@ -86,13 +86,8 @@ "egg:yawn", "tm:afteryou", "tm:amnesia", - "tm:aromatherapy", - "tm:bellydrum", "tm:calmmind", "tm:charm", - "tm:copycat", - "tm:cottonguard", - "tm:cottonspore", "tm:covet", "tm:dazzlinggleam", "tm:drainingkiss", @@ -101,7 +96,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:flamethrower", "tm:flash", @@ -111,7 +105,6 @@ "tm:lightscreen", "tm:magiccoat", "tm:mistyexplosion", - "tm:playnice", "tm:playrough", "tm:protect", "tm:psychic", @@ -121,18 +114,31 @@ "tm:round", "tm:safeguard", "tm:sleeptalk", - "tm:stickyweb", "tm:stringshot", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:sweetscent", - "tm:tackle", "tm:terablast", "tm:thief", "tm:thunderbolt", - "tm:wish", - "tm:yawn" + "tutor:afteryou", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:flamethrower", + "tutor:gastroacid", + "tutor:healbell", + "tutor:helpinghand", + "tutor:magiccoat", + "tutor:mistyexplosion", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:thunderbolt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json index 894e233f39..03668b9d0e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json @@ -101,32 +101,25 @@ "tm:alluringvoice", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:calmmind", "tm:captivate", "tm:charm", - "tm:copycat", "tm:covet", "tm:curse", "tm:cut", "tm:dazzlinggleam", - "tm:detect", "tm:dig", "tm:disarmingvoice", "tm:doubleedge", - "tm:doublekick", "tm:drainingkiss", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fairywind", "tm:faketears", - "tm:flail", "tm:flash", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", "tm:healbell", "tm:helpinghand", "tm:hyperbeam", @@ -139,7 +132,6 @@ "tm:magiccoat", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:mudslap", "tm:mysticalfire", "tm:naturalgift", @@ -149,16 +141,13 @@ "tm:psychic", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roar", "tm:rocksmash", "tm:safeguard", - "tm:sandattack", "tm:shadowball", "tm:skillswap", "tm:sleeptalk", @@ -166,19 +155,39 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:telekinesis", "tm:terablast", - "tm:tickle", "tm:trailblaze", - "tm:trumpcard", "tm:weatherball", - "tm:wish", "tm:workup", - "tm:yawn" + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:mistyexplosion", + "tutor:mudslap", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis" ], "preEvolution": "eevee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json index ebd5375dae..dd1590063b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/talonflame.json @@ -111,34 +111,25 @@ "tm:defog", "tm:doubleedge", "tm:dualwingbeat", - "tm:ember", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feint", "tm:fireblast", "tm:firespin", - "tm:flail", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", "tm:fly", "tm:gigaimpact", - "tm:growl", "tm:heatwave", "tm:honeclaws", "tm:hurricane", "tm:hyperbeam", "tm:incinerate", - "tm:mefirst", "tm:naturalgift", "tm:overheat", - "tm:peck", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roost", "tm:sleeptalk", @@ -149,7 +140,6 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:taunt", @@ -159,7 +149,22 @@ "tm:upperhand", "tm:uturn", "tm:willowisp", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bulkup", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:tailwind" ], "preEvolution": "fletchinder", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json index 7807e4b267..5730c9d680 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/trevenant.json @@ -102,10 +102,7 @@ "egg:grudge", "egg:suckerpunch", "tm:allyswitch", - "tm:astonish", - "tm:bestow", "tm:block", - "tm:branchpoke", "tm:brutalswing", "tm:bulldoze", "tm:burningjealousy", @@ -114,37 +111,28 @@ "tm:curse", "tm:cut", "tm:darkpulse", - "tm:destinybond", "tm:dig", - "tm:disable", "tm:drainpunch", "tm:dreameater", "tm:earthquake", "tm:endure", "tm:energyball", "tm:facade", - "tm:feintattack", "tm:focusblast", - "tm:forestscurse", "tm:foulplay", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:grudge", "tm:haze", "tm:hex", "tm:honeclaws", - "tm:hornleech", "tm:hyperbeam", "tm:imprison", - "tm:ingrain", "tm:knockoff", "tm:lashout", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:magiccoat", "tm:naturepower", @@ -178,7 +166,6 @@ "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -189,9 +176,45 @@ "tm:trickroom", "tm:venomdrench", "tm:willowisp", - "tm:woodhammer", "tm:worryseed", - "tm:xscissor" + "tm:xscissor", + "tutor:allyswitch", + "tutor:block", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:lashout", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:telekinesis", + "tutor:trick", + "tutor:worryseed", + "tutor:xscissor" ], "preEvolution": "phantump", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json b/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json index 4030bc3108..536b83c20a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/tyrantrum.json @@ -98,8 +98,6 @@ "tm:aerialace", "tm:ancientpower", "tm:assurance", - "tm:bide", - "tm:bite", "tm:block", "tm:bodyslam", "tm:breakingswipe", @@ -123,10 +121,8 @@ "tm:facade", "tm:firefang", "tm:gigaimpact", - "tm:headsmash", "tm:highhorsepower", "tm:honeclaws", - "tm:horndrill", "tm:hyperbeam", "tm:hypervoice", "tm:icefang", @@ -137,7 +133,6 @@ "tm:meteorbeam", "tm:outrage", "tm:playrough", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", "tm:rest", @@ -146,26 +141,54 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:scaleshot", "tm:scaryface", "tm:sleeptalk", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", - "tm:tailwhip", "tm:terablast", - "tm:thrash", "tm:thunderfang", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lashout", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "preEvolution": "tyrunt", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json b/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json index e43a7c8cec..31525abb87 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/tyrunt.json @@ -96,8 +96,6 @@ "tm:aerialace", "tm:ancientpower", "tm:assurance", - "tm:bide", - "tm:bite", "tm:block", "tm:bodyslam", "tm:brickbreak", @@ -119,7 +117,6 @@ "tm:facade", "tm:firefang", "tm:honeclaws", - "tm:horndrill", "tm:hypervoice", "tm:icefang", "tm:irondefense", @@ -129,7 +126,6 @@ "tm:meteorbeam", "tm:outrage", "tm:playrough", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", "tm:rest", @@ -138,26 +134,51 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:scaleshot", "tm:scaryface", "tm:sleeptalk", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", - "tm:tailwhip", "tm:terablast", - "tm:thrash", "tm:thunderfang", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lashout", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json index f0b0e836fb..4a7af25cd1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/vivillon.json @@ -103,7 +103,6 @@ "tm:acrobatics", "tm:aircutter", "tm:airslash", - "tm:aromatherapy", "tm:bugbite", "tm:bugbuzz", "tm:confuseray", @@ -116,44 +115,51 @@ "tm:flash", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", - "tm:harden", "tm:hurricane", "tm:hyperbeam", "tm:infestation", "tm:irondefense", "tm:laserfocus", "tm:lightscreen", - "tm:poisonpowder", "tm:pollenpuff", "tm:pounce", - "tm:powder", "tm:protect", "tm:psybeam", "tm:psychic", - "tm:quiverdance", - "tm:ragepowder", "tm:raindance", "tm:rest", "tm:roost", "tm:safeguard", "tm:signalbeam", "tm:skittersmack", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", "tm:uturn", - "tm:weatherball" + "tm:weatherball", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:laserfocus", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind" ], "preEvolution": "spewpa", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json index 3006abe1ed..d7aa431e2e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json @@ -99,9 +99,7 @@ "tm:hydropump", "tm:hyperbeam", "tm:incinerate", - "tm:leer", "tm:liquidation", - "tm:mist", "tm:mistyterrain", "tm:mudshot", "tm:overheat", @@ -122,8 +120,6 @@ "tm:sludgewave", "tm:smackdown", "tm:solarbeam", - "tm:steameruption", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -134,11 +130,33 @@ "tm:taunt", "tm:terablast", "tm:thunderfang", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:wildcharge", - "tm:willowisp" + "tm:willowisp", + "tutor:bulldoze", + "tutor:defog", + "tutor:earthpower", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:liquidation", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderfang", + "tutor:waterpulse", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json b/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json index 687c536626..1a5c0a4276 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/xerneas.json @@ -71,8 +71,6 @@ "75:closecombat", "80:outrage", "85:gigaimpact", - "tm:aromatherapy", - "tm:aurorabeam", "tm:block", "tm:bodyslam", "tm:calmmind", @@ -88,24 +86,18 @@ "tm:flash", "tm:flashcannon", "tm:focusblast", - "tm:geomancy", "tm:gigaimpact", "tm:grassknot", "tm:gravity", "tm:hail", - "tm:healpulse", - "tm:hornleech", "tm:hyperbeam", "tm:hypervoice", - "tm:ingrain", "tm:laserfocus", "tm:lightscreen", "tm:megahorn", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:naturepower", - "tm:nightslash", "tm:outrage", "tm:playrough", "tm:protect", @@ -122,7 +114,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:terrainpulse", @@ -130,7 +121,31 @@ "tm:thunderbolt", "tm:thunderwave", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:laserfocus", + "tutor:megahorn", + "tutor:mistyexplosion", + "tutor:outrage", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:swift", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json b/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json index f63d268621..1c6856ef6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json @@ -85,10 +85,8 @@ "tm:cut", "tm:darkpulse", "tm:defog", - "tm:disable", "tm:doubleteam", "tm:dragonclaw", - "tm:dragonrush", "tm:dreameater", "tm:dualwingbeat", "tm:embargo", @@ -98,7 +96,6 @@ "tm:focusblast", "tm:foulplay", "tm:gigaimpact", - "tm:gust", "tm:heatwave", "tm:honeclaws", "tm:hurricane", @@ -107,13 +104,11 @@ "tm:knockoff", "tm:laserfocus", "tm:lashout", - "tm:oblivionwing", "tm:payback", "tm:phantomforce", "tm:protect", "tm:psychic", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:rockslide", "tm:roost", @@ -134,7 +129,33 @@ "tm:thief", "tm:torment", "tm:uturn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:darkpulse", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:roost", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:suckerpunch", + "tutor:swift", + "tutor:tailwind", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json b/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json index 9e20051bdf..b135ab64f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json @@ -71,37 +71,29 @@ "form_change:thousandarrows", "form_change:thousandwaves", "tm:bind", - "tm:bite", "tm:block", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:camouflage", - "tm:coil", - "tm:coreenforcer", "tm:crunch", "tm:dig", "tm:dracometeor", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", "tm:earthpower", "tm:earthquake", "tm:endure", - "tm:extremespeed", "tm:facade", "tm:focusblast", "tm:gigaimpact", - "tm:glare", "tm:grassknot", "tm:haze", "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", - "tm:landswrath", "tm:outrage", "tm:painsplit", "tm:payback", @@ -128,9 +120,34 @@ "tm:superpower", "tm:swift", "tm:terablast", - "tm:thousandarrows", - "tm:thousandwaves", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:outrage", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -187,19 +204,14 @@ "form_change:thousandarrows", "form_change:thousandwaves", "tm:bind", - "tm:bite", "tm:block", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:camouflage", - "tm:coil", - "tm:coreenforcer", "tm:crunch", "tm:dig", "tm:dracometeor", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", @@ -210,14 +222,12 @@ "tm:facade", "tm:focusblast", "tm:gigaimpact", - "tm:glare", "tm:grassknot", "tm:haze", "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", - "tm:landswrath", "tm:outrage", "tm:painsplit", "tm:payback", @@ -242,9 +252,33 @@ "tm:superpower", "tm:swift", "tm:terablast", - "tm:thousandarrows", - "tm:thousandwaves", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:outrage", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -307,19 +341,14 @@ "form_change:thousandarrows", "form_change:thousandwaves", "tm:bind", - "tm:bite", "tm:block", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:camouflage", - "tm:coil", - "tm:coreenforcer", "tm:crunch", "tm:dig", "tm:dracometeor", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", @@ -330,14 +359,12 @@ "tm:facade", "tm:focusblast", "tm:gigaimpact", - "tm:glare", "tm:grassknot", "tm:haze", "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", - "tm:landswrath", "tm:outrage", "tm:painsplit", "tm:payback", @@ -362,9 +389,33 @@ "tm:superpower", "tm:swift", "tm:terablast", - "tm:thousandarrows", - "tm:thousandwaves", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:outrage", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -418,19 +469,14 @@ "form_change:thousandarrows", "form_change:thousandwaves", "tm:bind", - "tm:bite", "tm:block", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:camouflage", - "tm:coil", - "tm:coreenforcer", "tm:crunch", "tm:dig", "tm:dracometeor", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", @@ -441,14 +487,12 @@ "tm:facade", "tm:focusblast", "tm:gigaimpact", - "tm:glare", "tm:grassknot", "tm:haze", "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", - "tm:landswrath", "tm:outrage", "tm:painsplit", "tm:payback", @@ -473,9 +517,33 @@ "tm:superpower", "tm:swift", "tm:terablast", - "tm:thousandarrows", - "tm:thousandwaves", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:outrage", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -537,19 +605,14 @@ "form_change:thousandarrows", "form_change:thousandwaves", "tm:bind", - "tm:bite", "tm:block", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:camouflage", - "tm:coil", - "tm:coreenforcer", "tm:crunch", "tm:dig", "tm:dracometeor", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", @@ -560,14 +623,12 @@ "tm:facade", "tm:focusblast", "tm:gigaimpact", - "tm:glare", "tm:grassknot", "tm:haze", "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", - "tm:landswrath", "tm:outrage", "tm:painsplit", "tm:payback", @@ -592,9 +653,33 @@ "tm:superpower", "tm:swift", "tm:terablast", - "tm:thousandarrows", - "tm:thousandwaves", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:outrage", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": true diff --git a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json b/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json index d1ccf12a20..7f22719fdb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json @@ -99,13 +99,8 @@ "egg:spitup", "egg:stickyweb", "egg:stockpile", - "tm:aquaring", - "tm:aurorabeam", - "tm:bite", "tm:blizzard", "tm:bodyslam", - "tm:bubble", - "tm:bubblebeam", "tm:bugbite", "tm:bugbuzz", "tm:chillingwater", @@ -113,7 +108,6 @@ "tm:dive", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:frostbreath", "tm:gigadrain", @@ -131,10 +125,8 @@ "tm:lunge", "tm:magiccoat", "tm:magicroom", - "tm:mirrorcoat", "tm:poisonjab", "tm:pounce", - "tm:powersplit", "tm:protect", "tm:raindance", "tm:reflect", @@ -144,22 +136,36 @@ "tm:signalbeam", "tm:skittersmack", "tm:sleeptalk", - "tm:soak", - "tm:spiderweb", - "tm:spitup", - "tm:stickyweb", - "tm:stockpile", "tm:substitute", "tm:surf", "tm:terablast", "tm:trailblaze", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:wideguard", "tm:wonderroom", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:dive", + "tutor:endeavor", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:poisonjab", + "tutor:rest", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:xscissor" ], "preEvolution": "dewpider", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json index 0cd7c06b85..423a06ef6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bewear.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bewear.json @@ -88,7 +88,6 @@ "egg:wideguard", "tm:aerialace", "tm:babydolleyes", - "tm:bide", "tm:bind", "tm:bodypress", "tm:bodyslam", @@ -100,7 +99,6 @@ "tm:closecombat", "tm:coaching", "tm:darkestlariat", - "tm:defensecurl", "tm:doubleedge", "tm:dragonclaw", "tm:drainpunch", @@ -108,18 +106,14 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:flail", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:forcepalm", "tm:gigaimpact", - "tm:hammerarm", "tm:highhorsepower", "tm:hyperbeam", "tm:icepunch", "tm:ironhead", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -137,21 +131,43 @@ "tm:rollout", "tm:shadowclaw", "tm:sleeptalk", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:superpower", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:thunderpunch", - "tm:wideguard", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:babydolleyes", + "tutor:bind", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:ironhead", + "tutor:lowkick", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "preEvolution": "stufful", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json b/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json index f02b7d19b6..322d6df46d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json @@ -76,11 +76,9 @@ "65:fireblast", "70:mindblown", "tm:afteryou", - "tm:astonish", "tm:calmmind", "tm:confuseray", "tm:darkpulse", - "tm:ember", "tm:encore", "tm:endure", "tm:expandingforce", @@ -89,20 +87,17 @@ "tm:fireblast", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:fling", "tm:foulplay", "tm:heatwave", "tm:hyperbeam", - "tm:hypnosis", "tm:incinerate", "tm:knockoff", "tm:lastresort", "tm:lightscreen", "tm:magiccoat", - "tm:mindblown", "tm:mysticalfire", "tm:nightshade", "tm:overheat", @@ -132,7 +127,31 @@ "tm:trick", "tm:uproar", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:expandingforce", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json index 5df8a7bcc2..e570130f2e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bounsweet.json @@ -73,9 +73,6 @@ "egg:feint", "egg:grasswhistle", "egg:synthesis", - "tm:acupressure", - "tm:aromatherapy", - "tm:aromaticmist", "tm:bounce", "tm:bulletseed", "tm:charm", @@ -86,11 +83,8 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:feint", - "tm:flail", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", @@ -98,29 +92,40 @@ "tm:lightscreen", "tm:magicalleaf", "tm:naturepower", - "tm:playnice", "tm:playrough", "tm:protect", - "tm:rapidspin", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:safeguard", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", - "tm:splash", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:synthesis", "tm:takedown", - "tm:teeterdance", "tm:terablast", "tm:trailblaze", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/brionne.json b/common/src/main/resources/data/cobblemon/species/generation7/brionne.json index 81a4902657..e591141c43 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/brionne.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/brionne.json @@ -98,29 +98,23 @@ "egg:perishsong", "tm:acrobatics", "tm:amnesia", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", - "tm:aromaticmist", "tm:babydolleyes", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bubblebeam", "tm:captivate", "tm:charm", "tm:chillingwater", "tm:covet", "tm:disarmingvoice", "tm:dive", - "tm:doubleslap", "tm:drainingkiss", "tm:echoedvoice", "tm:encore", "tm:endure", "tm:facade", "tm:flipturn", - "tm:growl", "tm:hail", "tm:helpinghand", "tm:hydropump", @@ -129,16 +123,11 @@ "tm:icespinner", "tm:icywind", "tm:irontail", - "tm:lifedew", "tm:mistyterrain", - "tm:moonblast", - "tm:perishsong", "tm:playrough", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", - "tm:sing", "tm:sleeptalk", "tm:substitute", "tm:surf", @@ -147,12 +136,30 @@ "tm:tripleaxel", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:whirlpool", "tm:wonderroom", - "tm:workup" + "tm:workup", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:covet", + "tutor:dive", + "tutor:flipturn", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:wonderroom" ], "preEvolution": "popplio", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json b/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json index 76db41d5c7..5a1a2f3f36 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json @@ -102,17 +102,12 @@ "tm:afteryou", "tm:agility", "tm:allyswitch", - "tm:aquajet", "tm:aquatail", - "tm:astonish", - "tm:bite", "tm:blizzard", "tm:bulkup", "tm:calmmind", "tm:chillingwater", - "tm:confusion", "tm:crunch", - "tm:disable", "tm:dreameater", "tm:embargo", "tm:endure", @@ -133,15 +128,12 @@ "tm:magicroom", "tm:painsplit", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychic", "tm:psychicfangs", "tm:psychicnoise", "tm:psychicterrain", "tm:psyshock", - "tm:psywave", - "tm:rage", "tm:raindance", "tm:reflect", "tm:rest", @@ -155,7 +147,6 @@ "tm:superfang", "tm:surf", "tm:swordsdance", - "tm:synchronoise", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -164,11 +155,36 @@ "tm:trickroom", "tm:venoshock", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:wavecrash", "tm:whirlpool", - "tm:wonderroom" + "tm:wonderroom", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:aquatail", + "tutor:bulkup", + "tutor:calmmind", + "tutor:expandingforce", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:superfang", + "tutor:telekinesis", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json b/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json index 63830b16a2..a102f83679 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json @@ -83,26 +83,20 @@ "tm:bulldoze", "tm:closecombat", "tm:coaching", - "tm:cometpunch", - "tm:counter", "tm:darkestlariat", "tm:drainpunch", "tm:dualchop", "tm:dualwingbeat", - "tm:dynamicpunch", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:fellstinger", "tm:fling", "tm:focusenergy", "tm:focuspunch", "tm:gigaimpact", "tm:gyroball", - "tm:hammerarm", - "tm:harden", "tm:highhorsepower", "tm:icepunch", "tm:ironhead", @@ -130,8 +124,34 @@ "tm:taunt", "tm:terablast", "tm:thunderpunch", - "tm:vitalthrow", - "tm:workup" + "tm:workup", + "tutor:bounce", + "tutor:bugbite", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:icepunch", + "tutor:ironhead", + "tutor:leechlife", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:roost", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:thunderpunch" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json b/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json index 0fdffd673e..905000e434 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json @@ -74,10 +74,8 @@ "60:heavyslam", "65:doubleedge", "70:skullbash", - "tm:absorb", "tm:acrobatics", "tm:airslash", - "tm:autotomize", "tm:block", "tm:bodyslam", "tm:brutalswing", @@ -98,15 +96,11 @@ "tm:grassknot", "tm:gravity", "tm:gyroball", - "tm:harden", "tm:heavyslam", "tm:hyperbeam", - "tm:ingrain", "tm:irondefense", "tm:ironhead", - "tm:leechseed", "tm:magnetrise", - "tm:megadrain", "tm:megahorn", "tm:metalsound", "tm:meteorbeam", @@ -116,7 +110,6 @@ "tm:seedbomb", "tm:selfdestruct", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:smartstrike", @@ -127,10 +120,33 @@ "tm:stoneedge", "tm:substitute", "tm:superpower", - "tm:tackle", "tm:terablast", - "tm:wideguard", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulldoze", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magnetrise", + "tutor:megahorn", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json index 81b618eb1e..c1297b16ad 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json @@ -81,20 +81,17 @@ "egg:discharge", "egg:harden", "tm:batonpass", - "tm:bite", "tm:bugbite", "tm:charge", "tm:chargebeam", "tm:crunch", "tm:dig", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:endure", "tm:facade", - "tm:harden", "tm:irondefense", "tm:lightscreen", "tm:lunge", @@ -111,8 +108,6 @@ "tm:shockwave", "tm:skittersmack", "tm:sleeptalk", - "tm:spark", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -121,10 +116,25 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:visegrip", "tm:voltswitch", "tm:wildcharge", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:irondefense", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:xscissor" ], "preEvolution": "grubbin", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/comfey.json b/common/src/main/resources/data/cobblemon/species/generation7/comfey.json index 145d687c77..2eafa8bc77 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/comfey.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/comfey.json @@ -105,7 +105,6 @@ "tm:alluringvoice", "tm:allyswitch", "tm:amnesia", - "tm:aromatherapy", "tm:bind", "tm:bulletseed", "tm:calmmind", @@ -121,28 +120,21 @@ "tm:energyball", "tm:facade", "tm:fling", - "tm:floralhealing", - "tm:flowershield", "tm:gigadrain", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:healbell", "tm:helpinghand", "tm:hyperbeam", "tm:knockoff", - "tm:leaftornado", - "tm:leechseed", "tm:lightscreen", - "tm:luckychant", "tm:magicalleaf", "tm:magiccoat", "tm:naturalgift", "tm:naturepower", "tm:painsplit", "tm:petalblizzard", - "tm:petaldance", "tm:playrough", "tm:pollenpuff", "tm:protect", @@ -156,8 +148,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", - "tm:sweetscent", "tm:swift", "tm:synthesis", "tm:tailwind", @@ -169,9 +159,35 @@ "tm:trick", "tm:trickroom", "tm:uturn", - "tm:vinewhip", "tm:worryseed", - "tm:wrap" + "tutor:afteryou", + "tutor:allyswitch", + "tutor:bind", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:playrough", + "tutor:rest", + "tutor:roleplay", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:worryseed" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json b/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json index ae53b27fe7..c75e4bcc61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json @@ -52,9 +52,7 @@ "1:cosmicpower", "1:teleport", "1:splash", - "tm:cosmicpower", - "tm:splash", - "tm:teleport" + "tm:cosmicpower" ], "preEvolution": "cosmog", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json b/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json index 59d4d86fd5..8c9ef401a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json @@ -50,9 +50,7 @@ }, "moves": [ "1:splash", - "1:teleport", - "tm:splash", - "tm:teleport" + "1:teleport" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json index 789de7d900..ed28466a21 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/crabominable.json @@ -100,19 +100,14 @@ "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", - "tm:bubble", - "tm:bubblebeam", "tm:bulkup", "tm:bulldoze", "tm:chillingwater", "tm:closecombat", "tm:coaching", - "tm:crabhammer", "tm:dig", - "tm:dizzypunch", "tm:drainpunch", "tm:dualchop", - "tm:dynamicpunch", "tm:earthquake", "tm:endeavor", "tm:endure", @@ -128,21 +123,18 @@ "tm:helpinghand", "tm:hyperbeam", "tm:icebeam", - "tm:icehammer", "tm:icepunch", "tm:icespinner", "tm:icywind", "tm:irondefense", "tm:ironhead", "tm:knockoff", - "tm:leer", "tm:liquidation", "tm:mudshot", "tm:mudslap", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:reversal", @@ -150,7 +142,6 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:slam", "tm:sleeptalk", "tm:snowscape", "tm:stompingtantrum", @@ -163,10 +154,37 @@ "tm:thief", "tm:thunderpunch", "tm:upperhand", - "tm:visegrip", - "tm:wideguard", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "preEvolution": "crabrawler", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json b/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json index b65596b5ff..c18731a9b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/crabrawler.json @@ -92,19 +92,14 @@ "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", - "tm:bubble", - "tm:bubblebeam", "tm:bulkup", "tm:bulldoze", "tm:chillingwater", "tm:closecombat", "tm:coaching", - "tm:crabhammer", "tm:dig", - "tm:dizzypunch", "tm:drainpunch", "tm:dualchop", - "tm:dynamicpunch", "tm:earthquake", "tm:endeavor", "tm:endure", @@ -119,21 +114,18 @@ "tm:irondefense", "tm:ironhead", "tm:knockoff", - "tm:leer", "tm:liquidation", "tm:mudshot", "tm:mudslap", "tm:payback", "tm:poweruppunch", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:reversal", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:slam", "tm:sleeptalk", "tm:stompingtantrum", "tm:substitute", @@ -145,10 +137,32 @@ "tm:thief", "tm:thunderpunch", "tm:upperhand", - "tm:visegrip", - "tm:wideguard", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:focuspunch", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json b/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json index 881fd36a3e..7c2bd3a259 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cutiefly.json @@ -95,14 +95,10 @@ "egg:moonblast", "egg:powder", "egg:stickyweb", - "tm:absorb", "tm:acrobatics", "tm:afteryou", "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", "tm:batonpass", - "tm:bestow", "tm:bugbite", "tm:bugbuzz", "tm:calmmind", @@ -115,7 +111,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:grassknot", "tm:helpinghand", @@ -126,15 +121,12 @@ "tm:lightscreen", "tm:magicalleaf", "tm:magicroom", - "tm:moonblast", "tm:playrough", "tm:pollenpuff", "tm:pounce", - "tm:powder", "tm:protect", "tm:psychic", "tm:psychup", - "tm:quiverdance", "tm:reflect", "tm:rest", "tm:roost", @@ -145,14 +137,10 @@ "tm:skittersmack", "tm:sleeptalk", "tm:speedswap", - "tm:stickyweb", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", - "tm:switcheroo", "tm:tailwind", "tm:telekinesis", "tm:terablast", @@ -160,7 +148,33 @@ "tm:trailblaze", "tm:trick", "tm:uturn", - "tm:wonderroom" + "tm:wonderroom", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:bugbite", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:energyball", + "tutor:helpinghand", + "tutor:lastresort", + "tutor:leechlife", + "tutor:magicalleaf", + "tutor:magicroom", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json index 5a85173741..37f8f0474b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dartrix.json @@ -101,7 +101,6 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:astonish", "tm:batonpass", "tm:bravebird", "tm:bulletseed", @@ -116,18 +115,14 @@ "tm:facade", "tm:falseswipe", "tm:featherdance", - "tm:foresight", - "tm:furyattack", "tm:gigadrain", "tm:grassknot", "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:haze", "tm:helpinghand", "tm:knockoff", - "tm:leafage", "tm:leafblade", "tm:leafstorm", "tm:lightscreen", @@ -135,17 +130,14 @@ "tm:nastyplot", "tm:naturepower", "tm:nightshade", - "tm:peck", "tm:pluck", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:roost", "tm:safeguard", "tm:seedbomb", "tm:shadowclaw", - "tm:shadowsneak", "tm:skyattack", "tm:sleeptalk", "tm:solarbeam", @@ -156,13 +148,36 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:trailblaze", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:aircutter", + "tutor:covet", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:falseswipe", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:rest", + "tutor:roost", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:tailwind", + "tutor:worryseed" ], "preEvolution": "rowlet", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json index 6cbaff5fd5..6f340ec3f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/decidueye.json @@ -107,7 +107,6 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:astonish", "tm:batonpass", "tm:bravebird", "tm:bulletseed", @@ -123,16 +122,13 @@ "tm:facade", "tm:falseswipe", "tm:featherdance", - "tm:foresight", "tm:frenzyplant", - "tm:furyattack", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:haze", "tm:helpinghand", "tm:hex", @@ -141,7 +137,6 @@ "tm:imprison", "tm:knockoff", "tm:laserfocus", - "tm:leafage", "tm:leafblade", "tm:leafstorm", "tm:lightscreen", @@ -152,28 +147,24 @@ "tm:naturepower", "tm:nightshade", "tm:ominouswind", - "tm:peck", "tm:phantomforce", "tm:pluck", "tm:poltergeist", "tm:protect", "tm:psychocut", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:roost", "tm:safeguard", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:skittersmack", "tm:skyattack", "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", "tm:solarblade", - "tm:spiritshackle", "tm:spite", "tm:steelwing", "tm:substitute", @@ -182,14 +173,48 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:trailblaze", "tm:uturn", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:aircutter", + "tutor:covet", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:falseswipe", + "tutor:frenzyplant", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:ominouswind", + "tutor:poltergeist", + "tutor:psychocut", + "tutor:rest", + "tutor:roost", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:tailwind", + "tutor:worryseed" ], "preEvolution": "dartrix", "evolutions": [], @@ -252,7 +277,6 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:astonish", "tm:aurasphere", "tm:batonpass", "tm:bravebird", @@ -273,21 +297,17 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", "tm:frenzyplant", - "tm:furyattack", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:haze", "tm:helpinghand", "tm:hyperbeam", "tm:knockoff", - "tm:leafage", "tm:leafblade", "tm:leafstorm", "tm:lightscreen", @@ -296,12 +316,10 @@ "tm:magicalleaf", "tm:nastyplot", "tm:nightshade", - "tm:peck", "tm:pluck", "tm:protect", "tm:psychocut", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:reversal", "tm:rocksmash", @@ -310,7 +328,6 @@ "tm:scaryface", "tm:seedbomb", "tm:shadowclaw", - "tm:shadowsneak", "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", @@ -320,15 +337,44 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:taunt", "tm:terablast", "tm:trailblaze", - "tm:triplearrows", "tm:upperhand", - "tm:uturn" + "tm:uturn", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bulkup", + "tutor:coaching", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:frenzyplant", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:psychocut", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:tailwind" ], "preEvolution": "dartrix", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json b/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json index fff72d01e4..c4a1dbf99f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json @@ -98,19 +98,13 @@ "egg:spitup", "egg:stickyweb", "egg:stockpile", - "tm:aquaring", - "tm:aurorabeam", - "tm:bite", "tm:blizzard", - "tm:bubble", - "tm:bubblebeam", "tm:bugbite", "tm:bugbuzz", "tm:chillingwater", "tm:crunch", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:frostbreath", "tm:gigadrain", @@ -125,31 +119,40 @@ "tm:lunge", "tm:magiccoat", "tm:magicroom", - "tm:mirrorcoat", "tm:poisonjab", "tm:pounce", - "tm:powersplit", "tm:protect", "tm:raindance", "tm:rest", "tm:signalbeam", "tm:skittersmack", "tm:sleeptalk", - "tm:soak", - "tm:spiderweb", - "tm:spitup", - "tm:stickyweb", - "tm:stockpile", "tm:substitute", "tm:surf", "tm:terablast", "tm:trailblaze", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", "tm:wonderroom", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:endeavor", + "tutor:gigadrain", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:leechlife", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:poisonjab", + "tutor:rest", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:waterpulse", + "tutor:wonderroom", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json b/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json index 617432a090..6a64d083c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json @@ -94,12 +94,9 @@ "56:energyball", "60:phantomforce", "64:powerwhip", - "tm:absorb", "tm:aerialace", "tm:allyswitch", - "tm:anchorshot", "tm:assurance", - "tm:astonish", "tm:block", "tm:bodypress", "tm:brickbreak", @@ -116,7 +113,6 @@ "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", - "tm:growth", "tm:gyroball", "tm:heavyslam", "tm:helpinghand", @@ -127,7 +123,6 @@ "tm:ironhead", "tm:knockoff", "tm:liquidation", - "tm:megadrain", "tm:metalsound", "tm:muddywater", "tm:painsplit", @@ -137,13 +132,11 @@ "tm:powerwhip", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:rockslide", "tm:roleplay", "tm:shadowball", "tm:shadowclaw", - "tm:slam", "tm:sleeptalk", "tm:sludgewave", "tm:solarbeam", @@ -153,14 +146,39 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:switcheroo", "tm:swordsdance", "tm:synthesis", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:whirlpool", - "tm:wrap" + "tutor:aerialace", + "tutor:allyswitch", + "tutor:block", + "tutor:bulldoze", + "tutor:energyball", + "tutor:flashcannon", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:liquidation", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:steelroller", + "tutor:synthesis", + "tutor:telekinesis" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/drampa.json b/common/src/main/resources/data/cobblemon/species/generation7/drampa.json index 32ba16d3cc..fbed0378d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/drampa.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/drampa.json @@ -97,19 +97,15 @@ "tm:calmmind", "tm:defog", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:earthquake", "tm:echoedvoice", "tm:endeavor", "tm:endure", "tm:energyball", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:flamethrower", @@ -117,7 +113,6 @@ "tm:fly", "tm:focusblast", "tm:gigaimpact", - "tm:glare", "tm:grassknot", "tm:heatwave", "tm:helpinghand", @@ -129,16 +124,13 @@ "tm:icywind", "tm:lashout", "tm:lightscreen", - "tm:mist", "tm:naturalgift", "tm:naturepower", "tm:outrage", - "tm:playnice", "tm:playrough", "tm:protect", "tm:psychup", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roar", "tm:rockslide", @@ -164,11 +156,47 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:twister", "tm:uproar", "tm:waterpulse", - "tm:workup" + "tm:workup", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:defog", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:endeavor", + "tutor:energyball", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:lashout", + "tutor:outrage", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:twister", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/fomantis.json b/common/src/main/resources/data/cobblemon/species/generation7/fomantis.json index fde4f58863..9e342e49ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/fomantis.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/fomantis.json @@ -84,7 +84,6 @@ "egg:defog", "egg:superpower", "egg:worryseed", - "tm:aromatherapy", "tm:bugbite", "tm:bulletseed", "tm:defog", @@ -99,9 +98,6 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:ingrain", - "tm:leafage", "tm:leafblade", "tm:leafstorm", "tm:leechlife", @@ -110,19 +106,16 @@ "tm:payback", "tm:petalblizzard", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", "tm:signalbeam", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:takedown", @@ -130,7 +123,26 @@ "tm:trailblaze", "tm:weatherball", "tm:worryseed", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:defog", + "tutor:dualchop", + "tutor:energyball", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:leechlife", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:synthesis", + "tutor:worryseed", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json b/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json index 0d0c3ec603..2a1625fe55 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/golisopod.json @@ -95,7 +95,6 @@ "egg:rollout", "egg:wideguard", "tm:aerialace", - "tm:aquajet", "tm:assurance", "tm:blizzard", "tm:brickbreak", @@ -104,7 +103,6 @@ "tm:bulkup", "tm:closecombat", "tm:darkpulse", - "tm:defensecurl", "tm:dive", "tm:drillrun", "tm:dualchop", @@ -112,14 +110,12 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:firstimpression", "tm:fling", "tm:focusblast", "tm:frostbreath", "tm:furycutter", "tm:gigaimpact", "tm:hail", - "tm:harden", "tm:hyperbeam", "tm:icebeam", "tm:icywind", @@ -145,12 +141,10 @@ "tm:rocksmash", "tm:rocktomb", "tm:rollout", - "tm:sandattack", "tm:scald", "tm:screech", "tm:shadowclaw", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -169,8 +163,45 @@ "tm:venoshock", "tm:waterfall", "tm:waterpulse", - "tm:wideguard", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bugbite", + "tutor:bulkup", + "tutor:darkpulse", + "tutor:dive", + "tutor:drillrun", + "tutor:dualchop", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:liquidation", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spikes", + "tutor:spite", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse", + "tutor:xscissor" ], "preEvolution": "wimpod", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json b/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json index 5b18c77693..a8cddb4b72 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json @@ -77,18 +77,15 @@ "egg:discharge", "egg:harden", "tm:batonpass", - "tm:bite", "tm:bugbite", "tm:charge", "tm:chargebeam", "tm:crunch", "tm:dig", - "tm:discharge", "tm:electricterrain", "tm:electroweb", "tm:endure", "tm:facade", - "tm:harden", "tm:lightscreen", "tm:lunge", "tm:magnetrise", @@ -104,8 +101,6 @@ "tm:shockwave", "tm:skittersmack", "tm:sleeptalk", - "tm:spark", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -113,10 +108,24 @@ "tm:terablast", "tm:thunderbolt", "tm:thunderwave", - "tm:visegrip", "tm:voltswitch", "tm:wildcharge", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json index 8762522cf3..c3e3fc841e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json @@ -82,8 +82,6 @@ "egg:lastresort", "egg:thunderfang", "egg:yawn", - "tm:bide", - "tm:bite", "tm:block", "tm:bodyslam", "tm:bulldoze", @@ -105,29 +103,24 @@ "tm:gigaimpact", "tm:helpinghand", "tm:hyperbeam", - "tm:hyperfang", "tm:icefang", "tm:icepunch", "tm:ironhead", "tm:irontail", "tm:knockoff", "tm:lastresort", - "tm:leer", "tm:lowsweep", "tm:mudshot", "tm:mudslap", - "tm:odorsleuth", "tm:payback", "tm:protect", "tm:psychicfangs", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:revenge", "tm:reversal", "tm:roar", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:seedbomb", @@ -137,12 +130,10 @@ "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderfang", "tm:thunderpunch", "tm:torment", @@ -150,8 +141,35 @@ "tm:uturn", "tm:wildcharge", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:block", + "tutor:bulldoze", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "yungoos", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json b/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json index 4097043b6d..b156623897 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json @@ -79,8 +79,6 @@ "65:thrash", "70:gigaimpact", "tm:amnesia", - "tm:belch", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -92,8 +90,6 @@ "tm:dracometeor", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:drainpunch", "tm:dualchop", @@ -106,7 +102,6 @@ "tm:gastroacid", "tm:gigaimpact", "tm:gyroball", - "tm:hammerarm", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", @@ -135,19 +130,44 @@ "tm:sludgewave", "tm:smackdown", "tm:snarl", - "tm:steamroller", "tm:steelroller", - "tm:stockpile", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", - "tm:swallow", "tm:terablast", "tm:thief", - "tm:thrash", - "tm:wideguard", - "tm:wringout" + "tutor:bulldoze", + "tutor:corrosivegas", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:flamethrower", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json b/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json index 02b81e8555..6cbbcb3ee6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/hakamoo.json @@ -89,8 +89,6 @@ "egg:focuspunch", "tm:aerialace", "tm:aquatail", - "tm:autotomize", - "tm:bide", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", @@ -99,10 +97,8 @@ "tm:bulldoze", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -122,12 +118,10 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:leer", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:metalclaw", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -142,12 +136,10 @@ "tm:scaryface", "tm:screech", "tm:shadowclaw", - "tm:skyuppercut", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -155,7 +147,31 @@ "tm:upperhand", "tm:vacuumwave", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lowkick", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:throatchop", + "tutor:vacuumwave", + "tutor:xscissor" ], "preEvolution": "jangmoo", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json index 6d5ba2677f..edcc9306bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/incineroar.json @@ -102,7 +102,6 @@ "tm:assurance", "tm:batonpass", "tm:bind", - "tm:bite", "tm:blastburn", "tm:blazekick", "tm:bodyslam", @@ -113,21 +112,17 @@ "tm:burningjealousy", "tm:closecombat", "tm:covet", - "tm:crosschop", "tm:crunch", "tm:darkestlariat", "tm:darkpulse", "tm:doubleedge", - "tm:doublekick", "tm:drainpunch", "tm:dualchop", "tm:earthquake", "tm:embargo", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:fireblast", "tm:firefang", "tm:firepledge", @@ -139,9 +134,7 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:furyswipes", "tm:gigaimpact", - "tm:growl", "tm:heatcrash", "tm:heatwave", "tm:helpinghand", @@ -150,8 +143,6 @@ "tm:knockoff", "tm:lashout", "tm:leechlife", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -159,9 +150,7 @@ "tm:nastyplot", "tm:outrage", "tm:overheat", - "tm:partingshot", "tm:payday", - "tm:powertrip", "tm:protect", "tm:quash", "tm:rest", @@ -170,7 +159,6 @@ "tm:roar", "tm:scaryface", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:snarl", @@ -186,14 +174,49 @@ "tm:temperflare", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunderpunch", "tm:torment", "tm:trailblaze", "tm:uturn", "tm:willowisp", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bind", + "tutor:blastburn", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:covet", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:knockoff", + "tutor:lashout", + "tutor:leechlife", + "tutor:lowkick", + "tutor:outrage", + "tutor:rest", + "tutor:scorchingsands", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderpunch" ], "preEvolution": "torracat", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json b/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json index 4d5a27c73c..55202aa98c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/jangmoo.json @@ -84,15 +84,12 @@ "egg:dragonbreath", "egg:focuspunch", "tm:aquatail", - "tm:bide", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:counter", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -110,9 +107,7 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:leer", "tm:lowkick", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -130,12 +125,30 @@ "tm:sleeptalk", "tm:substitute", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualchop", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lowkick", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/kartana.json b/common/src/main/resources/data/cobblemon/species/generation7/kartana.json index b8da9381d0..670d4db99a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/kartana.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/kartana.json @@ -81,24 +81,19 @@ "tm:calmmind", "tm:cut", "tm:defog", - "tm:detect", "tm:endure", "tm:falseswipe", "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", - "tm:guillotine", "tm:irondefense", "tm:knockoff", "tm:laserfocus", "tm:lastresort", "tm:leafblade", - "tm:nightslash", "tm:protect", "tm:psychocut", - "tm:razorleaf", "tm:rest", - "tm:sacredsword", "tm:screech", "tm:sleeptalk", "tm:smartstrike", @@ -110,7 +105,27 @@ "tm:tailwind", "tm:terablast", "tm:vacuumwave", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:calmmind", + "tutor:defog", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:irondefense", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:psychocut", + "tutor:rest", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:synthesis", + "tutor:tailwind", + "tutor:vacuumwave", + "tutor:xscissor" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/komala.json b/common/src/main/resources/data/cobblemon/species/generation7/komala.json index 6aa2a945f7..62b323b280 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/komala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/komala.json @@ -97,13 +97,11 @@ "tm:calmmind", "tm:charm", "tm:curse", - "tm:defensecurl", "tm:doubleedge", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:fling", "tm:gigaimpact", "tm:gunkshot", @@ -121,37 +119,49 @@ "tm:psychup", "tm:quash", "tm:raindance", - "tm:rapidspin", "tm:reversal", "tm:rockslide", "tm:rocktomb", "tm:rollout", "tm:seedbomb", "tm:shadowclaw", - "tm:sing", - "tm:slam", "tm:sleeptalk", - "tm:spitup", - "tm:stockpile", "tm:stompingtantrum", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:superfang", "tm:superpower", - "tm:swallow", "tm:swordsdance", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:trailblaze", "tm:uturn", - "tm:wish", - "tm:woodhammer", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:knockoff", + "tutor:lastresort", + "tutor:lowkick", + "tutor:playrough", + "tutor:rockslide", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:superpower", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json b/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json index 4e9ccaa548..946b5c8462 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/kommoo.json @@ -95,25 +95,17 @@ "tm:aerialace", "tm:aquatail", "tm:aurasphere", - "tm:autotomize", - "tm:bellydrum", - "tm:bide", "tm:bodypress", "tm:bodyslam", - "tm:boomburst", "tm:breakingswipe", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", "tm:bulldoze", - "tm:clangingscales", - "tm:clangoroussoul", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -143,13 +135,11 @@ "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:metalclaw", "tm:metalsound", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:poisonjab", @@ -169,7 +159,6 @@ "tm:screech", "tm:shadowclaw", "tm:shockwave", - "tm:skyuppercut", "tm:sleeptalk", "tm:stealthrock", "tm:stompingtantrum", @@ -177,7 +166,6 @@ "tm:sunnyday", "tm:superpower", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -186,7 +174,47 @@ "tm:upperhand", "tm:vacuumwave", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:vacuumwave", + "tutor:xscissor" ], "preEvolution": "hakamoo", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/litten.json b/common/src/main/resources/data/cobblemon/species/generation7/litten.json index 07e2dba7af..70af5c25c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/litten.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/litten.json @@ -93,18 +93,14 @@ "egg:partingshot", "egg:powertrip", "tm:acrobatics", - "tm:bite", "tm:bodyslam", "tm:bulkup", "tm:covet", "tm:crunch", "tm:doubleedge", - "tm:doublekick", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:fireblast", "tm:firefang", "tm:firepledge", @@ -112,25 +108,18 @@ "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", - "tm:furyswipes", - "tm:growl", "tm:heatwave", "tm:helpinghand", "tm:leechlife", - "tm:leer", - "tm:lick", "tm:nastyplot", "tm:outrage", "tm:overheat", - "tm:partingshot", "tm:payday", - "tm:powertrip", "tm:protect", "tm:rest", "tm:revenge", "tm:roar", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:substitute", @@ -141,12 +130,24 @@ "tm:taunt", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:torment", "tm:trailblaze", "tm:uturn", "tm:willowisp", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:covet", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:leechlife", + "tutor:outrage", + "tutor:rest", + "tutor:shadowclaw", + "tutor:sleeptalk" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lunala.json b/common/src/main/resources/data/cobblemon/species/generation7/lunala.json index d1e6547117..58412c3fbd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lunala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lunala.json @@ -84,7 +84,6 @@ "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:confusion", "tm:cosmicpower", "tm:dazzlinggleam", "tm:defog", @@ -101,17 +100,12 @@ "tm:helpinghand", "tm:hex", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icywind", "tm:lightscreen", "tm:magiccoat", "tm:magicroom", "tm:meteorbeam", - "tm:moonblast", - "tm:moongeistbeam", - "tm:moonlight", - "tm:nightdaze", "tm:nightshade", "tm:phantomforce", "tm:poltergeist", @@ -135,22 +129,53 @@ "tm:sleeptalk", "tm:solarbeam", "tm:spite", - "tm:splash", "tm:substitute", "tm:sunnyday", "tm:swift", "tm:tailwind", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:trick", "tm:trickroom", - "tm:wideguard", "tm:willowisp", "tm:wonderroom", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:meteorbeam", + "tutor:poltergeist", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "cosmoem", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json b/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json index aee91102de..e9fb30f90b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lurantis.json @@ -87,7 +87,6 @@ "egg:defog", "egg:superpower", "egg:worryseed", - "tm:aromatherapy", "tm:brickbreak", "tm:bugbite", "tm:bulletseed", @@ -105,19 +104,15 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:hyperbeam", - "tm:ingrain", "tm:knockoff", "tm:laserfocus", - "tm:leafage", "tm:leafblade", "tm:leafstorm", "tm:leechlife", "tm:lowsweep", "tm:magicalleaf", "tm:naturepower", - "tm:nightslash", "tm:payback", "tm:petalblizzard", "tm:poisonjab", @@ -125,21 +120,18 @@ "tm:protect", "tm:psychocut", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:scaryface", "tm:seedbomb", "tm:signalbeam", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:sweetscent", "tm:swordsdance", "tm:synthesis", "tm:takedown", @@ -147,7 +139,32 @@ "tm:trailblaze", "tm:weatherball", "tm:worryseed", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:defog", + "tutor:dualchop", + "tutor:energyball", + "tutor:falseswipe", + "tutor:furycutter", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:magicalleaf", + "tutor:poisonjab", + "tutor:psychocut", + "tutor:rest", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:synthesis", + "tutor:worryseed", + "tutor:xscissor" ], "preEvolution": "fomantis", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json b/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json index e50575e16a..ecf1122f43 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json @@ -90,10 +90,8 @@ "egg:odorsleuth", "egg:suckerpunch", "egg:thrash", - "tm:accelerock", "tm:agility", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", @@ -102,7 +100,6 @@ "tm:closecombat", "tm:covet", "tm:crunch", - "tm:crushclaw", "tm:dig", "tm:doubleedge", "tm:doubleteam", @@ -115,29 +112,22 @@ "tm:firefang", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:irondefense", "tm:ironhead", "tm:irontail", "tm:lastresort", - "tm:leer", "tm:mudslap", - "tm:odorsleuth", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:roar", "tm:rockblast", "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", @@ -150,15 +140,41 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailslap", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:thunderfang", "tm:trailblaze", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:drillrun", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "preEvolution": "rockruff", "evolutions": [], @@ -217,17 +233,14 @@ "egg:odorsleuth", "egg:suckerpunch", "egg:thrash", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", "tm:closecombat", - "tm:counter", "tm:covet", "tm:crunch", - "tm:crushclaw", "tm:dig", "tm:doubleedge", "tm:doubleteam", @@ -244,7 +257,6 @@ "tm:foulplay", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:irondefense", "tm:ironhead", @@ -253,12 +265,10 @@ "tm:laserfocus", "tm:lashout", "tm:lastresort", - "tm:leer", "tm:lowsweep", "tm:megakick", "tm:megapunch", "tm:mudslap", - "tm:odorsleuth", "tm:outrage", "tm:payback", "tm:playrough", @@ -272,9 +282,7 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:shadowclaw", @@ -287,17 +295,52 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:thunderfang", "tm:thunderpunch", "tm:trailblaze", "tm:upperhand", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:dualchop", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lashout", + "tutor:lastresort", + "tutor:mudslap", + "tutor:outrage", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "preEvolution": "rockruff", "evolutions": [], @@ -361,18 +404,14 @@ "egg:odorsleuth", "egg:suckerpunch", "egg:thrash", - "tm:accelerock", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", "tm:closecombat", - "tm:counter", "tm:covet", "tm:crunch", - "tm:crushclaw", "tm:dig", "tm:doubleedge", "tm:doubleteam", @@ -386,21 +425,16 @@ "tm:focusenergy", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:irondefense", "tm:ironhead", "tm:irontail", "tm:lastresort", - "tm:leer", "tm:mudslap", - "tm:odorsleuth", "tm:outrage", "tm:playrough", "tm:protect", "tm:psychicfangs", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:reversal", "tm:roar", @@ -408,9 +442,7 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", @@ -421,17 +453,45 @@ "tm:substitute", "tm:suckerpunch", "tm:swordsdance", - "tm:tackle", "tm:tailslap", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:thunderfang", "tm:trailblaze", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:drillrun", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:outrage", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "preEvolution": "rockruff wolf_form=dusk", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation7/magearna.json b/common/src/main/resources/data/cobblemon/species/generation7/magearna.json index e070dc9e1e..316549af03 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/magearna.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/magearna.json @@ -77,16 +77,13 @@ "tm:afteryou", "tm:agility", "tm:aurasphere", - "tm:aurorabeam", "tm:batonpass", "tm:bodyslam", "tm:brickbreak", "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:craftyshield", "tm:dazzlinggleam", - "tm:defensecurl", "tm:disarmingvoice", "tm:drainingkiss", "tm:echoedvoice", @@ -101,16 +98,13 @@ "tm:facade", "tm:falseswipe", "tm:flashcannon", - "tm:fleurcannon", "tm:focusblast", - "tm:gearup", "tm:gigaimpact", "tm:grassknot", "tm:gravity", "tm:guardswap", "tm:gyroball", "tm:healbell", - "tm:heartswap", "tm:heavyslam", "tm:helpinghand", "tm:hyperbeam", @@ -121,13 +115,8 @@ "tm:ironhead", "tm:lastresort", "tm:lightscreen", - "tm:lockon", - "tm:luckychant", - "tm:magneticflux", "tm:magnetrise", "tm:metalsound", - "tm:mindreader", - "tm:mirrorshot", "tm:mistyexplosion", "tm:mistyterrain", "tm:painsplit", @@ -142,14 +131,12 @@ "tm:rollout", "tm:selfdestruct", "tm:shadowball", - "tm:shiftgear", "tm:shockwave", "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", "tm:snowscape", "tm:solarbeam", - "tm:sonicboom", "tm:speedswap", "tm:spikes", "tm:steelbeam", @@ -158,7 +145,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", "tm:takedown", "tm:terablast", "tm:thunderbolt", @@ -166,10 +152,44 @@ "tm:triattack", "tm:trick", "tm:trickroom", - "tm:trumpcard", "tm:voltswitch", - "tm:zapcannon", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:electroweb", + "tutor:energyball", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:healbell", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:mistyexplosion", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json b/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json index 830f4c80e9..9eb141141d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json @@ -97,7 +97,6 @@ "egg:swallow", "tm:acidspray", "tm:afteryou", - "tm:bite", "tm:blizzard", "tm:brine", "tm:chillingwater", @@ -122,33 +121,42 @@ "tm:mudshot", "tm:painsplit", "tm:payback", - "tm:peck", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:pounce", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:safeguard", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snatch", - "tm:spikecannon", - "tm:spitup", - "tm:stockpile", "tm:substitute", "tm:surf", - "tm:swallow", "tm:terablast", "tm:toxic", "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", "tm:waterpulse", - "tm:wideguard" + "tutor:afteryou", + "tutor:covet", + "tutor:gastroacid", + "tutor:gunkshot", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json b/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json index a5279d1c56..ddf7b1ab65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json @@ -81,20 +81,16 @@ "tm:calmmind", "tm:closecombat", "tm:coaching", - "tm:copycat", - "tm:counter", "tm:drainpunch", "tm:echoedvoice", "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:forcepalm", "tm:foulplay", "tm:gigaimpact", "tm:grassknot", @@ -102,7 +98,6 @@ "tm:hyperbeam", "tm:icepunch", "tm:ironhead", - "tm:jumpkick", "tm:knockoff", "tm:laserfocus", "tm:lastresort", @@ -117,23 +112,18 @@ "tm:poltergeist", "tm:protect", "tm:psychup", - "tm:pursuit", "tm:rest", "tm:revenge", "tm:reversal", "tm:rockslide", "tm:rocktomb", "tm:roleplay", - "tm:rollingkick", "tm:shadowball", "tm:shadowclaw", - "tm:shadowpunch", - "tm:shadowsneak", "tm:skittersmack", "tm:sleeptalk", "tm:smackdown", "tm:snatch", - "tm:spectralthief", "tm:stoneedge", "tm:substitute", "tm:suckerpunch", @@ -145,7 +135,43 @@ "tm:thunderpunch", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:bulkup", + "tutor:calmmind", + "tutor:coaching", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:ironhead", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json index 5716b4c7b1..9570c229b8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json @@ -86,19 +86,16 @@ "egg:grudge", "egg:nightmare", "tm:afteryou", - "tm:astonish", "tm:babydolleyes", "tm:beatup", "tm:bulkup", "tm:burningjealousy", "tm:charm", "tm:confuseray", - "tm:copycat", "tm:covet", "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", "tm:doubleteam", "tm:drainingkiss", "tm:drainpunch", @@ -106,11 +103,9 @@ "tm:embargo", "tm:endure", "tm:facade", - "tm:feintattack", "tm:fling", "tm:gigadrain", "tm:gigaimpact", - "tm:grudge", "tm:hex", "tm:honeclaws", "tm:hyperbeam", @@ -119,9 +114,7 @@ "tm:leechlife", "tm:lightscreen", "tm:magicroom", - "tm:mimic", "tm:mistyterrain", - "tm:nightmare", "tm:nightshade", "tm:painsplit", "tm:payback", @@ -134,16 +127,12 @@ "tm:raindance", "tm:rest", "tm:safeguard", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", - "tm:slash", "tm:sleeptalk", "tm:snatch", "tm:spite", - "tm:splash", "tm:substitute", "tm:sunnyday", "tm:swordsdance", @@ -159,9 +148,35 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:woodhammer", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:bulkup", + "tutor:burningjealousy", + "tutor:covet", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:lastresort", + "tutor:leechlife", + "tutor:magicroom", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:xscissor" ], "evolutions": [], "forms": [ @@ -202,19 +217,16 @@ "egg:grudge", "egg:nightmare", "tm:afteryou", - "tm:astonish", "tm:babydolleyes", "tm:beatup", "tm:bulkup", "tm:burningjealousy", "tm:charm", "tm:confuseray", - "tm:copycat", "tm:covet", "tm:curse", "tm:darkpulse", "tm:dazzlinggleam", - "tm:destinybond", "tm:doubleteam", "tm:drainingkiss", "tm:drainpunch", @@ -222,11 +234,9 @@ "tm:embargo", "tm:endure", "tm:facade", - "tm:feintattack", "tm:fling", "tm:gigadrain", "tm:gigaimpact", - "tm:grudge", "tm:hex", "tm:honeclaws", "tm:hyperbeam", @@ -235,9 +245,7 @@ "tm:leechlife", "tm:lightscreen", "tm:magicroom", - "tm:mimic", "tm:mistyterrain", - "tm:nightmare", "tm:nightshade", "tm:painsplit", "tm:payback", @@ -250,16 +258,12 @@ "tm:raindance", "tm:rest", "tm:safeguard", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", - "tm:slash", "tm:sleeptalk", "tm:snatch", "tm:spite", - "tm:splash", "tm:substitute", "tm:sunnyday", "tm:swordsdance", @@ -275,9 +279,35 @@ "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:woodhammer", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:bulkup", + "tutor:burningjealousy", + "tutor:covet", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:lastresort", + "tutor:leechlife", + "tutor:magicroom", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:spite", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:xscissor" ], "evolutions": [], "battleOnly": true diff --git a/common/src/main/resources/data/cobblemon/species/generation7/minior.json b/common/src/main/resources/data/cobblemon/species/generation7/minior.json index 0e7afe9914..1d57f8cab2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/minior.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/minior.json @@ -75,14 +75,12 @@ "50:explosion", "tm:acrobatics", "tm:ancientpower", - "tm:autotomize", "tm:bulldoze", "tm:calmmind", "tm:chargebeam", "tm:confuseray", "tm:cosmicpower", "tm:dazzlinggleam", - "tm:defensecurl", "tm:doubleedge", "tm:earthpower", "tm:earthquake", @@ -113,7 +111,6 @@ "tm:sandstorm", "tm:scorchingsands", "tm:selfdestruct", - "tm:shellsmash", "tm:sleeptalk", "tm:solarbeam", "tm:stealthrock", @@ -121,12 +118,37 @@ "tm:stoneedge", "tm:substitute", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:uturn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelroller", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/morelull.json b/common/src/main/resources/data/cobblemon/species/generation7/morelull.json index 392a2ff939..b2d4155b16 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/morelull.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/morelull.json @@ -82,10 +82,8 @@ "egg:poisonpowder", "egg:spotlight", "egg:stunspore", - "tm:absorb", "tm:afteryou", "tm:amnesia", - "tm:astonish", "tm:confuseray", "tm:dazzlinggleam", "tm:drainingkiss", @@ -96,17 +94,10 @@ "tm:flash", "tm:gigadrain", "tm:grassknot", - "tm:growth", - "tm:ingrain", - "tm:leechseed", "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:megadrain", - "tm:moonblast", - "tm:moonlight", "tm:naturepower", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", "tm:recycle", @@ -114,21 +105,31 @@ "tm:safeguard", "tm:seedbomb", "tm:signalbeam", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:spore", - "tm:spotlight", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:synthesis", "tm:terablast", "tm:thunderwave", "tm:wonderroom", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gigadrain", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:recycle", + "tutor:rest", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:wonderroom", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json b/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json index 74d20d4324..96881787b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mudbray.json @@ -104,31 +104,24 @@ "egg:mudbomb", "egg:roar", "egg:smackdown", - "tm:bide", "tm:bodyslam", "tm:bulldoze", "tm:closecombat", - "tm:counter", "tm:curse", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", "tm:heavyslam", "tm:highhorsepower", "tm:irondefense", "tm:ironhead", "tm:lowkick", "tm:lowsweep", - "tm:magnitude", "tm:megakick", - "tm:mudbomb", "tm:mudslap", - "tm:mudsport", "tm:payback", "tm:protect", "tm:rest", @@ -136,13 +129,11 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rototiller", "tm:sandstorm", "tm:sandtomb", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -150,7 +141,23 @@ "tm:sunnyday", "tm:superpower", "tm:takedown", - "tm:terablast" + "tm:terablast", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:highhorsepower", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json index 8e877ebb88..507de62847 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mudsdale.json @@ -105,21 +105,17 @@ "egg:mudbomb", "egg:roar", "egg:smackdown", - "tm:bide", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", "tm:closecombat", - "tm:counter", "tm:curse", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", "tm:focusblast", "tm:gigaimpact", "tm:heavyslam", @@ -130,12 +126,9 @@ "tm:lashout", "tm:lowkick", "tm:lowsweep", - "tm:magnitude", "tm:megakick", - "tm:mudbomb", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:payback", "tm:protect", "tm:rest", @@ -144,14 +137,12 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rototiller", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -159,7 +150,26 @@ "tm:sunnyday", "tm:superpower", "tm:takedown", - "tm:terablast" + "tm:terablast", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lashout", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower" ], "preEvolution": "mudbray", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json b/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json index 2d06bac3b2..93650778c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/naganadel.json @@ -76,7 +76,6 @@ "56:gastroacid", "63:toxic", "70:dragonrush", - "tm:acid", "tm:acrobatics", "tm:aerialace", "tm:aircutter", @@ -91,20 +90,16 @@ "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:dualwingbeat", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fellstinger", "tm:fireblast", "tm:flamethrower", "tm:fly", - "tm:furyattack", "tm:gastroacid", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:heatwave", "tm:helpinghand", @@ -115,7 +110,6 @@ "tm:leechlife", "tm:nastyplot", "tm:outrage", - "tm:peck", "tm:pinmissile", "tm:poisonjab", "tm:protect", @@ -146,7 +140,43 @@ "tm:uturn", "tm:venomdrench", "tm:venoshock", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:allyswitch", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:flamethrower", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:snatch", + "tutor:spikes", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:xscissor" ], "preEvolution": "poipole", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json b/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json index e56fbc8900..8c0f5bc684 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json @@ -70,14 +70,12 @@ "88:prismaticlaser", "tm:aerialace", "tm:allyswitch", - "tm:autotomize", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:darkpulse", "tm:dragondance", @@ -105,14 +103,8 @@ "tm:magnetrise", "tm:metalclaw", "tm:meteorbeam", - "tm:mirrorshot", - "tm:moonlight", - "tm:morningsun", - "tm:nightslash", "tm:outrage", - "tm:photongeyser", "tm:powergem", - "tm:prismaticlaser", "tm:protect", "tm:psychic", "tm:psychicfangs", @@ -130,7 +122,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:solarbeam", @@ -145,8 +136,43 @@ "tm:terablast", "tm:thief", "tm:trickroom", - "tm:wringout", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:xscissor" ], "evolutions": [], "forms": [ @@ -208,14 +234,12 @@ "form_change:sunsteelstrike", "tm:aerialace", "tm:allyswitch", - "tm:autotomize", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:darkpulse", "tm:dragondance", @@ -243,14 +267,8 @@ "tm:magnetrise", "tm:metalclaw", "tm:meteorbeam", - "tm:mirrorshot", - "tm:moonlight", - "tm:morningsun", - "tm:nightslash", "tm:outrage", - "tm:photongeyser", "tm:powergem", - "tm:prismaticlaser", "tm:protect", "tm:psychic", "tm:psychicfangs", @@ -268,7 +286,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:solarbeam", @@ -284,8 +301,43 @@ "tm:terablast", "tm:thief", "tm:trickroom", - "tm:wringout", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:xscissor" ], "evolutions": [], "battleOnly": false @@ -348,14 +400,12 @@ "form_change:moongeistbeam", "tm:aerialace", "tm:allyswitch", - "tm:autotomize", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cosmicpower", "tm:darkpulse", "tm:dragondance", @@ -383,15 +433,9 @@ "tm:magnetrise", "tm:metalclaw", "tm:meteorbeam", - "tm:mirrorshot", "tm:moongeistbeam", - "tm:moonlight", - "tm:morningsun", - "tm:nightslash", "tm:outrage", - "tm:photongeyser", "tm:powergem", - "tm:prismaticlaser", "tm:protect", "tm:psychic", "tm:psychicfangs", @@ -409,7 +453,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:solarbeam", @@ -424,8 +467,43 @@ "tm:terablast", "tm:thief", "tm:trickroom", - "tm:wringout", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:psychic", + "tutor:psychocut", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:telekinesis", + "tutor:trick", + "tutor:xscissor" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json b/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json index 20f4486083..99c378ea29 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json @@ -77,15 +77,12 @@ "60:mirrorcoat", "65:wonderroom", "70:headsmash", - "tm:acid", "tm:acidspray", "tm:allyswitch", "tm:bind", "tm:bodyslam", "tm:brutalswing", "tm:chargebeam", - "tm:clearsmog", - "tm:constrict", "tm:corrosivegas", "tm:crosspoison", "tm:dazzlinggleam", @@ -94,26 +91,20 @@ "tm:facade", "tm:foulplay", "tm:grassknot", - "tm:guardsplit", "tm:gunkshot", "tm:headbutt", - "tm:headsmash", "tm:hex", "tm:ironhead", "tm:knockoff", "tm:lightscreen", "tm:magiccoat", "tm:meteorbeam", - "tm:mirrorcoat", "tm:painsplit", "tm:poisonjab", - "tm:pound", "tm:powergem", - "tm:powersplit", "tm:protect", "tm:psychic", "tm:psyshock", - "tm:psywave", "tm:rest", "tm:rockslide", "tm:rocktomb", @@ -131,15 +122,41 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:toxicspikes", "tm:trickroom", "tm:venomdrench", "tm:venoshock", "tm:wonderroom", "tm:worryseed", - "tm:wrap", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bind", + "tutor:chargebeam", + "tutor:corrosivegas", + "tutor:dazzlinggleam", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:ironhead", + "tutor:knockoff", + "tutor:magiccoat", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:stealthrock", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json index df5958940e..9eeca62c89 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json @@ -91,7 +91,6 @@ "tm:calmmind", "tm:chargebeam", "tm:chillingwater", - "tm:confusion", "tm:covet", "tm:dreameater", "tm:earthquake", @@ -101,9 +100,7 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", - "tm:feintattack", "tm:fling", "tm:focusblast", "tm:foulplay", @@ -113,7 +110,6 @@ "tm:hyperbeam", "tm:hypervoice", "tm:imprison", - "tm:instruct", "tm:knockoff", "tm:lastresort", "tm:lightscreen", @@ -159,8 +155,41 @@ "tm:trickroom", "tm:wonderroom", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:block", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:covet", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:telekinesis", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json index 06d8c3ea09..a5998f9627 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json @@ -100,29 +100,21 @@ "tm:charm", "tm:covet", "tm:defog", - "tm:doubleslap", "tm:dualwingbeat", "tm:embargo", "tm:endure", "tm:facade", "tm:featherdance", - "tm:flatter", "tm:fly", - "tm:growl", "tm:helpinghand", "tm:hurricane", "tm:icywind", - "tm:mirrormove", - "tm:peck", "tm:pluck", - "tm:pound", "tm:protect", "tm:psychup", "tm:quash", - "tm:quiverdance", "tm:raindance", "tm:rest", - "tm:revelationdance", "tm:reversal", "tm:roleplay", "tm:roost", @@ -138,11 +130,25 @@ "tm:tailwind", "tm:takedown", "tm:taunt", - "tm:teeterdance", "tm:terablast", "tm:trailblaze", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:calmmind", + "tutor:covet", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:helpinghand", + "tutor:icywind", + "tutor:rest", + "tutor:roleplay", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind" ], "evolutions": [], "forms": [ @@ -166,7 +172,7 @@ "battleOnly": false }, { - "name": "Pa’u", + "name": "Pa\u00e2\u20ac\u2122u", "primaryType": "psychic", "secondaryType": "flying", "maleRatio": 0.25, diff --git a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json b/common/src/main/resources/data/cobblemon/species/generation7/palossand.json index 559d9a0d10..689bb512d5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/palossand.json @@ -86,11 +86,9 @@ "egg:spitup", "egg:stockpile", "egg:swallow", - "tm:absorb", "tm:afteryou", "tm:amnesia", "tm:ancientpower", - "tm:astonish", "tm:block", "tm:bodyslam", "tm:brine", @@ -98,7 +96,6 @@ "tm:chillingwater", "tm:confuseray", "tm:curse", - "tm:destinybond", "tm:earthpower", "tm:earthquake", "tm:embargo", @@ -110,14 +107,11 @@ "tm:gigadrain", "tm:gigaimpact", "tm:gravity", - "tm:harden", "tm:hex", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:infestation", "tm:irondefense", - "tm:megadrain", "tm:mudshot", "tm:mudslap", "tm:nightshade", @@ -133,27 +127,52 @@ "tm:rockslide", "tm:rocktomb", "tm:roleplay", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", "tm:scorchingsands", "tm:shadowball", - "tm:shoreup", "tm:skillswap", "tm:sleeptalk", "tm:sludgebomb", "tm:spite", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:terablast", "tm:terrainpulse", - "tm:trick" + "tm:trick", + "tutor:afteryou", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:energyball", + "tutor:flashcannon", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:terrainpulse", + "tutor:trick" ], "preEvolution": "sandygast", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json index e5c54dda9c..d368995880 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json @@ -86,7 +86,6 @@ "tm:assurance", "tm:batonpass", "tm:beatup", - "tm:bestow", "tm:block", "tm:bodyslam", "tm:brickbreak", @@ -96,7 +95,6 @@ "tm:chillingwater", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:curse", "tm:doubleedge", "tm:drainpunch", @@ -105,7 +103,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:feint", "tm:fling", "tm:focusblast", "tm:focusenergy", @@ -119,7 +116,6 @@ "tm:irontail", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -127,8 +123,6 @@ "tm:painsplit", "tm:payback", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -139,7 +133,6 @@ "tm:rocktomb", "tm:scaryface", "tm:seedbomb", - "tm:seismictoss", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", @@ -148,19 +141,45 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:trailblaze", "tm:upperhand", "tm:uproar", "tm:uturn", "tm:vacuumwave", - "tm:vitalthrow", - "tm:workup" + "tm:workup", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:electroweb", + "tutor:energyball", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:superpower", + "tutor:uproar", + "tutor:vacuumwave" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json b/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json index aa484914bc..2dc84db58e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json @@ -86,35 +86,26 @@ "tm:bugbuzz", "tm:closecombat", "tm:coaching", - "tm:doublekick", "tm:drillrun", "tm:echoedvoice", "tm:electroweb", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", "tm:fling", "tm:focusblast", "tm:foulplay", "tm:gigaimpact", - "tm:highjumpkick", "tm:hyperbeam", "tm:icebeam", "tm:icywind", - "tm:jumpkick", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:lunge", - "tm:mefirst", "tm:outrage", "tm:poisonjab", "tm:protect", - "tm:quickguard", - "tm:quiverdance", - "tm:rapidspin", "tm:rest", "tm:roost", "tm:shockwave", @@ -124,7 +115,6 @@ "tm:sleeptalk", "tm:snatch", "tm:speedswap", - "tm:stomp", "tm:substitute", "tm:swift", "tm:taunt", @@ -132,8 +122,33 @@ "tm:throatchop", "tm:torment", "tm:tripleaxel", - "tm:triplekick", - "tm:uturn" + "tm:uturn", + "tutor:block", + "tutor:bounce", + "tutor:bugbite", + "tutor:coaching", + "tutor:drillrun", + "tutor:electroweb", + "tutor:falseswipe", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:roost", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snatch", + "tutor:swift", + "tutor:throatchop", + "tutor:tripleaxel" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/pikipek.json b/common/src/main/resources/data/cobblemon/species/generation7/pikipek.json index d847dd2e8e..fd440756a0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/pikipek.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/pikipek.json @@ -90,12 +90,10 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:boomburst", "tm:bravebird", "tm:brickbreak", "tm:bulletseed", "tm:defog", - "tm:drillpeck", "tm:dualwingbeat", "tm:echoedvoice", "tm:endeavor", @@ -104,15 +102,11 @@ "tm:featherdance", "tm:flamecharge", "tm:fly", - "tm:furyattack", - "tm:growl", "tm:gunkshot", "tm:heatwave", "tm:helpinghand", "tm:hypervoice", "tm:knockoff", - "tm:mirrormove", - "tm:peck", "tm:pluck", "tm:protect", "tm:rest", @@ -125,7 +119,6 @@ "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swordsdance", "tm:tailwind", "tm:takedown", @@ -133,7 +126,24 @@ "tm:thief", "tm:uproar", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/poipole.json b/common/src/main/resources/data/cobblemon/species/generation7/poipole.json index f6c43eda1d..453e9869ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/poipole.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/poipole.json @@ -72,22 +72,17 @@ "49:poisonjab", "56:gastroacid", "63:toxic", - "tm:acid", "tm:charm", "tm:covet", "tm:dragonpulse", "tm:echoedvoice", "tm:endure", "tm:facade", - "tm:fellstinger", - "tm:furyattack", "tm:gastroacid", - "tm:growl", "tm:gunkshot", "tm:helpinghand", "tm:irontail", "tm:nastyplot", - "tm:peck", "tm:pinmissile", "tm:poisonjab", "tm:protect", @@ -103,7 +98,21 @@ "tm:toxicspikes", "tm:uproar", "tm:venomdrench", - "tm:venoshock" + "tm:venoshock", + "tutor:covet", + "tutor:dragonpulse", + "tutor:gastroacid", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:irontail", + "tutor:poisonjab", + "tutor:rest", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/popplio.json b/common/src/main/resources/data/cobblemon/species/generation7/popplio.json index 8177fb380e..dff5b17945 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/popplio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/popplio.json @@ -100,28 +100,22 @@ "egg:perishsong", "tm:acrobatics", "tm:amnesia", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", - "tm:aromaticmist", "tm:babydolleyes", "tm:blizzard", "tm:brine", - "tm:bubblebeam", "tm:captivate", "tm:charm", "tm:chillingwater", "tm:covet", "tm:disarmingvoice", "tm:dive", - "tm:doubleslap", "tm:drainingkiss", "tm:echoedvoice", "tm:encore", "tm:endure", "tm:facade", "tm:flipturn", - "tm:growl", "tm:hail", "tm:helpinghand", "tm:hydropump", @@ -130,16 +124,11 @@ "tm:icespinner", "tm:icywind", "tm:irontail", - "tm:lifedew", "tm:mistyterrain", - "tm:moonblast", - "tm:perishsong", "tm:playrough", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", - "tm:sing", "tm:sleeptalk", "tm:substitute", "tm:surf", @@ -148,12 +137,30 @@ "tm:tripleaxel", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:whirlpool", "tm:wonderroom", - "tm:workup" + "tm:workup", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:covet", + "tutor:dive", + "tutor:flipturn", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:wonderroom" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json index 561dbf43ac..172533853c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/primarina.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/primarina.json @@ -102,15 +102,11 @@ "tm:acrobatics", "tm:alluringvoice", "tm:amnesia", - "tm:aquajet", - "tm:aquaring", "tm:aquatail", - "tm:aromaticmist", "tm:babydolleyes", "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bubblebeam", "tm:calmmind", "tm:captivate", "tm:charm", @@ -119,7 +115,6 @@ "tm:dazzlinggleam", "tm:disarmingvoice", "tm:dive", - "tm:doubleslap", "tm:drainingkiss", "tm:echoedvoice", "tm:encore", @@ -128,7 +123,6 @@ "tm:facade", "tm:flipturn", "tm:gigaimpact", - "tm:growl", "tm:hail", "tm:haze", "tm:helpinghand", @@ -140,16 +134,12 @@ "tm:icespinner", "tm:icywind", "tm:irontail", - "tm:lifedew", "tm:lightscreen", "tm:liquidation", "tm:magiccoat", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", - "tm:perishsong", "tm:playrough", - "tm:pound", "tm:protect", "tm:psychic", "tm:psychicnoise", @@ -158,10 +148,8 @@ "tm:reflect", "tm:rest", "tm:shadowball", - "tm:sing", "tm:sleeptalk", "tm:snowscape", - "tm:sparklingaria", "tm:storedpower", "tm:substitute", "tm:surf", @@ -170,13 +158,42 @@ "tm:tripleaxel", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", "tm:wonderroom", - "tm:workup" + "tm:workup", + "tutor:aquatail", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:dive", + "tutor:energyball", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", + "tutor:irontail", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:mistyexplosion", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:waterpledge", + "tutor:waterpulse", + "tutor:wonderroom" ], "preEvolution": "brionne", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json b/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json index f9a013bbe8..24f314e9b1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/pyukumuku.json @@ -94,42 +94,38 @@ "egg:swagger", "egg:tickle", "tm:batonpass", - "tm:bestow", - "tm:bide", "tm:block", - "tm:counter", "tm:curse", "tm:endure", "tm:gastroacid", "tm:hail", - "tm:harden", "tm:helpinghand", "tm:lightscreen", - "tm:memento", - "tm:mirrorcoat", - "tm:mudsport", "tm:painsplit", "tm:protect", "tm:psychup", - "tm:purify", "tm:quash", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", "tm:safeguard", "tm:screech", "tm:sleeptalk", - "tm:soak", "tm:spite", "tm:substitute", "tm:swagger", "tm:taunt", - "tm:tickle", "tm:toxic", "tm:venomdrench", - "tm:watersport" + "tutor:block", + "tutor:gastroacid", + "tutor:helpinghand", + "tutor:painsplit", + "tutor:recycle", + "tutor:rest", + "tutor:sleeptalk", + "tutor:spite" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json index ffb1bfbac0..6fe8f4e7d2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/ribombee.json @@ -96,16 +96,12 @@ "egg:moonblast", "egg:powder", "egg:stickyweb", - "tm:absorb", "tm:acrobatics", "tm:afteryou", "tm:agility", "tm:alluringvoice", "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", "tm:batonpass", - "tm:bestow", "tm:bugbite", "tm:bugbuzz", "tm:calmmind", @@ -119,7 +115,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:gigaimpact", "tm:grassknot", @@ -133,17 +128,14 @@ "tm:lunge", "tm:magicalleaf", "tm:magicroom", - "tm:moonblast", "tm:naturepower", "tm:playrough", "tm:pollenpuff", "tm:pounce", - "tm:powder", "tm:protect", "tm:psychic", "tm:psychicnoise", "tm:psychup", - "tm:quiverdance", "tm:reflect", "tm:rest", "tm:roost", @@ -155,15 +147,11 @@ "tm:sleeptalk", "tm:solarbeam", "tm:speedswap", - "tm:stickyweb", "tm:storedpower", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", - "tm:switcheroo", "tm:tailwind", "tm:takedown", "tm:telekinesis", @@ -172,7 +160,36 @@ "tm:trailblaze", "tm:trick", "tm:uturn", - "tm:wonderroom" + "tm:wonderroom", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:bugbite", + "tutor:calmmind", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:lastresort", + "tutor:leechlife", + "tutor:magicalleaf", + "tutor:magicroom", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:signalbeam", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "cutiefly", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json b/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json index 3108d5a391..930f79284c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json @@ -89,13 +89,11 @@ "egg:odorsleuth", "egg:suckerpunch", "egg:thrash", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:charm", "tm:covet", "tm:crunch", - "tm:crushclaw", "tm:dig", "tm:doubleedge", "tm:doubleteam", @@ -106,15 +104,12 @@ "tm:facade", "tm:firefang", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:irondefense", "tm:ironhead", "tm:irontail", "tm:lastresort", - "tm:leer", "tm:mudslap", - "tm:odorsleuth", "tm:playrough", "tm:protect", "tm:psychicfangs", @@ -123,9 +118,7 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", @@ -136,14 +129,36 @@ "tm:substitute", "tm:suckerpunch", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:thunderfang", "tm:trailblaze", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:covet", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "evolutions": [ { @@ -226,7 +241,6 @@ "egg:odorsleuth", "egg:suckerpunch", "egg:thrash", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:charm", @@ -243,15 +257,12 @@ "tm:facade", "tm:firefang", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:irondefense", "tm:ironhead", "tm:irontail", "tm:lastresort", - "tm:leer", "tm:mudslap", - "tm:odorsleuth", "tm:playrough", "tm:protect", "tm:psychicfangs", @@ -260,9 +271,7 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", @@ -273,14 +282,36 @@ "tm:substitute", "tm:suckerpunch", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:thunderfang", "tm:trailblaze", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:covet", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json index b7936f0fa7..af4e514955 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/rowlet.json @@ -100,7 +100,6 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:astonish", "tm:bravebird", "tm:bulletseed", "tm:confuseray", @@ -114,18 +113,14 @@ "tm:facade", "tm:falseswipe", "tm:featherdance", - "tm:foresight", - "tm:furyattack", "tm:gigadrain", "tm:grassknot", "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", "tm:haze", "tm:helpinghand", "tm:knockoff", - "tm:leafage", "tm:leafblade", "tm:leafstorm", "tm:lightscreen", @@ -133,17 +128,14 @@ "tm:nastyplot", "tm:naturepower", "tm:nightshade", - "tm:peck", "tm:pluck", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:roost", "tm:safeguard", "tm:seedbomb", "tm:shadowclaw", - "tm:shadowsneak", "tm:skyattack", "tm:sleeptalk", "tm:solarbeam", @@ -154,12 +146,34 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:trailblaze", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:aircutter", + "tutor:covet", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:energyball", + "tutor:falseswipe", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:rest", + "tutor:roost", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/salandit.json b/common/src/main/resources/data/cobblemon/species/generation7/salandit.json index 559716fe0e..15d69144d0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/salandit.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/salandit.json @@ -97,21 +97,15 @@ "tm:acidspray", "tm:agility", "tm:beatup", - "tm:belch", "tm:burningjealousy", "tm:covet", - "tm:doubleslap", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrage", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:fireblast", "tm:firefang", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -128,26 +122,20 @@ "tm:nastyplot", "tm:overheat", "tm:payback", - "tm:poisonfang", - "tm:poisongas", "tm:poisonjab", "tm:poisontail", "tm:protect", "tm:rest", - "tm:sandattack", "tm:scaleshot", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", "tm:snatch", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:takedown", "tm:taunt", @@ -161,7 +149,31 @@ "tm:trailblaze", "tm:venomdrench", "tm:venoshock", - "tm:willowisp" + "tm:willowisp", + "tutor:burningjealousy", + "tutor:covet", + "tutor:dragonpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irontail", + "tutor:knockoff", + "tutor:leechlife", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:swift" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json b/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json index 5444a1bc57..c8fb6ca695 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/salazzle.json @@ -108,7 +108,6 @@ "tm:acrobatics", "tm:agility", "tm:beatup", - "tm:belch", "tm:bodyslam", "tm:breakingswipe", "tm:burningjealousy", @@ -116,25 +115,18 @@ "tm:corrosivegas", "tm:covet", "tm:crosspoison", - "tm:disable", - "tm:doubleslap", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrage", "tm:dragontail", - "tm:ember", "tm:encore", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:fireblast", "tm:firefang", - "tm:firelash", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -155,28 +147,21 @@ "tm:nastyplot", "tm:overheat", "tm:payback", - "tm:poisonfang", - "tm:poisongas", "tm:poisonjab", "tm:poisontail", - "tm:pound", "tm:protect", "tm:rest", - "tm:sandattack", "tm:scaleshot", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", "tm:snatch", "tm:substitute", "tm:sunnyday", "tm:swagger", - "tm:sweetscent", "tm:swift", "tm:takedown", "tm:taunt", @@ -190,7 +175,36 @@ "tm:trailblaze", "tm:venomdrench", "tm:venoshock", - "tm:willowisp" + "tm:willowisp", + "tutor:burningjealousy", + "tutor:corrosivegas", + "tutor:covet", + "tutor:dragonpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:leechlife", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:swift" ], "preEvolution": "salandit", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json b/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json index e3518e2242..d1e7df01b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json @@ -86,18 +86,15 @@ "egg:spitup", "egg:stockpile", "egg:swallow", - "tm:absorb", "tm:afteryou", "tm:amnesia", "tm:ancientpower", - "tm:astonish", "tm:block", "tm:brine", "tm:bulldoze", "tm:chillingwater", "tm:confuseray", "tm:curse", - "tm:destinybond", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -107,13 +104,10 @@ "tm:fling", "tm:gigadrain", "tm:gravity", - "tm:harden", "tm:hex", - "tm:hypnosis", "tm:imprison", "tm:infestation", "tm:irondefense", - "tm:megadrain", "tm:mudshot", "tm:mudslap", "tm:nightshade", @@ -128,26 +122,48 @@ "tm:rockslide", "tm:rocktomb", "tm:roleplay", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", "tm:scorchingsands", "tm:shadowball", - "tm:shoreup", "tm:skillswap", "tm:sleeptalk", "tm:sludgebomb", "tm:spite", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:swallow", "tm:terablast", - "tm:trick" + "tm:trick", + "tutor:afteryou", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:energyball", + "tutor:flashcannon", + "tutor:gigadrain", + "tutor:gravity", + "tutor:irondefense", + "tutor:mudslap", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json index d681be9481..6e6b6497b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/shiinotic.json @@ -83,10 +83,8 @@ "egg:poisonpowder", "egg:spotlight", "egg:stunspore", - "tm:absorb", "tm:afteryou", "tm:amnesia", - "tm:astonish", "tm:chargebeam", "tm:confuseray", "tm:dazzlinggleam", @@ -100,18 +98,11 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:growth", "tm:hyperbeam", - "tm:ingrain", - "tm:leechseed", "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:megadrain", - "tm:moonblast", - "tm:moonlight", "tm:naturepower", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", "tm:raindance", @@ -120,14 +111,9 @@ "tm:safeguard", "tm:seedbomb", "tm:signalbeam", - "tm:sleeppowder", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", - "tm:spore", - "tm:spotlight", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:synthesis", @@ -135,7 +121,26 @@ "tm:thunderwave", "tm:weatherball", "tm:wonderroom", - "tm:worryseed" + "tm:worryseed", + "tutor:afteryou", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:recycle", + "tutor:rest", + "tutor:seedbomb", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:synthesis", + "tutor:wonderroom", + "tutor:worryseed" ], "preEvolution": "morelull", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/silvally.json b/common/src/main/resources/data/cobblemon/species/generation7/silvally.json index 7d04b472b6..235d4ad8fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/silvally.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/silvally.json @@ -80,12 +80,9 @@ "egg:razorwind", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -98,7 +95,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -112,18 +108,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -143,7 +132,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -155,7 +143,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "preEvolution": "typenull", "evolutions": [], @@ -206,12 +231,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -224,7 +246,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -238,18 +259,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -269,7 +283,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -281,7 +294,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -332,12 +382,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -350,7 +397,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -364,18 +410,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -395,7 +434,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -407,7 +445,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -458,12 +533,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -476,7 +548,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -490,18 +561,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -521,7 +585,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -533,7 +596,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -584,12 +684,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -602,7 +699,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -616,18 +712,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -647,7 +736,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -659,7 +747,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -710,12 +835,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -728,7 +850,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -742,18 +863,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -773,7 +887,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -785,7 +898,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -836,12 +986,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -854,7 +1001,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -868,18 +1014,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -899,7 +1038,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -911,7 +1049,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -962,12 +1137,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -980,7 +1152,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -994,18 +1165,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -1025,7 +1189,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1037,7 +1200,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -1088,12 +1288,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -1106,7 +1303,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1120,18 +1316,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -1151,7 +1340,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1163,7 +1351,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -1214,12 +1439,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -1232,7 +1454,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1246,18 +1467,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -1277,7 +1491,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1289,7 +1502,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -1340,12 +1590,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -1358,7 +1605,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1372,18 +1618,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -1403,7 +1642,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1415,7 +1653,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -1466,12 +1741,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -1484,7 +1756,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1498,18 +1769,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -1529,7 +1793,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1541,7 +1804,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -1592,12 +1892,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -1610,7 +1907,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1624,18 +1920,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -1655,7 +1944,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1667,7 +1955,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -1718,12 +2043,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -1736,7 +2058,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1750,18 +2071,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -1781,7 +2095,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1793,7 +2106,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -1844,12 +2194,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -1862,7 +2209,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1876,18 +2222,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -1907,7 +2246,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1919,7 +2257,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -1970,12 +2345,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -1988,7 +2360,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -2002,18 +2373,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -2033,7 +2397,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -2045,7 +2408,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -2096,12 +2496,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -2114,7 +2511,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -2128,18 +2524,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -2159,7 +2548,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -2171,7 +2559,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -2222,12 +2647,9 @@ "60:partingshot", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:crunch", - "tm:crushclaw", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", "tm:dragonclaw", "tm:endure", @@ -2240,7 +2662,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -2254,18 +2675,11 @@ "tm:lastresort", "tm:magiccoat", "tm:metalsound", - "tm:multiattack", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:poisonfang", "tm:protect", "tm:psychicfangs", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:roar", @@ -2285,7 +2699,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -2297,7 +2710,44 @@ "tm:uturn", "tm:workup", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:block", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind", + "tutor:terrainpulse", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json b/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json index 8e68a4fc05..3fdf37b98c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json @@ -103,13 +103,10 @@ "tm:knockoff", "tm:lastresort", "tm:lightscreen", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:meteorbeam", - "tm:morningsun", "tm:mysticalfire", - "tm:nobleroar", "tm:outrage", "tm:protect", "tm:psychic", @@ -127,26 +124,54 @@ "tm:sleeptalk", "tm:snarl", "tm:solarbeam", - "tm:splash", "tm:steelbeam", "tm:steelroller", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:sunsteelstrike", "tm:superpower", "tm:swift", "tm:takedown", - "tm:teleport", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:trickroom", - "tm:wakeupslap", - "tm:wideguard", "tm:wildcharge", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:endeavor", + "tutor:expandingforce", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:meteorbeam", + "tutor:mysticalfire", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "cosmoem", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json b/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json index 9104b7ea79..5f16352965 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json @@ -76,8 +76,6 @@ "65:stealthrock", "70:doubleedge", "tm:allyswitch", - "tm:autotomize", - "tm:bide", "tm:bind", "tm:block", "tm:bodypress", @@ -92,7 +90,6 @@ "tm:gigaimpact", "tm:gravity", "tm:gyroball", - "tm:harden", "tm:heatcrash", "tm:heavyslam", "tm:highhorsepower", @@ -112,7 +109,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:roleplay", "tm:safeguard", @@ -123,19 +119,46 @@ "tm:stealthrock", "tm:steelbeam", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", "tm:trickroom", - "tm:wideguard", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bind", + "tutor:block", + "tutor:bulldoze", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:highhorsepower", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:magnetrise", + "tutor:meteorbeam", + "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:telekinesis", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json index 204a3ed32a..b99ff505bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json @@ -77,27 +77,20 @@ "egg:feint", "egg:grasswhistle", "egg:synthesis", - "tm:acupressure", - "tm:aromatherapy", - "tm:aromaticmist", "tm:bounce", "tm:bulletseed", "tm:captivate", "tm:charm", "tm:covet", "tm:dazzlinggleam", - "tm:doubleslap", "tm:drainingkiss", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", - "tm:feint", - "tm:flail", "tm:fling", "tm:gigadrain", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", @@ -108,31 +101,42 @@ "tm:naturepower", "tm:payback", "tm:petalblizzard", - "tm:playnice", "tm:playrough", "tm:protect", - "tm:rapidspin", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:safeguard", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", - "tm:splash", - "tm:stomp", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:synthesis", "tm:takedown", - "tm:teeterdance", "tm:terablast", "tm:trailblaze", "tm:tripleaxel", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:tripleaxel", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "bounsweet", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/stufful.json b/common/src/main/resources/data/cobblemon/species/generation7/stufful.json index aa3a297164..496278a905 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/stufful.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/stufful.json @@ -88,7 +88,6 @@ "egg:wideguard", "tm:aerialace", "tm:babydolleyes", - "tm:bide", "tm:bind", "tm:brickbreak", "tm:brutalswing", @@ -96,21 +95,16 @@ "tm:bulldoze", "tm:charm", "tm:coaching", - "tm:defensecurl", "tm:doubleedge", "tm:dualchop", "tm:earthquake", "tm:endure", "tm:facade", - "tm:flail", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:forcepalm", - "tm:hammerarm", "tm:icepunch", "tm:ironhead", - "tm:leer", "tm:lowsweep", "tm:megakick", "tm:megapunch", @@ -124,21 +118,37 @@ "tm:roleplay", "tm:rollout", "tm:sleeptalk", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:superpower", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:thunderpunch", - "tm:wideguard", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:babydolleyes", + "tutor:bind", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:dualchop", + "tutor:focuspunch", + "tutor:icepunch", + "tutor:ironhead", + "tutor:painsplit", + "tutor:rest", + "tutor:rockslide", + "tutor:roleplay", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json b/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json index 80693d89cc..fb3feac4bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json @@ -75,7 +75,6 @@ "tm:closecombat", "tm:darkestlariat", "tm:dazzlinggleam", - "tm:disable", "tm:dualchop", "tm:echoedvoice", "tm:endure", @@ -91,19 +90,12 @@ "tm:grassyterrain", "tm:guardswap", "tm:highhorsepower", - "tm:hornattack", - "tm:hornleech", "tm:hyperbeam", "tm:irondefense", - "tm:leafage", - "tm:leechseed", "tm:lightscreen", - "tm:meanlook", - "tm:megadrain", "tm:megahorn", "tm:megapunch", "tm:naturepower", - "tm:naturesmadness", "tm:payback", "tm:powerswap", "tm:protect", @@ -115,11 +107,9 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rototiller", "tm:safeguard", "tm:scaryface", "tm:seedbomb", - "tm:skullbash", "tm:sleeptalk", "tm:smartstrike", "tm:snarl", @@ -135,12 +125,34 @@ "tm:telekinesis", "tm:terablast", "tm:torment", - "tm:whirlwind", - "tm:withdraw", - "tm:woodhammer", "tm:workup", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:dualchop", + "tutor:energyball", + "tutor:falseswipe", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:megahorn", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stoneedge", + "tutor:superpower", + "tutor:synthesis", + "tutor:telekinesis", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json b/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json index 1f4da9514a..0af293591c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json @@ -68,7 +68,6 @@ "65:hydropump", "70:soak", "75:mistyterrain", - "tm:aquaring", "tm:blizzard", "tm:brine", "tm:calmmind", @@ -86,7 +85,6 @@ "tm:gravity", "tm:guardswap", "tm:haze", - "tm:healpulse", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", @@ -97,26 +95,20 @@ "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", - "tm:mist", "tm:mistyterrain", - "tm:moonblast", "tm:muddywater", "tm:naturepower", - "tm:naturesmadness", "tm:playrough", "tm:protect", "tm:psychup", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:safeguard", "tm:scald", "tm:shadowball", "tm:sleeptalk", "tm:smartstrike", - "tm:soak", "tm:storedpower", "tm:substitute", "tm:surf", @@ -126,11 +118,31 @@ "tm:torment", "tm:trick", "tm:waterfall", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:withdraw", - "tm:wonderroom" + "tm:wonderroom", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:dive", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:knockoff", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:playrough", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:telekinesis", + "tutor:trick", + "tutor:waterpulse", + "tutor:wonderroom" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json b/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json index ad58657817..9ab76b12a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json @@ -76,7 +76,6 @@ "tm:charge", "tm:dazzlinggleam", "tm:defog", - "tm:discharge", "tm:echoedvoice", "tm:eerieimpulse", "tm:electricterrain", @@ -84,7 +83,6 @@ "tm:electroweb", "tm:endure", "tm:facade", - "tm:fairywind", "tm:falseswipe", "tm:fly", "tm:gigaimpact", @@ -94,14 +92,10 @@ "tm:irondefense", "tm:ironhead", "tm:lightscreen", - "tm:meanlook", - "tm:mirrormove", "tm:naturepower", - "tm:naturesmadness", "tm:powerswap", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:raindance", "tm:reflect", "tm:rest", @@ -113,7 +107,6 @@ "tm:skyattack", "tm:skydrop", "tm:sleeptalk", - "tm:spark", "tm:steelwing", "tm:storedpower", "tm:substitute", @@ -125,14 +118,33 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:torment", "tm:uturn", "tm:voltswitch", "tm:wildcharge", - "tm:withdraw", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:electroweb", + "tutor:falseswipe", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:rest", + "tutor:roost", + "tutor:shockwave", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json b/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json index 9cd57799d5..579b2472f0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json @@ -68,21 +68,15 @@ "70:skillswap", "75:psychicterrain", "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:astonish", "tm:calmmind", "tm:chargebeam", "tm:charm", - "tm:confusion", "tm:dazzlinggleam", "tm:drainingkiss", "tm:echoedvoice", "tm:endure", "tm:energyball", - "tm:extrasensory", "tm:facade", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:futuresight", @@ -95,10 +89,7 @@ "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", - "tm:moonblast", "tm:naturepower", - "tm:naturesmadness", "tm:playrough", "tm:powerswap", "tm:protect", @@ -108,7 +99,6 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:reflect", "tm:rest", "tm:safeguard", @@ -119,17 +109,35 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:taunt", "tm:telekinesis", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:tickle", "tm:torment", - "tm:withdraw", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:playrough", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:telekinesis", + "tutor:thunderbolt", + "tutor:wonderroom" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json b/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json index 27b7843a92..e61d00c184 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json @@ -87,9 +87,7 @@ "tm:charge", "tm:chargebeam", "tm:covet", - "tm:defensecurl", "tm:disarmingvoice", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -98,9 +96,6 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:fellstinger", - "tm:flail", "tm:fling", "tm:gigaimpact", "tm:grassknot", @@ -112,11 +107,9 @@ "tm:irontail", "tm:lastresort", "tm:magnetrise", - "tm:nuzzle", "tm:payback", "tm:pinmissile", "tm:poisonjab", - "tm:present", "tm:protect", "tm:reflect", "tm:rest", @@ -126,29 +119,49 @@ "tm:rollout", "tm:shockwave", "tm:sleeptalk", - "tm:spark", - "tm:spikyshield", "tm:steelbeam", "tm:steelroller", "tm:substitute", "tm:superfang", "tm:swift", - "tm:tackle", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", - "tm:tickle", - "tm:twineedle", "tm:uturn", "tm:voltswitch", "tm:wildcharge", - "tm:wish", "tm:workup", "tm:zenheadbutt", - "tm:zingzap" + "tutor:afteryou", + "tutor:bounce", + "tutor:chargebeam", + "tutor:covet", + "tutor:electroweb", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:irontail", + "tutor:lastresort", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:rest", + "tutor:risingvoltage", + "tutor:roleplay", + "tutor:rollout", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/torracat.json b/common/src/main/resources/data/cobblemon/species/generation7/torracat.json index 726bf0ed8f..a02bf072ef 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/torracat.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/torracat.json @@ -91,19 +91,15 @@ "egg:partingshot", "egg:powertrip", "tm:acrobatics", - "tm:bite", "tm:bodyslam", "tm:bulkup", "tm:covet", "tm:crunch", "tm:doubleedge", - "tm:doublekick", "tm:dualchop", - "tm:ember", "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:fireblast", "tm:firefang", "tm:firepledge", @@ -111,25 +107,18 @@ "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", - "tm:furyswipes", - "tm:growl", "tm:heatwave", "tm:helpinghand", "tm:leechlife", - "tm:leer", - "tm:lick", "tm:nastyplot", "tm:outrage", "tm:overheat", - "tm:partingshot", "tm:payday", - "tm:powertrip", "tm:protect", "tm:rest", "tm:revenge", "tm:roar", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:substitute", @@ -140,12 +129,25 @@ "tm:taunt", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:torment", "tm:trailblaze", "tm:uturn", "tm:willowisp", - "tm:workup" + "tm:workup", + "tutor:bulkup", + "tutor:covet", + "tutor:dualchop", + "tutor:endeavor", + "tutor:firefang", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:leechlife", + "tutor:outrage", + "tutor:rest", + "tutor:shadowclaw", + "tutor:sleeptalk" ], "preEvolution": "litten", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json b/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json index 41b8ebcfd9..302cbcb331 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json @@ -96,13 +96,10 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:beakblast", - "tm:boomburst", "tm:bravebird", "tm:brickbreak", "tm:bulletseed", "tm:defog", - "tm:drillpeck", "tm:dualwingbeat", "tm:echoedvoice", "tm:encore", @@ -113,9 +110,7 @@ "tm:flamecharge", "tm:flashcannon", "tm:fly", - "tm:furyattack", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:heatwave", "tm:helpinghand", @@ -123,9 +118,7 @@ "tm:hyperbeam", "tm:hypervoice", "tm:knockoff", - "tm:mirrormove", "tm:overheat", - "tm:peck", "tm:pluck", "tm:protect", "tm:psychup", @@ -142,7 +135,6 @@ "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", "tm:swordsdance", "tm:tailwind", @@ -153,7 +145,30 @@ "tm:throatchop", "tm:uproar", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:seedbomb", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:uproar" ], "preEvolution": "trumbeak", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json b/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json index 2931f1be0c..32af6b5b9e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json @@ -99,8 +99,6 @@ "egg:swallow", "tm:acidspray", "tm:afteryou", - "tm:banefulbunker", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -131,14 +129,11 @@ "tm:mudshot", "tm:painsplit", "tm:payback", - "tm:peck", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:pounce", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:safeguard", "tm:scaryface", @@ -147,19 +142,34 @@ "tm:sludgewave", "tm:smackdown", "tm:snatch", - "tm:spikecannon", - "tm:spitup", - "tm:stockpile", "tm:substitute", "tm:surf", - "tm:swallow", "tm:terablast", "tm:toxic", "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", "tm:waterpulse", - "tm:wideguard" + "tutor:afteryou", + "tutor:block", + "tutor:covet", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:liquidation", + "tutor:magiccoat", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snatch", + "tutor:spikes", + "tutor:waterpulse" ], "preEvolution": "mareanie", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json b/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json index d4e84dbc42..f894ecf073 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json @@ -95,12 +95,10 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:boomburst", "tm:bravebird", "tm:brickbreak", "tm:bulletseed", "tm:defog", - "tm:drillpeck", "tm:dualwingbeat", "tm:echoedvoice", "tm:endeavor", @@ -109,15 +107,11 @@ "tm:featherdance", "tm:flamecharge", "tm:fly", - "tm:furyattack", - "tm:growl", "tm:gunkshot", "tm:heatwave", "tm:helpinghand", "tm:hypervoice", "tm:knockoff", - "tm:mirrormove", - "tm:peck", "tm:pluck", "tm:protect", "tm:rest", @@ -131,7 +125,6 @@ "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:supersonic", "tm:swift", "tm:swordsdance", "tm:tailwind", @@ -140,7 +133,25 @@ "tm:thief", "tm:uproar", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar" ], "preEvolution": "pikipek", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json index bde896d951..0154dc813e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json @@ -84,32 +84,24 @@ "egg:grasswhistle", "egg:synthesis", "tm:acrobatics", - "tm:acupressure", - "tm:aromatherapy", - "tm:aromaticmist", "tm:bounce", "tm:bulletseed", "tm:captivate", "tm:charm", "tm:covet", "tm:dazzlinggleam", - "tm:doubleslap", "tm:drainingkiss", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", - "tm:feint", - "tm:flail", "tm:fling", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", - "tm:highjumpkick", "tm:hyperbeam", "tm:knockoff", "tm:laserfocus", @@ -122,13 +114,9 @@ "tm:naturepower", "tm:payback", "tm:petalblizzard", - "tm:playnice", "tm:playrough", "tm:powerwhip", "tm:protect", - "tm:punishment", - "tm:rapidspin", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:safeguard", @@ -136,24 +124,42 @@ "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", - "tm:splash", - "tm:stomp", "tm:substitute", "tm:sunnyday", "tm:swagger", - "tm:sweetscent", "tm:swift", "tm:synthesis", "tm:takedown", "tm:taunt", - "tm:teeterdance", "tm:terablast", "tm:trailblaze", "tm:tripleaxel", - "tm:tropkick", "tm:uturn", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:tripleaxel", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "steenee", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json b/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json index 3e5efc4fe5..0b18aee454 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/turtonator.json @@ -107,21 +107,18 @@ "tm:dragonpulse", "tm:dragontail", "tm:earthquake", - "tm:ember", "tm:endeavor", "tm:endure", "tm:explosion", "tm:facade", "tm:fireblast", "tm:firespin", - "tm:flail", "tm:flamecharge", "tm:flamethrower", "tm:flashcannon", "tm:fling", "tm:focusblast", "tm:gigaimpact", - "tm:headsmash", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", @@ -138,32 +135,53 @@ "tm:overheat", "tm:payback", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:revenge", "tm:roar", "tm:rocktomb", "tm:scaleshot", "tm:scorchingsands", - "tm:shellsmash", - "tm:shelltrap", "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:smog", "tm:solarbeam", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:taunt", "tm:terablast", "tm:uproar", "tm:venoshock", - "tm:wideguard", "tm:willowisp", - "tm:workup" + "tm:workup", + "tutor:block", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:chargebeam", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:lashout", + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:uproar" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/typenull.json b/common/src/main/resources/data/cobblemon/species/generation7/typenull.json index ebcd196a18..3da49fdba5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/typenull.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/typenull.json @@ -68,16 +68,13 @@ "egg:razorwind", "tm:aerialace", "tm:airslash", - "tm:crushclaw", "tm:doubleedge", - "tm:doublehit", "tm:dragonclaw", "tm:endure", "tm:facade", "tm:flamecharge", "tm:gigaimpact", "tm:hail", - "tm:healblock", "tm:hyperbeam", "tm:icywind", "tm:imprison", @@ -88,11 +85,7 @@ "tm:metalsound", "tm:payback", "tm:protect", - "tm:punishment", - "tm:pursuit", - "tm:rage", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:roar", "tm:rockslide", @@ -105,7 +98,6 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:terrainpulse", @@ -113,7 +105,24 @@ "tm:triattack", "tm:uturn", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:block", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lastresort", + "tutor:magiccoat", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:swift", + "tutor:terrainpulse", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json index c356070f76..d25765510f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json @@ -88,7 +88,6 @@ "tm:agility", "tm:airslash", "tm:batonpass", - "tm:bite", "tm:bugbite", "tm:bugbuzz", "tm:bulldoze", @@ -96,7 +95,6 @@ "tm:chargebeam", "tm:crunch", "tm:dig", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -107,8 +105,6 @@ "tm:flashcannon", "tm:fly", "tm:gigaimpact", - "tm:guillotine", - "tm:harden", "tm:hyperbeam", "tm:irondefense", "tm:laserfocus", @@ -131,8 +127,6 @@ "tm:skydrop", "tm:sleeptalk", "tm:solarbeam", - "tm:spark", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -143,11 +137,34 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:visegrip", "tm:voltswitch", "tm:wildcharge", "tm:xscissor", - "tm:zapcannon" + "tutor:bugbite", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:energyball", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:laserfocus", + "tutor:magnetrise", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:risingvoltage", + "tutor:roost", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:xscissor" ], "preEvolution": "charjabug", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json b/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json index e1fb3f1a44..ba22c7fcf2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/wimpod.json @@ -81,14 +81,11 @@ "egg:metalclaw", "egg:rollout", "egg:wideguard", - "tm:aquajet", "tm:assurance", "tm:bugbuzz", - "tm:defensecurl", "tm:endure", "tm:facade", "tm:hail", - "tm:harden", "tm:leechlife", "tm:metalclaw", "tm:mudshot", @@ -96,7 +93,6 @@ "tm:raindance", "tm:rest", "tm:rollout", - "tm:sandattack", "tm:scald", "tm:screech", "tm:skittersmack", @@ -109,7 +105,13 @@ "tm:taunt", "tm:terablast", "tm:waterfall", - "tm:wideguard" + "tutor:leechlife", + "tutor:rest", + "tutor:rollout", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:swift" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json index d2131c6a1d..f2578c3075 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/wishiwashi.json @@ -98,7 +98,6 @@ "egg:takedown", "egg:waterpulse", "egg:watersport", - "tm:aquaring", "tm:aquatail", "tm:beatup", "tm:brine", @@ -110,16 +109,13 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:feintattack", "tm:flipturn", - "tm:growl", "tm:hail", "tm:helpinghand", "tm:hydropump", "tm:icebeam", "tm:irontail", "tm:liquidation", - "tm:mist", "tm:muddywater", "tm:mudshot", "tm:protect", @@ -128,19 +124,30 @@ "tm:scald", "tm:scaleshot", "tm:sleeptalk", - "tm:soak", "tm:substitute", "tm:surf", "tm:takedown", - "tm:tearfullook", "tm:terablast", "tm:uproar", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:watersport", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:covet", + "tutor:dive", + "tutor:endeavor", + "tutor:flipturn", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:irontail", + "tutor:liquidation", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json b/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json index 605f3bb9df..712ade3c17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json @@ -81,7 +81,6 @@ "tm:charge", "tm:chargebeam", "tm:dazzlinggleam", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -94,9 +93,6 @@ "tm:grassknot", "tm:gravity", "tm:hyperbeam", - "tm:hypnosis", - "tm:ingrain", - "tm:iondeluge", "tm:lightscreen", "tm:magiccoat", "tm:magnetrise", @@ -111,20 +107,34 @@ "tm:signalbeam", "tm:sleeptalk", "tm:solarbeam", - "tm:spark", "tm:substitute", "tm:sunnyday", - "tm:tailglow", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tm:wrap", - "tm:zapcannon" + "tutor:bind", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:electroweb", + "tutor:energyball", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:magiccoat", + "tutor:magnetrise", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:signalbeam", + "tutor:sleeptalk", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json b/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json index cef2766b33..5cb90ecb2f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json @@ -80,8 +80,6 @@ "egg:lastresort", "egg:thunderfang", "egg:yawn", - "tm:bide", - "tm:bite", "tm:bulldoze", "tm:chillingwater", "tm:crunch", @@ -93,24 +91,19 @@ "tm:facade", "tm:firefang", "tm:helpinghand", - "tm:hyperfang", "tm:icefang", "tm:irontail", "tm:lastresort", - "tm:leer", "tm:mudshot", "tm:mudslap", - "tm:odorsleuth", "tm:payback", "tm:protect", "tm:psychicfangs", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:revenge", "tm:reversal", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:seedbomb", @@ -120,20 +113,35 @@ "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunderfang", "tm:torment", "tm:trailblaze", "tm:uturn", "tm:wildcharge", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:firefang", + "tutor:helpinghand", + "tutor:icefang", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:thunderfang", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json b/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json index 30e6d9e4d0..a7331af61f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json @@ -80,7 +80,6 @@ "tm:charge", "tm:closecombat", "tm:coaching", - "tm:discharge", "tm:drainpunch", "tm:dualchop", "tm:echoedvoice", @@ -90,13 +89,11 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:falseswipe", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", @@ -111,24 +108,18 @@ "tm:megapunch", "tm:outrage", "tm:payday", - "tm:plasmafists", "tm:playrough", "tm:poweruppunch", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:revenge", "tm:reversal", "tm:risingvoltage", "tm:scaryface", - "tm:scratch", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", - "tm:spark", "tm:substitute", "tm:superpower", "tm:swift", @@ -141,7 +132,40 @@ "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:bounce", + "tutor:bulkup", + "tutor:calmmind", + "tutor:coaching", + "tutor:drainpunch", + "tutor:dualchop", + "tutor:electroweb", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:knockoff", + "tutor:laserfocus", + "tutor:lowkick", + "tutor:outrage", + "tutor:playrough", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snatch", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json b/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json index c0775638e3..ebd09e3fd7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json +++ b/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json @@ -63,15 +63,11 @@ "80:superpower", "88:doubleironbash", "96:hyperbeam", - "tm:acidarmor", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:darkestlariat", - "tm:discharge", - "tm:doubleironbash", - "tm:dynamicpunch", "tm:earthquake", "tm:electricterrain", "tm:endure", @@ -79,7 +75,6 @@ "tm:flashcannon", "tm:gigaimpact", "tm:gyroball", - "tm:harden", "tm:headbutt", "tm:heavyslam", "tm:highhorsepower", @@ -101,13 +96,27 @@ "tm:steelroller", "tm:substitute", "tm:superpower", - "tm:tailwhip", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", - "tm:thundershock", - "tm:thunderwave" + "tm:thunderwave", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:superpower", + "tutor:thunderbolt", + "tutor:thunderpunch" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json b/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json index f95438e043..84f11f9f1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json +++ b/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json @@ -55,12 +55,10 @@ "24:thunderwave", "32:acidarmor", "40:flashcannon", - "tm:acidarmor", "tm:endure", "tm:facade", "tm:flashcannon", "tm:gyroball", - "tm:harden", "tm:headbutt", "tm:irondefense", "tm:protect", @@ -68,11 +66,15 @@ "tm:sleeptalk", "tm:steelbeam", "tm:substitute", - "tm:tailwhip", "tm:terablast", "tm:thunderbolt", - "tm:thundershock", - "tm:thunderwave" + "tm:thunderwave", + "tutor:flashcannon", + "tutor:irondefense", + "tutor:rest", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:thunderbolt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json index 406a635534..a808026363 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/alcremie.json @@ -92,16 +92,12 @@ "50:entrainment", "egg:babydolleyes", "egg:lastresort", - "tm:acidarmor", "tm:alluringvoice", - "tm:aromatherapy", - "tm:aromaticmist", "tm:attract", "tm:babydolleyes", "tm:calmmind", "tm:charm", "tm:dazzlinggleam", - "tm:decorate", "tm:disarmingvoice", "tm:drainingkiss", "tm:drainpunch", @@ -109,7 +105,6 @@ "tm:endeavor", "tm:endure", "tm:energyball", - "tm:entrainment", "tm:facade", "tm:faketears", "tm:fling", @@ -132,19 +127,36 @@ "tm:psychic", "tm:psychup", "tm:psyshock", - "tm:recover", "tm:rest", "tm:safeguard", "tm:sleeptalk", "tm:solarbeam", "tm:storedpower", "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", "tm:terablast", "tm:triattack", - "tm:wonderroom" + "tm:wonderroom", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magicroom", + "tutor:mistyexplosion", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:wonderroom" ], "preEvolution": "milcery", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/appletun.json b/common/src/main/resources/data/cobblemon/species/generation8/appletun.json index 024b697908..144205a543 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/appletun.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/appletun.json @@ -84,14 +84,11 @@ "egg:rollout", "egg:suckerpunch", "tm:amnesia", - "tm:appleacid", - "tm:astonish", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", "tm:bulletseed", "tm:curse", - "tm:defensecurl", "tm:dracometeor", "tm:dragonpulse", "tm:dragontail", @@ -104,7 +101,6 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:gyroball", "tm:headbutt", "tm:heavyslam", @@ -114,7 +110,6 @@ "tm:irondefense", "tm:ironhead", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", "tm:outrage", @@ -122,7 +117,6 @@ "tm:pounce", "tm:protect", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -131,18 +125,38 @@ "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", - "tm:stomp", "tm:stompingtantrum", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:superpower", - "tm:sweetscent", "tm:takedown", "tm:terablast", "tm:trailblaze", - "tm:withdraw", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:magicalleaf", + "tutor:outrage", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:zenheadbutt" ], "preEvolution": "applin", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/applin.json b/common/src/main/resources/data/cobblemon/species/generation8/applin.json index 9e11e3c99c..6829a9dd80 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/applin.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/applin.json @@ -75,14 +75,14 @@ "egg:recycle", "egg:rollout", "egg:suckerpunch", - "tm:astonish", - "tm:defensecurl", "tm:pounce", "tm:recycle", "tm:rollout", "tm:suckerpunch", "tm:terablast", - "tm:withdraw" + "tutor:recycle", + "tutor:rollout", + "tutor:suckerpunch" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/arctovish.json b/common/src/main/resources/data/cobblemon/species/generation8/arctovish.json index 9e540d6e7c..f2dfea1ec7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/arctovish.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/arctovish.json @@ -82,7 +82,6 @@ "tm:ancientpower", "tm:auroraveil", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brine", @@ -90,22 +89,18 @@ "tm:dive", "tm:endure", "tm:facade", - "tm:fishiousrend", - "tm:freezedry", "tm:gigaimpact", "tm:hail", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", "tm:icefang", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:irondefense", "tm:ironhead", "tm:liquidation", "tm:meteorbeam", - "tm:powdersnow", "tm:protect", "tm:psychicfangs", "tm:raindance", @@ -120,9 +115,26 @@ "tm:surf", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:dive", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:liquidation", + "tutor:meteorbeam", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superfang", + "tutor:zenheadbutt" ], "evolutions": [], "drops": { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/arctozolt.json b/common/src/main/resources/data/cobblemon/species/generation8/arctozolt.json index e23db71570..d449ceae73 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/arctozolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/arctozolt.json @@ -83,15 +83,12 @@ "tm:avalanche", "tm:blizzard", "tm:bodyslam", - "tm:boltbeak", "tm:bulldoze", "tm:charge", - "tm:discharge", "tm:echoedvoice", "tm:electroball", "tm:endure", "tm:facade", - "tm:freezedry", "tm:gigaimpact", "tm:hail", "tm:hydropump", @@ -99,7 +96,6 @@ "tm:hypervoice", "tm:icebeam", "tm:icefang", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:irontail", @@ -109,7 +105,6 @@ "tm:meteorbeam", "tm:payback", "tm:pluck", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -117,7 +112,6 @@ "tm:rockblast", "tm:rockslide", "tm:rocktomb", - "tm:slam", "tm:sleeptalk", "tm:stompingtantrum", "tm:stoneedge", @@ -129,9 +123,29 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", - "tm:wildcharge" + "tm:wildcharge", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:irontail", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:wildcharge" ], "evolutions": [], "drops": { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json b/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json index 9824880afe..dd68659bd2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/arrokuda.json @@ -91,11 +91,8 @@ "egg:nightslash", "egg:slash", "egg:thrash", - "tm:acupressure", "tm:agility", - "tm:aquajet", "tm:assurance", - "tm:bite", "tm:bounce", "tm:brickbreak", "tm:chillingwater", @@ -108,30 +105,40 @@ "tm:facade", "tm:flipturn", "tm:focusenergy", - "tm:furyattack", "tm:hydropump", "tm:icefang", "tm:laserfocus", "tm:liquidation", - "tm:nightslash", - "tm:peck", "tm:protect", "tm:psychicfangs", "tm:raindance", "tm:rest", "tm:scaleshot", - "tm:slash", "tm:sleeptalk", "tm:substitute", "tm:surf", "tm:swift", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:waterfall", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:bounce", + "tutor:dive", + "tutor:drillrun", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:icefang", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:psychic", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json b/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json index b28e2a12e7..fa3a930737 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/barraskewda.json @@ -92,11 +92,8 @@ "egg:nightslash", "egg:slash", "egg:thrash", - "tm:acupressure", "tm:agility", - "tm:aquajet", "tm:assurance", - "tm:bite", "tm:blizzard", "tm:bounce", "tm:brickbreak", @@ -110,7 +107,6 @@ "tm:facade", "tm:flipturn", "tm:focusenergy", - "tm:furyattack", "tm:gigaimpact", "tm:hydropump", "tm:hyperbeam", @@ -118,8 +114,6 @@ "tm:icefang", "tm:laserfocus", "tm:liquidation", - "tm:nightslash", - "tm:peck", "tm:poisonjab", "tm:protect", "tm:psychicfangs", @@ -127,18 +121,35 @@ "tm:rest", "tm:scaleshot", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:substitute", "tm:surf", "tm:swift", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:waterfall", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:bounce", + "tutor:dive", + "tutor:drillrun", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:laserfocus", + "tutor:liquidation", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "preEvolution": "arrokuda", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json b/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json index b473b95672..18c69596e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json @@ -63,10 +63,7 @@ "egg:stickyweb", "egg:supersonic", "tm:infestation", - "tm:recover", - "tm:stickyweb", "tm:strugglebug", - "tm:supersonic", "tm:terablast" ], "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json index 224b9aaff7..33e67f9f3f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/boltund.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/boltund.json @@ -91,17 +91,14 @@ "egg:howl", "egg:sandattack", "tm:agility", - "tm:bite", "tm:bulkup", "tm:charge", "tm:charm", "tm:crunch", "tm:dig", - "tm:discharge", "tm:doubleedge", "tm:eerieimpulse", "tm:electricterrain", - "tm:electrify", "tm:electroball", "tm:endure", "tm:facade", @@ -110,24 +107,18 @@ "tm:focusenergy", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", - "tm:nuzzle", "tm:playrough", "tm:protect", "tm:psychicfangs", "tm:rest", "tm:risingvoltage", "tm:roar", - "tm:sandattack", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:substitute", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:terablast", "tm:thunder", "tm:thunderbolt", @@ -135,7 +126,25 @@ "tm:thunderwave", "tm:uproar", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:bulkup", + "tutor:firefang", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "yamper", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json b/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json index 74c96d1fa1..b1638c1abe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json @@ -68,12 +68,10 @@ "88:futuresight", "tm:agility", "tm:allyswitch", - "tm:aromatherapy", "tm:batonpass", "tm:bodypress", "tm:bulletseed", "tm:calmmind", - "tm:confusion", "tm:drainingkiss", "tm:encore", "tm:endure", @@ -86,24 +84,18 @@ "tm:grassknot", "tm:grassyterrain", "tm:gravity", - "tm:growth", "tm:guardswap", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:imprison", "tm:leafstorm", - "tm:leechseed", - "tm:lifedew", "tm:lightscreen", "tm:magicalleaf", "tm:magicroom", - "tm:megadrain", "tm:metronome", "tm:mudshot", "tm:payday", "tm:pollenpuff", - "tm:pound", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -132,7 +124,28 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:magicroom", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -209,7 +222,6 @@ "88:futuresight", "tm:agility", "tm:allyswitch", - "tm:aromatherapy", "tm:assurance", "tm:avalanche", "tm:batonpass", @@ -220,11 +232,9 @@ "tm:bulletseed", "tm:calmmind", "tm:closecombat", - "tm:confusion", "tm:crunch", "tm:curse", "tm:doubleedge", - "tm:doublekick", "tm:drainingkiss", "tm:encore", "tm:endure", @@ -234,41 +244,32 @@ "tm:futuresight", "tm:gigadrain", "tm:gigaimpact", - "tm:glaciallance", "tm:grassknot", "tm:grassyterrain", "tm:gravity", - "tm:growth", "tm:guardswap", "tm:hail", - "tm:healpulse", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", "tm:icebeam", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:imprison", "tm:irondefense", "tm:lashout", "tm:leafstorm", - "tm:leechseed", - "tm:lifedew", "tm:lightscreen", "tm:magicalleaf", "tm:magicroom", - "tm:megadrain", "tm:megahorn", "tm:metronome", - "tm:mist", "tm:mudshot", "tm:outrage", "tm:payback", "tm:payday", "tm:pollenpuff", - "tm:pound", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -290,7 +291,6 @@ "tm:solarbeam", "tm:solarblade", "tm:speedswap", - "tm:stomp", "tm:stompingtantrum", "tm:storedpower", "tm:substitute", @@ -298,12 +298,9 @@ "tm:superpower", "tm:swift", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:torment", "tm:trailblaze", @@ -311,7 +308,39 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:lashout", + "tutor:magicalleaf", + "tutor:magicroom", + "tutor:megahorn", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:seedbomb", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false @@ -389,22 +418,17 @@ "88:futuresight", "tm:agility", "tm:allyswitch", - "tm:aromatherapy", "tm:assurance", - "tm:astralbarrage", "tm:batonpass", "tm:bodyslam", "tm:bulldoze", "tm:bulletseed", "tm:calmmind", "tm:confuseray", - "tm:confusion", "tm:crunch", "tm:curse", "tm:darkpulse", - "tm:disable", "tm:doubleedge", - "tm:doublekick", "tm:drainingkiss", "tm:encore", "tm:endure", @@ -418,22 +442,17 @@ "tm:grassknot", "tm:grassyterrain", "tm:gravity", - "tm:growth", "tm:guardswap", "tm:haze", - "tm:healpulse", "tm:helpinghand", "tm:hex", "tm:hyperbeam", "tm:imprison", "tm:lashout", "tm:leafstorm", - "tm:leechseed", - "tm:lifedew", "tm:lightscreen", "tm:magicalleaf", "tm:magicroom", - "tm:megadrain", "tm:metronome", "tm:mudshot", "tm:nastyplot", @@ -443,7 +462,6 @@ "tm:payday", "tm:phantomforce", "tm:pollenpuff", - "tm:pound", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -464,24 +482,49 @@ "tm:solarbeam", "tm:solarblade", "tm:speedswap", - "tm:stomp", "tm:stompingtantrum", "tm:storedpower", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:triattack", "tm:trick", "tm:trickroom", "tm:willowisp", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:lashout", + "tutor:magicalleaf", + "tutor:magicroom", + "tutor:painsplit", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation8/carkol.json b/common/src/main/resources/data/cobblemon/species/generation8/carkol.json index d216cdfc84..109ab8aee1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/carkol.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/carkol.json @@ -95,7 +95,6 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", - "tm:burnup", "tm:curse", "tm:dig", "tm:endure", @@ -118,7 +117,6 @@ "tm:overheat", "tm:powergem", "tm:protect", - "tm:rapidspin", "tm:reflect", "tm:rest", "tm:rockblast", @@ -132,17 +130,31 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:smackdown", - "tm:smokescreen", "tm:spikes", "tm:stealthrock", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:willowisp" + "tm:willowisp", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge" ], "preEvolution": "rolycoly", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json index 4623e2dccc..9299c392b2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/centiskorch.json @@ -93,29 +93,21 @@ "egg:knockoff", "egg:rollout", "egg:strugglebug", - "tm:bite", "tm:brutalswing", "tm:bugbite", "tm:bugbuzz", - "tm:burnup", - "tm:coil", "tm:crunch", - "tm:defensecurl", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", "tm:firefang", - "tm:firelash", "tm:firespin", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:gigaimpact", "tm:heatcrash", "tm:heatwave", "tm:hyperbeam", - "tm:inferno", "tm:knockoff", "tm:leechlife", "tm:lunge", @@ -128,9 +120,7 @@ "tm:scald", "tm:scorchingsands", "tm:skittersmack", - "tm:slam", "tm:sleeptalk", - "tm:smokescreen", "tm:solarbeam", "tm:strugglebug", "tm:substitute", @@ -139,8 +129,23 @@ "tm:thunderfang", "tm:venoshock", "tm:willowisp", - "tm:wrap", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:leechlife", + "tutor:mysticalfire", + "tutor:rest", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:thunderfang", + "tutor:xscissor" ], "preEvolution": "sizzlipede", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json b/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json index 7bdac9f35d..35faef63a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json @@ -86,10 +86,8 @@ "egg:shellsmash", "egg:skullbash", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:chillingwater", - "tm:counter", "tm:crunch", "tm:dive", "tm:dragontail", @@ -100,7 +98,6 @@ "tm:headbutt", "tm:hydropump", "tm:icefang", - "tm:jawlock", "tm:liquidation", "tm:mudshot", "tm:payback", @@ -110,20 +107,27 @@ "tm:rest", "tm:revenge", "tm:scaryface", - "tm:shellsmash", "tm:skittersmack", - "tm:skullbash", "tm:sleeptalk", "tm:stompingtantrum", "tm:substitute", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:dive", + "tutor:falseswipe", + "tutor:gastroacid", + "tutor:icefang", + "tutor:liquidation", + "tutor:poisonjab", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json index dcaea68f0a..31f76b927d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cinderace.json @@ -98,15 +98,10 @@ "tm:bulkup", "tm:burningjealousy", "tm:coaching", - "tm:counter", - "tm:courtchange", "tm:doubleedge", - "tm:doublekick", "tm:electroball", - "tm:ember", "tm:endure", "tm:facade", - "tm:feint", "tm:fireblast", "tm:firefang", "tm:firepledge", @@ -119,12 +114,10 @@ "tm:focusblast", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:highjumpkick", "tm:hyperbeam", "tm:ironhead", "tm:lowkick", @@ -134,12 +127,9 @@ "tm:mudslap", "tm:overheat", "tm:protect", - "tm:pyroball", - "tm:quickattack", "tm:rest", "tm:revenge", "tm:reversal", - "tm:sandattack", "tm:scorchingsands", "tm:shadowball", "tm:sleeptalk", @@ -151,7 +141,6 @@ "tm:superfang", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:temperflare", @@ -161,7 +150,35 @@ "tm:weatherball", "tm:willowisp", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:blastburn", + "tutor:bounce", + "tutor:bulkup", + "tutor:burningjealousy", + "tutor:coaching", + "tutor:firefang", + "tutor:firepledge", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:lowkick", + "tutor:mudslap", + "tutor:rest", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:swift", + "tutor:zenheadbutt" ], "preEvolution": "raboot", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json b/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json index f4b01a3bed..07b74899d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json @@ -93,17 +93,13 @@ "tm:brickbreak", "tm:brine", "tm:bulkup", - "tm:circlethrow", "tm:closecombat", "tm:coaching", - "tm:detect", "tm:dive", "tm:endure", "tm:facade", - "tm:feint", "tm:focusblast", "tm:icepunch", - "tm:leer", "tm:liquidation", "tm:megapunch", "tm:muddywater", @@ -117,17 +113,26 @@ "tm:revenge", "tm:reversal", "tm:rocksmash", - "tm:seismictoss", "tm:sleeptalk", - "tm:soak", - "tm:submission", "tm:substitute", "tm:suckerpunch", "tm:superpower", "tm:taunt", "tm:terablast", "tm:waterfall", - "tm:workup" + "tm:workup", + "tutor:bind", + "tutor:bulkup", + "tutor:coaching", + "tutor:dive", + "tutor:icepunch", + "tutor:liquidation", + "tutor:painsplit", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:superpower" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json b/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json index e9b2d4fdec..bca16fdaa9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json @@ -96,7 +96,6 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", - "tm:burnup", "tm:curse", "tm:dig", "tm:earthpower", @@ -127,7 +126,6 @@ "tm:overheat", "tm:powergem", "tm:protect", - "tm:rapidspin", "tm:reflect", "tm:rest", "tm:rockblast", @@ -141,19 +139,37 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:smackdown", - "tm:smokescreen", "tm:solarbeam", "tm:spikes", "tm:stealthrock", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", - "tm:tarshot", "tm:temperflare", "tm:terablast", - "tm:willowisp" + "tm:willowisp", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge" ], "preEvolution": "carkol", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json b/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json index bfd5c7bda2..a2c51421ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/copperajah.json @@ -95,14 +95,12 @@ "egg:slam", "egg:swagger", "egg:whirlwind", - "tm:belch", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", @@ -110,11 +108,9 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", "tm:flashcannon", "tm:fling", "tm:gigaimpact", - "tm:growl", "tm:hardpress", "tm:heatcrash", "tm:heavyslam", @@ -139,14 +135,12 @@ "tm:rollout", "tm:sandstorm", "tm:screech", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:snarl", "tm:stealthrock", "tm:steelbeam", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -154,13 +148,36 @@ "tm:supercellslam", "tm:superpower", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:whirlwind", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:outrage", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:zenheadbutt" ], "preEvolution": "cufant", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json index 50f2e72778..33fb5693e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corviknight.json @@ -115,7 +115,6 @@ "tm:curse", "tm:defog", "tm:doubleedge", - "tm:drillpeck", "tm:dualwingbeat", "tm:endure", "tm:facade", @@ -123,7 +122,6 @@ "tm:flashcannon", "tm:fly", "tm:focusenergy", - "tm:furyattack", "tm:gigaimpact", "tm:heavyslam", "tm:honeclaws", @@ -131,15 +129,12 @@ "tm:hyperbeam", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:lightscreen", "tm:metalclaw", "tm:metalsound", "tm:nastyplot", "tm:payback", - "tm:peck", "tm:pluck", - "tm:powertrip", "tm:protect", "tm:raindance", "tm:reflect", @@ -149,7 +144,6 @@ "tm:reversal", "tm:rocksmash", "tm:roost", - "tm:sandattack", "tm:scaryface", "tm:screech", "tm:skyattack", @@ -167,7 +161,27 @@ "tm:terablast", "tm:thief", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bulkup", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:steelbeam", + "tutor:swift", + "tutor:tailwind" ], "preEvolution": "corvisquire", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json index d3a9f28e1c..198ab120a6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json @@ -105,22 +105,17 @@ "tm:assurance", "tm:bravebird", "tm:defog", - "tm:drillpeck", "tm:dualwingbeat", "tm:endure", "tm:facade", "tm:faketears", "tm:fly", "tm:focusenergy", - "tm:furyattack", "tm:honeclaws", "tm:hurricane", - "tm:leer", "tm:nastyplot", "tm:payback", - "tm:peck", "tm:pluck", - "tm:powertrip", "tm:protect", "tm:rest", "tm:retaliate", @@ -128,7 +123,6 @@ "tm:reversal", "tm:rocksmash", "tm:roost", - "tm:sandattack", "tm:scaryface", "tm:skyattack", "tm:sleeptalk", @@ -143,7 +137,20 @@ "tm:terablast", "tm:thief", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:focusenergy", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:tailwind" ], "preEvolution": "rookidee", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json b/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json index 9402eef45c..4de6a09d22 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json @@ -105,23 +105,18 @@ "tm:aircutter", "tm:airslash", "tm:amnesia", - "tm:aquacutter", - "tm:aquaring", "tm:assurance", - "tm:belch", "tm:blizzard", "tm:bravebird", "tm:chillingwater", "tm:defog", "tm:dive", - "tm:drillpeck", "tm:dualwingbeat", "tm:endeavor", "tm:endure", "tm:facade", "tm:featherdance", "tm:fly", - "tm:furyattack", "tm:gigaimpact", "tm:hurricane", "tm:hydropump", @@ -129,7 +124,6 @@ "tm:icebeam", "tm:icywind", "tm:liquidation", - "tm:peck", "tm:pluck", "tm:pounce", "tm:protect", @@ -138,24 +132,38 @@ "tm:reversal", "tm:roost", "tm:sleeptalk", - "tm:spitup", "tm:steelwing", - "tm:stockpile", "tm:substitute", "tm:superpower", "tm:surf", - "tm:swallow", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:uproar", - "tm:watergun", "tm:waterpulse", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dive", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:tailwind", + "tutor:throatchop", + "tutor:uproar", + "tutor:waterpulse" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cufant.json b/common/src/main/resources/data/cobblemon/species/generation8/cufant.json index 75c0f3d267..37ceb97818 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cufant.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cufant.json @@ -94,14 +94,12 @@ "egg:slam", "egg:swagger", "egg:whirlwind", - "tm:belch", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", @@ -109,10 +107,8 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fissure", "tm:flashcannon", "tm:fling", - "tm:growl", "tm:heavyslam", "tm:highhorsepower", "tm:irondefense", @@ -130,24 +126,40 @@ "tm:rollout", "tm:sandstorm", "tm:screech", - "tm:slam", "tm:sleeptalk", "tm:stealthrock", "tm:steelbeam", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:superpower", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:whirlwind", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:highhorsepower", + "tutor:irondefense", + "tutor:ironhead", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cursola.json b/common/src/main/resources/data/cobblemon/species/generation8/cursola.json index 422cd8fe42..201638eb69 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/cursola.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/cursola.json @@ -91,7 +91,6 @@ "egg:waterpulse", "tm:amnesia", "tm:ancientpower", - "tm:astonish", "tm:blizzard", "tm:bodyslam", "tm:brine", @@ -100,20 +99,15 @@ "tm:calmmind", "tm:confuseray", "tm:curse", - "tm:destinybond", "tm:dig", - "tm:disable", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:facade", "tm:gigadrain", "tm:gigaimpact", - "tm:grudge", "tm:hail", - "tm:harden", "tm:haze", - "tm:headsmash", "tm:hex", "tm:hydropump", "tm:hyperbeam", @@ -125,10 +119,8 @@ "tm:lightscreen", "tm:liquidation", "tm:meteorbeam", - "tm:mirrorcoat", "tm:naturepower", "tm:nightshade", - "tm:perishsong", "tm:pinmissile", "tm:poltergeist", "tm:powergem", @@ -152,16 +144,40 @@ "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", - "tm:strengthsap", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:tackle", "tm:terablast", "tm:throatchop", "tm:waterpulse", "tm:whirlpool", - "tm:willowisp" + "tm:willowisp", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:burningjealousy", + "tutor:calmmind", + "tutor:earthpower", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:leechlife", + "tutor:liquidation", + "tutor:meteorbeam", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:throatchop", + "tutor:waterpulse" ], "preEvolution": "corsola galarian", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json index 971b44f5bc..cb3c4112b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json @@ -70,7 +70,6 @@ "tm:bodypress", "tm:bugbuzz", "tm:calmmind", - "tm:confusion", "tm:endure", "tm:energyball", "tm:expandingforce", @@ -90,7 +89,6 @@ "tm:psychic", "tm:psychicterrain", "tm:psyshock", - "tm:recover", "tm:reflect", "tm:rest", "tm:safeguard", @@ -98,16 +96,30 @@ "tm:skillswap", "tm:sleeptalk", "tm:solarbeam", - "tm:stickyweb", "tm:storedpower", "tm:strugglebug", "tm:substitute", - "tm:supersonic", "tm:terablast", "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:energyball", + "tutor:expandingforce", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:leechlife", + "tutor:magicroom", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "blipbug", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dracovish.json b/common/src/main/resources/data/cobblemon/species/generation8/dracovish.json index fe13691843..83e6a5958a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dracovish.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dracovish.json @@ -80,7 +80,6 @@ "70:dragonpulse", "77:dragonrush", "tm:ancientpower", - "tm:bite", "tm:bodyslam", "tm:brine", "tm:brutalswing", @@ -88,14 +87,11 @@ "tm:crunch", "tm:dive", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonpulse", - "tm:dragonrush", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:facade", - "tm:fishiousrend", "tm:gigaimpact", "tm:hydropump", "tm:hyperbeam", @@ -116,18 +112,38 @@ "tm:rocktomb", "tm:scald", "tm:sleeptalk", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:superfang", "tm:surf", - "tm:tackle", "tm:terablast", "tm:waterfall", - "tm:watergun", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:ironhead", + "tutor:leechlife", + "tutor:liquidation", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superfang", + "tutor:zenheadbutt" ], "evolutions": [], "drops": { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dracozolt.json b/common/src/main/resources/data/cobblemon/species/generation8/dracozolt.json index fe9c53c88a..f3955f6e7b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dracozolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dracozolt.json @@ -80,16 +80,13 @@ "tm:aerialace", "tm:ancientpower", "tm:bodyslam", - "tm:boltbeak", "tm:breakingswipe", "tm:brutalswing", "tm:bulldoze", "tm:charge", - "tm:discharge", "tm:dracometeor", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:earthpower", "tm:earthquake", @@ -117,23 +114,44 @@ "tm:rockblast", "tm:rockslide", "tm:rocktomb", - "tm:slam", "tm:sleeptalk", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:taunt", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", - "tm:wildcharge" + "tm:wildcharge", + "tutor:aerialace", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:rest", + "tutor:risingvoltage", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:wildcharge" ], "evolutions": [], "drops": { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json b/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json index ab909c4569..16a87cd11f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dragapult.json @@ -110,28 +110,21 @@ "tm:agility", "tm:allyswitch", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:beatup", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:brine", "tm:confuseray", "tm:curse", - "tm:disable", "tm:dive", "tm:doubleedge", - "tm:doublehit", "tm:doubleteam", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", - "tm:dragondarts", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:endure", "tm:facade", @@ -139,7 +132,6 @@ "tm:flamethrower", "tm:fly", "tm:gigaimpact", - "tm:grudge", "tm:helpinghand", "tm:hex", "tm:hydropump", @@ -147,14 +139,12 @@ "tm:infestation", "tm:lastresort", "tm:lightscreen", - "tm:lockon", "tm:nightshade", "tm:outrage", "tm:phantomforce", "tm:pounce", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:reflect", "tm:rest", "tm:shadowball", @@ -174,7 +164,24 @@ "tm:thunderwave", "tm:triattack", "tm:uturn", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:lastresort", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderbolt" ], "preEvolution": "drakloak", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json b/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json index 078eae20f8..fecedb7b62 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drakloak.json @@ -108,44 +108,36 @@ "tm:agility", "tm:allyswitch", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:beatup", - "tm:bite", "tm:breakingswipe", "tm:brine", "tm:confuseray", "tm:curse", - "tm:disable", "tm:dive", "tm:doubleedge", - "tm:doublehit", "tm:doubleteam", "tm:dracometeor", "tm:dragoncheer", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:endure", "tm:facade", "tm:fireblast", "tm:flamethrower", - "tm:grudge", "tm:helpinghand", "tm:hex", "tm:hydropump", "tm:infestation", "tm:lastresort", "tm:lightscreen", - "tm:lockon", "tm:nightshade", "tm:outrage", "tm:phantomforce", "tm:pounce", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:reflect", "tm:rest", "tm:shadowball", @@ -163,7 +155,22 @@ "tm:thunderbolt", "tm:thunderwave", "tm:uturn", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:dive", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flamethrower", + "tutor:helpinghand", + "tutor:lastresort", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderbolt" ], "preEvolution": "dreepy", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json b/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json index 38135974c0..145fc1c59a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json @@ -92,13 +92,11 @@ "egg:shellsmash", "egg:skullbash", "tm:assurance", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", "tm:chillingwater", - "tm:counter", "tm:crunch", "tm:dig", "tm:dive", @@ -112,7 +110,6 @@ "tm:gastroacid", "tm:gigaimpact", "tm:headbutt", - "tm:headsmash", "tm:highhorsepower", "tm:hydropump", "tm:hyperbeam", @@ -121,7 +118,6 @@ "tm:icespinner", "tm:irondefense", "tm:irontail", - "tm:jawlock", "tm:liquidation", "tm:megahorn", "tm:meteorbeam", @@ -141,9 +137,7 @@ "tm:sandstorm", "tm:sandtomb", "tm:scaryface", - "tm:shellsmash", "tm:skittersmack", - "tm:skullbash", "tm:sleeptalk", "tm:smartstrike", "tm:stealthrock", @@ -154,14 +148,39 @@ "tm:superpower", "tm:surf", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:throatchop", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:falseswipe", + "tutor:gastroacid", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:irondefense", + "tutor:irontail", + "tutor:liquidation", + "tutor:megahorn", + "tutor:meteorbeam", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superfang", + "tutor:superpower", + "tutor:throatchop", + "tutor:waterpulse" ], "preEvolution": "chewtle", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dreepy.json b/common/src/main/resources/data/cobblemon/species/generation8/dreepy.json index 18d7e5fabb..4f26ca2e51 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dreepy.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dreepy.json @@ -92,29 +92,30 @@ "egg:dragontail", "egg:grudge", "egg:suckerpunch", - "tm:astonish", "tm:batonpass", - "tm:bite", "tm:confuseray", "tm:curse", - "tm:disable", "tm:doubleteam", "tm:dracometeor", "tm:dragontail", "tm:endure", "tm:facade", - "tm:grudge", "tm:helpinghand", "tm:infestation", "tm:protect", - "tm:quickattack", "tm:rest", "tm:sleeptalk", "tm:substitute", "tm:suckerpunch", "tm:swift", "tm:terablast", - "tm:thunderwave" + "tm:thunderwave", + "tutor:dracometeor", + "tutor:helpinghand", + "tutor:rest", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json b/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json index 2027400295..948e67700b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/drizzile.json @@ -90,8 +90,6 @@ "egg:haze", "egg:iceshard", "egg:mist", - "tm:aquajet", - "tm:aquaring", "tm:batonpass", "tm:bind", "tm:bounce", @@ -100,40 +98,42 @@ "tm:doubleteam", "tm:endure", "tm:facade", - "tm:fellstinger", "tm:fling", - "tm:growl", "tm:haze", "tm:hydropump", - "tm:iceshard", "tm:lightscreen", "tm:liquidation", - "tm:mist", "tm:muddywater", "tm:mudshot", - "tm:pound", "tm:protect", "tm:raindance", "tm:reflect", "tm:rest", "tm:safeguard", "tm:sleeptalk", - "tm:soak", "tm:substitute", "tm:suckerpunch", "tm:surf", "tm:swift", "tm:takedown", - "tm:tearfullook", "tm:terablast", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:bind", + "tutor:bounce", + "tutor:dive", + "tutor:liquidation", + "tutor:rest", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "sobble", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json b/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json index bf8689290d..c7fe3d5992 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dubwool.json @@ -92,19 +92,12 @@ "tm:bodypress", "tm:bodyslam", "tm:bounce", - "tm:copycat", - "tm:cottonguard", - "tm:counter", - "tm:defensecurl", "tm:doubleedge", - "tm:doublekick", "tm:electroball", "tm:endure", "tm:facade", "tm:gigaimpact", "tm:grassyglide", - "tm:growl", - "tm:guardsplit", "tm:guardswap", "tm:headbutt", "tm:hyperbeam", @@ -116,16 +109,23 @@ "tm:retaliate", "tm:reversal", "tm:sleeptalk", - "tm:stomp", "tm:substitute", "tm:swagger", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderwave", "tm:wildcharge", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:lastresort", + "tutor:rest", + "tutor:sleeptalk", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "wooloo", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json b/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json index dffaf3c66c..4909c681f7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json @@ -99,13 +99,9 @@ "tm:irondefense", "tm:ironhead", "tm:laserfocus", - "tm:leer", "tm:lightscreen", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", - "tm:mirrorcoat", - "tm:nightslash", "tm:outrage", "tm:protect", "tm:reflect", @@ -116,7 +112,6 @@ "tm:rocktomb", "tm:scaryface", "tm:screech", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:solarbeam", @@ -130,7 +125,29 @@ "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thunderwave" + "tm:thunderwave", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:laserfocus", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stoneedge", + "tutor:thunderbolt" ], "evolutions": [ { @@ -142,7 +159,7 @@ "electroshot" ], "requirements": [], - "requiredContext": "cobblemon:metal_alloy" + "requiredContext": "cobblemon:metal_coat" } ], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index ba7e5ad328..aefce812d2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -51,9 +51,9 @@ "light": "0-4" }, "moving": { - "walk": { - "walkSpeed": 0.15 - }, + "walk": { + "walkSpeed": 0.15 + }, "swim": { "canSwimInWater": true, "canSwimInLava": false, @@ -106,10 +106,8 @@ "egg:soak", "tm:agility", "tm:amnesia", - "tm:aquaring", "tm:auroraveil", "tm:avalanche", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:brine", @@ -120,24 +118,19 @@ "tm:facade", "tm:featherdance", "tm:flipturn", - "tm:freezedry", "tm:gigaimpact", "tm:hail", "tm:headbutt", - "tm:headsmash", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", "tm:icepunch", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:irondefense", "tm:ironhead", "tm:liquidation", - "tm:mist", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:reflect", @@ -145,17 +138,29 @@ "tm:reversal", "tm:sleeptalk", "tm:snowscape", - "tm:soak", "tm:substitute", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:waterfall", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:dive", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:ironhead", + "tutor:liquidation", + "tutor:rest", + "tutor:sleeptalk", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json b/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json index dead9958a9..6e021a0701 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eldegoss.json @@ -81,11 +81,8 @@ "egg:sleeppowder", "egg:stunspore", "egg:worryseed", - "tm:aromatherapy", "tm:bulletseed", "tm:charm", - "tm:cottonguard", - "tm:cottonspore", "tm:endure", "tm:energyball", "tm:facade", @@ -94,36 +91,38 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", - "tm:leafage", "tm:leafstorm", - "tm:leaftornado", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:rapidspin", - "tm:razorleaf", "tm:rest", "tm:round", "tm:seedbomb", - "tm:sing", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:synthesis", "tm:terablast", "tm:weatherball", - "tm:worryseed" + "tm:worryseed", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:worryseed" ], "preEvolution": "gossifleur", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json b/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json index 244f7bdb2d..c6001c59fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json @@ -77,9 +77,7 @@ "tm:dragondance", "tm:dragonpulse", "tm:dragontail", - "tm:dynamaxcannon", "tm:endure", - "tm:eternabeam", "tm:facade", "tm:fireblast", "tm:firespin", @@ -99,7 +97,6 @@ "tm:poisontail", "tm:protect", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:scaryface", @@ -116,7 +113,24 @@ "tm:toxic", "tm:toxicspikes", "tm:venomdrench", - "tm:venoshock" + "tm:venoshock", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:meteorbeam", + "tutor:mysticalfire", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json index 989a20737e..1c9f9bb62e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/falinks.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json @@ -93,12 +93,10 @@ "tm:bulkup", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:firstimpression", "tm:focusblast", "tm:focusenergy", "tm:gigaimpact", @@ -111,7 +109,6 @@ "tm:knockoff", "tm:lunge", "tm:megahorn", - "tm:noretreat", "tm:payback", "tm:poisonjab", "tm:protect", @@ -131,14 +128,35 @@ "tm:sunnyday", "tm:superpower", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:throatchop", "tm:trailblaze", "tm:upperhand", "tm:uproar", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:coaching", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:throatchop", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/flapple.json b/common/src/main/resources/data/cobblemon/species/generation8/flapple.json index 90bfd5eb68..642ca4d384 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/flapple.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/flapple.json @@ -87,14 +87,10 @@ "tm:acrobatics", "tm:aerialace", "tm:airslash", - "tm:astonish", "tm:bulletseed", - "tm:defensecurl", "tm:dracometeor", - "tm:dragonbreath", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dualwingbeat", "tm:endeavor", "tm:endure", @@ -107,13 +103,10 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:gravapple", - "tm:growth", "tm:heavyslam", "tm:hyperbeam", "tm:irondefense", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:outrage", "tm:pounce", @@ -133,8 +126,27 @@ "tm:trailblaze", "tm:twister", "tm:uturn", - "tm:wingattack", - "tm:withdraw" + "tutor:aerialace", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:energyball", + "tutor:focusenergy", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:magicalleaf", + "tutor:outrage", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:twister" ], "preEvolution": "applin", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json b/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json index b5d7956b5d..6293b4104a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json @@ -89,7 +89,6 @@ "tm:acrobatics", "tm:airslash", "tm:attract", - "tm:aurorabeam", "tm:auroraveil", "tm:avalanche", "tm:blizzard", @@ -100,7 +99,6 @@ "tm:defog", "tm:endure", "tm:facade", - "tm:fairywind", "tm:featherdance", "tm:gigadrain", "tm:gigaimpact", @@ -117,13 +115,9 @@ "tm:leechlife", "tm:lightscreen", "tm:lunge", - "tm:mirrorcoat", - "tm:mist", "tm:playrough", "tm:pounce", - "tm:powdersnow", "tm:protect", - "tm:quiverdance", "tm:reflect", "tm:rest", "tm:safeguard", @@ -131,7 +125,6 @@ "tm:sleeptalk", "tm:snowscape", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:swift", "tm:tailwind", @@ -140,7 +133,24 @@ "tm:tripleaxel", "tm:uturn", "tm:weatherball", - "tm:wideguard" + "tutor:bugbite", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:defog", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:leechlife", + "tutor:playrough", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:tripleaxel" ], "preEvolution": "snom", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json b/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json index ff80d4cec6..01a83880c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json @@ -72,7 +72,6 @@ "tm:crunch", "tm:curse", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:facade", "tm:gigaimpact", @@ -81,12 +80,10 @@ "tm:highhorsepower", "tm:hyperbeam", "tm:icebeam", - "tm:iciclecrash", "tm:icywind", "tm:irondefense", "tm:lashout", "tm:megahorn", - "tm:mist", "tm:mudshot", "tm:outrage", "tm:payback", @@ -98,21 +95,34 @@ "tm:smartstrike", "tm:snarl", "tm:snowscape", - "tm:stomp", "tm:stompingtantrum", "tm:substitute", "tm:superpower", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:throatchop", "tm:torment", "tm:trailblaze", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", + "tutor:lashout", + "tutor:megahorn", + "tutor:outrage", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:throatchop", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json b/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json index c35e552649..677912bc2c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/gossifleur.json @@ -75,7 +75,6 @@ "egg:sleeppowder", "egg:stunspore", "egg:worryseed", - "tm:aromatherapy", "tm:bulletseed", "tm:charm", "tm:endure", @@ -85,33 +84,32 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:hypervoice", - "tm:leafage", "tm:leafstorm", - "tm:leaftornado", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:poisonpowder", "tm:pollenpuff", "tm:protect", - "tm:rapidspin", - "tm:razorleaf", "tm:rest", "tm:round", - "tm:sing", - "tm:sleeppowder", "tm:sleeptalk", "tm:solarbeam", - "tm:stunspore", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:synthesis", "tm:terablast", - "tm:worryseed" + "tm:worryseed", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:magicalleaf", + "tutor:rest", + "tutor:sleeptalk", + "tutor:synthesis", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json b/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json index c334fc5095..e4f03917c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json @@ -97,28 +97,22 @@ "tm:brine", "tm:brutalswing", "tm:bulkup", - "tm:circlethrow", "tm:closecombat", "tm:coaching", - "tm:detect", "tm:dig", "tm:dive", "tm:drainpunch", "tm:endure", "tm:facade", - "tm:feint", "tm:focusblast", "tm:gigaimpact", "tm:hydropump", "tm:hyperbeam", "tm:icepunch", - "tm:leer", "tm:liquidation", "tm:megapunch", "tm:muddywater", "tm:mudshot", - "tm:octazooka", - "tm:octolock", "tm:painsplit", "tm:payback", "tm:poweruppunch", @@ -129,22 +123,35 @@ "tm:reversal", "tm:rocksmash", "tm:scaryface", - "tm:seismictoss", "tm:skittersmack", "tm:sleeptalk", - "tm:soak", "tm:stompingtantrum", - "tm:submission", "tm:substitute", "tm:suckerpunch", "tm:superpower", "tm:surf", "tm:taunt", "tm:terablast", - "tm:topsyturvy", "tm:waterfall", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:bind", + "tutor:bulkup", + "tutor:coaching", + "tutor:dive", + "tutor:drainpunch", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:liquidation", + "tutor:painsplit", + "tutor:rest", + "tutor:rocksmash", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superpower" ], "preEvolution": "clobbopus", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/greedent.json b/common/src/main/resources/data/cobblemon/species/generation8/greedent.json index 59feed14eb..6ff4e24520 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/greedent.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/greedent.json @@ -76,19 +76,14 @@ "egg:rollout", "tm:amnesia", "tm:assurance", - "tm:belch", - "tm:bellydrum", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brutalswing", "tm:bulldoze", "tm:bulletseed", - "tm:counter", "tm:covet", "tm:crunch", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthquake", @@ -116,25 +111,42 @@ "tm:rollout", "tm:seedbomb", "tm:sleeptalk", - "tm:spitup", - "tm:stockpile", "tm:stompingtantrum", - "tm:stuffcheeks", "tm:substitute", "tm:sunnyday", "tm:superfang", "tm:superpower", - "tm:swallow", "tm:swordsdance", - "tm:tackle", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunderfang", "tm:trailblaze", - "tm:wildcharge" + "tm:wildcharge", + "tutor:bulldoze", + "tutor:covet", + "tutor:endeavor", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irontail", + "tutor:knockoff", + "tutor:lastresort", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:superpower", + "tutor:thunderfang", + "tutor:wildcharge" ], "preEvolution": "skwovet", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json b/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json index 945b51fbef..257e71cd5f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grimmsnarl.json @@ -86,7 +86,6 @@ "64:hammerarm", "egg:partingshot", "tm:assurance", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -102,18 +101,14 @@ "tm:drainpunch", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:falsesurrender", "tm:firepunch", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", "tm:foulplay", "tm:gigaimpact", - "tm:hammerarm", "tm:hyperbeam", "tm:icepunch", "tm:imprison", @@ -127,7 +122,6 @@ "tm:metronome", "tm:mistyterrain", "tm:nastyplot", - "tm:partingshot", "tm:playrough", "tm:powerswap", "tm:poweruppunch", @@ -140,7 +134,6 @@ "tm:scaryface", "tm:shadowclaw", "tm:sleeptalk", - "tm:spiritbreak", "tm:stompingtantrum", "tm:substitute", "tm:suckerpunch", @@ -156,7 +149,33 @@ "tm:torment", "tm:trailblaze", "tm:trick", - "tm:wonderroom" + "tm:wonderroom", + "tutor:bulkup", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:lashout", + "tutor:leechlife", + "tutor:lowkick", + "tutor:playrough", + "tutor:rest", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "morgrem", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json index c0d90538e0..e700ccb025 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/grookey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/grookey.json @@ -83,14 +83,12 @@ "tm:acrobatics", "tm:assurance", "tm:bodyslam", - "tm:branchpoke", "tm:bulletseed", "tm:drainpunch", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", - "tm:fakeout", "tm:falseswipe", "tm:fling", "tm:focusenergy", @@ -99,24 +97,17 @@ "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", - "tm:growth", - "tm:hammerarm", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:magicalleaf", "tm:megakick", "tm:megapunch", "tm:naturepower", "tm:protect", - "tm:razorleaf", "tm:rest", - "tm:scratch", "tm:screech", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", @@ -132,9 +123,25 @@ "tm:trailblaze", "tm:uproar", "tm:uturn", - "tm:woodhammer", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:uproar", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json b/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json index c8352f17d3..173c534aaf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json @@ -75,12 +75,9 @@ "egg:nuzzle", "egg:quash", "tm:afteryou", - "tm:aromatherapy", - "tm:aromaticmist", "tm:batonpass", "tm:calmmind", "tm:charm", - "tm:confusion", "tm:darkpulse", "tm:dazzlinggleam", "tm:disarmingvoice", @@ -90,18 +87,13 @@ "tm:facade", "tm:futuresight", "tm:gigadrain", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:imprison", - "tm:lifedew", "tm:lightscreen", "tm:magicalleaf", "tm:metronome", "tm:mistyterrain", "tm:mysticalfire", - "tm:nuzzle", - "tm:playnice", "tm:playrough", "tm:protect", "tm:psybeam", @@ -121,7 +113,23 @@ "tm:terablast", "tm:thunderwave", "tm:trick", - "tm:trickroom" + "tm:trickroom", + "tutor:afteryou", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json index 8cff6de15c..275203ace2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json @@ -81,13 +81,10 @@ "egg:quash", "tm:afteryou", "tm:agility", - "tm:aromatherapy", - "tm:aromaticmist", "tm:batonpass", "tm:brutalswing", "tm:calmmind", "tm:charm", - "tm:confusion", "tm:darkpulse", "tm:dazzlinggleam", "tm:disarmingvoice", @@ -100,23 +97,17 @@ "tm:gigaimpact", "tm:gravity", "tm:guardswap", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:imprison", - "tm:lifedew", "tm:lightscreen", "tm:magicalleaf", - "tm:magicpowder", "tm:magicroom", "tm:metronome", "tm:mistyexplosion", "tm:mistyterrain", "tm:mysticalfire", - "tm:nuzzle", "tm:painsplit", - "tm:playnice", "tm:playrough", "tm:powerswap", "tm:powerwhip", @@ -144,7 +135,33 @@ "tm:thunderwave", "tm:trick", "tm:trickroom", - "tm:wonderroom" + "tm:wonderroom", + "tutor:afteryou", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:magicroom", + "tutor:mistyexplosion", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "hattrem", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json index 56efad0657..44fa37131c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json @@ -77,13 +77,10 @@ "egg:nuzzle", "egg:quash", "tm:afteryou", - "tm:aromatherapy", - "tm:aromaticmist", "tm:batonpass", "tm:brutalswing", "tm:calmmind", "tm:charm", - "tm:confusion", "tm:darkpulse", "tm:dazzlinggleam", "tm:disarmingvoice", @@ -93,18 +90,13 @@ "tm:facade", "tm:futuresight", "tm:gigadrain", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:imprison", - "tm:lifedew", "tm:lightscreen", "tm:magicalleaf", "tm:metronome", "tm:mistyterrain", "tm:mysticalfire", - "tm:nuzzle", - "tm:playnice", "tm:playrough", "tm:protect", "tm:psybeam", @@ -124,7 +116,23 @@ "tm:terablast", "tm:thunderwave", "tm:trick", - "tm:trickroom" + "tm:trickroom", + "tutor:afteryou", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:trick" ], "preEvolution": "hatenna", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/impidimp.json b/common/src/main/resources/data/cobblemon/species/generation8/impidimp.json index e77ae3e244..6eadeb48ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/impidimp.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/impidimp.json @@ -81,7 +81,6 @@ "44:foulplay", "egg:partingshot", "tm:assurance", - "tm:bite", "tm:burningjealousy", "tm:chillingwater", "tm:confide", @@ -91,9 +90,7 @@ "tm:drainpunch", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:flatter", "tm:fling", "tm:foulplay", "tm:lashout", @@ -105,7 +102,6 @@ "tm:metronome", "tm:mistyterrain", "tm:nastyplot", - "tm:partingshot", "tm:playrough", "tm:protect", "tm:reflect", @@ -125,7 +121,21 @@ "tm:thunderwave", "tm:torment", "tm:trailblaze", - "tm:trick" + "tm:trick", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:foulplay", + "tutor:lashout", + "tutor:leechlife", + "tutor:lowkick", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json index d680963858..74c944c0f2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json @@ -79,7 +79,6 @@ "egg:psychup", "tm:afteryou", "tm:allyswitch", - "tm:aromatherapy", "tm:bodyslam", "tm:calmmind", "tm:dazzlinggleam", @@ -90,11 +89,8 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", - "tm:fakeout", "tm:gravity", - "tm:healingwish", "tm:helpinghand", "tm:hypervoice", "tm:imprison", @@ -104,9 +100,7 @@ "tm:metronome", "tm:mysticalfire", "tm:payday", - "tm:playnice", "tm:playrough", - "tm:powersplit", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -129,7 +123,32 @@ "tm:trick", "tm:trickroom", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:lastresort", + "tutor:magicalleaf", + "tutor:magicroom", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:terrainpulse", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ @@ -190,7 +209,6 @@ "egg:psychup", "tm:alluringvoice", "tm:allyswitch", - "tm:aromatherapy", "tm:batonpass", "tm:bodyslam", "tm:calmmind", @@ -202,12 +220,7 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fakeout", - "tm:followme", - "tm:guardsplit", "tm:guardswap", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hypervoice", "tm:imprison", @@ -216,13 +229,11 @@ "tm:metronome", "tm:mysticalfire", "tm:payday", - "tm:playnice", "tm:playrough", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicterrain", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:reflect", @@ -239,7 +250,26 @@ "tm:terrainpulse", "tm:trick", "tm:trickroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:magicalleaf", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:terrainpulse", + "tutor:trick", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json index 94e20f3a4b..29a5b7dfe4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/inteleon.json @@ -97,8 +97,6 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:aquajet", - "tm:aquaring", "tm:batonpass", "tm:bind", "tm:blizzard", @@ -110,27 +108,22 @@ "tm:doubleteam", "tm:endure", "tm:facade", - "tm:fellstinger", "tm:fling", "tm:flipturn", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", "tm:haze", "tm:hydrocannon", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", - "tm:iceshard", "tm:iciclespear", "tm:icywind", "tm:lightscreen", "tm:liquidation", "tm:metronome", - "tm:mist", "tm:muddywater", "tm:mudshot", - "tm:pound", "tm:protect", "tm:psychup", "tm:raindance", @@ -142,9 +135,7 @@ "tm:skittersmack", "tm:sleeptalk", "tm:smackdown", - "tm:snipeshot", "tm:snowscape", - "tm:soak", "tm:substitute", "tm:suckerpunch", "tm:surf", @@ -152,17 +143,37 @@ "tm:swordsdance", "tm:takedown", "tm:taunt", - "tm:tearfullook", "tm:terablast", "tm:uturn", "tm:vacuumwave", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:aircutter", + "tutor:bind", + "tutor:bounce", + "tutor:darkpulse", + "tutor:dive", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:rest", + "tutor:shadowball", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:vacuumwave", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "drizzile", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json b/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json index e74a3e923c..1a3faa94a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json @@ -69,11 +69,8 @@ "tm:brickbreak", "tm:bulkup", "tm:closecombat", - "tm:counter", - "tm:detect", "tm:dig", "tm:doubleedge", - "tm:dynamicpunch", "tm:endure", "tm:facade", "tm:firepunch", @@ -84,7 +81,6 @@ "tm:helpinghand", "tm:icepunch", "tm:ironhead", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -106,7 +102,22 @@ "tm:thunderpunch", "tm:uturn", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:ironhead", + "tutor:lowkick", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [ { @@ -118,7 +129,7 @@ "wickedblow" ], "requirements": [], - "requiredContext": "cobblemon:scroll_of_darkness" + "requiredContext": "cobblemon:dusk_stone" }, { "id": "kubfu_urshifurapidstrike", @@ -129,7 +140,7 @@ "surgingstrikes" ], "requirements": [], - "requiredContext": "cobblemon:scroll_of_waters" + "requiredContext": "cobblemon:water_stone" } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json index d26af4cfd1..1023c0eda3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/milcery.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/milcery.json @@ -80,30 +80,28 @@ "50:entrainment", "egg:babydolleyes", "egg:lastresort", - "tm:acidarmor", - "tm:aromatherapy", - "tm:aromaticmist", "tm:attract", "tm:babydolleyes", "tm:charm", "tm:dazzlinggleam", "tm:drainingkiss", "tm:endure", - "tm:entrainment", "tm:facade", "tm:helpinghand", "tm:lastresort", "tm:mistyterrain", "tm:protect", - "tm:recover", "tm:rest", "tm:sleeptalk", "tm:storedpower", "tm:substitute", - "tm:sweetkiss", - "tm:sweetscent", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:babydolleyes", + "tutor:dazzlinggleam", + "tutor:helpinghand", + "tutor:lastresort", + "tutor:rest", + "tutor:sleeptalk" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json b/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json index b224ee65e7..9602c6d1c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/morgrem.json @@ -82,7 +82,6 @@ "52:foulplay", "egg:partingshot", "tm:assurance", - "tm:bite", "tm:burningjealousy", "tm:chillingwater", "tm:confide", @@ -92,10 +91,7 @@ "tm:drainpunch", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:falsesurrender", - "tm:flatter", "tm:fling", "tm:foulplay", "tm:imprison", @@ -108,7 +104,6 @@ "tm:metronome", "tm:mistyterrain", "tm:nastyplot", - "tm:partingshot", "tm:playrough", "tm:protect", "tm:reflect", @@ -129,7 +124,22 @@ "tm:thunderwave", "tm:torment", "tm:trailblaze", - "tm:trick" + "tm:trick", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:foulplay", + "tutor:lashout", + "tutor:leechlife", + "tutor:lowkick", + "tutor:playrough", + "tutor:rest", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:trick" ], "preEvolution": "impidimp", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json index fb04cfb234..a414f169be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json @@ -84,9 +84,7 @@ "egg:tickle", "tm:agility", "tm:assurance", - "tm:aurawheel", "tm:batonpass", - "tm:bite", "tm:brickbreak", "tm:bulletseed", "tm:charge", @@ -101,26 +99,19 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:firefang", - "tm:flatter", "tm:fling", "tm:foulplay", "tm:icefang", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:nastyplot", "tm:outrage", - "tm:partingshot", "tm:payback", - "tm:powertrip", "tm:protect", "tm:psychicfangs", "tm:quash", - "tm:quickattack", - "tm:rapidspin", "tm:rest", "tm:revenge", "tm:reversal", @@ -129,30 +120,50 @@ "tm:seedbomb", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:spite", "tm:stompingtantrum", "tm:substitute", "tm:superfang", "tm:swagger", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:thunder", "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", - "tm:tickle", "tm:torment", "tm:uproar", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:electroweb", + "tutor:endeavor", + "tutor:firefang", + "tutor:foulplay", + "tutor:icefang", + "tutor:knockoff", + "tutor:lashout", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json index d486590740..482432d62a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json @@ -104,7 +104,6 @@ "tm:afteryou", "tm:allyswitch", "tm:avalanche", - "tm:barrier", "tm:batonpass", "tm:blizzard", "tm:block", @@ -113,51 +112,37 @@ "tm:calmmind", "tm:charm", "tm:confuseray", - "tm:confusion", - "tm:copycat", "tm:dazzlinggleam", - "tm:doublekick", - "tm:doubleslap", "tm:drainpunch", "tm:encore", "tm:endure", "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:fling", "tm:focusblast", "tm:foulplay", - "tm:freezedry", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:guardswap", "tm:hail", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icepunch", - "tm:iceshard", "tm:iciclespear", "tm:icywind", "tm:irondefense", "tm:lightscreen", "tm:magicroom", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", - "tm:mimic", - "tm:mirrorcoat", "tm:mistyterrain", "tm:nastyplot", "tm:payback", - "tm:pound", - "tm:powersplit", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -165,7 +150,6 @@ "tm:psychicterrain", "tm:psyshock", "tm:raindance", - "tm:rapidspin", "tm:recycle", "tm:reflect", "tm:rest", @@ -174,7 +158,6 @@ "tm:screech", "tm:shadowball", "tm:skillswap", - "tm:slackoff", "tm:sleeptalk", "tm:solarbeam", "tm:stompingtantrum", @@ -183,20 +166,49 @@ "tm:suckerpunch", "tm:sunnyday", "tm:taunt", - "tm:teeterdance", "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:tickle", "tm:trick", "tm:trickroom", "tm:tripleaxel", "tm:uproar", - "tm:wakeupslap", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:block", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:magicroom", + "tutor:psychic", + "tutor:recycle", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:thunderbolt", + "tutor:trick", + "tutor:tripleaxel", + "tutor:uproar", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "mrmime galarian", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/nickit.json b/common/src/main/resources/data/cobblemon/species/generation8/nickit.json index fe3fb2d552..50d9f923f8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/nickit.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/nickit.json @@ -98,16 +98,12 @@ "tm:faketears", "tm:foulplay", "tm:honeclaws", - "tm:howl", "tm:knockoff", "tm:lashout", "tm:mudshot", "tm:nastyplot", - "tm:nightslash", "tm:playrough", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:screech", "tm:sleeptalk", @@ -116,11 +112,19 @@ "tm:suckerpunch", "tm:swift", "tm:tailslap", - "tm:tailwhip", "tm:taunt", "tm:terablast", "tm:thief", - "tm:torment" + "tm:torment", + "tutor:foulplay", + "tutor:knockoff", + "tutor:lashout", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:suckerpunch", + "tutor:swift" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json index a6ace004ea..feaf37b959 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/obstagoon.json @@ -104,8 +104,6 @@ "tm:brickbreak", "tm:bulkup", "tm:closecombat", - "tm:counter", - "tm:crosschop", "tm:crosspoison", "tm:dig", "tm:doubleedge", @@ -115,7 +113,6 @@ "tm:firepunch", "tm:fling", "tm:focusenergy", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", @@ -131,25 +128,18 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:mudshot", - "tm:nightslash", - "tm:obstruct", - "tm:partingshot", "tm:payback", "tm:pinmissile", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", "tm:revenge", "tm:reversal", - "tm:sandattack", "tm:scaryface", "tm:screech", "tm:seedbomb", @@ -158,13 +148,10 @@ "tm:sleeptalk", "tm:snarl", "tm:stompingtantrum", - "tm:submission", "tm:substitute", "tm:sunnyday", "tm:surf", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -177,7 +164,37 @@ "tm:trick", "tm:whirlpool", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:babydolleyes", + "tutor:bulkup", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:irondefense", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:xscissor" ], "preEvolution": "linoone galarian", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json index bc0de0fa7e..83e3e6f3d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json @@ -86,7 +86,6 @@ "tm:bugbuzz", "tm:calmmind", "tm:confuseray", - "tm:confusion", "tm:endure", "tm:energyball", "tm:expandingforce", @@ -97,7 +96,6 @@ "tm:guardswap", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:infestation", "tm:irondefense", @@ -105,7 +103,6 @@ "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:mirrorcoat", "tm:payback", "tm:powerswap", "tm:protect", @@ -114,7 +111,6 @@ "tm:psychicterrain", "tm:psychocut", "tm:psyshock", - "tm:recover", "tm:reflect", "tm:rest", "tm:safeguard", @@ -122,17 +118,37 @@ "tm:skillswap", "tm:sleeptalk", "tm:solarbeam", - "tm:stickyweb", "tm:storedpower", "tm:strugglebug", "tm:substitute", - "tm:supersonic", "tm:terablast", "tm:trick", "tm:trickroom", "tm:uturn", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:leechlife", + "tutor:magiccoat", + "tutor:magicroom", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "dottler", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json index c4927bf341..4b9313c132 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json @@ -104,16 +104,12 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:falseswipe", - "tm:flail", "tm:flashcannon", "tm:fling", "tm:foulplay", - "tm:furyswipes", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:gyroball", "tm:heavyslam", @@ -126,12 +122,10 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:metronome", "tm:nastyplot", - "tm:nightslash", "tm:payback", "tm:payday", "tm:playrough", @@ -139,12 +133,10 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:scratch", "tm:screech", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:spite", "tm:stealthrock", @@ -157,14 +149,42 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", "tm:trailblaze", "tm:uturn", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:covet", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:xscissor" ], "preEvolution": "meowth galarian", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json b/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json index d56f93eab1..ee0e7cb367 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json @@ -79,44 +79,36 @@ "60:discharge", "egg:memento", "egg:suckerpunch", - "tm:acupressure", "tm:assurance", "tm:bodyslam", "tm:brine", - "tm:bubblebeam", "tm:charge", "tm:chargebeam", "tm:chillingwater", "tm:curse", - "tm:discharge", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:endure", "tm:facade", - "tm:furyattack", "tm:gigaimpact", "tm:hex", "tm:hydropump", "tm:hyperbeam", "tm:liquidation", - "tm:memento", "tm:muddywater", "tm:painsplit", "tm:payback", - "tm:peck", "tm:pinmissile", "tm:poisonjab", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:reversal", "tm:risingvoltage", "tm:scald", "tm:selfdestruct", "tm:sleeptalk", - "tm:spark", "tm:spikes", "tm:substitute", "tm:suckerpunch", @@ -128,14 +120,27 @@ "tm:throatchop", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tm:watergun", "tm:wildcharge", - "tm:zingzap" + "tutor:chargebeam", + "tutor:electroweb", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:liquidation", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:risingvoltage", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json b/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json index 9396a4e649..3ed29e88c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json @@ -77,9 +77,6 @@ "66:curse", "egg:allyswitch", "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:astonish", "tm:batonpass", "tm:calmmind", "tm:confuseray", @@ -95,8 +92,6 @@ "tm:imprison", "tm:lightscreen", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:metronome", "tm:nastyplot", "tm:nightshade", @@ -112,22 +107,36 @@ "tm:rest", "tm:selfdestruct", "tm:shadowball", - "tm:shellsmash", "tm:skillswap", "tm:sleeptalk", "tm:spite", "tm:storedpower", - "tm:strengthsap", "tm:substitute", "tm:suckerpunch", - "tm:sweetscent", - "tm:teatime", "tm:terablast", "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:withdraw", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:trick", + "tutor:wonderroom" ], "preEvolution": "sinistea tea_authenticity=phony", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json index fa23b053d8..83615992f9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/raboot.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json @@ -100,11 +100,8 @@ "tm:bounce", "tm:bulkup", "tm:burningjealousy", - "tm:counter", "tm:doubleedge", - "tm:doublekick", "tm:electroball", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", @@ -115,22 +112,18 @@ "tm:flamethrower", "tm:flareblitz", "tm:focusenergy", - "tm:growl", "tm:gunkshot", "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:highjumpkick", "tm:lowkick", "tm:lowsweep", "tm:megakick", "tm:mudshot", "tm:overheat", "tm:protect", - "tm:quickattack", "tm:rest", "tm:reversal", - "tm:sandattack", "tm:sleeptalk", "tm:substitute", "tm:suckerpunch", @@ -138,7 +131,6 @@ "tm:superfang", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:temperflare", @@ -146,7 +138,24 @@ "tm:trailblaze", "tm:uturn", "tm:weatherball", - "tm:workup" + "tm:workup", + "tutor:allyswitch", + "tutor:bounce", + "tutor:bulkup", + "tutor:burningjealousy", + "tutor:firefang", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:lowkick", + "tutor:rest", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:swift" ], "preEvolution": "scorbunny", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json b/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json index 7686a3d560..d84245b678 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json @@ -64,16 +64,13 @@ "72:hyperbeam", "78:explosion", "tm:ancientpower", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:crunch", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", - "tm:dragonenergy", "tm:dragonpulse", "tm:earthpower", "tm:earthquake", @@ -83,7 +80,6 @@ "tm:firefang", "tm:focusenergy", "tm:gigaimpact", - "tm:hammerarm", "tm:hyperbeam", "tm:icefang", "tm:laserfocus", @@ -100,10 +96,25 @@ "tm:swift", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:thunderfang", "tm:twister", - "tm:visegrip" + "tutor:ancientpower", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:laserfocus", + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderfang", + "tutor:twister" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json b/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json index b87d5cb44a..2d8f30729a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json @@ -78,16 +78,13 @@ "tm:electroweb", "tm:endure", "tm:explosion", - "tm:extremespeed", "tm:facade", "tm:gigaimpact", "tm:hyperbeam", "tm:lightscreen", - "tm:lockon", "tm:magnetrise", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:reflect", "tm:rest", "tm:risingvoltage", @@ -100,15 +97,25 @@ "tm:swift", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:thunder", "tm:thunderbolt", - "tm:thundercage", - "tm:thundershock", "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:ancientpower", + "tutor:bounce", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:magnetrise", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json index d786e0cff0..6c79db240c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rillaboom.json @@ -88,8 +88,6 @@ "tm:assurance", "tm:bodypress", "tm:bodyslam", - "tm:boomburst", - "tm:branchpoke", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", @@ -97,16 +95,13 @@ "tm:bulletseed", "tm:darkestlariat", "tm:doubleedge", - "tm:doublehit", "tm:drainpunch", - "tm:drumbeating", "tm:earthpower", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", - "tm:fakeout", "tm:falseswipe", "tm:fling", "tm:focusblast", @@ -119,15 +114,11 @@ "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", - "tm:growth", - "tm:hammerarm", "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", @@ -135,15 +126,11 @@ "tm:megapunch", "tm:mudshot", "tm:naturepower", - "tm:nobleroar", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", "tm:snarl", "tm:solarbeam", @@ -162,9 +149,37 @@ "tm:trailblaze", "tm:uproar", "tm:uturn", - "tm:woodhammer", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:endeavor", + "tutor:energyball", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:frenzyplant", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:uproar", + "tutor:worryseed" ], "preEvolution": "thwackey", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json b/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json index ae1b444d6c..e7b016e0fd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json @@ -104,7 +104,6 @@ "tm:mudslap", "tm:powergem", "tm:protect", - "tm:rapidspin", "tm:reflect", "tm:rest", "tm:rockblast", @@ -116,16 +115,27 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:smackdown", - "tm:smokescreen", "tm:spikes", "tm:stealthrock", "tm:stoneedge", "tm:substitute", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:willowisp" + "tm:willowisp", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json b/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json index fb69e90a36..2cab860403 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rookidee.json @@ -103,21 +103,16 @@ "tm:assurance", "tm:bravebird", "tm:defog", - "tm:drillpeck", "tm:dualwingbeat", "tm:endure", "tm:facade", "tm:faketears", "tm:fly", "tm:focusenergy", - "tm:furyattack", "tm:honeclaws", - "tm:leer", "tm:nastyplot", "tm:payback", - "tm:peck", "tm:pluck", - "tm:powertrip", "tm:protect", "tm:rest", "tm:retaliate", @@ -125,7 +120,6 @@ "tm:reversal", "tm:rocksmash", "tm:roost", - "tm:sandattack", "tm:scaryface", "tm:skyattack", "tm:sleeptalk", @@ -139,7 +133,20 @@ "tm:terablast", "tm:thief", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:focusenergy", + "tutor:rest", + "tutor:rocksmash", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:tailwind" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json index d3b7bbfffc..ecc6238db7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json @@ -81,16 +81,12 @@ "egg:memento", "tm:allyswitch", "tm:amnesia", - "tm:astonish", "tm:bodypress", "tm:brutalswing", "tm:bulldoze", "tm:calmmind", - "tm:craftyshield", "tm:curse", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dragonpulse", "tm:earthpower", "tm:earthquake", @@ -100,21 +96,17 @@ "tm:faketears", "tm:gigaimpact", "tm:grassknot", - "tm:guardsplit", "tm:guardswap", "tm:haze", "tm:hex", "tm:hyperbeam", "tm:imprison", "tm:irondefense", - "tm:meanlook", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:payback", "tm:phantomforce", "tm:poltergeist", - "tm:powersplit", "tm:powerswap", "tm:protect", "tm:psychic", @@ -131,7 +123,6 @@ "tm:shadowball", "tm:shadowclaw", "tm:skillswap", - "tm:slam", "tm:sleeptalk", "tm:stealthrock", "tm:stoneedge", @@ -144,7 +135,31 @@ "tm:trickroom", "tm:willowisp", "tm:wonderroom", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt" ], "preEvolution": "yamask galarian", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json index 95212a486e..f8b0db2ed4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json @@ -76,14 +76,11 @@ "egg:lastresort", "egg:mudslap", "egg:poisontail", - "tm:belch", "tm:bodypress", "tm:bodyslam", "tm:brutalswing", "tm:bulldoze", - "tm:coil", "tm:dig", - "tm:dragonrush", "tm:drillrun", "tm:earthpower", "tm:earthquake", @@ -92,7 +89,6 @@ "tm:facade", "tm:firefang", "tm:gigaimpact", - "tm:glare", "tm:headbutt", "tm:highhorsepower", "tm:hurricane", @@ -100,7 +96,6 @@ "tm:irondefense", "tm:ironhead", "tm:lastresort", - "tm:minimize", "tm:mudshot", "tm:mudslap", "tm:outrage", @@ -110,7 +105,6 @@ "tm:rockblast", "tm:rockslide", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", @@ -118,8 +112,6 @@ "tm:scorchingsands", "tm:screech", "tm:skittersmack", - "tm:skullbash", - "tm:slam", "tm:sleeptalk", "tm:stealthrock", "tm:stoneedge", @@ -127,8 +119,30 @@ "tm:takedown", "tm:terablast", "tm:thunderfang", - "tm:wrap", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:drillrun", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lastresort", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "preEvolution": "silicobra", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json index 28fc182dda..94732015c3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/scorbunny.json @@ -93,11 +93,8 @@ "tm:blazekick", "tm:bounce", "tm:burningjealousy", - "tm:counter", "tm:doubleedge", - "tm:doublekick", "tm:electroball", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", @@ -108,35 +105,46 @@ "tm:flamethrower", "tm:flareblitz", "tm:focusenergy", - "tm:growl", "tm:gunkshot", "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:highjumpkick", "tm:lowkick", "tm:lowsweep", "tm:megakick", "tm:overheat", "tm:protect", - "tm:quickattack", "tm:rest", "tm:reversal", - "tm:sandattack", "tm:sleeptalk", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", "tm:superfang", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:temperflare", "tm:terablast", "tm:trailblaze", "tm:uturn", - "tm:workup" + "tm:workup", + "tutor:allyswitch", + "tutor:bounce", + "tutor:burningjealousy", + "tutor:firefang", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:lowkick", + "tutor:rest", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:superfang", + "tutor:swift" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json b/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json index 27e7ddbad7..ee32783d28 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json @@ -75,22 +75,17 @@ "egg:lastresort", "egg:mudslap", "egg:poisontail", - "tm:belch", "tm:bodyslam", "tm:brutalswing", "tm:bulldoze", - "tm:coil", "tm:dig", - "tm:dragonrush", "tm:drillrun", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:facade", - "tm:glare", "tm:headbutt", "tm:lastresort", - "tm:minimize", "tm:mudshot", "tm:mudslap", "tm:poisontail", @@ -99,7 +94,6 @@ "tm:rockblast", "tm:rockslide", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", @@ -107,14 +101,25 @@ "tm:scorchingsands", "tm:screech", "tm:skittersmack", - "tm:slam", "tm:sleeptalk", "tm:stealthrock", "tm:stoneedge", "tm:substitute", "tm:takedown", "tm:terablast", - "tm:wrap" + "tutor:bulldoze", + "tutor:drillrun", + "tutor:earthpower", + "tutor:lastresort", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json b/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json index ee508b9d24..acb3892398 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json @@ -73,9 +73,6 @@ "60:shellsmash", "egg:allyswitch", "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:astonish", "tm:batonpass", "tm:calmmind", "tm:confuseray", @@ -88,8 +85,6 @@ "tm:hex", "tm:imprison", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:metronome", "tm:nastyplot", "tm:nightshade", @@ -102,20 +97,33 @@ "tm:psyshock", "tm:rest", "tm:shadowball", - "tm:shellsmash", "tm:skillswap", "tm:sleeptalk", "tm:spite", "tm:storedpower", "tm:substitute", "tm:suckerpunch", - "tm:sweetscent", "tm:terablast", "tm:trick", "tm:trickroom", "tm:willowisp", - "tm:withdraw", - "tm:wonderroom" + "tm:wonderroom", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:magicalleaf", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:trick", + "tutor:wonderroom" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json index 7a5e13572d..6d8cb78ed5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sirfetchd.json @@ -1,7 +1,7 @@ { "implemented": true, "nationalPokedexNumber": 865, - "name": "Sirfetch’d", + "name": "Sirfetch\u00e2\u20ac\u2122d", "primaryType": "fighting", "maleRatio": 0.5, "height": 8, @@ -106,19 +106,13 @@ "tm:brutalswing", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:covet", "tm:curse", "tm:defog", - "tm:detect", "tm:doubleedge", "tm:dualwingbeat", "tm:endure", "tm:facade", - "tm:feint", - "tm:finalgambit", - "tm:firstimpression", - "tm:flail", "tm:focusenergy", "tm:furycutter", "tm:grassyglide", @@ -126,22 +120,13 @@ "tm:irondefense", "tm:knockoff", "tm:leafblade", - "tm:leer", - "tm:meteorassault", - "tm:nightslash", - "tm:peck", "tm:poisonjab", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:retaliate", "tm:revenge", "tm:rocksmash", - "tm:sandattack", - "tm:simplebeam", "tm:skyattack", - "tm:slam", "tm:sleeptalk", "tm:solarblade", "tm:steelwing", @@ -151,7 +136,24 @@ "tm:swordsdance", "tm:terablast", "tm:throatchop", - "tm:workup" + "tm:workup", + "tutor:coaching", + "tutor:covet", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:knockoff", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:superpower", + "tutor:throatchop" ], "preEvolution": "farfetchd galarian", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json b/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json index b528f477ed..8be5387915 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sizzlipede.json @@ -93,20 +93,13 @@ "egg:knockoff", "egg:rollout", "egg:strugglebug", - "tm:bite", "tm:brutalswing", "tm:bugbite", "tm:bugbuzz", - "tm:burnup", - "tm:coil", "tm:crunch", - "tm:defensecurl", - "tm:ember", "tm:endure", "tm:facade", - "tm:firelash", "tm:firespin", - "tm:flamewheel", "tm:heatcrash", "tm:heatwave", "tm:knockoff", @@ -119,15 +112,21 @@ "tm:scald", "tm:scorchingsands", "tm:skittersmack", - "tm:slam", "tm:sleeptalk", - "tm:smokescreen", "tm:strugglebug", "tm:substitute", "tm:sunnyday", "tm:terablast", "tm:venoshock", - "tm:wrap" + "tutor:bugbite", + "tutor:heatwave", + "tutor:knockoff", + "tutor:leechlife", + "tutor:rest", + "tutor:rollout", + "tutor:scorchingsands", + "tutor:skittersmack", + "tutor:sleeptalk" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json b/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json index 7327cbeb41..0cd2121d7d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json @@ -75,16 +75,11 @@ "egg:rollout", "tm:amnesia", "tm:assurance", - "tm:belch", - "tm:bellydrum", - "tm:bite", "tm:bodyslam", "tm:brutalswing", "tm:bulletseed", - "tm:counter", "tm:crunch", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:endeavor", @@ -103,19 +98,23 @@ "tm:rollout", "tm:seedbomb", "tm:sleeptalk", - "tm:spitup", - "tm:stockpile", - "tm:stuffcheeks", "tm:substitute", "tm:superfang", - "tm:swallow", - "tm:tackle", "tm:tailslap", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", - "tm:trailblaze" + "tm:trailblaze", + "tutor:endeavor", + "tutor:hypervoice", + "tutor:irontail", + "tutor:lastresort", + "tutor:mudslap", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:superfang" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/snom.json b/common/src/main/resources/data/cobblemon/species/generation8/snom.json index 0d709680ab..e788762402 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/snom.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/snom.json @@ -80,20 +80,22 @@ "tm:bugbite", "tm:bugbuzz", "tm:facade", - "tm:fairywind", "tm:iciclespear", "tm:icywind", "tm:lunge", - "tm:mirrorcoat", "tm:pounce", - "tm:powdersnow", "tm:protect", "tm:rest", "tm:skittersmack", "tm:sleeptalk", "tm:strugglebug", "tm:substitute", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:icywind", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sobble.json b/common/src/main/resources/data/cobblemon/species/generation8/sobble.json index af3075009e..d472a208d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sobble.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sobble.json @@ -92,8 +92,6 @@ "egg:haze", "egg:iceshard", "egg:mist", - "tm:aquajet", - "tm:aquaring", "tm:bind", "tm:bounce", "tm:chillingwater", @@ -101,39 +99,41 @@ "tm:doubleteam", "tm:endure", "tm:facade", - "tm:fellstinger", - "tm:growl", "tm:haze", "tm:hydropump", - "tm:iceshard", "tm:lightscreen", "tm:liquidation", - "tm:mist", "tm:muddywater", "tm:mudshot", - "tm:pound", "tm:protect", "tm:raindance", "tm:reflect", "tm:rest", "tm:safeguard", "tm:sleeptalk", - "tm:soak", "tm:substitute", "tm:suckerpunch", "tm:surf", "tm:swift", "tm:takedown", - "tm:tearfullook", "tm:terablast", "tm:uturn", "tm:waterfall", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tm:workup" + "tm:workup", + "tutor:bind", + "tutor:bounce", + "tutor:dive", + "tutor:liquidation", + "tutor:rest", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:waterpledge", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json b/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json index ee5ab61965..6a2eb7a71f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json @@ -71,9 +71,7 @@ "tm:crunch", "tm:curse", "tm:darkpulse", - "tm:disable", "tm:doubleedge", - "tm:doublekick", "tm:drainingkiss", "tm:endure", "tm:facade", @@ -98,17 +96,30 @@ "tm:shadowball", "tm:sleeptalk", "tm:snarl", - "tm:stomp", "tm:stompingtantrum", "tm:substitute", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", - "tm:willowisp" + "tm:willowisp", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:lashout", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:swift" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/stonjourner.json b/common/src/main/resources/data/cobblemon/species/generation8/stonjourner.json index c408871878..76bb19d654 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/stonjourner.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/stonjourner.json @@ -111,7 +111,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:safeguard", "tm:sandstorm", @@ -120,7 +119,6 @@ "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", @@ -128,8 +126,27 @@ "tm:superpower", "tm:takedown", "tm:terablast", - "tm:wideguard", - "tm:wonderroom" + "tm:wonderroom", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:superpower", + "tutor:wonderroom" ], "evolutions": [], "drops": { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json index d194501114..f089a30c37 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thievul.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thievul.json @@ -106,20 +106,15 @@ "tm:gigaimpact", "tm:grassknot", "tm:honeclaws", - "tm:howl", "tm:hyperbeam", "tm:icefang", "tm:knockoff", "tm:lashout", "tm:mudshot", "tm:nastyplot", - "tm:nightslash", - "tm:partingshot", "tm:playrough", "tm:protect", "tm:psychic", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:screech", "tm:shadowball", @@ -130,13 +125,31 @@ "tm:suckerpunch", "tm:swift", "tm:tailslap", - "tm:tailwhip", "tm:taunt", "tm:terablast", "tm:thief", "tm:thunderfang", "tm:torment", - "tm:uturn" + "tm:uturn", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:firefang", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:knockoff", + "tutor:lashout", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderfang" ], "preEvolution": "nickit", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json index bc68fe804f..e6e998f252 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/thwackey.json @@ -83,16 +83,13 @@ "tm:acrobatics", "tm:assurance", "tm:bodyslam", - "tm:branchpoke", "tm:bulletseed", "tm:doubleedge", - "tm:doublehit", "tm:drainpunch", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", - "tm:fakeout", "tm:falseswipe", "tm:fling", "tm:focusenergy", @@ -101,25 +98,18 @@ "tm:grasspledge", "tm:grassyglide", "tm:grassyterrain", - "tm:growl", - "tm:growth", - "tm:hammerarm", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:magicalleaf", "tm:megakick", "tm:megapunch", "tm:naturepower", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", @@ -135,9 +125,25 @@ "tm:trailblaze", "tm:uproar", "tm:uturn", - "tm:woodhammer", "tm:workup", - "tm:worryseed" + "tm:worryseed", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:knockoff", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:uproar", + "tutor:worryseed" ], "preEvolution": "grookey", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json b/common/src/main/resources/data/cobblemon/species/generation8/toxel.json index 1a642707a6..a12c9955e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/toxel.json @@ -67,24 +67,21 @@ "1:acid", "egg:endeavor", "egg:metalsound", - "tm:acid", - "tm:belch", "tm:charm", "tm:encore", "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", - "tm:growl", "tm:metalsound", - "tm:nuzzle", "tm:poweruppunch", "tm:protect", "tm:rest", "tm:sleeptalk", "tm:substitute", - "tm:tearfullook", - "tm:terablast" + "tm:terablast", + "tutor:endeavor", + "tutor:rest", + "tutor:sleeptalk" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json index a93c7471d7..5d9ff5981c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json @@ -85,15 +85,11 @@ "52:shiftgear", "egg:endeavor", "egg:metalsound", - "tm:acid", "tm:acidspray", - "tm:belch", - "tm:boomburst", "tm:brickbreak", "tm:charge", "tm:chargebeam", "tm:charm", - "tm:discharge", "tm:drainpunch", "tm:eerieimpulse", "tm:electricterrain", @@ -104,23 +100,17 @@ "tm:endure", "tm:facade", "tm:firepunch", - "tm:flail", "tm:fling", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:helpinghand", "tm:hex", "tm:hyperbeam", "tm:hypervoice", - "tm:leer", "tm:megakick", "tm:megapunch", "tm:metalsound", "tm:metronome", - "tm:nobleroar", - "tm:nuzzle", - "tm:overdrive", "tm:payback", "tm:poisonjab", "tm:poisontail", @@ -132,13 +122,11 @@ "tm:risingvoltage", "tm:scaryface", "tm:screech", - "tm:shiftgear", "tm:shockwave", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snarl", - "tm:spark", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -146,7 +134,6 @@ "tm:swift", "tm:takedown", "tm:taunt", - "tm:tearfullook", "tm:terablast", "tm:thief", "tm:throatchop", @@ -154,7 +141,6 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:toxic", "tm:toxicspikes", @@ -162,7 +148,33 @@ "tm:uproar", "tm:venoshock", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:drainpunch", + "tutor:electroweb", + "tutor:endeavor", + "tutor:firepunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spikes", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "toxel", "evolutions": [], @@ -214,15 +226,11 @@ "52:magneticflux", "egg:endeavor", "egg:metalsound", - "tm:acid", "tm:acidspray", - "tm:belch", - "tm:boomburst", "tm:brickbreak", "tm:charge", "tm:chargebeam", "tm:charm", - "tm:discharge", "tm:drainpunch", "tm:eerieimpulse", "tm:electricterrain", @@ -233,24 +241,17 @@ "tm:endure", "tm:facade", "tm:firepunch", - "tm:flail", "tm:fling", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:helpinghand", "tm:hex", "tm:hyperbeam", "tm:hypervoice", - "tm:leer", - "tm:magneticflux", "tm:megakick", "tm:megapunch", "tm:metalsound", "tm:metronome", - "tm:nobleroar", - "tm:nuzzle", - "tm:overdrive", "tm:payback", "tm:poisonjab", "tm:poisontail", @@ -267,7 +268,6 @@ "tm:sludgebomb", "tm:sludgewave", "tm:snarl", - "tm:spark", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -275,7 +275,6 @@ "tm:swift", "tm:takedown", "tm:taunt", - "tm:tearfullook", "tm:terablast", "tm:thief", "tm:throatchop", @@ -283,7 +282,6 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:toxic", "tm:toxicspikes", @@ -292,7 +290,33 @@ "tm:venomdrench", "tm:venoshock", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:drainpunch", + "tutor:electroweb", + "tutor:endeavor", + "tutor:firepunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spikes", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "toxel", "evolutions": [], @@ -370,15 +394,11 @@ "52:magneticflux", "egg:endeavor", "egg:metalsound", - "tm:acid", "tm:acidspray", - "tm:belch", - "tm:boomburst", "tm:brickbreak", "tm:charge", "tm:chargebeam", "tm:charm", - "tm:discharge", "tm:drainpunch", "tm:eerieimpulse", "tm:electricterrain", @@ -389,24 +409,17 @@ "tm:endure", "tm:facade", "tm:firepunch", - "tm:flail", "tm:fling", "tm:gigaimpact", - "tm:growl", "tm:gunkshot", "tm:helpinghand", "tm:hex", "tm:hyperbeam", "tm:hypervoice", - "tm:leer", - "tm:magneticflux", "tm:megakick", "tm:megapunch", "tm:metalsound", "tm:metronome", - "tm:nobleroar", - "tm:nuzzle", - "tm:overdrive", "tm:payback", "tm:poisonjab", "tm:poisontail", @@ -423,7 +436,6 @@ "tm:sludgebomb", "tm:sludgewave", "tm:snarl", - "tm:spark", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -431,7 +443,6 @@ "tm:swift", "tm:takedown", "tm:taunt", - "tm:tearfullook", "tm:terablast", "tm:thief", "tm:throatchop", @@ -439,7 +450,6 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:toxic", "tm:toxicspikes", @@ -448,7 +458,33 @@ "tm:venomdrench", "tm:venoshock", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:drainpunch", + "tutor:electroweb", + "tutor:endeavor", + "tutor:firepunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spikes", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [], "battleOnly": true diff --git a/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json b/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json index 72597a67e3..9ad0cb3b07 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json @@ -79,15 +79,12 @@ "tm:bulkup", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:crunch", "tm:darkestlariat", "tm:darkpulse", - "tm:detect", "tm:dig", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:endure", "tm:facade", "tm:falseswipe", @@ -104,7 +101,6 @@ "tm:irondefense", "tm:ironhead", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -137,9 +133,38 @@ "tm:thunderpunch", "tm:trailblaze", "tm:uturn", - "tm:wickedblow", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:coaching", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lashout", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:superpower", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "preEvolution": "kubfu", "evolutions": [], @@ -181,7 +206,6 @@ "52:focuspunch", "tm:acrobatics", "tm:aerialace", - "tm:aquajet", "tm:aurasphere", "tm:bodypress", "tm:bodyslam", @@ -191,13 +215,10 @@ "tm:chillingwater", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:detect", "tm:dig", "tm:dive", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:endure", "tm:facade", "tm:falseswipe", @@ -213,7 +234,6 @@ "tm:icespinner", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:lowsweep", @@ -234,7 +254,6 @@ "tm:stoneedge", "tm:substitute", "tm:superpower", - "tm:surgingstrikes", "tm:swift", "tm:swordsdance", "tm:takedown", @@ -246,7 +265,33 @@ "tm:waterfall", "tm:whirlpool", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:coaching", + "tutor:dive", + "tutor:drainpunch", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:liquidation", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "preEvolution": "kubfu", "evolutions": [], @@ -313,7 +358,6 @@ "52:focuspunch", "tm:acrobatics", "tm:aerialace", - "tm:aquajet", "tm:aurasphere", "tm:bodypress", "tm:bodyslam", @@ -323,13 +367,10 @@ "tm:chillingwater", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:detect", "tm:dig", "tm:dive", "tm:doubleedge", "tm:drainpunch", - "tm:dynamicpunch", "tm:endure", "tm:facade", "tm:falseswipe", @@ -345,7 +386,6 @@ "tm:icespinner", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:lowsweep", @@ -366,7 +406,6 @@ "tm:stoneedge", "tm:substitute", "tm:superpower", - "tm:surgingstrikes", "tm:swift", "tm:swordsdance", "tm:takedown", @@ -378,7 +417,33 @@ "tm:waterfall", "tm:whirlpool", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "tutor:coaching", + "tutor:dive", + "tutor:drainpunch", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:liquidation", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:superpower", + "tutor:swift", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": true diff --git a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json index 85c5e6ed5e..18874a6271 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/wooloo.json @@ -81,18 +81,11 @@ "egg:stomp", "egg:swagger", "tm:agility", - "tm:copycat", - "tm:cottonguard", - "tm:counter", - "tm:defensecurl", "tm:doubleedge", - "tm:doublekick", "tm:electroball", "tm:endure", "tm:facade", "tm:grassyglide", - "tm:growl", - "tm:guardsplit", "tm:guardswap", "tm:headbutt", "tm:payback", @@ -100,14 +93,16 @@ "tm:rest", "tm:reversal", "tm:sleeptalk", - "tm:stomp", "tm:substitute", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderwave", - "tm:wildcharge" + "tm:wildcharge", + "tutor:grassyglide", + "tutor:rest", + "tutor:sleeptalk", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json index efb6de9b07..1240936d9c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/yamper.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/yamper.json @@ -77,12 +77,10 @@ "egg:flamecharge", "egg:howl", "egg:sandattack", - "tm:bite", "tm:charge", "tm:charm", "tm:crunch", "tm:dig", - "tm:discharge", "tm:doubleedge", "tm:electroball", "tm:endure", @@ -90,21 +88,15 @@ "tm:firefang", "tm:flamecharge", "tm:helpinghand", - "tm:howl", - "tm:nuzzle", "tm:playrough", "tm:protect", "tm:rest", "tm:risingvoltage", "tm:roar", - "tm:sandattack", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:substitute", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:terablast", "tm:thunder", "tm:thunderbolt", @@ -112,7 +104,19 @@ "tm:thunderwave", "tm:uproar", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:firefang", + "tutor:helpinghand", + "tutor:playrough", + "tutor:rest", + "tutor:risingvoltage", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json index f60f43ffed..1cbcc4fc5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json @@ -69,7 +69,6 @@ "tm:agility", "tm:airslash", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -86,7 +85,6 @@ "tm:focusenergy", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:icefang", @@ -97,22 +95,16 @@ "tm:laserfocus", "tm:metalclaw", "tm:mistyterrain", - "tm:moonblast", - "tm:nobleroar", "tm:playrough", "tm:poisonjab", "tm:protect", "tm:psychicfangs", "tm:psychocut", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:retaliate", "tm:revenge", "tm:reversal", - "tm:sacredsword", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:solarblade", @@ -126,7 +118,32 @@ "tm:thunderfang", "tm:trailblaze", "tm:wildcharge", - "tm:workup" + "tm:workup", + "tutor:dazzlinggleam", + "tutor:falseswipe", + "tutor:firefang", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:playrough", + "tutor:poisonjab", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:swift", + "tutor:thunderfang", + "tutor:wildcharge" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json index d61002a57e..1deeb6fc26 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json @@ -66,7 +66,6 @@ "77:closecombat", "88:gigaimpact", "tm:agility", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -85,7 +84,6 @@ "tm:guardswap", "tm:heavyslam", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:icefang", @@ -95,15 +93,12 @@ "tm:irontail", "tm:laserfocus", "tm:lightscreen", - "tm:metalburst", "tm:metalclaw", - "tm:moonblast", "tm:payback", "tm:playrough", "tm:powerswap", "tm:protect", "tm:psychicfangs", - "tm:quickattack", "tm:raindance", "tm:reflect", "tm:rest", @@ -114,7 +109,6 @@ "tm:safeguard", "tm:sandstorm", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:solarbeam", @@ -128,9 +122,32 @@ "tm:terablast", "tm:thunderfang", "tm:trailblaze", - "tm:wideguard", "tm:wildcharge", - "tm:workup" + "tm:workup", + "tutor:coaching", + "tutor:dazzlinggleam", + "tutor:firefang", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:laserfocus", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:steelbeam", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderfang", + "tutor:wildcharge" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zarude.json b/common/src/main/resources/data/cobblemon/species/generation8/zarude.json index 11910b084a..b3a2b6b44f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zarude.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zarude.json @@ -71,7 +71,6 @@ "tm:aerialace", "tm:assurance", "tm:bind", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -90,23 +89,18 @@ "tm:facade", "tm:fling", "tm:focuspunch", - "tm:furyswipes", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:hammerarm", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", - "tm:junglehealing", "tm:knockoff", "tm:lashout", "tm:leafstorm", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", @@ -124,7 +118,6 @@ "tm:rockslide", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:seedbomb", "tm:sleeptalk", "tm:snarl", @@ -142,11 +135,37 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:trailblaze", "tm:uturn", - "tm:vinewhip" + "tutor:aerialace", + "tutor:bind", + "tutor:bulkup", + "tutor:darkpulse", + "tutor:drainpunch", + "tutor:energyball", + "tutor:focuspunch", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rockslide", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:throatchop" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json b/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json index 3e16212a89..a8885c52d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/basculegion.json @@ -99,9 +99,7 @@ "egg:endeavor", "egg:lastrespects", "tm:agility", - "tm:aquajet", "tm:aquatail", - "tm:bite", "tm:blizzard", "tm:chillingwater", "tm:confuseray", @@ -110,18 +108,15 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:flipturn", "tm:gigaimpact", "tm:headbutt", - "tm:headsmash", "tm:hex", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", "tm:icefang", "tm:icywind", - "tm:lastrespects", "tm:liquidation", "tm:muddywater", "tm:mudshot", @@ -139,23 +134,39 @@ "tm:shadowball", "tm:sleeptalk", "tm:snowscape", - "tm:soak", "tm:spite", "tm:substitute", "tm:surf", "tm:swift", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:uproar", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:wavecrash", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:endeavor", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:liquidation", + "tutor:ominouswind", + "tutor:outrage", + "tutor:painsplit", + "tutor:psychic", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "basculin fish_stripes=white", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json b/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json index 265e585b12..caa0e90a13 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json @@ -64,7 +64,6 @@ "75:springtidestorm", "tm:agility", "tm:alluringvoice", - "tm:astonish", "tm:bodyslam", "tm:calmmind", "tm:dazzlinggleam", @@ -72,23 +71,18 @@ "tm:drainingkiss", "tm:earthpower", "tm:endure", - "tm:extrasensory", "tm:facade", - "tm:fairywind", - "tm:flatter", "tm:fly", "tm:focusblast", "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", - "tm:healingwish", "tm:hyperbeam", "tm:imprison", "tm:irondefense", "tm:ironhead", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:mysticalfire", "tm:outrage", "tm:playrough", @@ -102,7 +96,6 @@ "tm:scaryface", "tm:sleeptalk", "tm:sludgebomb", - "tm:springtidestorm", "tm:substitute", "tm:sunnyday", "tm:superpower", @@ -114,7 +107,29 @@ "tm:twister", "tm:uproar", "tm:weatherball", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:mistyexplosion", + "tutor:mysticalfire", + "tutor:outrage", + "tutor:playrough", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:superpower", + "tutor:tailwind", + "tutor:twister", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/kleavor.json b/common/src/main/resources/data/cobblemon/species/generation8a/kleavor.json index 0bd817d9de..513a8a6849 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/kleavor.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/kleavor.json @@ -101,34 +101,25 @@ "tm:bugbite", "tm:bugbuzz", "tm:closecombat", - "tm:counter", "tm:defog", "tm:doubleedge", - "tm:doublehit", "tm:doubleteam", "tm:dualwingbeat", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", "tm:focusenergy", "tm:furycutter", "tm:gigaimpact", "tm:helpinghand", "tm:hyperbeam", - "tm:leer", "tm:lightscreen", "tm:lunge", - "tm:nightslash", "tm:ominouswind", "tm:pounce", "tm:protect", "tm:psychocut", - "tm:pursuit", - "tm:quickattack", - "tm:quickguard", "tm:raindance", - "tm:razorwind", "tm:rest", "tm:reversal", "tm:rockblast", @@ -139,11 +130,9 @@ "tm:scaryface", "tm:silverwind", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", - "tm:stoneaxe", "tm:stoneedge", "tm:strugglebug", "tm:substitute", @@ -157,8 +146,31 @@ "tm:trailblaze", "tm:uturn", "tm:vacuumwave", - "tm:wingattack", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bugbite", + "tutor:defog", + "tutor:dualwingbeat", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:ominouswind", + "tutor:psychocut", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", + "tutor:tailwind", + "tutor:vacuumwave", + "tutor:xscissor" ], "preEvolution": "scyther", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/overqwil.json b/common/src/main/resources/data/cobblemon/species/generation8a/overqwil.json index 4026a9d8dc..935bdb5e4d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/overqwil.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/overqwil.json @@ -113,30 +113,20 @@ "egg:supersonic", "egg:waterpulse", "tm:acidspray", - "tm:acupressure", "tm:agility", - "tm:aquajet", "tm:aquatail", - "tm:astonish", - "tm:barbbarrage", - "tm:bite", "tm:blizzard", "tm:brine", - "tm:bubblebeam", "tm:chillingwater", "tm:crunch", "tm:curse", "tm:darkpulse", - "tm:destinybond", "tm:doubleedge", "tm:endure", "tm:facade", - "tm:fellstinger", - "tm:flail", "tm:gigaimpact", "tm:gunkshot", "tm:gyroball", - "tm:harden", "tm:haze", "tm:hex", "tm:hydropump", @@ -146,12 +136,10 @@ "tm:icywind", "tm:lashout", "tm:liquidation", - "tm:minimize", "tm:mudshot", "tm:painsplit", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", "tm:raindance", @@ -167,14 +155,10 @@ "tm:smartstrike", "tm:spikes", "tm:spite", - "tm:spitup", - "tm:stockpile", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -183,7 +167,29 @@ "tm:toxicspikes", "tm:venoshock", "tm:waterfall", - "tm:waterpulse" + "tm:waterpulse", + "tutor:aquatail", + "tutor:darkpulse", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:iceball", + "tutor:icebeam", + "tutor:icywind", + "tutor:lashout", + "tutor:liquidation", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "preEvolution": "qwilfish hisuian", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json b/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json index 2247cd4364..956641509b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json @@ -100,15 +100,10 @@ "tm:calmmind", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:dig", - "tm:direclaw", - "tm:doublehit", "tm:endure", "tm:facade", - "tm:fakeout", "tm:falseswipe", - "tm:feint", "tm:firepunch", "tm:fling", "tm:focusblast", @@ -121,29 +116,23 @@ "tm:hyperbeam", "tm:irontail", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:metalclaw", "tm:nastyplot", - "tm:nightslash", "tm:poisonjab", "tm:poisontail", "tm:powershift", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:reversal", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:scratch", "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -151,7 +140,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -165,7 +153,36 @@ "tm:uturn", "tm:vacuumwave", "tm:venoshock", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bulkup", + "tutor:calmmind", + "tutor:coaching", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:lashout", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:powershift", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:vacuumwave", + "tutor:xscissor" ], "preEvolution": "sneasel hisuian", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json b/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json index 846c4f23fe..ed1c5dd447 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/ursaluna.json @@ -107,18 +107,14 @@ "tm:aerialace", "tm:avalanche", "tm:babydolleyes", - "tm:bellydrum", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", - "tm:chipaway", "tm:closecombat", - "tm:counter", "tm:covet", - "tm:crosschop", "tm:crunch", "tm:curse", "tm:dig", @@ -129,32 +125,24 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:firepunch", "tm:fling", "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:gunkshot", - "tm:hammerarm", "tm:hardpress", - "tm:headlongrush", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:icepunch", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:metalclaw", "tm:metronome", - "tm:nightslash", "tm:payback", - "tm:playnice", "tm:playrough", "tm:protect", "tm:raindance", @@ -164,11 +152,8 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:seedbomb", - "tm:seismictoss", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:snore", @@ -177,19 +162,49 @@ "tm:substitute", "tm:sunnyday", "tm:supercellslam", - "tm:sweetscent", "tm:swift", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunderpunch", "tm:trailblaze", "tm:uproar", - "tm:yawn" + "tutor:aerialace", + "tutor:babydolleyes", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:covet", + "tutor:drainpunch", + "tutor:earthpower", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:lowkick", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snore", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:uproar" ], "preEvolution": "ursaring", "evolutions": [], @@ -252,7 +267,6 @@ "70:bloodmoon", "tm:avalanche", "tm:bellydrum", - "tm:bloodmoon", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -274,29 +288,20 @@ "tm:focusblast", "tm:focuspunch", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:gunkshot", - "tm:hammerarm", - "tm:harden", "tm:hardpress", - "tm:headlongrush", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:icepunch", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:metalclaw", - "tm:moonblast", - "tm:moonlight", "tm:mudshot", "tm:nightslash", "tm:payback", - "tm:playnice", "tm:protect", "tm:raindance", "tm:rest", @@ -304,11 +309,9 @@ "tm:rockslide", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:seedbomb", "tm:seismictoss", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:snarl", @@ -327,7 +330,34 @@ "tm:trailblaze", "tm:uproar", "tm:vacuumwave", - "tm:yawn" + "tm:yawn", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:earthpower", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:lowkick", + "tutor:rest", + "tutor:rockslide", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:snore", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:vacuumwave" ], "evolutions": [], "battleOnly": false diff --git a/common/src/main/resources/data/cobblemon/species/generation8a/wyrdeer.json b/common/src/main/resources/data/cobblemon/species/generation8a/wyrdeer.json index 78bd54d9a5..830b9ff469 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/wyrdeer.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/wyrdeer.json @@ -100,8 +100,6 @@ "egg:swagger", "egg:thrash", "tm:agility", - "tm:astonish", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:calmmind", @@ -110,15 +108,12 @@ "tm:confuseray", "tm:curse", "tm:dig", - "tm:disable", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:futuresight", "tm:gigaimpact", @@ -126,47 +121,36 @@ "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:irontail", - "tm:jumpkick", - "tm:leer", "tm:lightscreen", "tm:lunge", - "tm:mefirst", "tm:megahorn", - "tm:mudsport", "tm:protect", "tm:psybeam", "tm:psychic", "tm:psychicnoise", "tm:psychup", - "tm:psyshieldbash", "tm:psyshock", - "tm:rage", "tm:raindance", "tm:reflect", "tm:rest", "tm:roar", "tm:roleplay", - "tm:sandattack", "tm:scaryface", "tm:shadowball", "tm:skillswap", "tm:sleeptalk", "tm:solarbeam", "tm:spite", - "tm:stomp", "tm:storedpower", "tm:substitute", "tm:sunnyday", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", @@ -176,7 +160,34 @@ "tm:trickroom", "tm:uproar", "tm:wildcharge", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:earthpower", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irontail", + "tutor:megahorn", + "tutor:psychic", + "tutor:rest", + "tutor:roleplay", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "stantler", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json b/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json index 5fa3ce1133..d4f1f0687a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/annihilape.json @@ -117,8 +117,6 @@ "tm:bulldoze", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:crosschop", "tm:curse", "tm:dig", "tm:doubleedge", @@ -128,54 +126,38 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:finalgambit", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", - "tm:furyswipes", "tm:gigaimpact", "tm:gunkshot", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", - "tm:karatechop", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:meditate", "tm:metronome", "tm:nightshade", - "tm:nightslash", "tm:outrage", "tm:overheat", "tm:phantomforce", "tm:poisonjab", - "tm:powertrip", "tm:protect", - "tm:punishment", - "tm:pursuit", - "tm:rage", - "tm:ragefist", "tm:raindance", "tm:rest", "tm:reversal", "tm:rockslide", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:seedbomb", - "tm:seismictoss", "tm:shadowball", "tm:shadowclaw", - "tm:shadowpunch", "tm:sleeptalk", "tm:smackdown", - "tm:smellingsalts", "tm:spite", "tm:stealthrock", "tm:stompingtantrum", @@ -188,14 +170,46 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:throatchop", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:uproar", "tm:uturn", - "tm:vacuumwave" + "tm:vacuumwave", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:coaching", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:lashout", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:uproar", + "tutor:vacuumwave" ], "preEvolution": "primeape", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json index 9cc8172481..01bd89a666 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json @@ -76,7 +76,6 @@ "egg:strengthsap", "egg:synthesis", "egg:weatherball", - "tm:absorb", "tm:alluringvoice", "tm:bulletseed", "tm:charm", @@ -86,30 +85,22 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:fling", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:metronome", - "tm:mirrorcoat", "tm:petalblizzard", - "tm:petaldance", "tm:pollenpuff", "tm:protect", "tm:psychup", - "tm:razorleaf", "tm:reflect", "tm:rest", "tm:safeguard", @@ -117,17 +108,29 @@ "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", - "tm:strengthsap", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:synthesis", - "tm:tackle", "tm:terablast", "tm:terrainpulse", "tm:trailblaze", - "tm:weatherball" + "tm:weatherball", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:terrainpulse" ], "preEvolution": "dolliv", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json b/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json index 86638129c7..633656a30d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json @@ -74,7 +74,6 @@ "tm:dragonpulse", "tm:dragontail", "tm:earthquake", - "tm:electroshot", "tm:endure", "tm:facade", "tm:flashcannon", @@ -88,14 +87,10 @@ "tm:hyperbeam", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:lightscreen", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:meteorbeam", - "tm:mirrorcoat", - "tm:nightslash", "tm:outrage", "tm:protect", "tm:reflect", @@ -105,7 +100,6 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:snarl", @@ -119,7 +113,28 @@ "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thunderwave" + "tm:thunderwave", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stoneedge", + "tutor:thunderbolt" ], "preEvolution": "duraludon", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json index 7811db2d3f..5ca8e487f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json @@ -71,30 +71,24 @@ "tm:aerialace", "tm:aquatail", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", "tm:crunch", "tm:dig", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:endure", "tm:facade", "tm:focusenergy", - "tm:freezedry", "tm:helpinghand", "tm:icebeam", "tm:icefang", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:ironhead", - "tm:leer", "tm:outrage", "tm:protect", "tm:raindance", @@ -104,9 +98,21 @@ "tm:snowscape", "tm:substitute", "tm:swordsdance", - "tm:tackle", "tm:takedown", - "tm:terablast" + "tm:terablast", + "tutor:aerialace", + "tutor:aquatail", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:outrage", + "tutor:rest", + "tutor:sleeptalk" ], "preEvolution": "frigibax", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json b/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json index 3a9cba58a9..a67c2b5228 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/armarouge.json @@ -104,17 +104,11 @@ "egg:spite", "tm:acidspray", "tm:allyswitch", - "tm:armorcannon", - "tm:astonish", "tm:aurasphere", "tm:calmmind", - "tm:clearsmog", "tm:confuseray", "tm:darkpulse", - "tm:destinybond", - "tm:disable", "tm:dragonpulse", - "tm:ember", "tm:endure", "tm:energyball", "tm:expandingforce", @@ -131,8 +125,6 @@ "tm:helpinghand", "tm:incinerate", "tm:irondefense", - "tm:lavaplume", - "tm:leer", "tm:lightscreen", "tm:meteorbeam", "tm:mysticalfire", @@ -160,8 +152,27 @@ "tm:trick", "tm:trickroom", "tm:weatherball", - "tm:wideguard", - "tm:willowisp" + "tm:willowisp", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:energyball", + "tutor:expandingforce", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:meteorbeam", + "tutor:mysticalfire", + "tutor:psychic", + "tutor:rest", + "tutor:scorchingsands", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spite", + "tutor:trick" ], "preEvolution": "charcadet", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json index 986cd57818..ad9c0e26f8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json @@ -77,7 +77,6 @@ "tm:aerialace", "tm:aquatail", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -88,32 +87,25 @@ "tm:dig", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:earthquake", "tm:endure", "tm:facade", "tm:falseswipe", "tm:focusenergy", - "tm:freezedry", "tm:gigaimpact", - "tm:glaiverush", "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", "tm:icebeam", "tm:icefang", - "tm:iceshard", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:ironhead", - "tm:leer", "tm:outrage", "tm:protect", "tm:raindance", @@ -125,11 +117,32 @@ "tm:stompingtantrum", "tm:substitute", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderfang", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:ironhead", + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "preEvolution": "arctibax", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json b/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json index 2e0910b092..1034db9697 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json @@ -87,13 +87,11 @@ "tm:chargebeam", "tm:chillingwater", "tm:confuseray", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:endure", - "tm:flail", "tm:gigaimpact", "tm:hyperbeam", "tm:hypervoice", @@ -101,32 +99,37 @@ "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:paraboliccharge", "tm:protect", "tm:raindance", "tm:reflect", "tm:rest", - "tm:slackoff", "tm:sleeptalk", - "tm:soak", - "tm:spark", "tm:substitute", "tm:suckerpunch", "tm:supercellslam", "tm:swift", - "tm:tackle", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:toxic", "tm:voltswitch", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:wildcharge", - "tm:zapcannon" + "tutor:chargebeam", + "tutor:electroweb", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:mudslap", + "tutor:rest", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:wildcharge" ], "preEvolution": "tadbulb", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json b/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json index 645535c686..501e32eacf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json @@ -104,22 +104,16 @@ "tm:icywind", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:memento", "tm:nastyplot", - "tm:partingshot", "tm:payback", - "tm:peck", "tm:pluck", "tm:powergem", - "tm:powertrip", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", "tm:rockblast", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:roost", "tm:sandstorm", @@ -139,8 +133,30 @@ "tm:thief", "tm:torment", "tm:uturn", - "tm:whirlwind", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:darkpulse", + "tutor:drillrun", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:knockoff", + "tutor:lashout", + "tutor:rest", + "tutor:rockslide", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:tailwind" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json b/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json index 6f745b1268..bf67f011f6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json @@ -79,15 +79,11 @@ "egg:leechseed", "egg:shadowsneak", "egg:strengthsap", - "tm:absorb", - "tm:astonish", "tm:beatup", "tm:block", "tm:bulletseed", "tm:confuseray", "tm:curse", - "tm:defensecurl", - "tm:disable", "tm:endure", "tm:energyball", "tm:facade", @@ -100,8 +96,6 @@ "tm:hyperbeam", "tm:infestation", "tm:leafstorm", - "tm:leechseed", - "tm:megadrain", "tm:nightshade", "tm:painsplit", "tm:phantomforce", @@ -109,23 +103,36 @@ "tm:pounce", "tm:powerwhip", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rollout", "tm:scaryface", "tm:seedbomb", "tm:shadowball", - "tm:shadowsneak", "tm:skittersmack", "tm:sleeptalk", "tm:solarbeam", "tm:spikes", "tm:spite", - "tm:strengthsap", "tm:substitute", "tm:terablast", "tm:thief", - "tm:trailblaze" + "tm:trailblaze", + "tutor:block", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:spite" ], "preEvolution": "bramblin", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json b/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json index 5f66bdbacc..d180ade897 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json @@ -79,15 +79,11 @@ "egg:leechseed", "egg:shadowsneak", "egg:strengthsap", - "tm:absorb", - "tm:astonish", "tm:beatup", "tm:block", "tm:bulletseed", "tm:confuseray", "tm:curse", - "tm:defensecurl", - "tm:disable", "tm:endure", "tm:energyball", "tm:facade", @@ -98,8 +94,6 @@ "tm:hex", "tm:infestation", "tm:leafstorm", - "tm:leechseed", - "tm:megadrain", "tm:nightshade", "tm:painsplit", "tm:phantomforce", @@ -107,22 +101,32 @@ "tm:pounce", "tm:powerwhip", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rollout", "tm:scaryface", "tm:seedbomb", "tm:shadowball", - "tm:shadowsneak", "tm:sleeptalk", "tm:solarbeam", "tm:spikes", "tm:spite", - "tm:strengthsap", "tm:substitute", "tm:terablast", "tm:thief", - "tm:trailblaze" + "tm:trailblaze", + "tutor:block", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:spite" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json b/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json index 04ea2f0e1e..ae63ed2055 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json @@ -59,12 +59,9 @@ "70:ingrain", "77:ragepowder", "91:solarbeam", - "tm:absorb", - "tm:astonish", "tm:bodypress", "tm:bodyslam", "tm:bulletseed", - "tm:clearsmog", "tm:closecombat", "tm:confuseray", "tm:crunch", @@ -78,27 +75,21 @@ "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", - "tm:growth", "tm:hex", "tm:hyperbeam", - "tm:ingrain", "tm:lashout", "tm:leafstorm", "tm:magicalleaf", - "tm:megadrain", "tm:outrage", "tm:payback", "tm:pollenpuff", "tm:protect", - "tm:ragepowder", "tm:rest", "tm:scaryface", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", - "tm:spore", "tm:stompingtantrum", - "tm:stunspore", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", @@ -106,10 +97,25 @@ "tm:taunt", "tm:terablast", "tm:thief", - "tm:thrash", "tm:trailblaze", "tm:venoshock", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:lashout", + "tutor:magicalleaf", + "tutor:outrage", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:synthesis", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json b/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json index 403521eedd..71d570d901 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json @@ -72,7 +72,6 @@ "egg:ragepowder", "egg:rollout", "egg:worryseed", - "tm:bite", "tm:bulletseed", "tm:crunch", "tm:endeavor", @@ -83,18 +82,11 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", "tm:helpinghand", - "tm:ingrain", - "tm:leafage", "tm:leafstorm", - "tm:leechseed", - "tm:leer", "tm:magicalleaf", "tm:protect", - "tm:ragepowder", - "tm:razorleaf", "tm:rest", "tm:rollout", "tm:sandstorm", @@ -110,7 +102,21 @@ "tm:thief", "tm:trailblaze", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:worryseed", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json b/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json index 1d2ff64847..d27961818d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ceruledge.json @@ -103,18 +103,12 @@ "egg:disable", "egg:spite", "tm:allyswitch", - "tm:astonish", - "tm:bitterblade", "tm:brickbreak", "tm:bulkup", - "tm:clearsmog", "tm:closecombat", "tm:confuseray", "tm:curse", - "tm:destinybond", - "tm:disable", "tm:dragonclaw", - "tm:ember", "tm:endure", "tm:facade", "tm:falseswipe", @@ -130,11 +124,8 @@ "tm:incinerate", "tm:irondefense", "tm:ironhead", - "tm:lavaplume", - "tm:leer", "tm:lightscreen", "tm:nightshade", - "tm:nightslash", "tm:overheat", "tm:phantomforce", "tm:poisonjab", @@ -142,12 +133,10 @@ "tm:protect", "tm:psychocut", "tm:psychup", - "tm:quickguard", "tm:reflect", "tm:rest", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:sleeptalk", "tm:solarblade", "tm:spite", @@ -161,7 +150,26 @@ "tm:throatchop", "tm:vacuumwave", "tm:willowisp", - "tm:xscissor" + "tm:xscissor", + "tutor:allyswitch", + "tutor:bulkup", + "tutor:falseswipe", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:ironhead", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:psychocut", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:spite", + "tutor:throatchop", + "tutor:vacuumwave", + "tutor:xscissor" ], "preEvolution": "charcadet", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json b/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json index 1744d12139..71b5c7df99 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cetitan.json @@ -95,7 +95,6 @@ "egg:yawn", "tm:amnesia", "tm:avalanche", - "tm:bellydrum", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -108,11 +107,8 @@ "tm:earthquake", "tm:echoedvoice", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:flail", "tm:gigaimpact", - "tm:growl", "tm:hardpress", "tm:heavyslam", "tm:helpinghand", @@ -122,15 +118,12 @@ "tm:icebeam", "tm:icefang", "tm:icepunch", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:knockoff", "tm:liquidation", "tm:playrough", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -139,11 +132,28 @@ "tm:stompingtantrum", "tm:substitute", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:waterpulse", - "tm:yawn" + "tutor:bounce", + "tutor:bulldoze", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:waterpulse" ], "preEvolution": "cetoddle", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json b/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json index 4a6ffdb1ef..92bef826a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cetoddle.json @@ -95,7 +95,6 @@ "egg:yawn", "tm:amnesia", "tm:avalanche", - "tm:bellydrum", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -108,10 +107,7 @@ "tm:earthquake", "tm:echoedvoice", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:flail", - "tm:growl", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", @@ -119,15 +115,12 @@ "tm:hypervoice", "tm:icebeam", "tm:icefang", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:knockoff", "tm:liquidation", "tm:playrough", - "tm:powdersnow", "tm:protect", "tm:raindance", "tm:rest", @@ -136,11 +129,26 @@ "tm:stompingtantrum", "tm:substitute", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:waterpulse", - "tm:yawn" + "tutor:bounce", + "tutor:bulldoze", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json b/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json index cfd02e84af..2af18290bb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json @@ -91,12 +91,7 @@ "egg:destinybond", "egg:disable", "egg:spite", - "tm:astonish", - "tm:clearsmog", "tm:confuseray", - "tm:destinybond", - "tm:disable", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", @@ -107,8 +102,6 @@ "tm:heatwave", "tm:helpinghand", "tm:incinerate", - "tm:lavaplume", - "tm:leer", "tm:nightshade", "tm:overheat", "tm:protect", @@ -119,7 +112,13 @@ "tm:sunnyday", "tm:takedown", "tm:terablast", - "tm:willowisp" + "tm:willowisp", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:rest", + "tutor:sleeptalk", + "tutor:spite" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json b/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json index 90b621c32e..2ea72030ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json @@ -77,25 +77,15 @@ "tm:hex", "tm:hyperbeam", "tm:icefang", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:icywind", "tm:lashout", - "tm:meanlook", - "tm:mist", - "tm:nightslash", "tm:payback", - "tm:powdersnow", "tm:protect", "tm:psychicfangs", "tm:raindance", - "tm:recover", "tm:rest", - "tm:ruination", - "tm:sacredsword", "tm:scaryface", - "tm:sheercold", "tm:sleeptalk", "tm:snarl", "tm:snowscape", @@ -106,7 +96,22 @@ "tm:takedown", "tm:taunt", "tm:terablast", - "tm:throatchop" + "tm:throatchop", + "tutor:aerialace", + "tutor:darkpulse", + "tutor:falseswipe", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:icywind", + "tutor:lashout", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:suckerpunch", + "tutor:throatchop" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json b/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json index e2b4cdfcdd..8a1e199dd1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json @@ -66,26 +66,20 @@ "tm:confuseray", "tm:crunch", "tm:darkpulse", - "tm:ember", "tm:endure", "tm:facade", "tm:fireblast", "tm:firespin", "tm:flamecharge", "tm:flamethrower", - "tm:flamewheel", "tm:flareblitz", "tm:gigaimpact", "tm:heatwave", "tm:hex", "tm:hyperbeam", "tm:incinerate", - "tm:inferno", "tm:lashout", - "tm:lavaplume", "tm:lightscreen", - "tm:meanlook", - "tm:memento", "tm:nastyplot", "tm:overheat", "tm:payback", @@ -93,7 +87,6 @@ "tm:psychic", "tm:reflect", "tm:rest", - "tm:ruination", "tm:scaryface", "tm:sleeptalk", "tm:snarl", @@ -106,7 +99,21 @@ "tm:temperflare", "tm:terablast", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bounce", + "tutor:burningjealousy", + "tutor:darkpulse", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:lashout", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json b/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json index 6f108ea172..bc4bfd3667 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/clodsire.json @@ -110,11 +110,9 @@ "tm:bodyslam", "tm:bulldoze", "tm:chillingwater", - "tm:counter", "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -131,35 +129,26 @@ "tm:liquidation", "tm:lowkick", "tm:megahorn", - "tm:mist", "tm:muddywater", "tm:mudshot", "tm:mudslap", "tm:poisonjab", - "tm:poisonsting", "tm:poisontail", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:rockslide", "tm:rocktomb", "tm:sandstorm", - "tm:slam", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:spikes", - "tm:spitup", "tm:stealthrock", - "tm:stockpile", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:surf", - "tm:swallow", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:toxic", @@ -168,8 +157,32 @@ "tm:venoshock", "tm:waterfall", "tm:waterpulse", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:afteryou", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:liquidation", + "tutor:lowkick", + "tutor:megahorn", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "wooper paldean", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json b/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json index d92fbd2a50..f5fc74c115 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/crocalor.json @@ -81,14 +81,11 @@ "egg:curse", "egg:encore", "egg:slackoff", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:crunch", "tm:curse", "tm:dig", "tm:disarmingvoice", - "tm:ember", "tm:encore", "tm:endure", "tm:facade", @@ -103,8 +100,6 @@ "tm:helpinghand", "tm:hypervoice", "tm:incinerate", - "tm:leer", - "tm:lick", "tm:mudslap", "tm:outrage", "tm:overheat", @@ -113,20 +108,32 @@ "tm:roar", "tm:round", "tm:seedbomb", - "tm:slackoff", "tm:sleeptalk", "tm:snarl", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", "tm:thunderfang", "tm:willowisp", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:firefang", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "preEvolution": "fuecoco", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json index 4600c5b440..60e50e7372 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json @@ -73,7 +73,6 @@ "tm:aerialace", "tm:agility", "tm:aquatail", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:crunch", @@ -82,14 +81,12 @@ "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", "tm:gigaimpact", - "tm:growl", "tm:hyperbeam", "tm:hypervoice", "tm:icespinner", @@ -102,18 +99,13 @@ "tm:overheat", "tm:powerwhip", "tm:protect", - "tm:quickattack", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:scaleshot", - "tm:shedtail", - "tm:shiftgear", "tm:sleeptalk", "tm:substitute", "tm:sunnyday", "tm:supercellslam", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:temperflare", @@ -124,7 +116,28 @@ "tm:trailblaze", "tm:uproar", "tm:uturn", - "tm:wildcharge" + "tm:wildcharge", + "tutor:aerialace", + "tutor:aquatail", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:irontail", + "tutor:knockoff", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json b/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json index 886a248abf..7d3ab25029 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dachsbun.json @@ -98,11 +98,9 @@ "tm:alluringvoice", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:charm", - "tm:copycat", "tm:covet", "tm:crunch", "tm:dazzlinggleam", @@ -114,13 +112,10 @@ "tm:facade", "tm:firefang", "tm:gigaimpact", - "tm:growl", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:icefang", "tm:lastresort", - "tm:lick", "tm:mistyterrain", "tm:mudshot", "tm:mudslap", @@ -137,16 +132,29 @@ "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thunderfang", "tm:trailblaze", - "tm:wish", "tm:workup", - "tm:yawn" + "tutor:babydolleyes", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang" ], "preEvolution": "fidough", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json b/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json index f46b66c2e4..bcf1f2ed6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json @@ -64,14 +64,10 @@ "egg:recycle", "egg:rollout", "egg:suckerpunch", - "tm:astonish", "tm:bodyslam", "tm:bugbite", "tm:bulletseed", - "tm:defensecurl", - "tm:doublehit", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonpulse", "tm:dragontail", @@ -83,7 +79,6 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:gyroball", "tm:hyperbeam", "tm:infestation", @@ -92,7 +87,6 @@ "tm:pollenpuff", "tm:pounce", "tm:protect", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -103,11 +97,23 @@ "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:sweetscent", - "tm:syrupbomb", "tm:takedown", "tm:terablast", - "tm:withdraw" + "tutor:bugbite", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:outrage", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:suckerpunch" ], "preEvolution": "applin", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json index 011af3563b..c7e8114971 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json @@ -72,42 +72,43 @@ "egg:strengthsap", "egg:synthesis", "egg:weatherball", - "tm:absorb", "tm:bulletseed", "tm:charm", "tm:earthpower", "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:gigadrain", "tm:grassknot", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", - "tm:strengthsap", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:synthesis", - "tm:tackle", "tm:terablast", "tm:terrainpulse", "tm:trailblaze", - "tm:weatherball" + "tm:weatherball", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:terrainpulse" ], "preEvolution": "smoliv", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json b/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json index 0f01191bd2..a846dc3940 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json @@ -109,16 +109,12 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", "tm:gigaimpact", "tm:heavyslam", "tm:hydropump", "tm:hyperbeam", "tm:icefang", "tm:liquidation", - "tm:nobleroar", - "tm:orderup", "tm:outrage", "tm:protect", "tm:raindance", @@ -126,22 +122,28 @@ "tm:rockslide", "tm:scaryface", "tm:sleeptalk", - "tm:soak", "tm:stompingtantrum", "tm:substitute", - "tm:supersonic", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", - "tm:tickle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:wavecrash", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:dive", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:liquidation", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json b/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json index 34abecff75..d049c8832f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json @@ -91,24 +91,17 @@ "tm:amnesia", "tm:ancientpower", "tm:aquatail", - "tm:astonish", "tm:batonpass", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", - "tm:boomburst", "tm:breakingswipe", "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:coil", "tm:curse", - "tm:defensecurl", "tm:dig", "tm:doubleedge", - "tm:dragonrush", "tm:dragontail", "tm:drillrun", "tm:dualwingbeat", @@ -118,10 +111,8 @@ "tm:endure", "tm:facade", "tm:fireblast", - "tm:flail", "tm:flamethrower", "tm:gigaimpact", - "tm:glare", "tm:gyroball", "tm:headbutt", "tm:heavyslam", @@ -129,7 +120,6 @@ "tm:hex", "tm:hurricane", "tm:hyperbeam", - "tm:hyperdrill", "tm:hypervoice", "tm:icebeam", "tm:icespinner", @@ -144,8 +134,6 @@ "tm:pounce", "tm:protect", "tm:psychup", - "tm:pursuit", - "tm:rage", "tm:raindance", "tm:rest", "tm:rockslide", @@ -178,11 +166,47 @@ "tm:thunder", "tm:thunderbolt", "tm:toxic", - "tm:trumpcard", "tm:uproar", "tm:wildcharge", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:drillrun", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:lastresort", + "tutor:mudslap", + "tutor:outrage", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:rollout", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowball", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:snore", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:tailwind", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "preEvolution": "dunsparce", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation9/espathra.json b/common/src/main/resources/data/cobblemon/species/generation9/espathra.json index 8189e4c68a..714ca20a5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/espathra.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/espathra.json @@ -100,11 +100,9 @@ "tm:bravebird", "tm:calmmind", "tm:confuseray", - "tm:confusion", "tm:dazzlinggleam", "tm:disarmingvoice", "tm:doubleedge", - "tm:drillpeck", "tm:endure", "tm:energyball", "tm:expandingforce", @@ -113,19 +111,15 @@ "tm:flashcannon", "tm:foulplay", "tm:gigaimpact", - "tm:growl", "tm:helpinghand", "tm:hex", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:lastresort", "tm:lightscreen", "tm:lowkick", - "tm:luminacrash", "tm:mudslap", "tm:nightshade", - "tm:peck", "tm:pluck", "tm:pounce", "tm:protect", @@ -134,7 +128,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:reflect", "tm:rest", @@ -155,7 +148,34 @@ "tm:trickroom", "tm:uproar", "tm:uturn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:lastresort", + "tutor:lowkick", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "flittle", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json b/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json index da2680f870..7504fad35b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json @@ -100,7 +100,6 @@ "tm:allyswitch", "tm:amnesia", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:beatup", "tm:bodyslam", @@ -108,26 +107,21 @@ "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:confusion", "tm:crunch", "tm:curse", "tm:dazzlinggleam", "tm:doubleedge", - "tm:doublehit", - "tm:doublekick", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:foresight", "tm:foulplay", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:guardswap", "tm:helpinghand", "tm:highhorsepower", @@ -137,11 +131,8 @@ "tm:ironhead", "tm:lightscreen", "tm:lowkick", - "tm:meanlook", - "tm:mirrorcoat", "tm:nastyplot", "tm:nightshade", - "tm:odorsleuth", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -152,7 +143,6 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:razorwind", "tm:reflect", "tm:rest", "tm:roar", @@ -160,13 +150,11 @@ "tm:shadowball", "tm:skillswap", "tm:sleeptalk", - "tm:stomp", "tm:stompingtantrum", "tm:storedpower", "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -176,10 +164,36 @@ "tm:trailblaze", "tm:trick", "tm:trickroom", - "tm:twinbeam", "tm:uproar", - "tm:wish", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:energyball", + "tutor:expandingforce", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:lowkick", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "girafarig", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json b/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json index e00bceb488..4a09725119 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json @@ -81,11 +81,9 @@ "tm:darkpulse", "tm:dazzlinggleam", "tm:disarmingvoice", - "tm:doublekick", "tm:dualwingbeat", "tm:endure", "tm:facade", - "tm:flatter", "tm:fly", "tm:gigaimpact", "tm:gunkshot", @@ -96,16 +94,12 @@ "tm:icywind", "tm:lashout", "tm:lightscreen", - "tm:moonblast", "tm:nastyplot", - "tm:peck", "tm:playrough", - "tm:poisongas", "tm:poisonjab", "tm:poisontail", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:rest", "tm:roost", "tm:shadowball", @@ -127,7 +121,30 @@ "tm:uproar", "tm:uturn", "tm:venoshock", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:dualwingbeat", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:lashout", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:roost", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:swift", + "tutor:tailwind", + "tutor:uproar" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fidough.json b/common/src/main/resources/data/cobblemon/species/generation9/fidough.json index 124af7daac..a21e894a6f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fidough.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fidough.json @@ -98,10 +98,8 @@ "tm:alluringvoice", "tm:babydolleyes", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:charm", - "tm:copycat", "tm:covet", "tm:crunch", "tm:dazzlinggleam", @@ -111,12 +109,9 @@ "tm:endure", "tm:facade", "tm:firefang", - "tm:growl", "tm:helpinghand", - "tm:howl", "tm:icefang", "tm:lastresort", - "tm:lick", "tm:mistyterrain", "tm:mudshot", "tm:mudslap", @@ -132,16 +127,27 @@ "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thunderfang", "tm:trailblaze", - "tm:wish", "tm:workup", - "tm:yawn" + "tutor:babydolleyes", + "tutor:covet", + "tutor:dazzlinggleam", + "tutor:endeavor", + "tutor:firefang", + "tutor:helpinghand", + "tutor:icefang", + "tutor:lastresort", + "tutor:mudslap", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/finizen.json b/common/src/main/resources/data/cobblemon/species/generation9/finizen.json index 34b1f2cffa..09ceb6e90b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/finizen.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/finizen.json @@ -92,19 +92,14 @@ "egg:tickle", "tm:acrobatics", "tm:agility", - "tm:aquajet", "tm:aquatail", - "tm:astonish", "tm:blizzard", "tm:bodyslam", - "tm:boomburst", "tm:bounce", "tm:charm", "tm:chillingwater", - "tm:counter", "tm:disarmingvoice", "tm:dive", - "tm:doublehit", "tm:drainingkiss", "tm:encore", "tm:endure", @@ -117,23 +112,32 @@ "tm:icebeam", "tm:icywind", "tm:liquidation", - "tm:mist", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", "tm:sleeptalk", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:takedown", "tm:terablast", - "tm:tickle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bounce", + "tutor:dive", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icywind", + "tutor:liquidation", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json b/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json index 8e3efb9ac8..c73aa3ac86 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json @@ -115,16 +115,12 @@ "tm:bulkup", "tm:chillingwater", "tm:closecombat", - "tm:copycat", - "tm:detect", - "tm:doublekick", "tm:doubleteam", "tm:dualwingbeat", "tm:endeavor", "tm:endure", "tm:facade", "tm:featherdance", - "tm:feint", "tm:fling", "tm:fly", "tm:focusenergy", @@ -137,11 +133,9 @@ "tm:lunge", "tm:megakick", "tm:payback", - "tm:peck", "tm:pounce", "tm:protect", "tm:psychup", - "tm:quickguard", "tm:rest", "tm:reversal", "tm:roost", @@ -158,8 +152,23 @@ "tm:upperhand", "tm:uturn", "tm:waterpulse", - "tm:wideguard", - "tm:wingattack" + "tutor:aerialace", + "tutor:aircutter", + "tutor:bulkup", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:liquidation", + "tutor:lowkick", + "tutor:rest", + "tutor:roost", + "tutor:skyattack", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:throatchop", + "tutor:waterpulse" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/flittle.json b/common/src/main/resources/data/cobblemon/species/generation9/flittle.json index 3071bc2f64..852d4050bf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/flittle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/flittle.json @@ -93,17 +93,13 @@ "tm:batonpass", "tm:calmmind", "tm:confuseray", - "tm:confusion", "tm:disarmingvoice", "tm:endure", "tm:facade", "tm:foulplay", - "tm:growl", "tm:helpinghand", - "tm:hypnosis", "tm:lightscreen", "tm:mudslap", - "tm:peck", "tm:pluck", "tm:pounce", "tm:protect", @@ -111,7 +107,6 @@ "tm:psychic", "tm:psychicterrain", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:reflect", "tm:rest", @@ -131,7 +126,23 @@ "tm:trickroom", "tm:uproar", "tm:uturn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:mudslap", + "tutor:psychic", + "tutor:rest", + "tutor:roost", + "tutor:seedbomb", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:trick", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/floragato.json b/common/src/main/resources/data/cobblemon/species/generation9/floragato.json index 8d78fc4cfb..bf9ca98c5f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/floragato.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/floragato.json @@ -93,10 +93,8 @@ "tm:aerialace", "tm:agility", "tm:allyswitch", - "tm:bite", "tm:bulletseed", "tm:charm", - "tm:copycat", "tm:disarmingvoice", "tm:endure", "tm:energyball", @@ -110,9 +108,7 @@ "tm:grassyterrain", "tm:helpinghand", "tm:honeclaws", - "tm:leafage", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", @@ -121,25 +117,40 @@ "tm:petalblizzard", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:rest", - "tm:scratch", "tm:seedbomb", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", "tm:suckerpunch", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thunderpunch", "tm:trailblaze", "tm:uturn", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderpunch", + "tutor:worryseed" ], "preEvolution": "sprigatito", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json b/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json index a162967a3b..c88d04a7d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json @@ -72,7 +72,6 @@ "77:painsplit", "84:moonblast", "91:perishsong", - "tm:astonish", "tm:calmmind", "tm:chargebeam", "tm:charm", @@ -92,14 +91,10 @@ "tm:icywind", "tm:imprison", "tm:magicalleaf", - "tm:meanlook", - "tm:memento", "tm:mistyterrain", - "tm:moonblast", "tm:mysticalfire", "tm:nightshade", "tm:painsplit", - "tm:perishsong", "tm:phantomforce", "tm:poltergeist", "tm:powergem", @@ -120,7 +115,27 @@ "tm:thunderbolt", "tm:thunderwave", "tm:trickroom", - "tm:wish" + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icywind", + "tutor:magicalleaf", + "tutor:mysticalfire", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spite", + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json b/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json index 360bef8468..94d6c8d39f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json @@ -71,28 +71,22 @@ "egg:iciclespear", "tm:aquatail", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:crunch", "tm:dig", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:endure", "tm:facade", "tm:focusenergy", - "tm:freezedry", "tm:helpinghand", "tm:icebeam", "tm:icefang", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", - "tm:leer", "tm:outrage", "tm:protect", "tm:raindance", @@ -101,9 +95,19 @@ "tm:snowscape", "tm:substitute", "tm:swordsdance", - "tm:tackle", "tm:takedown", - "tm:terablast" + "tm:terablast", + "tutor:aquatail", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:outrage", + "tutor:rest", + "tutor:sleeptalk" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json b/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json index 5b72d8bc6c..d3aa17a6f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fuecoco.json @@ -81,14 +81,11 @@ "egg:curse", "egg:encore", "egg:slackoff", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:crunch", "tm:curse", "tm:dig", "tm:disarmingvoice", - "tm:ember", "tm:encore", "tm:endure", "tm:facade", @@ -103,7 +100,6 @@ "tm:helpinghand", "tm:hypervoice", "tm:incinerate", - "tm:leer", "tm:mudslap", "tm:outrage", "tm:overheat", @@ -112,20 +108,32 @@ "tm:roar", "tm:round", "tm:seedbomb", - "tm:slackoff", "tm:sleeptalk", "tm:snarl", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", "tm:thunderfang", "tm:willowisp", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:firefang", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json index 1715d9124b..e1b89f6ed9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/garganacl.json @@ -116,14 +116,11 @@ "tm:explosion", "tm:facade", "tm:firepunch", - "tm:fissure", "tm:flashcannon", "tm:fling", "tm:focuspunch", "tm:gigaimpact", "tm:gravity", - "tm:hammerarm", - "tm:harden", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -137,14 +134,11 @@ "tm:powergem", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:saltcure", "tm:sandstorm", "tm:sleeptalk", "tm:smackdown", @@ -153,12 +147,33 @@ "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderpunch", - "tm:wideguard", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderpunch", + "tutor:zenheadbutt" ], "preEvolution": "naclstack", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/gholdengo.json b/common/src/main/resources/data/cobblemon/species/generation9/gholdengo.json index 303309ff3c..dfe0d9bda8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/gholdengo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/gholdengo.json @@ -83,7 +83,6 @@ "56:makeitrain", "63:nastyplot", "70:memento", - "tm:astonish", "tm:chargebeam", "tm:confuseray", "tm:dazzlinggleam", @@ -101,8 +100,6 @@ "tm:lightscreen", "tm:lowkick", "tm:lowsweep", - "tm:makeitrain", - "tm:memento", "tm:metalsound", "tm:nastyplot", "tm:nightshade", @@ -111,7 +108,6 @@ "tm:protect", "tm:psychic", "tm:psyshock", - "tm:recover", "tm:reflect", "tm:rest", "tm:sandstorm", @@ -119,7 +115,6 @@ "tm:sleeptalk", "tm:steelbeam", "tm:substitute", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -127,7 +122,24 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:trick" + "tm:trick", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:lowkick", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick" ], "preEvolution": "gimmighoul", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json b/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json index d287aca427..95e649741e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/gimmighoul.json @@ -80,7 +80,6 @@ "moves": [ "1:astonish", "1:tackle", - "tm:astonish", "tm:confuseray", "tm:endure", "tm:hex", @@ -94,10 +93,12 @@ "tm:shadowball", "tm:sleeptalk", "tm:substitute", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thief" + "tm:thief", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json b/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json index a5174b8a58..33183125c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/glimmet.json @@ -100,7 +100,6 @@ "egg:explosion", "egg:memento", "egg:toxic", - "tm:acidarmor", "tm:acidspray", "tm:ancientpower", "tm:confuseray", @@ -109,10 +108,8 @@ "tm:explosion", "tm:facade", "tm:gunkshot", - "tm:harden", "tm:irondefense", "tm:lightscreen", - "tm:memento", "tm:meteorbeam", "tm:mudshot", "tm:powergem", @@ -123,7 +120,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:sandtomb", @@ -140,7 +136,19 @@ "tm:terablast", "tm:toxic", "tm:toxicspikes", - "tm:venoshock" + "tm:venoshock", + "tutor:ancientpower", + "tutor:dazzlinggleam", + "tutor:gunkshot", + "tutor:irondefense", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json b/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json index c13c88d42b..8f1d589993 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/glimmora.json @@ -101,7 +101,6 @@ "egg:explosion", "egg:memento", "egg:toxic", - "tm:acidarmor", "tm:acidspray", "tm:ancientpower", "tm:confuseray", @@ -114,13 +113,10 @@ "tm:flashcannon", "tm:gigaimpact", "tm:gunkshot", - "tm:harden", "tm:hyperbeam", "tm:irondefense", "tm:lightscreen", - "tm:memento", "tm:meteorbeam", - "tm:mortalspin", "tm:mudshot", "tm:powergem", "tm:protect", @@ -130,7 +126,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:sandtomb", @@ -141,7 +136,6 @@ "tm:smackdown", "tm:solarbeam", "tm:spikes", - "tm:spikyshield", "tm:stealthrock", "tm:stoneedge", "tm:substitute", @@ -149,7 +143,24 @@ "tm:terablast", "tm:toxic", "tm:toxicspikes", - "tm:venoshock" + "tm:venoshock", + "tutor:ancientpower", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:energyball", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge" ], "preEvolution": "glimmet", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json b/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json index 26c83b6b8e..f64607c0e5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json @@ -64,21 +64,16 @@ "84:flareblitz", "91:ragingfury", "tm:ancientpower", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:bulldoze", - "tm:burningbulwark", "tm:crunch", - "tm:crushclaw", "tm:doubleedge", - "tm:doublekick", "tm:dracometeor", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:earthquake", "tm:endure", @@ -92,19 +87,13 @@ "tm:gigaimpact", "tm:heatcrash", "tm:heatwave", - "tm:howl", "tm:hyperbeam", "tm:incinerate", "tm:ironhead", - "tm:lavaplume", - "tm:leer", - "tm:morningsun", - "tm:nobleroar", "tm:outrage", "tm:overheat", "tm:protect", "tm:psychicfangs", - "tm:ragingfury", "tm:rest", "tm:reversal", "tm:roar", @@ -114,7 +103,6 @@ "tm:sleeptalk", "tm:smartstrike", "tm:snarl", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", @@ -123,7 +111,27 @@ "tm:temperflare", "tm:terablast", "tm:thunderfang", - "tm:weatherball" + "tm:weatherball", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:ironhead", + "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderfang" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json b/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json index f4b9c72d0c..fd81c2ef4e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/grafaiai.json @@ -95,33 +95,25 @@ "tm:acidspray", "tm:acrobatics", "tm:batonpass", - "tm:bite", - "tm:copycat", "tm:crosspoison", "tm:dig", - "tm:doodle", "tm:doubleedge", "tm:encore", "tm:endeavor", "tm:endure", "tm:facade", - "tm:flatter", "tm:fling", "tm:foulplay", - "tm:furyswipes", "tm:gigaimpact", "tm:gunkshot", "tm:helpinghand", "tm:knockoff", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:metronome", "tm:mudshot", "tm:mudslap", "tm:nastyplot", - "tm:partingshot", - "tm:poisonfang", "tm:poisonjab", "tm:poisontail", "tm:pounce", @@ -130,10 +122,8 @@ "tm:raindance", "tm:rest", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -141,7 +131,6 @@ "tm:sunnyday", "tm:superfang", "tm:swagger", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -152,7 +141,24 @@ "tm:trailblaze", "tm:uturn", "tm:venoshock", - "tm:xscissor" + "tm:xscissor", + "tutor:endeavor", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:lowkick", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:superfang", + "tutor:throatchop", + "tutor:xscissor" ], "preEvolution": "shroodle", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json b/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json index 4e9d6027a6..04bde2383a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json @@ -66,7 +66,6 @@ "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", @@ -77,11 +76,8 @@ "tm:firefang", "tm:flashcannon", "tm:gigaimpact", - "tm:headlongrush", - "tm:headsmash", "tm:heavyslam", "tm:highhorsepower", - "tm:hornattack", "tm:hyperbeam", "tm:icefang", "tm:icespinner", @@ -93,7 +89,6 @@ "tm:playrough", "tm:protect", "tm:psyshock", - "tm:rapidspin", "tm:rest", "tm:reversal", "tm:roar", @@ -117,7 +112,32 @@ "tm:terablast", "tm:throatchop", "tm:thunderfang", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:firefang", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:ironhead", + "tutor:knockoff", + "tutor:megahorn", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/greavard.json b/common/src/main/resources/data/cobblemon/species/generation9/greavard.json index c1d5e80870..ea1c6ff36a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/greavard.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/greavard.json @@ -85,27 +85,20 @@ "egg:shadowsneak", "egg:yawn", "tm:allyswitch", - "tm:bite", "tm:bulldoze", "tm:charm", "tm:confuseray", "tm:crunch", - "tm:destinybond", "tm:dig", - "tm:disable", "tm:doubleedge", "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:hex", - "tm:howl", "tm:icefang", - "tm:lick", - "tm:memento", "tm:mudshot", "tm:mudslap", "tm:nightshade", @@ -121,21 +114,36 @@ "tm:sandstorm", "tm:scaryface", "tm:shadowball", - "tm:shadowsneak", "tm:sleeptalk", "tm:snarl", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:thunderfang", "tm:trick", "tm:uproar", - "tm:yawn" + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:firefang", + "tutor:helpinghand", + "tutor:icefang", + "tutor:mudslap", + "tutor:painsplit", + "tutor:playrough", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang", + "tutor:trick", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json b/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json index 113859046c..ff6389bca8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json @@ -82,31 +82,23 @@ "egg:shadowsneak", "egg:yawn", "tm:allyswitch", - "tm:bite", "tm:bodypress", "tm:bulldoze", "tm:charm", "tm:confuseray", "tm:crunch", - "tm:destinybond", "tm:dig", - "tm:disable", "tm:doubleedge", "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:helpinghand", "tm:hex", - "tm:howl", "tm:hyperbeam", "tm:icefang", - "tm:lastrespects", - "tm:lick", - "tm:memento", "tm:mudshot", "tm:mudslap", "tm:nightshade", @@ -122,14 +114,11 @@ "tm:sandstorm", "tm:scaryface", "tm:shadowball", - "tm:shadowsneak", "tm:sleeptalk", "tm:snarl", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", @@ -137,7 +126,27 @@ "tm:trick", "tm:uproar", "tm:willowisp", - "tm:yawn" + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:mudslap", + "tutor:painsplit", + "tutor:playrough", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang", + "tutor:trick", + "tutor:uproar" ], "preEvolution": "greavard", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json b/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json index c4768a0a1c..9df6371f3b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json @@ -67,18 +67,14 @@ "egg:recycle", "egg:rollout", "egg:suckerpunch", - "tm:astonish", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", "tm:bugbite", "tm:bulletseed", "tm:curse", - "tm:defensecurl", "tm:doubleedge", - "tm:doublehit", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonpulse", "tm:dragontail", @@ -87,13 +83,11 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:ficklebeam", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:gyroball", "tm:heavyslam", "tm:hydropump", @@ -108,7 +102,6 @@ "tm:powerwhip", "tm:protect", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -119,13 +112,27 @@ "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:sweetscent", - "tm:syrupbomb", "tm:takedown", "tm:terablast", "tm:uproar", - "tm:withdraw", - "tm:yawn" + "tutor:bugbite", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:outrage", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:uproar" ], "preEvolution": "dipplin", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json b/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json index 4de8c7843b..58f7851a8f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json @@ -67,36 +67,27 @@ "tm:brickbreak", "tm:bulldoze", "tm:closecombat", - "tm:counter", "tm:doubleedge", "tm:earthquake", "tm:electricterrain", "tm:endure", "tm:facade", "tm:gigaimpact", - "tm:hornattack", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:megahorn", "tm:meteorbeam", - "tm:mightycleave", "tm:poisonjab", "tm:protect", "tm:psychic", "tm:psychocut", "tm:psyshock", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:rockblast", - "tm:rockthrow", "tm:rocktomb", - "tm:sacredsword", "tm:sandstorm", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:solarblade", "tm:stoneedge", @@ -108,7 +99,25 @@ "tm:throatchop", "tm:wildcharge", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulldoze", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:megahorn", + "tutor:meteorbeam", + "tutor:poisonjab", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stoneedge", + "tutor:throatchop", + "tutor:wildcharge", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json b/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json index dd08e952fd..6d5452a1fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json @@ -66,14 +66,12 @@ "tm:blizzard", "tm:bodyslam", "tm:chillingwater", - "tm:drillpeck", "tm:electricterrain", "tm:encore", "tm:endure", "tm:facade", "tm:fling", "tm:flipturn", - "tm:freezedry", "tm:gigaimpact", "tm:helpinghand", "tm:hydropump", @@ -83,8 +81,6 @@ "tm:icespinner", "tm:icywind", "tm:playrough", - "tm:powdersnow", - "tm:present", "tm:protect", "tm:raindance", "tm:rest", @@ -98,7 +94,20 @@ "tm:thief", "tm:uturn", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:aircutter", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpulse" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json b/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json index 274ca9f086..2900de6c72 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json @@ -66,7 +66,6 @@ "tm:brickbreak", "tm:bulldoze", "tm:calmmind", - "tm:confusion", "tm:doubleedge", "tm:electricterrain", "tm:endure", @@ -81,8 +80,6 @@ "tm:hyperbeam", "tm:irondefense", "tm:ironhead", - "tm:leer", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:protect", @@ -90,11 +87,8 @@ "tm:psychicnoise", "tm:psychocut", "tm:psyshock", - "tm:quickguard", "tm:rest", - "tm:sacredsword", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:solarblade", @@ -103,12 +97,27 @@ "tm:substitute", "tm:supercellslam", "tm:swordsdance", - "tm:tachyoncutter", "tm:takedown", "tm:terablast", "tm:voltswitch", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:expandingforce", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:sleeptalk", + "tutor:steelbeam", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json b/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json index a670d497af..fff4b78fea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json @@ -61,28 +61,23 @@ "77:heavyslam", "84:bellydrum", "91:focuspunch", - "tm:armthrust", - "tm:bellydrum", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:charge", "tm:closecombat", - "tm:detect", "tm:doubleedge", "tm:drainpunch", "tm:earthquake", "tm:electricterrain", "tm:endure", "tm:facade", - "tm:fakeout", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:forcepalm", "tm:gigaimpact", "tm:hardpress", "tm:heavyslam", @@ -99,24 +94,38 @@ "tm:reversal", "tm:rockslide", "tm:rocktomb", - "tm:sandattack", "tm:scaryface", - "tm:seismictoss", - "tm:slam", "tm:sleeptalk", "tm:stompingtantrum", "tm:substitute", "tm:supercellslam", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:voltswitch", - "tm:whirlwind", - "tm:wildcharge" + "tm:wildcharge", + "tutor:bulldoze", + "tutor:drainpunch", + "tutor:firepunch", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lowkick", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json b/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json index 79a852d5d1..3cdbaa4876 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json @@ -69,7 +69,6 @@ "tm:crunch", "tm:darkpulse", "tm:doubleedge", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonpulse", "tm:dragontail", @@ -115,7 +114,32 @@ "tm:triattack", "tm:uturn", "tm:workup", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aircutter", + "tutor:chargebeam", + "tutor:darkpulse", + "tutor:dragonpulse", + "tutor:dualwingbeat", + "tutor:earthpower", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:knockoff", + "tutor:lashout", + "tutor:meteorbeam", + "tutor:outrage", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:tailwind", + "tutor:throatchop", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json b/common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json index 01defd7176..4025c13bf1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json @@ -101,21 +101,15 @@ "tm:irondefense", "tm:leafblade", "tm:leafstorm", - "tm:leer", "tm:magicalleaf", "tm:megahorn", "tm:metalsound", - "tm:nightslash", "tm:protect", - "tm:psyblade", "tm:psychicterrain", "tm:quash", - "tm:quickattack", - "tm:quickguard", "tm:rest", "tm:retaliate", "tm:reversal", - "tm:sacredsword", "tm:scaryface", "tm:sleeptalk", "tm:smartstrike", @@ -131,7 +125,28 @@ "tm:trailblaze", "tm:wildcharge", "tm:workup", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:calmmind", + "tutor:coaching", + "tutor:energyball", + "tutor:falseswipe", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:magicalleaf", + "tutor:megahorn", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:wildcharge", + "tutor:xscissor" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json b/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json index 33dda1b304..c914b9c156 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json @@ -69,13 +69,10 @@ "tm:chargebeam", "tm:confuseray", "tm:dazzlinggleam", - "tm:discharge", "tm:electricterrain", - "tm:ember", "tm:endure", "tm:energyball", "tm:facade", - "tm:fierydance", "tm:fireblast", "tm:firespin", "tm:flamecharge", @@ -83,7 +80,6 @@ "tm:flareblitz", "tm:flashcannon", "tm:gigaimpact", - "tm:gust", "tm:heatwave", "tm:helpinghand", "tm:hurricane", @@ -92,7 +88,6 @@ "tm:lunge", "tm:metalsound", "tm:meteorbeam", - "tm:morningsun", "tm:overheat", "tm:pounce", "tm:protect", @@ -112,7 +107,21 @@ "tm:toxicspikes", "tm:uturn", "tm:venoshock", - "tm:whirlwind" + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:meteorbeam", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:swift" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json b/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json index 10c4c2683f..bf2be5895d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json @@ -61,7 +61,6 @@ "77:stealthrock", "84:stoneedge", "91:gigaimpact", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -110,7 +109,6 @@ "tm:rest", "tm:rockblast", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:sandtomb", @@ -136,7 +134,36 @@ "tm:thunderpunch", "tm:thunderwave", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:earthpower", + "tutor:electroweb", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json b/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json index b91fb45845..8fc2c6b26d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json @@ -62,7 +62,6 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", - "tm:defensecurl", "tm:doubleedge", "tm:earthpower", "tm:earthquake", @@ -76,7 +75,6 @@ "tm:hardpress", "tm:heavyslam", "tm:highhorsepower", - "tm:hornattack", "tm:hyperbeam", "tm:icefang", "tm:icespinner", @@ -88,7 +86,6 @@ "tm:mudshot", "tm:mudslap", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockslide", "tm:rocktomb", @@ -110,7 +107,32 @@ "tm:thunderfang", "tm:voltswitch", "tm:wildcharge", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:irondefense", + "tutor:ironhead", + "tutor:knockoff", + "tutor:megahorn", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rollout", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:steelroller", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderfang", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json b/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json index 8aa0d57af5..2d55c7e0c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json @@ -72,8 +72,6 @@ "tm:coaching", "tm:confuseray", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:doubleteam", "tm:drainpunch", "tm:electricterrain", @@ -82,7 +80,6 @@ "tm:energyball", "tm:expandingforce", "tm:falseswipe", - "tm:feint", "tm:firepunch", "tm:fling", "tm:focusblast", @@ -94,7 +91,6 @@ "tm:hex", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:imprison", @@ -106,8 +102,6 @@ "tm:magicalleaf", "tm:metronome", "tm:mistyterrain", - "tm:moonblast", - "tm:nightslash", "tm:poisonjab", "tm:protect", "tm:psybeam", @@ -116,16 +110,13 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:quickguard", "tm:reflect", "tm:rest", "tm:reversal", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:skillswap", "tm:sleeptalk", - "tm:spiritbreak", "tm:storedpower", "tm:substitute", "tm:swift", @@ -139,9 +130,45 @@ "tm:trick", "tm:trickroom", "tm:vacuumwave", - "tm:wideguard", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:coaching", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", + "tutor:expandingforce", + "tutor:falseswipe", + "tutor:firepunch", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icepunch", + "tutor:icywind", + "tutor:knockoff", + "tutor:liquidation", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:poisonjab", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:trick", + "tutor:vacuumwave", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json b/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json index f91f10f9a8..db6cfee0ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json @@ -112,7 +112,6 @@ "tm:bravebird", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:dualwingbeat", "tm:eerieimpulse", "tm:electricterrain", @@ -124,36 +123,44 @@ "tm:featherdance", "tm:fly", "tm:gigaimpact", - "tm:growl", "tm:hurricane", "tm:hyperbeam", - "tm:peck", "tm:pluck", "tm:protect", - "tm:quickattack", "tm:rest", "tm:roost", "tm:scaryface", "tm:sleeptalk", - "tm:spark", - "tm:spitup", - "tm:stockpile", "tm:substitute", "tm:supercellslam", - "tm:swallow", "tm:swift", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:uproar", "tm:uturn", "tm:voltswitch", "tm:weatherball", - "tm:wildcharge" + "tm:wildcharge", + "tutor:aerialace", + "tutor:aircutter", + "tutor:chargebeam", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge" ], "preEvolution": "wattrel", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json index 90f98ecef3..da7d9562d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json @@ -89,7 +89,6 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", "tm:flashcannon", "tm:fling", "tm:focusblast", @@ -97,25 +96,17 @@ "tm:furycutter", "tm:gigaimpact", "tm:grassknot", - "tm:guillotine", "tm:headbutt", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", - "tm:kowtowcleave", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:meanlook", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", - "tm:nightslash", "tm:poisonjab", "tm:protect", - "tm:pursuit", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -123,9 +114,7 @@ "tm:rocktomb", "tm:sandstorm", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:spite", @@ -143,7 +132,32 @@ "tm:thunderwave", "tm:torment", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:darkpulse", + "tutor:falseswipe", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:furycutter", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lashout", + "tutor:lowkick", + "tutor:poisonjab", + "tutor:rest", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:xscissor", + "tutor:zenheadbutt" ], "preEvolution": "bisharp", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/klawf.json b/common/src/main/resources/data/cobblemon/species/generation9/klawf.json index 8959f911a1..5e76b56098 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/klawf.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/klawf.json @@ -91,17 +91,13 @@ "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:crabhammer", "tm:dig", "tm:earthpower", "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:fling", "tm:gigaimpact", - "tm:guillotine", - "tm:harden", "tm:helpinghand", "tm:highhorsepower", "tm:hyperbeam", @@ -119,7 +115,6 @@ "tm:rockblast", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:scaryface", @@ -139,8 +134,30 @@ "tm:thief", "tm:throatchop", "tm:trailblaze", - "tm:visegrip", - "tm:xscissor" + "tm:xscissor", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:endeavor", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:knockoff", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:throatchop", + "tutor:xscissor" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json b/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json index 5971bce9ea..6f9f857b29 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json @@ -70,8 +70,6 @@ "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:collisioncourse", - "tm:counter", "tm:crunch", "tm:dig", "tm:doubleedge", @@ -131,7 +129,38 @@ "tm:uproar", "tm:uturn", "tm:wildcharge", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:drainpunch", + "tutor:dualwingbeat", + "tutor:firefang", + "tutor:flamethrower", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:ironhead", + "tutor:lowkick", + "tutor:meteorbeam", + "tutor:mudslap", + "tutor:outrage", + "tutor:rest", + "tutor:rocksmash", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang", + "tutor:uproar", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json b/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json index 943c62291f..bb55028057 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/lechonk.json @@ -117,23 +117,30 @@ "tm:rest", "tm:seedbomb", "tm:sleeptalk", - "tm:spitup", - "tm:stockpile", - "tm:stuffcheeks", "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:swallow", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", "tm:uproar", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:covet", + "tutor:endeavor", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json index 50f0ee1896..67de828b2d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json @@ -75,27 +75,19 @@ "tm:aerialace", "tm:agility", "tm:assurance", - "tm:astonish", - "tm:axekick", "tm:bounce", "tm:brickbreak", "tm:bugbite", "tm:bugbuzz", - "tm:counter", "tm:darkpulse", - "tm:detect", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:facade", - "tm:feint", - "tm:firstimpression", "tm:fling", "tm:gigaimpact", "tm:knockoff", "tm:lashout", "tm:leechlife", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:lunge", @@ -114,7 +106,6 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -122,7 +113,23 @@ "tm:throatchop", "tm:trailblaze", "tm:uturn", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:bounce", + "tutor:bugbite", + "tutor:darkpulse", + "tutor:gigaimpact", + "tutor:knockoff", + "tutor:lashout", + "tutor:leechlife", + "tutor:lowkick", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spite", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:xscissor" ], "preEvolution": "nymble", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json index 19ecd771e2..e6ea097824 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/mabosstiff.json @@ -87,14 +87,11 @@ "egg:endeavor", "egg:playrough", "egg:retaliate", - "tm:bite", "tm:bodyslam", "tm:charm", - "tm:comeuppance", "tm:crunch", "tm:curse", "tm:darkpulse", - "tm:destinybond", "tm:dig", "tm:doubleedge", "tm:endeavor", @@ -109,10 +106,7 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icefang", - "tm:jawlock", "tm:lashout", - "tm:leer", - "tm:lick", "tm:outrage", "tm:painsplit", "tm:payback", @@ -131,14 +125,32 @@ "tm:substitute", "tm:sunnyday", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:thunderfang", "tm:trailblaze", - "tm:wildcharge" + "tm:wildcharge", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icefang", + "tutor:lashout", + "tutor:outrage", + "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:thunderfang", + "tutor:wildcharge" ], "preEvolution": "maschiff", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json b/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json index 2bdd1b2854..5486a077b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/maschiff.json @@ -85,12 +85,10 @@ "egg:endeavor", "egg:playrough", "egg:retaliate", - "tm:bite", "tm:bodyslam", "tm:charm", "tm:crunch", "tm:darkpulse", - "tm:destinybond", "tm:dig", "tm:doubleedge", "tm:endeavor", @@ -102,10 +100,7 @@ "tm:helpinghand", "tm:honeclaws", "tm:icefang", - "tm:jawlock", "tm:lashout", - "tm:leer", - "tm:lick", "tm:payback", "tm:playrough", "tm:protect", @@ -121,13 +116,24 @@ "tm:substitute", "tm:sunnyday", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:thunderfang", - "tm:trailblaze" + "tm:trailblaze", + "tutor:darkpulse", + "tutor:endeavor", + "tutor:firefang", + "tutor:helpinghand", + "tutor:icefang", + "tutor:lashout", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:thunderfang" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json index ec79cd6934..ade56506c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/maushold.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/maushold.json @@ -99,22 +99,17 @@ "tm:babydolleyes", "tm:batonpass", "tm:beatup", - "tm:bite", "tm:bulletseed", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:crunch", "tm:dig", "tm:doubleedge", - "tm:doublehit", "tm:echoedvoice", "tm:encore", "tm:endure", "tm:facade", "tm:faketears", - "tm:feint", - "tm:followme", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", @@ -125,8 +120,6 @@ "tm:mudshot", "tm:mudslap", "tm:playrough", - "tm:populationbomb", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", @@ -137,17 +130,31 @@ "tm:sunnyday", "tm:superfang", "tm:swift", - "tm:switcheroo", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:thunderwave", - "tm:tickle", - "tm:tidyup", "tm:trailblaze", "tm:uturn", - "tm:waterpulse" + "tm:waterpulse", + "tutor:aerialace", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:lowkick", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:waterpulse" ], "preEvolution": "tandemaus", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json b/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json index 9b7e46170f..452d4fc3d8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json @@ -101,12 +101,10 @@ "tm:agility", "tm:allyswitch", "tm:aurasphere", - "tm:bite", "tm:brickbreak", "tm:bulletseed", "tm:charm", "tm:chillingwater", - "tm:copycat", "tm:darkpulse", "tm:disarmingvoice", "tm:doubleteam", @@ -115,7 +113,6 @@ "tm:facade", "tm:faketears", "tm:fling", - "tm:flowertrick", "tm:foulplay", "tm:frenzyplant", "tm:gigadrain", @@ -129,36 +126,29 @@ "tm:hyperbeam", "tm:knockoff", "tm:lashout", - "tm:leafage", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", "tm:mudslap", "tm:nastyplot", - "tm:nightslash", "tm:petalblizzard", "tm:playrough", "tm:pollenpuff", "tm:powergem", "tm:protect", "tm:psychup", - "tm:quickattack", "tm:rest", - "tm:scratch", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", "tm:skillswap", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:spikes", "tm:substitute", "tm:suckerpunch", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -171,7 +161,39 @@ "tm:trickroom", "tm:tripleaxel", "tm:uturn", - "tm:worryseed" + "tm:worryseed", + "tutor:aerialace", + "tutor:allyswitch", + "tutor:darkpulse", + "tutor:energyball", + "tutor:foulplay", + "tutor:frenzyplant", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderpunch", + "tutor:trick", + "tutor:tripleaxel", + "tutor:worryseed" ], "preEvolution": "floragato", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json b/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json index 343d1a81fb..86ce243b08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json @@ -69,9 +69,7 @@ "tm:confuseray", "tm:crunch", "tm:dazzlinggleam", - "tm:discharge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", @@ -79,7 +77,6 @@ "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", - "tm:electrodrift", "tm:endure", "tm:facade", "tm:flashcannon", @@ -89,10 +86,8 @@ "tm:hyperbeam", "tm:lightscreen", "tm:metalsound", - "tm:mirrorcoat", "tm:outrage", "tm:overheat", - "tm:paraboliccharge", "tm:powergem", "tm:protect", "tm:reflect", @@ -110,12 +105,28 @@ "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:uturn", "tm:voltswitch", "tm:wildcharge", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:outrage", + "tutor:rest", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json b/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json index 1a409f599a..9af88cc1ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json @@ -59,13 +59,9 @@ "tm:acidspray", "tm:batonpass", "tm:calmmind", - "tm:clearsmog", "tm:confuseray", - "tm:confusion", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:flatter", "tm:fling", "tm:focusblast", "tm:futuresight", @@ -82,7 +78,6 @@ "tm:mudslap", "tm:nastyplot", "tm:nightshade", - "tm:partingshot", "tm:poisonjab", "tm:poltergeist", "tm:protect", @@ -93,7 +88,6 @@ "tm:psychup", "tm:psyshock", "tm:rest", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", @@ -111,7 +105,26 @@ "tm:trick", "tm:uproar", "tm:uturn", - "tm:venoshock" + "tm:venoshock", + "tutor:calmmind", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:lashout", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite", + "tutor:swift", + "tutor:trick", + "tutor:uproar" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/nacli.json b/common/src/main/resources/data/cobblemon/species/generation9/nacli.json index 188cf4416b..3a3d0988c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/nacli.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/nacli.json @@ -104,9 +104,7 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", "tm:flashcannon", - "tm:harden", "tm:headbutt", "tm:heavyslam", "tm:helpinghand", @@ -117,11 +115,9 @@ "tm:powergem", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:sandstorm", "tm:sleeptalk", "tm:smackdown", @@ -130,10 +126,24 @@ "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:helpinghand", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json index 42af25252e..de2c14f9a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/naclstack.json @@ -107,10 +107,8 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", "tm:flashcannon", "tm:gigaimpact", - "tm:harden", "tm:headbutt", "tm:heavyslam", "tm:helpinghand", @@ -122,12 +120,9 @@ "tm:powergem", "tm:protect", "tm:raindance", - "tm:recover", "tm:rest", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", - "tm:saltcure", "tm:sandstorm", "tm:sleeptalk", "tm:smackdown", @@ -136,10 +131,26 @@ "tm:stoneedge", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:zenheadbutt" ], "preEvolution": "nacli", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/nymble.json b/common/src/main/resources/data/cobblemon/species/generation9/nymble.json index edee6d9c57..0706810b65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/nymble.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/nymble.json @@ -67,17 +67,11 @@ "egg:skittersmack", "tm:agility", "tm:assurance", - "tm:astonish", "tm:bugbite", "tm:bugbuzz", - "tm:counter", - "tm:doublekick", "tm:endure", "tm:facade", - "tm:feint", - "tm:firstimpression", "tm:leechlife", - "tm:leer", "tm:pounce", "tm:protect", "tm:raindance", @@ -89,13 +83,19 @@ "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", "tm:uturn", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:leechlife", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json b/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json index 61093c318e..006593010d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json @@ -66,8 +66,6 @@ "tm:brickbreak", "tm:bulletseed", "tm:charm", - "tm:counter", - "tm:doublekick", "tm:encore", "tm:endure", "tm:energyball", @@ -75,27 +73,21 @@ "tm:falseswipe", "tm:fling", "tm:focusenergy", - "tm:followme", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", - "tm:hornleech", - "tm:ivycudgel", "tm:knockoff", "tm:lashout", "tm:leafstorm", - "tm:leechseed", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", "tm:playrough", "tm:powerwhip", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -104,12 +96,10 @@ "tm:sandstorm", "tm:scaryface", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", "tm:spikes", - "tm:spikyshield", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", @@ -122,9 +112,28 @@ "tm:throatchop", "tm:trailblaze", "tm:uturn", - "tm:vinewhip", - "tm:woodhammer", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:energyball", + "tutor:falseswipe", + "tutor:focusenergy", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:synthesis", + "tutor:throatchop", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json index bb89a34850..6185ea7164 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json @@ -84,7 +84,6 @@ "egg:stockpile", "egg:stuffcheeks", "egg:swallow", - "tm:belch", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -117,24 +116,38 @@ "tm:rest", "tm:seedbomb", "tm:sleeptalk", - "tm:spitup", - "tm:stockpile", "tm:stompingtantrum", - "tm:stuffcheeks", "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:swallow", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", "tm:uproar", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:covet", + "tutor:earthpower", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:lashout", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "lechonk", "evolutions": [], @@ -188,7 +201,6 @@ "egg:stockpile", "egg:stuffcheeks", "egg:swallow", - "tm:belch", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -221,24 +233,38 @@ "tm:rest", "tm:seedbomb", "tm:sleeptalk", - "tm:spitup", - "tm:stockpile", "tm:stompingtantrum", - "tm:stuffcheeks", "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:swallow", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:terablast", "tm:thief", "tm:trailblaze", "tm:uproar", "tm:workup", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:covet", + "tutor:earthpower", + "tutor:endeavor", + "tutor:energyball", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:lashout", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "lechonk", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json b/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json index ea92ebbc76..099b05ce6f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json @@ -55,14 +55,12 @@ "56:crunch", "64:superpower", "72:gigaimpact", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", "tm:closecombat", - "tm:counter", "tm:crunch", "tm:curse", "tm:dig", @@ -75,12 +73,10 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:forcepalm", "tm:gigaimpact", "tm:gunkshot", "tm:hardpress", "tm:highhorsepower", - "tm:howl", "tm:hyperbeam", "tm:icefang", "tm:icepunch", @@ -91,7 +87,6 @@ "tm:lowsweep", "tm:metalclaw", "tm:outrage", - "tm:poisonfang", "tm:poisonjab", "tm:poisontail", "tm:protect", @@ -119,7 +114,37 @@ "tm:thunderpunch", "tm:toxic", "tm:upperhand", - "tm:uproar" + "tm:uproar", + "tutor:bulkup", + "tutor:drainpunch", + "tutor:firefang", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:ironhead", + "tutor:knockoff", + "tutor:lashout", + "tutor:lowkick", + "tutor:outrage", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json b/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json index f054a0f366..aa3704074e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json @@ -74,7 +74,6 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", - "tm:coil", "tm:curse", "tm:dig", "tm:doubleedge", @@ -84,7 +83,6 @@ "tm:facade", "tm:flashcannon", "tm:gigaimpact", - "tm:harden", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", @@ -92,7 +90,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:metalburst", "tm:metalsound", "tm:mudshot", "tm:mudslap", @@ -103,7 +100,6 @@ "tm:rocktomb", "tm:sandstorm", "tm:sandtomb", - "tm:shedtail", "tm:sleeptalk", "tm:smackdown", "tm:spikes", @@ -111,10 +107,26 @@ "tm:steelbeam", "tm:stompingtantrum", "tm:substitute", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:wrap" + "tutor:bulldoze", + "tutor:earthpower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stompingtantrum" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/palafin.json b/common/src/main/resources/data/cobblemon/species/generation9/palafin.json index e466111c71..f437031207 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/palafin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/palafin.json @@ -98,22 +98,17 @@ "egg:tickle", "tm:acrobatics", "tm:agility", - "tm:aquajet", "tm:aquatail", - "tm:astonish", "tm:aurasphere", "tm:blizzard", "tm:bodyslam", - "tm:boomburst", "tm:bounce", "tm:bulkup", "tm:charm", "tm:chillingwater", "tm:closecombat", - "tm:counter", "tm:disarmingvoice", "tm:dive", - "tm:doublehit", "tm:drainingkiss", "tm:drainpunch", "tm:encore", @@ -137,9 +132,7 @@ "tm:icepunch", "tm:icywind", "tm:ironhead", - "tm:jetpunch", "tm:liquidation", - "tm:mist", "tm:outrage", "tm:protect", "tm:psychup", @@ -148,20 +141,41 @@ "tm:reversal", "tm:sleeptalk", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:takedown", "tm:taunt", "tm:terablast", "tm:throatchop", - "tm:tickle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:wavecrash", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulkup", + "tutor:dive", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:ironhead", + "tutor:liquidation", + "tutor:outrage", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "preEvolution": "finizen", "evolutions": [], @@ -229,9 +243,7 @@ "61:wavecrash", "tm:acrobatics", "tm:agility", - "tm:aquajet", "tm:aquatail", - "tm:astonish", "tm:aurasphere", "tm:blizzard", "tm:bodyslam", @@ -244,7 +256,6 @@ "tm:counter", "tm:disarmingvoice", "tm:dive", - "tm:doublehit", "tm:drainingkiss", "tm:drainpunch", "tm:encore", @@ -268,9 +279,7 @@ "tm:icepunch", "tm:icywind", "tm:ironhead", - "tm:jetpunch", "tm:liquidation", - "tm:mist", "tm:outrage", "tm:protect", "tm:psychup", @@ -279,7 +288,6 @@ "tm:reversal", "tm:sleeptalk", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:takedown", @@ -288,11 +296,34 @@ "tm:throatchop", "tm:tickle", "tm:waterfall", - "tm:watergun", "tm:waterpulse", - "tm:wavecrash", "tm:whirlpool", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aquatail", + "tutor:bounce", + "tutor:bulkup", + "tutor:dive", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icepunch", + "tutor:icywind", + "tutor:ironhead", + "tutor:liquidation", + "tutor:outrage", + "tutor:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [], "battleOnly": true diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json index 83689543bf..65b29048b8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json @@ -72,41 +72,29 @@ "egg:wish", "tm:agility", "tm:batonpass", - "tm:bite", "tm:charge", "tm:chargebeam", "tm:charm", "tm:crunch", "tm:dig", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:encore", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:fakeout", "tm:fling", - "tm:growl", "tm:helpinghand", - "tm:machpunch", "tm:metalclaw", - "tm:nuzzle", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", - "tm:scratch", - "tm:slam", "tm:sleeptalk", - "tm:spark", "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:sweetkiss", "tm:swift", "tm:takedown", "tm:terablast", @@ -114,11 +102,20 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderfang", - "tm:thundershock", "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tm:wish" + "tutor:chargebeam", + "tutor:electroweb", + "tutor:helpinghand", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json index 24f97cdfad..08ab128558 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json @@ -73,48 +73,35 @@ "egg:sweetkiss", "egg:wish", "tm:agility", - "tm:armthrust", "tm:batonpass", - "tm:bite", "tm:charge", "tm:chargebeam", "tm:charm", "tm:coaching", "tm:crunch", "tm:dig", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:encore", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:fakeout", "tm:fling", "tm:focuspunch", - "tm:growl", "tm:helpinghand", "tm:knockoff", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:metalclaw", - "tm:nuzzle", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", - "tm:scratch", - "tm:slam", "tm:sleeptalk", - "tm:spark", "tm:substitute", "tm:sunnyday", "tm:superfang", - "tm:sweetkiss", "tm:swift", "tm:takedown", "tm:terablast", @@ -123,12 +110,26 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:upperhand", "tm:voltswitch", "tm:wildcharge", - "tm:wish" + "tutor:chargebeam", + "tutor:coaching", + "tutor:electroweb", + "tutor:focuspunch", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:lowkick", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:wildcharge" ], "preEvolution": "pawmi", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json index 3119b64931..2696222575 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json @@ -76,9 +76,7 @@ "egg:sweetkiss", "egg:wish", "tm:agility", - "tm:armthrust", "tm:batonpass", - "tm:bite", "tm:bodypress", "tm:brickbreak", "tm:bulkup", @@ -89,52 +87,39 @@ "tm:coaching", "tm:crunch", "tm:dig", - "tm:discharge", "tm:doubleedge", - "tm:doubleshock", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:encore", "tm:endure", - "tm:entrainment", "tm:facade", - "tm:fakeout", "tm:firepunch", "tm:fling", "tm:focusblast", "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", "tm:knockoff", "tm:lowkick", "tm:lowsweep", - "tm:machpunch", "tm:metalclaw", "tm:metronome", - "tm:nuzzle", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", - "tm:revivalblessing", "tm:rocktomb", - "tm:scratch", "tm:seedbomb", - "tm:slam", "tm:sleeptalk", - "tm:spark", "tm:substitute", "tm:sunnyday", "tm:supercellslam", "tm:superfang", - "tm:sweetkiss", "tm:swift", "tm:takedown", "tm:terablast", @@ -144,12 +129,33 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:upperhand", "tm:voltswitch", "tm:wildcharge", - "tm:wish" + "tutor:bulkup", + "tutor:chargebeam", + "tutor:coaching", + "tutor:electroweb", + "tutor:firepunch", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icepunch", + "tutor:knockoff", + "tutor:lowkick", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:throatchop", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:wildcharge" ], "preEvolution": "pawmo", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json index ce9b09f063..602864ce67 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json @@ -60,40 +60,38 @@ "64:nastyplot", "72:recover", "tm:acidspray", - "tm:astonish", "tm:curse", - "tm:defensecurl", - "tm:destinybond", "tm:endure", "tm:faketears", "tm:foulplay", "tm:gunkshot", "tm:hex", "tm:imprison", - "tm:malignantchain", - "tm:meanlook", - "tm:memento", "tm:nastyplot", "tm:nightshade", - "tm:partingshot", "tm:phantomforce", - "tm:poisongas", "tm:poltergeist", "tm:protect", - "tm:recover", "tm:rest", "tm:rollout", "tm:shadowball", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", "tm:spite", "tm:substitute", "tm:terablast", "tm:toxic", "tm:venoshock", - "tm:withdraw" + "tutor:foulplay", + "tutor:gunkshot", + "tutor:poltergeist", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json b/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json index f994432068..df8e09de1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json @@ -67,8 +67,6 @@ "48:shadowball", "54:memento", "60:leafstorm", - "tm:absorb", - "tm:astonish", "tm:calmmind", "tm:curse", "tm:endure", @@ -80,10 +78,7 @@ "tm:imprison", "tm:irondefense", "tm:leafstorm", - "tm:lifedew", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:painsplit", @@ -91,7 +86,6 @@ "tm:poltergeist", "tm:protect", "tm:psychup", - "tm:ragepowder", "tm:reflect", "tm:rest", "tm:scald", @@ -99,12 +93,24 @@ "tm:sleeptalk", "tm:solarbeam", "tm:spite", - "tm:stunspore", "tm:substitute", "tm:terablast", "tm:trickroom", "tm:uproar", - "tm:withdraw" + "tutor:calmmind", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:irondefense", + "tutor:magicalleaf", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spite", + "tutor:trick", + "tutor:uproar" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json b/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json index 129f6776a5..854827bc29 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json @@ -102,9 +102,6 @@ "tm:agility", "tm:aircutter", "tm:airslash", - "tm:aquacutter", - "tm:aquajet", - "tm:aquastep", "tm:batonpass", "tm:bravebird", "tm:brickbreak", @@ -112,10 +109,7 @@ "tm:chillingwater", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:detect", "tm:disarmingvoice", - "tm:doublehit", "tm:encore", "tm:endeavor", "tm:endure", @@ -125,7 +119,6 @@ "tm:flipturn", "tm:focusenergy", "tm:gigaimpact", - "tm:growl", "tm:helpinghand", "tm:hurricane", "tm:hydrocannon", @@ -140,11 +133,9 @@ "tm:lowsweep", "tm:megakick", "tm:mistyterrain", - "tm:pound", "tm:protect", "tm:psychup", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:reversal", "tm:roost", @@ -159,13 +150,33 @@ "tm:tripleaxel", "tm:upperhand", "tm:uturn", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", - "tm:wavecrash", "tm:whirlpool", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:bulkup", + "tutor:coaching", + "tutor:endeavor", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hydrocannon", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:knockoff", + "tutor:lastresort", + "tutor:liquidation", + "tutor:lowkick", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tripleaxel", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "quaxwell", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json b/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json index a5ece2cb99..c0d55fe9bf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaxly.json @@ -98,30 +98,23 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:aquacutter", - "tm:aquajet", "tm:batonpass", "tm:bravebird", "tm:chillingwater", - "tm:detect", "tm:disarmingvoice", - "tm:doublehit", "tm:encore", "tm:endure", "tm:facade", "tm:focusenergy", - "tm:growl", "tm:helpinghand", "tm:hydropump", "tm:lastresort", "tm:liquidation", "tm:lowkick", "tm:mistyterrain", - "tm:pound", "tm:protect", "tm:psychup", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:roost", "tm:sleeptalk", @@ -130,11 +123,21 @@ "tm:swift", "tm:takedown", "tm:terablast", - "tm:watergun", "tm:waterpledge", "tm:whirlpool", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:lastresort", + "tutor:liquidation", + "tutor:lowkick", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:swift", + "tutor:waterpledge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json b/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json index f24008c2df..4fa3221d52 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/quaxwell.json @@ -99,21 +99,16 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:aquacutter", - "tm:aquajet", "tm:batonpass", "tm:bravebird", "tm:chillingwater", - "tm:detect", "tm:disarmingvoice", - "tm:doublehit", "tm:encore", "tm:endure", "tm:facade", "tm:featherdance", "tm:flipturn", "tm:focusenergy", - "tm:growl", "tm:helpinghand", "tm:hydropump", "tm:lastresort", @@ -121,11 +116,9 @@ "tm:lowkick", "tm:lowsweep", "tm:mistyterrain", - "tm:pound", "tm:protect", "tm:psychup", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:roost", "tm:sleeptalk", @@ -135,12 +128,25 @@ "tm:takedown", "tm:terablast", "tm:tripleaxel", - "tm:watergun", "tm:waterpledge", "tm:waterpulse", "tm:whirlpool", - "tm:wingattack", - "tm:workup" + "tm:workup", + "tutor:aerialace", + "tutor:aircutter", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:helpinghand", + "tutor:lastresort", + "tutor:liquidation", + "tutor:lowkick", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tripleaxel", + "tutor:waterpledge", + "tutor:waterpulse" ], "preEvolution": "quaxly", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json b/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json index 3ce57d9581..1ff9fa3c41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json @@ -77,17 +77,14 @@ "tm:bugbuzz", "tm:calmmind", "tm:confuseray", - "tm:confusion", "tm:cosmicpower", "tm:dazzlinggleam", - "tm:defensecurl", "tm:dig", "tm:earthpower", "tm:electroball", "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:fling", "tm:futuresight", @@ -101,7 +98,6 @@ "tm:leechlife", "tm:lightscreen", "tm:lunge", - "tm:memento", "tm:mudshot", "tm:mudslap", "tm:poltergeist", @@ -116,14 +112,11 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", - "tm:revivalblessing", "tm:rocktomb", "tm:rollout", "tm:safeguard", - "tm:sandattack", "tm:sandstorm", "tm:shadowball", "tm:skillswap", @@ -135,7 +128,6 @@ "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -143,7 +135,32 @@ "tm:trickroom", "tm:weatherball", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bugbite", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:energyball", + "tutor:expandingforce", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:gunkshot", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:leechlife", + "tutor:mudslap", + "tutor:poltergeist", + "tutor:psychic", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:trick", + "tutor:xscissor", + "tutor:zenheadbutt" ], "preEvolution": "rellor", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json b/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json index 5116f2623b..2b4fbfa2d6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json @@ -69,12 +69,9 @@ "tm:charge", "tm:chargebeam", "tm:crunch", - "tm:discharge", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", - "tm:dragonhammer", "tm:dragonpulse", "tm:dragontail", "tm:earthquake", @@ -98,7 +95,6 @@ "tm:sleeptalk", "tm:snarl", "tm:solarbeam", - "tm:stomp", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", @@ -108,14 +104,32 @@ "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thunderclap", "tm:thunderfang", "tm:thunderwave", "tm:twister", "tm:voltswitch", "tm:weatherball", "tm:wildcharge", - "tm:zapcannon" + "tutor:ancientpower", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:electroweb", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:outrage", + "tutor:rest", + "tutor:risingvoltage", + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:twister", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/rellor.json b/common/src/main/resources/data/cobblemon/species/generation9/rellor.json index f41e3c2ce9..90454ad548 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/rellor.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/rellor.json @@ -66,7 +66,6 @@ "tm:bugbite", "tm:bugbuzz", "tm:cosmicpower", - "tm:defensecurl", "tm:dig", "tm:endure", "tm:facade", @@ -75,27 +74,34 @@ "tm:irondefense", "tm:leechlife", "tm:lunge", - "tm:memento", "tm:mudshot", "tm:mudslap", "tm:pounce", "tm:protect", - "tm:recover", "tm:rest", "tm:rocktomb", "tm:rollout", - "tm:sandattack", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:strugglebug", "tm:substitute", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", "tm:weatherball", - "tm:xscissor" + "tm:xscissor", + "tutor:bugbite", + "tutor:gunkshot", + "tutor:irondefense", + "tutor:leechlife", + "tutor:mudslap", + "tutor:rest", + "tutor:rollout", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json b/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json index 036a004315..6d79cd7363 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/revavroom.json @@ -117,12 +117,9 @@ "tm:irondefense", "tm:ironhead", "tm:lashout", - "tm:lick", "tm:magnetrise", "tm:metalsound", "tm:overheat", - "tm:partingshot", - "tm:poisongas", "tm:poisonjab", "tm:protect", "tm:raindance", @@ -131,13 +128,9 @@ "tm:scaryface", "tm:screech", "tm:selfdestruct", - "tm:shiftgear", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", - "tm:spinout", "tm:steelbeam", "tm:substitute", "tm:sunnyday", @@ -152,7 +145,26 @@ "tm:toxicspikes", "tm:uproar", "tm:venoshock", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", + "tutor:lashout", + "tutor:magnetrise", + "tutor:poisonjab", + "tutor:rest", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:steelbeam", + "tutor:uproar", + "tutor:zenheadbutt" ], "preEvolution": "varoom", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json b/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json index 10a9ebb86a..9704ec3124 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json @@ -67,7 +67,6 @@ "tm:acrobatics", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", @@ -77,12 +76,10 @@ "tm:dig", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:earthquake", "tm:endure", @@ -102,12 +99,9 @@ "tm:hypervoice", "tm:incinerate", "tm:ironhead", - "tm:jawlock", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:metalclaw", - "tm:nightslash", "tm:outrage", "tm:protect", "tm:rest", @@ -131,7 +125,36 @@ "tm:thunderfang", "tm:uturn", "tm:xscissor", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:darkpulse", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:firefang", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:ironhead", + "tutor:knockoff", + "tutor:lashout", + "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:roost", + "tutor:scaleshot", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:tailwind", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json b/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json index 55bf3eb508..0c52fd5fa7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json @@ -66,7 +66,6 @@ "tm:bulldoze", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:earthpower", "tm:earthquake", "tm:eerieimpulse", @@ -83,9 +82,7 @@ "tm:hyperbeam", "tm:irondefense", "tm:lightscreen", - "tm:magneticflux", "tm:metalsound", - "tm:mirrorcoat", "tm:mudshot", "tm:powergem", "tm:protect", @@ -96,25 +93,40 @@ "tm:scorchingsands", "tm:screech", "tm:sleeptalk", - "tm:spark", "tm:spikes", "tm:stealthrock", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", "tm:supercellslam", - "tm:supersonic", "tm:swift", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:triattack", "tm:voltswitch", "tm:wildcharge", - "tm:zapcannon" + "tutor:bulldoze", + "tutor:chargebeam", + "tutor:earthpower", + "tutor:electroweb", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:rest", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json b/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json index 078ad2ee22..c3fbf03091 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json @@ -78,7 +78,6 @@ "egg:ragepowder", "egg:rollout", "egg:worryseed", - "tm:bite", "tm:bulletseed", "tm:burningjealousy", "tm:crunch", @@ -94,21 +93,14 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:headbutt", "tm:helpinghand", "tm:hyperbeam", - "tm:ingrain", "tm:lashout", - "tm:leafage", "tm:leafstorm", - "tm:leechseed", - "tm:leer", "tm:magicalleaf", "tm:overheat", "tm:protect", - "tm:ragepowder", - "tm:razorleaf", "tm:rest", "tm:rollout", "tm:sandstorm", @@ -116,7 +108,6 @@ "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", - "tm:spicyextract", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", @@ -128,7 +119,27 @@ "tm:trailblaze", "tm:willowisp", "tm:worryseed", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:burningjealousy", + "tutor:endeavor", + "tutor:energyball", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:lashout", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superfang", + "tutor:worryseed", + "tutor:zenheadbutt" ], "preEvolution": "capsakid", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json b/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json index 8fcbcc1fd8..00e6b777ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json @@ -62,16 +62,13 @@ "91:boomburst", "tm:amnesia", "tm:batonpass", - "tm:bite", "tm:blizzard", "tm:bodyslam", - "tm:boomburst", "tm:bulkup", "tm:calmmind", "tm:crunch", "tm:dazzlinggleam", "tm:dig", - "tm:disable", "tm:doubleedge", "tm:drainpunch", "tm:encore", @@ -89,7 +86,6 @@ "tm:grassknot", "tm:gyroball", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", @@ -100,10 +96,7 @@ "tm:metronome", "tm:mistyexplosion", "tm:mistyterrain", - "tm:nobleroar", - "tm:perishsong", "tm:playrough", - "tm:pound", "tm:protect", "tm:psybeam", "tm:psychic", @@ -119,7 +112,6 @@ "tm:rocktomb", "tm:sandstorm", "tm:scaryface", - "tm:sing", "tm:sleeptalk", "tm:snowscape", "tm:stealthrock", @@ -138,8 +130,36 @@ "tm:trickroom", "tm:uproar", "tm:waterpulse", - "tm:wish", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulkup", + "tutor:calmmind", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:expandingforce", + "tutor:firefang", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:icebeam", + "tutor:icefang", + "tutor:icepunch", + "tutor:mistyexplosion", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:trick", + "tutor:uproar", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json b/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json index 45f6c1026e..d516631d15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/shroodle.json @@ -91,8 +91,6 @@ "tm:acidspray", "tm:acrobatics", "tm:batonpass", - "tm:bite", - "tm:copycat", "tm:crosspoison", "tm:dig", "tm:doubleedge", @@ -100,29 +98,22 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:flatter", "tm:fling", "tm:foulplay", - "tm:furyswipes", "tm:gunkshot", "tm:helpinghand", "tm:knockoff", - "tm:leer", "tm:metronome", "tm:mudshot", "tm:mudslap", "tm:nastyplot", - "tm:partingshot", - "tm:poisonfang", "tm:poisonjab", "tm:pounce", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", - "tm:scratch", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -130,7 +121,6 @@ "tm:sunnyday", "tm:superfang", "tm:swagger", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -140,7 +130,20 @@ "tm:toxic", "tm:trailblaze", "tm:uturn", - "tm:venoshock" + "tm:venoshock", + "tutor:endeavor", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:superfang", + "tutor:throatchop" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json index 06f3f294b0..acc7223250 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json @@ -68,8 +68,6 @@ "48:shadowball", "54:memento", "60:leafstorm", - "tm:absorb", - "tm:astonish", "tm:calmmind", "tm:curse", "tm:endure", @@ -82,11 +80,7 @@ "tm:imprison", "tm:irondefense", "tm:leafstorm", - "tm:lifedew", "tm:magicalleaf", - "tm:matchagotcha", - "tm:megadrain", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:painsplit", @@ -94,7 +88,6 @@ "tm:poltergeist", "tm:protect", "tm:psychup", - "tm:ragepowder", "tm:reflect", "tm:rest", "tm:scald", @@ -102,13 +95,25 @@ "tm:sleeptalk", "tm:solarbeam", "tm:spite", - "tm:strengthsap", - "tm:stunspore", "tm:substitute", "tm:terablast", "tm:trickroom", "tm:uproar", - "tm:withdraw" + "tutor:calmmind", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:magicalleaf", + "tutor:painsplit", + "tutor:poltergeist", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:spite", + "tutor:trick", + "tutor:uproar" ], "preEvolution": "poltchageist matcha_authenticity=counterfeit", "evolutions": [], diff --git a/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json b/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json index b7c549ce2a..8d9bf04256 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json @@ -89,8 +89,6 @@ "egg:encore", "egg:slackoff", "tm:alluringvoice", - "tm:belch", - "tm:bite", "tm:blastburn", "tm:bodyslam", "tm:crunch", @@ -99,7 +97,6 @@ "tm:disarmingvoice", "tm:earthpower", "tm:earthquake", - "tm:ember", "tm:encore", "tm:endure", "tm:facade", @@ -119,8 +116,6 @@ "tm:hypervoice", "tm:imprison", "tm:incinerate", - "tm:leer", - "tm:lick", "tm:mudslap", "tm:nightshade", "tm:outrage", @@ -135,23 +130,41 @@ "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", - "tm:sing", - "tm:slackoff", "tm:sleeptalk", "tm:snarl", "tm:solarbeam", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:temperflare", "tm:terablast", "tm:thunderfang", - "tm:torchsong", "tm:willowisp", - "tm:yawn", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:blastburn", + "tutor:earthpower", + "tutor:firefang", + "tutor:firepledge", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:mudslap", + "tutor:outrage", + "tutor:poltergeist", + "tutor:rest", + "tutor:scorchingsands", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang", + "tutor:zenheadbutt" ], "preEvolution": "crocalor", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json b/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json index 1c2f1658bb..9da61c61cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json @@ -74,15 +74,12 @@ "tm:doubleedge", "tm:dualwingbeat", "tm:earthquake", - "tm:ember", "tm:endure", "tm:facade", - "tm:firstimpression", "tm:flamecharge", "tm:flareblitz", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", @@ -93,8 +90,6 @@ "tm:lowkick", "tm:lowsweep", "tm:lunge", - "tm:morningsun", - "tm:poisonpowder", "tm:protect", "tm:raindance", "tm:rest", @@ -102,22 +97,36 @@ "tm:sandstorm", "tm:skittersmack", "tm:sleeptalk", - "tm:stomp", "tm:stompingtantrum", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:takedown", "tm:temperflare", "tm:terablast", - "tm:thrash", "tm:trailblaze", "tm:uturn", - "tm:whirlwind", "tm:wildcharge", "tm:willowisp", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bugbite", + "tutor:bulkup", + "tutor:dualwingbeat", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:leechlife", + "tutor:lowkick", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json b/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json index 02e8c03a2e..2a0450ff53 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json @@ -72,42 +72,43 @@ "egg:strengthsap", "egg:synthesis", "egg:weatherball", - "tm:absorb", "tm:bulletseed", "tm:charm", "tm:earthpower", "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:gigadrain", "tm:grassknot", "tm:grassyterrain", - "tm:growth", "tm:helpinghand", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:protect", - "tm:razorleaf", "tm:rest", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", "tm:solarblade", - "tm:strengthsap", "tm:substitute", "tm:sunnyday", - "tm:sweetscent", "tm:swift", "tm:synthesis", - "tm:tackle", "tm:terablast", "tm:terrainpulse", "tm:trailblaze", - "tm:weatherball" + "tm:weatherball", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigadrain", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:swift", + "tutor:synthesis", + "tutor:terrainpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/spidops.json b/common/src/main/resources/data/cobblemon/species/generation9/spidops.json index 30529d1bbf..fc7a31b07c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/spidops.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/spidops.json @@ -81,14 +81,10 @@ "tm:bugbite", "tm:bugbuzz", "tm:bulletseed", - "tm:circlethrow", - "tm:counter", "tm:electroweb", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", - "tm:firstimpression", "tm:fling", "tm:gastroacid", "tm:gigadrain", @@ -99,7 +95,6 @@ "tm:leechlife", "tm:lowkick", "tm:lunge", - "tm:memento", "tm:painsplit", "tm:poisonjab", "tm:pounce", @@ -110,17 +105,14 @@ "tm:rocktomb", "tm:scaryface", "tm:shadowclaw", - "tm:silktrap", "tm:skittersmack", "tm:sleeptalk", "tm:spikes", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -130,7 +122,29 @@ "tm:trailblaze", "tm:upperhand", "tm:uturn", - "tm:xscissor" + "tm:xscissor", + "tutor:aerialace", + "tutor:block", + "tutor:bugbite", + "tutor:electroweb", + "tutor:falseswipe", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:knockoff", + "tutor:leechlife", + "tutor:lowkick", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:xscissor" ], "preEvolution": "tarountula", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json b/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json index d45e393b8b..9b9b6e4919 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sprigatito.json @@ -93,10 +93,8 @@ "tm:acrobatics", "tm:agility", "tm:allyswitch", - "tm:bite", "tm:bulletseed", "tm:charm", - "tm:copycat", "tm:disarmingvoice", "tm:endure", "tm:energyball", @@ -109,33 +107,43 @@ "tm:grassyterrain", "tm:helpinghand", "tm:honeclaws", - "tm:leafage", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:mudslap", "tm:nastyplot", "tm:petalblizzard", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:rest", - "tm:scratch", "tm:seedbomb", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", "tm:suckerpunch", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", "tm:trailblaze", "tm:uturn", - "tm:worryseed" + "tm:worryseed", + "tutor:allyswitch", + "tutor:energyball", + "tutor:gigadrain", + "tutor:grasspledge", + "tutor:grassyglide", + "tutor:helpinghand", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:worryseed" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json index 489221c7a8..50cd9ad84b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/squawkabilly.json @@ -100,7 +100,6 @@ "tm:aircutter", "tm:airslash", "tm:bravebird", - "tm:copycat", "tm:doubleedge", "tm:dualwingbeat", "tm:endeavor", @@ -108,25 +107,17 @@ "tm:facade", "tm:faketears", "tm:featherdance", - "tm:finalgambit", - "tm:flatter", "tm:fly", "tm:foulplay", - "tm:furyattack", "tm:gigaimpact", - "tm:growl", "tm:heatwave", "tm:helpinghand", "tm:hurricane", "tm:hyperbeam", "tm:hypervoice", "tm:lashout", - "tm:mimic", - "tm:partingshot", - "tm:peck", "tm:pounce", "tm:protect", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:roost", @@ -142,7 +133,23 @@ "tm:thief", "tm:torment", "tm:uproar", - "tm:uturn" + "tm:uturn", + "tutor:aerialace", + "tutor:aircutter", + "tutor:dualwingbeat", + "tutor:endeavor", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:lashout", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:tailwind", + "tutor:uproar" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json b/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json index 830d81534e..5b836db857 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json @@ -86,41 +86,43 @@ "tm:chargebeam", "tm:chillingwater", "tm:confuseray", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:endure", - "tm:flail", "tm:hypervoice", "tm:lightscreen", "tm:muddywater", "tm:mudshot", "tm:mudslap", - "tm:paraboliccharge", "tm:protect", "tm:raindance", "tm:reflect", "tm:rest", "tm:sleeptalk", - "tm:soak", - "tm:spark", "tm:substitute", "tm:suckerpunch", "tm:swift", - "tm:tackle", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:voltswitch", - "tm:watergun", "tm:waterpulse", "tm:weatherball", "tm:wildcharge", - "tm:zapcannon" + "tutor:chargebeam", + "tutor:electroweb", + "tutor:hypervoice", + "tutor:mudslap", + "tutor:rest", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json b/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json index 15a0f82c8b..f63c1a9003 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tandemaus.json @@ -89,20 +89,16 @@ "tm:babydolleyes", "tm:batonpass", "tm:beatup", - "tm:bite", "tm:bulletseed", "tm:charm", - "tm:copycat", "tm:crunch", "tm:dig", "tm:doubleedge", - "tm:doublehit", "tm:echoedvoice", "tm:encore", "tm:endure", "tm:facade", "tm:faketears", - "tm:feint", "tm:grassknot", "tm:helpinghand", "tm:hypervoice", @@ -111,8 +107,6 @@ "tm:mudshot", "tm:mudslap", "tm:playrough", - "tm:populationbomb", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", @@ -123,15 +117,28 @@ "tm:sunnyday", "tm:superfang", "tm:swift", - "tm:switcheroo", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:thunderwave", - "tm:tickle", "tm:uturn", - "tm:waterpulse" + "tm:waterpulse", + "tutor:aerialace", + "tutor:afteryou", + "tutor:babydolleyes", + "tutor:helpinghand", + "tutor:hypervoice", + "tutor:lowkick", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:seedbomb", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json b/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json index cebfc0b75c..faec38f35a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json @@ -78,13 +78,9 @@ "tm:bugbite", "tm:bugbuzz", "tm:bulletseed", - "tm:circlethrow", - "tm:counter", "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", - "tm:firstimpression", "tm:gastroacid", "tm:gigadrain", "tm:grassknot", @@ -92,7 +88,6 @@ "tm:knockoff", "tm:leechlife", "tm:lunge", - "tm:memento", "tm:poisonjab", "tm:pounce", "tm:protect", @@ -102,20 +97,35 @@ "tm:skittersmack", "tm:sleeptalk", "tm:spikes", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:suckerpunch", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", "tm:throatchop", "tm:toxicspikes", "tm:trailblaze", - "tm:xscissor" + "tm:xscissor", + "tutor:block", + "tutor:bugbite", + "tutor:falseswipe", + "tutor:gastroacid", + "tutor:gigadrain", + "tutor:knockoff", + "tutor:leechlife", + "tutor:poisonjab", + "tutor:rest", + "tutor:shadowclaw", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stringshot", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:xscissor" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json index 879af33733..59763279ec 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tatsugiri.json @@ -99,7 +99,6 @@ "egg:rapidspin", "tm:batonpass", "tm:chillingwater", - "tm:counter", "tm:dracometeor", "tm:dragoncheer", "tm:dragondance", @@ -107,32 +106,35 @@ "tm:endure", "tm:facade", "tm:gigaimpact", - "tm:harden", "tm:helpinghand", "tm:hydropump", "tm:hyperbeam", "tm:icywind", "tm:lunge", - "tm:memento", - "tm:mirrorcoat", "tm:muddywater", "tm:nastyplot", "tm:outrage", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:sleeptalk", - "tm:soak", - "tm:splash", "tm:substitute", "tm:surf", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:watergun", "tm:waterpulse", - "tm:whirlpool" + "tm:whirlpool", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icywind", + "tutor:outrage", + "tutor:rest", + "tutor:sleeptalk", + "tutor:waterpulse" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json index 20355cfb3d..36c2d0a06a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json @@ -90,7 +90,6 @@ "tm:powergem", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:roar", "tm:rockpolish", @@ -106,7 +105,6 @@ "tm:supercellslam", "tm:surf", "tm:takedown", - "tm:terastarstorm", "tm:thunder", "tm:thunderbolt", "tm:toxic", @@ -114,8 +112,32 @@ "tm:waterpulse", "tm:weatherball", "tm:wildcharge", - "tm:withdraw", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:ancientpower", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:dazzlinggleam", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:ironhead", + "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:stoneedge", + "tutor:thunderbolt", + "tutor:waterpulse", + "tutor:wildcharge", + "tutor:zenheadbutt" ], "evolutions": [], "forms": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json b/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json index 8912f85a13..dc9573df52 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json @@ -71,14 +71,11 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", "tm:gigaimpact", "tm:heavyslam", "tm:hex", "tm:hyperbeam", "tm:lashout", - "tm:meanlook", - "tm:memento", "tm:mudshot", "tm:mudslap", "tm:payback", @@ -86,7 +83,6 @@ "tm:rest", "tm:rockslide", "tm:rocktomb", - "tm:ruination", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", @@ -95,7 +91,6 @@ "tm:spikes", "tm:spite", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", @@ -103,10 +98,26 @@ "tm:takedown", "tm:taunt", "tm:terablast", - "tm:thrash", "tm:throatchop", - "tm:whirlwind", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:darkpulse", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:lashout", + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spikes", + "tutor:spite", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:throatchop", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json index b5b21d5e50..21a4ae76c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkatink.json @@ -88,7 +88,6 @@ "egg:feint", "egg:icehammer", "egg:quash", - "tm:astonish", "tm:babydolleyes", "tm:brutalswing", "tm:covet", @@ -97,16 +96,11 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fairywind", - "tm:fakeout", "tm:faketears", - "tm:feint", "tm:flashcannon", - "tm:flatter", "tm:fling", "tm:foulplay", "tm:helpinghand", - "tm:icehammer", "tm:knockoff", "tm:lightscreen", "tm:metalclaw", @@ -123,17 +117,32 @@ "tm:rocktomb", "tm:skillswap", "tm:skittersmack", - "tm:slam", "tm:sleeptalk", "tm:stealthrock", "tm:steelbeam", "tm:stoneedge", "tm:substitute", - "tm:sweetkiss", "tm:swordsdance", "tm:terablast", "tm:thief", - "tm:thunderwave" + "tm:thunderwave", + "tutor:babydolleyes", + "tutor:covet", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stoneedge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json index bf19b56f6c..73f5970240 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json @@ -89,7 +89,6 @@ "egg:feint", "egg:icehammer", "egg:quash", - "tm:astonish", "tm:babydolleyes", "tm:brickbreak", "tm:brutalswing", @@ -100,19 +99,13 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fairywind", - "tm:fakeout", "tm:faketears", - "tm:feint", "tm:flashcannon", - "tm:flatter", "tm:fling", "tm:foulplay", - "tm:gigatonhammer", "tm:hardpress", "tm:heavyslam", "tm:helpinghand", - "tm:icehammer", "tm:knockoff", "tm:lightscreen", "tm:metalclaw", @@ -129,18 +122,34 @@ "tm:rocktomb", "tm:skillswap", "tm:skittersmack", - "tm:slam", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", "tm:steelbeam", "tm:stoneedge", "tm:substitute", - "tm:sweetkiss", "tm:swordsdance", "tm:terablast", "tm:thief", - "tm:thunderwave" + "tm:thunderwave", + "tutor:babydolleyes", + "tutor:bulldoze", + "tutor:covet", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stoneedge" ], "preEvolution": "tinkatuff", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json b/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json index 475b0b5633..081e5a86a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinkatuff.json @@ -88,7 +88,6 @@ "egg:feint", "egg:icehammer", "egg:quash", - "tm:astonish", "tm:babydolleyes", "tm:brickbreak", "tm:brutalswing", @@ -98,16 +97,11 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fairywind", - "tm:fakeout", "tm:faketears", - "tm:feint", "tm:flashcannon", - "tm:flatter", "tm:fling", "tm:foulplay", "tm:helpinghand", - "tm:icehammer", "tm:knockoff", "tm:lightscreen", "tm:metalclaw", @@ -124,17 +118,32 @@ "tm:rocktomb", "tm:skillswap", "tm:skittersmack", - "tm:slam", "tm:sleeptalk", "tm:stealthrock", "tm:steelbeam", "tm:stoneedge", "tm:substitute", - "tm:sweetkiss", "tm:swordsdance", "tm:terablast", "tm:thief", - "tm:thunderwave" + "tm:thunderwave", + "tutor:babydolleyes", + "tutor:covet", + "tutor:endeavor", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:knockoff", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:stealthrock", + "tutor:steelbeam", + "tutor:stoneedge" ], "preEvolution": "tinkatink", "evolutions": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json b/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json index e3ba197ade..712ac4d945 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json @@ -80,9 +80,7 @@ "egg:rapidspin", "egg:tickle", "egg:toxic", - "tm:absorb", "tm:acidspray", - "tm:acupressure", "tm:bulletseed", "tm:confuseray", "tm:dazzlinggleam", @@ -95,25 +93,18 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:hex", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:lunge", "tm:magicalleaf", - "tm:megadrain", - "tm:mirrorcoat", "tm:mudshot", "tm:mudslap", "tm:painsplit", - "tm:poisonpowder", "tm:powerwhip", "tm:protect", - "tm:ragepowder", "tm:raindance", - "tm:rapidspin", "tm:reflect", "tm:rest", "tm:scaryface", @@ -123,21 +114,33 @@ "tm:sludgebomb", "tm:solarbeam", "tm:spikes", - "tm:spore", - "tm:stunspore", "tm:substitute", - "tm:supersonic", "tm:swift", - "tm:tackle", "tm:taunt", "tm:terablast", - "tm:tickle", "tm:toxic", "tm:toxicspikes", "tm:trailblaze", "tm:trickroom", "tm:venoshock", - "tm:wrap" + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:energyball", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:grassyglide", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:swift", + "tutor:trick" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json b/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json index f9f1436827..cb5eb2f3be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json @@ -81,9 +81,7 @@ "egg:rapidspin", "egg:tickle", "egg:toxic", - "tm:absorb", "tm:acidspray", - "tm:acupressure", "tm:bulletseed", "tm:confuseray", "tm:dazzlinggleam", @@ -97,28 +95,20 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:hex", "tm:hyperbeam", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:lunge", "tm:magicalleaf", - "tm:megadrain", - "tm:mirrorcoat", "tm:mudshot", "tm:mudslap", "tm:painsplit", - "tm:poisonpowder", "tm:powerwhip", "tm:protect", - "tm:ragepowder", "tm:raindance", - "tm:rapidspin", "tm:reflect", - "tm:reflecttype", "tm:rest", "tm:scaryface", "tm:screech", @@ -128,21 +118,36 @@ "tm:sludgebomb", "tm:solarbeam", "tm:spikes", - "tm:spore", - "tm:stunspore", "tm:substitute", - "tm:supersonic", "tm:swift", - "tm:tackle", "tm:taunt", "tm:terablast", - "tm:tickle", "tm:toxic", "tm:toxicspikes", "tm:trailblaze", "tm:trickroom", "tm:venoshock", - "tm:wrap" + "tutor:dazzlinggleam", + "tutor:earthpower", + "tutor:energyball", + "tutor:flashcannon", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:seedbomb", + "tutor:skittersmack", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:swift", + "tutor:trick" ], "preEvolution": "toedscool", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species/generation9/varoom.json b/common/src/main/resources/data/cobblemon/species/generation9/varoom.json index fb9e5ed827..1b0c06e26c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/varoom.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/varoom.json @@ -113,10 +113,7 @@ "tm:headbutt", "tm:irondefense", "tm:ironhead", - "tm:lick", "tm:metalsound", - "tm:partingshot", - "tm:poisongas", "tm:poisonjab", "tm:protect", "tm:raindance", @@ -126,11 +123,8 @@ "tm:screech", "tm:selfdestruct", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:sludgewave", - "tm:smog", - "tm:spinout", "tm:steelbeam", "tm:substitute", "tm:sunnyday", @@ -144,7 +138,20 @@ "tm:toxicspikes", "tm:uproar", "tm:venoshock", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:bulldoze", + "tutor:flashcannon", + "tutor:gunkshot", + "tutor:irondefense", + "tutor:ironhead", + "tutor:poisonjab", + "tutor:rest", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spikes", + "tutor:steelbeam", + "tutor:uproar", + "tutor:zenheadbutt" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/veluza.json b/common/src/main/resources/data/cobblemon/species/generation9/veluza.json index ca963094ef..325881ebe4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/veluza.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/veluza.json @@ -91,8 +91,6 @@ "egg:recover", "egg:thrash", "tm:agility", - "tm:aquacutter", - "tm:aquajet", "tm:blizzard", "tm:bodyslam", "tm:chillingwater", @@ -102,8 +100,6 @@ "tm:endeavor", "tm:endure", "tm:expandingforce", - "tm:filletaway", - "tm:finalgambit", "tm:flipturn", "tm:focusenergy", "tm:gigaimpact", @@ -113,7 +109,6 @@ "tm:icefang", "tm:icywind", "tm:liquidation", - "tm:nightslash", "tm:painsplit", "tm:pluck", "tm:protect", @@ -122,22 +117,37 @@ "tm:psychicterrain", "tm:psychocut", "tm:raindance", - "tm:recover", "tm:rest", "tm:scaleshot", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:storedpower", "tm:substitute", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", - "tm:thrash", "tm:waterfall", "tm:waterpulse", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:drillrun", + "tutor:endeavor", + "tutor:expandingforce", + "tutor:flipturn", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icefang", + "tutor:icywind", + "tutor:liquidation", + "tutor:painsplit", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:waterpulse", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/walkingwake.json b/common/src/main/resources/data/cobblemon/species/generation9/walkingwake.json index 9ab146e529..1eef245156 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/walkingwake.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/walkingwake.json @@ -80,20 +80,16 @@ "77:flamethrower", "84:hydropump", "tm:agility", - "tm:aquajet", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:chillingwater", "tm:crunch", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:endure", "tm:facade", @@ -104,14 +100,11 @@ "tm:honeclaws", "tm:hurricane", "tm:hydropump", - "tm:hydrosteam", "tm:hyperbeam", "tm:knockoff", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:mudshot", - "tm:nobleroar", "tm:outrage", "tm:protect", "tm:raindance", @@ -131,7 +124,24 @@ "tm:waterfall", "tm:waterpulse", "tm:weatherball", - "tm:whirlpool" + "tm:whirlpool", + "tutor:dracometeor", + "tutor:dragonpulse", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flipturn", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:liquidation", + "tutor:lowkick", + "tutor:outrage", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:swift", + "tutor:twister", + "tutor:waterpulse" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wattrel.json b/common/src/main/resources/data/cobblemon/species/generation9/wattrel.json index 0b6511687d..ca78f96dbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wattrel.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wattrel.json @@ -106,7 +106,6 @@ "tm:bravebird", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:dualwingbeat", "tm:eerieimpulse", "tm:electricterrain", @@ -117,33 +116,39 @@ "tm:facade", "tm:featherdance", "tm:fly", - "tm:growl", "tm:hurricane", - "tm:peck", "tm:pluck", "tm:protect", - "tm:quickattack", "tm:rest", "tm:roost", "tm:sleeptalk", - "tm:spark", - "tm:spitup", - "tm:stockpile", "tm:substitute", - "tm:swallow", "tm:swift", "tm:tailwind", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thundershock", "tm:thunderwave", "tm:uproar", "tm:uturn", "tm:voltswitch", "tm:weatherball", - "tm:wildcharge" + "tm:wildcharge", + "tutor:aerialace", + "tutor:aircutter", + "tutor:chargebeam", + "tutor:dualwingbeat", + "tutor:electroweb", + "tutor:endeavor", + "tutor:rest", + "tutor:roost", + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:thunderbolt", + "tutor:uproar", + "tutor:wildcharge" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json b/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json index 4c8bdd1c36..062e89592c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json @@ -74,7 +74,6 @@ "egg:finalgambit", "egg:memento", "tm:agility", - "tm:aquajet", "tm:blizzard", "tm:bulldoze", "tm:chillingwater", @@ -82,23 +81,19 @@ "tm:earthpower", "tm:endure", "tm:facade", - "tm:finalgambit", "tm:foulplay", "tm:headbutt", "tm:helpinghand", "tm:hydropump", "tm:icebeam", "tm:liquidation", - "tm:memento", "tm:muddywater", "tm:mudshot", "tm:mudslap", "tm:protect", "tm:raindance", "tm:rest", - "tm:sandattack", "tm:sandstorm", - "tm:slam", "tm:sleeptalk", "tm:stompingtantrum", "tm:substitute", @@ -108,10 +103,22 @@ "tm:takedown", "tm:terablast", "tm:throatchop", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:wrap" + "tutor:bulldoze", + "tutor:earthpower", + "tutor:foulplay", + "tutor:helpinghand", + "tutor:icebeam", + "tutor:liquidation", + "tutor:mudslap", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "evolutions": [ { diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wochien.json b/common/src/main/resources/data/cobblemon/species/generation9/wochien.json index 9a45b43be5..1484bf1ffb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wochien.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wochien.json @@ -62,7 +62,6 @@ "65:grassyterrain", "70:knockoff", "75:leafstorm", - "tm:absorb", "tm:bodypress", "tm:bodyslam", "tm:bulletseed", @@ -75,29 +74,22 @@ "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", - "tm:growth", "tm:hex", "tm:hyperbeam", - "tm:ingrain", "tm:knockoff", "tm:lashout", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", - "tm:meanlook", - "tm:megadrain", "tm:mudshot", "tm:mudslap", "tm:payback", - "tm:poisonpowder", "tm:pollenpuff", "tm:powerwhip", "tm:protect", "tm:raindance", "tm:reflect", "tm:rest", - "tm:ruination", "tm:scaryface", "tm:seedbomb", "tm:sleeptalk", @@ -105,15 +97,29 @@ "tm:solarbeam", "tm:solarblade", "tm:spite", - "tm:stunspore", "tm:substitute", "tm:sunnyday", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:tickle", "tm:trailblaze", - "tm:zenheadbutt" + "tm:zenheadbutt", + "tutor:darkpulse", + "tutor:energyball", + "tutor:foulplay", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:knockoff", + "tutor:lashout", + "tutor:magicalleaf", + "tutor:mudslap", + "tutor:rest", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:zenheadbutt" ], "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json b/common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json index b6bc10c96d..da7b0802f3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json @@ -75,7 +75,6 @@ "egg:finalgambit", "egg:memento", "tm:agility", - "tm:aquajet", "tm:blizzard", "tm:bulldoze", "tm:chillingwater", @@ -83,7 +82,6 @@ "tm:earthpower", "tm:endure", "tm:facade", - "tm:finalgambit", "tm:foulplay", "tm:gigaimpact", "tm:headbutt", @@ -92,7 +90,6 @@ "tm:hyperbeam", "tm:icebeam", "tm:liquidation", - "tm:memento", "tm:muddywater", "tm:mudshot", "tm:mudslap", @@ -100,9 +97,7 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:sandattack", "tm:sandstorm", - "tm:slam", "tm:sleeptalk", "tm:stompingtantrum", "tm:substitute", @@ -112,11 +107,26 @@ "tm:takedown", "tm:terablast", "tm:throatchop", - "tm:tripledive", - "tm:watergun", "tm:waterpulse", "tm:whirlpool", - "tm:wrap" + "tutor:bulldoze", + "tutor:dive", + "tutor:earthpower", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:liquidation", + "tutor:mudslap", + "tutor:painsplit", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stompingtantrum", + "tutor:suckerpunch", + "tutor:swift", + "tutor:throatchop", + "tutor:waterpulse" ], "preEvolution": "wiglett", "evolutions": [] diff --git a/common/src/main/resources/data/cobblemon/species_features/sword_form.json b/common/src/main/resources/data/cobblemon/species_features/sword_form.json index 5793506ba5..26fbfc3147 100644 --- a/common/src/main/resources/data/cobblemon/species_features/sword_form.json +++ b/common/src/main/resources/data/cobblemon/species_features/sword_form.json @@ -9,5 +9,5 @@ "resolute" ], "isAspect": true, - "aspectFormat": "sword-form-{{choice}}" + "aspectFormat": "{{choice}}-form" } \ No newline at end of file diff --git a/utilityscripts/addon_movesource_helper.py b/utilityscripts/addon_movesource_helper.py new file mode 100644 index 0000000000..205dc6db2e --- /dev/null +++ b/utilityscripts/addon_movesource_helper.py @@ -0,0 +1,195 @@ +import os +import json + +# This is the entire list of "External Moves" as it is designated in official game data. +# Functionally, it is our entire list of potential base-mod TMs when the TMM is complete. +# Fans often split these into "TM moves" and "Tutor moves" depending on the game. +potential_tm_list = [ + "focuspunch", "dragonclaw", "waterpulse", "calmmind", "roar", "toxic", "hail", "bulkup", "bulletseed", + "sunnyday", "taunt", "icebeam", "blizzard", "hyperbeam", "lightscreen", "protect", "raindance", "gigadrain", + "safeguard", "solarbeam", "irontail", "thunderbolt", "thunder", "earthquake", "dig", "psychic", "shadowball", + "brickbreak", "doubleteam", "reflect", "shockwave", "flamethrower", "sludgebomb", "sandstorm", "fireblast", "rocktomb", + "aerialace", "torment", "facade", "secretpower", "rest", "attract", "thief", "steelwing", "skillswap", + "snatch", "overheat", "roost", "focusblast", "energyball", "falseswipe", "brine", "fling", "chargebeam", + "endure", "dragonpulse", "drainpunch", "willowisp", "silverwind", "embargo", "explosion", "shadowclaw", "payback", + "recycle", "gigaimpact", "rockpolish", "flash", "stoneedge", "avalanche", "thunderwave", "gyroball", "swordsdance", + "stealthrock", "psychup", "captivate", "darkpulse", "rockslide", "xscissor", "sleeptalk", "naturalgift", "poisonjab", + "dreameater", "grassknot", "swagger", "pluck", "uturn", "substitute", "flashcannon", "trickroom", "dive", + "mudslap", "furycutter", "icywind", "rollout", "thunderpunch", "firepunch", "superpower", "icepunch", "ironhead", + "aquatail", "ominouswind", "gastroacid", "snore", "spite", "aircutter", "helpinghand", "endeavor", "outrage", + "ancientpower", "synthesis", "signalbeam", "zenheadbutt", "vacuumwave", "earthpower", "gunkshot", "twister", "seedbomb", + "irondefense", "magnetrise", "lastresort", "bounce", "trick", "heatwave", "knockoff", "suckerpunch", "swift", + "uproar", "superfang", "painsplit", "stringshot", "tailwind", "gravity", "worryseed", "magiccoat", "roleplay", + "healbell", "lowkick", "skyattack", "block", "bugbite", "headbutt", "cut", "fly", "surf", + "strength", "whirlpool", "defog", "rocksmash", "waterfall", "rockclimb", "honeclaws", "psyshock", "venoshock", + "telekinesis", "smackdown", "sludgewave", "flamecharge", "lowsweep", "round", "echoedvoice", "allyswitch", "scald", + "skydrop", "incinerate", "quash", "acrobatics", "retaliate", "voltswitch", "strugglebug", "bulldoze", "frostbreath", + "dragontail", "workup", "afteryou", "magicroom", "wonderroom", "bind", "foulplay", "electroweb", "hypervoice", + "covet", "dualchop", "drillrun", "wildcharge", "snarl", "grasspledge", "firepledge", "waterpledge", "frenzyplant", + "blastburn", "hydrocannon", "dracometeor", "infestation", "naturepower", "poweruppunch", "dazzlinggleam", "confide", "leechlife", + "brutalswing", "smartstrike", "auroraveil", "liquidation", "stompingtantrum", "throatchop", "laserfocus", "megapunch", "megakick", + "payday", "pinmissile", "magicalleaf", "solarblade", "firespin", "screech", "selfdestruct", "scaryface", "charm", + "beatup", "revenge", "imprison", "weatherball", "faketears", "sandtomb", "iciclespear", "mudshot", "rockblast", + "assurance", "powerswap", "guardswap", "speedswap", "thunderfang", "icefang", "firefang", "psychocut", "crosspoison", + "hex", "razorshell", "tailslap", "phantomforce", "drainingkiss", "grassyterrain", "mistyterrain", "electricterrain", "psychicterrain", + "mysticalfire", "eerieimpulse", "airslash", "breakingswipe", "bodyslam", "hydropump", "agility", "focusenergy", "metronome", + "amnesia", "triattack", "reversal", "spikes", "megahorn", "batonpass", "encore", "crunch", "futuresight", + "blazekick", "cosmicpower", "muddywater", "leafblade", "dragondance", "closecombat", "toxicspikes", "flareblitz", "aurasphere", + "bugbuzz", "powergem", "bravebird", "nastyplot", "leafstorm", "powerwhip", "heavyslam", "electroball", "storedpower", + "heatcrash", "hurricane", "playrough", "venomdrench", "darkestlariat", "highhorsepower", "pollenpuff", "psychicfangs", "bodypress", + "steelbeam", "terrainpulse", "burningjealousy", "flipturn", "risingvoltage", "grassyglide", "tripleaxel", "coaching", "corrosivegas", + "scorchingsands", "dualwingbeat", "expandingforce", "skittersmack", "meteorbeam", "poltergeist", "scaleshot", "lashout", "steelroller", + "mistyexplosion", "iceball", "powershift", "babydolleyes", "takedown", "acidspray", "psybeam", "confuseray", "disarmingvoice", + "trailblaze", "pounce", "chillingwater", "poisontail", "metalclaw", "nightshade", "snowscape", "icespinner", "terablast", + "charge", "haze", "lunge", "doubleedge", "petalblizzard", "temperflare", "supercellslam", "featherdance", "metalsound", + "curse", "hardpress", "dragoncheer", "alluringvoice", "psychicnoise", "upperhand" +] + +# 99% of this is a subset of TMs since Tutors no longer exist in the official games. +# Since addons use the source anyways, we will provide some minor redundancy to maintain support. :) +# The assumption here is if we decide to have special tutor moves, this list won't just repeat TMs. +# This list will probably be useless then, because deviating from official sets would require manual edits to the species files. +tutor_list = [ + "aerialace", "afteryou", "aircutter", "allyswitch", "ancientpower", "aquatail", "babydolleyes", + "bind", "blastburn", "block", "bounce", "bugbite", "bulkup", "bulldoze", + "burningjealousy", "calmmind", "chargebeam", "coaching", "corrosivegas", "covet", "darkpulse", + "dazzlinggleam", "defog", "dive", "dracometeor", "dragonascent", "dragonpulse", "drainpunch", + "drillrun", "dualchop", "dualwingbeat", "earthpower", "electroweb", "endeavor", "energyball", + "expandingforce", "falseswipe", "firefang", "firepledge", "firepunch", "flamethrower", "flashcannon", + "flipturn", "focusenergy", "focuspunch", "foulplay", "frenzyplant", "furycutter", "gastroacid", + "gigadrain", "gigaimpact", "grasspledge", "grassyglide", "gravity", "gunkshot", "healbell", + "heatwave", "helpinghand", "highhorsepower", "hydrocannon", "hyperbeam", "hypervoice", "iceball", + "icebeam", "icefang", "icepunch", "icywind", "irondefense", "ironhead", "irontail", + "knockoff", "laserfocus", "lashout", "lastresort", "leechlife", "liquidation", "lowkick", + "magiccoat", "magicroom", "magicalleaf", "magnetrise", "megahorn", "meteorbeam", "mistyexplosion", + "mudslap", "mysticalfire", "ominouswind", "outrage", "painsplit", "playrough", "poisonjab", + "poltergeist", "powershift", "psychic", "psychocut", "recycle", "relicsong", "rest", + "risingvoltage", "rockslide", "rocksmash", "roleplay", "rollout", "roost", "scaleshot", + "scorchingsands", "secretsword", "seedbomb", "shadowball", "shadowclaw", "shockwave", "signalbeam", + "skillswap", "skittersmack", "skyattack", "sleeptalk", "sludgebomb", "snarl", "snatch", + "snore", "spikes", "spite", "stealthrock", "steelbeam", "steelroller", "stompingtantrum", + "stoneedge", "stringshot", "suckerpunch", "superfang", "superpower", "swift", "synthesis", + "tailwind", "telekinesis", "terrainpulse", "throatchop", "thunderfang", "thunderpunch", "thunderbolt", + "triaattack", "trick", "tripleaxel", "twister", "uproar", "vacuumwave", "volttackle", + "waterpledge", "waterpulse", "wildcharge", "wonderroom", "worryseed", "xscissor", "zenheadbutt" +] + +# These Pokemon are always allowed to learn every External Move in the games. +# By "these" we mean Mew. Mew is the only one, but even it isn't always in every game. +# Unless the list of TMs ONLY represents games where Mew is present, this is necessary. +always_tm_species = [ + "mew" +] + +# These Pokemon are never allowed to learn any moves outside of their available set. +# Addons can do as they please, but "official" behavior says never-ever. +never_tm_species = [ + "magikarp", "ditto", "unown", "wobbuffet", "smeargle", "wynaut", "pyukumuku", "cosmog", "cosmoem" +] + +# These Pokemon would be part of the "never_tm" list if not for Tera Blast. +# We don't know if there will be other universal gimmick moves like Tera Blast, better safe than sorry. +# We still won't teach these anything aside from Tera Blast. +sometimes_tm_species = [ + "caterpie", "metapod", "weedle", "kakuna", "wurmple", "silcoon", "cascoon", "beldum", "kricketot", + "burmy", "combee", "tynamo", "scatterbug", "spewpa", "blipbug", "applin", "snom" +] + +# List of desired moves that are learned by everything, where Pokemon haven't appeared in a game its featured in. +# We should ideally never add to this list, best to make no assumptions on who learns what unless game data suggests. +# Protect and Substitute are examples of this, but not necessary since they have consistently appeared every game. +universal_tms = [ +] + +# Only do this because it is such a pivotal component of Terastal. +# It's also not quite just a "universal tm" because even more Pokemon than those learn it. +super_universal_tms = [ + "terablast" +] + +# List of moves that when available have been learnable by everyone, but haven't been TMs for some time. +# If desired, place these in universal_tms to replicate the behavior from the games these moves were TMs in. +# Otherwise, restrict them to only those who learn organically to avoid overcentralization. +# (You don't really want everything to learn Double Team and Swagger, right? RIGHT?!) +ambiguously_present_tms = [ + "captivate", "attract", "naturalgift", "secretpower", "confide", "swagger", + "doubleteam", "round", "snore" +] + +# Though they aren't in recent TM availability, Captivate and Attract are reasonably learnable by all who have a gender. +# If you want to include them as TMs, include them here. +# Note: Nincada/Ninjask lost these due to an additional rule with genderless evos. +gender_only_tms = [ +] + +# These are moves that have been designated as "signature moves" for particular Pokemon. +# While they could be functional TMs, only being learnable by one line is a deterrent. +# Note: Hidden Power, Return, and Frustration are formerly universal. +# Keep them here if you want "latest" mechanics, remove them if you long for the past. (Beware HP Ice Regieleki!) +signature_move_tms = [ + "volttackle", "hiddenpower", "return", "frustration", "secretsword", "relicsong", "dragonascent" +] + +# List of directories to process +base_directories = [ + 'species/generation1', 'species/generation2', 'species/generation3', 'species/generation4', + 'species/generation5', 'species/generation6', 'species/generation7', 'species/generation7b', + 'species/generation8', 'species/generation8a', 'species/generation9' +] +output_directory = 'species' + +def process_species_file(base_species_data, base_species_path, output_file_path): + os.makedirs(os.path.dirname(output_file_path), exist_ok=True) + + def process_moves(moves): + for move in tutor_list: + tutor_move = f"tutor:{move}" + if any(move in m for m in moves) and tutor_move not in moves: + moves.append(tutor_move) + + # Curates TM source for "tighter" representation of what is actually an externally available move. + # Note: This will break custom/datapackable TMs in the future and necessitates manual edits to get them to work. + moves = [move for move in moves if not (move.startswith('tm:') and move.split(':')[1] not in potential_tm_list and any( + move.split(':')[1] in m for m in moves if m.split(':')[0].isdigit() or m.startswith('egg:') + ))] + + # Give em the ol' sort-a-roo. + egg_moves = sorted([move for move in moves if move.startswith('egg:')]) + tm_moves = sorted([move for move in moves if move.startswith('tm:')]) + tutor_moves = sorted([move for move in moves if move.startswith('tutor:')]) + other_moves = [move for move in moves if not (move.startswith('tm:') or move.startswith('tutor:') or move.startswith('egg:'))] + + moves = other_moves + egg_moves + tm_moves + tutor_moves + + return moves + + # Mew? Mew. (Ensures Mew's functionality isn't compromised by the games' differing species/move availability.) + if base_species_data['name'].lower() in always_tm_species: + for move in potential_tm_list: + tm_move = f"tm:{move}" + if tm_move not in base_species_data['moves']: + base_species_data['moves'].append(tm_move) + + # Process base species moves + base_species_data['moves'] = process_moves(base_species_data.get('moves', [])) + + # Process moves for each form + for form in base_species_data.get('forms', []): + form['moves'] = process_moves(form.get('moves', [])) + + # Write the modified data to the output file + with open(output_file_path, 'w') as output_file: + json.dump(base_species_data, output_file, indent=2) + +# Process each species file in the base directories and its subdirectories +for base_directory in base_directories: + for root, _, files in os.walk(base_directory): + for filename in files: + if filename.endswith('.json'): + base_species_path = os.path.join(root, filename) + with open(base_species_path, 'r') as file: + base_species_data = json.load(file) + + relative_path = os.path.relpath(base_species_path, base_directory) + output_file_path = os.path.join(output_directory, base_directory.split('/')[-1], relative_path) + process_species_file(base_species_data, base_species_path, output_file_path) From 31195dacdb74300b2f1ed436a72b093ea906048d Mon Sep 17 00:00:00 2001 From: Konoha Date: Tue, 21 Jan 2025 09:57:35 -0500 Subject: [PATCH 070/121] Resolve invalid Molang expression for Golem sleep anim --- .../cobblemon/bedrock/pokemon/posers/0076_golem/golem.json | 2 +- .../bedrock/pokemon/posers/0076_golem/golem_alolan.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem.json index 5759a64380..3eb6ac3070 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem.json @@ -49,7 +49,7 @@ "namedAnimations": { "cry": "q.bedrock_stateful('dummy', 'cry')" }, - "animations": ["q.bedrock('golem', math.random(0, 1) < 0.4 ? 'wild_sleep3' : 'wild_sleep2' : 'wild_sleep1')"] + "animations": ["q.bedrock('golem', math.random(0, 1) < 0.4 ? 'wild_sleep3' : (math.random(0, 1) < 0.5 ? 'wild_sleep2' : 'wild_sleep1'))"] } } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem_alolan.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem_alolan.json index 4db8925576..853cf14d38 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem_alolan.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0076_golem/golem_alolan.json @@ -49,7 +49,7 @@ "namedAnimations": { "cry": "q.bedrock_stateful('dummy', 'cry')" }, - "animations": ["q.bedrock('golem_alolan', math.random(0, 1) < 0.4 ? 'wild_sleep3' : 'wild_sleep2' : 'wild_sleep1')"] + "animations": ["q.bedrock('golem_alolan', math.random() < 0.4 ? 'wild_sleep3' : (math.random() < 0.5 ? 'wild_sleep2' : 'wild_sleep1'))"] } } } \ No newline at end of file From a71cfaadc8753bb761acdaa9b26c5b7baa2805eb Mon Sep 17 00:00:00 2001 From: Konoha Date: Tue, 21 Jan 2025 11:17:02 -0500 Subject: [PATCH 071/121] Toggleable Mooshtank var. in dex Also stubs unimplemented branch regional evolutions (Avalugg/Weezing/Mr. Mime) + biome fix to fix chat spam in nether during night. --- .../dex_entries/pokemon/johto/miltank.json | 2 +- .../cobblemon/species/generation1/cubone.json | 58 +++++++++++++++++++ .../species/generation1/koffing.json | 4 +- .../cobblemon/species/generation4/mimejr.json | 4 +- .../species/generation6/bergmite.json | 4 +- .../evolution/regional/cubone_alolabiome.json | 4 +- .../evolution/regional/cubone_kantobiome.json | 2 +- 7 files changed, 68 insertions(+), 10 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/dex_entries/pokemon/johto/miltank.json b/common/src/main/resources/data/cobblemon/dex_entries/pokemon/johto/miltank.json index 78e898f09c..53ab6aa0a9 100644 --- a/common/src/main/resources/data/cobblemon/dex_entries/pokemon/johto/miltank.json +++ b/common/src/main/resources/data/cobblemon/dex_entries/pokemon/johto/miltank.json @@ -16,7 +16,7 @@ "displayName": "cobblemon.pokedex.variation.color", "icon": "cobblemon:textures/gui/pokedex/variation/color.png", "aspects": [ - "mooshtank-none", + "mooshtank-false", "mooshtank-red", "mooshtank-brown" ] diff --git a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json index 5964a9aa54..b1aaf4b71a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/cubone.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/cubone.json @@ -198,6 +198,10 @@ { "variant": "biome", "biomeAnticondition": "#cobblemon:evolution/regional/cubone_alolabiome" + }, + { + "variant": "biome", + "biomeAnticondition": "#minecraft:is_nether" } ] }, @@ -225,6 +229,31 @@ { "variant": "biome", "biomeAnticondition": "#cobblemon:evolution/regional/cubone_kantobiome" + }, + { + "variant": "biome", + "biomeAnticondition": "#minecraft:is_nether" + } + ] + }, + { + "id": "cubone_nether_marowakalola", + "variant": "level_up", + "result": "marowak alolan", + "consumeHeldItem": false, + "learnableMoves": [], + "requirements": [ + { + "variant": "level", + "minLevel": 28 + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_overworld" + }, + { + "variant": "biome", + "biomeCondition": "#minecraft:is_nether" } ] } @@ -267,6 +296,10 @@ { "variant": "biome", "biomeCondition": "#cobblemon:evolution/regional/cubone_kantobiome" + }, + { + "variant": "biome", + "biomeAnticondition": "#minecraft:is_nether" } ] }, @@ -290,6 +323,31 @@ { "variant": "biome", "biomeAnticondition": "#cobblemon:evolution/regional/cubone_kantobiome" + }, + { + "variant": "biome", + "biomeAnticondition": "#minecraft:is_nether" + } + ] + }, + { + "id": "cubone_nether_marowakalola", + "variant": "level_up", + "result": "marowak alolan", + "consumeHeldItem": false, + "learnableMoves": [], + "requirements": [ + { + "variant": "level", + "minLevel": 28 + }, + { + "variant": "biome", + "biomeAnticondition": "#cobblemon:is_overworld" + }, + { + "variant": "biome", + "biomeCondition": "#minecraft:is_nether" } ] } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json index 79365ff755..2592659e0f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/koffing.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/koffing.json @@ -181,7 +181,7 @@ { "id": "koffing_weezinggalar", "variant": "level_up", - "result": "weezing galarian", + "result": "weezing", "consumeHeldItem": false, "learnableMoves": [ "doublehit" @@ -248,7 +248,7 @@ { "id": "koffing_weezinggalar", "variant": "level_up", - "result": "weezing galarian", + "result": "weezing", "consumeHeldItem": false, "learnableMoves": [ "doublehit" diff --git a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json index 1c0d693b10..fc2f53d2b7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mimejr.json @@ -207,7 +207,7 @@ { "id": "mimejr_mrmimegalar", "variant": "level_up", - "result": "mrmime galarian", + "result": "mrmime", "consumeHeldItem": false, "learnableMoves": [], "requirements": [ @@ -272,7 +272,7 @@ { "id": "mimejr_mrmimegalar", "variant": "level_up", - "result": "mrmime galarian", + "result": "mrmime", "consumeHeldItem": false, "learnableMoves": [], "requirements": [ diff --git a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json index 0df526dcd0..e46dda5217 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/bergmite.json @@ -175,7 +175,7 @@ { "id": "bergmite_avalugghisui", "variant": "level_up", - "result": "avalugg hisuian", + "result": "avalugg", "consumeHeldItem": false, "learnableMoves": [ "rockslide" @@ -242,7 +242,7 @@ { "id": "bergmite_avalugghisui", "variant": "level_up", - "result": "avalugg hisuian", + "result": "avalugg", "consumeHeldItem": false, "learnableMoves": [ "rockslide" diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/regional/cubone_alolabiome.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/regional/cubone_alolabiome.json index 453bea596e..caaed91c87 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/regional/cubone_alolabiome.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/regional/cubone_alolabiome.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "#cobblemon:is_volcanic", - "#cobblemon:nether/is_desert" + "#cobblemon:is_beach", + "#cobblemon:is_volcanic" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/regional/cubone_kantobiome.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/regional/cubone_kantobiome.json index 4e476d6b60..ab27f871d4 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/regional/cubone_kantobiome.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/evolution/regional/cubone_kantobiome.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#cobblemon:is_sandy" + "#cobblemon:is_arid" ] } \ No newline at end of file From ebf01442226bcf7919664f2d96fad4c42bdf99b1 Mon Sep 17 00:00:00 2001 From: Veraxiel <86495981+Veraxiel@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:50:54 -0500 Subject: [PATCH 072/121] Removed space spawns for now. --- .../spawn_pool_world/0035_clefairy.json | 38 ------------------ .../spawn_pool_world/0036_clefable.json | 38 ------------------ .../spawn_pool_world/0173_cleffa.json | 38 ------------------ .../spawn_pool_world/0218_slugma.json | 40 ------------------- .../spawn_pool_world/0219_magcargo.json | 40 ------------------- .../spawn_pool_world/0337_lunatone.json | 17 -------- .../spawn_pool_world/0338_solrock.json | 4 +- .../spawn_pool_world/0343_baltoy.json | 22 ---------- .../spawn_pool_world/0344_claydol.json | 22 ---------- .../spawn_pool_world/0561_sigilyph.json | 24 ----------- .../spawn_pool_world/0605_elgyem.json | 38 ------------------ .../spawn_pool_world/0606_beheeyem.json | 38 ------------------ .../spawn_pool_world/0712_bergmite.json | 19 --------- .../spawn_pool_world/0713_avalugg.json | 19 --------- 14 files changed, 1 insertion(+), 396 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json index 6a36c69368..8467bb20d6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json @@ -88,44 +88,6 @@ "#cobblemon:is_spooky" ] } - }, - { - "id": "clefairy-5", - "pokemon": "clefairy", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "17-32", - "weight": 1.52, - "condition": { - "minSkyLight": 0, - "maxSkyLight": 7, - "biomes": [ - "#cobblemon:space/is_moon" - ] - } - }, - { - "id": "clefairy-6", - "pokemon": "clefairy", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "17-32", - "weight": 2.375, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_moon" - ] - } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json index 4dd707073f..f12a31a644 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json @@ -88,44 +88,6 @@ "#cobblemon:is_spooky" ] } - }, - { - "id": "clefable-5", - "pokemon": "clefable", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "27-48", - "weight": 0.08, - "condition": { - "minSkyLight": 0, - "maxSkyLight": 7, - "biomes": [ - "#cobblemon:space/is_moon" - ] - } - }, - { - "id": "clefable-6", - "pokemon": "clefable", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "27-48", - "weight": 0.125, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_moon" - ] - } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json index 3f9ce69d7a..2f2cfbd87c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0173_cleffa.json @@ -87,44 +87,6 @@ "#cobblemon:is_spooky" ] } - }, - { - "id": "cleffa-5", - "pokemon": "cleffa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "1-22", - "weight": 8.4, - "condition": { - "minSkyLight": 0, - "maxSkyLight": 7, - "biomes": [ - "#cobblemon:space/is_moon" - ] - } - }, - { - "id": "cleffa-6", - "pokemon": "cleffa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "1-22", - "weight": 7.5, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_moon" - ] - } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json index 2b7c76fde5..ac553bb0b2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0218_slugma.json @@ -80,46 +80,6 @@ "#minecraft:lava" ] } - }, - { - "id": "slugma-5", - "pokemon": "slugma", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "1-25", - "weight": 8.4, - "condition": { - "biomes": [ - "#cobblemon:space/is_fiery" - ], - "neededNearbyBlocks": [ - "#minecraft:lava" - ] - } - }, - { - "id": "slugma-6", - "pokemon": "slugma", - "presets": [ - "lava" - ], - "type": "pokemon", - "context": "surface", - "bucket": "uncommon", - "level": "1-25", - "weight": 8.4, - "condition": { - "biomes": [ - "#cobblemon:space/is_fiery" - ], - "neededNearbyBlocks": [ - "#minecraft:lava" - ] - } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json index 4f362def1c..927ea8d431 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0219_magcargo.json @@ -80,46 +80,6 @@ "#minecraft:lava" ] } - }, - { - "id": "magcargo-5", - "pokemon": "magcargo", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "38-43", - "weight": 1.6, - "condition": { - "biomes": [ - "#cobblemon:space/is_fiery" - ], - "neededNearbyBlocks": [ - "#minecraft:lava" - ] - } - }, - { - "id": "magcargo-6", - "pokemon": "magcargo", - "presets": [ - "lava" - ], - "type": "pokemon", - "context": "surface", - "bucket": "uncommon", - "level": "38-43", - "weight": 1.6, - "condition": { - "biomes": [ - "#cobblemon:space/is_fiery" - ], - "neededNearbyBlocks": [ - "#minecraft:lava" - ] - } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0337_lunatone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0337_lunatone.json index def875613d..b98d3bda0c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0337_lunatone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0337_lunatone.json @@ -95,23 +95,6 @@ "cobblemon:ruins/luna_henge_ruins" ] } - }, - { - "id": "lunatone-5", - "pokemon": "lunatone", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "21-46", - "weight": 6.0, - "condition": { - "biomes": [ - "#cobblemon:space/is_moon" - ] - } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0338_solrock.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0338_solrock.json index e906528da4..6127ae8c2c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0338_solrock.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0338_solrock.json @@ -109,10 +109,8 @@ "weight": 6.0, "condition": { "biomes": [ - "#cobblemon:space/is_mercury", "aether:skyroot_grove", - "aether:skyroot_meadow", - "#cobblemon:space/is_venus" + "aether:skyroot_meadow" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json index f362e795e4..f9936e805f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json @@ -48,28 +48,6 @@ "minY": 48 } }, - { - "id": "baltoy-3", - "pokemon": "baltoy", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-30", - "weight": 5.04, - "condition": { - "biomes": [ - "#cobblemon:space/is_mars" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:space/is_icy" - ] - } - }, { "id": "baltoy-4", "pokemon": "baltoy", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json index 4d181148c3..fcaf813540 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json @@ -48,28 +48,6 @@ "minY": 48 } }, - { - "id": "claydol-3", - "pokemon": "claydol", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "36-50", - "weight": 0.96, - "condition": { - "biomes": [ - "#cobblemon:space/is_mars" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:space/is_icy" - ] - } - }, { "id": "claydol-4", "pokemon": "claydol", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json index 753e2d026c..8ea85ef17f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json @@ -105,30 +105,6 @@ ] } }, - { - "id": "sigilyph-6", - "pokemon": "sigilyph", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "24-49", - "weight": 10.0, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_mars" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:space/is_icy" - ] - } - }, { "id": "sigilyph-7", "pokemon": "sigilyph", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json index 51e1002347..83d869c4b2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json @@ -64,44 +64,6 @@ ] } }, - { - "id": "elgyem-3", - "pokemon": "elgyem", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "9-34", - "weight": 8.4, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_space" - ] - } - }, - { - "id": "elgyem-4", - "pokemon": "elgyem", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "9-34", - "weight": 25.614, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_space" - ] - } - }, { "id": "elgyem-5", "pokemon": "elgyem", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json index dd57b8d5e7..802322d13b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0606_beheeyem.json @@ -64,44 +64,6 @@ ] } }, - { - "id": "beheeyem-3", - "pokemon": "beheeyem", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "42-49", - "weight": 1.6, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_space" - ] - } - }, - { - "id": "beheeyem-4", - "pokemon": "beheeyem", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "42-49", - "weight": 17.076, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_space" - ] - } - }, { "id": "beheeyem-5", "pokemon": "beheeyem", diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json index fea6c76a90..d5ce2df869 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0712_bergmite.json @@ -103,25 +103,6 @@ "#cobblemon:is_frozen_ocean" ] } - }, - { - "id": "bergmite-6", - "pokemon": "bergmite", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-30", - "weight": 8.4, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_icy" - ] - } } ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json index e537b5406b..436edda88e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0713_avalugg.json @@ -103,25 +103,6 @@ "#cobblemon:is_frozen_ocean" ] } - }, - { - "id": "avalugg-6", - "pokemon": "avalugg", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "37-51", - "weight": 1.6, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:space/is_icy" - ] - } } ] } \ No newline at end of file From 6ca04bb064c5b7298eac20e70c59d6ce2cca0481 Mon Sep 17 00:00:00 2001 From: Polymeta <4726322-Polymeta@users.noreply.gitlab.com> Date: Wed, 22 Jan 2025 00:24:16 +0000 Subject: [PATCH 073/121] Update 2 files - /common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json - /common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json --- .../{0591_amoongus.json => 0591_amoonguss.json} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename common/src/main/resources/data/cobblemon/spawn_pool_world/{0591_amoongus.json => 0591_amoonguss.json} (89%) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json similarity index 89% rename from common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json rename to common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json index 920d8e5203..6af3d28af2 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json @@ -4,8 +4,8 @@ "neededUninstalledMods": [], "spawns": [ { - "id": "amoongus-1", - "pokemon": "amoongus", + "id": "amoonguss-1", + "pokemon": "amoonguss", "presets": [ "natural" ], @@ -23,8 +23,8 @@ } }, { - "id": "amoongus-2", - "pokemon": "amoongus", + "id": "amoonguss-2", + "pokemon": "amoonguss", "presets": [ "natural" ], From 329810407a1a9b03cfbc56ec1bc0883eece4b1aa Mon Sep 17 00:00:00 2001 From: Teggy Date: Sun, 19 Jan 2025 12:38:16 +0000 Subject: [PATCH 074/121] Translated using Weblate (Spanish) Currently translated at 100.0% (6391 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/es/ --- .../assets/cobblemon/lang/es_es.json | 45 ++++++++++++++++++- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/es_es.json b/common/src/main/resources/assets/cobblemon/lang/es_es.json index 7cbea7c450..d5f2139951 100644 --- a/common/src/main/resources/assets/cobblemon/lang/es_es.json +++ b/common/src/main/resources/assets/cobblemon/lang/es_es.json @@ -5483,7 +5483,7 @@ "item.cobblemon.poke_rod": "Poké Caña", "item.cobblemon.pokerod_smithing_template": "Molde de herrería", "item.cobblemon.smithing_template.pokerod.base_slot_description": "Añadir caña de pescar", - "upgrade.cobblemon.pokerod": "Mejora de Poke Caña", + "upgrade.cobblemon.pokerod": "Mejora de Poké Caña", "cobblemon.pokerod.bobber": "Corcho: %1$s", "cobblemon.pokerod.bait": "Cebo: %1$s x%2$s", "item.cobblemon.pokedex_green": "Pokédex", @@ -6352,5 +6352,46 @@ "cobblemon.pokedex.variation.metal": "Metal", "cobblemon.battle.crit_spread": "¡Un golpe crítico a %1$s!", "cobblemon.battle.superEffective_spread": "¡Es supereficaz contra %1$s!", - "cobblemon.battle.resisted_spread": "No es muy eficaz contra %1$s." + "cobblemon.battle.resisted_spread": "No es muy eficaz contra %1$s.", + "cobblemon.challenge.multi.decline.disband": "Combate múltiple cancelado, se ha disuelto el equipo rival...", + "cobblemon.challenge.multi.decline.sender": "%1$s ha rechazado el combate múltiple de %2$s...", + "cobblemon.command.error.nonpc": "Error: Debes incluir un identificador de NPC válido.", + "advancements.cobblemon.use_bait": "¡Baya buen cebo!", + "advancements.cobblemon.craft_rod": "A pescar", + "advancements.cobblemon.craft_rod.description": "Fabrica una Poké Caña usando una mejora de Poké Caña", + "advancements.cobblemon.use_bait.description": "Usa una baya como cebo en tu Poké Caña", + "advancements.cobblemon.craft_master_rod.description": "Fabrica una Poké Caña usando una Master Ball", + "advancements.cobblemon.craft_master_rod": "Dedicación magistral", + "cobblemon.battle.shift": "%1$s se movió al centro", + "cobblemon.challenge.pending": "¡Aún no has respondido al desafío de %1$s!", + "cobblemon.challenge.multi.team_request.receiver": "¡%1$s ha solicitado hacer equipo contigo para combates múltiples!", + "cobblemon.challenge.multi.team_request.decline.receiver": "¡%1$s ha rechazado tu solicitud para hacer equipo!", + "cobblemon.challenge.multi.leave": "Abandonar", + "cobblemon.challenge.request_team_join_title": "Unirse al equipo", + "cobblemon.challenge.multi.sender": "¡Has desafiado a %1$s (del equipo de %2$s) a un combate múltiple!", + "cobblemon.challenge.multi.decline.receiver": "%1$s ha rechazado el combate múltiple...", + "cobblemon.command.freezepokemon.non_pokemon": "No estás mirando hacia ningún Pokémon.", + "itemGroup.cobblemon.utility_item": "Objetos Útiles", + "cobblemon.pokedex.variation.region_bias": "Forma regional", + "cobblemon.pokedex.variation.breed": "Variedad", + "cobblemon.challenge.challenge": "Desafiar", + "cobblemon.challenge.request_battle_title": "Petición de combate", + "cobblemon.challenge.rule.level": "Todos al nivel %1$s", + "cobblemon.challenge.rule.anything_goes": "Todo vale", + "cobblemon.challenge.multi.team_request.sender": "¡Has solicitado a %1$s hacer equipo para combates múltiples!", + "cobblemon.challenge.request_team_leave_title": "Abandonar el equipo", + "cobblemon.challenge.multi.team_request.accept.sender": "¡Has aceptado la solicitud de %1$s para hacer equipo!", + "cobblemon.challenge.multi.team_request.accept.receiver": "¡%1$s ha aceptado tu solicitud para hacer equipo!", + "cobblemon.challenge.multi.team_request.decline.sender": "¡Has rechazado la solicitud de %1$s para hacer equipo!", + "cobblemon.challenge.multi.team_remove.receiver": "¡%1$s abandonó el equipo!", + "cobblemon.challenge.multi.team_remove.sender": "¡Has abandonado el equipo!", + "cobblemon.challenge.multi.team_disband": "El equipo se ha disuelto.", + "cobblemon.challenge.multi.team_reject.existing_team": "¡Ya formas parte de un equipo!", + "cobblemon.challenge.multi.team_reject.max_team_size": "No puedes unirte al equipo, ya está completo", + "cobblemon.challenge.multi.receiver": "¡%1$s (del equipo de %2$s) te desafía a un combate múltiple!", + "cobblemon.challenge.multi.decline.sender.personal": "Has rechazado el combate múltiple de %1$s...", + "cobblemon.challenge.decline.sender": "Has rechazado combatir con %1$s...", + "cobblemon.challenge.decline.receiver": "%1$s ha rechazado combatir contigo...", + "cobblemon.battle.center": "¡Al centro automáticamente!", + "npc.sacchi.name": "Profesora Sacchi" } From b430b8a1b449df0847fb4b3f0ca0c2265fb99f9c Mon Sep 17 00:00:00 2001 From: washashu0905 Date: Tue, 21 Jan 2025 08:07:08 +0000 Subject: [PATCH 075/121] Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 79.6% (5091 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/zh_Hant/ --- .../assets/cobblemon/lang/zh_tw.json | 161 +++++++++++++++++- 1 file changed, 160 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json index 89863bb091..127b2b7bed 100644 --- a/common/src/main/resources/assets/cobblemon/lang/zh_tw.json +++ b/common/src/main/resources/assets/cobblemon/lang/zh_tw.json @@ -5913,5 +5913,164 @@ "cobblemon.move.filletaway": "甩肉", "cobblemon.move.filletaway.desc": "削減自己的ＨＰ，大幅提高自己的攻擊、特攻和速度。", "cobblemon.move.flowertrick": "千變萬花", - "cobblemon.move.flowertrick.desc": "將動過手腳的花束投向對手進行攻擊。必定會命中並擊中要害。" + "cobblemon.move.flowertrick.desc": "將動過手腳的花束投向對手進行攻擊。必定會命中並擊中要害。", + "cobblemon.move.gmaxresonance": "超極巨極光旋律", + "cobblemon.move.gmaxsmite.desc": "超極巨化的布莉姆溫使出的妖精屬性攻擊。會讓對手陷入混亂狀態。", + "cobblemon.move.gmaxterror": "超極巨幻影幽魂", + "cobblemon.move.gmaxsnooze": "超極巨睡魔降臨", + "cobblemon.move.hydrosteam": "水蒸氣", + "cobblemon.move.hydrosteam.desc": "將滾燙的水猛烈地噴向對手。日照很強時，招式威力不但不會降低，還會變成１.５倍。", + "cobblemon.move.icespinner": "冰旋", + "cobblemon.move.kowtowcleave": "仆斬", + "cobblemon.move.lastrespects": "掃墓", + "cobblemon.move.luminacrash": "琉光衝激", + "cobblemon.move.luminacrash.desc": "發出對精神也會起作用的奇異光線進行攻擊。大幅降低對手的特防。", + "cobblemon.move.lunarblessing": "新月祈禱", + "cobblemon.move.lunarblessing.desc": "向新月獻上祈禱，回復自己和場上同伴的ＨＰ和狀態。", + "cobblemon.move.magicaltorque": "魔法暴衝", + "cobblemon.move.magicaltorque.desc": "魔法暴衝有30%的機率使目標陷入混亂狀態。", + "cobblemon.move.malignantchain": "邪毒鎖鏈", + "cobblemon.move.malignantchain.desc": "用毒素形成的鎖鏈纏住對手，注入毒素加以侵蝕。有時會讓對手陷入劇毒狀態。", + "cobblemon.move.mortalspin": "晶光轉轉", + "cobblemon.move.mortalspin.desc": "藉由旋轉來攻擊對手。也可以擺脫綁緊、緊束、寄生種子等招式。讓對手陷入中毒狀態。", + "cobblemon.move.mountaingale": "冰山風", + "cobblemon.move.mountaingale.desc": "將冰山般巨大的冰塊砸向對手進行攻擊。有時會使對手畏縮。", + "cobblemon.move.neverendingnightmare.desc": "透過Ｚ力量召喚強烈的怨念，全力降禍到對手身上。威力會隨原本的招式而改變。", + "cobblemon.move.noxioustorque.desc": "劇毒暴衝有30%的機率使目標陷入中毒狀態。", + "cobblemon.move.orderup.desc": "以瀟灑的身段進行攻擊。若口中有米立龍，會依米立龍的姿勢而提高不同能力。", + "cobblemon.move.populationbomb": "鼠數兒", + "cobblemon.move.pounce.desc": "撲向對手進行攻擊。可降低對手的速度。", + "cobblemon.move.powershift": "力量轉換", + "cobblemon.move.psyshieldbash": "屏障猛攻", + "cobblemon.move.psyshieldbash.desc": "讓意念的能量圍繞全身，撞向對手進行攻擊。提高自己的防禦。", + "cobblemon.move.ragefist": "憤怒之拳", + "cobblemon.move.ragefist.desc": "將憤怒化為能量進行攻擊。受到的攻擊次數越多，招式的威力越大。", + "cobblemon.move.ragingbull": "怒牛", + "cobblemon.move.ragingfury": "大憤慨", + "cobblemon.move.ragingfury.desc": "在２～３回合內放出火焰，同時瘋狂亂打。大鬧一番後自己會陷入混亂。", + "cobblemon.move.recharge": "恢复精力", + "cobblemon.move.revivalblessing": "復生祈禱", + "cobblemon.move.revivalblessing.desc": "懷著慈愛之心祈禱，使後備中瀕死的寶可夢以一半的ＨＰ復活。", + "cobblemon.move.ruination": "大災難", + "cobblemon.move.ruination.desc": "捲起破滅之災厄，使對手的ＨＰ減半。", + "cobblemon.move.saltcure": "鹽醃", + "cobblemon.move.saltcure.desc": "讓對手陷入鹽醃狀態，每回合都會受到傷害。鋼、水屬性的寶可夢還會更痛苦。", + "cobblemon.move.sandsearstorm": "熱沙風暴", + "cobblemon.move.sandsearstorm.desc": "用灼熱的沙子和強烈的風席捲對手進行攻擊。有時會讓對手陷入灼傷狀態。", + "cobblemon.move.savagespinout": "絕對捕食迴旋斬", + "cobblemon.move.savagespinout.desc": "透過Ｚ力量用吐出的絲線全力束縛對手。威力會隨原本的招式而改變。", + "cobblemon.move.shatteredpsyche": "至高精神破壞波", + "cobblemon.move.shedtail": "斷尾", + "cobblemon.move.shedtail.desc": "削減自己的ＨＰ，製造分身後返回，和後備寶可夢進行替換。", + "cobblemon.move.silktrap": "線阱", + "cobblemon.move.snowscape": "雪景", + "cobblemon.move.spicyextract": "辣椒精華", + "cobblemon.move.spicyextract.desc": "放出相當強勁的辣味精華。對手的攻擊會大幅提高，防禦會大幅降低。", + "cobblemon.move.spinout": "疾速轉輪", + "cobblemon.move.springtidestorm": "陽春風暴", + "cobblemon.move.springtidestorm.desc": "用交織著愛與恨的烈風席捲對手進行攻擊。有時會降低對手的攻擊。", + "cobblemon.move.stoneaxe": "岩斧", + "cobblemon.move.stoneaxe.desc": "用岩石之斧進行攻擊。散落的岩石碎片會在對手周圍飄浮。", + "cobblemon.move.subzeroslammer": "激狂大地萬里冰", + "cobblemon.move.supersonicskystrike": "極速俯衝轟烈撞", + "cobblemon.move.takeheart.desc": "鼓起衝勁，治癒自己的異常狀態，同時提高自己的特攻和特防。", + "cobblemon.move.tectonicrage": "地隆嘯天大終結", + "cobblemon.move.doubleshock.desc": "施放全身的所有電力給予對手巨大的傷害，自己的電屬性將會消失。", + "cobblemon.move.electrodrift.desc": "一邊變形，一邊以超高速度奔馳，未知的電流將貫穿對手。打到弱點時威力會更為增加。", + "cobblemon.move.gigavolthavoc.desc": "透過Ｚ力量將蓄積的強大電流全力撞向對手。威力會隨原本的招式而改變。", + "cobblemon.move.gmaxfinale": "超極巨幸福圓滿", + "cobblemon.move.gmaxfireball": "超極巨破陣火球", + "cobblemon.move.gmaxfinale.desc": "超極巨化的霜奶仙使出的妖精屬性攻擊。可回復我方的ＨＰ。", + "cobblemon.move.gmaxfireball.desc": "超極巨化的閃焰王牌使出的火屬性攻擊。不會受到對手特性的干擾。", + "cobblemon.move.gmaxgoldrush": "超極巨特大金幣", + "cobblemon.move.gmaxgoldrush.desc": "超極巨化的喵喵使出的一般屬性攻擊。會讓對手陷入混亂狀態，並可獲得金錢。", + "cobblemon.move.gmaxgravitas": "超極巨天道七星", + "cobblemon.move.gmaxhydrosnipe": "超極巨狙擊神射", + "cobblemon.move.gmaxfoamburst": "超極巨激漩泡渦", + "cobblemon.move.gmaxfoamburst.desc": "超極巨化的巨钳蟹使出的水屬性攻擊。會大幅降低對手速度。", + "cobblemon.move.gmaxgravitas.desc": "超極巨化的以歐路普使出的超能力屬性攻擊。在５回合内重力會產生變化。", + "cobblemon.move.gmaxhydrosnipe.desc": "超極巨化的千面避役使出的水屬性攻擊。不會受到對手的特性干擾。", + "cobblemon.move.gmaxmalodor": "超極巨臭氣沖天", + "cobblemon.move.gmaxmeltdown.desc": "超極巨化的美錄梅塔使出的鋼屬性攻擊。會讓對手無法連續使出相同的招式。", + "cobblemon.move.gmaxoneblow": "超極巨奪命一擊", + "cobblemon.move.gmaxoneblow.desc": "超極巨化的武道熊師使出的惡屬性攻擊。是可以無視極巨防壁的一擊。", + "cobblemon.move.gmaxmalodor.desc": "超極巨化的灰塵山使出的毒屬性攻擊。會讓對手陷入中毒狀態。", + "cobblemon.move.gmaxmeltdown": "超極巨液金熔擊", + "cobblemon.move.gmaxrapidflow": "超極巨流水連擊", + "cobblemon.move.gmaxreplenish.desc": "超極巨化的卡比獸使出的一般屬性攻擊。會讓吃掉的樹果再生。", + "cobblemon.move.gmaxresonance.desc": "超極巨化的拉普拉斯使出的冰屬性攻擊。可在５回合内減弱受到的傷害。", + "cobblemon.move.gmaxsandblast": "超極巨沙塵漫天", + "cobblemon.move.gmaxsandblast.desc": "超極巨化的沙螺蟒使出的地面屬性攻擊。在４～５回合内會狂刮沙暴。", + "cobblemon.move.gmaxrapidflow.desc": "超極巨化的武道熊師使出的水屬性攻擊。是可以無視極巨防壁的連擊。", + "cobblemon.move.gmaxreplenish": "超極巨資源再生", + "cobblemon.move.gmaxstonesurge": "超極巨岩陣以待", + "cobblemon.move.gmaxsteelsurge": "超極巨鋼鐵陣法", + "cobblemon.move.gmaxsmite": "超極巨天譴雷誅", + "cobblemon.move.gmaxsnooze.desc": "超極巨化的長毛巨魔使出的惡屬性攻擊。會通過打大哈欠讓對手產生睡意。", + "cobblemon.move.gmaxsteelsurge.desc": "超極巨化的大王銅象使出的鋼屬性攻擊。會發射無數銳利的刺。", + "cobblemon.move.gmaxstonesurge.desc": "超極巨化的暴噬龜使出的水屬性攻擊。會發射無數銳利的岩石。", + "cobblemon.move.gmaxsweetness": "超極巨瓊漿玉液", + "cobblemon.move.gmaxsweetness.desc": "超極巨化的豐蜜龍使出的草屬性攻擊。會治癒我方的異常狀態。", + "cobblemon.move.gmaxtartness": "超極巨酸不溜丟", + "cobblemon.move.gmaxtartness.desc": "超極巨化的蘋裹龍使出的草屬性攻擊。會降低對手的閃避率。", + "cobblemon.move.gmaxvinelash": "超極巨灰飛鞭滅", + "cobblemon.move.gmaxvinelash.desc": "超極巨化的妙蛙花使出的草屬性攻擊。可在４回合内給予對手傷害。", + "cobblemon.move.gmaxvolcalith": "超極巨炎石噴發", + "cobblemon.move.gmaxwindrage": "超極巨旋風襲捲", + "cobblemon.move.gmaxwindrage.desc": "超極巨化的鋼鎧鴉使出的飛行屬性攻擊。可消除反射壁和光牆。", + "cobblemon.move.hydrovortex": "超級水流大漩渦", + "cobblemon.move.hydrovortex.desc": "透過Ｚ力量製造大大的潮旋，全力吞沒對手。威力會隨原本的招式而改變。", + "cobblemon.move.icespinner.desc": "在腳上包覆薄冰，骨碌碌地旋轉並進行撞擊。以旋轉的動作破壞場地。", + "cobblemon.move.infernooverdrive.desc": "透過Ｚ力量噴出熊熊烈火，全力撞向對手。威力會隨原本的招式而改變。", + "cobblemon.move.jetpunch": "噴射拳", + "cobblemon.move.jetpunch.desc": "讓激流圍繞在拳頭上，以迅雷不及掩耳之勢出拳。必定能夠發動先制攻擊。", + "cobblemon.move.gmaxvolcalith.desc": "超極巨化的巨炭山使出的岩石屬性攻擊。可在４回合内給予對手傷害。", + "cobblemon.move.gmaxterror.desc": "超極巨化的耿鬼使出的幽靈屬性攻擊。會踩住對手的影子，使其無法被替換。", + "cobblemon.move.gmaxvoltcrash.desc": "超極巨化的皮卡丘使出的電屬性攻擊。會讓對手陷入麻痹狀態。", + "cobblemon.move.gmaxstunshock": "超極巨異毒電場", + "cobblemon.move.infernooverdrive": "超強極限爆焰彈", + "cobblemon.move.populationbomb.desc": "夥伴們紛紛聚集而來，以群體形式逐一給予攻擊。連續命中１～１０次。", + "cobblemon.move.shelter.desc": "讓皮膚變得像鐵盾般堅硬，大幅提高自己的防禦。", + "cobblemon.move.headlongrush.desc": "對手使出灌注了全心全力的撞擊。自己的防禦和特防會降低。", + "cobblemon.move.gmaxwildfire.desc": "超極巨化的噴火龍使出的火屬性攻擊。可在４回合内給予對手傷害。", + "cobblemon.move.makeitrain": "淘金潮", + "cobblemon.move.shatteredpsyche.desc": "透過Ｚ力量操縱對手，全力使其感受到痛苦。威力會隨原本的招式而改變。", + "cobblemon.move.spinout.desc": "藉由在腳上負重來劇烈地旋轉並給予傷害。自己的速度會大幅降低。", + "cobblemon.move.headlongrush": "突飛猛撲", + "cobblemon.move.gmaxwildfire": "超極巨地獄滅焰", + "cobblemon.move.hyperdrill": "強力鑽", + "cobblemon.move.infernalparade": "群魔亂舞", + "cobblemon.move.kowtowcleave.desc": "向對手下跪使其大意，接著對其劈斬。攻擊必定會命中。", + "cobblemon.move.gmaxvoltcrash": "超極巨萬雷轟頂", + "cobblemon.move.infernalparade.desc": "用無數的火球進行攻擊，有時會讓對手陷入灼傷狀態。攻擊處於異常狀態的對手時，威力會變成２倍。", + "cobblemon.move.gmaxstunshock.desc": "超極巨化的顫弦蠑螈使出的電屬性攻擊。會讓對手陷入中毒或麻痺狀態。", + "cobblemon.move.ragingbull.desc": "憤怒狂亂的暴牛發動之猛烈衝撞。招式的屬性會依形態而改變，並可破壞光牆和反射壁等。", + "cobblemon.move.silktrap.desc": "布下線製成的陷阱。防住對手攻擊的同時，降低接觸到的對手的速度。", + "cobblemon.move.snowscape.desc": "在５回合內會下雪。冰屬性寶可夢的防禦會提高。", + "cobblemon.move.supersonicskystrike.desc": "透過Ｚ力量猛烈地飛向天空，向著對手全力墜下。威力會隨原本的招式而改變。", + "cobblemon.move.hyperdrill.desc": "高速旋轉尖銳的身體部位進行貫穿。可無視對手的守住和看穿等招式。", + "cobblemon.move.makeitrain.desc": "撒出大量硬幣進行攻擊。自己的特攻會降低。戰鬥後還可以得到錢。", + "cobblemon.move.subzeroslammer.desc": "透過Ｚ力量急遽降低氣溫，全力冰凍對手。威力會隨原本的招式而改變。", + "cobblemon.move.tectonicrage.desc": "透過Ｚ力量潛入地底深處，全力撞擊對手。威力會隨原本的招式而改變。", + "cobblemon.move.lastrespects.desc": "為了替夥伴雪恨而攻擊。被打倒的我方寶可夢越多，招式威力就會越強。", + "cobblemon.move.mysticalpower": "神秘之力", + "cobblemon.move.mysticalpower.desc": "放出不可思議的力量進行攻擊。自己的特攻會提高。", + "cobblemon.move.noxioustorque": "劇毒暴衝", + "cobblemon.move.orderup": "上菜", + "cobblemon.move.pounce": "蟲撲", + "cobblemon.move.powershift.desc": "將自己的攻擊與防禦互相交換。", + "cobblemon.ability.zerotohero": "全能變身", + "cobblemon.ability.zerotohero.desc": "離場後會變為全能形態。", + "cobblemon.move.chillingwater": "潑冷水", + "cobblemon.move.doubleshock": "電光雙擊", + "cobblemon.move.neverendingnightmare": "無盡暗夜之誘惑", + "cobblemon.move.takeheart": "勇氣填充", + "cobblemon.entity.pokemon": "寶可夢", + "cobblemon.move.shelter": "閉關", + "cobblemon.move.chillingwater.desc": "潑灑冰冷到足以讓對手失去活力的水進行攻擊，可降低對手的攻擊。", + "cobblemon.move.chillyreception": "冷笑話", + "cobblemon.move.chillyreception.desc": "留下使場面凍結的笑話後，和後備寶可夢進行替換，在５回合內會下雪。", + "cobblemon.move.chloroblast": "葉綠爆震", + "cobblemon.move.chloroblast.desc": "將自身的葉綠素凝聚起來後放出去進行攻擊，自己也會受到傷害。", + "cobblemon.move.electrodrift": "閃電猛衝" } From 6b43e5d99d1d6ee1be6870e4c17df08d23c29d7e Mon Sep 17 00:00:00 2001 From: Polymeta <4726322-Polymeta@users.noreply.gitlab.com> Date: Wed, 22 Jan 2025 08:27:24 +0000 Subject: [PATCH 076/121] more fixes --- CHANGELOG.md | 3 +++ .../main/kotlin/com/cobblemon/mod/common/Cobblemon.kt | 2 +- .../mod/common/api/pokemon/PokemonProperties.kt | 2 +- .../client/net/settings/ServerSettingsPacketHandler.kt | 2 ++ .../mod/common/client/settings/ServerSettings.kt | 2 ++ .../com/cobblemon/mod/common/datafixer/fix/FeatureFix.kt | 9 ++++++--- .../mod/common/datafixer/fix/ShoulderStateJsonFix.kt | 8 +++++--- .../net/messages/client/settings/ServerSettingsPacket.kt | 8 ++++++-- .../mod/common/util/codec/internal/ClientPokemonP1.kt | 8 ++++++-- .../mod/common/util/codec/internal/ClientPokemonP2.kt | 6 +++++- .../mod/common/util/codec/internal/ClientPokemonP3.kt | 4 ++++ 11 files changed, 41 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3d39c127c..ebbcad55b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -159,6 +159,9 @@ - Fix Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames. - Fixed Berries not giving bonus yields when planted in their preferred biomes - Fix NeoForge not supporting "SodiumDynamicLights" +- Fix Players disconnecting from servers if they made changes to certain config options +- Fix JSON stores not loading properly if player with shouldered Pokémon is migrating from 1.5.2 into 1.6 +- Fix PokemonProperties ability=myAbility being declared as forced despite being legal for the Pokémon ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt b/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt index 87ea0e4578..ec08c33475 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt @@ -220,7 +220,7 @@ object Cobblemon { storage.onPlayerDataSync(it) playerDataManager.syncAllToPlayer(it) starterHandler.handleJoin(it) - ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel, this.config.maxPokemonLevel).sendToPlayer(it) + ServerSettingsPacket(this.config.preventCompletePartyDeposit, this.config.displayEntityLevelLabel, this.config.displayEntityNameLabel, this.config.maxPokemonLevel, this.config.maxPokemonFriendship, this.config.maxDynamaxLevel).sendToPlayer(it) } PlatformEvents.SERVER_PLAYER_LOGOUT.subscribe { PCLinkManager.removeLink(it.player.uuid) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt index 07064774a0..a1c083aa64 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt @@ -809,7 +809,7 @@ open class PokemonProperties { private fun createAbility(id: String, form: FormData): Ability? { val ability = Abilities.get(id) ?: return null val potentialAbility = form.abilities.firstOrNull { potential -> potential.template == ability } ?: return ability.create(true) - return potentialAbility.template.create(false) + return potentialAbility.template.create(false, potentialAbility.priority) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/settings/ServerSettingsPacketHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/settings/ServerSettingsPacketHandler.kt index 8d29dbf3bc..5378c110a4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/settings/ServerSettingsPacketHandler.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/settings/ServerSettingsPacketHandler.kt @@ -19,6 +19,8 @@ object ServerSettingsPacketHandler : ClientNetworkPacketHandler() + var featureTag = mutableListOf() if (dynamic.value is CompoundTag) { var rootTag = dynamic.value as CompoundTag var species = PokemonSpecies.getByIdentifier(rootTag.getString(DataKeys.POKEMON_SPECIES_IDENTIFIER).asResource()) if (species == null) { return dynamic } - SpeciesFeatures.getFeaturesFor(species!!).forEach { + SpeciesFeatures.getFeaturesFor(species).forEach { val feature = it(rootTag) ?: return@forEach var tag = CompoundTag() tag.putString(FEATURE_ID, feature.name) @@ -51,7 +51,10 @@ class FeatureFix(output: Schema) : PokemonFix(output) { } else if (dynamic.value is JsonElement) { var rootTag = (dynamic.value as JsonElement).asJsonObject var species = PokemonSpecies.getByIdentifier(rootTag.get(DataKeys.POKEMON_SPECIES_IDENTIFIER).asString.asResource()) - SpeciesFeatures.getFeaturesFor(species!!).forEach { + if (species == null) { + return dynamic + } + SpeciesFeatures.getFeaturesFor(species).forEach { val feature = it(rootTag) ?: return@forEach var tag = CompoundTag() tag.putString(FEATURE_ID, feature.name) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/ShoulderStateJsonFix.kt b/common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/ShoulderStateJsonFix.kt index 841a748355..1370f3f555 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/ShoulderStateJsonFix.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/ShoulderStateJsonFix.kt @@ -8,18 +8,20 @@ package com.cobblemon.mod.common.datafixer.fix +import com.cobblemon.mod.common.util.DataKeys import com.mojang.datafixers.schemas.Schema import com.mojang.serialization.Dynamic class ShoulderStateJsonFix(output: Schema) : PokemonFix(output) { override fun fixPokemonData(dynamic: Dynamic<*>): Dynamic<*> { - val moveSetJson = dynamic.get("State").result() + val stateJson = dynamic.get("State").result() //State not here - if (moveSetJson.isEmpty) { + if (stateJson.isEmpty) { return dynamic } - if (moveSetJson.get().mapValues.getOrThrow().size == 0) { + if (stateJson.get().mapValues.getOrThrow().isEmpty() || + !stateJson.get().mapValues.getOrThrow().containsKey(dynamic.createString(DataKeys.POKEMON_STATE_TYPE))) { return dynamic.remove("State") } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/settings/ServerSettingsPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/settings/ServerSettingsPacket.kt index 71b0477b8e..620ca254d2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/settings/ServerSettingsPacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/settings/ServerSettingsPacket.kt @@ -23,7 +23,9 @@ class ServerSettingsPacket internal constructor( val preventCompletePartyDeposit: Boolean, val displayEntityLevelLabel: Boolean, val displayEntityNameLabel: Boolean, - val maxPokemonLevel: Int + val maxPokemonLevel: Int, + val maxPokemonFriendship: Int, + val maxDynamaxLevel: Int ) : NetworkPacket { override val id = ID override fun encode(buffer: RegistryFriendlyByteBuf) { @@ -31,9 +33,11 @@ class ServerSettingsPacket internal constructor( buffer.writeBoolean(Cobblemon.config.displayEntityLevelLabel) buffer.writeBoolean(Cobblemon.config.displayEntityNameLabel) buffer.writeInt(Cobblemon.config.maxPokemonLevel) + buffer.writeInt(Cobblemon.config.maxPokemonFriendship) + buffer.writeInt(Cobblemon.config.maxDynamaxLevel) } companion object { val ID = cobblemonResource("server_settings") - fun decode(buffer: RegistryFriendlyByteBuf) = ServerSettingsPacket(buffer.readBoolean(), buffer.readBoolean(), buffer.readBoolean(), buffer.readInt()) + fun decode(buffer: RegistryFriendlyByteBuf) = ServerSettingsPacket(buffer.readBoolean(), buffer.readBoolean(), buffer.readBoolean(), buffer.readInt(), buffer.readInt(), buffer.readInt()) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP1.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP1.kt index fd58ca746d..7ab068f212 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP1.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP1.kt @@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.moves.MoveSet import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures import com.cobblemon.mod.common.api.pokemon.feature.SynchronizedSpeciesFeature import com.cobblemon.mod.common.api.pokemon.feature.SynchronizedSpeciesFeatureProvider +import com.cobblemon.mod.common.client.settings.ServerSettings import com.cobblemon.mod.common.pokemon.* import com.cobblemon.mod.common.util.DataKeys import com.cobblemon.mod.common.util.codec.CodecUtils @@ -99,15 +100,18 @@ internal class ClientPokemonP1( const val FEATURES = "Features" const val FEATURE_ID = "${Cobblemon.MODID}:feature_id" + /** + * do not use cobblemon.config in here, as this is used by the client whose config is different to server, always use [ServerSettings] + */ internal val CODEC: MapCodec = RecordCodecBuilder.mapCodec { instance -> instance.group( UUIDUtil.LENIENT_CODEC.fieldOf(DataKeys.POKEMON_UUID).forGetter(ClientPokemonP1::uuid), Species.BY_IDENTIFIER_CODEC.fieldOf(DataKeys.POKEMON_SPECIES_IDENTIFIER).forGetter(ClientPokemonP1::species), Codec.STRING.fieldOf(DataKeys.POKEMON_FORM_ID).forGetter { pokemon -> pokemon.form.formOnlyShowdownId() }, ComponentSerialization.CODEC.optionalFieldOf(DataKeys.POKEMON_NICKNAME).forGetter(ClientPokemonP1::nickname), - CodecUtils.dynamicIntRange(1) { Cobblemon.config.maxPokemonLevel }.fieldOf(DataKeys.POKEMON_LEVEL).forGetter(ClientPokemonP1::level), + CodecUtils.dynamicIntRange(1) { ServerSettings.maxPokemonLevel }.fieldOf(DataKeys.POKEMON_LEVEL).forGetter(ClientPokemonP1::level), Codec.intRange(0, Int.MAX_VALUE).fieldOf(DataKeys.POKEMON_EXPERIENCE).forGetter(ClientPokemonP1::experience), - CodecUtils.dynamicIntRange(0) { Cobblemon.config.maxPokemonFriendship }.fieldOf(DataKeys.POKEMON_FRIENDSHIP).forGetter(ClientPokemonP1::friendship), + CodecUtils.dynamicIntRange(0) { ServerSettings.maxPokemonFriendship }.fieldOf(DataKeys.POKEMON_FRIENDSHIP).forGetter(ClientPokemonP1::friendship), Codec.intRange(0, Int.MAX_VALUE).fieldOf(DataKeys.POKEMON_HEALTH).forGetter(ClientPokemonP1::currentHealth), Gender.CODEC.fieldOf(DataKeys.POKEMON_GENDER).forGetter(ClientPokemonP1::gender), IVs.CODEC.fieldOf(DataKeys.POKEMON_IVS).forGetter(ClientPokemonP1::ivs), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP2.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP2.kt index e4bcaae981..c44419465e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP2.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP2.kt @@ -10,6 +10,7 @@ package com.cobblemon.mod.common.util.codec.internal import com.cobblemon.mod.common.Cobblemon import com.cobblemon.mod.common.api.types.tera.TeraType +import com.cobblemon.mod.common.client.settings.ServerSettings import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket.Companion.convertToDisplay import com.cobblemon.mod.common.pokeball.PokeBall import com.cobblemon.mod.common.pokemon.* @@ -71,6 +72,9 @@ internal data class ClientPokemonP2( } companion object { + /** + * do not use cobblemon.config in here, as this is used by the client whose config is different to server, always use [ServerSettings] + */ internal val CODEC: MapCodec = RecordCodecBuilder.mapCodec { instance -> instance.group( ShoulderedState.CODEC.optionalFieldOf(DataKeys.POKEMON_STATE).forGetter(ClientPokemonP2::state), @@ -86,7 +90,7 @@ internal data class ClientPokemonP2( CompoundTag.CODEC.fieldOf(DataKeys.POKEMON_PERSISTENT_DATA).forGetter(ClientPokemonP2::persistentData), UUIDUtil.LENIENT_CODEC.optionalFieldOf(DataKeys.TETHERING_ID).forGetter(ClientPokemonP2::tetheringId), TeraType.BY_IDENTIFIER_CODEC.fieldOf(DataKeys.POKEMON_TERA_TYPE).forGetter(ClientPokemonP2::teraType), - CodecUtils.dynamicIntRange(0) { Cobblemon.config.maxDynamaxLevel }.fieldOf(DataKeys.POKEMON_DMAX_LEVEL).forGetter(ClientPokemonP2::dmaxLevel), + CodecUtils.dynamicIntRange(0) { ServerSettings.maxDynamaxLevel }.fieldOf(DataKeys.POKEMON_DMAX_LEVEL).forGetter(ClientPokemonP2::dmaxLevel), Codec.BOOL.fieldOf(DataKeys.POKEMON_GMAX_FACTOR).forGetter(ClientPokemonP2::gmaxFactor), Codec.BOOL.fieldOf(DataKeys.POKEMON_TRADEABLE).forGetter(ClientPokemonP2::tradeable) ).apply(instance, ::ClientPokemonP2) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP3.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP3.kt index bbeb8501a0..cc7f3f7905 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP3.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP3.kt @@ -8,6 +8,7 @@ package com.cobblemon.mod.common.util.codec.internal +import com.cobblemon.mod.common.client.settings.ServerSettings import com.cobblemon.mod.common.pokemon.OriginalTrainerType import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.util.DataKeys @@ -32,6 +33,9 @@ internal data class ClientPokemonP3( } companion object { + /** + * do not use cobblemon.config in here, as this is used by the client whose config is different to server, always use [ServerSettings] + */ internal val CODEC: MapCodec = RecordCodecBuilder.mapCodec { instance -> instance.group( OriginalTrainerType.CODEC.optionalFieldOf(DataKeys.POKEMON_ORIGINAL_TRAINER_TYPE, OriginalTrainerType.NONE).forGetter(ClientPokemonP3::originalTrainerType), From 64dd8336c6b14f19fac9a4336ff214e9402e6d45 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Wed, 22 Jan 2025 23:52:08 +0100 Subject: [PATCH 077/121] Made Krookodile's/Krokorok's look quirk rarer --- .../bedrock/pokemon/posers/0552_krokorok/krokorok.json | 6 +++--- .../pokemon/posers/0553_krookodile/krookodile.json | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0552_krokorok/krokorok.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0552_krokorok/krokorok.json index 6c5d8a935e..a15432cf20 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0552_krokorok/krokorok.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0552_krokorok/krokorok.json @@ -22,7 +22,7 @@ ], "quirks": [ "q.bedrock_quirk('krokorok', 'blink')", - "q.bedrock_quirk('krokorok', 'look_quirk')" + "q.bedrock_quirk('krokorok', 'look_quirk',20, 60, 1)" ] }, "battle-standing": { @@ -40,7 +40,7 @@ ], "quirks": [ "q.bedrock_quirk('krokorok', 'blink')", - "q.bedrock_quirk('krokorok', 'look_quirk')" + "q.bedrock_quirk('krokorok', 'look_quirk',20, 60, 1)" ] }, "sand-battle-standing": { @@ -71,7 +71,7 @@ ], "quirks": [ "q.bedrock_quirk('krokorok', 'blink')", - "q.bedrock_quirk('krokorok', 'look_quirk')" + "q.bedrock_quirk('krokorok', 'look_quirk',20, 60, 1)" ] }, "sand-standing": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0553_krookodile/krookodile.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0553_krookodile/krookodile.json index 76873734dc..25476ac29a 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0553_krookodile/krookodile.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0553_krookodile/krookodile.json @@ -22,7 +22,7 @@ ], "quirks": [ "q.bedrock_quirk('krookodile', 'blink')", - "q.bedrock_quirk('krookodile', 'look_quirk')", + "q.bedrock_quirk('krookodile', 'look_quirk',20, 60, 1)", "q.bedrock_quirk('krookodile', 'shake_quirk')" ] }, @@ -40,7 +40,7 @@ ], "quirks": [ "q.bedrock_quirk('krookodile', 'blink')", - "q.bedrock_quirk('krookodile', 'look_quirk')", + "q.bedrock_quirk('krookodile', 'look_quirk',20, 60, 1)", "q.bedrock_quirk('krookodile', 'shake_quirk')" ] }, @@ -59,7 +59,7 @@ ], "quirks": [ "q.bedrock_quirk('krookodile', 'blink')", - "q.bedrock_quirk('krookodile', 'sand_look_quirk')" + "q.bedrock_quirk('krookodile', 'sand_look_quirk',20, 60, 1)" ] }, "standing": { @@ -73,7 +73,7 @@ ], "quirks": [ "q.bedrock_quirk('krookodile', 'blink')", - "q.bedrock_quirk('krookodile', 'look_quirk')", + "q.bedrock_quirk('krookodile', 'look_quirk',20, 60, 1)", "q.bedrock_quirk('krookodile', 'shake_quirk')" ] }, @@ -90,7 +90,7 @@ ], "quirks": [ "q.bedrock_quirk('krookodile', 'blink')", - "q.bedrock_quirk('krookodile', 'sand_look_quirk')" + "q.bedrock_quirk('krookodile', 'sand_look_quirk',20, 60, 1)" ] }, "walking": { From dcbac52fd75d897eb5a8cd51e4f05199e703397b Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Wed, 22 Jan 2025 23:52:30 +0100 Subject: [PATCH 078/121] Some Seaking animation and walk speed edits --- .../0119_seaking/seaking.animation.json | 20 +++++++++++++++++-- .../species/generation1/seaking.json | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0119_seaking/seaking.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0119_seaking/seaking.animation.json index 48063fec7e..e3bc6e85fe 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0119_seaking/seaking.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0119_seaking/seaking.animation.json @@ -515,8 +515,24 @@ "position": { "0.0": [0, 0.2, 2], "0.25": [0, 0, 5.4], - "0.4167": [0, "-0.5+math.clamp(math.sin(q.anim_time*90*2-0),0,1)*4", "-0.25+math.sin(q.anim_time*90*3+30)*4"], - "1.0417": [0, "0.5+math.clamp(math.sin(q.anim_time*90*2-0),0,1)*4", "math.sin(q.anim_time*90*3+10)*4"], + "0.4167": { + "pre": [0, 3.1, 2.35], + "post": [0, 3.1, 2.35], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [0, 3.41, -0.99], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [0, 2.13, -3.54], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0, 1.09, -4.05], + "lerp_mode": "catmullrom" + }, + "1.0417": [0, 0.55, -3.8], "1.0833": [0, 0.5, -3.34552], "1.5": [0, 0.2, 2] } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json index c506dffa8b..59802d6f68 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/seaking.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/seaking.json @@ -52,7 +52,7 @@ "moving": { "canLook": false, "walk": { - "walkSpeed": 0.12, + "walkSpeed": 0.17, "avoidsLand": true }, "swim": { From 3b96beef363d76b96a7d7743b4611913893d24a2 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Thu, 23 Jan 2025 00:03:27 +0100 Subject: [PATCH 079/121] Adjustments for Krokorok's/Krookodile's sand walk speed --- .../resources/data/cobblemon/species/generation5/krokorok.json | 2 +- .../data/cobblemon/species/generation5/krookodile.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json index 4a6806ea9d..a7f96be39d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krokorok.json @@ -56,7 +56,7 @@ }, "moving": { "walk": { - "walkSpeed": "q.is_standing_on_blocks(2, 'minecraft:sand', 'minecraft:red_sand') ? 0.40 : 0.22" + "walkSpeed": "q.is_standing_on_blocks(2, 'minecraft:sand', 'minecraft:red_sand') ? 0.3 : 0.22" } } }, diff --git a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json index f3fdf37c46..c2bb07c812 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/krookodile.json @@ -56,7 +56,7 @@ }, "moving": { "walk": { - "walkSpeed": "q.is_standing_on_blocks(2, 'minecraft:sand', 'minecraft:red_sand') ? 0.53 : 0.23" + "walkSpeed": "q.is_standing_on_blocks(2, 'minecraft:sand', 'minecraft:red_sand') ? 0.35 : 0.23" } } }, From c67cf2e05daf19ebe489d83f1a297d5a1d6407c4 Mon Sep 17 00:00:00 2001 From: Polymeta <40173118+Polymeta@users.noreply.github.com> Date: Thu, 23 Jan 2025 00:16:02 +0000 Subject: [PATCH 080/121] validate event output from FRIENDSHIP_UPDATED event and also fix logic in internal handlers for friendship boosters Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com> --- CHANGELOG.md | 1 + .../main/kotlin/com/cobblemon/mod/common/Cobblemon.kt | 2 ++ .../api/events/pokemon/FriendshipUpdatedEvent.kt | 11 +++++++++-- .../cobblemon/mod/common/api/pokeball/PokeBalls.kt | 2 ++ .../common/api/spawning/fishing/FishingSpawnCause.kt | 8 ++------ .../com/cobblemon/mod/common/pokemon/Pokemon.kt | 1 - 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebbcad55b7..6e693b6080 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -162,6 +162,7 @@ - Fix Players disconnecting from servers if they made changes to certain config options - Fix JSON stores not loading properly if player with shouldered Pokémon is migrating from 1.5.2 into 1.6 - Fix PokemonProperties ability=myAbility being declared as forced despite being legal for the Pokémon +- Fix trading sometimes crashing the game/server ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt b/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt index ec08c33475..34283ed402 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt @@ -258,6 +258,8 @@ object Cobblemon { // Lowest priority because this applies after luxury ball bonus as of gen 4 CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(Priority.LOWEST) { event -> var increment = (event.newFriendship - event.pokemon.friendship).toFloat() + if (increment <= 0) //these affects are only meant to affect positive gains + return@subscribe // Our Luxury ball spec is diff from official, but we will still assume these stack if (event.pokemon.heldItemNoCopy().`is`(CobblemonItemTags.IS_FRIENDSHIP_BOOSTER)) { increment += increment * 0.5F diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/FriendshipUpdatedEvent.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/FriendshipUpdatedEvent.kt index b8e20c717a..5c9f1fa78b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/FriendshipUpdatedEvent.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/events/pokemon/FriendshipUpdatedEvent.kt @@ -8,6 +8,7 @@ package com.cobblemon.mod.common.api.events.pokemon +import com.cobblemon.mod.common.Cobblemon import com.cobblemon.mod.common.pokemon.Pokemon /** @@ -18,5 +19,11 @@ import com.cobblemon.mod.common.pokemon.Pokemon */ data class FriendshipUpdatedEvent( val pokemon: Pokemon, - var newFriendship: Int -) \ No newline at end of file + val newFriendshipInitial: Int +) +{ + var newFriendship: Int = newFriendshipInitial + set(value) { + field = value.coerceIn(0, Cobblemon.config.maxPokemonFriendship) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt index 59e97f22db..f343607067 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/PokeBalls.kt @@ -202,6 +202,8 @@ object PokeBalls : JsonDataRegistry { // Luxury ball effect, low priority as it must be triggered before soothe bell as of gen 4 CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOW) { event -> var increment = (event.newFriendship - event.pokemon.friendship).toFloat() + if (increment <= 0) //these affects are only meant to affect positive gains + return@subscribe if (increment <= 1F) { event.pokemon.caughtBall.effects.filterIsInstance() .forEach { increment *= it.multiplier } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/fishing/FishingSpawnCause.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/fishing/FishingSpawnCause.kt index f37bc8776a..6807c8cd19 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/fishing/FishingSpawnCause.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/fishing/FishingSpawnCause.kt @@ -10,15 +10,12 @@ package com.cobblemon.mod.common.api.spawning.fishing import com.cobblemon.mod.common.Cobblemon import com.cobblemon.mod.common.Cobblemon.LOGGER -import com.cobblemon.mod.common.api.Priority -import com.cobblemon.mod.common.api.abilities.Abilities import com.cobblemon.mod.common.api.events.CobblemonEvents import com.cobblemon.mod.common.api.events.fishing.BobberSpawnPokemonEvent import com.cobblemon.mod.common.api.fishing.FishingBait import com.cobblemon.mod.common.api.pokemon.Natures import com.cobblemon.mod.common.api.pokemon.PokemonSpecies import com.cobblemon.mod.common.api.pokemon.egg.EggGroup -import com.cobblemon.mod.common.api.pokemon.stats.Stat import com.cobblemon.mod.common.api.pokemon.stats.Stats import com.cobblemon.mod.common.api.spawning.SpawnBucket import com.cobblemon.mod.common.api.spawning.SpawnCause @@ -27,7 +24,6 @@ import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail import com.cobblemon.mod.common.api.spawning.spawner.Spawner import com.cobblemon.mod.common.api.types.ElementalTypes -import com.cobblemon.mod.common.api.types.tera.TeraTypes import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import com.cobblemon.mod.common.item.interactive.PokerodItem import com.cobblemon.mod.common.pokemon.Gender @@ -129,8 +125,8 @@ class FishingSpawnCause( } fun alterFriendshipAttempt(pokemonEntity: PokemonEntity, effect: FishingBait.Effect) { - if (pokemonEntity.pokemon.friendship + effect.value > 255) - pokemonEntity.pokemon.setFriendship(255) + if (pokemonEntity.pokemon.friendship + effect.value > Cobblemon.config.maxPokemonFriendship) + pokemonEntity.pokemon.setFriendship(Cobblemon.config.maxPokemonFriendship) else pokemonEntity.pokemon.setFriendship(pokemonEntity.pokemon.friendship + effect.value.toInt()) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt index ff4927c60e..172a4c3ebf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt @@ -314,7 +314,6 @@ open class Pokemon : ShowdownIdentifiable { */ var friendship = this.form.baseFriendship private set(value) { - // Don't check on client, that way we don't need to actually sync the config value it doesn't affect anything if (!this.isPossibleFriendship(value)) { return } From 3dec294728367bebfea80e861c5f33b553bb6ab4 Mon Sep 17 00:00:00 2001 From: aeroeng15 Date: Thu, 23 Jan 2025 00:32:26 +0000 Subject: [PATCH 081/121] Split type strings in Pokedex view --- CHANGELOG.md | 1 + .../mod/common/client/pokedex/PokedexScannerRenderer.kt | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebbcad55b7..2bf7e6ddd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -162,6 +162,7 @@ - Fix Players disconnecting from servers if they made changes to certain config options - Fix JSON stores not loading properly if player with shouldered Pokémon is migrating from 1.5.2 into 1.6 - Fix PokemonProperties ability=myAbility being declared as forced despite being legal for the Pokémon +- Fixed type formatting in Pokédex scanner mode when dual types require two lines ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt index efff174e32..369024b083 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt @@ -183,10 +183,11 @@ class PokedexScannerRenderer { val typeWidth = Minecraft.getInstance().font.width(typeText.font(CobblemonResources.DEFAULT_LARGE)) // Split into 2 lines if text width is too long if (typeWidth > (OUTER_INFO_FRAME_WIDTH - 8) && pokedexEntityData.getApparentForm().secondaryType !== null) { + val splitLines = typeText.string.split("/") drawScaledText( context = graphics, font = CobblemonResources.DEFAULT_LARGE, - text = lang("type.suffix", pokedexEntityData.getApparentForm().primaryType.displayName).bold(), + text = text(splitLines[0], "/").bold(), x = centerX + xOffset + xOffsetText, y = centerY + yOffset + yOffsetText - 4, shadow = true, @@ -196,7 +197,7 @@ class PokedexScannerRenderer { drawScaledText( context = graphics, font = CobblemonResources.DEFAULT_LARGE, - text = lang("type.suffix", pokedexEntityData.getApparentForm().secondaryType!!.displayName).bold(), + text = text(splitLines[1]).bold(), x = centerX + xOffset + xOffsetText, y = centerY + yOffset + yOffsetText + 3, shadow = true, From ed7d2d5d2aa3eecf5c262a049776d7356104052e Mon Sep 17 00:00:00 2001 From: Carmendar Date: Wed, 22 Jan 2025 21:02:09 -0600 Subject: [PATCH 082/121] Hitbox fixes for Eiscue and Golem. --- .../data/cobblemon/species/generation1/golem.json | 4 ++-- .../data/cobblemon/species/generation8/eiscue.json | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/data/cobblemon/species/generation1/golem.json b/common/src/main/resources/data/cobblemon/species/generation1/golem.json index 25e91cccac..a80317bfc2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/golem.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/golem.json @@ -49,8 +49,8 @@ ], "baseScale": 1.1, "hitbox": { - "width": 1, - "height": 1.3, + "width": 1.3, + "height": 1.7, "fixed": false }, "behaviour": { diff --git a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json index 931a3379ca..821d8802e1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eiscue.json @@ -44,6 +44,11 @@ "catchRate": 60, "eggCycles": 25, "baseFriendship": 50, + "hitbox": { + "width": 1.1, + "height": 1.7, + "fixed": false + }, "behaviour": { "resting": { "canSleep": true, @@ -173,6 +178,11 @@ "aspects": [ "noice_face" ], + "hitbox": { + "width": 0.65, + "height": 1.35, + "fixed": false + }, "baseStats": { "hp": 75, "attack": 80, From 9edfa279befcfc619f0bbf0e59494551760cc5ec Mon Sep 17 00:00:00 2001 From: Carmendar Date: Wed, 22 Jan 2025 21:18:24 -0600 Subject: [PATCH 083/121] Lucario can finally look at your aura. (can turn head) --- .../bedrock/pokemon/posers/0448_lucario/lucario.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0448_lucario/lucario.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0448_lucario/lucario.json index edfce064b4..d0da2933d8 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0448_lucario/lucario.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0448_lucario/lucario.json @@ -11,19 +11,26 @@ "battle-standing": { "poseTypes": ["STAND"], "isBattle": true, - "animations": ["q.bedrock('lucario', 'battle_idle')"], + "animations": [ + "q.look('head')", + "q.bedrock('lucario', 'battle_idle')" + ], "quirks": ["q.bedrock_quirk('lucario', 'blink')"] }, "standing": { "poseTypes": ["STAND", "FLOAT", "NONE", "PORTRAIT", "PROFILE"], "isBattle": false, - "animations": ["q.bedrock('lucario', 'ground_idle')"], + "animations": [ + "q.look('head')", + "q.bedrock('lucario', 'ground_idle')" + ], "quirks": ["q.bedrock_quirk('lucario', 'blink')"] }, "walking": { "poseTypes": ["WALK", "SWIM"], "isBattle": false, "animations": [ + "q.look('head')", "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')", "q.bimanual_swing(0.66, 0.6, 'arm_left', 'arm_right')", "q.bedrock('lucario', 'ground_idle')" From 38c5fcc23fca6f9db13648c168fed1066dc8a9d5 Mon Sep 17 00:00:00 2001 From: Carmendar Date: Wed, 22 Jan 2025 21:51:15 -0600 Subject: [PATCH 084/121] Applied gravity to Arctozolt profile --- .../render/models/blockbench/pokemon/gen8/ArctozoltModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArctozoltModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArctozoltModel.kt index af450d35f4..5aff4b5739 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArctozoltModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArctozoltModel.kt @@ -28,7 +28,7 @@ class ArctozoltModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame override var portraitTranslation = Vec3(-0.45, 2.15, 0.0) override var portraitScale = 0.85F - override var profileTranslation = Vec3(0.02, 0.95, 0.0) + override var profileTranslation = Vec3(0.02, 1.14, 0.0) override var profileScale = 0.33F lateinit var sleep: CobblemonPose From b5bfe44196b3b4428b8f0ca0e019abfd146f5205 Mon Sep 17 00:00:00 2001 From: Deltric Date: Thu, 23 Jan 2025 01:45:58 -0600 Subject: [PATCH 085/121] Hide name tag field for NPCs --- CHANGELOG.md | 5 +++-- .../kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt | 3 +++ .../kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt | 2 ++ .../cobblemon/mod/common/client/render/npc/NPCRenderer.kt | 7 +++++++ .../cobblemon/mod/common/util/adapters/NPCClassAdapter.kt | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc272ab8d9..03d0b1c721 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -187,6 +187,8 @@ - For Pokémon: - `pokemon.apply(PokemonProperties)`: Applies the given properties to the Pokémon. - `pokemon.owner`: Returns the owner of the Pokémon or 0.0 if there is no owner or they are not online. +- Added NPC field: + - `hideNameTag`: Hides the name tag of the NPC. ## [1.6.0 - The Record Catch Update (December 25th, 2024)](#1-6-0) #### "Now that there's a fishing mechanic, the mod is actually good!" @@ -2089,5 +2091,4 @@ Thank you so much to all of our community translators that bring the mod to the - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`. ## [1.0.0 (November 12th, 2022)](#1-0-0) -- Initial release. - +- Initial release. \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt index 4874f4bdb5..1fd6968324 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt @@ -57,6 +57,7 @@ class NPCClass { var isInvulnerable = false var isLeashable = true var allowProjectileHits = true + var hideNameTag = false // If you're adding stuff here, add it to NPCPreset and NPCClassAdapter too @@ -97,6 +98,7 @@ class NPCClass { buffer.writeBoolean(isInvulnerable) buffer.writeBoolean(isLeashable) buffer.writeBoolean(allowProjectileHits) + buffer.writeBoolean(hideNameTag) } fun decode(buffer: RegistryFriendlyByteBuf) { @@ -148,5 +150,6 @@ class NPCClass { isInvulnerable = buffer.readBoolean() isLeashable = buffer.readBoolean() allowProjectileHits = buffer.readBoolean() + hideNameTag = buffer.readBoolean() } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt index 703b6c84d8..cc32daec50 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt @@ -37,6 +37,7 @@ class NPCPreset { var isInvulnerable: Boolean? = null var isLeashable: Boolean? = null var allowProjectileHits: Boolean? = null + var hideNameTag: Boolean? = null fun applyTo(npcClass: NPCClass) { resourceIdentifier?.let { npcClass.resourceIdentifier = it } @@ -63,5 +64,6 @@ class NPCPreset { isInvulnerable?.let { npcClass.isInvulnerable = it } isLeashable?.let { npcClass.isLeashable = it } allowProjectileHits?.let { npcClass.allowProjectileHits = it } + hideNameTag?.let { npcClass.hideNameTag = it } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt index 2ccbd1c5ad..fe3ef308c7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt @@ -60,4 +60,11 @@ class NPCRenderer(context: Context) : LivingEntityRenderer { obj.get("isInvulnerable")?.let { npcClass.isInvulnerable = it.asBoolean } obj.get("isLeashable")?.let { npcClass.isLeashable = it.asBoolean } obj.get("allowProjectileHits")?.let { npcClass.allowProjectileHits = it.asBoolean } + obj.get("hideNameTag")?.let { npcClass.hideNameTag = it.asBoolean } return npcClass } From 8c09cebc597351723bedec5c48efd62202f4179b Mon Sep 17 00:00:00 2001 From: Deltric Date: Thu, 23 Jan 2025 01:54:48 -0600 Subject: [PATCH 086/121] Updated spawn packet visibility and mutability for Pokemon & NPCs --- CHANGELOG.md | 4 +- .../spawn/SpawnExtraDataEntityPacket.kt | 2 +- .../messages/client/spawn/SpawnNPCPacket.kt | 14 +++---- .../client/spawn/SpawnPokemonPacket.kt | 40 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc272ab8d9..7c3e3c640c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -167,6 +167,7 @@ ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. +- Updated fields in `SpawnNPCPacket` and `SpawnPokemonPacket` to be visible and mutable. ### Molang & Datapacks - Added flows for: @@ -2089,5 +2090,4 @@ Thank you so much to all of our community translators that bring the mod to the - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`. ## [1.0.0 (November 12th, 2022)](#1-0-0) -- Initial release. - +- Initial release. \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnExtraDataEntityPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnExtraDataEntityPacket.kt index e6fcb1fbc9..290e0f3020 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnExtraDataEntityPacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnExtraDataEntityPacket.kt @@ -18,7 +18,7 @@ import net.minecraft.network.protocol.PacketUtils import net.minecraft.network.protocol.game.ClientboundAddEntityPacket import net.minecraft.world.phys.Vec3 -abstract class SpawnExtraDataEntityPacket, E : Entity>(private val vanillaSpawnPacket: ClientboundAddEntityPacket) : NetworkPacket { +abstract class SpawnExtraDataEntityPacket, E : Entity>(var vanillaSpawnPacket: ClientboundAddEntityPacket) : NetworkPacket { override fun encode(buffer: RegistryFriendlyByteBuf) { this.encodeEntityData(buffer) this.vanillaSpawnPacket.write(buffer) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnNPCPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnNPCPacket.kt index d5a63137f7..7139e95f74 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnNPCPacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnNPCPacket.kt @@ -30,13 +30,13 @@ import net.minecraft.resources.ResourceLocation import net.minecraft.world.entity.Entity class SpawnNPCPacket( - private val npcClass: ResourceLocation, - private val aspects: Set, - private val level: Int, - private val battleIds: Set, - private val name: Component, - private val poseType: PoseType, - private val texture: NPCPlayerTexture, + var npcClass: ResourceLocation, + var aspects: Set, + var level: Int, + var battleIds: Set, + var name: Component, + var poseType: PoseType, + var texture: NPCPlayerTexture, vanillaSpawnPacket: ClientboundAddEntityPacket ) : SpawnExtraDataEntityPacket(vanillaSpawnPacket) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt index 756d2361a5..b33abbdc8b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnPokemonPacket.kt @@ -24,26 +24,26 @@ import net.minecraft.network.protocol.game.ClientboundAddEntityPacket import net.minecraft.resources.ResourceLocation class SpawnPokemonPacket( - private val ownerId: UUID?, - private val scaleModifier: Float, - private val speciesId: ResourceLocation, - private val gender: Gender, - private val shiny: Boolean, - private val formName: String, - private val aspects: Set, - private val battleId: UUID?, - private val phasingTargetId: Int, - private val beamMode: Byte, - private val platform: PlatformType, - private val nickname: MutableComponent?, - private val labelLevel: Int, - private val poseType: PoseType, - private val unbattlable: Boolean, - private val hideLabel: Boolean, - private val caughtBall: ResourceLocation, - private val spawnYaw: Float, - private val friendship: Int, - private val freezeFrame: Float, + var ownerId: UUID?, + var scaleModifier: Float, + var speciesId: ResourceLocation, + var gender: Gender, + var shiny: Boolean, + var formName: String, + var aspects: Set, + var battleId: UUID?, + var phasingTargetId: Int, + var beamMode: Byte, + var platform: PlatformType, + var nickname: MutableComponent?, + var labelLevel: Int, + var poseType: PoseType, + var unbattlable: Boolean, + var hideLabel: Boolean, + var caughtBall: ResourceLocation, + var spawnYaw: Float, + var friendship: Int, + var freezeFrame: Float, vanillaSpawnPacket: ClientboundAddEntityPacket ) : SpawnExtraDataEntityPacket(vanillaSpawnPacket) { From b4e99204c8bbd3e811a456ccde3d3468ba78f614 Mon Sep 17 00:00:00 2001 From: Deltric Date: Thu, 23 Jan 2025 03:21:04 -0600 Subject: [PATCH 087/121] =?UTF-8?q?Fixed=20Pok=C3=A9mon=20being=20able=20t?= =?UTF-8?q?o=20evolve=20mid-battle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++-- .../com/cobblemon/mod/common/client/gui/summary/Summary.kt | 4 ++-- .../net/serverhandling/evolution/AcceptEvolutionHandler.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc272ab8d9..d820715482 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -164,6 +164,7 @@ - Fix PokemonProperties ability=myAbility being declared as forced despite being legal for the Pokémon - Fixed type formatting in Pokédex scanner mode when dual types require two lines - Fix trading sometimes crashing the game/server +- Fixed Pokémon being able to evolve mid-battle ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. @@ -2089,5 +2090,4 @@ Thank you so much to all of our community translators that bring the mod to the - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`. ## [1.0.0 (November 12th, 2022)](#1-0-0) -- Initial release. - +- Initial release. \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt index 3c4e8296d8..4bbb0b21aa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt @@ -163,8 +163,8 @@ class Summary private constructor(party: Collection, private val edita }, text = lang("ui.evolve"), resource = evolveButtonResource, - renderRequirement = { selectedPokemon.evolutionProxy.client().isNotEmpty() }, - clickRequirement = { selectedPokemon.evolutionProxy.client().isNotEmpty() } + renderRequirement = { selectedPokemon.evolutionProxy.client().isNotEmpty() && CobblemonClient.battle == null }, + clickRequirement = { selectedPokemon.evolutionProxy.client().isNotEmpty() && CobblemonClient.battle == null } ) ) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/AcceptEvolutionHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/AcceptEvolutionHandler.kt index ecf8572df8..89ec4ad54c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/AcceptEvolutionHandler.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/AcceptEvolutionHandler.kt @@ -17,7 +17,7 @@ import net.minecraft.server.level.ServerPlayer object AcceptEvolutionHandler : ServerNetworkPacketHandler { override fun handle(packet: AcceptEvolutionPacket, server: MinecraftServer, player: ServerPlayer) { val pokemon = player.party()[packet.pokemonUUID] ?: return - if (pokemon.entity?.isBusy == true) return + if (pokemon.entity?.isBusy == true || pokemon.entity?.isBattling == true) return val evolution = pokemon.evolutionProxy.server().firstOrNull { evolution -> evolution.id.equals(packet.evolutionId, true) } ?: return pokemon.evolutionProxy.server().start(evolution) } From 34aef306c1a1b68d031563e7cd27fe25a8f9e073 Mon Sep 17 00:00:00 2001 From: Kenji_64 Date: Thu, 23 Jan 2025 20:07:47 +0100 Subject: [PATCH 088/121] Fixed shiny Flygon's goggles texture --- .../pokemon/0330_flygon/flygon_transparency.png | Bin 498 -> 528 bytes .../0330_flygon/flygon_transparency_shiny.png | Bin 498 -> 531 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0330_flygon/flygon_transparency.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0330_flygon/flygon_transparency.png index dd54374ad19a9ca8ffa3557a3f5a725c950f34cc..69fd4cf4cd254a2988ee1b039d59910e72d60898 100644 GIT binary patch delta 394 zcmV;50d@ZJ1CRueB!2;OQb$4nuFf3k0005XNklg5R4AJ zLZ?nWLQm1Ho~bA45ju7134#umAc(TyA?Q%MjHYfiicr5Fh_mxwcD#Jf?99Q##pP`| zD57_A6q`(jvzU&mIKRKU*?8kOyP;jw}16J;6FR88PC#JrXyVm^iGbNnLl<=cxjRMi+S_>eld@Tq9q4%b>g$I z>!MmW+i$!0r=u#$LD96o%>rvS^+ oF;J( zXz~7VzieJ_SNqtltGIc6d2IX6Z`A8wJv|?+_jY@?jEGoVUw=j_@9I9_KRZo@+tvQy zvrDNpH`OSc1Le+A;cPzndGkkfU%X=_-&CVGAAdx|IFkdVS|@<*YJX6`uFGFPRF2tH zqihb8OHKfNz4;>|rWfO6$#XeSu5|)vmcNgYJ6CSyhyJxr0QD~X;`@5q*b4yuhQUq& zBEH7_k{l>A*eof4^26{3I|Z1{Cq+3>F8LQ=x2|Hhu6jFmJ67`MhGQ-V$_#c2kdpg7 z4*`>r0cew;0Shr8=M!FljTqz86X*Z{01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjfM1-F5 diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0330_flygon/flygon_transparency_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0330_flygon/flygon_transparency_shiny.png index dd54374ad19a9ca8ffa3557a3f5a725c950f34cc..93a65a11f78b3f4e7b4a714265c96a82e54e5658 100644 GIT binary patch delta 397 zcmV;80doHG1Cs=hB!2;OQb$4nuFf3k0005aNkl1z6 z7w8a0%BytE(r3yO^i?WZ9r^-Pq7@Tt8JOG*$yv4&aMA-IwZET)IQz5iSpMAk?!&LI zpYF@5iRt1dj@fVO*shEC`1!||qYu8(pPzU4-Rs}qzW3@^w}01htbVHB0spfiHTIjj z_kHNzsSL;2tsdIz-Rfbq4&<9Wg=rQM5oOf9mB4gy)6V>HhTwHWK3~q-{^!eCL^LCH zAlD?GgPlTkXtqCf__ymK%BpGGFK77KNFB&ENsZo0pcA|}Q{c*~Y5Om$CU&d$)q#BN z9zb`AyiX r3NX|iXT6caFbvG1QuP7;nm?uQ7JA900000NkvXXu0mjfqI=N> delta 365 zcmV-z0h0cc1o8urB!3BTNLh0L01m_e01m_fl`9S#0004sNklJ( zXz~7VzieJ_SNqtltGIc6d2IX6Z`A8wJv|?+_jY@?jEGoVUw=j_@9I9_KRZo@+tvQy zvrDNpH`OSc1Le+A;cPzndGkkfU%X=_-&CVGAAdx|IFkdVS|@<*YJX6`uFGFPRF2tH zqihb8OHKfNz4;>|rWfO6$#XeSu5|)vmcNgYJ6CSyhyJxr0QD~X;`@5q*b4yuhQUq& zBEH7_k{l>A*eof4^26{3I|Z1{Cq+3>F8LQ=x2|Hhu6jFmJ67`MhGQ-V$_#c2kdpg7 z4*`>r0c?|?0S7T4=M!FljTqz86X*Z{01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjfNZX$E From a7c43701c0a5585a0cb50a5663916c2d136e10cb Mon Sep 17 00:00:00 2001 From: Sterrezo Date: Thu, 23 Jan 2025 22:12:13 +0100 Subject: [PATCH 089/121] Wild shiny sounds now respect the shinyNoticeParticlesDistance config setting --- CHANGELOG.md | 1 + .../client/entity/PokemonClientDelegate.kt | 26 +++++++++---------- .../resources/assets/cobblemon/sounds.json | 18 ++++++------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3d39c127c..ab5caabe6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -159,6 +159,7 @@ - Fix Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames. - Fixed Berries not giving bonus yields when planted in their preferred biomes - Fix NeoForge not supporting "SodiumDynamicLights" +- Wild shiny sounds now respect the `shinyNoticeParticlesDistance` config setting. ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt index 981af448dd..b00d7f98b1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt @@ -372,24 +372,24 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate { override fun tick(entity: PokemonEntity) { incrementAge(entity) - if(currentEntity.ownerUUID == null && currentEntity.pokemon.shiny && secondsSinceLastShinyParticle > SHINY_PARTICLE_COOLDOWN && !currentEntity.isBattling) { - //wild shiny not looked at - playShinyEffect("cobblemon:shiny_sparkle_ambient_wild") - lastShinyParticle = System.currentTimeMillis() - } - getClientShinyPokemon() + playWildShinySounds() } - fun getClientShinyPokemon() { + fun playWildShinySounds() { val player = Minecraft.getInstance().player ?: return val isWithinRange = player.position().distanceTo(currentEntity.position()) <= Cobblemon.config.shinyNoticeParticlesDistance - if (currentEntity.pokemon.shiny && currentEntity.ownerUUID == null && !player.isSpectator ) { - if (isWithinRange && !shined) { - playShinyEffect("cobblemon:wild_shiny_ring") - shined = true - lastShinyParticle = System.currentTimeMillis() - } else if (!isWithinRange) { + if (currentEntity.pokemon.shiny && currentEntity.ownerUUID == null) { + if (isWithinRange) { + if (secondsSinceLastShinyParticle > SHINY_PARTICLE_COOLDOWN && !currentEntity.isBattling) { + playShinyEffect("cobblemon:shiny_sparkle_ambient_wild") + lastShinyParticle = System.currentTimeMillis() + } + if (!shined && !player.isSpectator) { + playShinyEffect("cobblemon:wild_shiny_ring") + shined = true + } + } else { shined = false } } diff --git a/common/src/main/resources/assets/cobblemon/sounds.json b/common/src/main/resources/assets/cobblemon/sounds.json index a10e19ae28..1059172e54 100644 --- a/common/src/main/resources/assets/cobblemon/sounds.json +++ b/common/src/main/resources/assets/cobblemon/sounds.json @@ -1003,24 +1003,24 @@ "particle.wild_shiny_chime": { "subtitle": "cobblemon.subtitle.pokemon.wild_shiny_shine", "sounds": [ - { "name": "cobblemon:shiny/wild_shiny_appear_chime", "volume": 2.0 } + { "name": "cobblemon:shiny/wild_shiny_appear_chime", "volume": 1.0, "attenuation_distance": 128.0 } ] }, "particle.shiny_ambient_chime": { "sounds": [ - { "name": "cobblemon:shiny/shiny_ambient_chime_1", "volume": 0.3 }, - { "name": "cobblemon:shiny/shiny_ambient_chime_2", "volume": 0.3 }, - { "name": "cobblemon:shiny/shiny_ambient_chime_3", "volume": 0.3 }, - { "name": "cobblemon:shiny/shiny_ambient_chime_4", "volume": 0.3 } + { "name": "cobblemon:shiny/shiny_ambient_chime_1", "volume": 0.8 }, + { "name": "cobblemon:shiny/shiny_ambient_chime_2", "volume": 0.8 }, + { "name": "cobblemon:shiny/shiny_ambient_chime_3", "volume": 0.8 }, + { "name": "cobblemon:shiny/shiny_ambient_chime_4", "volume": 0.8 } ] }, "particle.wild_shiny_ambient_chime": { "subtitle": "cobblemon.subtitle.pokemon.shiny_ambient", "sounds": [ - { "name": "cobblemon:shiny/wild_shiny_ambient_chime_1", "volume": 1.5 }, - { "name": "cobblemon:shiny/wild_shiny_ambient_chime_2", "volume": 1.5 }, - { "name": "cobblemon:shiny/wild_shiny_ambient_chime_3", "volume": 1.5 }, - { "name": "cobblemon:shiny/wild_shiny_ambient_chime_4", "volume": 1.5 } + { "name": "cobblemon:shiny/wild_shiny_ambient_chime_1", "volume": 0.8, "attenuation_distance": 128.0 }, + { "name": "cobblemon:shiny/wild_shiny_ambient_chime_2", "volume": 0.8, "attenuation_distance": 128.0 }, + { "name": "cobblemon:shiny/wild_shiny_ambient_chime_3", "volume": 0.8, "attenuation_distance": 128.0 }, + { "name": "cobblemon:shiny/wild_shiny_ambient_chime_4", "volume": 0.8, "attenuation_distance": 128.0 } ] }, "pokemon.bulbasaur.ambient": { From 3e9331ec6458f117c84cba9ae73ca6ea34d8c34f Mon Sep 17 00:00:00 2001 From: Sterrezo Date: Thu, 23 Jan 2025 22:34:19 +0100 Subject: [PATCH 090/121] Updated the evolution sound to match the particle effect timing better --- CHANGELOG.md | 1 + .../resources/assets/cobblemon/sounds.json | 2 +- .../sounds/evolution/evolution_full.ogg | Bin 218630 -> 218678 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab5caabe6c..ace58079c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - New Slowpoke shiny texture. - Updated drops for many Pokémon. - Completely resynced Pokémon move and stat data based on later games. Learnsets have changed considerably to maximise available moves. +- Adjusted the evolution sound to match the timing of the particle effect. ### Pokémon Added diff --git a/common/src/main/resources/assets/cobblemon/sounds.json b/common/src/main/resources/assets/cobblemon/sounds.json index 1059172e54..2c70346589 100644 --- a/common/src/main/resources/assets/cobblemon/sounds.json +++ b/common/src/main/resources/assets/cobblemon/sounds.json @@ -149,7 +149,7 @@ "sounds": [ { "name": "cobblemon:evolution/evolution_notification", "volume": 0.7 } ] }, "evolution.full": { - "sounds": [ "cobblemon:evolution/evolution_full" ] + "sounds": [ { "name": "cobblemon:evolution/evolution_full", "volume": 0.9 } ] }, "evolution.ui": { "sounds": [ { "name": "cobblemon:evolution/evolution_ui", "volume": 0.2 } ] diff --git a/common/src/main/resources/assets/cobblemon/sounds/evolution/evolution_full.ogg b/common/src/main/resources/assets/cobblemon/sounds/evolution/evolution_full.ogg index 523ef3b4565b3fd9a785c6e9823f9c2b34d152e8..ab89b71a136952d2cb30321d212676389149337c 100644 GIT binary patch delta 216571 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

  • g`~%`06#5`p_J(-VN2rh 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
    Tag: #biome:is_arid -- #cobblemon:is_sandy +- #cobblemon:is_badlands +- #cobblemon:is_desert - #cobblemon:is_savanna
    @@ -1039,15 +1040,164 @@ This file contains tags related to different biomes in cobblemon, as well as som
    -Tag: #evolution:alolan +Tag: #regional:bergmite_hisuibiome -- #cobblemon:is_tropical_island -- #minecraft:is_beach +- #cobblemon:is_freezing +- #cobblemon:is_hills
    -Tag: #evolution:cyndaquil_quilava_hisui_bias +Tag: #regional:bergmite_kalosbiome + +- #cobblemon:is_frozen_ocean + +
    + +
    +Tag: #regional:cubone_alolabiome + +- #cobblemon:is_beach +- #cobblemon:is_volcanic + +
    + +
    +Tag: #regional:cubone_kantobiome + +- #cobblemon:is_arid + +
    + +
    +Tag: #regional:dartrix_alolabiome + +- #cobblemon:is_beach +- #cobblemon:is_ocean +- #cobblemon:is_tropical_island + +
    + +
    +Tag: #regional:dartrix_hisuibiome + +- #cobblemon:is_freezing +- #cobblemon:is_hills + +
    + +
    +Tag: #regional:dewott_hisuibiome + +- #cobblemon:is_coast +- #cobblemon:is_cold_ocean +- minecraft:snowy_beach + +
    + +
    +Tag: #regional:dewott_unovabiome + +- #cobblemon:is_beach +- #cobblemon:is_ocean +- #cobblemon:is_tropical_island + +
    + +
    +Tag: #regional:exeggcute_alolabiome + +- #cobblemon:is_beach +- #cobblemon:is_tropical_island + +
    + +
    +Tag: #regional:exeggcute_kantobiome + +- #cobblemon:is_jungle +- #cobblemon:is_savanna + +
    + +
    +Tag: #regional:goomy_hisuibiome + +- #cobblemon:is_dripstone +- #cobblemon:is_lush + +
    + +
    +Tag: #regional:goomy_kalosbiome + +- #cobblemon:is_overworld +- #cobblemon:is_swamp + +
    + +
    +Tag: #regional:koffing_galarbiome + +- #cobblemon:is_mushroom + +
    + +
    +Tag: #regional:koffing_kantobiome + +- #cobblemon:nether/is_toxic + +
    + +
    +Tag: #regional:mimejr_galarbiome + +- #cobblemon:is_freezing + +
    + +
    +Tag: #regional:mimejr_sinnohbiome + +- #cobblemon:is_temperate + +
    + +
    +Tag: #regional:petilil_hisuibiome + +- #cobblemon:is_freezing +- #cobblemon:is_hills + +
    + +
    +Tag: #regional:petilil_unovabiome + +- #cobblemon:is_floral +- #cobblemon:is_forest +- #cobblemon:is_tropical_island + +
    + +
    +Tag: #regional:pikachu_alolabiome + +- #cobblemon:is_beach +- #cobblemon:is_tropical_island + +
    + +
    +Tag: #regional:pikachu_kantobiome + +- #cobblemon:is_forest + +
    + +
    +Tag: #regional:quilava_hisuibiome - #cobblemon:is_taiga - #cobblemon:nether/is_crimson @@ -1057,60 +1207,62 @@ This file contains tags related to different biomes in cobblemon, as well as som
    -Tag: #evolution:lilligant_unovan +Tag: #regional:quilava_johtobiome + +- #cobblemon:is_temperate + +
    + +
    +Tag: #regional:rufflet_hisuibiome + +- #cobblemon:is_freezing +- #cobblemon:is_hills + +
    + +
    +Tag: #regional:rufflet_unovabiome + +- #cobblemon:is_temperate + +
    + +
    +Tag: #vivillon:archipelago + +- #cobblemon:is_mushroom + +
    + +
    +Tag: #vivillon:archipelago_anti + +- #cobblemon:is_magical +- #cobblemon:is_spooky +- #cobblemon:is_swamp + +
    + +
    +Tag: #vivillon:continental + +- #cobblemon:is_plains + +
    + +
    +Tag: #vivillon:continental_anti - #cobblemon:is_floral -- #cobblemon:is_forest -- #cobblemon:is_tropical_island +- #cobblemon:is_mushroom +- #cobblemon:is_savanna +- minecraft:sunflower_plains
    -Tag: #evolution:oshawott_dewott_hisui_bias - -- #c:stony_shores -- minecraft:snowy_beach -- minecraft:stony_shore -- terralith:basalt_cliffs -- terralith:granite_cliffs -- terralith:white_cliffs -- wythers:calcite_coast -- wythers:cold_island -- wythers:cold_stony_shore -- wythers:deepslate_shore -- wythers:frigid_island -- wythers:frozen_island -- wythers:gravelly_beach -- wythers:icy_shore - -
    - -
    -Tag: #evolution:rowlet_dartrix_alolan - -- #cobblemon:is_forest -- #cobblemon:is_taiga - -
    - -
    -Tag: #evolution:rowlet_dartrix_hisui_bias - -- #cobblemon:is_snowy_forest -- #cobblemon:is_snowy_taiga - -
    - -
    -Tag: #evolution:sliggoo_hisuian - -- #cobblemon:is_dripstone -- #cobblemon:is_lush - -
    - -
    -Tag: #evolution:vivillon_elegant +Tag: #vivillon:elegant - #cobblemon:is_magical - #cobblemon:is_spooky @@ -1118,7 +1270,123 @@ This file contains tags related to different biomes in cobblemon, as well as som
    -Tag: #evolution:vivillon_monsoon +Tag: #vivillon:elegant_anti + +- #cobblemon:is_mountain + +
    + +
    +Tag: #vivillon:fancy + +- #cobblemon:is_cherry_blossom + +
    + +
    +Tag: #vivillon:forsaken + +- #cobblemon:is_deep_dark + +
    + +
    +Tag: #vivillon:garden + +- #cobblemon:is_forest + +
    + +
    +Tag: #vivillon:garden_anti + +- #cobblemon:is_cherry_blossom +- #cobblemon:is_floral +- #cobblemon:is_jungle +- #cobblemon:is_magical +- #cobblemon:is_mountain +- #cobblemon:is_mushroom +- #cobblemon:is_plains +- #cobblemon:is_spooky +- #cobblemon:is_swamp + +
    + +
    +Tag: #vivillon:high_plains + +- #cobblemon:is_badlands + +
    + +
    +Tag: #vivillon:icy_snow + +- #cobblemon:is_taiga + +
    + +
    +Tag: #vivillon:icy_snow_anti + +- #cobblemon:is_mountain + +
    + +
    +Tag: #vivillon:inferno + +- #minecraft:is_nether + +
    + +
    +Tag: #vivillon:jungle + +- #cobblemon:is_jungle + +
    + +
    +Tag: #vivillon:jungle_anti + +- #cobblemon:is_mountain + +
    + +
    +Tag: #vivillon:marine + +- #cobblemon:is_ocean + +
    + +
    +Tag: #vivillon:marine_anti + +- #cobblemon:is_frozen_ocean +- #cobblemon:is_warm_ocean + +
    + +
    +Tag: #vivillon:meadow + +- #cobblemon:is_floral + +
    + +
    +Tag: #vivillon:meadow_anti + +- #cobblemon:is_cherry_blossom +- #cobblemon:is_magical +- minecraft:sunflower_plains + +
    + +
    +Tag: #vivillon:monsoon - #cobblemon:is_mountain - #cobblemon:is_peak @@ -1126,7 +1394,18 @@ This file contains tags related to different biomes in cobblemon, as well as som
    -Tag: #evolution:vivillon_ocean +Tag: #vivillon:monsoon_anti + +- #cobblemon:is_badlands +- #cobblemon:is_desert +- #cobblemon:is_floral +- #cobblemon:is_mushroom +- #cobblemon:is_tropical_island + +
    + +
    +Tag: #vivillon:ocean - #cobblemon:is_coast - #cobblemon:is_warm_ocean @@ -1134,7 +1413,24 @@ This file contains tags related to different biomes in cobblemon, as well as som
    -Tag: #evolution:vivillon_river +Tag: #vivillon:ocean_anti + +- #cobblemon:is_cold_ocean +- #cobblemon:is_frozen_ocean +- #cobblemon:is_lukewarm_ocean +- #cobblemon:is_temperate_ocean + +
    + +
    +Tag: #vivillon:polar + +- #cobblemon:is_frozen_ocean + +
    + +
    +Tag: #vivillon:river - #cobblemon:is_river - #cobblemon:is_swamp @@ -1142,7 +1438,48 @@ This file contains tags related to different biomes in cobblemon, as well as som
    -Tag: #evolution:vivillon_sun +Tag: #vivillon:river_anti + +- #cobblemon:is_forest +- #cobblemon:is_jungle +- #cobblemon:is_magical +- #cobblemon:is_spooky + +
    + +
    +Tag: #vivillon:sandstorm + +- #cobblemon:is_desert + +
    + +
    +Tag: #vivillon:sandstorm_anti + +- #cobblemon:is_badlands + +
    + +
    +Tag: #vivillon:savanna + +- #cobblemon:is_savanna + +
    + +
    +Tag: #vivillon:savanna_anti + +- #cobblemon:is_badlands +- #cobblemon:is_desert +- #cobblemon:is_floral +- #cobblemon:is_mountain + +
    + +
    +Tag: #vivillon:sun - #cobblemon:is_sky - #cobblemon:is_volcanic @@ -1151,7 +1488,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
    -Tag: #evolution:vivillon_tundra +Tag: #vivillon:tundra - #cobblemon:is_glacial - #cobblemon:is_snowy_forest @@ -1159,6 +1496,20 @@ This file contains tags related to different biomes in cobblemon, as well as som
    +
    +Tag: #vivillon:tundra_anti + +- #cobblemon:is_mountain + +
    + +
    +Tag: #vivillon:void + +- #minecraft:is_end + +
    +
    Tag: #has_density:dense @@ -1439,6 +1790,7 @@ This file contains tags related to different biomes in cobblemon, as well as som
    Tag: #has_season:spring +- #aether:is_aether - #cobblemon:is_floral - #cobblemon:is_lukewarm_ocean - #cobblemon:is_magical @@ -1666,60 +2018,109 @@ This file contains tags related to different biomes in cobblemon, as well as som
    -Tag: #regional_bias_evolutions:alolan +Tag: #space:is_fiery -- #cobblemon:is_tropical_island -- #minecraft:is_beach +- #stellaris:mercury_biomes +- space:mercury_hotspot +- space:mercury_plains +- space:venus_highlands +- space:venus_lava_caves +- space:venus_lowlands +- space:venus_midlands +- space:venus_volcanic_plains +- stellaris:infernal_venus_barrens
    -Tag: #regional_bias_evolutions:cyndaquil_quilava_hisui_bias +Tag: #space:is_icy -- #cobblemon:is_taiga -- #cobblemon:nether/is_crimson -- #cobblemon:nether/is_forest -- #cobblemon:nether/is_overgrowth +- #space:ice_craters +- stellaris:mars_ice_spikes
    -Tag: #regional_bias_evolutions:oshawott_dewott_hisui_bias +Tag: #space:is_mars -- #c:stony_shores -- minecraft:snowy_beach -- minecraft:stony_shore -- terralith:basalt_cliffs -- terralith:granite_cliffs -- terralith:white_cliffs -- wythers:calcite_coast -- wythers:coastal_mangroves -- wythers:cold_island -- wythers:cold_stony_shore -- wythers:deepslate_shore -- wythers:frigid_island -- wythers:frozen_island -- wythers:gravelly_beach -- wythers:icy_shore -- wythers:mediterranean_island -- wythers:temperate_island -- wythers:tropical_island -- wythers:warm_stony_shore +- #stellaris:mars_biomes +- #stellaris:mars_biomes +- #stellaris:mars_biomes +- space:mars_dripstone +- space:mars_highlands +- space:mars_ice +- space:mars_lowlands +- space:mars_lush_caves +- space:mars_midlands
    -Tag: #regional_bias_evolutions:rowlet_dartrix_alolan +Tag: #space:is_mercury -- #cobblemon:is_forest -- #cobblemon:is_taiga +- #stellaris:mercury_biomes +- space:mercury_hotspot +- space:mercury_ice +- space:mercury_plains
    -Tag: #regional_bias_evolutions:rowlet_dartrix_hisui_bias +Tag: #space:is_moon -- #cobblemon:is_snowy_forest -- #cobblemon:is_snowy_taiga +- #stellaris:moon_biomes +- space:moon_highlands +- space:moon_ice +- space:moon_lowlands +- space:moon_midlands +- space:moon_rocks +- swe:moon + +
    + +
    +Tag: #space:is_space + +- #stellaris:mars_biomes +- #stellaris:mercury_biomes +- #stellaris:moon_biomes +- #stellaris:venus_biomes +- space:mars_dripstone +- space:mars_highlands +- space:mars_ice +- space:mars_lowlands +- space:mars_lush_caves +- space:mars_midlands +- space:mercury_hotspot +- space:mercury_ice +- space:mercury_plains +- space:moon_highlands +- space:moon_ice +- space:moon_lowlands +- space:moon_midlands +- space:moon_rocks +- space:space +- space:venus_highlands +- space:venus_lava_caves +- space:venus_lowlands +- space:venus_midlands +- space:venus_plankton_bloom +- space:venus_sky +- space:venus_volcanic_plains +- swe:moon + +
    + +
    +Tag: #space:is_venus + +- #stellaris:venus_biomes +- space:venus_highlands +- space:venus_lava_caves +- space:venus_lowlands +- space:venus_midlands +- space:venus_plankton_bloom +- space:venus_sky +- space:venus_volcanic_plains
    diff --git a/docs/cobblemon-tags/1.6.0/BlocksTags.md b/docs/cobblemon-tags/1.6.1/BlocksTags.md similarity index 99% rename from docs/cobblemon-tags/1.6.0/BlocksTags.md rename to docs/cobblemon-tags/1.6.1/BlocksTags.md index 942e036d76..d50e5dc282 100644 --- a/docs/cobblemon-tags/1.6.0/BlocksTags.md +++ b/docs/cobblemon-tags/1.6.1/BlocksTags.md @@ -186,6 +186,7 @@ This file contains tags related to block in cobblemon. - #c:farmland - #c:farmlands +- aether:aether_farmland - minecraft:farmland
    @@ -465,6 +466,19 @@ This file contains tags related to block in cobblemon. +
    +Tag: #block:gilded_chests + +- cobblemon:black_gilded_chest +- cobblemon:blue_gilded_chest +- cobblemon:gilded_chest +- cobblemon:green_gilded_chest +- cobblemon:pink_gilded_chest +- cobblemon:white_gilded_chest +- cobblemon:yellow_gilded_chest + +
    +
    Tag: #block:glazed_terracotta_blocks @@ -1172,6 +1186,7 @@ This file contains tags related to block in cobblemon. - botania:white_floating_flower - botania:white_mystical_flower - botania:white_shiny_flower +- cobblemon:pep_up_flower - deep_aether:enchanted_blossom - farmersdelight:wild_carrots - minecraft:azure_bluet @@ -1863,10 +1878,7 @@ This file contains tags related to block in cobblemon.
    Tag: #block:logs -- cobblemon:apricorn_log -- cobblemon:apricorn_wood -- cobblemon:stripped_apricorn_log -- cobblemon:stripped_apricorn_wood +- #cobblemon:apricorn_logs
    diff --git a/docs/cobblemon-tags/1.6.0/EntityTypesTags.md b/docs/cobblemon-tags/1.6.1/EntityTypesTags.md similarity index 100% rename from docs/cobblemon-tags/1.6.0/EntityTypesTags.md rename to docs/cobblemon-tags/1.6.1/EntityTypesTags.md diff --git a/docs/cobblemon-tags/1.6.0/ItemTags.md b/docs/cobblemon-tags/1.6.1/ItemTags.md similarity index 97% rename from docs/cobblemon-tags/1.6.0/ItemTags.md rename to docs/cobblemon-tags/1.6.1/ItemTags.md index 2f5b335afc..b31e5c510f 100644 --- a/docs/cobblemon-tags/1.6.0/ItemTags.md +++ b/docs/cobblemon-tags/1.6.1/ItemTags.md @@ -229,14 +229,6 @@ This file contains tags related to items in cobblemon.
    -
    -Tag: #item:cobblemon_seeds - -- #cobblemon:mint_seeds -- cobblemon:vivichoke_seeds - -
    -
    Tag: #item:cooked_meat @@ -329,6 +321,7 @@ This file contains tags related to items in cobblemon. - cobblemon:reaper_cloth - cobblemon:ribbon_sweet - cobblemon:sachet +- cobblemon:shell_helmet - cobblemon:star_sweet - cobblemon:strawberry_sweet - cobblemon:sweet_apple @@ -433,6 +426,19 @@ This file contains tags related to items in cobblemon.
    +
    +Tag: #item:gilded_chests + +- cobblemon:black_gilded_chest +- cobblemon:blue_gilded_chest +- cobblemon:gilded_chest +- cobblemon:green_gilded_chest +- cobblemon:pink_gilded_chest +- cobblemon:white_gilded_chest +- cobblemon:yellow_gilded_chest + +
    +
    Tag: #item:hanging_signs @@ -590,9 +596,9 @@ This file contains tags related to items in cobblemon. - #cobblemon:apricorn_sprouts - #cobblemon:apricorns - #cobblemon:berries -- #cobblemon:cobblemon_seeds - #cobblemon:herbs - #cobblemon:mint_leaf +- #cobblemon:seeds - cobblemon:big_root - cobblemon:energy_root - cobblemon:medicinal_leek @@ -820,12 +826,9 @@ This file contains tags related to items in cobblemon.
    Tag: #item:seeds -- #cobblemon:cobblemon_seeds -- minecraft:beetroot_seeds -- minecraft:melon_seeds -- minecraft:pumpkin_seeds -- minecraft:torchflower_seeds -- minecraft:wheat_seeds +- #cobblemon:held/terrain_seeds +- #cobblemon:mint_seeds +- cobblemon:vivichoke_seeds
    @@ -882,6 +885,7 @@ This file contains tags related to items in cobblemon. - cobblemon:deepslate_sun_stone_ore - cobblemon:sun_stone_ore +- cobblemon:terracotta_sun_stone_ore
    @@ -949,7 +953,7 @@ This file contains tags related to items in cobblemon.
    Tag: #item:tier_1_poke_ball_materials -- minecraft:copper_ingot +- #c:ingots/copper
    @@ -977,7 +981,7 @@ This file contains tags related to items in cobblemon.
    Tag: #item:tier_2_poke_ball_materials -- minecraft:iron_ingot +- #c:ingots/iron
    @@ -1000,7 +1004,7 @@ This file contains tags related to items in cobblemon.
    Tag: #item:tier_3_poke_ball_materials -- minecraft:gold_ingot +- #c:ingots/gold
    @@ -1015,7 +1019,7 @@ This file contains tags related to items in cobblemon.
    Tag: #item:tier_4_poke_ball_materials -- minecraft:diamond +- #c:gems/diamond
    @@ -1345,6 +1349,13 @@ This file contains tags related to items in cobblemon. +
    +Tag: #item:bookshelf_books + +- #cobblemon:pokedex + +
    +
    Tag: #item:chest_boats @@ -1397,26 +1408,28 @@ This file contains tags related to items in cobblemon.
    Tag: #item:logs -- cobblemon:apricorn_log -- cobblemon:apricorn_wood -- cobblemon:stripped_apricorn_log -- cobblemon:stripped_apricorn_wood +- #cobblemon:apricorn_logs
    Tag: #item:logs_that_burn -- cobblemon:apricorn_log -- cobblemon:apricorn_wood -- cobblemon:stripped_apricorn_log -- cobblemon:stripped_apricorn_wood +- #cobblemon:apricorn_logs + +
    + +
    +Tag: #item:parrot_food + +- #cobblemon:seeds
    Tag: #item:piglin_loved +- #cobblemon:gilded_chests - cobblemon:relic_coin - cobblemon:relic_coin_pouch - cobblemon:relic_coin_sack diff --git a/docs/cobblemon-tags/1.6.0/spawnPresetList.md b/docs/cobblemon-tags/1.6.1/spawnPresetList.md similarity index 77% rename from docs/cobblemon-tags/1.6.0/spawnPresetList.md rename to docs/cobblemon-tags/1.6.1/spawnPresetList.md index a0f64b375a..a39a36848a 100644 --- a/docs/cobblemon-tags/1.6.0/spawnPresetList.md +++ b/docs/cobblemon-tags/1.6.1/spawnPresetList.md @@ -37,15 +37,15 @@ This file contains all current spawn presets of cobblemon. | **structures** | `minecraft:end_city` | | ## foliage -| Key | Conditions | Anticonditions | -| --- | ---------- | -------------- | -| **neededNearbyBlocks** | `#minecraft:leaves`; `#c:leaves` | | +| Key | Conditions | Anticonditions | +|------------------------|----------------------------------|----------------| +| **neededNearbyBlocks** | `#minecraft:leaves`; `#c:leaves` | | ## illager_structures -| Key | Conditions | Anticonditions | -| --- | ---------- | -------------- | -| **minY** | `62` | | -| **structures** | `minecraft:pillager_outpost`; `minecraft:swamp_hut`; `minecraft:mansion` | | +| Key | Conditions | Anticonditions | +|----------------|--------------------------------------------------------------------------|----------------| +| **minY** | `62` | | +| **structures** | `minecraft:pillager_outpost`; `minecraft:swamp_hut`; `minecraft:mansion` | | ## jungle_pyramid | Key | Conditions | Anticonditions | @@ -54,12 +54,11 @@ This file contains all current spawn presets of cobblemon. | **neededBaseBlocks** | `minecraft:cobblestone`; `#minecraft:mossy_cobblestone` | | | **neededNearbyBlocks** | `#cobblemon:jungle_pyramid_blocks` | | | **structures** | `minecraft:jungle_pyramid` | | - ## lava -| Key | Conditions | Anticonditions | -| --- | ---------- | -------------- | -| **fluid** | `#minecraft:lava` | | +| Key | Conditions | Anticonditions | +|-----------|-------------------|----------------| +| **fluid** | `#minecraft:lava` | | ## mansion | Key | Conditions | Anticonditions | @@ -75,10 +74,10 @@ This file contains all current spawn presets of cobblemon. | **neededBaseBlocks** | `#cobblemon:natural` | `minecraft:farmland` | ## nether_fossil -| Key | Conditions | Anticonditions | -| --- | ---------- | -------------- | -| **neededNearbyBlocks** | `minecraft:bone_block` | | -| **structures** | `minecraft:nether_fossil` | | +| Key | Conditions | Anticonditions | +|------------------------|---------------------------|----------------| +| **neededNearbyBlocks** | `minecraft:bone_block` | | +| **structures** | `minecraft:nether_fossil` | | ## nether_structures | Key | Conditions | Anticonditions | @@ -120,17 +119,17 @@ This file contains all current spawn presets of cobblemon. | **structures** | `#minecraft:ruined_portal` | | ## salt -| Key | Conditions | Anticonditions | -| --- | ---------- | -------------- | -| **biomes** | `biomesoplenty:hot_springs`; `biomesoplenty:wasteland`; `biomesoplenty:wasteland_steppe`; `terralith:amethyst_canyon`; `terralith:amethyst_rainforest`; `terralith:skylands_winter`; `terralith:yellowstone`; `wythers:calcite_caverns`; `wythers:calcite_coast`; `wythers:mediterranean_island_thermal_spring`; `wythers:salt_lakes_pink`; `wythers:salt_lakes_turquoise`; `wythers:salt_lakes_white`; `wythers:thermal_taiga` | | +| Key | Conditions | Anticonditions | +|------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------| +| **biomes** | `biomesoplenty:hot_springs`; `biomesoplenty:wasteland`; `biomesoplenty:wasteland_steppe`; `terralith:amethyst_canyon`; `terralith:amethyst_rainforest`; `terralith:skylands_winter`; `terralith:yellowstone`; `wythers:calcite_caverns`; `wythers:calcite_coast`; `wythers:mediterranean_island_thermal_spring`; `wythers:salt_lakes_pink`; `wythers:salt_lakes_turquoise`; `wythers:salt_lakes_white`; `wythers:thermal_taiga` | | ## stronghold -| Key | Conditions | Anticonditions | -| --- | ---------- | -------------- | -| **maxY** | `62` | | -| **neededBaseBlocks** | `#minecraft:stone_bricks` | | -| **neededNearbyBlocks** | `minecraft:cracked_stone_bricks`; `minecraft:mossy_stone_bricks` | | -| **structures** | `minecraft:stronghold` | | +| Key | Conditions | Anticonditions | +|------------------------|------------------------------------------------------------------|----------------| +| **maxY** | `62` | | +| **neededBaseBlocks** | `#minecraft:stone_bricks` | | +| **neededNearbyBlocks** | `minecraft:cracked_stone_bricks`; `minecraft:mossy_stone_bricks` | | +| **structures** | `minecraft:stronghold` | | ## trail_ruins | Key | Conditions | Anticonditions | @@ -150,17 +149,16 @@ This file contains all current spawn presets of cobblemon. |------------------------|------------------------------|-----------------------------------------------| | **neededNearbyBlocks** | `#cobblemon:concrete_blocks` | | | **structures** | | `#minecraft:village`; `minecraft:trail_ruins` | - ## water -| Key | Conditions | Anticonditions | -| --- | ---------- | -------------- | -| **fluid** | `#minecraft:water` | | +| Key | Conditions | Anticonditions | +|-----------|--------------------|----------------| +| **fluid** | `#minecraft:water` | | ## webs -| Key | Conditions | Anticonditions | -| --- | ---------- | -------------- | -| **biomes** | `biomesoplenty:spider_nest`; `terralith:cave/infested_caves`; `wythers:forbidden_forest`; `wythers:phantasmal_forest`; `wythers:phantasmal_swamp` | | +| Key | Conditions | Anticonditions | +|------------|---------------------------------------------------------------------------------------------------------------------------------------------------|----------------| +| **biomes** | `biomesoplenty:spider_nest`; `terralith:cave/infested_caves`; `wythers:forbidden_forest`; `wythers:phantasmal_forest`; `wythers:phantasmal_swamp` | | ## wild | Key | Conditions | Anticonditions | From 24910778d449d5bd45502d43fb6fa3b061887dcb Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 27 Jan 2025 16:53:44 +1000 Subject: [PATCH 120/121] Shoved molang structs in more places, you can't stop me --- .../mod/common/api/molang/MoLangFunctions.kt | 2 ++ .../mod/common/command/ChangeWalkSpeed.kt | 4 ++-- .../common/command/CobblemonInfoCommand.kt | 4 ++-- .../mod/common/pokemon/ai/CombatBehaviour.kt | 9 ++++++++ .../mod/common/pokemon/ai/EntityBehaviour.kt | 13 ++++++++++-- .../mod/common/pokemon/ai/FlyBehaviour.kt | 14 +++++++++++-- .../common/pokemon/ai/FormPokemonBehaviour.kt | 10 +++++++++ .../mod/common/pokemon/ai/IdleBehaviour.kt | 7 +++++++ .../mod/common/pokemon/ai/MoveBehaviour.kt | 15 +++++++++++++ .../mod/common/pokemon/ai/PokemonBehaviour.kt | 11 ++++++++++ .../mod/common/pokemon/ai/RestBehaviour.kt | 12 ++++++++++- .../mod/common/pokemon/ai/SwimBehaviour.kt | 21 +++++++++++++++++-- .../mod/common/pokemon/ai/WalkBehaviour.kt | 17 ++++++++++++--- .../mod/common/util/MoLangExtensions.kt | 6 ++++++ 14 files changed, 131 insertions(+), 14 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt index 0d084506bd..94b0706c53 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt @@ -732,6 +732,8 @@ object MoLangFunctions { map.put("max_hp") { DoubleValue(pokemon.maxHealth.toDouble()) } map.put("current_hp") { DoubleValue(pokemon.currentHealth.toDouble()) } map.put("friendship") { DoubleValue(pokemon.friendship.toDouble()) } + map.put("behaviour") { pokemon.form.behaviour.struct } + map.put("behavior") { pokemon.form.behaviour.struct } // Inferior map.put("evs") { val struct = QueryStruct(hashMapOf()) for (stat in Stats.PERMANENT) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/command/ChangeWalkSpeed.kt b/common/src/main/kotlin/com/cobblemon/mod/common/command/ChangeWalkSpeed.kt index 54c3207c2f..f37577f126 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/command/ChangeWalkSpeed.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/command/ChangeWalkSpeed.kt @@ -11,7 +11,7 @@ package com.cobblemon.mod.common.command import com.cobblemon.mod.common.api.permission.CobblemonPermissions import com.cobblemon.mod.common.command.argument.SpeciesArgumentType import com.cobblemon.mod.common.pokemon.FormData -import com.cobblemon.mod.common.util.asExpressionLike +import com.cobblemon.mod.common.util.asExpression import com.cobblemon.mod.common.util.permission import com.mojang.brigadier.Command import com.mojang.brigadier.CommandDispatcher @@ -40,7 +40,7 @@ object ChangeWalkSpeed { val pkm = SpeciesArgumentType.getPokemon(context, "pokemon") val walkSpeed = FloatArgumentType.getFloat(context, "walkSpeed") - pkm.behaviour.moving.walk.walkSpeed = walkSpeed.toString().asExpressionLike() + pkm.behaviour.moving.walk.walkSpeed = walkSpeed.toString().asExpression() pkm.forms.clear() pkm.forms.add(FormData().also { it.initialize(pkm)}) return Command.SINGLE_SUCCESS diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/command/CobblemonInfoCommand.kt b/common/src/main/kotlin/com/cobblemon/mod/common/command/CobblemonInfoCommand.kt index c2ae97ea1a..28ff3f3be9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/command/CobblemonInfoCommand.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/command/CobblemonInfoCommand.kt @@ -45,8 +45,8 @@ object CobblemonInfoCommand { .append(this.INDENT) .append(Component.literal("Is Snapshot:").withStyle { it.withColor(ChatFormatting.GRAY) }) .append(this.SPACE) - .append(Component.literal(if(CobblemonBuildDetails.SNAPSHOT) "Yes" else "No").withStyle { - it.withColor(if(CobblemonBuildDetails.SNAPSHOT) this.GREEN else this.RED) + .append(Component.literal(if (CobblemonBuildDetails.SNAPSHOT) "Yes" else "No").withStyle { + it.withColor(if (CobblemonBuildDetails.SNAPSHOT) this.GREEN else this.RED) }) message.append(this.NEW_LINE) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/CombatBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/CombatBehaviour.kt index 28540cfe97..5d00a78890 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/CombatBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/CombatBehaviour.kt @@ -8,7 +8,16 @@ package com.cobblemon.mod.common.pokemon.ai +import com.bedrockk.molang.runtime.value.DoubleValue +import com.cobblemon.mod.common.api.molang.ObjectValue + class CombatBehaviour { var willDefendSelf = false var willDefendOwner = true + + @Transient + val struct = ObjectValue(this).also { + it.addFunction("will_defend_self") { DoubleValue(willDefendSelf) } + it.addFunction("will_defend_owner") { DoubleValue(willDefendOwner) } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/EntityBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/EntityBehaviour.kt index cd071fd814..c5d24dd1d4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/EntityBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/EntityBehaviour.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.pokemon.ai +import com.bedrockk.molang.runtime.value.DoubleValue +import com.cobblemon.mod.common.api.molang.ObjectValue import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState import com.cobblemon.mod.common.util.party import net.minecraft.server.level.ServerPlayer @@ -21,13 +23,20 @@ class EntityBehaviour { // val avoidedByPhantom = false val avoidedBySkeleton = false + @Transient + val struct = ObjectValue(this).also { + it.addFunction("avoided_by_creeper") { DoubleValue(avoidedByCreeper) } +// it.addFunction("avoided_by_phantom") { DoubleValue(avoidedByPhantom) } + it.addFunction("avoided_by_skeleton") { DoubleValue(avoidedBySkeleton) } + } + companion object { fun hasCreeperFearedShoulderMount(player: ServerPlayer) : Boolean { - return player.party().any { pokemon -> pokemon.state is ShoulderedState && pokemon.species.behaviour.entityInteract.avoidedByCreeper } + return player.party().any { pokemon -> pokemon.state is ShoulderedState && pokemon.form.behaviour.entityInteract.avoidedByCreeper } } fun hasSkeletonFearedShoulderMount(player: ServerPlayer) : Boolean { - return player.party().any { pokemon -> pokemon.state is ShoulderedState && pokemon.species.behaviour.entityInteract.avoidedBySkeleton } + return player.party().any { pokemon -> pokemon.state is ShoulderedState && pokemon.form.behaviour.entityInteract.avoidedBySkeleton } } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FlyBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FlyBehaviour.kt index 8a60b4e184..1ca918f4aa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FlyBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FlyBehaviour.kt @@ -8,9 +8,19 @@ package com.cobblemon.mod.common.pokemon.ai -import com.cobblemon.mod.common.util.asExpressionLike +import com.bedrockk.molang.runtime.value.DoubleValue +import com.cobblemon.mod.common.api.molang.ObjectValue +import com.cobblemon.mod.common.util.asExpression +import com.cobblemon.mod.common.util.createDuplicateRuntime +import com.cobblemon.mod.common.util.resolveFloat class FlyBehaviour { val canFly = false - val flySpeedHorizontal = "0.3".asExpressionLike() + val flySpeedHorizontal = "0.3".asExpression() + + @Transient + val struct = ObjectValue(this).also { + it.addFunction("can_fly") { DoubleValue(canFly) } + it.addFunction("fly_speed_horizontal") { it.environment.createDuplicateRuntime().resolveFloat(flySpeedHorizontal) } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FormPokemonBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FormPokemonBehaviour.kt index 043fadaa4d..5f30867cc4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FormPokemonBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FormPokemonBehaviour.kt @@ -8,6 +8,7 @@ package com.cobblemon.mod.common.pokemon.ai +import com.cobblemon.mod.common.api.molang.ObjectValue import com.google.gson.annotations.SerializedName /** @@ -50,4 +51,13 @@ class FormPokemonBehaviour { val combat: CombatBehaviour get() = _combat ?: parent.combat + + @Transient + val struct = ObjectValue(this).also { + it.addFunction("resting") { resting.struct } + it.addFunction("moving") { moving.struct } + it.addFunction("idle") { idle.struct } + it.addFunction("entity_interact") { entityInteract.struct } + it.addFunction("combat") { combat.struct } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/IdleBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/IdleBehaviour.kt index db6a311b2c..222ae46464 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/IdleBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/IdleBehaviour.kt @@ -8,6 +8,13 @@ package com.cobblemon.mod.common.pokemon.ai +import com.bedrockk.molang.runtime.value.DoubleValue +import com.cobblemon.mod.common.api.molang.ObjectValue + class IdleBehaviour { val pointsAtSpawn = false + + @Transient + val struct = ObjectValue(this) + .addFunction("points_at_spawn") { DoubleValue(pointsAtSpawn) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/MoveBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/MoveBehaviour.kt index e1e16e5c48..189b2bea67 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/MoveBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/MoveBehaviour.kt @@ -8,6 +8,9 @@ package com.cobblemon.mod.common.pokemon.ai +import com.bedrockk.molang.runtime.value.DoubleValue +import com.cobblemon.mod.common.api.molang.ObjectValue + /** * Behavioural properties relating to a Pokémon's ability to look and move. * @@ -23,4 +26,16 @@ class MoveBehaviour { val wanderSpeed = 1.0 val canLook = true val looksAtEntities = true + + @Transient + val struct = ObjectValue(this).also { + it.addFunction("walk") { walk.struct } + it.addFunction("swim") { swim.struct } + it.addFunction("fly") { fly.struct } + it.addFunction("step_height") { DoubleValue(stepHeight) } + it.addFunction("wander_chance") { DoubleValue(wanderChance) } + it.addFunction("wander_speed") { DoubleValue(wanderSpeed) } + it.addFunction("can_look") { DoubleValue(canLook) } + it.addFunction("looks_at_entities") { DoubleValue(looksAtEntities) } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/PokemonBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/PokemonBehaviour.kt index 04737ed17b..accf6f91c0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/PokemonBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/PokemonBehaviour.kt @@ -8,6 +8,8 @@ package com.cobblemon.mod.common.pokemon.ai +import com.cobblemon.mod.common.api.molang.ObjectValue + /** * Collection of all AI properties definable at the species level of a Pokémon. * @@ -20,4 +22,13 @@ open class PokemonBehaviour { val idle = IdleBehaviour() val entityInteract = EntityBehaviour() val combat = CombatBehaviour() + + @Transient + val struct = ObjectValue(this).also { + it.addFunction("resting") { resting.struct } + it.addFunction("moving") { moving.struct } + it.addFunction("idle") { idle.struct } + it.addFunction("entity_interact") { entityInteract.struct } + it.addFunction("combat") { combat.struct } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/RestBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/RestBehaviour.kt index c541927df5..d628a4c6bc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/RestBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/RestBehaviour.kt @@ -8,11 +8,13 @@ package com.cobblemon.mod.common.pokemon.ai +import com.bedrockk.molang.runtime.value.DoubleValue import com.cobblemon.mod.common.api.ai.SleepDepth import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition +import com.cobblemon.mod.common.api.molang.ObjectValue import com.cobblemon.mod.common.api.spawning.TimeRange -import net.minecraft.world.level.block.Block import net.minecraft.world.level.biome.Biome +import net.minecraft.world.level.block.Block /** * Behavioural properties relating to a Pokémon sleeping. This can be wild sleeping or sleeping on the player or both. @@ -31,4 +33,12 @@ class RestBehaviour { val skyLight: IntRange? = null val willSleepOnBed = false + + @Transient + val struct = ObjectValue(this).also { + it.addFunction("can_sleep") { DoubleValue(canSleep) } + it.addFunction("min_light") { DoubleValue(light.first) } + it.addFunction("max_light") { DoubleValue(light.last) } + it.addFunction("will_sleep_on_bed") { DoubleValue(willSleepOnBed) } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/SwimBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/SwimBehaviour.kt index c60011815c..b7bde1e0cc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/SwimBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/SwimBehaviour.kt @@ -8,7 +8,11 @@ package com.cobblemon.mod.common.pokemon.ai -import com.cobblemon.mod.common.util.asExpressionLike +import com.bedrockk.molang.runtime.value.DoubleValue +import com.cobblemon.mod.common.api.molang.ObjectValue +import com.cobblemon.mod.common.util.asExpression +import com.cobblemon.mod.common.util.createDuplicateRuntime +import com.cobblemon.mod.common.util.resolveFloat import net.minecraft.tags.FluidTags import net.minecraft.tags.TagKey import net.minecraft.world.level.material.Fluid @@ -18,7 +22,7 @@ class SwimBehaviour { val hurtByLava = true val canSwimInWater = true val canSwimInLava = true - val swimSpeed = "0.3".asExpressionLike() + val swimSpeed = "0.3".asExpression() val canBreatheUnderwater = false val canBreatheUnderlava = false val canWalkOnWater = false @@ -27,4 +31,17 @@ class SwimBehaviour { fun canWalkOnFluid(tag: TagKey) = if (tag == FluidTags.WATER) canWalkOnWater else if (tag == FluidTags.LAVA) canWalkOnLava else false fun canBreatheUnderFluid(tag: TagKey) = if (tag == FluidTags.WATER) canBreatheUnderwater else if (tag == FluidTags.LAVA) canBreatheUnderlava else false fun canSwimInFluid(tag: TagKey) = if (tag == FluidTags.WATER) canSwimInWater else if (tag == FluidTags.LAVA) canSwimInLava else false + + @Transient + val struct = ObjectValue(this).also { + it.addFunction("avoids_water") { DoubleValue(avoidsWater) } + it.addFunction("hurt_by_lava") { DoubleValue(hurtByLava) } + it.addFunction("can_swim_in_water") { DoubleValue(canSwimInWater) } + it.addFunction("can_swim_in_lava") { DoubleValue(canSwimInLava) } + it.addFunction("swim_speed") { it.environment.createDuplicateRuntime().resolveFloat(swimSpeed) } + it.addFunction("can_breathe_underwater") { DoubleValue(canBreatheUnderwater) } + it.addFunction("can_breathe_underlava") { DoubleValue(canBreatheUnderlava) } + it.addFunction("can_walk_on_water") { DoubleValue(canWalkOnWater) } + it.addFunction("can_walk_on_lava") { DoubleValue(canWalkOnLava) } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/WalkBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/WalkBehaviour.kt index a3f46d6316..af55c4bc73 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/WalkBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/WalkBehaviour.kt @@ -8,11 +8,22 @@ package com.cobblemon.mod.common.pokemon.ai -import com.cobblemon.mod.common.api.molang.ExpressionLike -import com.cobblemon.mod.common.util.asExpressionLike +import com.bedrockk.molang.Expression +import com.bedrockk.molang.runtime.value.DoubleValue +import com.cobblemon.mod.common.api.molang.ObjectValue +import com.cobblemon.mod.common.util.asExpression +import com.cobblemon.mod.common.util.createDuplicateRuntime +import com.cobblemon.mod.common.util.resolveFloat class WalkBehaviour { val canWalk = true val avoidsLand = false - var walkSpeed: ExpressionLike = "0.35".asExpressionLike() + var walkSpeed: Expression = "0.35".asExpression() + + @Transient + val struct = ObjectValue(this).also { + it.addFunction("can_walk") { DoubleValue(canWalk) } + it.addFunction("avoids_land") { DoubleValue(avoidsLand) } + it.addFunction("walk_speed") { it.environment.createDuplicateRuntime().resolveFloat(walkSpeed) } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt index 8ecd54bcd7..5fe95be17d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt @@ -223,4 +223,10 @@ fun Iterable.asArrayValue(): ArrayStruct { val array = ArrayStruct() forEachIndexed { index, value -> array.setDirectly("$index", value) } return array +} + +fun MoLangEnvironment.createDuplicateRuntime(): MoLangRuntime { + val runtime = MoLangRuntime() + runtime.environment.cloneFrom(this) + return runtime } \ No newline at end of file From 71fc8449052bb40fd749f9a7426baaa1f3a21a00 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 31 Jan 2025 08:28:55 +1000 Subject: [PATCH 121/121] Wander water, air wander --- .../mod/common/api/ai/PathfindingMedium.kt | 10 +++ .../api/ai/config/task/AirWanderTaskConfig.kt | 71 +++++++++++++++++++ .../common/api/ai/config/task/TaskConfig.kt | 2 + .../api/ai/config/task/WanderTaskConfig.kt | 2 +- .../ai/config/task/WaterWanderTaskConfig.kt | 69 ++++++++++++++++++ .../entity/pokemon/ai/PokemonNavigation.kt | 2 +- .../cobblemon/mod/common/pokemon/Species.kt | 13 +++- .../resources/cobblemon-common.accesswidener | 4 +- .../cobblemon/brain_presets/wanders_air.json | 15 ++++ .../brain_presets/wanders_water.json | 15 ++++ .../species/generation1/charizard.json | 2 + 11 files changed, 201 insertions(+), 4 deletions(-) create mode 100644 common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/AirWanderTaskConfig.kt create mode 100644 common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WaterWanderTaskConfig.kt create mode 100644 common/src/main/resources/data/cobblemon/brain_presets/wanders_air.json create mode 100644 common/src/main/resources/data/cobblemon/brain_presets/wanders_water.json diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt index fe1c943214..65396ae566 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt @@ -1,8 +1,18 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + package com.cobblemon.mod.common.api.ai /** * The medium that an entity might be in which motivates what type of wandering it should do. * + * If you've discovered this in main and it's not being used outside of that unused extension function, delete me + * * @author Hiroku * @since January 25th, 2025 */ diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/AirWanderTaskConfig.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/AirWanderTaskConfig.kt new file mode 100644 index 0000000000..932fbdde0e --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/AirWanderTaskConfig.kt @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.ai.config.task + +import com.cobblemon.mod.common.api.ai.BrainConfigurationContext +import com.cobblemon.mod.common.api.ai.asVariables +import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WANDER +import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue +import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable +import com.cobblemon.mod.common.util.withQueryValue +import net.minecraft.world.entity.LivingEntity +import net.minecraft.world.entity.PathfinderMob +import net.minecraft.world.entity.ai.behavior.BehaviorControl +import net.minecraft.world.entity.ai.behavior.BlockPosTracker +import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder +import net.minecraft.world.entity.ai.behavior.declarative.Trigger +import net.minecraft.world.entity.ai.memory.MemoryModuleType +import net.minecraft.world.entity.ai.memory.WalkTarget +import net.minecraft.world.entity.ai.util.AirAndWaterRandomPos + +class AirWanderTaskConfig : SingleTaskConfig { + val condition = booleanVariable(WANDER, "air_wanders", true).asExpressible() + val wanderChance = numberVariable(WANDER, "air_wander_chance", 1/(20 * 1F)).asExpressible() + val horizontalRange = numberVariable(WANDER, "horizontal_wander_range", 20).asExpressible() + val verticalRange = numberVariable(WANDER, "vertical_wander_range", 5).asExpressible() + val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible() + + + override fun getVariables(entity: LivingEntity): List { + return listOf(condition, wanderChance, horizontalRange, verticalRange, speedMultiplier).asVariables() + } + + override fun createTask( + entity: LivingEntity, + brainConfigurationContext: BrainConfigurationContext + ): BehaviorControl? { + runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue()) + if (!condition.resolveBoolean()) return null + + return BehaviorBuilder.create { + it.group( + it.absent(MemoryModuleType.WALK_TARGET), + it.registered(MemoryModuleType.LOOK_TARGET) + ).apply(it) { walkTarget, lookTarget -> + Trigger { world, entity, time -> + if (entity !is PathfinderMob || entity.isInWater) { + return@Trigger false + } + + runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue()) + val wanderChance = wanderChance.resolveFloat() + if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false + + val target = AirAndWaterRandomPos.getPos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt(), 2, entity.lookAngle.x, entity.lookAngle.z, 2 * Math.PI) + if (target != null) { + walkTarget.set(WalkTarget(target, speedMultiplier.resolveFloat(), 3)) + lookTarget.set(BlockPosTracker(target)) + return@Trigger true + } + return@Trigger false + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/TaskConfig.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/TaskConfig.kt index 8c950d0113..85cec31cb8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/TaskConfig.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/TaskConfig.kt @@ -39,6 +39,8 @@ interface TaskConfig { val types = mutableMapOf>( "one_of" to OneOfTaskConfig::class.java, "wander" to WanderTaskConfig::class.java, + "water_wander" to WaterWanderTaskConfig::class.java, + "air_wander" to AirWanderTaskConfig::class.java, "look_at_target" to LookAtTargetTaskConfig::class.java, "follow_walk_target" to FollowWalkTargetTaskConfig::class.java, "random" to RandomTaskConfig::class.java, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WanderTaskConfig.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WanderTaskConfig.kt index fc05ce20e5..021d21fa92 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WanderTaskConfig.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WanderTaskConfig.kt @@ -11,6 +11,7 @@ package com.cobblemon.mod.common.api.ai.config.task import com.cobblemon.mod.common.api.ai.BrainConfigurationContext import com.cobblemon.mod.common.api.ai.asVariables import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue +import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import com.cobblemon.mod.common.util.withQueryValue import net.minecraft.world.entity.LivingEntity import net.minecraft.world.entity.PathfinderMob @@ -64,7 +65,6 @@ class WanderTaskConfig : SingleTaskConfig { val wanderChance = wanderChance.resolveFloat() if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false -// RandomStroll.stroll(speedMultiplier.resolveFloat(), horizontalRange.resolveInt(), verticalRange.resolveInt()) val targetVec = LandRandomPos.getPos(entity, horizontalRange.resolveInt(), verticalRange.resolveInt(), { 0.0 }) ?: return@Trigger false walkTarget.set(WalkTarget(targetVec, speedMultiplier.resolveFloat(), 1)) lookTarget.set(BlockPosTracker(targetVec.add(0.0, entity.eyeHeight.toDouble(), 0.0))) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WaterWanderTaskConfig.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WaterWanderTaskConfig.kt new file mode 100644 index 0000000000..381e855e99 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/WaterWanderTaskConfig.kt @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.ai.config.task + +import com.cobblemon.mod.common.api.ai.BrainConfigurationContext +import com.cobblemon.mod.common.api.ai.asVariables +import com.cobblemon.mod.common.api.ai.config.task.WanderTaskConfig.Companion.WANDER +import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue +import com.cobblemon.mod.common.api.npc.configuration.MoLangConfigVariable +import com.cobblemon.mod.common.util.withQueryValue +import net.minecraft.world.entity.LivingEntity +import net.minecraft.world.entity.PathfinderMob +import net.minecraft.world.entity.ai.behavior.BehaviorControl +import net.minecraft.world.entity.ai.behavior.BlockPosTracker +import net.minecraft.world.entity.ai.behavior.RandomStroll +import net.minecraft.world.entity.ai.behavior.declarative.BehaviorBuilder +import net.minecraft.world.entity.ai.behavior.declarative.Trigger +import net.minecraft.world.entity.ai.memory.MemoryModuleType +import net.minecraft.world.entity.ai.memory.WalkTarget + +class WaterWanderTaskConfig : SingleTaskConfig { + val condition = booleanVariable(WANDER, "water_wanders", true).asExpressible() + val wanderChance = numberVariable(WANDER, "water_wander_chance", 1/(20 * 3F)).asExpressible() + val speedMultiplier = numberVariable(SharedEntityVariables.MOVEMENT_CATEGORY, SharedEntityVariables.WALK_SPEED, 0.35).asExpressible() + + + override fun getVariables(entity: LivingEntity): List { + return listOf(condition, wanderChance, speedMultiplier).asVariables() + } + + override fun createTask( + entity: LivingEntity, + brainConfigurationContext: BrainConfigurationContext + ): BehaviorControl? { + runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue()) + if (!condition.resolveBoolean()) return null + + return BehaviorBuilder.create { + it.group( + it.absent(MemoryModuleType.WALK_TARGET), + it.registered(MemoryModuleType.LOOK_TARGET) + ).apply(it) { walkTarget, lookTarget -> + Trigger { world, entity, time -> + if (entity !is PathfinderMob || !entity.isUnderWater) { + return@Trigger false + } + + runtime.withQueryValue("entity", entity.asMostSpecificMoLangValue()) + val wanderChance = wanderChance.resolveFloat() + if (wanderChance <= 0 || world.random.nextFloat() > wanderChance) return@Trigger false + + val target = RandomStroll.getTargetSwimPos(entity) + if (target != null) { + walkTarget.set(WalkTarget(target, speedMultiplier.resolveFloat(), 1)) + lookTarget.set(BlockPosTracker(target)) + return@Trigger true + } + return@Trigger false + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt index 34b03c1b9c..32179036ae 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt @@ -80,7 +80,7 @@ class PokemonNavigation(val world: Level, val pokemonEntity: PokemonEntity) : Gr (isTouchingLava && moving.swim.canSwimInLava) || this.mob.isPassenger if (pokemonEntity.behaviour.moving.swim.canSwimInWater) { - return isInLiquid || super.canUpdatePath() + return isInLiquid || ((this.mob.onGround() || this.pokemonEntity.isFlying()) || this.mob.isInLiquid() || this.mob.isPassenger()) } else { return isAtValidPosition } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt index 2dab829b03..58073f2973 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Species.kt @@ -129,9 +129,20 @@ class Species : ClientDataSynchronizer, ShowdownIdentifiable { }, ApplyPresets().apply { condition = Either.left("!q.entity.is_in_party".asExpression()) - presets.add(cobblemonResource("wanders")) presets.add(cobblemonResource("pokemon_sleeps")) }, + ApplyPresets().apply { + condition = Either.left("q.entity.behaviour.moving.walk.can_walk && !q.entity.behaviour.moving.walk.avoids_land".asExpression()) + presets.add(cobblemonResource("wanders")) + }, + ApplyPresets().apply { + condition = Either.left("q.entity.behaviour.moving.fly.can_fly && q.entity.behaviour.moving.walk.avoids_land".asExpression()) + presets.add(cobblemonResource("wanders_air")) + }, + ApplyPresets().apply { + condition = Either.left("q.entity.behaviour.moving.walk.avoids_land && q.entity.behaviour.moving.swim.can_swim_in_water && !q.entity.behaviour.moving.swim.avoids_water".asExpression()) + presets.add(cobblemonResource("wanders_water")) + }, ApplyPresets().apply { condition = Either.left("q.entity.is_wild".asExpression()) // presets like aggression to players diff --git a/common/src/main/resources/cobblemon-common.accesswidener b/common/src/main/resources/cobblemon-common.accesswidener index eda01cf0ff..846bedf72d 100644 --- a/common/src/main/resources/cobblemon-common.accesswidener +++ b/common/src/main/resources/cobblemon-common.accesswidener @@ -111,4 +111,6 @@ transitive-extendable method net/minecraft/world/entity/LivingEntity getDimensio #String name, VertexFormat vertexFormat, VertexFormat.DrawMode drawMode, int expectedBufferSize, boolean hasCrumbling, boolean translucent, MultiPhaseParameters phases transitive-accessible field net/minecraft/world/level/material/MapColor MATERIAL_COLORS [Lnet/minecraft/world/level/material/MapColor; -transitive-accessible field net/minecraft/client/Minecraft textureManager Lnet/minecraft/client/renderer/texture/TextureManager; \ No newline at end of file +transitive-accessible field net/minecraft/client/Minecraft textureManager Lnet/minecraft/client/renderer/texture/TextureManager; + +transitive-accessible method net/minecraft/world/entity/ai/behavior/RandomStroll getTargetSwimPos (Lnet/minecraft/world/entity/PathfinderMob;)Lnet/minecraft/world/phys/Vec3; \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/brain_presets/wanders_air.json b/common/src/main/resources/data/cobblemon/brain_presets/wanders_air.json new file mode 100644 index 0000000000..c72459a9e7 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/brain_presets/wanders_air.json @@ -0,0 +1,15 @@ +{ + "name": "cobblemon.brain_preset.wanders.name", + "description": "cobblemon.brain_preset.wanders.desc", + "configurations": [ + { + "type": "add_tasks_to_activity", + "activity": "idle", + "tasksByPriority": { + "7": [ + "air_wander" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/brain_presets/wanders_water.json b/common/src/main/resources/data/cobblemon/brain_presets/wanders_water.json new file mode 100644 index 0000000000..91b320632c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/brain_presets/wanders_water.json @@ -0,0 +1,15 @@ +{ + "name": "cobblemon.brain_preset.wanders.name", + "description": "cobblemon.brain_preset.wanders.desc", + "configurations": [ + { + "type": "add_tasks_to_activity", + "activity": "idle", + "tasksByPriority": { + "7": [ + "water_wander" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json index abc801e944..797ceede67 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/charizard.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/charizard.json @@ -56,6 +56,8 @@ }, "moving": { "walk": { + "canWalk": true, + "avoidsLand": true, "walkSpeed": 0.147 }, "fly": {

    hzw{3AV!w%3&akN5y_``t4~JWGAQZi}ZzmMRCED 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 XJMqDEx}l(jU`QBIUt%Q;K1KRJiF|;r delta 216482 zcmXtpduFd$>wfCKe)sh>RFb@`Bw;jgbu|W1@c)ijLpjKQx3N50naPa8#Q%N% z?}5wn0InJn22vz~@Be=J-xvSAwai)cm{r`?)x+hHv%Le>A8U$zh&8%7EwL`xSQ#mE z3v5u!-2FlguO_z3E#OW_ODR2;Dp;?xS`lDZ*Mk-Wn z3>ou@c82Knhww|Q`ps&%q^145Y>@U!KB^vNF>M7)i`7$O{TKNIj!Q#{yiw$UT3IsK zUDeL+p!jI)fY(4wxXQuLzwtEq@5U}u?Z*uxYg^OH@qz%f5cWD`+U<43Ww_H09uvi4 z+^CbLeAKs*37_0zGxE1C+k5xKb>&45q$G=#E)S+9np@_vM^m475*ca2&XMG)Pq;~{ z#SGhaSa%BcTEG08KW_Mv`o0JjC-7&+_s0Nu{8_<~?3=)xkBrbWd}FG%$-%AFEq*CB z6JO>ZLUj5qu!-%ZA=>K|lPA9!j*HPx#M}E_7+4OM&KhQ)%#?ag{$HOu0eG%6 zGsJ}jm2fc;79y`d)7ZZu7mnO0E5rUV2sv?eUU_wKnZ4|VR3KJU zZ&D}sM##dHn$x}Q8{GaVS)0IP&Fj>_KcjcQzddYTS)AMI zj@BNMs7UwkIvFl_u-R@?)E3A4aodGj4w!dKm7>~M9v1TK{fa+W5788f9zo8ieoucA z5WQSgMQ8A58;6=j1qs21mn1!wt1&l@>S!9jXJq)}#bcOm@SlIgWKJab4C}bL*RSm5 z*Z-8tr+4u;EJn1la{_kZEod zB^&BVbhmW7>ltD#GQOa`LH$Ja{HV#N*E=!Ks&(PdJkfwjQbelv z23-;tS77qRk{MN7Rq6`1Ym$2R?!Qf`IoM4kcNlv|UMKqahp2~qo5MHR0Lr?98Qq6{ za%K|)?#e?X$Q)9EA>F^^9BY}}LJopSBV7Cu7}`$_3&D%)%VfNX?f`}OzQ3rWBJm*j zM;?BDNg4Rih6{k7s5k)Tv;Z`@>oxYhLJ5EE3*(T_)zP+=&q(M0Ir@IYSZDd)#W@Ax z>moNjYWVNfva-LOhHN;Y(%}8u5x#gcs9|NhwK%dA4lrRbr%w7g8UV@X@j|65Vll;?a^jYNR!#(19XAuxAY{E2tVG(@PxBdj@u;MdgKSgc6^OyUbOy}QyhKb zTVrdU^aqe^4AeC|8&K{7%<|+wk%0z^8cF)eKeCIx_0S^cs?R24nJE>82ka2Yxt4GU znwgBuW*8y?!z}!UEqlMhWrHPgx+zi;4U?pS? z3RGlpMge>vgFUX)ZRHB^0w{>+?%b{>%=t`4KCrk3lG^4?e6y^hC7!FkJR(JDkdv#~ zVOI_o$@1FUQc_lsng_P8ul0my?%MuwKzbn-6!UsZ25rReO*j9LaQ|^a{);tQ-f*_b zXo=;0h}P$-5R!!qOng>^S;^7YBw<0D@$YIc3{k~rQAxWs#PJ#mgX%;AIA!%mcuU)p zeyyWEO8;=HwdN?x`4j)cH^ZMKmGbZWA{q4l3-UpNGBMwPfqbpQ zMFzt=b!B;6fGloF?+HVob_c%d#Qfz#TCcaL}YxE!LV;bOkVPL$t_pAWQN3|wDgtKM_8L4SSS0}`6$y? zRveXwnyRlAnck(nHT;65w~$ju%GG?baSKr~YIr+pYuL-}H;=86c)px_HET6tImhN3{> zvOx@m4TpwUL&~u(DRi?6Vrfcbv`<@Ic7Ax~99^CM*}o2BJ^N?$ob=bsm-j}`Ufns` z>|GYvxBpRFx=>;Fp*%(-K~;i%^kK+d9(sowZ5u&`_Y3ONU9()vJ`;*!_Ab*|^#{n2 z2tL{r1`z@W%gIvZ;>hR#L%_B`9yG#gz?Wg*%E7>Ps&}^bv9*Om8S&`!aey86;?9F1 zVw@gk@r!eOfI<yU-*e=Qb|DV+rZ0LM7#eEkBKaLWJbU=G*%W~Q?^`?V zKr&gJ6700@*ZG-+ji#qO-(>~%3aP-+UoR!2pq80)Xxr{Km{&$a8-Lb(?eP_xoT+%| z8F2mig9-T$6E7T?GQSu(MBBxXv0Ml)^lRTR`G;T+mY7&kHjNZY4Vacw9!}I-!5TG8 zAIZA|F9ek7zA{Wq3Kjrf#42ek8s3X02aBQ>Cs&|a_Lz6!JHdXTPQbexLnGOAt6e!3k zmYT$~t0O`0CX)?bO)Y;>+T)}Zd4kY&kt(KVIsXaqfXd)v zLcWLBV(IK&M8UmDGi!gxcpo}>P}psMQ+_YGK7Rfha1@U}qK`d2gFUbCfpuyjltjO0tcAAuT!(*GhVRm=S7 zCr_w}LPgZheN%c=`5(k_AYpx8UYR?VsZ$1yQl1c>Lym(9WFH1ul~1z(k15%LTv z$($1?zqv6#?)!bERp83$v@_Zz4Gc0hdFD0~9k~DP`l$m}RxDs)v14)EPyH0wiNiV{D_JN`Qs>EVD z8Ivq^Ww5YyzYgcyBRZsN^w++fU>5&`NVs;nnE}N>roQmc7=Poo5c{0I?t92^ki2JFwbo1%s-Sf+i! z!0Oc|lI_=HdX&XwdlL-g#*vhd4B-E#M^Qe5p={xs_Hi6}Yh+LRRz!$!3)tG*>dDx4 zK?Q{AzB+`BJxHt!r}}H;#ws|gzXLCqx(~oiyI6*q8>Mf+A46;*j=;o?Ubyw@Q$TaE znChXUOt7GEA)WacTcV0+qDQ)@D%;#!Ut~t=$b!C%h2niio?p%D5aK3xBD!xcepR{U zNlYbt`q^Co0VWUcNcoPLe6{hG^tteEu2v)Z{}fc&G50v?w%dm z8NW4u)Mih!N~m^wvN&Gx*is35(5aI8VRQfXj@aEc<7Qj;t?Lvy_ z@;T;jN3w^6+xQj;tc+Y-6zYVeWhj3<__1yOg?LGRR#LiSD8r6IdL~iFXw7tB>U{(Y z7fY$+ZO)W0+Da)n8czz^`gSht=M2;j1}lS?NH_p^s8y^FiKPT_uGrC_tUumq2Xf?F zpC`lzfS~z()fFOEu8C1HnY%CeY16iy|3c5u3ODTvtBJ zB3b*m`&>j&50bUYI~^`={XdYHTg4! z*qx<9*i@Hm>S;m^zoKt;e6+!PqL!bJKF$ZBtC@|bLV~mpgICUWFG*e!Tbbam=}4XA zt9d`TuGdY@KfIcSjXgJyR37Y_FKAUZ2M_^beud2RkETn1V=UK9q?9VypQY6=EjSP} z?;&2=iQAi-AXtR#5j^iIkSGjM8OL*~A*Xv1GrNxFT`oSw(^4Es3sYn|xa9M>2DB<`ORs615}=1ov^N0cdR=S>xeaNJ3B~&$FgfUX}xL_aA;nP z|BYbwL(BtaFH(%7w|pJ!$6MbEP%jPW1@}pZAxxtA(3wDgFM^+tIKEsYm z`RguEqHzD&hLh&MN9|UdA6|VCY`wpoYyFVtUu}B`JA-K4LW|Q(s*-J^B#$V8x68UG zH52m1y#2zHt-ZN8RFDpbuFmGg9oClh(SZHqeG^Ra^loq9+m|V$F)?`gKOX$^<#hdg zHM&H0g|pBpb_Wn7cmU79? zg6vh3nc8 z`>XVF=vt25xYZ%}pThekAI46LSxydQ$+JTPgRsa=>IQK1h3_Zv*nw5{*oXLYUeL0SEcA<>3?LGy>(;gf}v(%<{~R~x_l54l+n zLwbB^r%SDDRem!oxt>x{zn(xZ{$95Kll&=E?3=lPBj%bA@E*GC->Op%+0FmHIiAz* z&6Zh~AU;7QqRmnp?iH(>0!PZDJb_Kn;S1PnHRY)9YsY{d1#00-K;Ekb6V*GgqF_jh zM-uqMmOcu;510?7?Z{yg`2aN}HpguT@B7>Bt*K`__Mz}oowGsq-16jHIg4}p?E|R?&Bsf>cCAKkoxey%k_PkssSKd2oiFUm zwJoR#X~)I$Oa2JKTu1v7ta2(=9V1w^+^>|+4ITx&$nY+TinRfBzakqx226iPrr5ur z-+M^n)gy!rb2$j_cZR2aI1xs(!Ns3#c#N6KKoAsc!))+2vUM6F4YvN>CBcj1+b9}X-Cp6wMah`_ab=ny|Lg?7z@M5a zc3fpC0f6s1dkp*NwXTh-8la*w`1^C=-!x0Tp~*Qvt3t}G>Siyb~q zVl74-IVqjxE*{~<@9=#3gJzLlciZq)QVO$392L1ea*{6w_W~zbKlibQSq*ca$uc{Aw1dhVe@|asI|}BQ%gcW>UWf&JW6?GwoJ(5fyp9E>r_0 z%Jk8N-Pr0&Ip^friD*ELNV1a*{cuZLfh>8Ln-B2CXJFxYln*sF`xao^uAuU%BQ}O#=lQ2c?14)qV!{(HGer8QuqrQYL6i?LHMr{}>OC8=xc!t0G z)|ZSa1)homcn_ra5k#U8J1><zrS@FK*F2^k6Vi6qB6}QbL!HH(&wSwzHNXpKYn+H z;^BfS+9f%vx3jNe_hSEcj>ZM+!+&%X6dyJ>p0sylL*QknDK=LSa_HADPmqk{>*OeE z&a(T#P|fM8zgs$BPl{$NEa)xC{Vw&Zj_9`FeuY+2mT|>NI<^!?~4@NwLR+%fgVUr+}1sUWX&E6U(LMyIx zPG#ZkBQ)3}_P%=U-p=RxTbfFae+X#??#Q2Hz0s~<$pqQaMDb_dHS-tL0D67Xf7vdO zCp-Yy#%G-BH4=w)$kzNxS>xT z%dW<-)3OMj3%6Ya)IFG*+-SJ_1OVsip>WmMp@L(<&& zhFTe2`CLYkIg{#HG?X{!-tPG1!{YZ}gdL(FDEx8=YIP5(7}=F--tj?wm6>UXW8M6X z9P!iB!}hmq>WL#HcNP-{XB|YZYEn#ZN&@8E<3LfScmk>kfsl?6aS5c1p@@fJD5{%e zxZ~gXJ!1&pAKsxyD6$u%02w=n@Xmyit@zE^;xSj#_x>cki84duE-Bdq58cB6D%rEm ztWS5iN08ICb|;pHC)#7d=AV05Uh7#IzIpbR{<2x5m1B8;XMU=)m)g*n4slVG#5&eS z0;ML^hR4c!nH@XQj7XepOwh;MT|=OZhGfhAInM5U|YUds(zi_B=OBeE7>G2~c5wNyA$+1Y&j?tZK-vgor2m zCvzy^D44ue@O}SA+Iik+%kmpBmU>e!thQnTa}N6teC^N4-&)>^!**D%yi;xPxjIrt zelUqq?1*<4xwR))wRw_D004&VhRcV`P|rZS2*CGt(*+$JQgJjBpk8+o3z2u}fJj3` z0AHsqM9z)0_+}-;sbDtr^ce-VWfYWOd>?IxFVy9i=2Z2?yQfrnB0symx50idk!`MC z^$=5%_G{gm3SQ0odd7()TWkvJN9IL~YE4zua#2xUw8qE}(g{l6F|=M2-j$_eo09&PTb=4!?H3W6NqPLxo%6z)j$=^g)@&riFd*mwKH^FO!e8D!r@*I- z7-dGZq?I-{V}a=EW|RPw`8fDF1g+09g2;&l{T=t49v00v_xvSWc1Zqscv5hlNv5Koo*rnz;lQ!0K3L>Dof{Igy$t< zjV!$vD_9x2)fWoIvoH%xq~FYB+|LZ%PKNN?#RCRpYD@~rM` zaJINDc2)Z=)+uH!;REqW)JjI`+;c-}tp<7gTd<3(BK}w;{=Z)M<+JB}_K(&j@8N%Q zpNzn);xW4#_fr*IxFbm)o4XZ=$DR!?=MDGFhRZv%dE;g`@#7(np`G9LD$D3@v*bro z&poT*L^S`o{F%$3kz;>3YZ})|`^j(<=B&?J1Ie$DH8Q01o%3&}#2bc!;m!OGRl?kh zy(bJk!5!PYW2T{V)>GmADyIhn@=qC z^Gy0m_ooItTnt2pP<75bkw2+82oJ1L0WTc$?~j?tG4EMGQap;%2!%fv?M4MQX|2P3 z&b-F6dUF5L=l}frZe&_qSSa(tuaZN?J@={5Ot8zfv#ti!=%83{Bi&J>Rp67)Px^g0 zJW`R3haOkHtUKzF3aq1jtMGuwi}k!jfo=mH&xmE)$}9B>Z}CW$@)UjD(QN%rAd7nD zCFD)0*(Z>&{pL!6@rkOSyanFJ`|z@!xJ{WZK_mp8$%5PSrf~1|^E5BEkg4p;qrrCO z376B^u)_%ba(5=8Wl>iuE*Xm%rj<{qZcd%^ebonSYZiSEjW>#-V^xm<@XI-E+A?jX_P zc)zq=7OZ^8nEaejHXMPBnSZ%R`7l8+f;ki}`5Ov=`5VJwedk~`^xsL%lnS?j!RHa{ zAZ<_AjD(fTDor_xk}&=rCNd*$C0c?ngHaVy7Df-NvPX(!x#v@{!jyGCx?98)4()#j z*ce%oTGM!63a56eP}fwCakKvZc!lJKKKhUf3bo;i8jqE|S1%^mT7x5L)kda%G-$8u zZSvrdeia`zeV=kE#E6(Lju(}!f06pzAn5b*U5_E3d$g!WE+h>MmNk4dh5(Qs&mUSt zFmklv=`{Bg5TL@$*k@SKl60WGp>Jh>FM?2D=j%6lAp!TNmB%Gvw*!s>vXDs=++ni2 zPYj>t$sMY$35jU0J!&`Y`Gwbc%d+#y5AYhc zld~SmPTE@dz7&eR@M5?65DeHY|K; z`VmPY;z$ZotmN2(QVJOc@^0mGHBrFANJ9NZXPAa$8pibTdpiA0CXCRl>4U!uJ+Oe0 zQexy{9liu@Rj92pS1J8fI1Q}R8*Fa{@YW*Kodd zR%qrRSQY~TGnmede=@76xMMFM6PLjjjEpUYmyPS;=9h!vTL2Hp0BG<{(n-OL7=#Z` zDq&?8Tv^X;EUFum{mDFdks(!;RVGvZvv(Eyy}fdSM@8PKzMy&B8dno)nCzjRSU=Bm zn7h&as{!{P<^#m8E*!Ed3lrm#hVl?VsLcY5&8#)W=3IBZ? z%KCV=bFXFo*A*q0vL?@_4x|hIsl~#`Usk#FXLQR``&kRN>NB0)K0Wu zUY)>>>yjM@O|qCnjrf;KaO~pi=+C=gMFUv*(AE1n` zkfgxI?Z^}&CQl3xY(GiymS8}_N=4A11RTOVnQoe*ogYpR7S1=@dc1X2Y~U#u?l-Wx zU}a^orLaGf(R($`V{|Bq_I2;eE{zxYyIDe%=TM^gmBD2tGXtlLm}MeWm!!7Kh0@d0 z4{v(q?wW}6$Awg6OCo+o!plnAwhQ4A0;#}Tw_%^Ojku!^nuLI;0kY!RXN~GO%(;EQ zxpu0Im%*PjYh)gYpAEW-o$C$}@sKZVHTlH4 zPrrEAekiO^$8rW|5c#;CW8J{77BsjWP6Kiqr79xxPxPRgjz0Z}=y#paZ+vgH9d12x zi9QWtizxpDHU!>r#)&xzkOh7~vCN+{;?-rnKf3c|>*LS&lR7-3kZ!m?`1E!b#wSmT zkH=(3jw6JgxK?(vM%^&CwVPx`N}L??aqBwlGrQ)&&lBVUw4K(9ap)hByTIbPMfpg* zA9srT)~@7j8ouv&s{Wu$YFSf1MwON9<9qKVX}) zj~FFfM=kjre298$ySETgALDrcB4*Q>EYqZYTKk~z+E$^Q4K}x#B!q?IN0@Nqlzrh+ z;>K~Hzn_96`;i0y{cR_7e5q6GGYTli>0M$<7x}s81*Y>ywmDCb7{CST&Nzkj@lLAk z$lo5nE46xLs%Zfq4)r6iyOvpRgFf>4yWBF*7+(qV8Cf^{Z8CXey^VOcFfp$F>&N}S zLbU>-MuVb3YEBh`%{IN9$4@bZIQ(4KI1GQ<^8fH7%!y z+<$rcs+?`=r8M7nB~zYd8B$NCzoai8GVb@41lcc)Zyy?K*kc0Th%R;>V^?A&^uu%B zQ&pzopHByJgs@U8)BQ%w++cdyV3J?(dm1zprEM}YNmwdKy?t{O(nApSC6D<; zjd-Ub=4z+P_O9)69LBgIgN_qSSpZK-RFZ|R_B{NZ1;<+|Spe-OR4Ue7G$svMqd$OkT;w2~rD3+22%BDil zzUJ*)ju*^BGPcVELDG}1vb&iFFE?972(%D};g8hi@B#cofVs^+tkwm96EXNA3Kdtg z4QP~93?>-*O|o<8%6e(G9A;g$wIf|>x#F02zcuqRt(QLlzAP_PuK4(`UHI9yu9(mk zlWZlk_3PI>zSo@Bs9SH_qa8x}>fXuVn$PC1u1U&hl5cDwFF&0Wur({foD*bH_@+#h z%tse@Q71)$k3W+{B3q@^X>K>{#%?_aqF|_OcIAu+0N{)*TwaLLAqy~@Yd30hd)0Dy13$HlrCF)6LZ|)b z2S<@#c^buHcJ`U_?>=FV6mI0C8QVdQOz7c**>D&h2DCuHHQmu$obh30C9j!+^vwZ- zOhWxY@Co*Y$e(nT#81H#POCmF=QRfrC6&uU>Ufbv$dRw1V6j9=k^Y&&5RgO;@oQx0 zYR<-KUCgK)>vG*Wzvaz${gf$>Po7m`ku5v2DLFIAIb}qrAJ)4%x3678jxl z2hQzQS25QJ8R1rk>Yh5Od%?XoW)3PPYD!`-VyXKO!g_}4hFq_V{)X1#_&6X!{7q6z zP<`@Vm`$))DI*R36v9>^TwFKCh7xd7vlBr>=cGW}a3}MPK~u5F127;N!v9(g<*x;i zTy0&CD?PSRsk~P3pCA4qP)1g$>G*}#onBh|2_eggiKM7NWSV6KYg6peOJz3hv_h@* zRMk8O_}X=kus|Qfs%?^)T9nY!XPT%5eeL>WqF0SeOR;QIFVYF<4-$z7bX6TA`^I6; zs09c*yab>=V;Ssb-(Mk>_)zFD1p%W!qSP-xWJX|2+EQ`IwV+@+?XX^k9GDbS{h2Vu zWkfa(gu!tDb0+#vAHOaJw`dTUD6>+E>b}yxr+$7TEYJ?%2832A{T5E)w__EFU z;Q-K6vdv|&l$Ujf@A|eEXYnY<-wWD_slEC-!!Swt#g!nWzEMnbs3V~*czS*J>;o-u zg5n?F($siMlsOY%hqUOeImQ4{f1-Co245r{lO}aV_Q{bzv6az4H z0i{;uKRD@|d_E=;#yP6dOoFF$fQnK2hI>@MPQW8%)}P+Bl-0V$TT!98_H<{*Q`)kX z-}3VdOJorJ^J44CJ>Hj*5`ig=!p%k7uPg{_8|Ij4o2!GSGU;CjzkJTSR%)FI520}S zDoO)mNO1{Q;P5$lZ?YiQ{qFlaNsaZ16hr=OLbUYP7IU=MgiS}eds_rGab=2AE=uybRvQb+@!JwX@O7ugRM&h9f9h9wJAp*mxsqR(-1h=JMN z_@_fx1l2yJHY^kXFhBxP05@WdAHb>lfe~R^>f{hJIh29?CgK3xokai;i71ZA4Af$E z<%8Q9n{9d!th)WWT7wsIgEuLNXoQ>2Gcdg%=A31+` zyq@=LomZ26Z_U3WRYIj2xzie~mQvX;`=wZ6q)*CdD5t+W9ZLW2!8q|JIETE<40ijW zPV++@h@qw1K{bK$enpGtIbCe^v-gVQ*AabRMFfrb5qNCUKd1090g1BN_$V8aRpAxL zr)oLuhNgN6YqIFBOZ&Y1yx3a&M7d|J6Tm%1{s5?EB3zZh;IUIAJqWg;o~uR{17ZP4 z%r(aMW=55GZKCm(pEqK5W0qYWg@G$GhcV}sbh0V}vvyK%2%jCSENla{^US7{e9cQ(Z{WSBz@@nU2I*7bVC7-UG?!2QiA!FQniT89C%ql`wq0y^Cz)mSoA{)q~LEQh^hl!H+=faXxTC*5qk$0KEo+Xm*3#b?G9F=_)&iNT5 zlCXTp=&Q&BPm<4JBvbW$_1b9lO!srv2N?VHlaB#^z_NP2z<}g=&Io%8!3n;1HjFI zIL`TD0=qEM`kX`5@yKKHK3#{wZ75VC{^sIRE9D*`j0!W+Fo?+sklcI%0JzdiueGJUyK- zSfxgy#jw04B{_JoRRBoqXMMC+@wKod7himd0TTB#NKJzXu`qfwfJj(&mxXS4$O8!> zphxu&yf|xptoHBpZDICF} z56~;gI z+Ge&kg=197yZX{*R@>7#Y<@yBUWhg2E8^blebUn|ogw_*s{2kR++kotmZx8)1%_eJ zphOLHSqSZE>U9jCl6~#RT0=k}nj!*%*&WLE$K_+D6hkkcpkQ`D3)mq4Pze*|6Y)rj zHIWIv)dYv-_b%=FgZD`UOeP1jix4Me-l-giQ^>vgK08Ra~cXy?`;bkqlA}Z z7~sQ>NPg-V&T+i}T-5l&bK?h!XwTne8uEtB3`P@!(akQm45&wXJ4Xs=AjT;-*~@wy z`q};Fytc7hHItlTL{S<&0=(mF#e9sfm9JM=I%Kr{+8^XKRWBl&-r}oy9XbLORC~XX z?_)wY41bSZ0tT_WP3jjZ7cYA6R&VuHq8|;g3+?qB&qwoq&AAObLD7$sFdVOJ;61anKcfC~&reR{atB@!kA?^!1bsfoVNqy75SX z89YA)Acl)1pF6o0V+!~!BK!_Qg?BRtqFkS^J*8_#DM#ldX{#ua5Z+*^VARFGOh_g< zWcN89MW8lchu;s4ByuMRIW>mJu6^A&Z2#!Oe{y9kN?!v?3D_}OMQFEoT6~x4#DQ@r;ey4 z&(`oJSvv;$>Bt z{8OYMERandnAto#O9E(FacUlX+Vp&#d**OzVD=a)rGcnmAe@v5Ji7wqK_^poyFS%L z-FKQd*t9}#g81JtXViYPY68sa_^t*7dUCd+D;{%G65Dflf+7Iu2jOkU0r)7Gxo3Ox zc@1Rnsqh3hL0g6|H%yLDpDU>cc~_S^)~3mK?8{AlEW=k^>E}4FY2y!-wPX_aXR%a~@EhEw`?uMY)>1we3Gm`Pjz+ z3L4p0RvW6SVoK_zI&}uEkolJ!X6eO_Wzts74Ey&(r&Nx+oxD>cO4;> z&*o%wPL(&qZtj~P9q})JCIPAdb*LA8bCI1Y5u}^D@M!6YBn8kE>K`(N^lF#%Vje!9 z((D!_z=h5Te*Wu^>t!omERd+|*7|uP1~2Xh!h?&Fy|;9()uYo$F_T}S3JNfjFgDkS z$M_Y+hH;dYtg!*6uu!EzNne~Tez{}_(9S{c_oS}0K;Rcz#WHvxz-;^ z56FjEZ*oy^7aH*pI$TGS=D_@sHn?^^cxNz|8zn;Z%58{pcRbqhk#sHSXh>m z&zS%OtY$q(?ty&i6i=~b501`KcfotU2%4PZF>he-nTgVoMW0_=f2!`@b=|A~rP{mp zN}#T7<4)38*I;4RU#~_l7X!@%F(&Pdo_}ikja~m_(NqUdfM}ml0rQ2gS2FYs5k3T2 z{s#Ul*8W)zr6k_PZC(u(6o@6m~^Q!i$kT4$aog;g+NFhWAzavMdiSM`pKJ4!%xL{p&YU ztE1Mtkt^3^*KDxhpR?Dgd5`*ChFd55GByW<9XDG4NiM`NLLzX1cD48SR^FCUZr#Mk zFcf|vu;T(VC%V&6d$KYL!V%5>Zj`BUj$P6mczi#8hOH$)5mcf}$00^iNOyu{!+N0i+JZ0*)UaWx5hXkUjiy=HsF zmMeR*wL$OBxGTK8D#r+^MP>z*aHtguw?i@T-1zf#DBW*`6m^rdogE~K5Y_MBumcmF z%M#)ffr=(4h{q}t%5eNBH~#t&;Xrb&+HnCT2D@R8)wLk2_HXE181cby#Fu%5eie;d zi&Y7(sGFpjsS=6moFUGfTzhmR0Cx9Nv3VB<0dN@@7?gs|A0u^^eAy)^ZfunRF^46T zsn&%fl$F)?=>`9rRN%u;fBYm4JctC z*Co_O5q)&zbJf>(uaBOJ%Hl*qg^66iA?B_rl+D~+U=L)jK>MQf07yE2j;jw^WvH0u zpsUK?RFIuffP{om#?1$OL|43rbl+@=5$20*t{$qqXgDEcXNgF;4~1dT48jVp zBTNq^c+fif=m)6$K?r@D@4K8m}e))+$=!xtAk9VyKiHf00kz`D#U-3I>wt<`_*w{Gz2W% zc*;A(E5k~42Q%@@djp#czF3TL;Q|)*^+274w)GE82eX53a9|zu68}^)h-eVIcOKjZ zfC6=q?^l~W@X%(3iUP@}2L}SfD(4B$bC~oPWBL$;7-D=P1H{- zMZ%!FNDKgN|Lb7+3BYlKKtJ2Rw~j|WaZJbZ`c0cmzdg(|O8**(3`xy9t)Wp=-JN9d zBeU=v(|R@_Lqv7%Q+B7ky#>b&!N@G16b%!s7Oq3$k=WS+#w@nTIYu@h%f`-(m9wKF z=lbdLH>u^FUeI~f(wNL(FU?WohIIKggDoZ9X6Tg7z;gDI2=h$nz4h^E&TX^n1iCKv ztW>v@)t7PAUW!;5cQY-KqyM4lJ;0jyp0?q$X(aUCqy(jd^xg~|rARM|6hS~hK)SRn zNCyQ}1Pc(FpdeMn3IRnxl%|xQA|hQ-LFqN$`hVVUuZwJwO_uEJoS8ZI+%v}{KJnqP zQ}3@|?k`E(vQxiSWnyy}jwpMf-$r-G`Yc(kFk+ zO@Q}pz=rtw*|+Ch*Z-=$9x(IVbYYzo=ZNg3iC-FuSQ7L|v3xbNV0iv20xs;QJSLxG z^pJFa5bdqjUX<`A_3obLRnxh+jc@3>b}2+yjn^{@MpQne@~5aDe@u*H&lpd~`Y{{a zDJP}gxu>1o>Z(ho$UNiCF|;4&>%1itXqOWL~-Bud>nwdIvEpMM5P(d}Ag|K)rN;&7aR zh^T%A-|@zYVnrX;`Qr*B6@n!FF!4{h3lVl|WYM5F3GcqR@8*j2e!Dut>yOVk#Is~3 zl1+G(y2vSNCg3HZsQ-JkxND4<`r2ZIF3XFF=EXeW=9m#y4&^y9Zd&O_7Q-vwvkNm! zQU(*TB4p7kkt*qjmSigX(|N>ehc4YsP^*%`*x#yh-ox&;`KLT zr0L`SMOzTZRawGnX}~t;X545RvDuJ$wzGyD6A8P?SY$P~yW$8Gid#*3?_A?_sh_WK ztwlr+Uoxt#C48&Z=SyZoU;3G9*akIwuqqs@|Eo1)GpoJqLgBUM}BkNh4D7eUD6~K1$6rV1C%Og4b5G+<_Ur1 zP~e6?kmfD-8hvz`?t&nH6@eKRrj#}dWa7aL=pHacOG4=;JC%?#xuEaE{j|iQ&vB}E z_8jZt!+-0R?2(n|_LsgKlxXW{=>8boOgp3%qgYCD_XOPN>g}0FNd>V?TW4zaC2mIF8<-Bx5dx-(ne$> zcMHQUuT5!v^}Y1ubcV+7^dbHCq;L(9>Yy(^AA5Rm!(dsEJsx-%n`eCZ$T=c#I)P zMa(v5$Lo1Zlf%-L7P*4{T$&;@+>Mk40^d1-Msm6zA@^N+@c@K0EC|)=H$1+UoaTM{*7eQA&!>MZPrW~Q>efVN*rWS< z#i8-kpJxZJ?1J%w313F%NB)lLTnasEYZTXs`os8V!B*A>e)?Y5 z^$+`6{9*BzYwDGynN>4ao8-WwF=X?s%HS9xU%K@m#IKgDiphh*-?K^5_3vF29yYYu zSO|?wKlEZa@j5f8+JTuCpn4WR5VJ7|OALw?MytcPs1xXaMULvXKNoVK+ax2Hm3H0TiKYHkJ`Z{LO+b8PeBsXc z_DRue4^-duUUqi8^>y%V;B0TUG+*Ie24%);;a51rwo8-y!ZOz;C(>SAWqed4y%wY? zBFadDkG0J;UACzH6+G$U5O6g0$+K_W`3}cV(5-)DsvLaXSfq6vZ_xbey0wFYDjnjc zlVHVTrK*=7LABBp%cEZ+$&UMBwsj7cHKSvw2nnk`fl(!8wc3oMVcn)zjz8k}^SN|) zE}KpAKdu^f6{~Ii1d9gF_ecf%wAcsN(Sn@p!S`3b?Sp~b;c>ET1k4Iq9m?ZTpF61sF8KMT>R<<}Hl(WQh&Alz?v&QKNoyU``Z2KR&2bC; zRp;7+-ZGIeWiO}KCNE8>58H@SdmqIuI^4rppVP(r%O2s)``Fh~C{{sbA;t0&GZM-4 z+kZSDN{i5tg+@B--JZe_lCdlfFcMRJ02Kr||2{%)0vvQ{Fy;96x^>pgkUseS38vQh z4vJnL^KiWQda3r!(TETUjSeA0sUhOdQyCT%k)C|nw&;bS!9e?C|HGd!<$VfvxTJL# z-YMsxzes#OwpRD-mbB0_aK3`vS@yE+G1+Dhl{a6%rG_9~U9dR zPszn_!ELi}Is9EWjG0N@DM696$MC!(OW9gi;yeV_c z=H8VVffJ|Qag>*T2C&MqeG)Z z=i-gd7xP_vwzdw|*afo4zo7pGj_`_9?j}CMxE%fx1((nR5XZv=1|+*#!7>gcbXizJ zkC}Apyd$MGX}$&l;0#(ovJ0)d5_578+*Orq_=)8ZgRvgnPxA#e#1)DF3CwsHBunc# zFmo2NoE5O=u7hte;PW#^!E+eA5_>6%SHv5)U9l*;t z8Q($=Sl5+QOW1%Us5OtfR(d#nvU0`-Sd+d$8wccnB9*_=a*$R$3%UAF2AL^I9veWD znmkJ+i8y$nbEt<8tS}&FWnw17rxTNofP{G&F-*T_=+RCsJ)ig|DxEE%NHo zu~W3*-S%c%h1t$c1&`-zV-76By*F6-9p|}rtP9-X^l_Rj%Y5=YIom%>k1ME#b1Olv zNtG@nD*I*8U?4#QwoN0|R8Ndu(Fhhkp-8I9(O1(s*-lx-;V{7GWD*2axUoyJyw62R z)6xUpv^*ttAeqoJlm8QvF~(OqVa?E>YcmB8#x8Jz_Z=-2VBm|k6TKfB`qM&=4UvKe z-POD#Ffd4N*GHx&0QB}jKw)Z^VLs6s4AJ(GoFYe}Frda}ahh5DnOVE?maF7R=Z%AmLiXKH&_z}znwq8NNZC*wf zEv^}@Q)pXpxN{=QYmh}tP@ot!aFLnpYQfP-Fj3HHHzEMI6iavmJ;!EZ>XJP8h;)KG z$AA?)!Hm&Kmm@8~QbypslZ~Qy3gqt&Yk(KOIrCLzB%_g zCK+_APV78RWDpSw3H~ZeAnhxkyzPB?iXmEgi4S1;n@%lV4A0LCCP7n%WX(*k3w^>y zsF0x?_Q*tZ~!_ zoP8IO@({9%Vi&l5Gu-yykYAzE8(oxyz!(?X^?nFIDAMf~<Jtl$q*ZsvS5B8u+Djsy;XxwPRmRe zO)3Z2LS8xm3>m-+mi!t1UTOu+C@_gE6|Y#_a``Z19bqr+REjJzA9hi?SH1EjzfhBv-~yYT81RPT#qude`lgnYTNx}_x^h)l*J|B&OYVk985hmZ3AydlItxBr z{*U+SnP9me1v;Y=E&{7oSENpPF?!e>#g_h9)txVA!6lC!k7aDNCF?znM8mpAgGnDw zJM@l-s}swuKHf(6W*$hr9#dfSsto1k0OF)OY}9Wl-FYtreJi~%!Vyf5thZvlk25z% z9p(n-M^~N8F_+h37z&FW?3D`epE?)RI!M0Rpvrkcl7N_&AV6tO++>#oAQDkk zYfS^$rMX&B`Yf^oM`D+`n+&hA2z>qE`mv^VyePB366Z!;mCSd>R7nTsk&^F=vU5Fu z?e!ae-u(XP&sLtmcBPyWt`_@=jrnnE>d{l`rW0rWHi)POwdx%L)UG?-%>NGr0nGn~ z#s7gIi1LE%`46+gj;=1poSYnKFwGpPKOwu&^l2m-Qqw>)rJYn%R#pyVJCm{E`?s9# zhg~Il%{tBZ;nwhj!%?N?#xh&!A{H6M(!&8&cb3Xuod^qCAK)8Z&?qT*W0l}+VRfeJ zW_{D81PAZQa^|T4?7`K~$D?iL419-7S3s@Uoo|2WzV)6s`Cz(UY3}Q@P<|i5V0BLN z_=soz*_IaPZI?!yRCd>v*{HT>6BD5)Z@KlwE#JP}IlM&2)S)MdOOw77v9+{uAg~>L zB6crsSm@>#p-f!#)zeP^f3oi7%|JFqjG&a2>VN0W|9sqiVJlPo=5yr`jRXt6Wd247pPEuGala9 zMB~9-5&hB{-A@v)^}oN@oFLo~F=@B~CyVO+ciI3y)+;0^ay$+KL%aPOsdKN02=d#& z2s0E{u)S4`VA)_A6S5Fp9Ci&*$m7&$?!b9X+!l5Tx^%C0{%FK{pSOU$}upXf;4sYz9#8zT?;^I1L^mzdM86jWUQ zo|JPTG-mtf?7_4Xq%^gm87%7-RJ9@05?E2p7fhJ>pTe5++Q z*fW%0rRNwmu--YlqzX~w)#=1jzW%jp&FZ30_#OMp^z>Z)`NK4pzuDBeH$Q$=?X}Hq z+cPWKtxF33J-2e19c)w(hz;H#26yzUxW!2O&Tg-((nTiK*xz;Q<-G>Wt(vzO$?xf{ z@^MsGu%HZNiCelr$0PAe1dwD{O84Mmuw%fH*;BEgZu0{MIEvwd$iIZtjU)rt1pUi z1#v&kgB~Oww=5g@@KI(ze1?4HY^#H62NCdO<}G)Yk4u_Zv^e*I3EpuIgLS`{x0wm1 zXD1b!{7R#}^lvj<<3t=y;BK!q_T~*pVSyWz)zvB%C~!p8-}3M}Y`^${ZRC@=1s?o_ zkm079`HLPXC>=;uo)_m}#ULbnMa1%gD>C!=?2oS{&>du5BAzUZqXN*d*^-5r?S&Em zQl9><8-8+ObJ5-FEEUOt!2n1uY*%r74Boc6>3w-+z}YgPD^sMh>Ir`W1a?hO6jKOz zAr0`%7B?rLg={|sD)6Aj3|Lz_nIIu<1z8js_y>;J!a8UcH_G1u*!zv`06}&q?#rxTmk`_>n18dQV2RLw;n`k(=u#82}Oob#y;^^PU zGUVCO&8-b)_u#p&Hu1BsD|CR&l~Gp4k~@K6lk2PASY97>BUg^G`*lwv-W_9cKH{NB zrzieu+5iuh|0y-B?A!i2j?UV}_2z0;%Hwv-q4|`Vuf1U==0+ z?{nmV8UJ&)ugBe7kY!A7yDgaiHbpyjC8RLnjE|4<&7oVKV-{HlD}d>j>!IS9_BfZM zsQZ<1CKiR;dGGTGGZNW$2q%%a-}H2&km3SY9Qwfz8eCWv*xt~!a-tM1uL2Xf$s&|i z;`-LdG6+x&A41^KRec3m4oa8f4CazeB5#?61Ruw=s0?)+5>k^5L1y|urw$DiT+D&T zCK8EJ0XTOpsqwEd0F2zpNPvLI1@;?7r27jcjDvmtetU8KFhp&&9Qbm8%yOO42s3L~&B-xnTyt!b^Px;3goPm^_pO)}&w3 zKfr((fm&$*qua;t_|cKl{KD~o*qc3bs=o8{!TOc+kL_!RjfH#M`}+U36W^5-gnv>N zP`PIGwSv6(<v0s%4V@gU#ZtwtW2sTl7-NK z8kz?#MNJ@gF@fjq24i9A<*xD;rc2l?TDP5>D2WbRPaq>xTv3h>--jt3p-&lrBu9u8 zh}B^qWvxXsXSjnH5U$5$R=VI08*%YDJ`sxAiFFR@Da1J?Cl2Aa7Uj@R~G#JYTNdOQR-quXq4wyW85GV1W63LiYEr zjA*ZLYd7)3E8#K_k?cYKiq!53#|k}?!`tlJ;}vpk?;|;5h(y0|vRyF*>qB$JQ&z0?Z(gaeRgwF$xW*+qdm4;GlZTK&&MmM67JN)M zPLFCziWCgqJBx!v7s3Y=Y?H9yIfg$vWWmhP{)gGXbpvPFLe!2E)&c{(U&;Y$V#P8! zB~wRSca#i;S04w@}Z{c5jT(?I5=CpORC=XI86? znQ_@6T?>^?cY?x9vc;uANOrQk1WfHXk#&j-j?O^`9v6@6z>LD%gu3_w&48lcSGpCFSdAH-Yz+bHvQoA#>f)LpeDo{lt> zv+Obf*G%*qK*oYGbrFbi3an||KfekDK%VsA3x|!iwq$aA5*;|$SW;y<`;zZv-Gu9k z272FXoQ;JAF_Yqcq8=z%?oVfvP$V`wk#AfKED#{ic5H(rAnX8O)C!~Z3;aqKXdpfN zZ1lqzZrbu4Z0wIGQNordbBg;JUVdXztbgHFnQ(}Y#98@?UtKgX*t;Och`k~@akS@~ z61suhtJ8ZGY5rzJGGvE{3UJn4Q6=k5&oh|Gebn1!ib>SDIXf2v>QSyoy!Ps(jL!xD z%zR`7V?A0dD5Me<$g)5J=fnpzr(cQ&K2Q{6H(g9YKhkqSgmL8>G7ztEF##QG3^U?; zOaT7snP@+YCKf(4>h%urgH#s3@sKw`YU}=e9Dwg}JQWE>8YBR!{Y6^jJa07tNXBSC z)=iD|bT~XO97-U4JN-yU5A{A3mG$|iQs~T3a`RWFG3Oh3pm+lz$>sg(u3Ks_x%u5@^ij;NP1o-kE?bwr(*+g(*|k0WD565+u@ZLi$^5Bh0B&NZSV=0QTm z2hr^xONV@S&L0#xZQRbNS|7I@3FD2Ym-0KZ&;D05SEmIe`HawBk6l~4dXdSlG|E{y zv-R1ltV_8%A%{_fhGcYOYtvW~Xia$sJvAxz>bbwYKkFp>p%k?w=k7~hwf1Jw){|UtbVnPfD zsF1j9E2*%C_!QKnMIY*ZrU)-~ zFw&TG>ZTij-KX=PH#UC_uCb4yJ{ZpGVQLH`T%o$-w>`3?!qSE#BJma5A(WRyEvGWq2xs9U$5Lm7@a+t`rB_ ziS+7o{9v7IJRLIL_}D*9@l|f~wm5d&UEe&Hki0$8mhItA9_mq^Dgl@Zo-D$oK!DXj zsU;g0z)rwow)$^OtlL$3mGj=ZIN8_dKj|~{=E;|Q`k<2&a_2!v#Yt1yTlt^vhm=(P zQmFE00O5ZILZ4q^?Z>OB7C7*rY7J~1y?vW1CP!GjJU^39iYU_`dgY-k$o$h(P5b;l zKf!q%c+cjNm3sB+@wR+S96nrFDr5q_D1K4N4LBLZ%f!T-JIlD_vGhScNb|yDaf3mN zMC*?r@K>(jeA3r`2Gk+%r5-?M-X~McbpM9^%HPqUkWc%*?+qaT+S>*Oo}I%@?JO6L zi(>wNn#KREYx2JioBu)-Rr?zb5(?zw<_Ml}h$cXDS5#D1S5i|uZfT>Yp{b)~Wn+WD z4sys*HJVxAk7~izedT?rYNvj4f}he}uvcR~tCxOViGV@$UdId7scg61ey$tq_{}4? z{7wTSsf&%DaX&?l-iCJcj@nA%6VlQ!jK#}+=a)LGj1zWigkPkw2nAn%NA9WZqXoul zp83q_qJAOluyS$Hj)rt;imhG4;K84|K;U}ZGVylm17`ugIBykM{|oWm&K1L|O(TlX zgSyPD-|dT46V3Ti5)bo7Vrff1MkC}hn~QkwoI7!Gu-z>qiJj8u;JARU_rC1`fgLVO z-PbD9P|o93@8sU>xl<=u_{b5XdH11gEmYOPBitmV%_AvH1)tP+4`l`Aro)aFU^|98 zi_qPG_9Gz{@h1Q9-ty-4KaOmdjtS9boS)+R&-_=CU&qzde@p(Fc#1aK#YgFkOlKEc zK}vLn^3e0AXj;(S*X`aFt;rY@3`+W4RjxgH(OJzCYaTPoK$~WgOX<^4Rs5t|}p$_pzr9jyLZ6n_o4tP_?duD4?!b@qwQMXV!it zfdJ85NxuQ1Af8nJ%IUyzjk(>y0!}>4iCB_o7we+&$e_JvHV^+zv`FI{c4M7(qF|t4 zHR8*>h8=UN6--_>(22q*+Uy;mfg@Axyn!0~uixj?az`R%2Tf!ci?g8}b85dD>w{P^4L_ z%bdCaF?-_+{fX=4Vx;PGNI-;uqIjfCcaH!DX0-kh8;KyzaegT~FSCtPYv8|c8e}G} zv*2I2HA$ui>Bo?`9ocNq75;4hp0KZ-O@YACwg<(}tC=&fGw$hn_e^0%&p0)Hps>>S z8V%F&3KieGy9oSK4W0KB8Z}nVS+9^ntSPRFg3;}-JHC_HEs(Ss%8Cn_WO_7#o68tw zTUFRZoG1v0TFjCI%r4LdFOsnt0L^>5L@pVb9+Hrx`sAJ>fHU_@>y9DrhkCl>@%oi-o-K+= zC(~MxiakKL-%j5vHi>;QTob|TFE0eOJmR9fJ1Yugv_uN-SvE@j7ch#X=Ak8ZV3IKzaXIx%whCyud7? z`hgrj++I6Luk@i`^myhwm!E$qItit7X5v667fEVRE?Uu%Uz0JiWi$~a+z z%L*c|iOuMoLPdYBn5K`5nGx2$k1Qp$c2@JQ7gBUIMTQRuJkD&o-7 z>v5?*q(eG2`z<$_=LfcRPynj)_1F66i%b3zB!>gzw@MG&b)qRZ?n@@Y@HoW;^{?Yr>{k3CnuC+vw ztzKN1Q&(oJ(`=M5+WyUfL{dys{o=XM0?uUqY5&<&;ZViwp~iM;eT7LzlyofAe8 zORyTv*G-#``hBFyS6@~m+O$Cm@Ez6RyWbSgSUZ2*%JkBhfH~y|MCizoHxw!z4nHz~ z1gk)T3lEXnEEHDB`L`AWWe;`GXOLgxwn&yngu$YD&Kiauv$8Q8K{SX7r@$14I>8IJ z!#jD_T|uTFmW3`MYZz_HGLAcM-F)wPg`nGp@i+;Ru@~>3D{;VO7|2&}d=dm}3nV6& z=C>;vSC|}vd@)L&)mrywk(>A~EtgpGcK;n@Fx9_#tQ`%W(jXNmLi;H>?wWeWBBP>y zF~8)I!-Ndksy)!sAl|H`9Cv$mMH=CNM{*zVPPulj>|B=WJbGFTP*Ws;E8*OCzR5dc z10*Z|sZ+?(F3_n@U4*(PFLBNioRbHYN#dP0m%i)|pPXy7`xZ-EuUQZJEi|SXjbBRZ zbUjh#!UR6=p6%>&oGREcX&SyWG#=Busu1H-P;>DvvuZ?qP>!ZVut3xs^W`oX<&03>0?1GA`WqcS zmv+37P5`6o2gkIVwk`WTej~zess}7!mB6gb7$__=VO@D=WZylD{OnM?+nkP&af!`N zKy}Ca`BVSRUJ0wCOQGMq*wyRhk*j?TFn=&a5(7U2Qj6VBNXaFT!#7qd+0FV?6TIuQ z#8J^WQILio%w}k+*~2Jm`NX@?Rl}PPbw~Ov6=-7;L~zZ&APps!^P^ zHgu7r_NOkk2bDLkuWpb27$k@ss+XJezOXv`u+f(9;ow0s&)eGv1*Qt%zX$o|%I!*m zSVkCd`X%3pN9N1HwH%;1Hp%RDMFkrf_2?(E-qDC99e|@HCefVu`Ztmdy#DrPHWqU5 z2sMw`1xT1~m2P?RA>&tOUD8g+)o}wzOaRiW-mr^d-sJ-h#PK1enA8bAWDmfUN(=$n z>0T4nbm9$DGk?_e*!TUJUzUehg0xOoafh}-onYA0^hD71N;*UtGit;Pt-~Ek z?)Ha=8b^S&-Sn3$oM_%490MSQaG^=zqPb!~LkdgDO6sNugArM$Q+;?SYXQXs__-xS zI-?>%L^4CyxDXTyAm#Y%18Z_8Y&jbng>c~N{|HbB==%TX&X@?rxl3*2FDJ86qA1kKP5$QQwFGbH4Kg^_yj2_i(* z{rm4*BxDMZApTQ|Md|3=)Mkz`T8%CI*wpvLBR3io3846m@DW`B4+EsA)(u6!;HMK~ z?O6mKo6OJ&8PVmw(zgcLh1}1d-e(S@jn*9$#~#}DV(a@p(Zv@P^1G%hBLcmU{%!M) zieyVN622fsj5a&(AAo^12$SSCk-5S?ebdYNJ6nJyn0RFz$W?$ z0!5PW0>aZ_{U8xV=ItD4xyJW&(^EWI^DkP38g&-==^bsq>OV}adD{n zbYJLJV(#4s4!|>~<7x}L`VIp9Qh@bW&*!@xkz;X(Dvlj;5zC*dHj9Mn&b@tk&8T&M zYv?Eu1-e5{*lx@Fa3WSe8U^B}6YRer`fElR{U$kCNXFIc&?CLXh%N{N60rwJ4g~po zBL36VtmXC51zBMyN+i3Da;)^+b0d@G-y5VwaMg}prw~jQYhbT9+d%vKW z%zq^65Jw32+vanNW=7bxnr8)_lGxQ3bLUQf!{C*vfC&ZY{2&_^7p2hFoO^okDuebT z;GbDX?rRe!(vi-_e@kb4ZJ_Qd1c=Nx`>%*N=w7Q1=hy5n-sQjS!-MB$)#&!mW_Yl8 zhihzG$|KulzojtIPg@cOVEp<(P6pBqmzCUH7%T?+%NN{(TCQjyV>z$hhKgG3|9b~X zN02xbyWJvK2iD7wq#YMkKmacG`6s6TZ7-jt_nakT80vIRNN@gfp@jdNBVd*hFpJ8^ z1)`;(|7#&Z4g8;E{|7z%vkl2sXdMBilQy>hmh(7?lyn%-%xIQ0Et)z_gr-5$rIGBv z=bqVQdr`vGr$Ul5g`BY=x_`_&xj!6`{Ay$F{dY}{b9ux=hJEY2Ad|CNz5MHZV6^Y8 zDH1jF`h@9cjzzP@Sw>55_jb-UN=`(QLF`J+kxLr~C($mKdOYlfohs&Nt4lxPD?c{x zlB54P>eg_@J6Qf+Si)y9T3zv6kl(K?04l1Nz6U8>$UWQioFzak^+B`ITa``^8@L3` z@$T#Mzt*|uU+y0HT~cZ1?!+_j{hn!KDEU!nV8J;ZE3YTk0uou@`)61L6d6Ey>yL8x zc>fCskWo2tE!K_R^t`}>o<3*usO5TNTt4~qiELvVAikD0)hvFy<@Dpxge{#j&5bHe zUt-neg{iBtN02^7dULkA_ON)FiaL=0Md6ls%fkl@4T=ge8HO^43*o@3;vF@S#bu0&6IaGI9XW zW?q1MLPmZ)?aMJf)-)v% zl9}SXFZs>gJiZ1~sn$7LZx~Rl{}k*G%UCrI=$@uOQ@2$1mxZX{<)-=edmwo+`mHJu zjbyst^5Q(PeWr9n=?c4!$9i$FmHM#9M#RyDNv+Kz$3XGTB5sEMuA-)`r#DHyuC_ME z{p=tLL{u>gA^jx@)02)-+L6XS3_!Qz0rL&mT=WpouVDrjK(Z9}rxPEfpQPdxim;Q= zK;5IaAyR#~&)bm>QqxDsZPB{tJr&FRY%y>pz#g)Mh?Payt4J4 zIz|gkZ+_jvUeXrhJtRofc$jz95sKb}5vV@ymm&&D=qP#;ce;~GA;}Cp$jcqkcw)BT zDb*&6IqWZUB<~R+`I*|{#w|0D>xA${a}Y-@c^VA+a(h{j&0sVLsY6(*;Pzvk9QK=> zQ@cb%4D0sO)@4a50FQJNgxEByH_&MC&*=kT8-JH#otwnDy}j?+$;`WuA%8gC%pp;1 z;b*A6KZIhX=bb;Z;J=JfAg@n-?6LO+f;L+M=;eB7>*cpVJWTtXq|EYE5EQ=^e39a_ z5k`(=-dhlSVr*|tqRE?)@PcXO-vwa7g#azV+JF_*C`9iJqK|ckVL(EL2deuse*@C& z00NVh=-Yl=lT@^Q5fY-S%D?v7Sq_Sc)F{0z3MEgH~HIcQ50O@9!P^=Oe%xD)HTV$Uq1Tmkf z9PryTj+1@>W#-M%LV;9>V-xlWKeDuz%>;4m9^4V63>ZP2rorTUGUBEGZ}W&(MZ7)y zA^xX3;*j`799@xDsPk=K|Am^CRvSl`lLixnj<4>{DTS=R$zTF2Mz6744^D8Tb z_gB~Z1llX4KIydG77LdJl}*bU^e6I!XSAM2=zrFi?-0xyz{+`c3r3)@4zYTm@DrS1 zflLMwU|{LG2_<)l3K<+>vfepD(~#G3eJE>ue`fg}myKjj*!Be1L#Z~?A4cv&Pi6@t zEbQYM|4oXaLu7kP%+aezVGV#i1kB1J2*59u;-R~cwl2Z85Q(AYoiT#x@!nnrXlgk^ zFrca-)Y{0}HyEQFq_sVu0{G}zK!)OkxgOBxYrkP5jw3e~U=r@30O`jCM6=fs`Yq`) zH%ZJpbX@J9X8}n!kcVO7nZbt_DaJP-7)YDm;LSI*Hm5Y|vkZR)7aI`RwhbL%?HEk*H7C?E)MNz>ahx z51ipWyNEQCmPzT7-{P|y~;hphFIe_=eV{$wXxq?4}Dlq0(&bC)>~SqQ9pKpRFA-xjbAX^DW?%;0)7@BVp>4vKL&WF;8$_Q-5;xI5H+EQWIzC3bucF(^zWNF=%jd71UNbY z5;kBzXC!cHSUL+t{jA6*)Gl+z62Cw36C9K^5wOiSiLHV=7-G$q^o#Pv5m#-9hf7Z43)ii@RD561>8)EswiWOMoTC?t+Yzf zS@x6!?u8sWEx+gf4y#oCW=OdMvjZGpp3ORr-A(vJw~R*#56&iwn{*+$53APo;ltjUf&Nr+$= zvcTj|ejE~ka#P!dng19VBSN@{@HmiFNa!q?0l$10moq4gd+X_jaRc9APoARTIXE1&|RmGFVACa%n_ zy6lwH4E@++qNvHE1NqJGpvmqeRseITVu0D%LT(_xf`J)HdN=avheKpl?Y^gdzY9U=cvzACXN>j@eIliiH#ER*BEz-IopBLyk%9`U+_ZphN zxeZITrH6K`$Unje(SfJwrX2sq=(hCpVZRU@RWt}_PjBKaTdWeQx;qj@!+fx z<4p#5XlS;+8%F)sr_F?_pfG>RjAYEIHG=)i8s%ruf*3StPnTWi2Gr$WH34Q3%D)gi zv5^JMYsm|q;ti|y111&z^)U+3LEr|w)F6WEYGDBtg1vyGn*=~pYzUW&bwilJ4?zTG z2Q@>;!^Qv|2$?$$0C4~tvhnc5zse7)KuRj2NY*cv5oVYjAEJCKCQ|=KD*#Vd+99f~ zmH2NG1RHM+jqwU1cY-NS=BYK%0tYFwUSNA=Ae3r4Pwrtimx__*p%~WBh=f}!0A~F2 z+jaF)j4UJgm(=4_Ugr=LPKOKfp;lmkAkh~!qKTzwQIK^Cya(_)oYi|4k;kQ?@4Rbe z*taON@HLvSI3qDT?dE(l<#zJS-N5$lNe4SSc>>Gc-~zYH%q19t8#?~H?*+N8T09&w zby#vdDp!|Lf!+aGc6odhMYr;y6Z!czUs=?+S zR-rj>7s;`t1&XJfD7!?K+MSPdHy9cuMO+9F8CpB4k%Y&}K1H8|mQlQbZhDK0G=iyJ z1s*&wfrCQ%PK9zAw!X^zCtu^czH2HW_v8A1yN5>u@v5)Lrq^tB&;QiEV~}6^V|rk~ zfUK&MGOQ&0!9dUK&jq9-ax@rA9-ZY8fpe^rp{?{PU6Fs<4Dx1xxSLX-?M2F-+1ZN=bXNFA8*Co)IR zpt#4!H)nigf zXFGN_K^Cd$?En~=U$UazMScz{rYrnhV@%#^4NOz@IHRse%~VhX7~M#OfOe$w&y zMR`%x8(}yD5iR5cIvM9MfLfV~XdKZd=$`|CDK|r$9JN>vGQ(9o!P9kVVD}7!GTC*8 zAmiV@E~@VTBkHTeqWZ#a_XOQ3l0$b%hcI-9N=pnWA_@p7B{OuFC?NtPq9P?JAu$Tl zN=PUnqllnLci;27_xqkZf504`;mpi?_SyU0>s{|!YG4%biPf>8NIL{23`nK6ixv4I zsv~2fnx$~Bp|Ef)TZoL0nL-Kx)9M z0T=xr|C^T)I75OYFdX8M#5pdjKd}GNtF3$c$uBzFXKRgAwq*UiM!D@Gf{alaXsi$8 z(`zs{-9jYtb+I)c@OT+>%TJqU03&#xPfG~TG%-gcMDBTB>B4}dO`+EbsR(i$7y5BH zz@z-vc}G^sNtJnWWg+P`g{!n+vzQJVRSzU#xS|vv8qn4cLz9jGAgmAAar`WX?-iw& zK<4Z=6cfyvC;~ibfyzBHVbIMh0x5`Il=RCtSbp|K@6p_UBhku)7n;yMWkXLp4pJ3h zgdGzCZ_R(Kn2YDUQAq#Iw%9x})_7r<3^DhQgp6F=6KrU-0poF<^wURc5Vze>=j`bk$^&?M^hn+6%|3daIsYu zM+@LNE!IRYVpOIHNvoKFoXV{OBXi zc1b0t7&Z(D!me*RVpCQnxL!H&zBxA@tbPJ9EO(6L?MiCmM; z;lWIa{Q7#1{v0-#H`Mn0R$E3&X^FCwW$8|DNbx7xg7$>Dcez+5YZRw&h58ZasTFK7 z)KdaJtC))&s9!5P?ik?RJ86rrK-FQ-MdN8-r>uuvjd#yxHj)$g>KhcOEzoaM;AhqQ zcdsK!&GWg<&)0WmRXYm(j+8MUJS_K+wi+V26i*gsnqrO{O-d+^?Q}i|akmD}iTu2| zU7eC#@yOl%Tuu`ks>Q`=XF|!UUdbrFi;E*6P+EW#26=Hy;giR>9~Un8j=aOeZh#t? zH0Beu-rB&(H^fm}u6&=YX$0+TQQ#u)3_Tc=ASsV}J zzKaz{7TD-TiWSOVxV3ucUASe959(=X3F3sX-AovcxD*a79kkj6YD7EgV!z-3vZC9lDYv7JzBuD;@`uqOG zNuOkMx*S5x!)$0!qciq%$gVJ|4i%kfxV&SJA$(H=kRvrC0X9o9R?2bvSb)D4oaLO~vM4hMpoU2PluTVo;DB?()}RiddvI6&kEqWGouMf$x`A-PGK<;3 zwyBSYm1=3GYe86Z{_`AN8|H_eHF=EO%|Vy5nx{Q?TIq%Ukl!wTb9?oi^PNNDPCh3O zHq2xB+1EB5Qd%t8Q9TToQzF}SewPH!b_bJ3Dn0yaJd%nq2({P`{pkjoaAmm&kXZ($ z2%y~y%Co6>AHnd8B1m8fL%Rbzg_c@U+!+b~=^Z0^5X5Q>O}xr0o{;vl7$DyG03DSf zmcs@KX0=c7&*{L=FA*I@oY;Jkuc%M1$S5U7|Q_&+RSM8krNn|2r=lHhja{xaK zN9i{`Z;V=pO3r%OhED*-_p;;yMfOb@^V^mO!oYbk#a(d$M;#enStNBZa<1{=>;1=S zBnhMfLxS>I%2}q%TJL~XQjf9xfdcGQ@GDWk#g39S0ufFKB#FQx&L~GX8jy?MTHvDNfjUiWqzd0q-=MTeKPeRIbr;-V01lj%5Lah zksQOJvV8u_D4-6G?6a%DkQ<4Hp<^l2%*!7Y7(!H2_Cy|nGVU7x9 zMZ4nRLNhRxlgQmYowujOAuA2LodjHT%JhrK*SC{zKpb!x>l!#*LmHH8JR`l_k1z)k z2go53D_9%Z$ppPRnp9iI<~tb<*pp+7$<)x*MO$|J(`MVktmAhcEZ2s%Z=BZG7gwXQ zuzauIJ!OhW=j*CD*tl@f;C4uxyyvNe5_gf!fc@H<{Pm3gjX!oZmcolDPTN`0r;oKX>*f^U0r_-1;}M(5Y((4$&!H$s0ud82i4MG zis5=lfX*$2=S4pi1N*cUI2drlhGvn2y{*e&bc68b0}O$YrDP$ z25qiZ6A{Y#C*>V$mnytu^SmGN(%b5#l6=by(y3a0WJ57f^6|!_ulYSsVEUTKj_0IUxG?XFIL=X-{z*|pJ4a?n)0rHveu{c z@ftLCsbVoe2$;5~s<@8!E7bym0c?bdlC=`YLxPz@)@Z$X4&DIF`(ii`6;Bhv0(N2@ zMWKB1_8ulhQ+K_d|1h!F8c1)(6qPu=d=#|8r7OwGO11JhlJ3IvO3Gnl;JxPh%NGis zB&#k-uRQZ|@#F*5>Be%D>pX6A5Nn!~; zM*a|YLVI7$GnyR#AjZXsW<;F#2S-hj3jOk@eW*-kgfN&mWhd+}5}-(TbOT;<^BKi`H0WqwxpVEYq*&>2lgyIu%|jQjydSkQa!(_6zViQfEA-_3=#rbs zu7k7xUSI~8_%Y5Wj^D!%Lhl!%qr1_&7fya`DI3&ZCxt-5W(AmYBgZlDmA+@bJ+rXb zM$=G=-Cz8*I)ChcRT&T*jY+r&`2&>@>{1U$C$UJ_rR~mBD4)Y<)?9wzNm(5c_CKE@ zQ^6N8zzA5|;e*#;s5BV6+k_x+gpJ_LY={)#A3Ya0?$fYz_^akY^ZkLv&utY=Z!TE; z?X3}0URS)6PB;A}m&)~5NZr7{;@r#t9jxw=N}*z=io7pEbd-HtM=VT;R4efob8Gdn zi2`EGfaFp%U=NZY=jX`y;e_&7s$qB88xM)+Wze)0-4KOpm&*9zyYVdk1vdXd z0RF;Eq0EzwaIS4K{K`kmG*VnLD63ya&=BVMQV)cU6hPE~r4JeaM`}*U6!{Aa8^osk zFOpT4uKug(Vxbpq>8BFpR2EPnU;Ot9w5BPuw!MHaYd|tzPyGX_@oJ*bYwQ7Stj5oKoWaJdR=xPSL<^@I0AdSgGIAT%a!T~l;V zmyd#IaJ&r;okfek4zR~dRSd^Lm*Wu&C+ zj?nt&MZ8%_!DvOgVN0fpfmMcxf$nnB5&FX{cAPoP?$xn289+OzoaED5EjIz=LUGGGMkQ| z_LCdXm$wj6qE1zae;eHd4JI_8uMqNyhR}Vtfp-SvM@h_*+ zq22_x7y&VS&UX{4TaqGxfZdld6nl`CK>a1DtJzeL)4!V${r$h5KA70O?#JRUpf9Na|P(K@@!hY8Ygh5zU_G8SXR4g&y} zdHy5x%`@xiC_sReVE`(kiUNrg*bpZN?yt+`Fb<*x&^L1s$@*f95i z&JUC)d#!#YU?Ybp*_Z{nTS3F7%L&& z8diJd9SomEktmT4D^}@$yFK+qgU+vGh}*gE6VFc3qvL0f*Hs5yUMn_j9T$3tJU_jE z5+a`vlYc)=^^Rt@jp`i=`_AKR>J8_==f7O7E!9ar`^vzA8KkX04;)(qyYp9_CMiGi zs7JAnNqx_z%U9EjVTmzpLHAN*{fpnU3zL7qf7{=QT*miJv98}6t9>u>2wC=uL>_@Y zMnXONXg0*({fiV%<099PKt?%ZDq4bfXEcr@d1m<8MJ-blth9XH{;}OxUE8+i+Q^b? zd+^ZR^ZI=LH61qGuf%DlRIjK;Bw9s;UmaTzxs~2X11DUsdK?WyAg>iacoML*60eb>QP=A*0~?s8-h1vcQH5=U5pz!3GA}WW&Nc3D86YO)24aN(jFA2i4}Uc{L8t zM`wR`>|CTIBSxLoNd-sca48pX?@-9I_+zw`ikjdx8fanDe@-}+$82=0zL>NC>}Oac zI4eh!N#Mv?*zToOQR4Jz>62n8RLKB#WT~44JAX@QSjtSik^9}}v)Z->sZRT&;I_wm zPBp~f+wL`KCn=QjI^n%~KEGYI`YsAGhwKM`n4{e>{3oO#Np-;rr_+d08X6yQLCpR} z)kvvCl>XS<)+NEQJeIlL_vKU^J2WGv4de6t8}LXBGg7X%uYbaU={N z2=+X<(0Bb`SY*@zN!}|?Lvm}gtB^xQ%-(&Bc*+o9Mh09XC1lAz!E1!G*Hi@t|A8{Y zlmX!!=Nad79-$%UKhE2A^>lP}4Yd6H{my64@#irbjTP^#9aA$utn*X|x@GSd7fen! zPJb81@>ql+kViR>V+f3T?$WHF%mg#ZA@&Upol}AtUMU~50)d+dx*fBULy4$M9dAZWrese0m`rB!EH$8PW zLQaHE$?wSqM?t@RQGQ}J_unOVJWW}6CpPqczt4}D??1C}^TvS7aGZ)JdZD;{zyzm& zT4Um^lCh8$Buz8XY7cZJz81R)Y5+vq3gYS#i-ILTN%!fNxSPwO$BNQ`O+H29c9mo8 zhz^Y1AZ4bK)j{lvJ%Hgn-DL< z{0$P}=nA3F-_f0ypXty!Z9hZH^cS@XOLD2kL|oU7ADa|M>ALUbqc`UgDem|PN+g~Y z*C4?3iaaA3c-v5rgPV55MkGdc)&(YY=il+P&w9Z9_wMrDw3KD`;8tqpxqygAzddUR zf35es`X5%J{lAtKkl>aVU?NqpCusyq$2--g&{b+PqaJzO<*?C-BMF07axj_-;UE)^ zdpJqx5~80w0w>kW?_p%*D20D%57(Y7wYT1GFGI?+zSJy*0J~gh!>|* zyU){9qtUK1NH|GannjmVo{((@yuvA_Goi)0Rd`!XQXdqh6=zb_;550Yj47%NG*wM1_o?HXvM%U3ml zysO$GsOUv?Jt1)g8P}%`H-zI>f%fHL?!BIaR>iSUJG5(1pno45{&U#7%Y)BIbF|Lj)0aCXW&7G!|6LiT`>*z?fX~CyK82IcC<*i<7;1V>pEB70%nz97QkvV_5My&Z~T_obK#UX2#&`G=Qo6p_?t! zmgf4ywncNx`cmCgpG%r#fwVMicH|K@AAV?5r2h`BO1RGQvAa@2OcgDX%;PsR|9GB1 z_@7S485Vn1mu}c~{aH=CyTww=X?n7SH#CILGye#icb49jjPHO{FC-l^=>!2_!px%|$X66FMW+S)%!y zE^HkJ>q~_a zu$^LTeIzc|J9`HqN^JToo{m@4?W~L7iXZw?!A9fiS(5)yVKZGdkim_|rn*&0TVyPn z*J=%8&I-gQ+ry$AhL@w$bOrua{OyN>uLKtgbrz_}2vF(c7?)@_z&(I_)2RsTa7%eK z0)KZ0N&Cz;FsG-HA_#dJh?=kfLtaEV(3LS$JDo7`zIFHnH#%Qg4605VC^>7(O!y~c zuo;{lc|3PqalR-_S8(+HNB#M6-^z`(yXw2O*4A&7?kk*Jeg&74qraV&PHdPFK8SQo z!=AoKSKy}>6tF?i_qN83EX(|zFlC^^Pc%t;0qNm;liik;_c9)M%_{M@+z(!0+J>X8 zzvX%Si1~b7q_e^70}Y_@@`tMPOCvdni0#fyg{`6roQJ z674El$Ew?DdYxD@&RQpnPlhc5uO$v(-9VL4t7h6}#NEHRItKE?H8|K)j}T&!?%Y?uvR|*u$xYZKeeTbt$Q~_x6o2Fu4k@-4e<}Was{d; zszcuE)oFLE+99ZOue%~)AY4JwVP{6#M(1tOXif*+6??mty1~A%*048KN`V-u?lBTZ zgIjjp>>=96g(QQjQq*>U=u9CYHu|+}H0g(J2mq|Dq#a#soRol-6VM1+A{0Ty>@TR2 zO=4&54aQxh&_OgPtT)EY8)k+8sQy|bH2or9|6%y#-@APE_RYa6s)|$dV~g=2X1_Ud zXfBCxya=dqeQ0i_Ns@fIFt~f(X!ZTh*0&bWxRIfDCU-sM=k>{RTH^?HVMWmUe#zES zIL)7;n>W3I^tosEF{2G%CrbnD`48IQbcEr2=GTC%aQrJ8th>TCYR#-B1CHh>_+>1# zrS`Bti(2GPX?VPu)~j@f;AZ<-(FRmIvXKBRakRZ$MUM=NTFb~Xx! z&+aTLy3d9t*XSp7B&#xU z^C>9T!qYMFx-{-788!Q-w8!I2w*%jC9iPf$)!cQm&rNQ73o9bwN)|<1*byW|We#ws3oP(6rSp_T zbZ8ow2J|#wsJrcj>5OfLsDm6O*H15yh~uthSY{OR2A^(<|K62qOnKXEBUZa2l+xo@ ztHR;(>pj37so`McV8c08Yi7Hw#6~SKM&P6^NHAi*ZLOIa|A1|o9y@-aN^gv@!j$Da zAd5`bTq-QPuSzyhJ?d!FkHOp4R@=a~^g+?TLE$?`#Up@`c+^QhG>dy%^L6*vPm!hL zgLdaPbq4$W+?|Vo57^1Tf%_4E++3DsXL6+u!oJ~Y=i_SqxrbZ7N%cFYcQUDh`jEQy1DGS~Oej zo;*e)=EdY~vOLq1(U^rFZ?BjOyF*$GIQ^ye-atfRJQ=gyulVz}#ilP055Lxr&q}qw zPf}({n5kN;k&}AgHCPk$HF)tm6BrMzJr3W^zT^Js-F8Rcx$j#nqT;6N_X^pM&7Vyp zBW?N|;~in+IFo!rM2mzeZ4bofw7JyjJiPee zliJXCvOf(fPtB>`V?UO_k37VuaKVqSkK=}YZ|lUQk-jOimR+}=-;B8vZHxPm-{~T5>Ez=ltn!I%7*N`#Ov!FDyRQQ5W^+PiCTe z8#Nm^6V3g!E%jeaK`zuHc<=81=4PeyP`Km9A@ytl*|TZWm0~4a=!=9)zfqoJc2XUr6yWo-4XUrN zZwhHV))vL45;&Wy^pDZz4@u1j2FKpsVk8xOphl@}|HbN4QGBY%w+@WryK8juy>;A! z1EyrznTO}E%(NKX?7Pcx)YKRISoanw&L386CDuKV`Q^P9**Y{(10ZU=ZuNd!AZx&y zS1k%DMW^!WJR6V527@-+BK%eyh5pVx%8P5(q8 z3E0=q2S-F*+_<2(aV4CEpD7N#jU6%xUdXae-0WkhvE{kPI#OmJwq{^Ojn- zn1wL)rGo;ZDTFG`K;;ssq>Im<5|9mu%X|LG^|ue|Neuzz&qM}BIbrqtr3`_rlP z!_x;Ydr!y50_5C9UjIAP3G-}weRwa@7HgSH>ff?~ed{E%DeMllsbeN?;ks@$F`>J{ z2X0W$%_6p`+M47_f%N!~r}t3+OxU{cv3M)*o8+3nVLWah9nGRA;oYLHTe12j=V|=jmf_n2g64#99)L@>G7&BAll@; zj}T+428t&3+Z0!fnIu5rF#rQx=|2cq=)cFj$xpV{mA;ixW?-L$2I?XpZbn@kSWi~<^;jUStWFewTEygK?ha3t|Sf59r-RLMJ;}I}` zb7t`$0b!={kUw3AArw-eMF{Y9S9LQlU-SL+aNsBU;Oy-XK(VZmV<6U*Nrn%U@+oO@ zlR#@vF7#?BDA-@Wi_@V+nxEKF*Aa$$-`qvP3>}+elJAWb zjcYU?5h9muRULSBc4jaePe&b}v+=Lau;Xore$jS2sZ_UA~dq6XlM)i$xY$Z#b zOW+RdZ^&y-AxIt(u2;`U(=`Q8>!1O&9+re?)u{3qc%>}nE*UZeM=et=9-CO5r%&|=JffvWZ;-|7onJUhvFQ&Q+wwqS~!3LLj* z$Lx+F4qZbHfc^$56OnPn96rcHiU!kSkxiXWErrU>Sh=l|N1#~$Zm;ElqJDqwQ&TJU z8~0EO-~wA9K#UZi%Y@*Mn9-_F&s0j%kkn6lJ)-ZKQUZ;<89_E3{7>v3)&b*hrH&RB zSsp^vI6T}+%dekY9(A}j`;aBwc7gsp%n5t(Euz1hE}0u< zrWtsV5ZE;LvK_QI(#Nsp=}w>BJL3eIv~;5v;WBKq++DlF(Fh<8G(30oUZjc2D-dlJ z2PPgqJTD|y>JbcTWu^@T$cVmJG1?7pz>#ZDDj7SV;Flg zpVnjTZe1Zz?6xm=qf%7&qznhZ&CgsmKl?oZPKtT>@+H^oY^)-pA;)!O4x7Pt5QPM| zA6G03qh6H076YcN{eYYlpl}m1gZAAyXIrjV&+tbkSYg@FE{MSZ=v9#{QKW2hkWB?# zN8tYsRuJ(TPK<+|20}ys*hkeXssfDP~@T`Dy(0@U!zd$J-JJ@QVoTE6zORM@zOK*^iCu4Nq3W zs86Tl6)MKA$g(+6EAjN3L8ir-`lps4G(n96RAxv43UG@dyeS+ZLC}Uy};iTCJ zv|z}`)$p4J#AnX|iOxa`*54hMTE7)@?PK<<`Hqb_r}Fi)&h*Ku<*(DOJG7DC#o^K` zW8WZEd8@x@vOKXLDx(FRqh&Kix9$Y?2z95kS(5%)Hu~)p49R*nM*Ba17Al-N#U#7o zMvhxokd@h>gEsF6TM2hSNY(|C3d=8HFcL($54oK;K||u;%v;_NTieG=hAa(gMgmUx zA@gz~XUmcb=aW8L=>ZvLl^AM5Oa`1B`tsfyh9rQ9&z=e_8eY1yH<11qP0CxP3564k zoYuhszK7{%NXM9I6cAa6$NX%Pjdb|K6%lK<#fpjRJ|SkqFwBT+3n4V-TOjC{hqwY z_d6N+1`}HB%xqeZ0p}H)vl;QR08AVnS>tocvz!~D05Cz$Siuj2xZH5Y5ymJGiOpj> z_`}MFm2Yz{=JI3TZyLK#500CD23T0!*o(ki{CC-(f6#aOLTKMEc4Cs{r|Fe}70mbYOmXB% z=4%%zfqQZ&h>w4D?>7gGZy9q4M((hH$pCX8@&Wo3e@PW6TA5m`Qlq{=gL?$vqT)_4 z&HBjp--ISg=Y2FSsn6|fJt&ImtrGC}A;DZ=W1k*61WN#)g2ObI%L`IZ@fv#Bi#1&AhFGuA9GI<*!2{$fM7#h%JF(gW) zVGC^m(O8hpXc?`ElOP{@MY^ow8ePswAH?KOw8Zi36yCWh(A)BM*gkE2d#XSB-tP>> zb+3Xj>7Lza?(!e5**Oo|I_0x{cGe;t)JP`dKmNQPAOmz6sa~Y_1@~k7U}&-lBYT8_ zTLU*gPLQ3{U%DI+YoixO&wl|+A@G_|v(KetI&vM~2Ri&@a8CofWnfw;st8`Kk-P!J zC}FPj=-5nwoEa!|BS#+qdyJhv0BufQ|Aid4!KX%1xi|Z7yx(D6y*5Ie1-vFt?x(&0 z*dm;*=zme+u|IeK+CGjwLo=PiWQ@K`h3u@wS;G8{M%4hex0o=l_!;0`V=dUfL-S%&Q; z5myJdjyH<^TG<6@qu>HJ;Ee4SkKZwK7q!DuV{zP^fK|N(!-uLZ=RTm`uw7)?1N8D3 z7F=UFkfE^47eQz0AQ)&8M*w0#K41O%xYc8xfv$4BmHgu~t&tB2nn#-jot0$2-@Fg_ zW50?}=ev-{QM^FDxZt!W`*zMz^1#4F=)W?Cg+;bx*di1tu!NfAw zL_t#U;ybJcwW*H@7?l5=^8{)%YK5fnL8TRgHtvkv5`km9&!+rT8yx9kX!e8<%7D7h z2#jUc3Ko%D{I?h?SGb|rq?;}RDb`E>X%^z9GA?_E9h4rPz3FdKPGIW%;$-j% zz{P&t@FqFdo)tGPZYS`00S!HmE6>ty=0Djrjt_Lw-b!%9YRV&oDugc*qb0cYwCJwF znU^s%nRw(5L`lCGTN@`86~B&*q_vYk!=R?Zz9@nfsAQ67zlePng&-#aW&-Y8()c-Oy85s0W~XgV+D#bh&*9CjUwPSIb&7j5D~xJ7 zXYE4!SfgWl!?j-`iT@t;Rgv*h;~u2H;Db^EGkEkXgqU#0`>K<^q1eBOtW6KMUT#!u|L zQYWej%2Q)n|C=Z5xb`Oa{400*f(qqwLBlIP`ke)bw+U2K{%~j>dG_tKtG1#;@>LW& zl?(wS@*_F{J`?Q^W}^f25IsUY(JW@Q(%$3f-JyJs&2*W7$U5g}(3hJ&y6P-~CoBY@XPQMYh=; zTRJ}Wt_m0VCB$`lRJm$X_xJaMdfvAsY=?`Ou{=}KfN`68%?$@LgE5wmCI}$OyA{sL z`yUaqHOI^e9ibC*j~V9uOOF2hWPuIi(JN6k;=zFWvOo?9#xz?batkX;}T##)}Gg+aNe1OJW3>U#@ih zW5i!rj`Hi{<==S0u)Kpk<1h4~CCOIH)Ua#9Qpv3pwHTk+U+>LB+ zN0*7peOKg#6tH16=`wq+8zq#o01yvVAmf#DHGoA${Wrb|Y+z`;u;fQaE{*mWV^|&~ zAWgaAdjJC9C#UsfXB7Cyi$)W;tfLyy!tH!W(L2^nwvmMwji#Txl!~N6%H9a^CI*Ad zb1Tsv68#Kv+Wi6skHSl?)>VEg|LW|)y3F1Gn#vGHo@ti|!Jfut72eou^G!V$i?9oB znZ*84;7oS|E>csIWe0l$EgRH!65y%76uq?(@oyfK#(iK7ZhMdX`ht_bZxqLmL)H-% zrs%8_Y%P`y_Qt2|t><087!}7&p0EC})NDIk%J4Oazr3@+c}4I~s*T~|>>O##ZpEd5 zr!)x4iV*lssle%m7-K>GNR9T{4;$6EM9qd?FbUpovFKRaBJ zf(n%VaTXLQLFXkCwXW9+X(8?wPy-F0Zu(mp9fn#Ej1qDIB{*wD4nBJj0Q2rhaVYwQ z0Ue~poCm%;XZQ2RvGjS-?T zBX4|kE9JB(P;YIg zCRdL&>(@Q!g_SZouWL?koHm~}sx=Y<8;@eK2;TP1#b1+dzctOD#MfV!%rD~c_O0bw`=_8c$n3{+q2McB!sAZ#$CcP z^T5!H*-%&roNnwr#^iQ&pI3idBr#17d1SIsysZN`*?6+6lqh(!lVm74-sq#iCu0Po z$8{1d7#yCeiy)R2=suyo^n0_7+G zOkEzqk;v5;R~i#9FgBwXYzbOqxysAL0CH{u1t+yDxr}IBZ-SD0%A;^wi|_M84}Sit zzQ6c$Wp11OVd1QZ>UK%oanrC2l^=dBB+a7T?Rq*w*p|Da)ou^w`ea7R_OQ(2O z%Thi8DZ>}d%AsgHjZIwhwmFjb5H2A5hz~AIuTcx`&Vm6ddQn_96$$;HD;?pE4FIt*8(VvF}J;QP3s2F=re3hRQ=W7;2)8XA=W z?BysB2);kM#x{KWVNA!3U(Ti3! znyy$y_+4%+&zpYhXI#>d8_H?2(B%Ew>so9)!*6!%6TSyY`}H&Mm704!;N~m`_ka`jh;OJ_SOeb6zjCclBf*I4y6XAT|QU1q&mh?mW zUwIhyqQ+xknLl_k<|8i-n>Bo@7NAXS8k&Ck1WP~?0H7&I_jw8y7k{@`q#{WSS#Sfb ztTz%J?W6L29%VbmtvEj}X`=(~Z)fqBkNWH{CO$Rw0x%*8nyIMqi}@l~9d*jEN!jdn zad^vJn%5NzLBOA&eivD!A%c`1CMfDnF-Gho7=5ue6g= zuES2h->$;q>yS=p^Tx~U195?z)B-Vs2yw;uNJ&@+-PMj_(IO)eehIG`?27Y`n<2`s znD71KJNGp&0G4t?ryMsRGC@KBnb_FIVHNj%9dnVO?=RW%6P!P*GN@o~S@UCH6ioN^ z3$A*2e}Wu*aSHKm=Z072`7`d`)g^p2qDJS|+bNQ*W>t1^vSN<|mjIHd=8qLTgBG}-QIjv&)aLZCtw&3E=yLH&!&lR)z zaSl~gQ}eavvZ*cd6qw?du%6HRHsPXi$Pid0i-7w30fs($_HE(d#>NwQMg*}KZ=HTM z?CV7`kZtK2vPe|bNRpjPg#EQtDuX3Gs zVa_wXkrZ|Gkvl8*znqsRtDM7uRxlY?+Mf&euX#x&^~ibceo1(TL#l8*{)5Hjx)U9**mLbNXd6K&g*H>$$#tSHmG)?BZZ0TLf1Y zF4<9KfoAXj9u=CeM0sI`qAwm*UIHj(TXL0ymyFvFyJBRddTRXzB84N$(b7{FKJqN) znR{<1TD`2Y$Fh|i{OU;2=x3q0s@(Im|E*q?6@ z>k1cmY@OyE_l71FA`80TKAkN#{&Q@S=SVJqjcW?S2BwEvNwlIq9KAg0S^B@$Oj^9R7$=-=mpF9 z0-2;F9?fbNb?5}AMq)?d#7g(0UkcMQz-Ns|nKbtP?W@Ga@Yu`U`Fk*c=3MZEAy$%W zI>fLfgpxjp;GT4JW5CjMSeu-bJybxM#=;YR?-q<+CiFAv>YQ-FRaKk0-e29SnQ6b4~DrT*XUWvh`)Ig}2@+oH-o9HDak+KTve? zdKNb>HpAhU@H+z1B2f%PHaI33O|)qS9V}m9fRB>EBLFTD|Gh6wd5jfaKl(MiaQTE9XbCUmw(ELAIhVeqLCoJUcm;B5$G{OnSfBOK^o%nM_WL{x+DHlG2bk4%x~ZTX@WGq?cFZ z#Q2sg>D`DB74{(TFkd-|f7E^Pa3@)F@iuo(_uVgRE+KugTND-sG;>O<3yM;wi`LKJ z1s%r;E-BhW=BL#}2`3MdFWX|0QF8h+BK4>QR{;a_oIsl-?qKUk2m0ohg}<1K?|uV5 zUdpA#?(7j84A;t@xR_}u({~uzU2L*<_R7)+Y>KJu?N~idDI{*un$+&fd6NEyOW(nb zck!CJl%>>q{;ogRVS=-60y1nNo_LxeRdbq1|zt%QuCVgJsds|vo_QqVwt zC(MTt*hv28R!H&5ko)KlPec!Fw%=rW*E`A zKyKtZI>fwr?-{sTBY$-yqLsFW^m{n1ys1P{X~*^p4^r22I=YYX$)|c+vPvla?g5D{ z9u^*g$9WR`-_8Iu#mZ~(Kao`x)TU&>@!dPUiH%d&Z#XZ}3WfiRT^*adxRYQBHjNuK zg2OH8;*!(tvvg}7pNo=#@r`?7)bF_F|LL%KSWn(b1Puo7m{$rFX};;M(`}Z?#!bdz ztor$$Txfb%LYJ})isHnKHI_otSb@MQWyCLKh#1X-w(lgVADLrok_X_K_7MO1 z$(f&qRj;~y=$ z0t;BWR=Z>_?Qd=!pBz6_kvOkbTy=kq#a5~P&6+P5y43HnV|#X%p3m^?M~ty{^UR%& zRjFG7Vj(llOUmc7H1lV{)x8uw_v+jHTX*(e6}A4Vg$d}%BKUc7`XkddPb2EwZ-jDe z(>$-^cr)s;b*++#*m!2U`FG)Wrp~Q88nEyxK=kC>(NV_p{4WC)e-z)yCzu`=+` zyw)~twW^7wb`CU3|59Loluz3$-(=nKZMtlbTx>I?KOpG!e~5YupeVoh{r_yxwRGds z-672qA}A=G(xSA4QUbelr?jMkC?PG;4KSPrSfg78^J;GWT6Nz&hJ ztB;0K#xx}vm4SiVwA6ZO02xM~jcH$y2UP5@iBg_GoUjyHEUL>jOXfZ>bO4D%Yiajp zncxlS&TF?T^m6Qz>cQrq+;l;qoIh@xyM?7I^Wpv7WqyW+#4~ zirTkj)G(G=C3EEtQODhSse4!E-3OJP{jN1-Kyb5l?N}i^`rutkGUDIm^O--9Z7R1Q zwLAum?9*zpZp#5xwk4?^Xf(fIQERD1h4kI+U=N;|K7A;pNH}+UCdDkq8w$;z<^d!$ zsO9KK!v8i$QH|}Cd6aVZ%9ZnjRq`_30_auW_@sB)&-{HNw237cl=BpccocUb@G!2Ft!?l?) zA+UCW^aNEuWeg8i0J6HIN^M(3g(N^W03$ApByfU5Jf9{W{|%Zkl>gfxFQk0%T{kN5 zq7G@;{`SzuHw!I4xxeS4A#O`TKn_ZY;uQi_WoAuJ@s1)YCW~EE*xSjBBsqF48xP9^QZq{|j;* zH|F@?uRc+Lns$XGK^{}5$+29im)g|KJvSZ8sr|1y7$a7H`y0e`UrY7vyFlZ3Y?*!# zH|h})N}u*-o<{wVJtU^)z(D`ali(^r%FuhU4al3AL5Lr2H@*P6Is)jK#oi0QS-wdJ)T?#K4p>e{NKag~1!DWBr%6#9{`xOGPi!EcN& zO-?{K^lp5QxFRb>8?~10;_COXU%P-kx}(U5)RSueao%q!n(Y zhdbrU61?E~@?NFXM#Ae)kJZ|N$;&joh$|{w!1Dhdust67ziA0*>vkuU#eM$!RaiJN z*;y!W{!;LDEov{zNq213fnC15Ck-7MX?CgC)oG}vk!gAwc4bF46zH+QCDlg_P|?)O zgNdCl4|fNIJ}S5#&ffX=3{&hhMXILPyu50Y;QUEM56Ucn8w{Lm5P?2z2wUSSWohDv z)Q!J{=oNmXKF_;n6k8}NKh?7pXRq6{$-8QUSs2^RxZ;w1(QGSzLOw|2QYKzBY+zA-C+gc)Z8; zKn$osgXlPgX_6eJi5}UrS+aMms`|xknsK4^P74)L|3qp{!yU=7Nxyo80HRqpM2);d z%iV5PAb8LP5uWea>eNKc@^@*&0*c5M`xx=DqT*c!H)fO@j@clKpcv2VZiKF+u>iG4 z-=Y`h1go#8uBF9m@MWo)y702``RtzZl&)v@Qv#?m10aUu`tY6z;P66&0k|!pPh4?X zE&%f@cD+FH`(T|jOMOU?~@N2Ai8kmQ8 zdUn%eRO(QuOneq!+b~Ulw&n0M`k~Y}B2sWIUwFmxtAn1RzZxA|ZCL!c;43^oqj&vR zBg-1IhnBmg7)pA2yU4JFhTJ5P5nOm0Oi%UtRERocbHx|Z?_&J6g z!!pH0$St)*t)Kl90Q4Q^n;>3`c8XcRUId7{^X&?~PE}ld`%s4iO<+4~_O^;qM(&wO zaIg>=H<9|^$0&l z)>$}o49g39k?e>eY~-%I@~5PW`7wa&TY;h|02?;{>5w4KbFk{~H<7`n-X-@qO5h!o zFaQcuDr~!Szd%c|H*^;JSdWFL_Y=e%i-mo@0rkh_l{6ZGwUP%&D)GI?KMWOOle$77 zzU;80Nk+IP3JW1y;=+2<-j+-uh*>IvA+_8XKNA2ZENryxTJCc9TjPyA93igI%z4Hq zy!D`>EilbKwPC`}^*viq(x6&-RwAouA9aO!Heo|Gn$eAe&&+4tP=Q+8rGG+WL5=@# zi|i$$)SSy^M7_%XBv_{&0&MRulj;?v{SAHV5U3W4Ql#7RhPPZjN5V}^y1+x0xrVF- z+GleQ!&0PP#Hl=q|5tIVF0`P@MYTk4XjY~J>I#LNW!{pB8y(JkWX~bj*=3!|Iha1X zXo9Lhm&XAjGhyDfheFEC{rI|$-#^o?`?eMRD&hF~(%%RNEHTrNex<~apd@I`oAf5^ zVdN4g>QR;>kyrNz)-4GshbLeHo~OVET! zsR+wVD0_Hk_Ceg!N5!E05<5B<@owQA4sAva9Zf+zGMi%o*f+PhKu<~=o!;w-rzw+6 zKi3IBjM1Ok@E2N-7vB^Q8T?E@{}KVn)i^CUkm4tMCnU%zj>L&taI=n;0`Q-d@Dok~ zmz_i1G!Vylq~xX$e{h))^BDaZHc0aIwM~Ls(WvaWPkH_W0=JOYiKK?`pT}ufilZA> z!C8@FtA7fEp*1=i3=DcI-p*7Z#%rOrkG#bZc&I4lJY|f~(}z!G{ZTTKKd7Z_S-?Zg zOQIrMXay2=`!W5N4)SRY7U7AJdZq)E@DO12E;{Jw`PXWXCXvpI`{=6^{T5p0QeVaP zXO(G2?jAhRy4y8v4_7)I$53^FV#XDJ!_U4~-u1DbkD;8*x{+zBySx`>YVr@=)?bI- zlEl`OZlG6qAn<<%@kUtu{&o}E(LP3PK05_gZfK1P4!!ny?%$Oa;8kF4$5J1bGBQ77<|hM{R9LxG>r%)#hb_B|{kIeZ55S?WagJJRR^0 zngXUfov*IH@7TXdH!&d@#AA`7=mpitIyyIvq9o(1s=r-j)-|qkt5E{;?sT3sZ`YMp?s>4T zTs$Q~M~%D#SfxE7NP*q80qixY@pBX;Bv?&8LOZy;M`i*8$&h*c*~l~7KGY@o?DfgP zzTJLF*$$t0I7I7{rPl*NP_nTjkpUEj2cH3UBJ&G# z-jT`-WW5a^6>^JYZ`vFBzEkxL16ziXHn!hQt$LSbNMEykmGvP(Ajw=cR)qN&VO&<>09={NBAIf{b92@g6<%u5<5T2EBi+)R$n6mC4c z=U#P_G&(n(4?YxpWg^FN=V=j`4F7HNV*MWrkD3WvtW>8NE8DEA#gEi|iSQy<+ONy^ z3)gh;sFZ_N4JjP|^R6Ls)xGQ3TX%Z7z3&n^e=0ME%*=kj&PUN{Qvw=2H2B64gewFh zUV&SoeQ_6lVCfnbwf^laUd1Dl z=weQ!;>E2VeRMAqp%2V!RTJ~KRoD%6sBAt^#mP@1abq58i^i5b=N=t-9@k6aNOkZ# zjT<}_p=bD_7}`WOJXVd*s7d(3e#*gC7v3XvjC&ygs)T|Z2XkVRNWp}{z_-0>?;ik4 zh+IoIz2JEfE$@vpNaKKkI9=c?)DHQ(GF~BSab}jL0{Q8M5T`uBMtdvOQ}LW;(s&z_ z-_wVt`Mv1xIqFQvfc+eDx7>b-uXTi*&U8uloALsaa z;u8>=wwwZcWqz#A*fYtD=)#E8-H9Mg0sw~7 zUw<(buuc5h?)1JZQEHt5LmvR(0ABOxo0YRF)jCcq129WW0QLFb<(0Yg`@S&MzA*;iAteHVC*XA3`Q%R&JQ)DrN*P!-)?e2hpNK(YB=<4*Tx*|UU2S^OX$EQ zI$R_Wav!&R^xv6k5(AVXfiSI#h92sG8&|K9L%E#%jMG&2&Mc;hjGQwyP-2GLT>$U_ z}9|As!A_*}92xFL)N2x|G!Zb~&cTxW?R$vci zkv46MN-ECF60S6G`cRzOv&$R)Oo{Cl)N<~*d5#d~I1?9RfCP|~NcZNQIj>6BDNO;W z*KjiiBHti|o5p*5B-PUcC>f0%#_+>16cBvG*E3#}1cx7n}1OeqEg$w#uGtm?)SnsBb)# zb391T{3jLN72j5rxdiu;$gf6@*X$m+a3_bEn`)oy3#GdgQSFa1Ig>BztaBvB^_^F6 zlH87c75zv|F8j1vH)7Fn5gum*ms8P8(Ljgw!3S6UC0y%;E(d&XhO;VMKY3?UFuXdv zJO_iUrn+-Kc$~ZB16owu1oelXc*^EXsq^B#If zrs?U1e(gKBLDL<(JH9*+`Ts+>{>O#IUH|oG{5kY}* z8U7jhYjWxUMcGGa;2#Li$btN5ih9@v5;ANpOfmA;KY8TCl{uS|QcIJx!buyKrNU<3 z^APUhn(kro`@F;4&6V0*5^B2zVfvldHiXRIhuk*G#-EIj&ZP@l z=4nU1rMR4bwW{j06-&C30?vNip&srmB9>w2flm(J`VK{tn-#0n?g{Q7$t^6Anhc<< z4l%}UyJfv`uVx~GzTa7^!liXXqKA3WAZy&k-2C1iCO{-(9fRyP#kPeoZD(CP6>Y_&1{NMfa~~0IR~k}Oqm`Q zb9ATr;U^k94ra+h)Y5@Ve56-p8X@W!o1#OxCF|6@l7o>Pp>64=p;LpWzrzG@WK!9n zPx?wQyldZ;I5hw=(cAvhbe))FIwK=bQQsy#>Bo?^C|#UbS@XwIywYBctQdY2@Rfy* zE-jI8Ni2&kLx7nls388hsS3GIz!sQ{Gm-=s6JXR~Vi11}xfT=TLA4jX&Io#{smauF z#=fhwC5dTqP@+lse8X%4N$XnslcH=;H^sJo zv3UC&x+5zS)TdS5P=O;DtzDb4h1vo$WL zy)yn1HnSjjhJ$ZtyoJDUn&ClM1UaDwA)JSfX_h5u-bkGDGHchGodQZ-4?!)qgvyW|3k z;}qTDZ+_n){Vrwg>fvrk@rYr`ryl=pR6y&oSwe{J$Gk7z$eG7{?m=Y{7v?tlMRgQg zk=z=nvWJIKXapA?CVsmrCzzi(es1Btt8u;Ny%E#2x_fbk)LP#wo~Gi*X#a_of(Bb; zzSB%3j#0DfI@~4GOx6uc4?E;uWHm9+%+oCv)ucYr-no$13c{h1|qSk5-Gy8%P+lB|GpZ z!azuHClMAT!VLq(w65_q)xu3UVJtd`P@O4~VK`i!p{!#Ne7tcdnkb^M4R2bR3#2S% zlM|wQu+SyQ4{GpGAq9|JJmski#XF@HVxpRcEivbPIebM#(Yx zb9;&F77mCDA9H*;5|oD^gV?=221D7p*3Ny{YT7uv~sFUtFt3~UUt`!N%K{1Q0bL5Kh|CFWY5S{8=c68iZAoKD!v{dxei z^mADfNMQ&qmcuQtlUWcjj;@NHHPXqrIXhM-nY=g>K-`CZfC2_d$Kf19lfqKt=zz7` z4H>(aoUG-)ewkk5LGzpvj~u)dbI`L4ksBJNb-0uHf0l0RwFa#S zhWaEtX>2b_Kj<{ii#aq*2Qo9}ul0~P(r`&Ds_ZuOF)!HREa)ZA!!J_ZmJ9b%Kh^{-%Z1X*mnRi!bqoHU>L*YOQG?h)$&IjJJU zw#gr?9uD%%E8mDIJ-_W8xj!_xX{ThVE0GyY)jiDc^dk4oAc& zB$XkvJ?_rqlkbOeWiPquSnF3;OvbQW&7WaV0S*vZXoy|2LPCJM{5fZI=%1)$q=;qtz|F+%XSO~v5 z*MvNEsDn$6ai*5jF_EzNzP|V$pVq4|w$i1MYToYIoC${hygB5?E z)jxUxlal<)%tD>Exzl_H1+0Vo~xv)$$M&l|4GsMx%xVcC7z{56yNy39YHlV zsxR^keVG++B`*D$hj1~BOmk(bi-B^PyKkxHT(44Y3J1Ilb4oHMU}3M`NWk%z*k@eY zB<$1#VZ3~`?nZ{P@#R*kpT2ub5zsa>cFN$|K&|6Cod{!B-S ze~2$Jjp9X9b%3(bQ_X*Lx7xQ9MLz`6JiD+K=9$);Z~r}=A?tp3uV3hlp3Hou`>(?} z->juawP>-;-zD3l+Tvn6s(Hf&tLbBGdL93hw&zT2!Di>rTY!eHlE!Sp0@{V4HlSfd ze>(M2QZ8<4@p)q)mHJ7jRqc*ga)p~(*IVAtKP6T2I~1$9y=Vmu&Mx01-6+v<{U}<^ zSTx_*x2S10g1Mmj(5Lv`yPSusfzf-;Ljan)W+cAK=oXr17OKsbJbRoM{lK|OPqA}> zk{S@y6CcQuGaQaeD&N3&+e1sSKu+FFeRPI;IZ7zU@bTi?EE__Zs|fw^>YiVsTGo@<}1=7R#R+1QdJn&+DC#+#N%o69Z@pC1ig zcXxL3HPzYFe&FjT?3RrEe5^_D9+>IBK97iOuN+Jr^!Bz-OZ&{miKYk$wqevQqmC^T zCOaS>@SnMDa4M=5_HK#S-0Qr2JH|rft@gVPynMY>ixAgJ7kKLHLgo9grIyWC2c8`l z-qr4n_s4R-LEafmq<3rB)sGr+1?9b{)%Ud^X;Y-41W1?>dj?m*0-CpK_$HApv83i$ z2bJ0olpjA7*3Z;Iiq>Ni>i+TKidj7a#z8h+siosSV0y5FVzdRt5s7d|5Bix$TyPqU z8iZu5R*smfqn3Npm!olBgiQ(#@4A^Yz!E^7XzN>(AuV;Yju#(atdEIzV&?CZEwH|9 zfHT@>3%o|an8B%4Be&2NNux+9+B(C?-ibcxOFNId1? z2LA(y4;rlG;l_ctxK7afapjJ_FE`h}jxYgUblZjfHMEZVj z=$vtX4ZfL8Jm*q};Y`M(V9y>e?yD0D4s4(Z^|(-*HHT9oA~7b2!5CmjX0+zP!?}{U zR$c%ptNUS4i~s^~IEP(ZK{01p5EKNUF;Zn+$*M0OGXc*Azp%;M&y&wM*jwl!!q3`H zc2-PL3$e}bD-UTSKYpu^Ic$rQB}c+2kOW#7QP}?}Nl@kgf1?6{TVWqr5brVIL?kA- zAX{Ucd_?!!_1X!SGUJ513%`nBY2f2f*DGh>hd&YDEq6xWkjI6e5h#WB?_=;}S-FI` zPkWwp#S&m0@gF@gfP$ndYV0HdF0n-_jJ;3bjP@ZoK7Bd&qxX6=hj@KU!qUZ-PiY*%_+-&Pau%bn(%P<*x(yn2%0YA9+G z?`+7;SaymI?U$-0^7l}x)?s2s8N~5kw#ePL9T9AwcClDEYJL5$?rTK&z$?wHMZ!-t z?bTuCB0Oog;>_~zv8=Kt(23X!GxD3ckqkb8(AW}%|45WV0In#Dr3jtFxnu~C8pqXU z&w(QH%)mThxDm;B3xU6*teq_BVD`lF=*`0xU=n>R zuLPM*d!Ddl`;wxRD51GEVcGu6x7SXV6no|xyiktP`nX?om=&Ffm$E47;qseM&a0v??>e$R{;kVlzEIlf*DAakV+?w>8+mYNwnmP{oTcfRVKX!JpJ(;*Vm-}Q zHblbrSq}I#nCZ^?exn7M`Gz8tCrs6@BvhGNHbsYORU)AjfbT(wSistYF;#*N?jd$< z<~6c$%$JP|XtT9L7TEbARlw@~ zM|$n$8?v8%DEEMinf}@J0?dKC@J$X#B46mlFHzXQ7D7Xl*pmd#6C%S+Uyh&PDc4K8 zB!I#HB8^X=nlp(Z1eMUZLuL&@Vm_bf()rx2BH8RWad+CjS2{(p!;AWC`3lVcquQeY zsX7`mA=!vqHRJFZBU;{)+))D-5P%m7Dax5BiF*0>x{Ze~fNkDybSoO~bZpFr1l+q5 zNxUF;)Z}zStg#@X?!n3zj))I009)yxIbj0-fx5AhDt|FOzObYY;w8GG3mctiU?%MD*~-NW_cw_6dA*VeCWACXdLpu6X9 zM=qD#Vds-%@IWNKIPF;bPQ~CHwl>Gl@f=6|=g{iA>6%pVaViu6m0|xTJJP6VQYyn; z;r*?p_Pa}lA?W%p84(eS$4)iLAvb{Wz()WY!u)dreg{kh4eIndGiiXKA^L4L^!#sD z%%`9ezcJ?9d-LvcA%rsgZ(N?E(WHDCYV*<|>x<;nm_7=O{>}nGE@uXJu%e!>SOG3V z>aQfAfOd%U4(X3C0@OvhQXMzHE-*>c7?H8CfPZgUp`Hx5X;G28GI=&Oe&q&uLx>`X z$_6cPJR1hcOuY5!#+TTI;cZ^O<{kOlBvv^uPfyoGGZg>T59P-}QS9iDk)}KrYA4A# z-)&blatf7$Z{7;!yEk3J8=6zX^VMJ*# zm7Bvc)=P(YFg;@8N1#Rhf#Ivux(G&F3}l={OZ**v*vC|uepMd}Rl>?lSMy5)C!M959MXQL85g& z>lIM>lYRf)8_xeHYz4CCjSsxO8DZP1p>Oc-Q)5|?pWuredQ03IAOX}QQMmYyV1=;h z%9Hf;O-c$o&%1wF{F6MJK5=sNRj z?zh+|-Q7P1w$Ky>eE^@D2~2&V?F z8e9rJiHYo{eXuOf0Kg$6n-YYSvT!ky_CWT$@-y6Rld{Kyq1X#s0>E0D9StzX8>q+fF?y(LL7>(o%*($6=S{!25aV3Vu>O&9UH1RKq8_hbZc4bww&xIZ0%OO z<8=f1{vSVhTKZO;p|MPV7>aPYR*bUrPK5U@0dBG`o?N1?KU4$YY=Ji%jT4jpDTIT3 zzY`sNJ$x*@rs~!xjyp5pRcQ`Fx#ms4kfURmtg2}c3D`4jI9{Z@oH;ray=akPWZ(-u zqz~E=$BngLKV&CfX!wE6OhIg*avpR9h>S2Lqcp?AwYvmaz{W7XkZso(wUxiDJP-m$ z!iP}oZTZJUz=Y2e?a=}}TbPy=V|@A&84FGi@;YVX--#p zq(DReuD)X|Q`GsCtE8zxWuNAj8DXiLbAbq9QP(x?+!|LCt3XIrDo@wzsamgwiSp{0&QEvJUT*&^56-WucduSd;vSB+TSx2Wh+Bx0 zz1N}R$mLtR$z`|oNKQlqdnf%A{rrOE9f-gFEsCQVEQhVAQeLeS2yDgpFy6yQKl3+U^hvW(3Uh)3AtD~$wZs$8T{fb57=#L3l=VtJkNIN>j5S{NS%u==zRu&WL*AJLSI+258Z z-8B|$Las)NJYbzJ_l&M4Mn;K051=(?JHC$Cx*~D8wCzt*7Dz;4H3P_NWT-ST4BvnX z6~BQGLK<1{rAXCOVbhD-i`CDwiXXp#{3)u(v_G_6)!Bon4?$?S2*CRTM?DznFeL_g zL~%uw5FQSfr&(Hgz1hlfH9~tGz0(St{aTPLSo>`5V0%DUF3>da(%ml~ZP_(IPBMBc zaGBE#twtF1VZ-yGOTjU7X)5n4^|AYRN)%t4X)_irwgnA#3sZX(8p8}7Sc7>tnnO0f=VZRn={AC5S)p( z>?f4zY(Je;?rBy3Yspw4QX;ZV3tPR(1;V|#Abe1wg2q8lQVBF8Qu~DT;H>v?A>qd<>%P4q5 zRSEWpbwCAtveA6=7t!X9N@vw@lSuiq z9~(keo1>&yw6oXD!u< z?xP<+#(9lUI1B%O*MDLQ91aIi5+a!BaLiNR>*qN3sT+>a;eQ=;jmF($tfw1_BPhAC zm<6?u6i$h+m@}DV0fi2jmi0B+LO+#`x$pE7kIV~7MY`jalG6H3W^TmQ-uJc{fcNkU9`hzUMSCSe zti+4|+#NBzc|lM;7?fG*Ue8Lhi=&5_lkI2Wzkk9T5Pz$fcp&HocP-j|a6kC++`X_$ zv1opK%i!wnWY>>;&A-SBj&wC$fSdxuavN@H)9m+j7+`+rd!<^ZWD1aQh!A%BhqY43 zY7Gh5R87g}KdI?2HN>Kh2>(=f^r^y^td$c<@oaEQ5h-Z+DnR(D4L7exWrNFq2vl4! zMX{D{)=cv6f5n+_G!hSqc?3&r0<)=BAF|6WN3pYsKd3WL_^Bp4vv-q-WTIsQ zw+4ao2hvgvH)kY2-}uYBZ*GcK)iNCgLva;~E8Mdy^fzh(Rsi>}IRMnrZ2ka6KMese zUZChKbr)d5CziRbK|<)1;ix304hazwzg72g~ih$GW~Ks#OR5-p=ka z!Jmo|&6ja^6M0O@rku~JQLD3K!?T!QW4UM*HnJNbROAr9Xyl-O7(wDW{6bdiw*BRM zllKl&A4YxuIAvXO%%2O`u z8g2>HOK4}o3w7J`>dVnxZ9RrdMlP>sm&BzXOhq!<-7x-B`L3*eL9-`~NFgiTP6=i^y50=GE3YXTtY6q0Hb zxT)R%$StKou~g%7rK$bhivfYJWvE0b&a#iLjq!Z!h?D6aozY<7$Qf1`IE{5$fIbc< zK?VR28GhabSx9FopnRA^NX4(_m5rY_@&SLaqTIE#QW;?3MS@UU76Kp}UW9siD2ria z$tU<|#tGm=;Mql={3swG@VHC7(Tj(@31kUvp_nTJy#2Q_4DTPGoba56KK_ax89Yh! zzGPfn9@(iVZx(8{wA>dYu|lOAcRAdv-1*okgI?znoNpD(?4?V^ME>xtmg_qIA+0*B zpZVK+B+W`3-JjJ)&gMzuYpSY@+3nQ(7U@07`3%L!t`DtJLA>wBy!TW62eIkq zr}dW2Ho^G%q&Tkl8mUg^S$_rkRfb*4(xz&D_uXXq+5z9d4|fsbtwOrTw16^~(TTiA zG%NWQgQAd=mk(+?jOkGK80KpG86hngblqGN&nsjWruM`KV^=KqPos}OVwdz*!4TWk z^`wnxewy;1&B|O@mc)Ho4Tref^au7MB?}U6T|7qHlaSnx_PAOJ=?_7}LCZKZ?)bG) zLEH)lDP~iNqHS`N*&!V{mFv2-8+aY1gB46^LQEJ1qJxiB_bOY$K1RclvSxcoIqNW( z66!M%2}|_&z7BN*-ns+iD`I}ZnhF>f>0$lnJM-lV7VFasj%Y%~lCx0+2wA!;1TT7G< zQOJ9TmOPWu{GdUp6*O3f(uo$Hyx&Cjx+E-`UroOrGxs7=0j>I4w2-2)`=}VMx?L=F zNRP94{M-*LuH->3@tHNAm(ARx4$HAh{}~1?5KJX=z=BFPJ8qSBc^X1O?$my!UcMX@ zN9Xt_@(3d;3`vS?%@{7LS47?zw7W3IFt|=2LSVp&oe-*~)f;E%$$Wc&6cDCD@JHJO z`5=L1NC-M+o+4CA+Rl0`y7=CKhh12pqeZ%(1@s;rAs4`H(G_Wm^!cjsl?;6^5w5v| zLl&I^%I30Ude|-z2um_P60O9*N_~8Omg^pti6W8}MM6Gzz>t$TxK_L_cBz_=%`u_;s)VcG4{Xz5Wn*c9BlIYNjXjy z>seDHV0<6%u>{S|>E7+6e7=i^l1zd8k9N9aVeS=VA76hLA~2idh`RY=nxaCW>RX~J zZhmj{U5!d>>qp*=TPknDgub|Y+f%u(IZOn;7k$3nRbMslsAR1HIUjtu%{n9pvg6`Y zVCiTiw%l8e(Zx+qBb@CzIC+p^j98=ye2Vjdo(Hk(BWdAKC-1~i9J26J93IBR#p!*r zEn&H`{{6mGp`8a-A}$PYWRheN`1bqSu=mqNzbZX6PKH;CK3~k5?D{$X!pT;`Y=L~L zykEAM+OyJbJV!M90|rV0fk_QUJ+j55SrUd(znIs*)Xe451>b6IJnjZ`6vYtqeo)JAtpF$5igL{0)#k} z_~D%Ng^!WS$gEi7Y%y8#^qd$`s;72 z-YM1Rwz5uG-Ck`KyqB^%V=~~%nExp4>D&s7fq4CV(=XmqHrbuz!-sX}*1ut*8uTsc ze;Xrbx2s$w7DZe8Zws?CBCJ~8Fj~%4QNrk-Cq{K}_f`s`SK(SJ7N?8rvhaW9?@zoK zAa}tTnalUVQ5M;Wmc7(1r(ZN^Tk|Db!m?DoTJcRKEH{J{)sOTh za-Y8BnW1Ycyj6sj#@|WGgf5SniogJh^s^LzG4L~R!lY7GC@rS;_CW5u6yo!u+Tcc*O%O07Mje`YBDjmF*6Rfu~O`p}Ay zS=ai>4-umxyQWAhw0*Cbw%hvoFfZ4RTLpbm~h#s@vZ~;ov8>FC67_nLTvbxT_?qv(`Gr_FGas zUPbOnlj_d0Cd9odE*Ik{oDa~%(m~=9Yd*JQiW(f2+;*0$(R<&kA!6g@cWi~dQBr)P z2+{Q9)?cK+P0j!p<+?pAc6@R5h0gev9v)zr;-eNb$8}l2nH?IRZ~m^Ex*jUuZ%(iz zEE2Eu8v;i}_FTrdv=xo$2=5L|BgBkoYZofdhM1)&iX12P?`9uT#iE2#fVJ=70e&SZ zv94+?{}}r44eG*?bE4=uApY^C8n8I=EonXQ5_=l7Nd~9Z14RDh)(|0D@ntzUSht*f zMrKPu9Rw3o93@0zewjvm6P5m3xB5#iDKml2qrNxm61`zp$a#9%&(`cwA7XyOvR>e< zulDIMYZFG%XcP46m*WtP%LBpJ4(b#~OZ9@VZuG{DpEG^hD}C?i^s;V{_IR6}=6p{) zO$~gJzdzC^RMW{A45h!<{9Ec$Br}PCdw*kZ?$5ZVp3c_8^&N%JzhJ4{-DOuIu{~vF z%TgzDh1lY@`Ag1x$JfjX&Sr01GC33Yi8>QeZ*RdVI-1g?8ys7g1z4HHjO7Nx;9!Go2!r%!URZ` zZGzZj4Hcd`8ToxaBZtlg_fS&TnhkMLdj2p7>NW;|#b*dibwSLkSltcLX5qiw^q)>o zJGE?)^?rW~iNL}wmIhKTeJRXn4dK>y=>H??ETf`oz_q=HE|G3&q$Q+t=#Xwi0VSkC zT51oCpmcXhcSuQhOLt3mH=KFbch-02$E-E;W7e$MQ_r=Z`@X<|j7l zY7F%ut=3{TG#iPPH>zydd~vf8N7!b2y?j)yBI>BOdL2^HVKE(Y_D@_Z7EB9;tMuV6 zulet>bK*@DRzWAreX+n_O$B+b#r;x8CY?)e8}=-s@wGATAH}kNJKC6^e$b&kHi8G$ z)Oeg;%9VrsQlD~FH>*5)>8PxG793S()tyr2Q}TTrLnGBF=p(8ux&ouEYiLe2dEybs zR8>B>Naf~+27Oln$+B2=sA*9$^$gj|o1>smU*pVneNdDTE!ASRTD~2hI%*A3j`QUG zTQA&5=h)vy-dw}aQrYfI=r`D=c6nVG*bI{zJjReI`Ie}BAH z&cn(DxrSAhJK3LDUmTZoeX=`LZUY2Yl07=#Wi%mW2TW)pHauNG zP2r24X_11~F=k&5V^xWpB7I{t9Z~lYuUs@T?(Jjw;p5-9X6N1h?P!+s8EL1(0ix#JY4R8 zSh=e|#aKS(x*=wK`R26^%BaBAwieP@jGW(0{|(Jfk7fMg9|Y{lI<(TWInZoK$LVvtCXoc-r-;=UQ2^)QBLPYHB<_JMI;@x+yCGa$ zO}}sPZaMb28 zmg6W^UqB&kY4gl9Tjp`y1{raXLwNp4^o9~hNAAUZfhLyLJ1dPYzZ$BnOX}~e_^&oC)?3VE zQnJ(ElP@c$FT`^w5AYo14nBMF50E@+$Bc55OulwO*7g-xCv$4w#@tLxLDrK+Qwfil z`A4KsN(-fc@P~25P{DpcIl+#9Ya65G4O?1$j@1{mpKS@Oytp_mF}_z;5_YBcBS`vY z_05x$0hv*Ru^~*N8rqrgZQ_d$K@ebUwBxk7mr>z?hes@<1k^gWp88&*mN`W7ux30l zZuVw*-eCWpjP;GGqps!kNu@F+kkM}C)IiyZ0mgyvsNe`&sWjut@eG9rW2Y4eM+dl3fIA#t1lZ_A=jLVECE>k- z+k!nKSRBFBk}Qu{e7q`a;RjyLI?eY30%*uMpWh8F-*$}5yNUih6o*9)}7gcei z$rH^}oE$CecNAUXUEFEs8S=eVVLMcoV^A~|j8F;wDyV z)Kp_Czh5dC!zT+yr=l?bz=5eK#x1XyeAcs#f*?#HSp3klYpa%6H2gzYx4z9^V!}9T z+K7on?_GAqY&I(;sbP!Lx4RZgt6!j9{N)UQH4T4Ygtp(>CnEk=jR44%pg+ud@+oYu`yf!PT6wVhQRSRShnt*a8eTK}t+)qDaM%qz$=2W^I{Uqr z6iTc(8)fjX<>3-9^Q445aYDMT(c25p;Y;0cx}As-N(r~*W}(98?LT*L3i6h%u`3B^ z3;L5^pMeH9NreD;6ackC<0CSt@~rN9PZ+EocQ(fLd~U_CD85X9DVHyI)Om4l#vf7? z_{$SZkb{jMQ)l_tzvHy{5s~rF&=TnPmNH~b>kQxS&4Y*0&IkAPx3(ol4g1eLV_CCe>UA1jllMiE3~_Di zyA*&T822L@nh!bRaT77=eM-X|Okm_KO*!%xL4tBa5{uD(`1e3y>oBoTy^z8Ds71IS zjv8noz3G+w4gok}s?O-Kln5dKHNs9+=7br7GCD`W!ySt{NF0-5wL&nloSt#74OZq| zEDf3IPbc=qbhmU4EbpEpQFwp4k+Q2M^RC?P10z;UN|F94Wz&aM-0+BLqk-F`NpfI&WvK<1z(;d7EBnDHm zVE`(T=mais<`=>!-}VQKSkz+z5ef_L!B~Ao4MSVCM*LP%)`+E) z1x1Lc^!cYoN^|s-kJ$3XQU;HUjz(wJC+~tkk{XOK9D0TZgDAVu+Rq;((WIO8I$ZTF zUWPB zO%e6iq?S}qH+k3f^+e=s?E4>n2QAAvrbwps7o1<^NG?4q&#@xZdfmTYNs0omq)t7A zswpY*zA>obh{WN(H)n#i-R)x?q?g+{qRNgSmG>j2>(mgS#Y^q|C5T#NuINqUf^BZO zEJH4w=ac}~I44fZz0^WPdek9o8F6X|H#H+Lh}I?v|2}gV-@t<*G5$n%mym>@QNr;m zFYHH1;A95Jnju!tp8byVDR@#fdS!KNU0xUOR_r#|*V?-0X0q@#Q1T>PFDmLZY2@WA zkZ5#&{sQ$d;7x|*O{%E15N#gB&HK~-KJ8KJxHL#{m{J!xYI4P zIPB!D`$_Pc4=EQ57XKrn4LyuR%Q8!i;6{@A^8o>VL_kD>pfiISFw3S8@|DIX9iyZuCJ5e5nq|+B zHiZY*6S&1kt1$vp7%$@J(5}V52zY_@g^Z*eT2xJG>9T?i;#dd#*fyx$)RCf>o2<*5( z8|b(sl$vp01FNhbU;K0x;Y8~r0rcpw(KIj&tek%DXcuL#gFZZ`Ydc4c0_3`OBg8Xa zS8Vq3GmLyi!FPUf*1Dr)SxTo$(!?RZi}Xdc?`EBx<4mT5v`kySH0%W_yjk!+T6uFv zsiHDzsbSV}eGBRLoEc17%;u7-P5KtBVauzDc0V%wF8`0KI>`dXLw`uJWIt@s^X2F_ zqb7^mo($|oIgs+{@0#2gE2feV>dft>EG^XNUmTJkbsh!%110sQVAdx^8Wn3KAdfw;szRR5@qI9AXRmK%~d^J#A1O& z;jFJ2y~>MgTiJyc*noy&aa_5AjZ-0_ndFB6=~v!z0?8!+z@HP?BD01-#&ugCR-Wty zJNk@tp5G2gzy3G`n35;8~c+2N*uFJ%D@v}jlv5D5+G;}GvSscd8#=+#&cK` zl_?mR+N1-9Wg} zq>V(ge2Ztm-ZJ1VX;}gb%A;k$l-ua3t~ppmafH2hS)dix`L7_km{&?EZuY$wn_pGE zh1LrkjPZrHF~s-y634=LOtZB2AFJC~vwcGrvle_Pr7d@%^fS6PI=E<9?-8jnP+^zU zs#j7EXf8Y)Vt5G8t@PB(@N-#hgQK>BTo{v^QOKNVO~;a>5E#J3jS#Ml<_Mg434;B< z#XyYfC-1S^hb(|94`+4x{KX~@3V!rW$~tinhyX>nO6im#cLsb=wA?ZD_kPH<$*CnL z1lki;+p??6$l^82_d`BFP@n&1^_;@6&*d*v|Gs!NzKCj5YblzD2;5A*d=2#^-T6wF z@78t>1VR2FD#2DEus4LOce<38Aa9CMwvLIm2)Xm*(c83x+zMTvDJ$MD#gjet&38Gj z_a6DKD-Awg4Kz!lW4rHE=Oi|>+8^aYJeuKrpbxm8d%8(pP10MlfXNFjA0MM% zvJxhHwVI8{>|fJTChzZiDH{aozZ@#9CYb&UpO1A))egEWdD$)wiX=fjUa zGF-U0W-xpVvVFD;!W4LfG8Xjm&%U*6_=_GPPz#MFT-qBIg0S5#6dQTH<< zUq2K7xLx?)WFp{*n-vG}2II~R*sUi^dEn(Q$esh=2Loy0bDsc=NMvM?djz5*9*UF_ zLg3gD%7WJh|Iga*2a_XJx{Lx0WrrkswA-|@JBf^Fk*DAX|g*H8y)SO;8L zn#MdPz~@Cppp*^;00wOA%(Mq2XZMpcD53xip%0RZ;NCQvd;>CDGw@_?=SNeT@w@Q;JNx+~-C zH`6e}BYmdM@Aym?t5Io#>wKeUpKr>mXhrzobA;vNR|CuQ+L5MDUg~Fq*~wMnRdThV zT~R9obP);SWLh8^F5|Bk4fVSp^c3P$Di$!#hk`_^`=Sh$6C{&Nb6<{KNdv@x2J zNuy9iS8Psp^9zU2W-2;&g6h0R{s|V$KLj%!5#fUh?`XNPd;G2MVz+myQyF_*FwEJ) zPAmzvq{vAGj7GFd_xnp2_B|x8b#wWWvYVKwL92D?_hY9yzc6Bynt!LvtVvW_%n?^e zxqkoCy)^enxv{GAhxliMr%7^pCIXmD1@=N8yK~)lL>f*=;<+D}r63~2)T4j3S1h?$ z5djFKfp+qa-CPaYbRbxfN&VzVx;#7)|XqWh+3&eWPfn6)&7>EI`VO@yfw%l)#!G1 zruauN*CjhT{Yu?hiAxA~edw8aIgVk_sA%#vIUY^W92>N0HrJl_VMAPm#GPV@DaP)B zP1oq0(>L1tc_)*vhjD=ZSKaxu`B3UPw{!GHdloaR6bIkRHqBBB_%m(;@$lnw1={!a+ULw3+eQ8`; zhz*56(XrZW;K zEI?f+)sDBVph!#@2()~^vUQU_JmYh_CTj55>grS(BbuDZWtvLpR{Mp^iJfvdBBu8V z6Q&P*jjPR7t9;A*;_8a*ci@GF=e6hb7cz7cyTF##SG-@GMm}W(7+BtXBf!o(ynUwv zev!3_{vI-NtL8i!@1t7xD^ARmecf8hVP?*JeC2e-sj609F*Un|hSQg}CTsEdgY0Wh zl42>&)p6y4cU0L8_%Prry>T#fpxzjT5T#3gt)?>z;dkYQE^0e!TRj%dJcf|uQpF?7 z847}QKSH}o1J__kpVD+CVEknE$F7J0M1s+OLVg1PB!VmmP-BRQGIKg;34GF?+fST- zOgwwwOW8qqI$ZB5dq`gQJ1-?rbGJUExY@2azd_c^K%wtK5aY*+M6|@7#W?sbdToY8 zZs6MxiU?PoFutg~h(g$Zd8Gy0kjPObU&r180L4dCcUoWt5e7Md`>%rd~@|Wr?9#n518p|E8qyW^g-K2-`vN z_vTjQ$m;_d!zUAB)eX7}%Xc76`mvpAt*7R*f3_Dc_FLKqtxz)>HH8J~g#0dPteNbVKW~}Py0lyu;}4aZrTQ{ zMwOyJ&YDpVh0zmWv>oOxY?{e*mC*G1a-LJ0B`F6&RE zwgKBNO>f96Tri_=?gG)YgPohnud)1(%(?JGTlVa-!cM-VT#BuJi-r!D`%2umB)$H7@ zJO5Ezr=R3(&XHrm_gE!ife3|WGa;^qVGB$f1{Ex*bqIdiW`1xF{Jd zo)mwA{)Yy*y|g5Wi^5R+sQx7C@{r<(g@qRhr8AVi_cE@O3MCo}GVOY!K;0&!BLM~a zFAmPHXV}=bbIMSt&BIdl3u}6p?X!oHxpQ!{SWp4B1Uvt9ZL!}cb;0{JSN{Jz8TNec z7c|qkYEQ(#cj!~yS&@}RQ6++EuE>PGiqrSDS1v*O0g7_uG2X3w8TIhtnYp2C{Dr-n zT#$@B;IlOtL>6FalgOF859w8~{_BiVT;|?@@&~Iu7G_4tD=d$#MBrdSVN8jv(XJQv zk~;I6G4do;h3>B|16ql>;6#Q8I0TsZ_eNE`PU=b>3Y|wLS?c z96e8gA_GR{3!?Z_lP?1cCy2%O2V3~f_=6Toxhdm1tVmzS1nF|gl^;AS()28~7ooaw z8AkK45)LjW%^lY)5;iMTRoXKC=uv5T%lp{G zAyshS&(Ocew91Y6UfiSfjKAL5OSJ#z@hBhn` zky2Y0CmCU2qQ^3L{IW%rGE{*(P>kbXZm``EnS(s*kBkoUp<#t*P^?B?BvZ#(AP@<4 zlSi~5;*mQ!lT~W#;$Pyeh+i z6)i)n%D+VZ;!PxGul{!;#?|PHRs<0$^|m$?F%*gl3R5;&wa;3asj=o*iI4Bu_qvKG z2`8x9NWDV+L4Z{NV4@(yb|8R}8hnJ;oua`Id0?!LinlJtq~+N3jY{l_SA0$5E2rZu z_l3s>4`--@-P_U{8PRz$nfdD3iHUy-szd|Uz2E2PCm(-s`iP&X-g#2p9&YOK%|-~` zJT`3H;lpDV!aHS3ikrS2N&m8^z`*XKZQ42=59g!o#vnJw(y)_@{)JZKIzaz3-?Bm; z-^mMQ=s)8@<5Y2CeH$6Q@Go6CAc=38=9%+Oqyw7bta82e-qog^A~z^xBnE} zM9i9AJ&R_4JeQHSx9zSJ)ZFi6$;NoAvQQZQ4KZYw$o zj-~#GZH+HdER?X8FPIV7mpOzQivGUrntp-Re}Zb<(Qp0NSH*;FZOD@oN>xI(+W$S5 zHSR7L0BsYh!ZMl$8w8UW}Zd%Gu0_6#EWQH}A2Z^EQ!h_|{8$4u!|&pY6S(S-L+^Z9AI%;W0GEAwEd zZ9Ks**(OGpCA}3q&2C}kVvngm36Hr`w5`TGpDKBzKbbnYc@a{%*o#;ggdDlE@spEx z8`_)o$TSNon_E`J*KVBeI;05y$@U4$}uCCg^8w;v4F&v5O5dzt96kRby>gcq5%SqZE{R z?WuDDQU%@i<-g-yj)n;N0`%eEfygpU(7eJMVt{o#tH#Wiv1yGCixyk`^Ol(uhXxs+ z`~{A;J}t1fx^m2F-IVqmxbgQOnl;fy*^__QO=8IAW{{wTCxwL^XLCix}`3wCHM5Bh!URG8@+v#0*)1E>Q6R zi|>Z(*^t))H(VmKq0WhbDT)A)_^t+`hRC^*0z;>GnG49tqL4iO?UO6)XXgWdmpoJ> z|3r4oe@GMASRG!8t6;J(P8$ptNqE%#W1dO3B9i_>d-LjW`*=s%gRTB6=kZFDT>_(1 z+{$~Jr5iDP)jm$~4^QH#3v=b*mfBYYZ=&s9CCZ|gdCR)0)*I8$UiQMxa*Wo0v_`+_ zjs}Y8QPi_rRyA_>#eg4$-UQQhB_0pwJX}nso-`JjXl{zq(|8j5%Dl_W^?zGDQsQgD z@<{x*;R7nvlFrc*RwKWP1e-=G(}Z+<`g7%9;ty2Ckt2xF;-al0_P8K})2+4Lx|5EW z-#R?fM+i{_x51s3j?d3w+m##E z-L4CV5mLsuVyAWd?`kSt21+g@LjxB*XR$Bs@E*N77OkRItE}$| zPz&k2eiz7|DF^zo1QPmjeL0LW`4`r2iA-Y|K62kmA2r#$0m;{2+Gtf z;_KkFRU#`Vaw@oT!eIYqWXR$e2b1QZjorPo{Fz&$yiFcChFn>!D5bc{b6h4rPa%?q zToDKBwXA&m%er+&Eu#O$k`Q=vCXkf}@b8ct#4~57x`mR{)MD zQQW8I3-`wf@!?d7=WKP=qhGYITnzID;+U~A2Ke-~Mar9>Tsh?1)1x>-*ghy|krqTskQpNj538d(^2-IL%i1L~-a%;LiMw!`;4d!>pk&?a?_Bm7gvo%Zo z;f|BHS?qCoipv4tG&ZJii-t_Ig`5vFgVdJCXy=Pfmuq$c*2_ckSlrNAf6aaVmpZh{ zsR2iS6Bs-`*`43<)wT@GeECi9`e9Ps6nn{VrenZcwhc_k=^}fkRS|eUWH#C(TUx^d zOl%Nh$3$`CkQQDLS_-3~Pmw|o|LMk_D>onmNcxkEr!=!c=HXj5i&Wn@bz8^2ReMzVbsJ$L=V7FJUL=)U2N9nI?}m%!p?N}qm;d8;b}vrKoW7F zbcf~4fave*Z4ixt*d>Gjtu*@1fhpAWZkt=TwRP6FPRdT3OE+{aS2w{2uY6Fbo~L44 z>)f6??Im>jrj5+oiFS9hdXASES4z3T&W(Dt@;#1HOi*Y$EaS2@VMY1OTYK@=`c2*A zk>>Y(``ee#$5cEYi-d)pV8 z^(c%dGeq~?Vvmob%qg$@C48FoT;OFYhNuM9UBfRk4V!k-l!+CWlHVKhtI<^1s+}Y; zuR-$MdxATc4QWNH@baJFsyhcK-00zS;Ceo;9f~M$yJ0#L{KGl6@BUqHy zH)6|Si2q<`S2Y*k;G8Ie~P&8j8c9y&)&}s!a}0rU+it3 zJD!`wM8$>eob2tbK-=d!QAhZlIbvU`(Xe`uXal+2EAJ1MLTf`SzbLG|4Mwg}_f-I< z2{66ZLp>dSc0kgK+r}VBs6ZsD007%}{zCxwOYLM`SM6TiU+SuUv;Hkgz7^j8d_2~w zf5ZDFLehOzS5f@(R_u@U?eaNwvP#;uTX}TKqvnN|jOGf6iDYYLEg3Ivd42xkw1yX+ z<@2hkP3=lnZjwlmi&SUXdF|A`m) zE49kZf~n>SY+!~5r3alP@#}i5d8!2U8m^}%-cR47H+AD=W1H}F)lYI1<|r&T>BBVU zp9YJXT?M{ktmMxfj=y=uTr@7DS>L>LJAt1N>7?t9HNs#t95L*REO$;V64j;oCZWyv zlGNT7?=A1ABGc?}(>r3{&8~r@qwCWpZ5T0DO1t|eh|Z}F+^D<-;>|S$k-qU+lJ*D3 znl^~#v0ha?9sVfUp1mG(R~a5jUfozMIb}-@u0^UaB#i1}jvR_ar8v33-f0s=+@UEz zG(L=m5zz(PtxUIRHGvy!Co4h6tCA?r!{gB9lLloGm3&FDI_^i zXy;O>AJ6e~vEaPA@v+X2N8hB!L@Z8Lh0BM!tNy*gR??5ngydr+C$~&J*Y5tC`O?dd zgEk92g!ce6IufpKMFJM*1|%YVrAefIh7tla$knJ>GP2D_6+V%ATG!>+mMr{FpY?|f zFU8Wrm{Dj;JSSw;df?kPQ>+-A01}807H6S29e`699!xq!M_(C=VkiF;x*_R&mLSv1 z^GzivVf;3D9l9j1^XwJb^<8#I*ioPE76}i6bmz?Tmgo&d2a|Fn^*CS_&Nu{`m2>ES zzeY{zdYhN7D8RA!I>5MHk~ov|38`yE_XxGU9lp zrX%0jKVaoD^;k5qNJR0}_X-!Zm$fFV+5 zRC;3c9W^qu+PzWXOACyX&}u{eIsK&D%L$&Kp3p(}y)$B1rSWChSH=$1W+83)>ZM*9 zr!2F@kZe7?hRL9V-!}~RaZ3~*J0mHW95YHttSGN@0=Lp3(OEqilrXF^ZD!L-_dgK?^M)OhVx7Ko2?PB0Ko)BaqkY=dCsIfBg#XbxRFoQ zDF$sK4=XQOafNt?R+zNBP) zd`H7obst_IMFBFtEcUB-&~Gl2BCBG1ffz(6_|Ai%;=O^Tufr%rfb(AfUtcw7SK)Qn#3z!=<)@RV zxLux``OxAA+=?<}-%BRWH%7-FJt!(?YGa;oJcxQX#aL=`_R@tWSDud%UE{F?UL@&f zBDUyLNbLTp6~Tr&SQm0m3TN|QN|8vgUrf6L6+d-hr2NP`NH8=jEg3clAhuESL9B0a z%B#cmh)zua`=FM`WOUbyM3H`^=&rrLQx&~&j=zUDkFCzFVmI?@E~Y$A%rO0-Nm%y! zi_53A+~bKHFgkhrDK`aFUhGq#5Fht~(B6OzYBpCXzi8(E@KF^stsgr)Eb7HzyEizM z%_l7iEZr?e9iWrL=wW4-b`UYvidWXDHQx+z;KC zY*OamUXGLNzl}*-6Lk#ynY=}~?QztN+HN8sj#=(hfUzHm7)EU&>nTB#%kygjnE?-E zr_)!LKs06>xk2;gX`4RM(82{~D5UiL!sx!MO9Du=0$cN?(oJAw&cDT3B%omTCD2F- zw_@eSQrEh^Kb?qHCvZBY=02B2eL1rAF^uU7Jbgf zb2TVIXahP&``$l_Gt>%MHzE=sJc0odc#_-%?9*glP^hCtesZ6*E1&M-v3L-?QPuAG zvtcIV%ndFXy2qEd9b$QWA~LYZ;V;$h%3UrH2fPT~Buq4W{BXvh+8Nh={NeJne`7~= z%!8bKu@ubyRh_!gH~DBS9*Im+NC%s!`HJ`zzDVAVKy!Cd8biXuzJyBtTmwJ-yl5CH zgh|m0{X~P-vb``=Oo{~;hh63thUU}Q_QVq9=OZQ{?UQf;dE@`P6d9*t!5*i26d3;uP3)&SeEpk4wCobb-`f79&pr&^5#meAKUXxz(?Y(>*2I zi~A~$cG#d}b}J(ugvM;I7AfgGtx<{%F40@NF?79YBx1YHc{uG@jGQ`aaK3jDPJibk zmSOm$8dmAva&5NO;E~?4Q0{isg$JpTV79LLsYOf}ns3y@-+Cyu;bAzH zG5>1yJnY_{b*2FeJbbx5+$~3>)9LtoQ-3^P=kDQ`^s7yGs@Cy{_P>})82wN3NQ`uKN(MIIj83cF3-@To=^4>?S$KEd|8GOwuN@$}~Jyg_M?n~gp-6oE6 zc)~^&_gbnf(FTSM8=<;1B^EYkVR8un#`O5axbd9Rot&iv%H3x6F}`=_Fc#i}nQ1H? zd{fG2Fm5PAmW%^BeF3jtg)cD*3Ff!8;t4Gux>#w&X4WBnPxp|0QV&x*~ zr(eEc5uX8FJjWH^VixwOCPU^&8P({vb(HQ0U0 zUP{V_rJ24CCcTe+d-be$D)ZiDA^3K>7W&8xGoA5SOtZbYZ8daEM8pzmfCS1yVr4_()C}HU{d{WyFA6Q=%09#jZeV1yBO#(6|sC*9vUsk+H>1k~XA6nN(DWyXs#8q`%OU?-EiVpCz}cXo3Mu}y}@ z9V%GfzjX3u&5$TC@WShP; zAU?xPtZ3R+5I)inA+^TO)S;z`#P&5dUeEz7e0Z#LzMnMEXYhx%c}P}qLi`ecvs{f| zO;&c5ZWxcHGkd1*(eVh8Saz0**1UMFq-hQDMS&mzc+#&{_VFjAA+)q;s1)*0r51XS zOeeRzv|08Q5>69)+06c1cv&`EEL2`Cvq*qpuzkpXvFtZB&f0^Oj88J4W4=(9VF-%y zD&rbk%Xk)1(`ytwibAm1VDO(rY9zw$UBd*@4+2Pvr;^g<&9wF()YQLzk7mznGyq$! zKgK)c_xBJ5uyaY3AlPl$5(5-?kJ9$-=94V$`@G{PN>M0!-EsrBF}ZQ1H+@ly(`{EM z-}{r}?zS70@>F^eWZ@j59x>&Jl&YPGstw3O{lXsOFSZY92z!fHK-KN42j(kn z!4IL9*ynj^%150?2`R2yi^>#>u zpZia2spdPUG3EUmKBGoGD-4EST}4T#h}<+Vw36FR8RFC(kS@`>doqR)W z6y1!(JhKNaSZenQTr;&l^6Vzcrjb;2VLQmH*Hc?HLQh!C-6Ex<-FL2k_yVn}<`7)T zwrjF{yWSx>5a%459H~Fhik48O_q{KssYg^Ea%nrX~#=l=pjg-+yX8`C{49B^CF97LR=8++Ql2yj;TKytoSKK5BjAJc1qW~6bV6{nhkW)uiWI5 z?3c^Y;t<)#-zdzM`24GOed)!j6P2SJBpiQPa*)^=yJHxvt=uKC ze$w`nf|^Odsp|asHg#%C)P0glG$05NnXvoRQ3{wEoy zR%RHd1V1EJG0|xbH^?J5P%y)rslIPOYzzUH}6@lAA|SXW@gV<>>13x}8IGj^`qMV^{H+)R9Ul2$MhkGwP04 z5TPP^?9@4S@B_p{{T(EJVo`h5=5Yamh+zMkt*1t+e+ox=18X%=nOZdD_I>tN|HA=H zZ&l+4MadRrB3b|KUI7bQLT{_+CPzbKv20<%acu+Jr6QQr&VqCZ6=n34T}T!bCk1|3 zhJCFFhd?tVM`Gc9zJx_=8}AO_7bzM1PjFp~yqPA{P4~s!9C)vf@LOfw%|ml;zaVO4 zTFSt{Q=s*aH8y5bck&+oGI%z+P`gh6Ug+Ar#?lGZ+uQu@O;Y1l(??VoM#yR(X*G^% z!SeF*IJx?dWk&U)fByGh#Eds%mAXdx1w!xL-4D2RmQ7!+4I2>xcy$_8D9>Df(H`smPE_G*B_=SfPA^isaQ4uyur5yy z@e^E(vu=Z+t=nl!M%-cy{p1Vd`V2j?|1{l6D?#lCjU_DF&qz=lAuaOsIN|(hB4JeV zgEQEVW)()YaL?*G)*sh&Q)d+?Dktn9^?VS$b<(T~83*l@vf}2yH@@U-tiQe}B*O1A zvBhZa)b%TBU*T1RsCOqaan|Zc>Et`9e`PF&pjc~101HrKVaUOyqF^%h+g%urWC{e% zKWIRR`wEtR)p3qhwV7!3obrVZZM=3k-=IWb;s@-9rywK_?tR0UfHQYxf+Oc>e+eQy z=8@ZL5YI0X!yGocupjohQGRG$GKvRO{}un;IQ+q=-bAL&K2-S{2SVodLt9}O4e1Vp zo~Beg#4^`q7)U3LMnWB7$)qynkQztJu3-A)6}uzA8(GAD94MP|wO62%UAVg%M)o7Y z1Ao4csU{o#lrchPNg0^cgiWS5P-s^1Sllu|6QjTEdK30&N?ZSm4w}LdDRhJhTZ$|~ zQ0mbPqPbeVgJd8FubK-a)j!~LvUwem1<+$42uxyDYp4Wq#=ILNL5V~!Z()4MP<7;= z?{bp%CTZ=(aB9S+1s()(k#m`nGQBC+Yp)i+)&`Zn8RaGXC^zXsk!!I6KDTZg7&7sJ z^)WmR#7>h|pAI~v#|z{J=Hv>{Ru zTp;1LS@%8EQsM#lZ4Zq2tH?-w2$>h2&#Uz_Lb-DwTlc=q?(xA~A^WbwNIB?sugmLn z={9%#Yxh}S`|;VtVjwNIJh39B)KH1z$0GFUqs=uH&rf~D;3k=4ygrlaRgW1nI}Q(F zJ6y~UC%>BIGMik94@Bs@FHDIrqAOejU1mcgU!yA;pk2f(hu%ASG$kbU zGnmxsy?)L;QZkpgrD-9SL~j7I9O4l(-DPnrDNZrJ;4-?$>fxL{BkNTERO0k%)V}lL z*-2Dpl0;&fe~tQ;XXBa5AR?#f$JjPq0(vA)(2%hyCN*uS)}l87v)IuRZ$KB^$3YG> z#wZpR+L@P2^c31b5S2_63*Fyf0wj6)A9PY z{cs}eQ~e4?O4p`&K>Mk{Bv*lU;L;TO}Q4kd;0CM#*+9S zxgAc&Xm78V?lp9mg=F(FMvm%D2liXUn3+O2b02m}MpIuDAYg#A7FAq4pLjM-lS5NS zKh}BQD*ERP|AnOdFqGi^WelmL0B~TgCND%R3p6H73}}f6P!vPQR1uiiE>v3~mk(!W zjWoHDmuS^Z_008UIvOsoXNDXY-W$S|R*qxO*cq)8ah71pqU;BwzjH&vAB z$ys%u`4Ha@ET$qnAO}JfAuR4Gndx%Y$7|6}7iC8KI{6aLy+uL>)oWRb2jnjal4#9O z)Ct5$N&A~-trHS7XVzP9L=AJN!=}k*qN!ipUvJ@Gj)HScY8wxFu8;4UE$;az5GF-s zP?_N-fTUM#hpCsUrH+s4|3lPSMYR>JTX0pyA=20E}=ky0tJdoarffx zE$;5_?hd&*_l!I4$V-xkJnU>)YyNZ2Z>;kmz1*(Bqh^_<5$~-f$W9FF$D;izGu5w$ zl~AE(xfMb1Mb`2?$+NP+xyFg}+!aTfaT+t(#{DBE_WP>hM~)A!&npp3Ul{`|%bSRI zxu#eMVM-VG+^z2vI_f}C+gK+<5&;J$bbFAS>a)PS0OR-8MdUT7yr}dUA8y@+w z@@*p5b|ThF6L&$ZFMhZ<_`Xn>v%L z>LdzqQ!}$r0`oIx5}_kfL?2nS>O$HYGk9Z1uX0+4nBRHfS;(8G%O}dB)q4u`mR04l ze!#^1HdcgcVt`4b6(2P+zHoGB^?-!mB6Lm7$%ZVfIQ}PxMQ5#KE!9gsCUTGC*}^=) za)Krdj@5fkvKI7dHaU{!(}1PR%j8A%AIg76{k3Xh)7)d1hL}eAvJAS4wI$dvSf%ui z;_ZWze0b}ZV~wRM5DMN&9{4IdaL*H6hBnkUSCAZrnz9sCW^foqnAwgg_IpAEIa2!3 zo{Li@v9T@zcBt+U92QJTTpSwCKFIQGT_Knm(scqgXatfGmE=aWe0{EH04S$<18(o! zU#u3Eb3ifwX{8QYT62q)eoA!7We}r;Vt6Ayr`VDYUZ%xHfXee2jq$Uo9sIea@2QHE z2QdXvqtyRUK@7@1ZDGXQufN^8^ej{BJY7g`hw>P!6=5OfM92(hHy zevs^h^sm0*kbkoRgg6RK0q2|m3HOgUfOvroGhhc?1O@k{uJx0}zIVK(OZ#H^)->Vo zajcqn*7(~{+wztER?_ZLAsH-4`z~S+8)?Ug2Yqsm`lj6$ZqF=+$)Zhtex8(rXW#*o zHS2B3Ds(SG$q66QXXehTHH%5ID}}0l!eRg-`QU=V+uwzo>>g_OYdTYfp;*Jt`b&Y#sKo~2iy9e4O!LBj?FQyQ{mdEi5I=oqi^vgYv9T3c zcyxh9(pp+a;bte`L}1eYA@H>b*Dqp@07ksK@Hm9xZ!uiM9a=;HEFp63n3@e*hL0=A zH6jpJ>8Kkz;$A8&0wtZw#EP5%2=Wy%B>mT$dW!$s(5ulTy0Bto@4R@pFe~)H;M>uo zY*=6GCm8qJf5?TXCEs1H(+Gi0GE^Xq)I`Jy8^|n*F>*5h8Ajbh1`Xgm`^Uw}VHI?c z*(#5G7!`-Fc5XGh+a>f>nR)KK^W*^uzZqEQKz5QBMOqkNuhG$rcac{SrO;qYGw;Ck zuEr;>W#}E+Mhh|PCr1bO_}RE1yS5tk&xAtvAsBhmxB)~C6@q%6~6_P*MF zPNkk};CY`8^}o+!?;-^H#@=f}?Tg$WYkJkWfm0=0G?b$xPtBwm--xAl6ENt!P08Lv z9uIy>d%q8~BlOXIq1#8v2-|KP1|WnWli8AK<9HBn zyF=iCJeWsxV1XPtrv?fz0X1b7@f5fBKG+-;z}xM=?FrJjl8VT5R3mFI%hWbCT&s|l zShzAcmEqGDTj?$iN(MMk1jera^^0XmDMVJx(&XO>BGANGFXqnJ6I)Pp!wFTAz1y{}ax|@SMqyV#9Ewj6}M3d!NtUE!2$_8%gkllR+kU(XzmY4H0Br`I}wi z9jVj-D@~ZDdm&B5zoAkvf587KP6Qmk55+rILFGUiWMHL($2>piv5mLg`KryOtk4rc z&?Z6RduSyHh#b&tK`i`}Qt+`M3^`jGbd&98S=q0kgZo{Pv6h={x3N4P{^vT%x9RUA znmvSv+c_uY=bGw7oFTd6-*N;OT~AvLVA`=G43gzI`D(b?0 z>qd!sRE>0&$>iC9APF9VnKM;#K=>%T>Q+r14F-Z*{?R=WJQ%dYrN(D2NrEYX6*k2Y z`WX|101MD$-Zgv~PknmYnRXpVlWy8~*^{d|B+O=-s?I@T7T|PxBX&5xO+pI-O8H2V zBx!9wWcd3V*yh;HxZ~sGD*b%)F&X4bq*Df%~r4vCe_o|FF-Kp^wC?zaCIK=2^P^LT}}gcSS<%mPLL(}0n{ z1YjaC1LQL`m<=oh`4$ZfpT)aN9XiT1S!kZR1uQqdvCtLoYWe<_Mhu}#>*X*6se_!wF_J}j`W_0gU%a^6P=ca|LTHaUk+hU-f zOr3*WWY}n`4xqiZ1ec~fzBV!3Qyf6503c4;>wjlZ&dPkrtpRuqUuUXt(T@df& zgwFdLaA={fS15#kErW7eSHgm&g9u4b3Tz5%H|=_$iS2o&OH|xr+(AYQ5ZdvyQjtn6D?22_gD; zf{H~MeY1%x7Zd}f7Qc*#w%Sv}axh<>+%c7>CzShxwRx5k=IRXyipjP6wa?O#eA?T% zmD2b@!8Cq{Q75BqwrPiKa0qy@w~}PVXsiyE2$S7v=SZE{&8L_d%rnN8DVJZ!OOgKk zwq-Tz#A70AaCM3dzo5j?x`*Sq#*#j0uoA|sueaj&lu&0eN1T3JfGg(ouP?T1(lzdBN5>tYs5bfcJsh~fO(-(;;-vT^AKjW4+@=~3oM)Ulj9j5|0B06mSLZfv@Rzc`FN?(KqF1yh$u%UwJHffPI z4+>$8H;k(n$N=CS0wb}33M!%7439-n3xWk~fOnZu0M-T`PItp)jvGN0=CzdJz`wmT zP7|xYxXQ>P_U_>+K<~QopI&o^tsUuO+kI`pv5PqncbBJrhI>Gs~oye z6PFlUdli$~nZy0x%DZ_5ZObXEwv~vYt^j+ru{Jp(cQp?1-c*kW9pCa9*!R+1fr5xJ z6Q5EZ3r4nh$RTyQEo&K!;H-83mrEO+c~4NY@7_}6?s~Bo2;^@H!aAP$eVji;+P@g+ zYDPs8v{W2xjZxGGmZp#Ru|Vn|Glr)`l*vlr_^exKK-n;mnb=6X6~OJ|IIqZ_`{lh z_t@{gBZBZWA9}NGkefpwze6kDHjDsAW05L})CcJqjV^Gm1IJvd*td5jkdd*L>Z}t| zGN*%aOtcy?&u8;n7{1LdALy7+85FRVx56gHk4j=F<1Aa}uc%H=qGKtrkg1!fBVETq z+&09uL7+te-De7()lq&i`#d9V}Irg{zcIP3h2Z&D7pQc+;#rYEo8=N zZMIoxJ!Ok&C(Jg2d{ZTC(;{q6=)>vDV-OB6``KTCH6>B|>8_@Wy1-6C06k*gtq@M; zXdRB5CrG=p=3o|CvF)XPF4h4O@7ga}SJlJ(PaQ`T)I=`6Bouy{SYjn5%E6wfsxh${NTGvD!p;VWxG=u6Zv9W>O<9^kAdXd$P%^=SSys5)NQoQvV4S1ZmfbHap(+-*#v;3UJBYP z%i`dtp7hZ1CbPDFCjOTY|9kjnahXgsUy+pP) zRC@)|ovnMV-)U?jl<5z8B?@eK5k`9o2q|PPp6V*mje1fO?hQ*>chIHtsR(xLZo}x; ze90<7z27(-J2zH+G9(9ui5%-L#@3mbnVT{DrsM-H7S@~5M9DFuH0rg;|M{50< z)k+e!@YErM{R{Mac%_&AB#GYMC&6{pk9|QXU0yvq$nToKTl7;@BO}z>IVw`DMI@AI z0i@FF_~+k!jMbJ4(+3YztVEVxtA*EIoBgR$knsXIu^&;&vK$DB-7n_aGx1$W4%vf= zyUc}Dv?bOVGXuio5aQSpH8rd%kXjWA$_4C#ex$@B3o4LytB~peSbJ;UHE%ZNPi{Nz z6v|B~=d#MENutA9mZhhDnic(Wl1#Cs&GyUXHwi!Tkw6r%MW}U=+Q^$vnDJ zmx)DiyZgMUOw{nNSr6-6R5Vp;&Mq734Nfd4y^n6$Hid7ujzrKkCHfB6szWi__x5VJ zkvXwV=Ms%2`a6eKypNo>BJm>LZ!jP>M9V5o?BOH(iy1u6)M=%?y{2Mjn{aHy-*1$x zUZXFpIZj_-AMq`h$B4$G(Bgz)Fvek;{`h$o_145ZS(seG{e5x5`_$wMY|8PI`s@Os zy-R@fgIKo9rK%RLe7s-~3%Yk;Eih=~-c0RW{V1zpq%Z6=Pe+D>>lJ6RsB-~fE*Pu;o8Cf{&7X{Pe_=}TIc7`x9O3$Ge%UgtwRNY?llDUuo@MpFzY`-b(lMogeE}VXQ z!=ET3P$~vK)6!~MHn%q{q=KYQHLq^dH-(g!zR+?07IKS+M5TCiZsUY@RV{_a^3sbt z-;gdGiRpfobMCh-;pN*JrFO<*2+%+J@Ny_=RYuZGXgO&a7d zbhsW*hVjAQ42D%D|LApM;^4umLk6OvRQK}4`m`p1;;)q{Z((yv5d&d&yUNGLff?3f zI2;u2m=FcGOoan_(BF>v5(pV4=N_hSYZw!$G?kC4cSyr|PZQvgihnv?&SUe8t(? z22Eu?9=t4Z-6pzuv%_j>*^?AR}2~H@L`aEe>*c9BRP0o|dOS_?ERihiw zsH-XV(w)14oT2)+LPQXQJ_X^3vV%tg1ao06Ae$g$p!$b2WStr;K~^!VT*8r@jvR&a zGFP?!v$}uBy!w|%B(Zv#;4%_JBGaYMQ`O7;+?7*1p?oh+-dh!p_XWMj`Z7q>g=c|^ zD>Pox-MIl4N8C7ozGM94$z&0?lj0@f= zZfKW`m|IjoFM)Pi>ao_Y44CuB5GZe8J%Sn$ZB@}q8vVqtP=jn4YE}$}vz-^gfg=Wx zJOWXCpMC|0XGOU!T`V?US(pTFo6K3Kk00N_&jo9qvKsOp*j+G4q~1OGYNw##-3_Ty zm!1pjW4g)Ck;@_iJ)&R7@jfkpXOJ@H+_pa!k5b$j|Ky{VOk>6+@q zC%GnTmBFS=P}lIhi?3vn&zlRZv=Wr^y8@juJ`bxoox&uYNxZFoNV9vPRKXvA^ZQ{! zFuD+B^UzmC{*|~mfnqjFepcnmz*R9l!7#uaR~zxMthgPP8EX>NbOKyXRDy2c&sS+5SvS7{2%t^G zAV!o6$!`U)z}71b0C_C_fK`Nw7Nu70c3!e7BNmtVK#+sIVx@^3w=E6CeEtyF)P1qG z){`$H0m?o&$Pt;NC-&M&$3N=L9b4-m@m=!z(&%aSA&R@kFPYL|2)ZbIH#o@wmMQ%? z1BKE&dX-S>>gjxU7{=+C!GS?q0;K4fiih-3kYI^qpuQPWTOhZrRF6{Sp6YpI%%Jmf zfyUeL+4YCWq)Pts)(>&*kI#_=Gk)*$0)rR4=P{GF2fg@Bif+1vN*(Qk7t$i--`V1} zftaX5U*+Ij1+%q_a~jfC{d~vN|4<%7Y(QdpO^j;dXW+Zpk#cB?%Em7C)9Jo_$S1$DvJ=IcDA3^Wl^BgE3w(G53yiKlg z!HovO|7#`qklO@{7BV^!7#5nY_2 zFT5h8s4=t|eniV#nKu*T>86v)Ir$VKc;-}d>l3DjsJ;LiX@ktf%Tm0;L$+$Zsj|IC zKNWG3EW}B%IyA4$`Hr9b>eD@{&Op{MryLX@iPFRK^R1JSZ%K8p0T_xwA`=c*ZtTcsx8}X%fdK&SHcer5nGt`j6 z{D*MHT{q;dMU2MJ*a%bpnABFbm<<_6M@{}oK9w&Yp%~WjGdnpK!W?odCbNb+$P+u0 zZuxXr#3AMMbv{F2$LT_A7!X5ND=Gs3TTtcm+p+yBYA4yrQgsCcH- z5IE{3h)Ov7wulo=Q-wbWVyUCZV7*8CJ7w{NU3?e481`A!W$Vs1^%@QWvpNP9q{Ai+ z1H7mY>qVrB?kGV}bXsD(OU%^%AA;#o_I^m^Rk)Abjra#N-?56^w6AgM-6MFFp4~<0 zQKeNUYP0(|HS=(_sngx)k7UKG*N+JSvjVi@R}WRp)Sw9`pHjM}q9-xAvv`~g}B$2bU z8h?a#e&vq~jXhga4hJ}!NP3xcDLK2hU;a|iXwLtEr{yQ1?ohvanLd}32xb{U$i!IJEF(FM@`14JBRoBIN$%MU_ z87t?K#QF>TiL;A_aZ2{fyog9#DSb}MIAmos{MKqU6-6f-xVR3pDiz>+V8|Mt>~Ctn z#uWpfpRF#)X!L?O#*el5s=~~SUA}d> zkpZNP9*AN&hhpEiHag@R9T*KzEffiY27~xuRUtaIg<{;`%}7v7%F}^UV8g^%-pzmt z4Xf{Um%T;PLnTO`Rdh)$pu8?hcD^r#Sonmg=2q_u>0um-m#d-eTVFPjbw}+ey-zq4 zZcFl8-mjGB$#0IZNny20p^{_NPRZVtv96Xbu({(a!g40{z7I}6?neyP#;$8V&-iy$ zTG@M_`_H2NdhyHpndoK^D=ai&^qLS5Klqm7zd*?-i zF*HDWT#ya|1_*)F14g}*%zyfiTa$z|&Owk9P3yW_JW?r&c6K)}FQcU3p?hAqog|4- zE{Cf9;>vT|hPVSigjCU{#QM2u zih%5>sH3raS-bHax@IjPMh?0)Q3~NY6H}xIb8K%Ieh}2dnGhcp6HL#Se;l8 z_I`HWl9|RlIB;nKgQdiUEhWC;1nzDgu^0tzUyZ@Z#j8^YA3)H!Ys*JyVz3w)njQhtND9EG_Ucy{vR4C%m=IWuxAtIFVp4jA~Q+=%x1LA)OJj^3pjD%mxOUc=&m3UEM*IcsnDfMc_ zX?5dJBa-Q2!6y6Y5s1gRo%9n%x~To6+xE=)BrtX$mepvPM3Hsh63KK!n5LRl_jYSL zliiGOG^Sz5W(}BCI(Sp}8mY-UY3W>>veAM<_0^y6{PQ|$o@L%4BaKN_JliJD1sW@e z`G+F4A+t3*O>O389r~JFh&moGEH_)Nv@c8S@EC_&h%k)N7wj!9CT--xXqmlB?@Aw^ z++4oWJlBWJoAcsZ-~N5Ou?M==>Nf2o{(X{9)o&FJzlx6Nw5r|9GgC_B@QC5!&~12( zO!RP#G=aj2`y)ajcd^TX?A`k{Z~ZE5ppQ4+KyLEty$W+TG{hG~wV>WQLLgE;+p=K3 zsJI@YqqeHyz~8Nyybx>-_j!wHVRD!3Lm9%!12eqBAbOwZP;vWc-3WgIt@gUc!mnoX%X zSw7RRUJm~n>u5S4Xr4tZ&+^Z9z3R;5VS90?)8UF~aDg#?YkmwnE}Dr~xH>!p+0 zK&w8criue+PG*>B z4PgIxehHtEq3juK)h6S+8GOJSn^bXdP5nBcrJ%_er|g}xsro?^%oqe4Aq%UN4kO$6 zX-fe&eXg?x8iMH9oPST_SpwgAne=};twS~WnSRaIt`%}5@59jb#1?1}fPXf)HxK(D zcqlR~R$;XpnAr)+Ck@|DKXcjmify^buna%cWM`|i^ypLI!TZn~MsB?RWXHTcNV3e) zB!3u7Jt&Q(%{Seu&jt1#c`27L<#}aRryfK3oFU(=Ll@g5(MIs~Lb8%z;Dy&4N9O>Ta37*y66-qas zh20)bg!IV3d`zwU^yec2d-ucm*nrJ(ti)JgdJ6-ct;S;vbM)(9H~I zV@)|WYiG1($QvKyPi508(X43t`k*-`(Xh(`hJenDXYYDkC{7znZrCunh;Z&A{zw9t zt`-p?7d~`mwS0U8Pq9`~u)eRJBqbp=5$`SIKS4>MnpMPZeqVc)SLf0%|2UdU{yv=_ z4?Gy{Ong;nrL!TqSVNM57+EUjc`yXyBgu`-JFfZc^ONJO*m5s=yv<7nPlBeCNRPI( zat1bHfqnEmv!L(dc~(W7JpK(20LdjlDsSlX!D&l|1wRu+Xf>Zz68X69G8S4d?YW;6@#SNMHrY6ae%VYOC6#A8>~DU) zsGvTl{aD?wGd+-$%Hf5OtL`Hwj2^n?o=cdhF=Ke1I;nx?U zN*)hZ-|AuW>HAF4Up*St;`EOxl+uD!pzRe*r{R&x$}ciuFP&uzzKM31m=-9zrny)q zYo8A9BowkXnTdY)Zc9-0alFOoY$}{xFAH+M2zgz!c|Spqs#q0q=TR2y=>L?UKk$MCA}m6r6l7oxh?mb%4``rgot-)N*M4VM4(nx|C*!H1(v%a??0 zuVw`*>q&wL=miLR>TCTvS!Z2s&C&P(v{rak!bwJG)p1wmAltOzQtz85Y#+f8E#7;4 z+WA=UiHV&3)feUKH;Y$cntYvgkYB}(xSU1*#kox@agpybdwO4Q@o@V_qAewwl)(k! zM$&JK7j8NBdTB!UG7R)17qxlJpU0_4<7B_T(2%=^W+}_kyjfh(9+8P;3uFnbolk9O zy@IP3@m(5y4Z}g%?r$CE=&=jK@9;6z?`VJeCG3Q^y=&aq_qbiqHz-r@Km)h&iQM|! z(KN!8QJ&0Mr)-T><7OeASyvRuCI+|`7|$WiHs8+DG&v@h6?5H-Q?id=E)W#~Vd$WB2CucJFG=gJ@Vn3TQm6;z` z?;nBJaQf1;)Mmpm*K!(91iC|f5jPJ+x0zMAVhnqWCqv&-yjOmO$-aUOZ=Bh z1EI$Q`rqF{c;KIq*hvti;uQpe(?o(pATNJ#80j$wCJ=<1_$6!V7|n{iqw}?0-`AG} z+ASUalnZ$F;|9oKW}r6XpwNiWRg>a5Jlrw^h@yrCuZYni?4mlhn$-3VhmYsJUkD3< zR`(};6WTW9C(QlY3`tg7wO=Y5{nEy0_5FrdG~De);!XD6E)S!njkFEUU#9-v-?1K$ zIwlFXfRUbFw;7MzG>SCfNlA&kezj>?spmBE?ki@kubw$19sJE?HOIz_Wt|QQbj444 zu3Fj@i(#quKNB2Hk__;b0tYl)+O*z)T*}wIOl(~u>U$JnIpQzQvTK$O{RcNwo#U;HK5{yq5Jiml>aymW7qKioPBkpH2vEWz>;M#9l0 z)#i?$?pH{#Y6?^`4R^$ffJ7HZY-)@TjU4ULev=Utl2sx0>?qs7A{F^Vqn8Gr1|J+yKs-Z&4$^J)lc*=mD|%+zhVY=m<&WrJFJC! zy+O4uvTJOYajXLGLka&04*6f*w|3}kXpW_i;`3u|Vkg$Ygh6YP1bv9YBZtOVVV3=E ztyf134qSGtzIt6t;uCS%G4lWk=8_^`O%;n_t*npTJq7r`-E1yqo>r_Ae!?ak$L-mO zxf;s4{IqcNoQ%BAT5Mc6G`0G85&CFwx_(l7kVE@`o&J36?tBO?yI7~(<2IRplW#QB z*?WrU8jr>A=&Q`Jem~k%Lv2o_}G2@CdB#SMq4ti1HH1EOe>mY;4KciO6#3EqeejLaaOM|RL#21fp%q=Za4aPZe4k0vp-LkVO{=c z3{`7uic9*CrDA=Ri;1BZ(-g5e?ua?@6Kk;xTB0OK?Z~L zr<7hODY_J(cpWVB=hnUU&*&%jpmJ#|iMM895UJw80$@!4_e01h0z#Z_&V(n~%odE2 z3IVvBfU6G%sVzM_!g4@QPY6sBR4pt6_smwdY7o;8F8uqeB)%1p`RpgJp{q_6ZU|3K zxqady27K-bh8QF++1s8+4{~yGi;~c95_mZW28LyXO%@(%(YZ5uy>(Jt{IqRydEWTm zBt4lQTsG>PW1a78j+qv49l2Hh#tQq7IIR??IesFR-CHrev1y$SBhMgpHYT(n8yBR( z>J~P%*Pv}(&%6im#goE~t*00zRAy+!@h|Y2VV3$w4TFo*ZOuN}>`~0%P@1P=yxj{; zogq|VQXi0k7t9frcqji}^g(3fE}z1y(nk}z>#A1F=lD{D?JIH@KCQcxzt}j2dKh+h z@O!M#G;;^V{5|J}4(?dk3(waR8swjSrwqxUdWbKPlRkq~_gMJw#H@aOCByTzdqgPx z&ZmB{gH!_^+;$j=tQr&8-ah70HkvfV#f`4WZ_M09yRSE_IygG$)5Sfo41u^@#tn(5kdea_bl+XV zy>h~Q;Q%eGnzLO5hxh$VsSkDmof-J#xS``^$hgLK;>8A%4tx#x?#MIHW1vS>3zAnpAaD6kaB;BZ=Hg;I_-45#Dap5C2cm zx$O)|Q_i~O2Gks23iNR79(zGn8Pv0I#|7H=?MqPNy%rYccYC-R4t#vln;5G8sidSu z!&3ee2W2adLMOWeCvmUsLy_vH^7Lw9!S+hHp$gj={(Y=2Pbxa^E9Oy$Gh&&fYy ze)Ny}ITIW$SE3IyfKOQ3I0%w-R~A`Iyb{s7!dE^C?jodX*aJpjS`vEnFRY7AkXk2SnRq zLyk60n@M;-0_>vNOynY>g|&X(LAKD&5dJYWfpB`t<9p8zdO+z?>m*-%RW|j&i|`ot zgy6=&3s~@6c;h!3TI)lKb=^-t^GxQEbCvi_F&=Q+pPvH{t939J-kjM2QgRD)~%0!#_uLbUm@PpG^DH1-ASsv|(I_G3#pYv;zu zH8!@StY}&>2*!-~Dg_4RvGCb4@s6MlJSg!1W-%$8n+iWY*~p&#!g5OvqNIu=k+0vx zS1`3)3*=`;;;ET`!!d`%*J9Dfm9dxpV@{M)Q{NSwX8Wrv_2Hvs(o1x#4?QayKsp4g z9hfu;;Tg_P^(galO1;y5=YZ-Kh3u=)M6)N&U}5O^gLpwNwxZIT z&_Ng>yv@wk&2E%mN6~7O6065Vz#>mzud$hxW$YDCq0DudWmlI^6Ti$W?aL1K6G#h_ zd@Du3DbX8{q0MDv zL))f^xx1?KYiZ_j5E^ag$R6kjzH4~ltIyFRqI^eLk@$mIu-^lfAcM8etJEnO$*U?q zvwVdkv4(Bn^Ip%#2iaC(qqaX6y~cb?azsR!YKi}Hj^;p_;t14NubAl({;4O!CRuv) zX*7AJhxilvuH&kA`g0?&rFIsX069TC0I&zuEnff44tdoRboRuU(E-Vyt1ZuVe&KuL zd4NfmXkoWS&Ds84QfST3@HA&pANx2<#W&l>z84$Yq;ZKz9>QN>LvIK5Z=pBG7#3O9 zdShQf4`wrB+ zj8%IGuf1CAg0&H!qAhA}MrWN!%SKVRZs2W`<6JwHwB?j8w-M2y?ANJr@_E#tz7rHQ z@NUZ~1&sqJf(IBpHs%6Q@pio70Ydoi(L!f?NE>6#o8ofD;XhAZXK& zGxm9B_8&uKvRU7dh);D_Ecm5c5M@CB;U|CE%$Jq!VcI( z1m`x4A^erC;46hXG5~_`00IPm;rd9bRFS!j9o_E-%WYZPf*sy3b7;(a-wV0UCnL7< zh8Y%)6$mibJAUYvlK=7}@v@uU74+3171k?IhV~2&lJlN*`dVZyL}~YCQN+diDjGAu4B&+Z3Gy}z|dv7#4y z5p&ESj8UVpO0K+h*7scVUh>wxpbKn))KO|;z!q=)-~)H=yVI%uwJ!C9(3*>oG*E<3 z0s;J*dF-MWVTr(6{c>sMlw*hfPfnIE3DK|77KdLl1xD+pT2k8Un*L=ixTtnfzbF^A ziip%?){UPJIXh)QX=m;#qt*6(3n%5oEi7F)(#>NCcUMgi(C-dzVEoKECWrxmbZ2{a z-#s{gaKJ<=OiM#4sX24%iE$yI)M$T4kKjXQvZK2BE9gU0a68r zW`Y*_pdjv7#GHVMyALt_g{OyF%R8gnI)qEU{*LSCg6ppvTa0(lUEA|J3o{Gf7$-m) zc~&!09o8dZO}<;kr*--UF0f_fABy-kTKV)(@fEi6T+OO_s?*3Zh3Y}aH!e>{4gJ>R z(#@4+Uj0eo<$d3F@N-KihNjjm$mZn*z30z#s-vuyN{dMpqv3^UB-bYG$nD z9TBLUeW0xt5(seQxO~>azvagiMg};cCLQr*~9GfR*K@ez6|_=#L^|^_>$eLy8Ax#!%e0{Kif*7Uq}>^ z*P?`B=RX=IBg0CKAOeAW7ILEf&_PdRSM(0rA~2C=PQql+lc*qG?@L?aq8{Y|sOfJg z&P2h*2-_%sF!rA&bf5uI%Rx@^YA7MW?ibh~lz%A;H%}u;dmf57jR_+AwRd9kQe&&q7Pzabwu6I<&77$=%bgt8z-K+>3Z{x(x&# zd48|hN(GUz9@>KuoEdC$(P`unT*?tEu4*y7>=2pH%?c#%WB3y(pQ2!wCHv+}{N6mf zLt)lz@)rOemZ3KXinr7Gu~G{8ZQ~cK%SlK9f5@s>pRrBjhso*+R`FP`^v{LAZYU`> zSQHlQ;)yr&iJ~>2m+Y@OF;f|H_b|y;jEb3@-JE_fl8&+6Ljjk+5C2c=kp4fd1H=yn zsa*rSy!pF{z`wvZqGG}l&W_-5$ol|@)Zq&L0=5Uc3nPXa14TifH}B3+V|yqXY8x$r81U>ygZv`HAnYYOB9rt>_VeV+uX&NtOr!f2 zY)>7U?e4ka0$((^lB2cTSYHrD)8*|MZqM!j{++9MU3l?+W1NI`gIBHX#!7$n4_ew- zm11)qE5ezab!(9$ftLFluzW1_{EbyHcz<`+LqpW8J;T21eK-~iJls^8n&k9QK3bf) zk)E2A-fNpYaQ@HsN&Bb!BXsQ)OAefn^2XUl;lK>Tk;@X*98c8WOiGX?_ZrYySRc%S zDZ0wJyI8hG#=7O~0!xh44S0XV=%-A!6a%U8ghAJ6HJU5tqsD1+otkZEG7!SB@ReQH zJ~jm!%_In~SXMr^imbgppXM*cM^J5|p?Ot%A>$lWMRJ7^59z8OX6E(CO1eOaX|-KA zR^VWI=paIK8b>1bK!G?A+dLeb5?(zri=4Mok~?{gzoY}i8X=ALYYz?!5R&(802rQp zRzT(cvw7lz0*8)LAEGamJJ6`xhnvp_0QRKD7qlLSrm1LsNclH<_5{nVtPLsb^@GU@ ziQFUAHG~iOda)gj<=Y&L=H0*N8zUY+I$sp!22y@m{^QHf3mPTgwM8#UqhjwKfpOn_ zgby-Wg{32hS%)h521W91i}!`sC2gwnP#IKZYvh!0!nX%A_uM3X-Ky)U`~G$@J0o)K zl_~X5Ub`UZ@49{a+-F2~ka`^;wL5~ayYl7-&a&2nvxSy)!GQ1JX z&CqHwMfNsg1)tsPf0Coto$7x`sd+bSt!OGec9w_rHuxep`s0OXT2v=jp74AcH^BX4 zl;rSCEPiUn*{_N??S87bCft9YPv_fC)hKhb{+4?tM`J(04}3K<^^$T!$UB_nyvi2% z*{o;Y8vw!-FSjCEP68t=Fa4sHE$ZcqT-?$!91;6%xb)Ih*XK%Fe|Dhd8e?B?HS1%B z`iiN*$DEcqoG0udPbW!(F-fPEakCXHo5%9Gi=j;+!^3O4W>rb}{1w9j@D%STYT0t1m&~`Qs|Y#rWY`9K zV3=I9atZ%(*)OVaJsRrrnQM`H{fnznkGEl1Z&Q$Jp~WH%?A{F{{3)XfokR($I?af- zNdysfpCK+Se+{@L&In(yT=beoNi|`oy|Qa%tt{1KmPYhJR{p+?$e(q=fm;dRELzV@ zf`e9rMO_-HO0D&3QXbFa)2FA2X7V_CSFkB&V9~kdegcpGc*QwHGSMq zr7@3vu$$(`4~)}f@XqD<^I+>JWEhwU;eWIrf>#eA41^zP)e^JH1&=bKGCLas@(+hu zVBQ_+ZK^g*Ku|n0X=O0HakXkpXRc@?VIVLAeCz$Lwa4-5neaJtJ$yU!Sv7!J0-nI2 zC$7I4l)lwG&1=f8JT#bjs^n9$0h^iPU@3SxsTGsw$#;_J2xVM#x-l`ob@%9h0&euUqfUI2i)ma8hD9 z1N>+q8Rsw9UCR=jgdUIT9C)Rmg&3rtTX@OtMo*oMmfkOQjv4=E$d)vm+)Uotce3x+ z`!1&1Y;~+&4&qm^rZXn+-rxTIwFvetAKYranS6yJp)YM|h|LL9 zB9UM!HkC(jbE1Kd!|BfqRa~e<+s#eEM^CUy;>u0M(pPElhw$F;!v))$o!3>DxgwX! zGceI|S7d4-Z&aN9LvF2qLi{NsV|M+aDZ@ zivq$)>M}>YP7wCoALr7wICY>C^m^(b2Ror*?%E%1-CtyJ|;HEU?ZDwwHGxX%8F=~bTnvKzMxZKGi!b=S3GLo~ojp`MWDW zI!{-TI=mBBKC&CzJtK^tI0fS$IQ-Przs~*#RUh(y}TDC0^M#Ks*>Z z3JVQUxswa-9^Q!wLT<{{c42pWwBxjxH8a)s%pmb+uX`{!n5CTv`_AiNje4&^37bJL zB7=4pC=DIxfK=i3Knj z>c{slL9>WhjJHR;ck~yL2WR(-D{R@T*62eDllMfTnDIt3-D*Fkxp?+|OH>L>B|G;_ z$syQIf_{;ha;AeH;$=Zto#c;z71bS606aC40|mOg#w)%lg8T%jNJgzhN+-Zg(6#on zZ&VG=#wD}0XlBA@p_4>TSumdZ4MqY~*Mg1FVt%ur6Ue{7YutNc+qkVAkNxr|%mR@x zXYG~1_F)MRL)?#lzf-P#7#oA_9+WA+1%k5{m;QmUKMXbvNV4rLipL<_13}l4P_Pii?-0;1xk2S{IKv?0?{Uy98Rr*p)~yR$#<|$JCzL6J zs-^C<=PG4nubWdN%}7rv<3T`Hmrkx6n0OGgVAYjSm5ocU|4g=hN=E({m1nJL5CV3Ky0{)#aHAV5ZKl~*YkoQj3tSS}U zgSOzo3L^e11dzk#&y0g8*+A=L{D#zw1X5*O2aM+d;iR3NZz-<@T|ibpVcxhKArM{X z%Ov@~8W9KG+`Md_MCkp?+!yW#P0H6q?vsQUsA{i<>TpuY_WSkgFO$2VCDtdc&IKhL4%)#f-Y=dS=!2^zT|ueg#sJc23%N>Z%3Rt^G^E>RAhS2_Kb|t8?_g{%@>B zrCY{YUh#Cem0}jf(}>o}Yq)B*komr(36Nkh0g+jf9|nFfTp`c_ogB&3LD+w4&SoMA z&|92F-C|s2zv{M$4w{)j+<$qZ8+LF2aK`Sl^l<`c5*6P4ynu0tt~?R|o1por4`+=G zxo{!UWrntVXhI7PFB)?&*LtoJ zU9&yAEA^oLqU7SxUp9=ur(~m!^jYQdn5(^qTjS>2*NnIySPl|2f3UlAsKdlWL;Oyfm7d*lp*AbR|G*tbY7e<)@XI)7(2moE4u zS@S^8VhyY`=3+Qa^Z{Hcq|48w(5W2ASsNjkISlt8PjTVJd-KOnge`{e=R52$OKvc)++~hG6z6vsVf4hH> z)w(0SEp$1%DE8wPSn~e!dLp#CN$cuk;WoB&<^0E3>2IdVuWSnLs-#oV!s7Vct@n6` zKZN?m)^?H>y20`1u4wN}ofpLZGQjoJ2=^FZ^spsypIE&w(Mb za;uYYbK$brr5w)4GfZRRt_mA9+i*%gt5PT{(oWJa|0k3)FF-w?R|-?jDIOE&i9=9F zX&c_pY;&rnq-6Msh19NriA>4CC9j-ONfOOr2whje8g3OuMqM(N4e&WL73(c3sDS=^ zxAeJ%0vLdgZgs%wgTX0@k@xY50XY!F2j7q!S)8Z=XMY0*Mw^`n$Y(`gUoLKU1YAW8 zCZ3MLH=4FnbtSF$)R^NPdoHQXD{i(v+A#Dxh(N{&m`di9X4iyep+5B2}(Mtpv&%t3MU4k@a!n zmtp?+>eON$TN3T+X2y^;DrKtx$vnmVBuQF+OoRHP*Nln-H5yWH@Xo7 zk-~D8?;;w*6i{oZ9n=zP1oIGofjU5c@$mET3t5=LA{>6G#Opm>Yd|^$@cMLfw)xdAbUbc0P0`Y!-heqsJ~D*(q6KNEwTkJ`Zl_(ib3{51FIt6BeDOndDL z%yY+Q&I%PyKhB3%y*zvSSggruFS3oDYNakq&c*Imdzc6IXcM_@$$ZUHVPkluL{Cjw z$8vLae`sBr4Zp>wi1(TG|5dRR{t@}F!dbr5)~?Faf!Zw3H5i{@u;%+mo5j=H%w-kfK0+EM25)fg zjDJ)Wx0@5&3Z|>&Sl$-H#xwtgpcKE9Vo4=t{~bFXJW9}vytdEz?-|F)c=*h85QJOY zY~hv4_($_sfAH(OHyF|c$~ejdED@aQ)Kcc5F~1NUZgCmAV_(h;OoB6dKy)t}bcNU_ zl{plh+hDgkQFY(tTO^s>Kry+bBrdU#WsPs`Vm2F}48jp!2k7z~p|eCo5uW;| zORABmFqa&LxEPxW9B1n~4$vH*B$SSFju6o(jt!>^fW1f&->cfc(mvcC+D$G56s#^~!KrQ&)S(x-09Q)VR8u=;rRE!E@n#5ngwdybR)?;?lzRzDKj zCL;bat4a*a-lqv9UKpQ%v;eDsj~*0NrU@2s-X2!w+;&61bg-niMP8pSmRlV@gb1J& z2P34Q?XOj0xQnICPobb&!W%ho-h$(LSz z_}i5UrCgCb7N8S58Uk|gz=TjD1DOaU>)9aV&u@XwdSm=n)NDC`okZr!dF@ttHwhig z>UqJn#4t4YoI=1yG(NWWQ^^^cF}`=Cs?w207W8>Aj=99ZRUPFZ(1ZIuU*vJHP*G&o zjH{9`VRHcQfrJ>D`Gs+zL4Qj|7E`QAhP6a-m6z__c{hDu?7dGriH{LOlg4bhD4o2L zV^U~j6f(3~8FEx0W(YDn6yo#fY0(8!SPOH&@;}^=T_0sm_4O^_H6w*#EDp!bDy3L)E(mVZbz7s<}i9u7Vr6@HQW8h(-P3#ug$_4Nx{>K#&?i>naq1GuWsHGuA?| zkHtc!0Q1>$0?)TG)(PRPg>zLKHsp-(Lp0 z540&wZ?sipXY=~soQ%?k=Yiu|A{%FNvNo=?VqX;;jXd@@-c+ak*}J{f&AQn~5!wR^ zFvMJkJT^^wGem0zE7SUfa`wm=;NA43uRS~l9_gMp7nrg)<3iPQAXN{;l&RCVY&R#KC5FHw{roRm~%@{(3uM4700gQWB1vz z)rRm_vgk1#@CS0267?z1-$cPYnk?_hXFqm)esZeoc;O)ebNVJevPSWhl|WU=-7L>| zEs$MCO-(5nU!VBxmTmr=9Q2^&A2c1-qj3 zVMw3nFK%}sFb+U%S|c;t>H8+N=O^wI_pj={-@y*vF^$ZP&ovd4$T!gC+4^DA?yK5O zhW-|r--04f1y(=Nwka+vWQpieg)Y@qY0Ex&5q*w+i1JIwzUv-OJCVrk$m7S-#4TUy zab8F9`{&XcA82tDVt!4jfCtp14m>*|GO`1U6hM0tcmxh}o`Na+j{bzAq0!3x&p?WG zv@w9eE&z010B*2*oeBu2Vj#DQQ4??=aJ#7b1LRl``;qg9?)JT4opx=cr^i>HtJ=ZD z4{cA-244b+sHs|C`;G^bf;(AjPE^n4*u{wTYlj7jUI_|Jn@r@Mb*x~wvK`Irr7una zSa9IA4!VD`QYD6gFU~o!sr(Ibp>Z`F-x-hcEwa`*js=5dF;DJ8so-YEet8yr=a1$- zJb`hQ#Pf0}pwHuq&&+Fi#h87cz3taN#w~Kv;-n$y$%vmUefFIK@$(x*|L_kkT7i&> zvj9QKG?j2Fih+U-6*2no#TIQVZvn*eOcHRX8YEW_o5wNxj3-iW(d5>mpxCC{y@>Jt z_%WO+Y7yS1*(EhD(n&KG`TO@rZu0^V6I0-{@Nia`ul){N1`!hp5w{dkdtmJMHp3UmQq~pm9uubq7G1N^V>yDqZ+x*cn~5oPOK$>r5J(>$g8G$ar1j)?ThTCmm`| z6(JS!Grr1yI6?~Ll4oXoJ09Hf4+B5f)$6c;HnLB@U3zx1AkX_Hmi`tPo1K>08{yCw z3Ynn_#mjONCJ+)#A!mwQ9Om?n0kaks^eoy48CD(kpzNCxl9(1rs^};ku1xYTA1e6M zT8EbeoMYR{)E%(S+47|ovuQiarD6XSGp0*BiA<;OAe{~UmaoGXoKh|ZL3H9-N z>ccR9lbXu_NYU>@gib0IzR^eu0K^D@zRFWW0_&es!~*^RN6$}Nn|+nhV2wY1ACtb9 z-(37XTtVS_;iDHQ#WzDDayRX&&a2Fsw<<0w0++~LjbF9oU*Zw4rfu;?c}EQR6tAGP zQ6(7SkLWcc&=YMHp(?6T#`9ThOlU}toYKFT`4bBOG?+oCJHeMzGs&{<-gIW;aCc3)J?w9Lk!$*kn`1ez> z`X_T7tGFjvEH0n8pc^|D*6c5<8SY~#vg3?5=Fd(|<1LRra*tb}4&~6L?b_3`r-dJ> z4auut9-u=$@)=k|ug{IO>h#P}eI6qode81T)kY2?qU4_Uv#h4AU`_8$Fy+};ML7Fw zY)KuhFNJxpJo$xPQUgvixP1c`mnNfaMsa+EA6GCz@q$Dk& zbDZY!1s`^bCeQR+!G&=(v&e(Pc7gp>?S=EcGESDTLCpOLF`J-CW&$&5H;Q$HE1p9} z^$%m!pAtrAkmCK8r&^Wn$yq*)BktR@cTcL!3{xNnRJV?655%tYks@!)v_a(+F;cP$KI8A zoY)vz1aoJxwn5Cq$3QsFHLNMw_0v}O0ok>M0~H5ZD4p;Z!7P!Vi%a!H9{ZWWG=*Iy z-w$?{N0*W_0){#BAYZt<43U}7v*9vFUWx-j^6PEk)M zvR8tFL*A=>2Q!QgxU%{Z0qewPrB=2X)(_3x z`)PqW#z{cyK`cF66cuxCsKUZJ7_$mQqW%b66_dKK>HR**laPE}5lE=`vBsD@9lRJ9 z1klO#GtYZDwx6aPgPIvJnBdDnT@ccZDKR7S+sry|QJb6e-``lwcc(X@5^%~PLgxsE zg5n@@gmp)tANG%j{1fYXK1~e(B*k+PCc&|19Sv!kpZTFWB{fcF3W7>tj3LYdmZeMqOrZWc(w7HqShEY>C7=?fX8i zeIr~QW34=~(`K?%ZdJx{aQ`-30rBgRG_GgS@a^4<;nkR?SUn9J-q(@)O-vKDe@BJfJQ%^f%*kAuP0za(jAXZXi8AH)vy zfsn)z5LN;HPGsuzwl|&pS%5eSMBsDQ>-~t3-gTN=M%|62o*&K{Mfoh)P|Zn|0_Bx+ z$8_+BGE|u}fO<*Q+pCA)L)0L~Z7%w>{^4{>7Mnw9Ik!?yA@1npz{5I5aZE?S8hb~PJB=Gt*)0fB|h z7ar$GnAe?-AYcGag$-0b$q$moz?Oy$SA3u!mQi`wAFPU+?JX2#1NY#Is7A8xjG5-N z?BoTQWxYNu#AiG;=e*et*g1yd%9Lj9ur%@JcXBnqN|WI_P|WU29ys`(&^Q_=J83Hy zi1(e#OReYL8$9|%&{YZN5CLLW#|;UIhHWA^#LS%Tjt&9pitjwP^9!4?)7JXDsBv)6 ze^CECFjN1}?k3ELkq^%5tF}eL0C|u1Z(~UkF0uM0O(&0^0jqrtQJcdPIU6 zKmRm_>ZNOZbK<5uZZ%zF65qWlGaw zcN$A9{2G|{|h7$FZ};Fh75L18vV!p z#84%uA`C)e0kwin54l0zVMQ8!*wNy(XavAah9lwXw(mT*xdY|VD1q~bKT)bB0iD2r z=wB%h0H+lW7%=8y_W~imRN(<6&d7k16(Iif0lL9s#PQ?#Z(2g2(JZw5+wI)lMt}IT zd0CN|R&Y^elT#rJe=1gOz^@2GmhoGKZTWPj!z(PsgL0!MvppkbdR&2Mg?YAMiB+pe zZuja(-;xTeA&PJX@CqhYLV`PiP+$d1+~r~-Kz+Kz z{TD~yJ~jlygKAd4vlAc&5I!`N0D!y=patJ)0|J2TpYTJ3!WV{Q+VpL9;b7;50nzsB zBKV84$s6YBuDO($(ho?Pp;vgiEg|+5y||V(qQQh4t{7lUYKC_+w&|8O;#JR5^Ii_J zuKce%##a%Jq9?&{q~f8catJ!U5Q7Hj-AyJ)T>S?QVjC@<)leGH&PNWAR%6mlN=Ldp zt?DiiS$odR8$L<_kRgCXcpDYg8{)i+-nT9j~}^jSS*>x@I*tOmcp z0SR&&eMWLbu>EL$R|c~ zE1c}kZRS4kmuN`=)Ek|~Pl)gT3~4Gqa^MYSi9wmbU(9*QE?8+kuE$7pUrfRwxr!~% zdN=6&dX%0qF}ax@LXp09q8e%64y4~Yg_<>?04a+NTeyVCrR<%#jsZSw7IfPKzM^la zVf^_X2SHK(I)C81zZFN%K38kli?$x&Dz`T1@EnLvkzWXuN=P>skD7S{K#Ukjx}yN` zNC^lXJo`fXxzX9fu9!EtYi~{Q>S}f2-&u9Xu`|(h-&r}$doP#KjO{fh3@`6G)t(I0 zwW0fHC3|bv^_cF2DI%Sdyp%eJhoeYo#oT}6~`5T`J~$W|$>qmyGBec3keh4*ZIW}N@5;f&QEidHc7`6!v8 zFM@)0DiVZroREQaHe`$KJ|jXcG0P zBZrTUOxzZ>xnos}17}K)*y&NJ4s^dy#7>(g-hsfwY_$x`LfM=ifxoiu-~d8)W!O8v zlZeU;;Z+4N>w(q4Lvg9A!Adh}6ch`uZ)S#qq>!3ls^8Yn+~D`!*@7Rw=k7}E-1|V$ z7j|1kaj_c?uBD5T&rdflRJ=_xRfA3fEmxqtMuXO3xXq4^(aLLceia7kI&|@jGAfb9 zGi5UA%}N#nq!}{{^{I&O5u>T8NfKFy1GXctC+EIxWepGI#jH)BfU6-K)W2MrcV3V7 zbLZ9Yb#cVY$PvhC&r5%05CiU%Xo%P-ga8PIQMNEpE0P@@fGcP2)4pyYEIoe{kQOGb z!fufGhC`jJ_Vw;4NME7`J~$TUz{UFUtm^)uw1ZY-PpvM1Eux~r*?de#y$A?Qgt(q+O6=k@nAE$kycs9 zW8vrwOc#eJaO(V0>q+8higup`WI+_on;0Q|5s2Bb$MW;0{Mvs2j9QhY&e}~EyWxm zEw8blx$Fdvq=TZ?#EF~BN}g6+JhstyM&4?Zh_6R>Rw~G!l8O0#s%cRz5uh^? z{cX$0cVsxCO4oD~+~3gFE4|#fWv#lM0=MPUf7G8MG??l{in7}NjpAH^D>)Dal%|vU zhk%4H{P2++-e^Yf?2k;NA{7&h_v#*HqtXy|9nPY4AX~tb+Tk0~^l>33kZ0y`j40TC zp=e9Dhbpo}wYav8ON{F)q%s^OH{D>&HmSRb*MZn8#gcvwssE|N$Ik;VH4p<`;LhNv zu%>UWY-=@ra&1_gHQ~3ZF24nVRk>jh>@{rtp8L7KcV8oIZtanL!q?*$2yi6;_>DQc zK*F76?eK|Dj`9G*x**UQBHRt{*$o7~2jHKMzY?8^u3Uo!+HR!HyLQ`ohObHz^zMpI zW|k;B;@oud7T+=R3DW(MAR_~(1}+KITZHp)+_tN*-GqiM<-C1kAOo&s1iMe^xVY}U zJwLM03Y1S0djBuLq*3JaO{)>R#%;zHU7wwvrGAO?kg`1kk=0aj+>F5Vs4O1m3}FwC z%85Gp6uToXMqRBVoda~bIIO8t0RzGgLDCY*4M4L=yIl zl0*3?`ft=Sxe?6G0%!Dd0rLW@7d=~DA08RnGVlJEgW2h;Jio8G+pn`LzAa1=YLfz3 zZSkXtM|mi*G}{P;(_m3y!>#blJ|%%wm*4l1a^8)Uwin>RqYGOS4DQe=SV8hDax*Qo*JKG}sY-fj~Bd(BDp6P8tn@sZYb) z4$1((B61@GJb5R2G;DQY5BHY_}*Ezp}v_r9`-KL`N9UoX~ zIx-axmbZjOMNUr|oHm+kI$&PUspjOalc^6PQ9g-3eAl$^6u_5#2LfMB2+6LjbCaNB zNE2~`#Dx!{0@tHNvM={cVnh8h3(MAv({FWHgOl20_M$n}c$c~O12x}sy?nu$l}g}` zJQ$j_7&m(fHrBGF9yY`Lg454`_qyf=W|&l}NiTW-+0x}1y0vN&J^5Wqs}ylalGUF_ zj-0zV^GDooDO)gSPkiZkR zwJAAKanWmoXr^?3DMjN(gE;ZYu~F2j-~bhnFNhqu)0A8mW-XckqTU0M@@Roam=sN{eWQW%Bfg0)*pFH0j6f@tm2IRjMA&u}AqKIop}N&1 zj+PtY0;WrJPOrr3j@c>Ic1ZO7^S!CY`+9&;IGz};rK$s)h+oMD7ak6zj#wA}8#6e^ zOq`lpIsfgUyP;eQZok0K7-k4Wf=oMr#(n*%}=VxaKbq(-Kt_y_UhC|h5Br28}4sr84PyGbIqhVoohQkA9FjNYh0|b?y0TAMZ%K~sd zK~TyAKtTW_4{`ePEAk3LD zj@RPU7HDpT=io9iBS<#%wz!5bm2yYQomGJ<^KuSVIBB5 zg4n!!QsU7ifI|WT6mds6f)a7?Kx%ODWNH_Vb2Jht12vy}A)q5-RF7X>T7h778@OiP z5L{wyqy`(3E}8ut8z0K23b>1_l(G~rzY8T2)JIqZ3a{(?S2zIwgEwkaTW^r)clB*j zp$DH0i3jo#+6@fJ>Pc?$o|q9;?j4kEi=^CtZ~M!y9(~=%_YH-COeW0&1Tz>#@0mRz z{N_P)rhtPd8Wfp>B|Zp{P=n!x{gE5tlf|)7fpZ4{NdlRgc0vt^gwHs1-W=NV9>0SD zRLA!&I}VbZX&xvIFYf;p>22S5R%ZB#j;}EP*voS)bTUl1R1|3D4UF?;8C6T@Xg$5x z;k^;XFpXruSBP4{l#6>9v=H8-6_B{B#!(_weBU9-y>Od1{*2@63GV!`Z1^f1?pU3Q zYHMAd=S7V8gmt5-yg`~#Ay2*sd4m}3ZiGc)o9m{$yU{&XIOkZXziob``vosV>L)1< z0ePNr2u%-0C(TcuAUgC|y;=3F@?Ju5*3Y~w8Mb>rlr4u9Q^ieC0HJ`Nm=W=#*-{||REa*g zOkz6vAP#$=+E1JLDRX#}9%Ja|B!CQj9)!nmY5fEs`@=_Kf&nKyzylF;AQl^uoHn}Z z;dyp1?5s3D151@ERHP^^A~o|vKkv=`>do<-Wv%1ni$w{R(^cE2y;XE z06{B`v-S)GQDq$W<)<~8li(3s#X@tf2&qwhEqcy$4|6S}yv#|H5!WONSH z1S9hNzP$~kO39>?hRPtkiPPIZL^3ZAG8&TnkKZ9~n)z%B15+<%gPBty;|(WGB)x?p_O z{AY{r-gdvJ`PeVRYPph!5*=FsbqKOHDdL2S9Gjde)fd;ewZ@(_>pQ3uFp2(e5Hj`u zK?pf42!Y4O2gqUglv*JH0U-e)3rpxI44z^EYo}O4^;4S&y2$P8&qdi+| zpH{J5m#?wuCKLJ8-Pw%P8z}3oIkdp4wHZm@?r%lEVI!u%AG8d$l!m{*Mj0&->i0-L zZu$EZ{AKMo?eb~A1{j%wJel%rd?z>#`$@sR`C9Jvc1FN31-#zxC&D7a{S>w78(xue8c??pmO zgnp5A(A%G!&a}yocA3+3y&>76V})MW$$B(W&}f+Q=6%0gHHs))zH+@ zkP50(cH7ZD&CtQro?8;GW3>;{X*m&ZWh@}#S`v$oVWs7}cn4=Pj#a?}=AOPXPfKit z)(3ZlE9K*~t3)!fyjw6L#5F$;$^!VL;$6|-!QybP1y0?6miw&3_KyWsYA3APTnyN6 zKU1EZr{0wkAA{wQ34;G|uVDjjmbLP5X1g9JogNjw^D|L_hg%`7d%{ANKL!@iz_nK{ zVWDYMVrGj_;`)SSqCJ zxmo#H3FFbd^A_K*99k#{1a1uB?Y+DC$12zu)?^!%4!${wi_lMjZ`+;!OE$Xvq%@Zq za!DDXcYZVF^ZZi&(yGDr^1X6OD(aa^mAu)j=FXcwJdTl5^Q!Lgmtc}u8RwN+6AHN{U4IDo22$ z=xYML0^wIZy#Z3<8MG$<6FfFPLVpp9Iq9>q0V*(O?zX<_>MF~EWQpdk(O`1)2xQEK zf|7CZC?c-@hGhEfYKAd*4sLYMh5j$e8GiHcJmHe>$s5%WQlH)tzwMo&JW}?Vpag=- zG-t+%z|OxPLKpeElvI`GDKy%NPkiROS<&{d0tgfIm4c zCFtLSBI3zg9y+t?T`3HJ*9+LM0t@}LiI&zM3s(NPWz@cd5yN)Sn4u|Wn6tZ_5ow=c zWEDN5x&mOFqU9|9^asJ4xV}?|E9dNN*#i?~6mO-|w#%D6)4il$RjGMgFgh2sX`R=2 z5fmEY6d_&7H08ST(gPTWXz!46Ji`9z>Z~pC^L@uLjzBPMlW51lI%(_ zO9X~ImPC`yUM|koNJ_4l^5)>)pFSr_D|Vw0VCu*SAVZw|15f=J(?n>#3mhua!T8U= z&%LLVnJM7&wq(HsJ(js5Wl0p_69=*ak zQX7_yDRy2medO!)H4tPw{ND1rc?X=T@)OwRu|_AAK!#>|2r!<_`RGvXx%;jNL7dxm z1!~}h!8$=-8h-eHv5qum)B@XzHh5%sedig%Uk)BF35tJkjm@9ai(Osj3q9$u1>K)$ z$!3fyW$wK7XtAAwf=lCk$Xo;|r<`n~c)aH7{E?twig8zp1mmr!_A6>9&E52VT0_HeipGU zR>)B&U!bJ{nawQi&gnlT73|(u;~j@7WhB+jeQx>uioK=yiInoT1f02BznMh2{OHob zz$yWTHV~L^^4Jm>jtuU8c_FH&)LV*)SIKYD|8P`R^;3vG{;SXGlpXJ%Y0jHzX4mlh z#i8mK-%n?hB}bwg__u@YELi6T#xb(;Hj#KQzi2NU*LXCTlWqMqLn-&D*GXU+L?qHJvHz8Wr-7(8A|pB zpLk#ILBBL)s6JBJ>_t@O3V~G-@G|GO{SmtRe_~A2RTRHLO7xkfmyJh2RxWkG)@jxX z?a6=>%tmen8VQVneE3wj6@*R@3_1fal19%#P{l!j*TlLq7|8CNHe{BtJ@@7F#T`8Q z;@!CFm>6edza&hkpz~BUrm}YG^?HNNze5m|mU)|6bTxb{6yF*|4+go9O?)Lz zOYM8Ob0j3hcKyapQT2ugFlOyR8Ng9Gd(usLvyLL$q6f$(!&?Q|;F!2c!KGA&FpI;! zLrjQ5$P+&X$)mwG7tzTLHS=++^U?Z@0l>om16HR7pC=OMs|_`B%)#1;lk=yd zttjy0Qqg|V>F$)GyfX|DMc^(u+`jiHpMmNp3NXv{t%uW5MS+R{4L+%Hg@2-I4Pe%Nda zNO1iM`9T6io6Y2BV>tcL>)Lgp54dP6L=Xq5P-6z66|?07#MDC|-Dpx>qy2tg2)Q_< z%R|7x=&t>%G)7Tc40w3Yxjs;x1G$Og7?mzql(s&QaTOaZn020*w@F4X@E}{exd7J4 z$*}rOdK55@;dwL)6_w0x$W}5LZIL8G#fv|%n^>KN4*fPJ#su02G^;^_X7KaVk%CM7 zggL(tnTaVK0Cs_@K>SV-D*#hOFca`WF2-O-`qAKqPDzoyfQh+IERF@p9NGDuS8BNl zCJI@+vh%gzEJ)S#K0HD%3W9Hf!HrqhD>d(_ij^pzi#aO;*}<-dVlFEwE6V4*N^^b$;@v2yKZEe}aP?vSlfS1A-LIE4 zP83Kv35~jSmLDOGzn`6+Wr^8oTKV=x6+vC|4SduN00(=l-^poS z-N8QUD%f5=%qE&X2;wgIxNO&ftl^CovpLydJ8kiNxr3n1e#JEm% zwrLC@_X_osR%Hn3+@qcK0%v{yq2K=1>mQ$RD5S^tXI;=2L2hljgj!^P5)}r_Fhvag z0g&6bem$5_lh*GdhpnFm#2tZki>PjR-8+OG3U)YCRb+-spiklpV1)v42I1kTwofgG zPWuum_WEJ(Ce4-Uh*34T4h|`lTI~8H8+hEFICtlOF+DfXoJ{o79#Rl zSl;_pZCYgo(ken@Fn@YSc>Ihpb)FrvrRT-dWNN*!8VH^`60@7V=L{VQ!@=hj_asc` z9^ZOr9QuJZ*t%(|zz@66cHdn3QTK{ytM4QVceFh%EG2`CG@+_%W}C#W(0CDzV#@` zR#c^S6x^Ky{MP=~Dy%8v9>b#TXxC=D|Jtl4ywIgwa<)A)E{={8alZd>Xxcv&^5(6^ z@ft}*e>MBoMNt6z#3S`%MZMj+eg4)tx>PXpo^R5CR(-==+DfcIol0CAYO_cpn^BJz z2a5VAfg$00Ei-ME(DJtvJv9GP{vF#!zCl=rsDl+zQD$$}OKn^WPNGEF9H7HjZKPSH0ML18|7P_##VixTtF( z*E$nEsi~lTJ1A2P8}R!AkdkKK(TM{SO4!dGuqoTuxuWrxyTB2tho)u^7i*cvz$l+uU}(0G&l65 z?wy`VRciUe>Nf~!En!T^TjnpW8B|vVU+-HK7^S7PDq8*ceDVX7aeF-0jKsbiw85L; zc=3#mbrD_v!Iu65@!@nhBL*Vq%hAPbw~xcg2zBv4%fI5Gp<0>@OdPDZYI$^MUo&`e z0LO)$>1a$DZX{qNMpi9M;qT>+a+J2HmU6fNiW^j?^a#1!Fv_)&^!b4DthBol44v2% z>Sfkc!KRXU?YN^GuH+~xTUSc=+8w63r)1USb2d4Z+-p!xw*GBPYGzp~A0z4YSnyMmp|#l9y$I%BZ%w-32x;N6mU zWh%{Ivi>mF)=B{%WkSw$dz#3;rlX{qZJSR9|2Zs7ETH)GR4x4^EdPc%FfapW5U*%o zetWD>zv5#4TN;V`u_>&^M0w30OCkJkok$bj7?73?@OL(OJsk85;xHljIUq8ZO=uTE zH>>MRs99ms<4-oaijx4|!7;s+GcwxuQ=V&^+gC8h%Mo(bg(mBuPwU$OFttD{W zlaS0lKFv}Ne1&@b?u>VOz0<8H0G$7uyucyCUI_mSuBCvTUlZD7{!>BGgnopoLv5kX zu*o1rs0%a@RzY!X=ilZI_y`BcLW2ldo+fm`^qu$sEMdnaCx_%v;sKe!1q2N#yT=Kz z=kDC_M?wLpR)+1fKC~X*o&JonZIFFA-ili~5u!*8_c9~IocX*HQkPFU{!Y)tG}-E2 z5ub>(@q1rH>8V+=e6ysiGGR!9e&tz!T*_z@GGOZC{;B6gUnp0uT;}PebR1!Sl z<3NBqyLA+7Php(O;xt&wdExr@Lvc;+D3`t|2IWd}jKY-n>w&5&+1o-t&SPU_^P%)D z^qjakp>75EApVXeuSyPY{-(#vcGWgRuT1Kt-ZMWdEAlu^?Gx=T?_c_uW(_ z8@_l1i5xR9U}_8aAEM4ODylYM*PEdQ0YQ|K5RmR}cmWYf>F(}s*aL`kgLHR;bfa{a zbhmVO%$aYUbJq7~{?1yn_S*BT`?>Gy>iPg5Mg+z{Yj|@Jl}#Z45(z0SJWVI*$R|EH zEbEvN2eGd*p02v}-;-?=9Q4%BNiImX=k?oY-un(;_fA$BjoVk2@HZZ2DvBKG%nQxmH@Bbaw(AaNC8$W?1BPCZov)e*!ZbWWa zGm%>_B|P5XvB~k_(@)IsQcRjIeUFlQ*@fNU43G!|1Ji#(8tWs!Ex{Kk(_?+QpG|pi zHOh<%0)TV~*-yhzrTw3$OQMks-tuAm2Y=SAlAS|OT$ugzc{7H{{-)|#RyR)Uf}myPE{^NxLKEkam60?rRmes@ESc%f`|xsO8m|S-g%+| z4aooF*>IQ3_(Foq-zZ_5;w~aZb9km?-@aRDOIm;ZnUDkbd$PGJWt%as7G>p0zU4iHr*V5`6LZm-PP6@pV;b2G+h%LTO=53UCkjo-RQAFzOZ~23OVYYp0f`Km=i0P+M2L+U%z}d_Ug5!*n zZOuDgWcZCv1S%?t0V(!6sK^EI1FeIlD1d|oRDwLdlMS}&v)AXEfx|=+s;^?KyFUhZI*d$&;#d_4GSdD!DQGSS8 z*sF)Xg`Ai+iy7+8^c>`BuD+bR(reL+D2qcES6U!qOhH>xrdHtmhrR-l`LwA@&2t54 zYM`WaTKTs@!ZNe+wBK2SSkrD>|BgJ4E9yX6NCm_I3#zdWZ15of2B9_B=ayx+R3G#@ z?pNPibYI>sUi`@R9zCvR&dF?TtJ^|f{e$EyfUm`_{rG2-;`pPD7uLucpgtk_rI2oP znxKu>GA*&+1PZSH=gRv{xWo44yEXNTesOx>k-c3xB-V3fj0#+Qix5(>8 zvVK|^{ejkF^?wmE3AT}gOg;z^dUGba#>k|a*B;Od7Z5jz_5~t1bfsii!hhHpWY+8` zB2jO=M!*1ZBohLVoW;{3_{YK#BJw4!i_yzTAH~P{X~4>M-%p(8b9XP+*ghRRqZa`k zs$=7@axV9N={<=PFnd=uJ+w)1#H6a{Ygvcd(nfiC$ct;VT?^nJ2gDqO1gjm^xm%^;SlL4(R-U~5`TBDw zHIo=YDPZ9;UF>^7eWBK{zY$FZpH#l%I8gLi+{f`1qG{L>e4$f}fCtYsD!}?goa>wj zPz_0@f%D^x9W}N1Ldf|3<=sNbv^)j4sX+btHy(4Nl}aTm>e*{A@{T#vdr!nmRn_@7 ziCEUxHKo)t1b*kyv>8{)&ElbMl3DalX0M?{;GEy?QjVAb;v?Be2vVOtF%59}S8P?Q z%x0~L-E7<&VSOJU)!Y^g>_LLwH^PRxnwv&Ea!)zZA*j$Fh^%je5kt_~(GC<5yOKru z;0HNoU>$oz7+y>a0b;O4*#>OAgnX6#n%pLzPu+{r$FVUKyhUCvT37EWSKNYxQ|&-} zztVRv-g-A0>ijK%sKw30?Zc<4D=Ac%fn!`Z8?C#h-1!7I-N*UKYQY4XQ#QN%EDR_1 z7i-5;gFSD8MuVo&+Q$ctW4?MZSTney@2V7CC#1Od!9( zUcaC57B}8jm-s%r(A6d^E@08QdHWkU-aDNB%4g~R5D75qz-hKq=U#-pUpq4ejR_RP zWSS6`pdroxC|iiv3L;X`O(8{%`J~;YEv20>nXC!^+Qe0hZKLd{dTlBXDc|huWfO9K7hL z{+&k-k(v`_2})3|e&h}B?Qnq%M{u=4K`1`!sn^;=sSMShr<3|W8I%6ZrD;=Nez|+_ zmXN&beR;A$D8^Fb`2OmrjdARVuk&QF#F>#Jbo%l;cge7RQn9{r~NQYu`YE)!4voF$C; ze2DsE(d+5mON^qEqh9NIst(AnAiNHJ#YM7Uw~d^7Vr2#M)qgOwCm!Pnfd98O;&H8Z zS(+jD4gUcz+6xAVvD&1}g+gTj3=@y0sPQbUF|{xNXD0Ce;64=9f{^qVQoyTWQUHAt zfxx)C@|5nh`>~0?CF%C|Sx}fe^Wo@WBgK8w(~WWRPvPx(D9(FcbHe80rwcL{PZcb! zfma~1UWSzXpxDmM1ZNvxf09EFF6Q$A={5CDF`Dy>WDA&;No;wfCTJzh%;#A&UH?o3 z2)cb5#vbkyYvB2bj=;?9gK~NVc>Z_p2xDSx+5XQiS7##^I7*4>5U#E#*N`9&NaoTo z6Z^VVN5Js+nB6$tDy^R=PjMUXmaa!cGV>|gYz8lnn=pY)cS?pLdP$|(EHY2 zHs|>$4FSxR-c!9Vy8gTMu0MQCA^`4B@{LQvu;li>VCRB{n%#UHG#8nJ$WABfS4dsI z&@rS*PfnrEaa_K=a7U!k73D%e?|K`Y1EA6J^TIPCWm+U_qDTZrI}6t(=Wr+SZiYBS z&aPNERLNjS&;p)a03SHvW9;k=Gn&7yqLgR@po7u%Y5X|b<1xeIF6e;UeM)92avyy| zQ!2=ubs+R~c4N`2zI>#oSC1TAG_85;sZg>YIkm=Nv;lqUop-q_zD?MSYZ!`S+FL8Q zTI;^i%`{jT_zwnZ!agwo6mj10rRYbk(r|O!V<*Ij=lFp^EIVCy4(S1f zx~cE9=K~P?jP|zgg>;@X?E;IBUalkjUbD3v1?15AkIC@VSWAr@!jDWg2XC^LVyUlv z51TVtXcXk&)!-_t@l#(+c=Iz-aQH2#q~rdQd3$Z?UY+YTfk(hYEM@pwEOeMUtwZ?a z&FDyi*3|XYEB|X%EkuI1TOs6zJZm588fZj+cloSndzS6eD*-P9h^bHsDdZqR7_0>Q zUr)#7B=IdY*O?@_D=9GdTx)( z|MB0RT3@E^9go*;iJa1eQ)7qUKdleOJ=7ie3jCX&p*wt#$zm+dI@zbWA9*wuNHf*G zQ4>0*b8F!$gk>!r=-R&g{oH78|I-d;GdemGB=ndz|8jIBb0KxUx3VRP`t+=ywc1Px z-k0X;@;+aE=4*J`Rx^_@U&#RNbomDMJBvWr`l<%oZv0F_(*4j#$k+6rtDIjoM|v+X zTz`GOPv7H>lggb-l;0YX$0ZUQBE`UZoQoc8mc{)>1Qr3W3(!?bKN3?oJ699hK)FEK zUh9C{C4fE){j?U+96Zh9koXyRcULYhcaqk$@L^mGJLu9S=Kyj_-rTe>E?E-a`U& z;A0~Ua#f@zQ{xR30F0P?=74!G4j;ImLWE~L-M5s-w;uK@c-|*Xiwvi_2Psa6lsTbB ze^Q!fDw`{M3~O)I7RJ#tZ@pg_s`>U(y|yipB3tn|mccpQ=Z?|bt{t}5bRq8>=3IbG zIz?}IzThr(V$tuj(?cw02k@q5KYfgH|{w7>})QXRF=ce%1dv;la!D5g#Zbm`PokRFx-V*D5Q-&?M(rei)w*zMZsO&u)I z?{O!-vEx1uKdTwOh+k@DvzC`78<)Ebk6XVtC(0V1-Z3y-mAHy0IN#@+AYV!8!$oD17AACQVd(%0YGZHql!iY0rR zdTWEEA!z=CG*gUk6*1;H3%;Xowf+>Xw)>QvZ-YZOX~c%pX7oN+L05l;RNSx6;x{g9 zneEsgl3MqW8j1cIC(-~;67IZJ>-J6TiEDO-k@{(#5KtersO zwq{nibvk&P@inZ{Ggq2X`L(t3Y)m3$(xlv*zsH|?5c&Uq_`&?Y;RhU<4SemvPIw3N zgL%Uo;h!#WcTY5YgQE=h_n5yFQ_=ynfQAoV*`payMOIsnC@Kb`Oz}YlWQzbX#OzXb zQ51`hF3p@>WB@`W@Smahb^S_FJ1Ng){djmqnz_idB+IXBvJD=5YlW&NQ|``&r%$qd zww7v`swX+)VX_O)-wHCd1-uHohV0xJz zYx86F?fd=)FESASN$t!Pmr}f6>^;wIi8{A)KIzWm9Ao)a6pRdpc`udma|RzdqR&)Z z0BtC>0JXkhm1FJN58u*!;oQiW48>+6<1#^;R1}3G04a^Dno-hy(G^F9czc3q6eD<;TB-jV6Nw@>&!ReIg2gKt8fq8a9ZNQE=9 z*fy)1`0Pkq?i1e3sB(sUf5t(y>lny4JS5U3xk}bkA;`T7f?tR-8qya43aYQ}a`f#< zRSvy4KY)k;CKT~(VugJkW4hdgSEba-6Ps~mf9U=O+g-z<;Qq{VBYiDUnEjSzujt*e zTH4ymp}KrIeB?D|XNOi;{~Rnc=kpCN__Ao$X;q>W(up>|sPt*oQzt#%@pb{%9Vb=K zZ%*|Oe1GP1Vx3HmwxY_JZ_M7ZfiT0z{Dj+NP+qqtrcyXv(sz32;cEJxAb7t^iW!}2 z(r@jqWM(&f^5)O8yAFM+EQkE%@=^zFop=$v1uj zVBg2ngug|X7L1}&Ppusr;?Bd`kO+Z*(^u;HcS`vJ*;#gFsf5agZ_ElH>8(p!hx(4 zN&&ZRUz~^6Bcn(PnXbY$JaG^p2F4#CDAjVF_dkd2fmtb9`*>??EpGtNt<$@>W(0H-vFJ zdKXJP$w5GkqWtpn|5|sZ&#os7pG{lL4G)_-qepI`m03)#IAO`KI=2cbSeP?6B>MZT z@$$=|+q_ZvP}AWaMA!Os->EPT?0pumUS$4j^ErR7Yc|YJnI%E3x6<$}Lmj3yY0B@X z*2;57rmZvO$zOie=cXpY-2Cmxew5wSFi9T&9!L$6yoi3UynkUzCa#N_{Fmp-{g{yZ zgKxE8qHFKZUwQlB(2^Iw zBS%z0eIkGBj~@A(N50VN?{p^j6LsN~#O>(U3YfXb{AOeO>A_AsMyc6;GwE8VfVHib zPAx|xszSk(-<)^ln4lV|_mD`bBE^moj3Z6tAxLexI@3>B^`0?5eAMgXpDiacA;0F@ zYV`>zJj+&kmJpWdB8EO(MElf<_V*Rh|0 znsQKya8{FY(+qzt@xP&!R25jq(@B-i?3kwM*G?>_!_O6;>)O?|z?I6?RZ0TK!#8XS zA1umnl6|2b45vwSm{)KfP) znzceQ?|*>|<4hlh3yX z(=)ansXk^K$lXYIsF;qMG3tPX5O zt0y17_PZ_Q=atg=QsJovFW*RyYuhzvZg1FTvv=&NU2HoY_pGDcXf;QrAJfLS^6t7; z+A+9xCh1|)-%m!Qc`A@PV`IGpw%wO=`~eiG6RuAawDoC8TOK-IdDqPFUcI%z<@b^R zxN&Z0-RgDs<9773uIqwL>B~subJZv;>zh<|PAzd6#v~^;1|~oAbJ{>sq;7@mkp^Sx zdzJE%fi~9*EHhH%8n=JyWBT0he`IWbGNf(xrQy8kVcFZWQ7aols?S;#I!=ux`93m9 z<#?vP$@S&Kv6`GXJ@30nO`@Q61_?H_WAN~}fP<+6cJQa5tv=6nj)L0h0Cyp{gNf71 zbv|4Y?V&kQN8$_;af)8@sTp;D>$*6oih2F>j#jGSlVp9>%!U|=R}a%RV0GmCg`zDd zYzv;BYiyz84t*8mG)R_TsIj>oA+?jpYwt47-LN1c@c{mO_hhBcFc3V&BRQi|1QQY1 z8$bJ3EVYG2Ki?c}5GeRsKD_o8wY%-yq;Yo0UEW;UQ_qsTJ~`!lE&aSc!Lk`t$id|O z10UQkg$>UNvIxITLcN^=U7mJet5+?Tw!^9In}(N}?9mbKA`2eHs^ z>x0{F$_Nd43jHZt(s6B_RD$st$B>fb{8243NsP`F9V7RGrNpmCrd%Z}Ui!=OK@5%b zk@bduHfOZ0C)u#He@-U+-Vu3d?%6Ca6BZsyr2LwCTrN8jGMy~z*`8c508%PA({Rot zhrkxT<2LlgkufQ1^;CaY)@pfWPCqZuk-XB#`2BA7C;iIWBfWsp{;!#5p+!qugs4rW zx7O`@hiYFKe;4nYl-RmpT53d;@qN2g8f>7Hw!|)T*7`yIH1{x14hV<9qq(;@tldog z>&vF5+XhGQ!{#QuB8@NyfKY#Q#54N9u5dtsJ)<=GwCwSE?NDwQnv+HYs z91gzF?4GW<97L{VNnKL(EniMBxa;N?zBX(i z7&X%?9#nn~Ac$l1c@5zY`wW#l{Ar)rI>!_Hb!-UwV@giL zM3vAPRB~Kft4!=n(wfNTTi%cgG_sNvemztC()W(1LUFq_@r(PH#lfq@()U>d={Ok_ z>>L8xQC%WaFCA!6_9s9Ly_^Z|W=#3A)DEHe8x&4@XtQh_8ccQ*F;hZzS2BW3llLPtwkXNq$jL}*KtQ1@` zzdo6yQV%80)4cO^cKg~@^Kc-3d$+MXS16?d@>v8iS7EP#Zk|_3ubfB|B6E`6F@m^m zUJiTIT_5d=)3*J8o*54?)!D7fgfh`Y?h@*|@>q@hsCZaI&h)OGWy8wD`Yg;L#Z*^A zDp3`7-4pDOmElsftVkfSlpmJg7(YNpex{_3DD*I9Bdd$yIV|#q&+Pok$!_!;$C4Tv z$iKcYCYu(X^D|~8_M)fFAg3-5>sRXVi4c31+munw&LQIS>ciNSPt}#<_w&^~jn;r7 zrM-U|wbAGF2&98s)DRp1J|gc+b-wFO^v!A`Mk+=)L*(!J?H&;9k4gs_Ne0R}0FOKb zA{Ty~ok#={|5jAkiGuE5;SO)7*sxh}S_G{7H)rc7eSigLQwLs3dD^vVbA^KPE?nPInCm_}M&dZB_y$SRnh+WJ>QYrjr^`HZjT z#wcWF)3v_zsxOw|d(cv(*1u{$@J($jUmZQ-DpBA4gkZy9T(n#YS=C6^I4=``XGU|$ z)?`9`hWP(j9~%FgHITs%Ilhju1q85ExF9DGo-{bX5v*B)HkPKaTsVf+p(8}aA4vlB zHQw44u7)N}x#+{+PAses;|Rb>3{aI3?6<`&itUpGB2|+b7@$&90_!=3z%u42B_N9N zB8d$eyru+9zT*L`RHid(wC)`0(~GJ3Z&HNy9$7kIhsWm=9I!om_c^`$+dBzm*&F71 z+|#Vf)Xt_gcsb}`GRK%QOSe2^b$4-RR(SKg`M&b5IYRMB{o(No_R-jb{lICtc0#=U zuMZ#_Q-|3PV>37A{RJ-?zMa8o99jpR&Ak3K((FaFm1To;( z8b$Dt&#X~a%8lfjQM2Ice3wX8klWbinJ<8*9f;i%DosUp>`@N)Q*VJOkR#xYhe1WRDWyL{~>^xzJ?>FcDHq}?X z6>yd5EKdo^?CuQFn*~jZ;Z(=?`{=MlijUIkh`%9g7~Qc%L*4&DNHtaR0SSL}S$#6_ z8LWPob+Ti!dJEJagCP+wobl@gG z>hz4;iBYX-nkw)Z~FSV022A?ZF^j@fM3CFna}g3^fns$iD2bg znA=lEz|6lxGb%GHOT0W^4jSR;8ncon>hqo-8?qjvFBDpfKGL6xgDmgRoxWN}P!>mg zwNu{>^PXsV^k2P!i<^rC=)T`q?~8t1AM6(AyI18koyEl!H@U$^gx5K036S6~DILGS4C+c>z_yzMW_I&=(W01i7gS(!d7O?ow^ zDbqMfxwV`BBq4FdS+9{s=aT;NQ$AWazRWSp*FLG4wzFivaN$7G+4EFy|5{tV$njeC zSC6+p8S_==c1UXZ0I~GHEbe?uyQpAa+r{nKsXkYpuRKIb6pFfpzy`BEMl~Vk! z9w*?@Ww@T*MuZ-+u8i#TrAs-%?{<$n5~LuR=k&Q!ey3ZRKt{G!rCs9AqkFAQ_H4yG zwbV^!llAQR{=M>5^TXWHdmhvrmTk$@w1J~}k4B(~8l>MiHjxZk_dkkuvxfs2Y+lpbg%oxz|)kyd5* z)@A&$6Z3=F{-qmFbEW2dCyf4~YCdnt-y^HvKT;->1m(k7C~zv6zyrgGSW=;>q80fP zS}yBv$BpNoox(3!b2JNLRE%*@Q2_Do44+^3x2yp9JT69|BWODAa;t9+e*Sr`Gmd63 z?LC=Nxdn&`wc^R&`p%817FA4g{?I8RZSrhr&(3{d>YBy-Hiy>u&3bXtj*|?%*CPHy zg1tF54*I%)C6#2!>)>CE{;&H!<9j0(Ly%W_w*f$$0$|m|tDkVPtZk(JF}#QT&m3Y&MXsHly<`2JnUZS4@xGMen$ z%b-m6ts>z$?BooFw04k=ckX44H7=F;_EtVs{p5-ICJ@)h|7=x4y^scK}VCZ!4)qFTf_&0ZZRy@bQ zpPz29pYnwz>1NKyWz2FzVl@8w_;K8e<@6zhw9ko;%J64>3?(bw>mR)l>FCF;pRlLD zozj$ zsh2M=;2KtbJp$Re)@#0pdcrignyOE>bgd*sF(ikI%gN-}=KiS@Ciz(*+hFp>=Ykt? zi6GhNv0quRamilkKit(z7&QPfa>ur|)A4fI_Cod}{EizS26UbAG`VLaBDRo?{&H3p z2T1r?HypCRHK9YdIe|w-Jst#qK^ZaZPfy&SJQoy;p8!F2ndp2tCE;0NWNoR)FS^W> zAv11Vh5hBB_ayh5mOJ<7FKdK6Vkf?pD=nr%&U(8mfe?&CuR0HPX7zXR@!`I<7cqFs zo)Vcp70!CfaHQMQ#hui#OzvUrb~6JP6w)1Y_p-#^{>=)N_-CmwJ#sitZ znXU3?ACB{$z;Cq+bJ7Ytl^l|6&#*gSjxFupDNcJs_U7J`qC zqXz=EQ5@*UXX#G&T=>NZx$?Obj2~gILf@Eh{4u+PR0t6eB_Y-G2*6dt=X$jD zOJa+5NfDHc)_GmF`$v+Sq# ziLbq0>S4Q+^1L6A~r`&{6QZV(<$MUd4b-3jN=KxFCxc)PrWS^yek;N%_Ikm0_%K z`!Tq;LyaPlljcq<@GSLCI(MEBIMv~iwD*SJrK63r5rOMWnB`Rhj~zT-4bL-jixIKY`}`2om+9x>9RT|7X7i=ha`1$K}Q=O~y&kwo2i zzKyzKjXCmD>gEIn|Gfkg^CNFc=(kx(-w&Q?R|4Njw(d)}G>F-RJ}Uu?A5*AIxvPIj zpg}v=%k7uDM_v6q8T-T?6KA$69`Cz-;M$t2;l4BZ*cvS0tspa3@{`2O4eB1ZKf>3& zCdW(N2y4AinRReN_m^+?D73&#*l36rQS=)2M8j0rpEu4mBLhY{Pg{28R+c`hgaeP|05gGL;E#Nf{eJIy4b&*->Z_ZLhZx40?!w9{E+h!^>PL)GA@-&iy=%w<@?q8Y<)n zxTw&{i?R3}&&N};M%2Bw-6+-nq`FeA=>qk#wZkhVNLj&@pgpHb$lJ*)GEqEEc8zNW zY<|u?vk#&GHMSsopJ1xN7ij$|0LW88u_DsY6cbi>?s95RNZWKLeFt5yk`!6yxiN(s z+^up4FcQ+xkfhFaoCq;s3`67Z^+s!ZPajyKqDhCOtIp3dLBC74$|e{02@YSSf#%HP z$wbs)5L~lf)qk-+H&rgjf{nO{sn*~BDwCStcksH9rneR8^y+we`Zp?gclTHuJU5_1 zx}5RovM1lBo7rC(e(qPTmF~pW^5|QfvJk$I$?(|lQlzGK;zwdFU!IwGFXn#Ycha-x zsr-31V4}FzgTz)s?_pG3PGyjbIT;wbwm~QO3O>GU^&458x{5f|`GzDQXJPfsl`UO* zr!)4QFsciQCgV#u-AY^|^eN>Fkt^aM@1tF$XFljwI*+^fEORw)PoZg%X~p-E)WI1l zLPX~~!EapOg+~MvVNRu|-Ua?4dlkmot;~*as-j;IT!w4u@=?gDAU~M`@9gXq$)ewv zI`9hwi8Wj7S2}~%m9<7Q=fk|vm@S5AwiCYt(B<@_TOAP^UxhV73Eu`HjKL{~!BvC2 zK2*RZT$=im&){oy%kU}rS7@lAy{DbuYO$S3pO^(EXrAoDj9@$@g^z;Wu!S;xw2e0)hg zIz1uvKIWO9)aX)Je;Qn_6wqvDV<)>V4J<|$bIF&eMHLrJUGA7{7ei0J#fKYPb)wYL zZ}Q8NV_Ccr6#l?9GaZMj_{UxpnVI0A%W&!yI%3@{?eB*koGRsx50dSIP7#(YS)e~} z4~j!13n$rJK-?1apm7_TmF*sMbLsP(ktwVxvHRMJiA2e?t+D9K@*n)7!0L}0C($rtHB@f@?4ts_0IG`xFA{*&<$sF={FoJ!fY>51 z!siLVnRnQ{>TfMd0NRTviYf|d#19X)Oh^!uj>&y3oUezSow4mJa_#TkNYgOGZq-&i zn=CtKg(kcTF1gl|6-9pBEK<7jIX_`rx^9w2XjB%EY8R6vHNt|WJ`RCcoqyk-$Nhpse zILfjpaLxhH+=9&Y@OY4#B{ZIX>POZLQrsV0l#5zh)sL98C8mqs!zw?+kt2-M;y)?4 zY`#q|%;xH2loB24BanFbhLSBePE?|>o$!Fq)%tT<4_SKEV!rLorwkSy2akIF`c;Vx zS1LcGc0A#zgMxT~>i^~!T|fRezaWR_7if_+svt4U2<8EYlsdsc9$s!UD|lZ*5GDzu zhe^YjGcD?Pkpi;6LA&*r8XuDS9w(@lZJ@xMzY-KNh8$6+3ekfA=`6r_*dNF|gsP*S z0!ZHpkkd~ZGKYhA#CCEdM%HLVwCrPjmsU%jDi#C<+-7;k)mT>U&TPHldHvxlXjU+QVwNIZxgm1Y*F+0Z)K-g%X9?-V8#!XLHcEzJ9Jfs-hAM1pSB? z1PVmI4nfYLw!d~;-|&yT(zv58^_kHRQzxLY*e8sB)jS;&gX2EK)?@d4U7^QDv$v*? zgOhiRE+@MfE5wk1xU(v^Q>6GSBX6x|Xr=24FQfcJ&Dh_;)U~b4LI`vpK@iLgQ9(z` z&bBI^rZWADxiu>jR^R{uFgbaFE`%UNRABJi2Vk8Kib4VyK)UnkfcYl$CX^Rq0D(y~ zXG z59)=B3o-3qwOE_Sl@XnSK%Z*A;02|5nIDnjbC`RYRum?Or)_ah@%&>)E@PcjrImio zo&i(OTO;wcp&0jt5(aU>^1MMSs*F~0jk!kLKgZn1XCT<69{*BPSVa#1T!p-Z`+kbL zscscSqm2&C7S%>81jD-6Z=T{~Y_OneWlL6j%n^F6NBWhf9n~|5k+(NM z7a#(E3&Cq!@P&&6h&Txq;wtMUaqcVN>Sn2luG#p&oBBVyOVo#LF=7v7#CP7)Iie6k z1IVEQ0<;s+1E2LLTn8^J8XE%+%RdS_rB!}b#STalxusbtd`MpAa4(Ru@eMN$yj1h? zV=f{6)a#;Yo7&P7)vb-u$lp3vMKAoLLnNMk>2?2zm$@crgw;R0#c`_js6u^_{Qmpj zSCJk)@sgW9baV3I&i(u6`+{h8O%2K%W=s6)2)jYn`xo`q7GBbmPnrg17Q25;mOP|v z$!=ryM7UxgskDr8zB;u=L!6_U`CKS6LsqF04JWAm9kL$9(}-AzsI*W!W={uaghLY( z@qs{;fLRO>m*6gGuvFX-M_i&|%K8zp+@#C%%V{rpfGgWygzVNbr!e}s0(o-W>0Q=@ z@KvrQ)BF1GQc5BnnQvW@h04+5r)jTT#&jG^p8tDbOI!1Ni<-C^Fq z4lKWGm58_PNuS&{h1f5GtC9xtj%qjdU5)Q9-crWu+RtuofA(5M!!Yez+qab6H454h za9slB{|p9P)!*GeiNqFB=By=OuDoy6Dr!rY{maNusIq6br|!$db@5Ibp#a?~?wXez zDesFS;x4Y5^Q&s{oG)%SDfkgWcM6398az-FOxn%+@pQzXfWe*uJ0&&KF7}C!1@aSK zVxK>Z0EkrF+h9{!r;e@%xvxihtT29o5%L6RZ=9px=xP?W>a-&)(iGz-W`qbNzzxnyhF{beby-w|CaS(Sk8mMty@@c&RJI2v zcSoJ$H-SM<(Kimb0Lg^s1h(E=C_)S}+{%I2+69m4fOGim<@SmE+-4>4=UD!t5+BQI!dK|TTJ=JO|V>A%2}rU2A^~>r8N{1?sp?=k`1d`NQsM& z>MHO&?RP6P$<(=t0)d9Y0gEwvzl8jFRgSTqOtW2121{XVyf{e$%!GypN?h}s=z$!t3( zzkq^;Ef6PK&2;Xse_eMTFSsZ7&7Lk(*%dkcL4{31qyVFjBTHiZMDvZC*%Ybi2u0Pa zAG_=k{#As4d9N69Q(t5h?eZsyT@NXWyBrZ~+uZGtZEQ+>{Xbl(AD5GBx;DN{zAYX{ zc%lmz8W|g!B4k&s4?*CaMe`W4ZkN)SBlo5y3}?ywJ+?_aASUp#;0j*8-@!WKKleM3 zgh)c(ex{hDsvDIq=|8=GG~DS)I+$7eSSp0w*r?zmD{QW-*?;cG`#8_ASCw*3q}KeT zgMZ94f+6Km!)HO4n5Si(R)s&4935SIN+>3@oV^Thd*G|tGxhu)6OL!zlp23{zIbDr z_Zm})jfQ)0NLIRorV1>w7ipg*1)rI*eXE|7u>0w6NA*)iI@YwGCoMD8BZN^zewtvO zf^3{Sx+QLd8<~H%NnZrNZunoeT|Ls{wx(2f5aQ?EetfaJGR$ceqR|E?E>Es}AJR@- z6xFXF54Uv$T~eQbYIHy`+SUlGQ}fv&4SndhW+oK92o;Mn3WQ`kKswN4c>EDb*E0bq zrtBLcUH})3)L?}df$&u$;umx}QfA@!v^5v!SlKn>`c9C^#xy#$yZ7hLvLUgpu&2dh zaP(8zvq0nCu=znh z&ZM(hDF=&q;3FrUaHj5sRBd{BK1YgmZ+Fo1yXB%h+oWGE=1TP$UqMnOt;fi!{R_47 zaP(1KVOrQ>1>vWKy5^Fqpr;Dq&8u;)B&1FV>1V`HMT<`f{uC0ChAs4Aa^mkYP^1t0 z{03dM&0L8ys7CqBOKW|sLS+9lhP*MrSFJZ)3Soz^f{JW>(hG)apXa?^=TrxZzEW*a zJQm=Q_kAOFV$$bY6B3BR^-d{r2Fgor;M>W6f=%M`Ygl)Gw9ZGvvDvlu-cAyhoz(1j(VRe^)WY`oDQv+*rH)sSwBZu1*&ynwR0yFFszhXHNHh&su4JxFh52 z_FGS+aiHbDOoS-m*|1G1CYv{VES%jix)0;FM;aBJx_J$93hyqYTeetM2VYx`V;ntoCjP0P?@s&3CMh87xlIMs z0no=i9rXtL;$33Hs9Wd|)SVMPY$0s;v1jA?3T=A>16S;|kn6EC-Uf0nfG zVOFQMGuAuPH$!`__A{5}_pUcy8=#FF7!~;{+jCe z-)W)PltC9F<=;Lf3wmUlO_chyhiTq8aq%HJc8kUHAy~932~|3RkOhMHJ0PCjbk>I3 zH3UB;gY>IQmC&r4+||c_R>uUdL|9E|RSNxvx^_Y~(JOEtA+Q_d447O5xjjY=xZE1m z-A#LmNmBJgM2oF!c*^IJQrU%FQkgE=gPCa~k^H~-=BphHe|PWJ1k%4Yyc-+VcE&9+ zsq2`pP>{6R;+Q32ZAJ6hk?fXe{IBU+z)^lF5yIMJW(tocRY8q6S|JMP$8%SBkVe zOw&}(2hGh*KhMAfm!nU+ohP@MZbxjUKRFq}d(AlV@t;NwPuumm4$8zyrJ@J$>>9cL z3$<`>QqEJhJ%3ueJ|I(wA)?2wNBA`pxol6X?)BuIZ`uo!TR?w4Hu~iZhZdJNG50;^ zXngMCoxN!wSM9A2C}b^5p-1KVM)}GweKC)}^`z^#;Ar#^|Hg^-O`S;~6K=&lT~ME} zMa9JNoL5`s*y9lcD?470@^iJ!lGJV*+d+Dug!0%*tWx2xE@9TSOhR(C-^nI+$P!sZ zP;WP+_u2r8#I~Z))n|cV(985s3?!wqENC~J+Go(zS9>2JK@$H$IWd1}VTc>Z)W8G~ z4&*6_0@fG1rbI%&z9rrh`X9vtB6(oD2NQH|ll(u#w!T3lk;jbMwxWqd55H}2#C!jA zci1U<$8Cc&`0S|4LkR4sKIsgJTUQx(t&-0tWhhC&3Mk&6WPJo%(^ECP^bSmiKERZU zg(!DdtUm0|TZ)ys??6oFT1+!09-kKu|NEAmw^pP|XGxBV6i-qA1z~|S=5wBwdBNVh zbO->IU#>e^bFmz)X>yUY_DP#-H*i~iL95B=aM_cyeCJI`rRFXRdWAQ;{3jSbY4@^S zxD_MAKbGLu6xay9y1G_Q*~QqXPI^=RsN8cTEcU`1AGBqeFUMSbiYnfV^8pu%3+?U8_4fF)O?} zanrEeeZHIo$6j$ZRP)ePPc@>p+vkAuTzS9Mw6+9tHHI~&@H9w`ne-#Em5KV0{lm^o z?#+9|N845ic3m-6_S?_X&^Fv)vsgEv&3f z=zIn#hPJ2?{|`}T;T2`ncKtz0q?8hAl`fI)MnJl|LApC{5D+D$yGy!r=n#}&7+%T3GdSbBOgx8-XexaQ=}Y`4m(Bo?p*4p0Qu^M;Wp`1ea!(NXI%*h-(>Bt!@un1Rpm^M{fbqLt zsbTvL47te`5?7k$DJDUIuA?Ukk=OC#wKpW5O9Y$0dXEx+{T0RZpzaD`LcQJlb(< ztF`kpV~AIr4we96Bxj$y%A|Omh65}kY7S=osxjbnwBiy;Vjx%d=+~#mZ3bbDn0;GV z!Tf33pl>f>NHO#LfDQ^~#^sP#EIvz7J3;Pa^!I3;x*(L({N&TTpK22rrHAI|EzJx- z#51h*R_hWCMjNga90MfiHR2wlq#!C} zEM;PlwG0)%=x?Nq^6by=F8AVXS^p_fJj30aZ#x+3T72^%3>OLB5Qy0@lo<}Kh4U@h zE?cIereY$caQ&4~D-@VX&n8w4z6MyREm`Lk7+y((GbN4hdp}0pOI5&y9M=OK>hzBp zVd_eoT1^!`XLw~)-`6>j-(&T5z1xNr)QgIVDQo9gJ=X@^YO5glmywlY;KLU?*p*A> z3F%{ydJ!0~+OSlt`vbe)YSBCWUPX9W=P+HD9c)3OoH~;?lHt%b44`e?PzKxm430Uf`+;h&Y_4AcfC{ezvP^z z^v?%${A?ykY%=93pYU{{VRs#@sK`0hpy@=ix+f5Y^)@1yjS(m!*Q8BZ+oZvN6^|4> ziHvwv zdV-a|cPN@m(pC5w>irS*?CldN9N-`;*I^v6G=es2#J*yX{_Kz7MSGq!B#(X;a21?7 z8uj?#5I-Y81WM%kE|06AZR2LflegCOI(!gNJ>!CvN@ryky`(cW0yMBSES^&X>@>z| zTs5S#^_FtKceKwm39IRSbn#7Ungyp_`~0#a2%->pQSu#K_@h?-%Gy0INz?k>0*Z=U z7+UO>e3j?(VWCIncv_Y4X7P;C$FEI{YH1FbZjrXmaVoYz?VE*?Y~7PTSiVbhgS2JI zN>0=tP(fkYf4>Kz@B+VHV>EKT^(bqjEgM-6=l(N$*ka7*1`-XNU7LWgQ-A`jscAr{ zAmgbzjw9W@5BuZhAnGdit}dtFNYty2Hj;m_R?lri@rUiQOeDrU0CGws{!V;|kyw+Xcv0riRL(paj(j zK&3PBuNIklTE%PiB?!^~iqpS1OKgA~W}tOPn^o;tD@|nVJ#8hsx-euW=PX*c^I7*U z?Ho;{R|dCuJ{UM#G>Jd#TUVX>`Dd%U5FiVVo#}LvCU6qLE0UEC$&3@Pq@btyKh>R6)}BS3 zLZU+8vvwhkS6q&_#^-<9SF};DHbtuACj5NI?5af>(N6WYkSMIx=|M=Kt^(}{a_R^X zlLjPZ4X!SqpI(7QP1rfVQ4yDnJZ6Z&s_*R4`R7EH*TC<%0VfYPi=WS~dUGPMm>&^! z!S`;iwsFIkhGrbU`X@Xl$1p4tkz<%uGYrx$94u- z4R*C(GPo0$(akd3_sH6%^)f|J`8(A8B=&MjkleTe&Vk5`DkSVDn0utfUVBbS12Q1so^ z)(C~|q;Jw$N!*1B<4NZTC#$-(cvx><-t%p$i0@vdn&(d&sRTUZSBx!$oD7o>Qd-l? zWr)ETZa(t){;|tOBI;2O)cPH<-_OsiLuU(`cbu^{S}BaexgN~{c*u6nu$$u{=Uj#RrlCb zB``lFIcBBfzE9jES+wQRDt(4K8aD8}2;kAyGzh>G^&C43k4$h?Bksh=`uruh!~0!b z6VFz6%4wr@(_>9RfoxsBAst2oZ!B)_M>)p0zTJDq?xpWEVG(Qvx{nL365UnWwrW`h zci2b^!Z4r2zDkY{tZ&fYB|Vf}OqtqL0Kch4vn{n0EhtUI0_GMdT8k~@N!fF@XUXe5 z1<(#RZ4|gRPOhV6W}T%89@u5_0JXv1 z?eRxW5t!P)!87xc7dp4SH@(YpuAhwdaI>Lx@JHLWOQx^C9LjONpRfuOb4wmEHs~CW zGaqS}bm5DwfYJR)ctr$oX<>`2e$g2ufeJ0AEJ-ErvG(AywoP4+-$?$>e2&Ge9@@p8 zmBX)TxJtbj#BLP}B}BbY#|-}<3J((4f8I;E&B}rr`9T9wL+W|gNScz;pm9jwL!jC&{ zXf)c@i`wK&UOHSSZ4u7yJ6Srwo?Jgzuu!>aI)DY?Ppl=$lFH;3lQkm zB3eBR-bQp}CZ9h@r7?>Hsyz`7ve80)T@MPPxsbmsIOC#7^kjPUQh`ciu4Z-6J+@Zi z5{cZe?RVCBcB~C(vOSFfW$j692Ar`6+a~(0=y7PfJ2%(%O5=U2YmLEfJkBet?>=%t zvkThQlg$(5zg7;j{Eo?F;d8EL7!;-prR8wSWPe9!Cvs8HWh8+rl-ku~E zwp{zEaPwPHDcL01!$65>gfwVX}U zTgA@&P&uhmaDTH_5P~wgZ*s4T=I>~Ph^l><459v#7#-Ly#d#H}$|uxf|H7IhYwXqg z+#Ux=%b}ERJ2yJU9iTMS#t_f%Q>4vUF`FIZ;VFxbfJ%Ze5KG5guBTT2vL7rQya&-Z zNW`?t$W+K=Ap1PzW-YwHfxQ=W#Gc^J`(fb}gFCy;ha;Vf{l({kZMjN2K^`x-XSav* zR$VW(eH$b_LLl`Yb;c!sOISJ9ycyYzu zrax59X9o60d7Dr@9K4TOiE8{%vd4MNQxV!g5O$XRprs)U{0tgZE|R>_444RUGtP<8 z%x;Lu7^5ze*va{s@I8^(!;bgn*0th$)I$qf|Ftl$>}~b(wU(o*|C8qLxZMY3ZzbCz zi#MHIm}!?o0H=Jw)2~0uQBjb%$NOil_>IY`_-IeYqCAE~Xq3=>WG&{59aF8aL-{MX zaTwNZ_Rh-+PhyU(!>s}eaNoC8@F`;!xbI&QZxa0o!i*P2YF(&KL1u_@ zDkMZ*2MGu{!YH7i+7g}76A(ieY6!SgsHba(i%|M)pXQC9^xjn!PDtO(Rh+ihUT$mh z1O311DcVjw1UNgg76&^0Czn)tam9D%d+w4C9%s{RNa$woKxquXTnYoloz{ z1`Ny$RUR*c#*4qtJsF=e-CfMhrZ(%23Vo~xs>IXMI=IDSomIb5C0yxL5L5pVXZyj0#SVXI(R&z_^->)J z4?q|jxMgELvRgRxwk<}86iL27Uksu`o>H z>@994_Fmhq1Nz(5Xx@)?b`69k6NU7fXq1CDRQ5f^oz~L66wY=_I07vUY@T(QA(=k1v0EHGe^dfJn!qEMM!QDl6h-5uz)2ay z#X#XT_GKY;BJ{u;IEC8sR%byRc;3>|*SvPUjphMb?nuYuaI!hhdC#0lz$0hyv-S8&msnUq?X!QtDN( zZD>P67DSa=c1mQ1k#xEAUfolE6ytpw_%G~!gT``J=F5Dex@Kni4*8>5yz<}b^#XZ5 zH1mw}Z<{MB=;7p?Q zz*gL*apx(R-9C>3?^?!)65sjg#te;XIR7!X63ORyC5t4IxXx#ZW}sdzxQ#VdYMJz5 zU8~eW-tFd6nxLj}t$^k0QmTAZ=Zzx4V4M;`?#02g;i?{%z(PI*l*L z&_ddy<5Q*Kf!y)xv+$k)LF9LO1OjfEZb=&&axy7IXV3pg&$tvr>Ea8#N5F1wC=C;@ zF2;*H)=n-f%zMOHY0WJ2MPl7j){~;BXT_Jm4h7k_09~O4ZekmG zNYj<6t3=+_llQOauU2z?J3A+WICcEJ?r@XwGviVQDSk0?=wjY_#q$&eHTW@(V$lAMYHR?UwD%*L*1*wX1+Sgn}ba?^K9PhSfC!;&SRF zkov)wP2e)Ly)cX%aOZjlTxEyOHz}TmgPR5X=L~Mk_ACMT!Dz3?9%&276QKK~U2@Ar zci`(q*pW3o@@&dE&yzXfSETDE)aWrEB|@oJZ^U~K8S)%9dZujD>>vt{x@vf=<4TiT=@>jd6(uOdW_O@VEo}!-Iu2zzxD%AJDKoRMk!U&8;9JqKD%%EnzjG5ce?cZi<)aj+!xBX;X# z%_XV~&eRH2&AzNgJJ!a9sb)%Y3}n-A)CI&?L}`1)pc~4Dyy*@E1#XxwY)&_HI5tS{ zYAIohZt)?JBw-^2V_Z;IkQN>r$aIgtIndJ1^EkI{&#M*Kcim}Q%GaxV+UmF(6&CU1 zp<6wFXgXfJKYMI!zeYPM$YU%j&fYl_P zrN1wASgEDdk*}1M+-v0HK6`6dWUuN>s|xjLZrp15K;zP(%x86$e(0_sMUqS-G__sv z$$u?hNY@uo4AI`|+HusJ9Qc(ht?DaDUGD1?N2{&#H7$!lJMZCQs%OlkdWmY(m8nx2 zMf9s(T6S=Yy0TyAQ>>Ee7v0Y;@Z~D^FVo48h%hOk28n(iVc$|0)I^i202??BdT}`6 z%;cWgx>rSk{eWiBV zWwIkVXQ40y720UYVmD9}uW70uIG$E==Id4d%eaY(L5;LhWVTSU2D?bp|7uNVDd2>` zk~n?;Z~z%Z;k`{Px>*TglUK@Qc4MoDuM<96B1-$H$Pj&gh?#@~V(f%}!b1}kK*}Nu z!~t+f%R5upVoXClYTPHf$1r3TRybWui9=6T91j7^|kEVS!Xyt3>IZ-5xbC_{AoD;awA)FFYCtG#10s(?HKN@ zG~GBov*jmdlH)YU`uGjrs9H|PlPYnhCbExTZa>clfLgw{zajyFc=6@sl%vp*;9>HJPp zAGFmud||1}=p3(xwBo@m1yY^*M^f#GBDC&!kgyIl7SbF!=r170oy}_?S@ij9)UM!Q z;5rBaf#?zhk*oiGf%Z}tRD}-u2cTFX@qW3Y?FeY+2FzDj;H;1UYCf;#hm2^}kYcEm z)}CUnyHf{mxsKdsiAn0BxaO|Q5(F7TUp)N*hyjzIWPCq{pK)u_cbYEVlKC!&6)@5)hC0pa&_s5FR>46P;6 zkVvSI@`scwUugbFvRtk|b|nV=@(o<1> z9feZm(iG3XdmELge{Bbw3y)~>@VCZ=7e=Nh!vz)Xl22PDP%Apphx{G!D<#r!AQ4P& zrM0S9V_Md~SKQzM6zy}N^;Hw)ske?Vc|PkLCb^J>ze#Va)LY2324*r1*xOWxGD&;3 zJFfK6_>=^W-?>N6JTI-N$ursBug>HMkkD4PK09(cLjlG)ubfu~n&zF~(>8KtxH zBW?2kmx~O zopm>uYiY=U(3U(8619GuSD*yCC=M=GAhQYoE6}_&(K@I#a1Hq!B)S{4eV1~vvG050 zX>gzJdBwA4lkK(TaC6~zca)&)?PT*iF+2|5v$f2^C=`6AY0IcoHH+;O9uDP68-<>(8^q?BeKv)Lh!qi@E$T$Jy2N3dZZ#;)c=tMJbz`nsekBGLu z07JWzpElG!(EFvyAQZXO@mH`>&qfmF#P?h`3KP>NT^3o3G8_Z74MEa?Xw5buj$KX9 zvY7flVBD4E+o5A3=qZePLn6YX-?Mz3n~Vbb|z+WYG$D zc?I}^Mu2ZMSI#wx;uK}78nuOkie@Q?#{63Ho+ama#;Br{B*FE3`>4IPjqNW~c^?A7 zK=-T21E)1S8t)IvErD|rwT=|iVV#3SyE}+KTXSb) zmQixqFi+q38PVw~b@(^lEoNV*wr^rYw5nCZ>C?5~*jIPq3EclSxtnEz-=M|Fy6FL^ zloQ=tn4(^uaZQI2ZHBMXf4HC(V=^DrQ0UF!D z<|kdgsmq`LQe5vM6z~yk=1F1lm!!a1BDB%)qXItqS=nR$L^b*X2j>0V;p&C!!Ou@y z6gm%QKGIR+$8LK<8V|1|O%Iuif88AFKGC?VS^6AO)jg9tutl!~;0JnMHV$Sr_5YxN zOHsMH@~~xY2l%%6=4X%5&Fq0Qr`K9Ihh>LMm5%1@7aTQQW08%Kgk?h#kdXnoBrf2 z<$WX8`A*c`B`l+?FtDR=b#;_W-HYZZ&En6^e4y0afjXSUDJEkNgI zCHrNr&5On=F!aZ7|Lwb*-FcwO%+%yl@vpsMG_7Iyd87K#FVCh$iPL|vxP1L@t0^;v zUe{(*3NlA)7=`-x5z`6v)M%#B2}hoat>_va;Zdxo`D<&-Q+4qoTo z|6;hj#cXvadqAo5HlG`dyeYf!+3WS08EJ`T@!+&d({xXmF zZ<9|iJao2wtu)%-?ua?j$&>D1R7&(x9jy1gI`&^o6vV8O_VCtf5eS(OWRqi#;yq~N zD9;Qgm71O~57l1pR}1P>Z}OT-O#Wu`n25IX>LiK^ujMGL?g&y*&J>a!*-dtWTl{d) zvJHh+9VagKytf4UWn&i32nmTQ8}mErRmt|uAdv%vJh_g*9p0Bnid@I7u$ClS!$N@8 zHEyj+8}6qU#`uLa-UdX0H$4l`H zI{lyI0JCY45zmd5DgXIp9eP))=B?h~(8R`U%f~gTKOphw~nxcTH*?c%vJ~q2j@( z#HDaL<=gNxZ#eh(UdbpRv@&u(It{G|2sjP~7Ay=|<#L)sX*!C?yPFB#pu3|GJ4?@C_o1NN)6 z2N#eXl{Ht7L7%v~7G^!v)#o)_k?+R#nvJhV{|aWy2PhO1`EdVUSUsFrf@;*2m1|ei z1MKM2o3|75Q8G(4Z-XTs%EG|{rQCkF$(jC%48Z`tu@{%RsQG~qSok~ zfk`8EuuY&Ula*QDJq;aFyn@1l6F*y@OM|eB>JG$_pvWc7lz1h4zR_ zhB)ayK;|puk22?$2=sh9VqE>D8aHyECl;B_;-Y*6m4c)=(_aJL{wKA2BbPWBjSpIt zu-@fvN%i2qmzv>UKJugkqatzblYCZ!?%D70#KktNMY0e<=f)HFE|F;fUJ8+Ua5=u2 z<-bm{{(=I}|EsftEXBg`l(J35Pf&rnz{ZQiWw%QF$d)IX6|JLPpS`WjHOgec zuRy5X-~bMzvI5ehM#Q0oFxXQ^;{;BUSib%k!e;Y-cgW0HD}upV@wssC?G8=YLerdr@{ZkqCMhoUk{16Xd;TgyPFSQo#A2+#x1g2S$%#e z_t~+Xmgo**rZn!xhc_lZ+rm`gK``w~&G29r>Algz{q*B-a+kQZ%379Wfph)m6h+!> zf1zj}0PKFTTXavIntA@`$ni4c1b>?3^J4Olxp_?r)f@*^^h)F5vW%hd>VDHoM_Mld z--rE)H%5;ZaZa6wzm17oQf)3ydlmOXgPCxQ8$~&=v`1$jyZ$8owogyZmfwZI}8r)7EGnSf-xuPYT#CbLPeuerf zGTz}FK5(q{?W||@7?x*sa7#8lg%eM^!I1+;ynwh0;g36#!;>0l6>IY6e&2I?t)XlD z+R~V}2ZfO#NQ%YsW8zvUpf#&)#4aAh_QvHk**5{930%aclPY&{02tVva0toz`|kE zo?y+VXl$EYww#drHhd}NGWv>dlAg20w2SfHG?>MJiV@q4e@8H zkk`|I7oZz(&}NTUXxDN?ZUR_O0!p z?4ES`m2{2^cz=I|Z89w8r}Z8W@r$fh_w{aN>df8yrhL+X z80(U`4GZhDI=zM*eCHr`sbUNK2Rr8dU%$Xp7LUAl#a{(e8G0X$6@9obfAv^X0tdoj ztJ?lt`XS1hVxL4v7%k;{5Au+&3*1T4GfnU-l)H>{CSkD7{N|h8UlNsek;lWMT*X;$Tv+PUJb(Jwa;p!d9 zP0?4R(GCHbKfyf`Q-cR}2JV@)k2!T=c`M)GBJis_67Pg0OV>CBFcly+tv@}3o3F=p zeK236Ae-WcjfqSs(B`IKvdRiCWNLdDT>O*7`mmIJC0G1bzErO1_ngM{cR9_6ggQw* z73EeXz@o)%9Xs4h;zD?etp&S9AEN{ zYfB<=)62v6d)gd}WKBRIXS-;wNDNns6+OAO1_~pPn@Z>m$@VpySdN zm7g}{{%f-5`4=-BH_SIf(n(?QRE;P|ACEN-p|1FJGcJQB314tlr=fq4L2Ftg+SD(Z zUx22EbfqTVwDL^#k-nz=&0s7#fP`@E6vhdhe*=A|ADW?m_Bj9&Ss(qH%Z2mdY9mV7 zln?wKP9^XTC3Yr?&BcdYnZ#A|Ru?Il?kYSdF%MFHcq{qWVWdJYZO51C0eW7qozk0- z1np2Y=Eq-Yxh%~Ym3dMm&E;DBNXM|D*l_;yS3BmFujbbu407l+c=GMl4)3jGI=>{C z2G*jQ-tU_k8Nm>cN@pQn(C^n@wa!`%BOGzd?{xxv+mBtBgmQ}b28rP`M)G?i+O|Enqq+{zt!RdhBLi1tWG8 z1;!xuUz4b@ALC|P>|CYOurperOBkc!Ri!Qg+JvP4zTqWde?TJlC3=PjWu>Ysy`A^(k8HqM;UY_c*zjqfCgf7S3IO{BGfh>{-}>K*!9 zi8^PEIr&DS2Rqpn39?M+7%ciYqRWJOvHq2M!r@Cgw3(*6F2v%TBz$IVmg7ak_2*CX zjottS9H#%AW7(@b>XYtV{)$2Qx~YOgJ{~OKP|?qc3(B&>!oc!+0qW@Rygi%)Pj0fP zkm~v2A^z+@ZxBT{63AxV7}U4j8?vW^$iY5YK2_-p?bKY1{1Q9%L6CBxD-Xr7@Wuv0#N$~LM49`&ZF@Kmi0t@r1<8a-*2k5j3X zu?5?Ck-2bhNmJm#-F%XiT!xH1?szL++E_GA@*Yx25P(zCJipi7X|>0S(sAkm722__ z%%*eP4wKMW+c-H66LjSnKAMM(Em@7lHKBmv=3NtI;V-3-gSRocPns7$H zZ#@3`+{0UTR-@*lLB)Vin=koa>&~ji{Oj@X>hI=%8@GRH0Xb`HQK&qoH#f|W`X@FG zR5cIj0F^hc4n*5zQc(O`!SjXGr>vn{H@3HSmo||N7IQ~0FtMlq5J3{JbhE{BFn!Z< zQa_ny_l{x(zkK2KjhW-y^TrQKphhRsazR-94i6L5k)lp7DvkFFH0^2ejlL^w6vxvWa%zcb6&>&*?hG3*TRZ*Qv`pDruF z$&o$K-g#=UPh!Xp&{~Y$q?(w5Gz&5C3-yW(Jdj=Ufk%N8ThqudMyKrA`|hq&;X$t- zj*$J2K|e*yG(iGLbT4tLd5x6rb{cv!4&C ze9L&}L$f9vQagGzd$rT{&y*dT0~_y-OJhQ=_i>WodRS2k{`|`SS&8rAb;kQ2NT941 zNgTu*YUK&IUdxKSiCU~&`%CTxLK8*%Q#;&`?iNVztw!V&d3hnydDiHseNYhqp}4ts z;JaJ7G5{b-a_@$?AgzA1&Wf1mXJOVJaz`7Tx`R^=`KG?;HUGNvPhq)r&qLpdJdoG) zv{KNHVYO@0i}}VLF{0QEcEoHcnys7JOG~qLwUz+8BNwVMc6eR~OQRru2TigdJ;w~P zqxb&aQ58@m1h0quxcD?#!>`mHa8UL#nU1pJ_Z^Abiyb!&p8lB;);;-_kJGiXNJ083 zK5ESjsQ-?dzkMx)`X-uE;?B!3<>&3^Vqcw}sOB-Dd)!A)-VX>4`CQ3A*qEx>9}B0n zhd2UXY=wBtXw+{}_O?ddrwh{K*P;^6ZwvR!34Hl6I1;+96A9K>=UzTVUoO0`4_B*W zF@4@P!xX)lj+t(^K^s;)VIDBYc?o(>q2@vfmO^Jd)^lAcRds;BS#yyq7R?O|M!|E( zNdU2TfqEv_ksyT`K_J;%n?{|r=VPMt!;e1C6cP9Q zP`bCU2G2Vi_lAKEOLpM}bXaD7 zK2CE@Hf#bWq-kv_@&e@aK1Pn|1lHZHT#6G^{jDG}n#P6c$QHQ}Wo$!*d8>~3^SZw! zor;Ud&tB>bD3WM+M9t9GuD8B_CU8K?65mHa?~Fm}e7>NRDCMsG(~rCPO+e`QRH0|p zxPRpxi_XE3;nj?nX6KCCsiu)RqXxfQ8&oNkuC8VI>%ix&>p+9|(AD29_i4#kN=@HY z1Et$DSO_BoIhijV9RXQ2unyf%qva5)Cu^H}LJTE#|zzu^BidO~fN2PWbJl z@hnzYfKE;q9f^Sng_fJ5I0M2f@W&Jm{W}sh5z~<4!f@`klDp+9Jdw~zOB|tnpBVjP z)5nF7=aUx|RaJy@Ft?9MTWJ*j$p_4i*fKayQ7F5ONUbAoNI4ZF=N=v0>Ys zf}=afk}c{%G+uV`QPQHhmKUo_ZPKS$b)R`o#Tyi*`ZeXm1}|JKZ=kJ* zs=~W1FqWG{tz@yxA(yr%$;MQN;w1`u`(ss24s~k~>VHfs!vED_s1Y-yQT<0V5j+WQ zhG_0^NAONO5o(MYqLI`QZXS?|LV^4W#P%y0IZkT8U}xD7j0Bn>b3)?9?^4I2AACXF z1*oB82dekZ-=H3LVLQGy#v;koG9p}L+=`~m^TBNQ7=vk5!4K+}HJJ#<$DiK1SHU{3 z?@ly^ch02g_b=(x$Yl0M7L#koM_Jok25wYR|J*t?^MTW!4n=5n9;(Q0r0r!|rF%mr z>W0ccm(3JUcVx=dGeYhKDeA|IFd(13fpp7OFgP=vJWnnAa?RCd`)Qh;n#G`HWyUfu z$8$-s$3!P{VQ=8T?v(o^w3jBrQLVoycllNSNOpL3&#Bn9@gpqN_55`Ixbb3wLZiQr zSV3ahVRd!{^4sUEamCN5_zvl1><9h5>jL-<0c6W7x*~DEo2~EfWgk;>3B`j8KJ@7BXsDUM@u*NF>gVpwR3NjoR4N( ztK&CmHrJOIkX6d+^J1_cbEkOYE2>rFa_Kv@+T8%7HwnJ6RTks66OhzYg6An)N&1#N#`_tW)d z)4zAThF_m8ZQ<9g@DkF+TqhKR|J2=9Wv1)(S>DpPl_~OLtY$@wejo8Cd)}YyxmxpH z)--FQd>~%E(jTj`9q03$GP*3&^Xg;9IJqlNh3WkJcd#kYZ5F?C+AI4Rc&S+m7O1-+ zNbharzmpT~DVzCl2yHc42nt5wBI&6tf&*)cl(D-8rLNUMf$p(~jEeX7i&SsWHZRZE zI@oFa&8w&4FYRR-j4rFYk*q`|$d?OA>U~=Dtl!rMZjcXdHY3?S=HE}-P464TDChM^&XhPAUkeGpVf*Am`C1L$DL2)EPae6- zhsfVZz5r1xi~XxlfjPg?Y^*i3EcC{mK!mZXu@F88evr9t5K;k9N-(_TPt}-@T&?o^ zlyLHF<_-DJRlNPjO!)cH7g+D~R-(6a{J_8yg-^hve&dvXyX=cp*taW}v-SgV5BQk$ z+TV+V?R^!TpK8x))^964euN3cqz2iZ#nLn8vJ7tt^agpQ;^9_o#gbD#hHj7 z@3Si{9W!k;raJ6V4Ef*i>k#^G7RG0>c$b^TisJY?oy|OP@y2a}9bfHOh{So; zzcKZR4L!}JWWBseTSS3SGWr;q@{O(|J=u)^s$};exLa~c}=+vzbhpQN$n&z zJ$Rb++D*cE^MF28;o>8jsvuiU#DXn$qS&;%=40zR;)W-Yzqj{Yxrt(&U6AyT7`~k# z>&R0b7yB)m;ND9qrrXa?@&iv-f>dA!Y?EjGzZ!}>mCo|v!5|RDA~iiC$+M2e!~$!e zMDz^{A|2-g&J!Cn)3Jgebi~V*Udx#b={j~YsD^%lPfT8Mbf^{AOUSQd^=iIkeD%;| zG2ngyK|pBn+MI5x3U8a9+nN&pljU8u=Lg}?wrXbbOz(>@@(7aLmN=XA_+oTX;vM#J zgCLqlBx^9rUUn_VL~QoWL-Ruu5uw3Pi;mlErE4ERc2h(k-9DAC?w2}^nTmletU)Wp zkkfQ8PWe<){c4hZ&YxD3Y2D~k9k%0sf?8uVqm@zTS*PrS@ZNZy#P*EDM}9f)fu@0o zq&f9a6`q$iiA~_L9=rRbXJ?xQ`!}4Jv31kQdB#LTEPV7LH@>($c|=D6W$O4C%v|Yb zSmA9>3^;Gq@1OW&MCJ$UA}w*un!Mx6U)kCSwc?4t7{AeY zTVFezR?)d_6mjFmI>zH}wvVtOi!}{Ywd*8H9ss##@mk{5!?1zD6{V@wMAL@NYyAx1 z_~O>oM*3>r`(PgG-&PA^@~xmu_@+c^p;<}hc4L4#s(TPay8hN0?F9;IPV0)FSwQ#3 z)A8TYuOb*FkrYoNO-!>@M6VxK9=~ZsTyhy0X?1e2U(dHHRpC^-l?XOxLcZB_Pf6XQ zDm659H{`oTgBa)+?rfH!5HHP5-8ZCwM%&>{T2iGu-LEy1+cq#cx9g4Xbo9-MVB9*| z=TBP8mKfY&4oLtLG10QKuDG_=wY%WHw0q8SOL#P^!>5}+Q6KWoV~T!L|eQ0Hz*U6LOr*yhG&t66V5)u0?#9n=gHA&Dy#2+i0I!EkBACe?`7>X!RTIzBd z*z}F=_3wyET---rs-f03_&TL=(3xBOTr4#tCx;?qoXkM7yS5wnLbB!OP zyB%54S7vaO{Z^_j{_RZKQ#nEeYQ$7);460G|Mp-nby+y^)AJkJxlW;Ud@e(crPBW-l0BjNE$Hf{^-}HU&W$Z zE4PfZ+I-^OF+B8$K=gDgtnt78c^oaXBjY@~{D6u0^d+e=ViCPrZ0<|LZ8)xB+B>`w zC#uMTyeI_5|HBd*z$Rn z6aLMuQFHE4178u;DnMHmJ&_f5+SR6yj5KKZ4{@CRE*0s2m;jMnn6wIi>Qv9@6g0^) zOq_@lDi{fbPaVXJIJ~_KZgj3pV!8j$kiQ7Df{l${9)HQ2uql7^`@m}o_2IGQku1S( zX58;|A9x>-49f{>KYD$&HCR{VnAQK2ygXHc<4bH-=v3HmjmqVBWyhwW211vd@Zz&h zWJs&%2Ur8@nqq`H8arSPS&1=K*H5lg z?L8FBCxY9L7BP>jMwq3%B1x+1^!*FG;^EJ-I=A zspZorpfPdpM&9VzBb+c!8_B+TmDX*J1@+7PR&*YO@3B}=Vi2WSi{GW`lV;Si?cZ{) zm%AowODb)=X#q{PJg#ypC| zrG1Im-K&sFvEI+xF#X}Vj|aaBuZh-PGUJ=E0(^l7Qf!R98yX>3MV&Cwv_O%y;$bsr4rYtu<5gpU zR#e^OAZ3O>wfafu8SJdh05kaE*4V?h^#B6jDjPU}^e2xj<}FrK*^NHU;z}`5922zx ziifV^Zkldfk$w3C?}*y`X5c4|QoL&(!&{qc8P7JEgpYX#Klt=h2Y(bm^EN$?8~-}y z7e|?`YEC6+Ev5DNxLLG!{tMM}$ezbN(;P{iF4MsDNHpaNH^VE7%WD3>tZQ|o$E3jr z8xJMP)&qtDgz_(bhUQK`1+ZnR@ZU89A|__d_TWTDt=*uxVx>ZNWMt1viE6t%+j%u3 z`dd9(IHaiVPc?2E@E9}T)ZG$a5dj0nmDir8S(I@qRXp^4= z?_2BWu-}36=&EUk-^+dGGaZQxzRtXAl0zaFIjsQ+}+)2ai_Su>(TGNC*xfx!OOX;jj3O5W=-b7bRtp)C8I8085k zk$kMiAGYAAMj3zem}lg`hV9pQa$;dfN-uoJ176uB%zT4*JjQELgNWB@5#`Qo#q)dL ztK1i4W^TkL!Z%va1$pm@NSLAymZQ&p3}q%kdauXujv%r&Qwu{`ZLHBiw$uoZJeQ_wKS)H|xDOzH3c-k3e#I zLVC=d9>?#V|M@&@|4(0_L5wY-+=T&z2#-eq+#2ET@PKC`)P-LNmBAbyjX)^ALZ+rP z{cZ;#EEUx$zd&$J#caNj0XTt_m$e5;GE*Y71h_@8h1C)PYm3eFkSc1@eLp!1V`9wxsz$Vf40 zv*6s4E{6FXOU?vy9-J)?u-87N-kot(>z&9=f6~rczx!;8^CL#?LrVMgx^t7=BB|M# zv({)qC%3x>uN3#uo90ZpdN3sB^d@6#!aw?y56lOc>4T4ZmQmNU+TG*I#@Q`j#k}su z{Ec!PmexlBI~#0pbvQZJCO`(kkD#3`7qH*}Zu_w0Wh?Keieb0b&!gAm5p(sfoj%M8 zz8s?JL)GGHY5SE#)?bhcB-Pb4*CR#>e)W?y@2W83G90d0&U+UdfrFX5DKC4Rk{jIA z5&Szf_}i$-w6z028ft^~XIPbHp}9xe{$p+&kzitVkqn>1(!_-`8u&`|PzfUfbqjjH zf&2f_m8g_vu^0SVGmP3myIsu;w?8t7<(urcU=)OJ4Kdh*x;=eHKT=$k?32W_f^@=d(1u3sR`y#RUHeRPOx7bC93NJRLlP9uiGI>_Ox^Pm%Dt^?0J~v;_zeqmt-6IT$COkp5M*(R++6diMI=P?or^KuZu0` zqY>k>8+HYiv_o)BmycC`Wr~da^Y}Xc{I)oorKmG7XechSjX|C4(92d{bnvb*j&4sS z<9kX(Rr#oR_@-|LS`i9GCpiJ2c|rgcZT!X8a`XsJvBKxqO(K5tShhZ&)b}^gGUFZ> zK-Z#HJ2<4u@O{z>`1WZ4;)vANukqhJpKO@-H#CFMY|Idsmp%C_Xc|;hQuL2epQa8} zqrYH!ervblFF!_50c_VUk&`WX`W#t}DxNzo`YE6D^Kx(Xb*?Iw`T&Y4Qml#kg)rg= z-_ZLU7mL;Vo7e&Kxt(UHx1#%3k93y5L!0fHx{`uFA)si(a^uY{nOR`Xs~msBAv%dp z<9hBIB87gr8M&h~qj3d)x{5j;l#Kuvd6Qh@4yK!uyzqX0S7!?KkFLvsgx=w^|GYkv zqW_~HMzW~Kt^U~G3>0hdRjYg9vo6xODc@mZTO%;11>t*^R(i7&1=dMaoRj4~Z)cDH zIR9|7v55Mrj8ERBpwEL+cC-2B&$ovse5s%e2N4IG_U%>Cwl5>s&lWv195{;>wn^P@ z15>Y9Qnvzv+eErb3i3{5R)6osS-zJ%nVz>s_nPyJ#Gj6Jegs$#X*Pq}xGmBAXAJVr zO^|3rmB|f&`=a-0FA*bTN;fXTK;th1K8#QeXs-O#F?OaJx&^|;IU`{WLbx*b-h#d( zdSlRov}cf$34Pv2sQMC(WO(a^LQ_YZcV({&Iar3B_PS<`+V7f051!I$AijFGr|bm* zJ4rEnP~5|MK&GN9LIpc*M9tJ7Y&kKk>tzTIXpl6wJie&u(Vf0>SIso@eO9`y5J$D2*1^; zksJuM=KE_%|Ihbx2xnrVjn|sAr%1*_hYlULMLxGvm)_Lg#Xt1|KK7SP%AZy#j-i%< zJ+y(|8g@uJ342tkUlrGie-_854PO_>n-mn4#Gb0AEEW&j9cE-(wIp6M?O#wXV)C&) z`Ip)70*3Qx&=#p~YPMm$;h7fr_@Ci9$kPy!9B>7jAgSRn5=Sfr$s0-u9X69#>Zs_+j+o$iK;4O}4TWWYA8-0aZWFr=p4Ng#Hx;d!&u>3Q_G^f zp>>y!6DrF&)v4aq;M(|gK2H~a!pCGl?0skXS1~nf!_)AuzfMZK>BN(|a3|OYGa_+2 zCSDTx#D@GZ8uUjK@dZ!XC`Fb*Id6QnFKb%_*xOaSGe38$ z`sqGWh={xy?pA*{7O*7Gt)E|a7n>1lpYVyje68T1BTpB8etk8puPa;&UQTVYg6g0- zB@T-o^Y3u-2@FNfRyylCodOj0$&CwL880D94!T<|2PvLimAFT%`CevPCg!2>k^dxP z9Yn%uha3*5vp*S4C(&Ol&rtU7Jd4ha zSuwe&G}JD}oL+L&=S4L#W68(z^2CCRAxEK;vw3$qRKF9jx{Te)N;aU=n1%tyda;&V zA>6*43l73G@=p4CsQ&KwmwbBJA@%S6^y=?lvvBNo^WD z%``)waiVEiHN+t=rba`?;sQOw&JPCZw&GkJNu7g`zP~)w$j5)k|4eLld{GMFZ>?&- zS-maW-K&0f z-J?5HL6sBqHTNmkV?cat=rwyvpcr|?>WiSsjFxWBKeZ0iwI{6Z6|TZbo8kBSw-a#T zh=7NHv4_^@n{0-Fww+%ZRqLKt2EJjn{#P2=Y-jzhb0%ltyspA*zt%@Y&o zLiW60bLmoi`M74`5+@h8PD@pbnx-MmZ(Ua}^L%%B zuVDA(t&LlE+<%U%l5TLVZFO5!CKW8Zl)((H;a=YAgUn($_HCEss z=dD3Q;Fmq-KdF-$SUaT)p5r0%#2-2p$#Yb*<;PQDHV?}Vu?x*<3F=>MN>z)>lxO5p z;QAz}!rW2UJMzbp<$m(kyGer*Z{O&6Ie&HLE|}&GX18zaf+v6IwJ4NWV=k zPA-SgD5hBM&N*BXmz^j_ZHYJ^_^5p>{UEr30SYWeMQ95#|3>y;A|+FaUL;^dWKrn9 zObW;eq!EMM8ppn?C0ugXy13qZ-`ae0cf2LjB=34_p2(8n>FBlW=aK8DAo%`nK9v4C zjyzIgY-qz>XNcmxVcf5P3=E*DjmT1&leqX(=w@T)skOvZGe`4@lF*L<{ubrNjj8Kf zUWVu&AGFa4sSm~p-!&MW*z4&AHdm8sN0!<}8!YN{aD)9*7^tw~N0Uv8tX%BIJg>^i zjh=?ro>h5EyNG29*fV&{Bk~?G{ALOqQ^Vs|9%>a;POm!Po~#T8EW6dVtz|@P8m4?*`3wgIV587a7HM=|Yea5$N9+&^l)5 z-Zvz2l)pc)G+d3)>8qT^w4mUX3vJf6L{(g(`?e?BK3V^{CisBnz@gQ_S}pbp>qgD4 zHZ+MskVUDd`Ck0V>N0+0^vg)njY=8WkReWq6=I2nJUwiikpQyqow^8xS9|uzOb*=G zHj^CB$SC+i;YwC5m{k*ec?T(spWl+M^FSp={ zl&yu+2GD!_`<=R-+GW>|R}X{amodkz3SrbO{ZV0VuHERiKU5H{FQ^bq45p#cL{5{W z%Cx6eFvRrtQ4EQ-J88+BZaB*o&U)!K8#?WlRMTmD7*mSj%Av~nC z{;V1Qo%(-bMC$*E5wwW=!;dNX?H$|#Ziy&d^+ZHY5)ozx54Zv17X{Y~Ebjh+f=vxF z0I!^?A4igOw1O~WCN>a7+kZ%Y6 ze2IfKZKkV`+Oyic@*O`SUT4rYSO&t^h8U$fa4zLGO%~FR)a6zVYb~q z^!jQLrGfFZN_KR2+rBMdJelOny8=P^WXB$sU!nX28e$P@5$3e;M`*T(!F8lcu?%p4KtoXei{;{7u2%VRfTLKD$8ZYAEyceO9Wgrh4t$EC1+x^=IAh zTQj)vv{#{;xs2_O{U-!QT0hvIKY7edbN!x{HPMtK5zn1lP+9J*Rf1@=d*{%$dWAW4 zS3WzV1>#5KpC{~B=8vXw26+gqPP49sOyIUKowxGPND4#w>Kvvm=gBDHIIv(cdnxv3JP>02l>5!FE92+9I`5SN1tDT$^jJa^SWem_&xzQ{g8)NLz=lC0oJ9M4h>F>+Z3=cqq7uEN{lw%%0wXMLAWRatD zENd#;I{rF7ZfS#pN09>sFQT_dpEB~R4_<7KN>7G|8^&>;XOerpllhK) z(pB$5IK|SR9SEicl#f~oWks=_`uvoB1^!k3dOO_iJQ@aG!KPI|mB=ZqmiBL}(1a9a z0Eg{!ZXV$-5#3qoM3uMNgJc7S=CpNK_w z6~q^+6yyaG!wGVAas6hK;glf?@7I1zj^@EtHQs`j3kY0}24-LlWz<02p}-eGH;T5z zn)Lq9GaU{tbO)qqcU#M_aCM4f`~1tn$_Djxz_YWRjQM22X|#P=)jtp?8W419rn;GL zFjc{u$+z=KdW30}aZ7Oiu_@OX;JoTNUog*Iwc^dd#0=lVgot6#stcCB~V4%HL8C{S7rB zi;EV(I04Jd)UR47B^0BobL-Fn>4W%wGTSk^Dm#_tY z$4I=uKU1>;BPbkWUQ>3AeEnZ!_15z#m07F=b{6YGh|%JCQp`z?w4p&JB=yz~DGx!QFpxW4uE#V5=E z*zFCzJEm?)M-Vgc%I|Ni6qrdglJV#!3XPv~H)F>)VeeKVZKvfulX#m(OxD z0!h2xIk1A}(JoDyQ?1biGmo=N)<9kNJgqoV%&0w61N;{=2ag}xHuBr{>rWY6=T!qs z9iq-rLtTiVUq1zw4kj>kDR2UYF%a+b6IC$kn9RqMnKe(u>@CK64QNsGm2d1?k?Zq&z$8>|S( zQ&4}RWP?Cczfa0MBCcFJjBv%+h(W9%cSJg)q(tp&T3pYD<(C=Ey)tGS5=Ek<K`1YyAnJ#dGy21*2YG*~gWo_M+HgDNo(bWudb9!7Tt%?7D94RXw+N zITD&z9X_%X__LVWNn)>P(*pu_9TDXG^ zscSIaGv7;{X3ybyZQ><7BaWPdevf0BfngO1sLDs)(CY zrqk2yoB`{T{S)XpECwCwi3m}*1=kEa%(&G?h&sF!w%KkR_2}e&oiqov8?Qxs^p8sFnX`lKpd^Mz z-)sU~-&VoLwTsn%CPYUZ>sa*@yeyXmuDmKYGzb4J9v)Vi_llQKWgl9JjV(p)PydL; zO4{6(1=M$1$9}W%?Wg)4)-y+t%2e4A997loc$K^=W2$+_aQRY7GK#S98>ZvF-{w!- zmv=06%TRDewcUpRYP?Drff*ha-bB~=Rs2cdPwprivWi#6tRCpOf%+AK>zVAB%`4ez z*};f|Kqeu9qHsW}h>xqL<|li>1OlfFr7vt?`9@&e6k)yyY`rLIJa1j!-GzOjBE6js zR0Up8VJ_%q8rspMZJdW(+lzH|NLMt<#L)w(#-;Vf*q3Fqg8v;I>u7Zu5;|bnSLk zQdGBcR$)({7aAkgbJ$&3DSRqVf~B3cq`-KMJI%CwT!hp=#n(7MD)o{GVmT#|XB{C1 z8EUd^!?eM5dLB50X&cMy-euSA18ihjv0io^lYeVO6;of-^50|XJgFasRT@`*9?3{W zt*J;4TSNC|ymz?N9qW@m#FVHfNig@Rt3TBlc^su`MM@EhR!FPAP?vOhh*67C7~v1z z(D-cR*_IK-l;cT|8s@p^~jZ9PjapsFa`!mh}By&+^;X&w%j3lek@# zsu9AJ*^L~8Bo%`h$oOd8*mJL#hcf=}19gxj@;aZ~hI0@)ABdDgO!Go0exmnCaRy`5 zV;~8h(>B98=Ifc(I0Qc<6fw)c_4ePFutnYQzxn9p&8`qlev|7# zbxuF`t+5%ykBa}6((Yct-rB<=4i!MUAKX=MKl4dh>L{XUIJ?#VQMExx^EM1Ue3F^p=jGy8$YPE4Q zf<;&^t@RF!D?a<$O__^vu=mInYT_YpONOb;iR;X94X8PdRp#>NTA&zN4*c<)(&}lW zG&Tc>z>2y|jX3VefJiZFGAamk3kG)wkydzb*_sYRkU$vJSO~{BKN2@+5L@v}6uU5w z(^CZS&=%@mWN*g29B({)exKrBKwtSr-{VI;?3}vUYNRIZuW=5<(HQ zYudQ4M@3Gp8umt_cYC2N0GCKs+Ek@X(CBZbR(W$tw7=u#zDX;1*_Gobw#T-9t*G01)ssy5l#oEN^n=t1HcjGNS(S;icAV!wQN zw8ZE!0VJ9Bd>Mt)whmt&WNXM0A04_heu@rJ=t7hAzCI4gq&j+VzCn-Yg$(`38D%v{ zlqM^=G~7_VGS0m|FPCnqPJj07B)rsSI=Zh&t&t;!5$C%_<`@x)8Da~sY^n+qmJ~lW z7#z#S`Z)WkToJH>P*dp_rA2Xw0G`b>x5tGsAfAx57Gv%6o2c#OR36G#@`VFaGDrq& z-%|I%4>684qb4o%kY6C{jHH1pbQB zH&Qe??GU9$;M^kyp@X6eHet6tM>Z`-o;Be}yx~ zu$%?`_lG5#E!L3uOpy?R-z}Mm#^03RYgZh&L_Mx|J{XRng{GUdpD@ib+v?$e!^RKo z=MxEKdf!jTEbS2+Yc-p-)1xAhlQG|Jq|BR_5*3^G?`>^4$IF*v1jGj3Ao60=?_nLt zAB!IAk+iP$VUiC)e~@tTs)Am!0icpWO`4(eNrfunBcKqO6gilbonyNC~Wk*JxC2_|U4TE3pOP!Nr zSFo;+L#N>spZD5MF2~r9;~uy6P3Wc9^=Rh~B59`DxSWB{`CG-!V*yhcXk5JScoJXe z;aW9BQbUS? z$!gqK@qX4b|CvJm6fqQFIF5<24r3~5eI&EybQ(H@PP1}Yrc4NTLqt-(B9s|> zxF4dV#R?t{H-<;9E^viQz5IG8hNKi$Bn_0q^mdck|8QY|yd|9eHSVE`#UZtnlvF4Z z_AUMzTT^-VemoCk?<10rH=apZTdB?Ld)8|AZMienh3vvQ2MGBEz}63av=$VxP?~E(03)rL+`1^=%q4iQJk#odfr^KjafN(+&Np-VvEX_A_cFo>zjh|?uM(Q~uf9az_=-SvXxUwyZmZd*V;^l;u_PcX-sXPkNo+>w*Kz>IK<6w!`?U3tJ9_H`7K1>Gh%ex&Dnri zYd-rxTyw`lb#`f-n!5=KbXUS^f|;$9^*%8*54-v#t2i%DH%Dh2@ZdQp6Dc1xTI8mX z*67ACXSxZ8A6aMQ;FMfGqlMCwTKADHhX2)@JWJDov;C_5*m>F7?tbxN5$m;Pe9z2T z#3339ZMTh@{{$np=t$^|x=GV^7xd$`<#Z zUZ5;~u0Kr;JM$>?t;_pi(AU>F>&UC=pISNL;q6dLx}HdkGNb#R+d)QmD=uTt-$lp0 zQBz?Ve_cxGVC{)Q-`7XKoi4t2x>FoaCo#1)rokn3px4#jf7<#xpX&>E3P`F%U`(42!%5%(hosf5Ac6SepC^_9ieWdg>SX#5fM z&h7C6#=d;Ia-@kz+MgvXa_VxpO_+DTlb&dVL}a0FHC%`(Q_z|(YlJeRdIRZYu}HN!AAf{id$FX*sZb@d_8SrB=c$K zof2}YRLIdnQ*=uyUQ}RV!GTmw&EXf3k=>0=^yqT+;U5K^lB;6j33~6-4?-%vf!Zj@ zh+zITZDJ-YDusL;eaw*5m@Q^0&P(N?b`A##1FSFBc&#sMH`EqYs|tRhDoLCWzNkmb zRU~Wm+{gut`-a}w#!v?Ae%)9%*ShM#a`qbuzr&;xdyll-VVPW`v`!OYpG(W8aw6+B^$lGVT4r%KGU(l3 zP=P-)+Ytdu^dYwPVlaw%P%!#G6EP$#LA5 z0tL!MC=tU?#>`y%4LlK6s=n9b_c-jy8zqak7Ts(q6H!{)Ix4Apr?}1mmfmAJ*uV7} zTQidHR@m!x;#*Pydg< z`9k0wC;_RYgaMZ>0o)>=*|s$6Wpe3J1@|yHyM;B?=jXv^9NLJQZ<2EUy2#xbw%R<2 zYiCeRRTmH)+%d3t#c};uV%}9*_NY%qbHr{RD=c1fxli=jEX=oYD}Gt>8J;9`nq+O& zwXs^h(tyODR^m!mS#dz`tO2DR0(^&a&i69LKIb?ZU+(RlKfC(en!L!DHc&&YeDYDF zOo!x8Rauxq8Am7vWHngLnP>wh45jRR+?AQ`Q|g(!k|W!GG4riiECo*TRmc&z0L5Hd zfdN53gH^bcylnBIY&^MVs9a%&k32p|g-0_Vrmz=36QllF=*}~g4>xPk062^AKX6IO zFwDH`T19VoMF^gwB=BcL1DoNJ9uXM^384-EtL5qfn_fC9;9i+k1|saoSGlG-I=&GJ$^iKtGZb`wa&k5$BVo<0*qC`_({+HcMTcT zr22Oahf0sIZmdf963=t1#et|X8eYb z=zfAc25bgrVEJ1GSfISK-Lk94+`>AYt}vazgx15>La>-E4eu0~uMQKiJSL|KV0nsX zHp}#j@~Lomr_u{FpNY4-U+EjcnQ9WJgjDv7 zfnS=Y?V>aleFDD7S0iGLR2aKi;T*nSo`xd&G99m9h--L4P%Y=N*rMuI&$Amc^@TJv zkHq?u#5k-s&cpx=7jzqcGpBs-5v#3UK^%unY=bASO+m+ZhQ|W>p9>gJYuzy=jYv|t zDmTcb6>6#`HPJojl^u(#3^+c=`c2{_p?Z#TXH-u%g0%|!hLhJ#i(jBW-*dhGimAlK zbf&y|Na%Jq;qu?xM(n?te<%I#7+hb&?QRh*TF(Zq4!pnEiHyW^Y5rIb39R`$IKSFu zymeo+?RtqF9MutoPX{WWZYfaSaF7Zv{ZiZUTNTO*!8|#)Ha}i+%^x`>>g{~ zs(4aVow`yZI4l#F^;yQ^GSAnS*?;jYbjBK|pXfe4|EgIs!zqCD&Xh5?gup#AVvn7^ z?<)N92Wsx)Te?hF%;zJxrc#5B>-W6o^iVR2vU`{Zribsm8y)E0lm#D!{r#%xS^3`Y zEy;j~uru|_u7SZX>CA|hw3k|6ZPP4~M4V2z`aLC4#h2Z+9gF#)g8l6|g?k*K%xo-R= zgWR+9T`;4I>WAgCMvj2zd-xLf;DqWCix`>gd(i5O$W#z2=-)BZzbe-sNBwuml>b2Q z-n>IR+9eDLoR;e%c)^YG2MyxZEcbpk=sT0WxfEFu8@+D4M>!9f4uE&H2&pIYq8olG z?Gj*8b(uo)NyQVq-!bj^#jRpg(I##~bHBTA%WbfY6S38iI~2P>_tR#_ z5qG#yj{~{yj?TDfD&d(7h5VIiXi44lyfmPU0TZ}ds{grkmd=?(|8u7yWb}zJRf6tq z+_n#FDnzsV%=VU-Y^6a*&h+(7@a>zm;;Lo4pi8iJdKsojr_ zGwa$-Y|SnQo&xA-Dv}3gs?$8F^yIc3V!pnSWK`Ymn{&V zzo4^^Z46nc;pu;6=g;e8>P>+q@Wq)m6$ENq$O}TzK*nOz)*gKoTWnU@)P*J%mWjkN zp^eN3`iBSlyntd0(pX@zY!Dm+waq4S5v8e{u^TLW1j=1v~r+;>v43k^Y%%wj#b-hMOlB{BBjqGNo5FbPrk=O zs@mEh?CEitR9L8lw;kO|Hk&juY9cPhzqYx~p)$i;Cy?Pf2|uWih{oGX4DcJR6ne1{ zSxu~ccoAnwlMt?Em_T}-PwuJu#j8o;TE+DC?Q=7YS9}a=nZhxFn-7*`04e~P*<&=| zb`9rxj^T)LX=%;}Pqi~bMT;5I?$xo%1>RB+*}G0Ij|5cwYJhs=ab#J{<}Xh7UdmRtIB=zC|gL5t39T{J-55>7TBFz}d(Des*=%fbD2pFhNMfOp~%UOiX&z60bL zd1HXcIkdg-NcguMg#?zm*>#r?H8ofv%Gb3I8sam$DuZ=$0>W>>q z^Q>w+RE2_hUwIS|mIAD9;+fJ9P3mz=ZaOd&>$c^0JgV43bkFW`CV>QzW3nOGU_p|H z=m#vilUE9pmTKNe@VgAQsaZ}Ut=Q0+r!F&>g`H})5V;}c51BW)PEU9?TG<(9Z32&0s!tBiX%mb5JJIA`1oi`^F zKfp*C2QKT6fX4Z?OZ&yugoIQ?MV2pp^E{Pd-0s#VQ9I>EN8=xSPi!Gk_WIC4o-%IS zFV*s;M}|CHuywTyq7kDm%+P~TrRF@DpKIaEX7kIxx=hclXl z9VSszQwy2sN$ReFdKD{udDiipw=0?I#uPV?|Ngj>EYT{6XZ(D7(vm3YSQK)K}d(%<0ekm_JhSn#p>&2~z)ZDknFW#p` zw=(xiM;DQ02})Jp|8om=@Em&XDf?Sn$(Xs-HU8#Md~`&F(d{=7^V%^(F}_^Ur}#tz z_FE!quq8&(GwFl}k04Tjd{=vrd?6(J(n8`uAj&_RUJ~PrhJHafZ2&K|VOEq(M9Y()5$%6_h^t?l~OlrMrljI+K$egTKGqEU-n1CvMDDHafYlnmz6Cc_Vtoj zyT@p_c$B}ru+g?SuIxXG5%_(+l=;6HAfx-~P$|ica;1<|MFM=yZK3;Zlk(7e$Il!A9uL+G*Ur|@a-QTWJybPdMW0{6 z5l$9~i5Ah#{z z)?fK?dG4`cUGsGyN!R8E$=Kf&TyJI7z@e_Ymh;8xny5!R{1Srt^0BHF;(+8b%TJ9$ zT8XSos&nn+f)BwQZWQX&`kXF$p-vmkZ*qX52jHgO`GK!tGrE=O>!&ZHr#5)Xg5Fikh7xHQ+a}bfytabllUuFiE6|+L z#H(=w5b-~xa9j+KIQr;+11IA*q|c)~jetCJS_A*JK>i)2a#6}JynA6-a}#U_x+dG{ z4){sxiZ4?@emcP?97lLT#tHP)uZOCFIiTDlkCnCE7e}BYzDOB>O z(fdgc!3tcvVXNsGGF>M0OJ(GUjN}FXHb{YEE5l zGI+yx){A&q>mo3EM?8jQDEzG;1-IyZL|Eph^NJo?hS7r=``t;*3ysfqIYPBQB9ob# zgK-WFrhK*w@Cp&`z^n@C0TrFjga#t}-z_fsf3l!Y%rXqTkZ(i%Ig-A%#%A_a`{#0d zO6wgeqpJfv%`VMV-T9x{08awm0A{iV80t4cLr223szOH2mjg~VB5bnMt9IN919PYj zoy6M6v%N#~NapWAd}Sp{0fLPdmf*Fn^0LaZ^muCgTn}EOU}fxwOo1yyiJoclokp2ygwUk>HXpxMS9%jSN^AKeHU8t9&sx6w!UbQq-c?V zo*9&A{T&9;dO;RJNBaqyI~dH*a9(7J89q|CnL7(#KX#2TeBaPeUi|R&Oi4}H`?6_= zc}1W-1cTWjW$93EuZm6MtF17{Vu!1l57d)u$=KSm+Gg1eP-tl=x>)}Eyr$g-qr5|j z_&syr^+0o zhg{A^mLJW%bsjluRuglpu}@-KaK6lVp^|&Ig(NF9!)Q&8lMBn zoCVd;+$v!Jdn#h3(X4cgA6C`dDGb4PhkVLC_17g;bYYcdBPE9ns;;b6+D)LV6Mt!R zoPdy!mduDBuinPzmfq`c;=GF!5f+w?9PfX=a0|rrUC}nj-m5&I=iXuv_+TCXJTUl? zX?kbSCx1bjtl~rIocdSh36dr+%g82rkt`=s)EoRMz?9-Vraf$D8pl={W5IWD)d!}@ zF^)bT;lIS6ci{OqXSRKuvVAe+wj@nJAIh-f7lsw zEc7rQ1=7Y=-1rxD+kXgnT9*%A)jtVQ#Bm64KCXJ9(Qx=7%?OOg&f~XLGWsTaPHQMv zW1V`IQ@pShwUb_Oh=?MBXI*3&f>|PwKv!RKIVnT%Vs3#X-gfCq_$$ft=eDD+*3zpT zuvz4s+R5$G)ZO~K=Dh#|$=KH z{U{+9fs*vWkzApLaN7)l?>X+6S9Dt)tsCh0so^81M3zO_?-bn6%r_zY;ysr$xBSo) zNmzyHsj7CS&sMQjmIr$~q6_9ZN3CI=rN)YM<#ydJhBPKHlJRn)J#06Oe54Xd#6q@ z&tb~q+1(~9X|)`^1;>0<62*;C*yygJ^x>v2c>3SML&(F%dg&GIZpseVlzq*|jXfU& zw)B00uN*a*iqP{>ttr45f61I(;}Sg(S#=yAw5_R((h-KcO&SU5Glu>$1~~(@+4O$N z$-5H<1~Oxu&4tjGhb&{Lq*UYYy8E|rMMH0ziSOh(S4FAApF5N4Mcuur>RTbg#+K|S z?L&tnUtKm?tnuNc?VFQ#RYDYjkPPUiBar-OgLB0hv@I`fV;wU&rFK7@V;YC_UP8>O zSmH8C=9ZjqZC{c|ZGvT)?i{d7q?-{5NjG|uWDY+OhjBS<+WYFfD?vw047Eewc8xUtQ{S?6=^&ovOC!g=R%U;ie>FVK=Yp=3 z(NN-kZ{mWZ4Z)}bzgp7Y#LB}iF)%(7K7{mLF^kO~xDe#M`^Bef+yHR2y}HV;21i(K!2WhWar6<(CWi>@ok}nU;5DZVMTRM4lp`yQ%HTSrq zH0*a|LLkVw^EcKp#y0Q0G}9j8RyukrK2nMYdCC*5Q^V|zhGF1l&ap||JLbvl$At5h z+adpL)rNiL!peDGxn7Tjq-ZIykEFA{kA$=@VI{Lz}2RE?|_$Hru-uQMX;xp{9M_)1Ney=!X%t83p$t$IwJ2~+dcE$kkFB;9m%ox?3 z{jR|M#ox9OgqFhOyHz{CoZghAgrf$$5a9?swZ05F9dCStx6yT-3u3S={LcKY3<#ux zd(Z#QC#icT^qmwLRz@<`>g;(kvQFgc42aev+IjUjtunKu4v}k3>tPFomJN6&@1Cb3 z#k|j{nSce_(pgzVb3%dg^4`O`5RX2J&fuBt1GfGhZ>!}aOHiGuFq}d*m$aMWd}dh= zZE0WruSu&r5%;Vo~Wp=oH&|JVr-GFw5uiaqB&b6 zrki7OgUi7?wK4M@SM?vCrsX2txrzr-{h3?U+g(Q`RNP)&Lv~~s-(+;=JIqCA+rP|l zb#Fb9U1(Eoz@5zlR?K{HOK7RxpImE4mM`uKZ)Om8;nmn(UFS$sgWRz;vdsZ%R#Fh3 zM8Y(4dL*0OtM$`<)-ct<)GVxLCE#}(+mnaJKfIvrs;{PV++Gn|+w+BF7JIfo0WC4J zd4sm#3YhfvbfoVn`fyNuSWI4R>+m&!Yml;$ZDZ^V$g^OqBWUxQ1#YlQMmx>#HmX}V z%)OR^WBwz)UeCme+Qd{JSc&T$kF1v_>9m(E^A@VnVsb%uu^@ct+9JPX0{x}&+$BHw za4cFm--wqu0_la17vG`!V?gA04Zc;8A8YmlXjp;Q<>sr3lmNa=R9C2 zka$!v<+`SQ9#J_f8R@}Ihf7E^QN8Wnk zIUsv5M|5&GdmT?wo@sQzDDJe_GQGs`e0mJm2<^W(&~FG3VdVeSvQR_L4QsT!_+VDB zI9Lo!3popedBOBxZm=Yn5zGTQIP{*$py2U;G4;GuMbRe$yUY`Q|YaugLtLj-vrL@6G zm4GgJ?!erEryGTrOso8}z8KC?{Cl1Dn`Uzud7r{U01cjO{mF-z9I3RrMtni}Ni3{E|;T_XQaAWW5!ZGKrXnOT1vyO?TWn|4pb86j+{ zUSu>nWHWr6!u#xuFOcMWC6e<9qLf|0)782ctKmWmEMGq>^=$(+YB|b9O1wfLnzl9H zX1twEUuz|IXIiUi-y|w(;gZ_aA5wvTdO8beqoTmJJ>8#rC^x zIe!5kNuISizgKOzv#z}E+|*pWw8#~a4XA}mzb7Vp`Q{z1to_YhY0->FfIRgW`XP}_ zg#Z%u#rebAafJi!HkO|!VC$r8S1|CKu>J8{%nrDYnm&-+FM5$k#y7ynWccY%k>;Bk zuYF+!b$w_%27dkDgNDh02^RZ#qud9K{wCZ}?3*#@V0YcO8m^+lFENPFDSb7-&vZe9 zl+Nf?ZEgs?sk0(iMMHrSo5(Z&>-|7Kmnf-K$3}nBSN1A6PAghHL7!v%Jw%fmXASJSo}NCjzE{b7YO&JB z+prk4?cY#v`-!z}JgB}k8UE)+7N$(f%q5T{b6h-KPffNaBT zh{+jZtR)|r4f)08;$kk7l9E#Vo!jgE?K`LL)#g@j=fOh33Is2O+SK|Kz-Et?8j5g- z{qIg1`2Q6*J1&I_S)F2?6g!AV0YFM}?>UH_;L>0a-vp{*rE z>rdBBB!~aIL)JF<-EY*e&SgZc227eO2OTF@5Q*8N>4?=>{jf3*x2Zq;eTP{ddF#aHZ#?d zzCh;D>`63JCpcJZXxKEe0WS7s4L{{{sD%~d1%@&GVAJ4ZR8?8JQzc{K(e`>W;=jYz zW`4^Se3pj!M#RUEAGT?ryu=E5oZmbmK8q_qisC%jxgqmRam8i#x=x0i!)q2Hz#hIy zkGGe6W!34$^x{yh75ko69yYTgAFZGyjTGn)ebX@wt=MBA6ZdF`OXL`;Cq9V)SrkGS zL;XrWy8Si$0r7YM$P^p_L)vuY?ChHSxxuvSkHz+UnRI^=Y~r{(T6Eng-gr9W$qr8E z+bnnZ%ZZgsrI-JV&`UgU zNL!(hm$M;P<7?4WnnSfL?O%)0jQ?0K8=YWQISEYvM!|UrTt6iKBpqycD!fbfIgu2} zQxZ}c`F>g%eUK$at-9p%{kZchb>zB?eum4sUJHitIxXjgaHDzvCjS-C>Gw9zVw>de z){7nC67lEdO-!~D7ivT`e!hJ#e~P{bW68eTC7A@?BHVE4>rr4G{1H8yT>NZ8K%vl_ z!(ra-)NK<1z|8$vQom*C!3m4PCe8WRH3AmYLDL6`A%I2?po`V}r=uR?+oa(kA$tT+ zol}4WFqqR!p!bKrP)Pb|S z$E2>lo(_w1w^5^Y{L2OPKbr2dLJ#+)$DZVzgyACIY%j~`_N&oil^t!S*#<63=5%WV z3mzVU-tiZ3s^lg1iO2A4Fn63LinlegABYHrl?3UOu}C^t4Z)jhlG?s!$rvU;#ws=38f+1se<<_mS}pxSj1qUY*uV7aG;m}?_bF2K35aU z{V^#glCN7nJxBTM=UX?b8Qj_7O7&@z-15c}y~s~wvjI)Nkws?$<0L1&Exc>W^#$4c z$p6}nrjTTWoqev}wOxtGB3+e@VZQ=KQ8b^dDCNl~4EA5qNXV=qTW4xjC=eDpb5C1E zBwW2Q|0MWdmQ*M_#6BU@FrFeIS2a3qL7`V9mDKs9@(;Net>Lb@?LAxj?{w}~{%#4N zeRZjCGx1w~qa{D`S7YAQ75QPjlJr0D!Mlx{g0i88j&F}O#l?c|)*{PeNH`!ul)k-1jQ(_Wg!N#$C4T?rI5Ua6fY20wxYO40JYD%KCTet=U?h-QeMzbc~0L}S${?!q$i5FOU zyj2nNSgC_!!u+sL2 zPOPYu<8Vnob#;1cD1kmw8K}0G|Bf4ziB=bg7KkK1@%r|-L+_STo|$BxQq+vJ3(Z}kfX7zWFXPtUL0_F3L1lrwJG z%vp3|eVehVY*Wk(bD3Q&i8&D87b@Q~e5<Ud4h2CZ_PqZtowUfBr!!&?LKUt2XMW^tfoaKJ2S;ktIk=^51 zjo$r&!1JvyLDIvz2#!;9i1YgNQ*cJOpzBo$W3{&{@E~{9sgz4$wQi=5{)~(_1C8@i zSonED8cUjTEsIOgOr*Q|!oiW!tHQGD{JMaPNb1#i5*gv(V~ArXFB7y-maQpthx8s4 z=)!ss#^1`52Mi!X4lCc3Os z7&ZEZ0m(k;VGFC(7v#f7q+xf1$(Fn)m#6|$Cp4OQ; zukwnKQ6s5yD?-QfzJaw(InMgdDa_S^7|emvVoIY;fUyLK=oJ0e)TFHJX%^RMX{RN6(;2 z6Z5X{r#d8t6viW9xeeJIxCVY!g&E2E=+ymf|B#bfD)uz?9obeqb<)Knsp|m<0@l91 zLuI`S32oVOboWWwcFev(!5r>gT6>Ir%MCdW+rLjm$ymQen9t$0(MEdz0tfju0gXQF z$PIF9D3SJd1;Nn4prYdABW@PY<_6HS@$!Hqx3SBmjJ~^Pv^twOQ{J4?3Q|rKl+es% zyw0G%5P9XGS#gxN1zE!(6Bq(a{0D0eMZ4PefAOPZGcA%ho@x6;yG(G&uH1=}gAeXBlq z+z;^e8xuM!2rd$$V(5iN5cc{D=5mx=0=K3ZV(eYKZ$y15H4^lVocFQsiRT|^9YF}?%hqi_hHNvLix+F;E71RVw2{~YL!uR@Siyj4pHD%M$r&!`2B|mAgMhk|UlXGbb_J2W_)o#48Z@@b=LCD??5XZLCwj@g&~wMe%<+ z3k_rf2cb!B@W9Mq0Wd#U4(tVXgaA?X!G*kn<|g0{u&KbY*e4i}L1>2t;mAGM>ieLM z!573q5Ia741-4M44$>x82*zyYT?p`=72W!EB4(T+)DPf{>=5Cp@4sl<$yQ!)u3y1Z zoKcV~u%+o%9(`d<4M<(xv$p+&r z%oBJBOhC;Wm;Uq#p`^8_<6P$zXB3OHSx2EYRi>@|;(bLg*St`~n&49XMT*?*EAlQ? zi+n5jysTrt^<&ST9Fc4A4Uur5RzROwwG_WRa*4z-%%$qLYRI-KuM<{Ns#Lf(WYm5N zljA*)K*Yo_jUea8d!|>Mq!M8KCW`a|#=@b8z#ez0Kv85M(&SDx?Zg7TQOn;3E?uC^ zAVeYf56TFeW$+-191#m*0fiE70C6LXOn*T?XYa(9V+bsewlUjZx+{a7n(MAFFjm`f zpe)r=6J2YRVNW2pA4#3Wm`jMh_w9G0nJS5D`RZJR<-qzf9k_o1{r5A=1i}Sg%jH)-Y}M*KeDTGDqv{sxNAz)s zOjruK!e|+IM{w1n)TJ72{d0U+1lrtiff9~PZ-I|=E+9Xdd<>{m(B@^mylT=#>p@?j z3KpdD7X(iRFBCcAEZ|9o%N!_l?uXfopuNAmLOD^&q3hfPAWlE zpeUrLv^g+uz^Lx-1T0-nW7?|X92>HW+MHjXkX@kHHhhHoEZ8!eI&>%zPid1NroAvv zdf)N8a!opyB$e&hej>WPT#8_;iHtg&P|$b?neBV#k(556=F}2RBhz7)#Pfq%HKpR0 z89hU4Kb_@G+l^51z@Sqj3sETR*%V{}pfThB*}1m+?VMeZv3_|O5~ z2<{WDc;?PjK$dKv1+5Qn$)jdluWOEm3Q=<=S7wrBrg88UHn^x+^ba#4xR~h^C7jGX zj-*tXxX~&diSjKgPCU26DcHba(L>kKYTygfXnOhu5Tw=j!vGTnMCcWakqeIqTlHu` zxAcOOm9ut(1j^>|M?NG#Rfcz9A^jl)zd4AGhst-^P|mip79B!lf6>_`%25Hh@l4>1 zSbC@zYc<>B=+3eE`G+y}_pR&6#X>lj@7 zd1$i$Y_dt}QAFdM91`~k?$Kh~L{@1uHYX=j(`68}a$(^hh~`ahz6|^0VIB#wk|$Y2 z)lB)lN~GdMIl`_fm6#S0>HRCb>xke157n?wZ#P^-0-94viZE7anO4Hx60kiYkg$BI z=+?2G`7}hUs-_)xw=!^$IusEdurrM&a9e6FK(_>b|&w3lD#8Da( zQt*Z6-;FO-qbXq1wkt=B(A}9D{1N^KctYBgJrMqC;?pwe2pQBROmv5gUJz8d=R)CK zLZe^sTJtL$NbjQwA`}S>Vz9#7Y8vuFt5aeMy|<<)x z+Qo#fCVedwj=JdyJS&648rcU*1z*6OZFe(=#nKAMCA9c=k$+f~f5orq+V8K`WiB?k zqveZN>1j?QH|$l%znT;E_Ent06{fkP-r<6MxUv^(?vtx0%CjUh-U+Om=VbfYnr(rG zkL@}h!I2$@kxaNkL6$tz(lbw-Q(=HEO1&^~nV_5${>7b>(H*JWK3c(_Uj{=QqP%G- zd%`)DDVm=kG;RP4nBMnfMDCVYN zz3y+di~NG_$D2;;bG^2}!*hxvu8gBk$Rn*J9l^{%Z1;B3Iu9`gznGKM=EQm2>{$`i z3g%>j49B{}r|(DT5bzB!dfgvhCm_i(2>AvI!YbHrRz?!#Y%jB@cZwH4vX$9{tt*qp z6}o~3{Xu5p`n5&wm;w6P1wdgTMuSYCl5Y=~<)kCA3*as)O_V%qSFSIHxAt~_jPE?v zg>8&IV=bYUhFrQGi=gTxs4^B#U?9jZs{{q#_FQY!G%w>RA55k5jn(^f&X>zV|KrbA|_Cn6jWEK@s zrv5w-asS`+P_tnav+LXik$J_uGZSNU2%lE-^ioPmweW|5RDRo)NJ&9PUioHsH?*M@ z6b#upQZ^a7|D=9@94!bw`GM$zpYMy~A@Xr^Xr)bS@l0_7uq=l9zSHu?$S|y#Mza{x z+Ttn!h1`G|)cF?=XvYaXFB0jJ&9lT^FjG;E9p}3KBWQaPqzrSeoVOIF7MYFD< z;focMG`jdlbc^@xg%+FP9>WqoD!%wHQKc>OFqw$3p|Emxd4|cRouLh~7g>qNRb)E! z(f+|O*+TG858sgCx?<(ip{T7osGpKxKnZEVqQ!VEQXhdk+k@dKHD&Vou>;_YQgsR z_170!=_L*Y)}P%t2&HIjUESQtBrdu@U*55`a;ILmUU_vd_b8Fs%yjeh?xnsmwKNv}M_7kWKcJ(Whf}yWwI|)a+Xdg-YmewH##oz03Rti}X z@2Sz)$8}&4eKY<%ec%d%0>!gl!EoI>mM%mXub~%E5Snzb=SpodR`3f8$iJlDjs6X5 zfbTw_sxRM5Ss7j*jv8MThR~S+2N~?y%-~UfROEk+>$~+A2Xg`yA_pvN)2#)+MrJKz z@}ao=5zXo?l=P4`(L&_=^INsRfBPY6^qbwoee;emPVeBIgoefG#%9g690{X_ddkuj zZ99Oe)cd7fBPQzh0WYscg$<2zoyfVfPtoETUd&f;{*HlH)Yo(8&>xxetHy-_J)8I5 zPw0~nLcUpA$1|oAp6daYe%D5NG<7nB>4f}1#+v&0>ejmDM~l(m^pLS7!x0LkD*;YA zapS$OZjshkO-B#tMNMtHil}=3uuo##>SD~2$R_kC(y zr){kP7ied)HvegkyS%J#omSI3S|S6A zggCJ{B4s5D@F2JFU8-(Y5EUp51oGXBoYwc2?WeiQhB|^qm%OmJ={lNr2|mmO=@}4a zgWwmoAYNVrP#uV6M3F3Q3>G)$?M37+qEm5fW8q*<--%EX?x(3{ao#q%{<^(>8tcnV z?dCHFSN#t;IlIA=lRZT9wibuSQNaA}u>AS0;GT4&xiyJ${6tkAJO1up>((}FHOtcN zok89)*bq4N)trdW6SfR!_f{9`m1Pl&1-T)k7gO%~dd;wN!L zISVTmjyzdh7S6TyBJiR+Jl>sGe>~ht*@wJ2=C&&SyW@PXT*#K%G*rf2pT{HL%k`oE z^Q8mMPQnPjHKgoV60uhk=n5eFOZLO{8fY)kr$?nuT`*jrGSnlx`t2OzgDH^BavH8^aqFQ3e~u2Rct~DJ6KrDCV;*dBtT;xl%#gvRo3kn@T#c zg!i0vt2cg_TP=&egLWQ1S8Eylh92maeuQ+Fi9E;0?k=Yn`nP{SFug{4B5`Eqc=g6( z_I-Lt)^lY#KYdImanMMp*(l%Zw-oJBzkLPsU3L>yyg{oOt}H>XB9YXx4atN914-h z%&rY7zHllg@^2&wsA`^fcrrz5eVJrX=U^}VOE`WnwqXpt@P~HOkpQVP#}nG{*&^Ko zM`EC};v{SRjPfF8M5HN7VpQI#Kz8bXO5nkfb_Uyd5@&Q(tLXrj@JXL97cNwN}) zGt=*1W4GRV!Dexpil@^3G4lU>n)j79R(1c(y)&fX?oa*KJ~5=Lm*1ITqB-IdNcjAC^!A2J3&rcQ`H1yL4SC(LP>-?Zv&B zCfy=Y+eO*N>q1%|dYeAscN``V=1(K-)$4w#&qWw}#TY7A^hx5Z_NkX=oXx5;rUP^U zC+Bke8jU&pBwJUatz-|OJex`i2TvhuCn}4Vh$|Aye&`3?1{uc5~D z3&W01t3pUAn?3!_j1ZQLX zX5+W5aDxBpAHe_g4_b)+k(w-ah6}cWFh0z{)?hoZC)gfB_%ML5S*^ilnc+X!gOL&8 ztHyPqNQ58%vZ>!5|MXAA>r=bD>h^hY>#b-Ke2DfKmbMVTXJ zEu_NKhH@BSoseHLaW*K?hnO&On(v12owA?h$jSImX%|x^- z0Pe#EzQijK-_pU4Y?AykbKicqljZCzdSdu|>K~mtck-v9`}e=7dY!lO02`&WEi4$; ze*%o`ta}|Tr#%YIL&5h$*xhwBgB23nf5(GESKFO|6}od?gRif=Ima#*SA+E@1D%X^ zmPi&o`B#qr$f}x{6$`Y;fo(o+17N}U7(SP+CBIc+E$<2pVz4$qJXN8E5;&{{Ar3;3 zA>)pDen+>48?sMj>8(?UK-iq!qRMu0@K^Wu5#k1+vUD*8;DIvtuw+9sQ?QCqcugHw zJI;U?Bx?ryM7?DnHB~j~Ecy=L?1a}x<-+g0+RV}8$MJz|Ja2HXFUAGlpDB2T#$#<) zJ6%QrEkPqs_I2a#_rDp`;&!UT>Ts!%^9SJ>>w*V_lEP_3L>SAtlFDE9qrIo!cxvzJ za0|RI1e1+OTtd+a<#ImX(3IxJdw-pvs?Gw+em3Hvn3CevCgQBV<}odro_Ley>tDAk zZ!?=4Pnn(BI|uW&!#&w(kt%UdDE6N|y)?#sUv9zD2k#Ewixv7ds2L8!o~T2IIa1ur zkdA(NoIjgpK678$s6;9l9j|_VhKE|@ccXP8Mhm&ods`M>80iJAl7f39{p(PPey+gC7zr__A5+4gJ1`B*VS#JR`t4}nwZ zBlLTdXl9sL%!eA{#M+R)`C81$aWWtGd8zdqp;m@AJ5xG-d0~&I#_(UabUv%(z*2P*7fDUjy?Ue5)Ro$jsP6 z1SEjJYQjG^pi>uy8v2sgc9pG~I3lXJgCU^_W05w@*>9TGq$AhU}-1Uge)l@Ul#Mvt>_F4g{guU+AOvlCbx zWocmkDW|HBO)F?uhD{0*jGnXuw2ya3&1kBe^OCToVn{HO!;pVJD^KJW^j5&taw}SA#AVQRu>O@b8fU?SpVZpRJ%~K9UWQHi2(iDo=)+ z_Np2QfN34NhwFZMWpV)#ZW;OOJ@Ts9Q{E+ijJ>>%A{dAzn*uDp6+eOjOlK(bn!yc4 z3Df)%>H9&ZPoB+8TVScIf;VT`ZLylC(MZQK$;_x98r0ZnB$&Rc;NiegHPV**&POj2 z)sMX4xsGPF!Cv~ZC8jwr@6;}dagnSSU9Q~?A6A5ZtdYA0vp9{tBPTwj{u#OEG4g)B zw%Fn?EMn6^SVo45=37VtP-bY13FJ@`6$ywzrKlW@|s?+;Tm8;UG{(R*c1J+C@xjCpg-|t8sO5#L3q7AzY%$;j5O%E4)C)?6gO!3N z$73ZZo;50}a?t&?EQ77;hM_~nnsg*C{>^o%12r-S^~W6n6bxMhO5*@w zw>vriJHP(dnX|leJ9H9T>F90Omj1+Gzb9CI>8)(94qLmtiia?*TMm6ab!u8DXx8A& z{Ha7Jtreebyv>mTAa>rm%b9q{L_Zlg*{-^t^=p6{FfNq!94`FrO_qt~_OeAlQem4i zY`itjb(dJX=P^sXuXY38={gxYyL<_^I78jo3oh%3Z@rupJ8g~env-Vk-K@K=^6Ih? zl||$ul3}uE2?wIT(7B#PNFXY> zeS)-;28Rj(&LID{we=R&s8|teLfKAOGXFkr(1I%-R(CrLD*?Vg!U&85Og2eZGa3ke z4tfw5bm)%!alEraPc40I_4=vWwrF7uO}$0=A&=Y3%P{?+!g&$HZ=!jlQO4v?Vy=*D zl#3WaeKr%lu-$CPuJ(A&x|&dZvOT$Z$j$Lk<1!=Ap|8H0Ip;0ecgLLG_g!z8=tskF zW0oh|z%xf^X{hgw4?k_9j55;S&kLLf+zaMJ(g|nLbXF?i~DS z^w2>90FBoZ$Zh&I#DvI@+J+M|6ob8>5HOMje#6e*u9*B#Ph&-a#KDnE{j5$IDDv6R zM&eTv~ao82XzQgsm11Q4?2J;1#Z2c(yKW zM(yPHbrBxSBcBAbXUe_3$9;re!taSwUSPrnim#cA3QdY0J{lP;`)MCC{CfHv1cJZ6 z;}nj3v>@oNhot%BR8nCiUJ(QR&JjTPvLR#>+N$@%eRB z?Z!s)I+OUC1FxLlHrAx&cm8LIg#WaLyl8TBzOwl?eZx>EtHDu4(!+`PI&Rh+^kxS% zTf13a+zQCa&mHReIlN*jc7GIRH17PzJOO`#p}=ul%0i7%p|cwfBj;)4vUkmH64UlK z@BS=BQVK5#@%RUtc-9^R0o3yCxA~byG z4$gX#AdP1?CWRA`x2XXom!?`zHbMNirA0+QxeD3Ap6AX3LTt@4_eTM}XWuc}R+jG{ z0x5oiqXlkT)Iu0bGq+3-$jWY>T;H(!^8c;1uvsnNpNDhF)&jz7p z!{ZAztx*GOf~cjv9LE(Q$~(BfKTx_cYmZc@O8<~Q5drpWU@j~sEd_;nvD0TeGZ8^0 z6g7j3vx%-9SJZJ^!3I1~(Eo%R0*9o1G)8$M=)Wqi3IwdFkBB;N8Bd>86#jgDWo$tL(o&MM z?yqb<{X2AtG4J^%^Z^$U^ggin1>OT{vo+_+XSR27QwLl_^>rNNkJ$w^xh3RI#RW2G zhUY;BdHT;%2xVF`0Z1Uwrf80X7fxhj;HYw+jQa_-^EVxp7viYsjiQ;gk&tYp<-`GV z$X5KF#j{U);D=%4FLI^uDn+t}!wyX4ez;2CFEn`FpB}mK=ZmT~Hfnh#ujOqaVIeG^#^!Qs z)orAZ=Uo=1g>D@`Nm+L9$212W# zMwf9QG8gIx6igKfNCOrmcG4joHWvfzuRrNMsCgp*CkJIlYaMgxG}1$j{c>u)<+s)-4FkP z)6fvcjA?C(vEVafH#?qkxaFP+!xoFV>_r0LP1%+%k1uA?=#J;=#mS3}teVlmT6o|J zB!?ginGvBg^#hzH9Z&s3Awxz{5>VM+$h)ARv7Y2N;XoGb4!@vSh~e3O!ixQJ0Cly* zl7L_NUR=BhGcIk|9A6;KN!l$&->O*VeoQkc`!~1cL#4Pub)T`7^$_|OvDJW#V4`^*7Gl`P7 zW;$`>7X=-x(mz=iH>c#TXOB34q1#a8S>Z<<*T!81eok^S2>pjr>Iq#=N#OCT3yc|b z61W+DR>ULZI`Y;Yt1klCXC`N6jCBa67j!5i8myp_{}sN7UynZW!~C9l(YbA;np!H8 zO{s6wn+SXxL{hU_I{s|+*-i?bJ8|^2+xfhFg>*17E-0^9Kdf876ipU>?*)h!a`;5$ zrx6n2|6M^8ZF*WBCfD`$m~h-t+>s7Gf)bSNCA0}?KnRA$rvUjEy4GnJtobm~rwG)Q{NGzcu)@_OpbXvv z?wAQPZRx3dec?H0(f!+~-Wu@i@UTd*CU2d|Yjxsxe8#+%U>1X5{=Fm!EWBQPzw~s9 z|2IfJCkvi%6&9_>jXTr(Ed9;g<;a!uEask@{+o=|!fi6#CxU9+3`21&bFDbrBNv9i zsmIDnPjBNBC1|0BdYKQQTBh)UxgQuEW4-dCvj4gHJ4`Pr+Rm?4W~TyI(nmHlML!Bg ze?HGg3Xvfz(uKzqEA-w7uT9|Zle{nFuvEx?CTJCEVb(yY z$Rcsv*@JXiC4SE1nlhniIW zPf4MJ@b5qhJ;o2X5Fy1DVj{7F6x%34gcMr{G}RAMYvV3}OO67?1hskhm9)=Cyi!l3 z%7EFCoe;zX=Kvx$o%Hy31rlWkp-zG>K>lUkN*5qlF%S`+ zq@L@5=*TU6=f+yp!N5taL%d^Byn1TV2oR9})Ac4_>d!H*k+S6<6)C3$?IF52w&$2q z=ckQjY37d&w~09&L7G)B#27uK)sk%it?NVf3)DfM6v4EiAxnNuM2ta%%1&(}hf9rM z=Tx~m0_<+B8N?<2-h2`K)DrvY$#3P)P46kaJd<6nEcI`$ag?qYtD#-V$TGNGP{2o_ z>zyVu-!msVhF=S-O8#$n{;YT!(=ae;axpnx)Kub4h9e*+BPvkpYuhn&#JXvz{imqb zW1d2Hobm@d7)E*qaD;bnHBPhAw;G{xhoh?7R!`7A)sF;vi^FhnF&5M)$D|TEH;8d~ z*{rY}NxoDltQ75&R6&9Bn?5_jFM#eH)0{6E*|VQOjOHFT_{YU~81fTdr(wMgG} zba5RNh;Dpkd)NfCtxFY%Set(yHiS%~kJ)?^pB~2kGkFRpmVU^SQyAa;Od?s2K_j=Fc_75*WpA5OBt&%iZmvnlkJ1{c+)BGD*yKNqg zgH@tyE;8E&4V;h?T==Yu42dzk<5kG@ktH)J6kMh4UAP11&TW&;NO#eAS-4= z*j75W_8K0c`3<@(l%!Rkgo0oo*`SJV$x-m+A0Vt|5Gouf52^-XP&5~=MT2z8hlCwx z*7Y=vA~%*{>vvU+GGVI+AY=CogO<74!uk6idjDRiPMbZShYMpkECGh0#qhd(^CLfN zh9tk=bB*<|UHiE?kkl@Fxrx@s3(*4F!VT ztl|4XwJpIHhGR5(D}ePiP6Wm{krv-B-z?ic8?jkX_$X$L5YTVvf4aBKF^r?~^&FW_IOmk8 z$*^fBdew>&^H3dCX_E1^wo?1z+&Nac`E#McVe6bzIPN;PgZN+_L{@FgpWueKxh(fb)2#x2<9@gEsn*X>buf<=gzmV<1)IN zY$4e912XmqttBk1pI5#X76E++K2TeUsSys`MY`6 zt6KcPUS^@*_nVs|%|?aRZ8#@5MzsR}x{@dBR|1G*=+m6c4 zkLcNKEI~zju1UiUGj0MaOyQWFaF?|qH9-A1BXJ%}t2XGSnR~N6l#WnpuGcy4oNG}% zk&Y^es;Xy^cX(do#YFP26Nr}~1vy^E#%#&XKx;$J?y|~R40=0PQ&eZU=EPX=dL4`suzA0Mo;d5d24}pQkWaTf zNrt~7$#W}b`ZTsm+H49se`t zKun$vwMk77vo;F$pP_^wC?9_20t%h2;x$SlvarJSYz>s)Pwb}3tAz1F(d0rP|KFX? z|3}nU1=X=d+xBMT4#6R~2A3eg-7UC#aChCf1%d>32o~IeJHdmyySqC)PQ82Uesrzh z{#Z3;&(TAWSx8AgTw~?LWK9pJ`n^>@Cn8tk`$&%Nv3?IkWfIwi%2`OlGCMg7cpxbZ zK-JtgxqdJnikcM)O3Y4RT#%Ir4iUt>>$Zz5+|^fbV*EjJN|dM3$wGxhLY109kMz0$ z2{N=O?=Max#1+p<(8Q|Ga7JG@t($9RJ~ViO1}4|4@%tzN+B_n3f{Q3hB0=Ikq+FOj zLv2us;`lIX9P2S&4ci7AcC6ZfMG8JD_={o|LNn|DfQ{|x=eRG0X+l$&s6iBq-jcEudx@xW+NKfRq$*MVnWR^NsZ7OeH?iRm39=`rUT zK{d5(lYT5K%rJyNLe%oE->&-==jy+@*iGCqa}r0oeAne4D)q(GC#90jab_Di#E{qAm1>W`myslqwPXCrPQyh?r&#{bYTIRibS;UlO>ug01)G%;6WRG(I<#M zSh2cGV5nZ*_+$iM{ELKxgVeqAy%y9|uD_HB?cF*{4%EwaI09v1cAzMWnW?uI^<8EK zeXlmX#McM8-6xx#-aX>0mcv~4-iO7#p>7w}h>RVoEv;Pa$eJUm9mwBr(%50+kd#AC z{m#$vm%Y=bOne8K*Fv+-I+G)Ll&)sY0@1;PanzO5zeh75Kehxh?)>vf|K5Ku363PU``$hANJY>q0gt4u2yfD!OlX6%hvz00Ses&h;N&)$6Mm^2wbhHPu5bf0lGcb)muqUL?!QxkOi*`lYah1Sik$jgH z6ACt*M6tklc=W{k<@_Ln^gAY3rKK2LJI;)>N<~N0#wGU(%^>~Y;qXoI%Kx-d2@n48-DhClM$PZTyCGc-< z8L%=}6UJG0*s}aB%-Z#%E(}}F`^N8>0u*ETBOAiieC#xWJ};aPe|^$;v)Bq2)0M?# z=ARmjzMHclVdfWHy_-JnlJpZ$k*;NnW^9t(yR;hCY4O<0M7`MOoV9e|{}I)=1c{*c zy_MgvjS4CXw1o7z)+~9!Aefzv`V9JIo{BA4JdpD+abHeGX|ea$CZg;t_#L(!??kMz z=Kkg~__`%_KQmOwmN&Pa6XKl1=XPxDpCBXt={Xi^1sO^va#xYuw$nAZG0Dws9FGzM zdDO*Ubav1`5cS)D5YAqsb39!kh;-NG>I3 zNSS|O=&j)!W^i&~{ZALIQFV=-cmefqc$dNnTvEzGp*m5B89d{xpzYa*O!ke2{Sbmb zZj8(JM19UPvn^2T>-7(_#LzsmaemhRy)wn`#)4DC1L`IbV1NY70O)`>q_XBHsU+d2 zLQcW!ZxC~t%<4q%d@lsuKY2k?-0N~msD{Yga)7Ftkm(yVhLS=fOd)(D_U1l!&fApJ zQa?YNk9uVrx3xI?<4~6G^XYBM@lzh_miwm{+Z>BAaIO%(n_XfQ% zY`rz9yPuc_vp*6C70zn zD@b4Xti{zsNAk$afli~VQ*4xCmrCt|42x_h&QMTfQ^e>h|G%#9^R2?1%8k2sb9&iX z2=|CG>^;=T#$Q(|LKsfGizsx0;s~OAUcU%vCPT%Oe&3_m&R?L2O_hp#PFgbjare!5 z_UHlq^OH+n<{iP{0YH3*j8AHapdNilwg}%+eLA5xB@Z@m3?7h}UjsAw)|)dD7(A3Z2;$;|G}P-8^@nADy`t{O{hJl*jM@z!3B;IvQnYbD#F1(PGF z{%wza8;o0jxbZH=8w83Yg(n6;op=23(6Asxd3G3tw9nAU4Df?zc3*)0(CkS3svR@= zN3Y!``{A#?BQ;a?Q)VTiEk^skSP%mGV1=0p%BR4hJ~#ZojA_73Yefu_5|T4F1iIgTbSf|$=rIWrvim&F|Vu?OaVkk_;yM@dj^twvMQ_^;cB;`5h z`x|W8LlRjaFvWzc#sko#a+m^|?&<)v{vI+PG~GL-FQT_qmhz={tvwcbK^%2)P+I-d z0ZP=IA!pcU;DYJ01t@7&!U4!W9V9aIXbp(CH~?&@Zk(G#pE@l*-FCIZk3Mt4}Z z=roc9lD0~Q9KwY}`f?-zcw#`oMX2Xo?b*F*XX@@Zie#CdgDI1`UD}zv`suI7h9=a= zA71s}kq+lc5sib@D#t(eb~!iC^VUOh9ln~8uW62^Z&RHT?`?fcRdX+ky2>;8xb-EP z-=)R9RK;qyTYC7KkXOZ(RlKpqNKjf|^wl}852~y|a>aOlnfK%547+=xu^!KROpgx2 zQ5q-cR6*$YYgpI6fE_^R?z9{Jli}1IzJ<4OG>5|n0N{Y?JfY_S{6RQ|r0S3lw2`TL zaBscKqGgNTI}0J%7KeRVfAqAHOns~|EX2#4-BTYYCqO8A2QiTKCgV*>pLTVI<GQB|y1?Xti8uIJi%iz9vt6GS<=H`|&~2 zduKyjaBIq06hgfu@U!o=yu}+2xqCDEbSdM!wEfe!$C_qdUVcI~ZW1KZ8`%M*7lVbG@rI&^yGCE?ia&!1!>zVwU# zXwcJ=go4J4Akhs>K&4>~Qx>i&>=>i=XYCT$&0T{QLxZq7n}AJt6esj#QnBRj^-q6z zg|&L*!Wzo_&8N!rfp)+QD*W;r$MEwUo(_NWaY=I%kyh_8XV`9CFK2 z$+Lz*zZ^WF)6aB+{yVyOLJqCNv}6%;U%8NT6+dBR_^clV-F(e@ft2#)=Z8voY0Ooy zVNP)NoF}9QlqIQ(43&(6=I@Ev<3HZT)C_x)X9cS05*7xt!K1?XPjt$>hwXzfgF%RJ z2z+9s4mn#?V*b=DdH9wExAZ!SEE65x7Q0V38cv(4*#;r%FEhItpANF#7=8`-NpgF_uTOJoU#X~rSm%Za7Ba{30$xOqadFHsTHKVZMhemiQ= zbd!T$@8t+u&Iu(Po6jBiQGN{D-oS&+r7ayk6&EUZbFDWq7x*rnE5mZ<)RIk88#^d~ zLiy_XK%7Ib9H)ri87EBn@`0_15aJL=^I>+k?tJlDJAHD+L<~V3X)+C-c0yqcPACp5 zg)&$Op?*YMkoA3d!mF8YZzq(1u(N(F=<@ZL( z%Xfy&H|Z^XPPK=E*_*IopS~nm&V`hCJ2|a{Y~`meeH;9p9fsw+Tr2q#1ebjoidcgp zAB9a(AOw+U0E`EOfpg5M2Y`hKR`bX5@}lW zKASrh;5#IgfaBm#x!7N5X@7h68x>SJJ0Xd)Rl$pO@TM1JGr~{4^?m2IiJSY>Yv+#` zXXU#ingrHD-MI^V1@|D*bJnPPf(ai<+!w65Fa}c>GT=UJy)wWJ)Nz#2yXer3Tt)W* zbWtrVI}CW?ve};)9aTxLD7kxa&i;}52DrUq+8vXYIGXd&bm3Un1dQgayQ zlMGTOyqIM(_>{^r#t%uZ3jF82a8Ov0T5RFb% zC3GpWHhRl-9#ui1?JLlhR^g_{A1zAu`8sk8Gj7}31gn=Z6!iRIf#%=_P%`?!>*FA$Fu-9_*=3we z6$4t#pIj!l3&u$7iFq}mIQMt^yDFzL#`}kNGg9^CEqfD#PFufo%MD-ick30?i8x0( zbut|qg1RAkZgLg~dSQEJ&nRx8XO4v%bEC@iFc_3>8VX^o_h8)e;OAkMz-;T^GauwQ znMnE_hTNu0ZhN15mlk3qh->l6LLA{C_*=<7L2Dx=$Ut2t$c2gP1;s-(Hkyx&a7rZc zperA-ddh4%D}rtt!zk)4GuWO>Jr=dX(b!2GuiV&7Vrb)(+D#tF$pI4h4aY;S1Uven zF#q8AAwaZVKPo0hYXmte{_9p0tn>L0{zEa>37g~IhJ*dWzgERX|&?Nrs0bceOHrK%<({|2Go5qUS#jH3d9pbx32eP9-HhFkmV3|iN}!fIpt|yv@e;lu zOn&JvYx;xTNJ*HKhvc43P zvCPQc2eUvav&a_SAyG=A^kM>7+QF*|dnhaxaTZ}5L;~mHuaZ zVQs#gi(b!|(o?1RlfJ6V_H9N367!k&*T`{I1z*Rc=8x>s(ct($>%pKtR4fV0WmWkg z-8iuyH432wzh&iqlMrHx$)I9%BC{Un>MDhVa3De`((qI)paT6PW47vtVnTxjOFj%5EHsWL{d}+V40oluhUMmauB%nfmaE! zC`r>ER=!S+&gZqHEB38_*)asVZ6IhOM2~fV6#x7`Fl#=mS zZM5wk)CTm=n74Ed^mrhDcC1d^#miC$kj`jcoyyDVlK)BGcbdG!NK)+5p(wbYKICn1 zJ56QE4d@@=sw5FXR3EGlXA(nnj(++mt(#RC(Jy$;XYTd5(wB3&wG9Z*WWD!LG-qZM z&oTPY$cdSX()ciYwvi!wx9gnna!1Hq|JM6Ld?SJVupx{e(c=Iqgd;YzyHx?F*4AX~ zE`$rICl)sE*4otZYq4)da`@)f}rb44(b!SUplhfK8lw~RJlo2R{IZ+Nvh zpPof#|MguErH4kh(WUE(W@5)`7S2dTwhTGx@p~rBBJ_uERoLUH?ffBy(IBRxlQ@Uj z$=ENzD(5y8C_V%pb6ml7R0yNGg+WFK^A+};K?rmQ{L@J{j6`x|0czOJ>g28qC~QcZ zfaX|yg6M?nR$50jaXZqh=jvHk1n-27FRv}VJxPUc^RG+6De$QrbwiNkmb(BCbBQ*0 za`(vO0eZ#V*6irm$QDMB-x#NY+zsgo>hd*Q%hh0DElT(mW%<*1$7?*JcZO~&j{Mc{ z5PuEN6DKZce($}l&MeHMV9P<*7xCp*b>7|EelOmbayTFg+!4#b-ZJe5B zq;aC3i`&WlM~aVA;^f19=LHuE;egI@sLlDhV6BhfR4gL*!C+=XoNJ`g^EJqgpxH^l zCv}>0!9#rEt1ye`7ubnI3?{wB;IQ$?NS$isa`GwUuutLf`HyLe)Cq6+FDN26!!vFx z+Ct5fn6uB4b^d&(iY^h!Zyg@Zck3kP9{)=wAi=*=2>(BImFfKqG9FF9dzWk^yfX;q z?@pM=H{-W}H;D3^$D7-mP5bOND-ic1P7w6^fY}Tl`9hrp69&sM=^qFNkSDtc-#cmc z0aR*Y(n^e2IBq%+@`sODcvj^p`$PFUbGBm=2>D2lT(LL z{<>4{6-2+|OIqBb=7de=uX5D0PquT)9V-IKf)ue*(hjI)j1LsCR02##Scc%CWmhXOw`2??T%f zJy^L-eed8NOhbk-$FCD(7y=7&{3UAz0{okvK9x>Ov^MH)eBD^PV|+c<$FO0|y7tGI z3%>}TyR^8SEh70X=UOUwJ#Q4)oeb2@Pv)e;xiVE|71k2d<8_^)Y4+Y7$_f9zj^^1?Zz-R>W zq#dK1yW7q|*!yc!r&-fI@M&+WeRHG6OH)rkpy*;D+NBeA1jE3To%Qoo&B0xDx5u=z zIC|59V1v0l`}bs#qu2(rq^6+i@^r$c`5a=I8CmT|{AnrS8Byb2m++GL&d z+{T=9DS4qaPP9gM@k7r^ElN}{IbE6&7cxF~X$wyn2HW2AXk<^xduY1IGJz~zFDWZR zk3@8j$aa*2;nkhI25-S9NPf;%w~shbP0np1WhKWQ_MJ)zLxTnMp$+SHGyi&}2t5ZT zA0=+-^>dC5jFc>FtOB)3O7hDM6aj?YZNzYVrmu^c^L}FE-H~*+#Sis8&>!O@`EDfr z$aYO;W&=jFD(d~R`%n3REbtLwh2S#gQOk${KwlUPkR;*~hqo8)-zhci)=5(QdwTZf z@O3F0yDe|&t^RpS$Hg4m)H0pv>mm+obA-83J+XFR$dDYu!%)=kRP>Z)07Qgs{@Bt&JbH*`$S8 zS7cGYkDwGaS2<8;!26HwFG}G6G)7Ke4*JVq$<oH6ANTa zuq}>@n}1+cR}#3Zg5c&`;&*KhVW9_OO0qvGNO8vDg$|GUin_v*Qy%?Gld@?4YKrbm zYe;eP9Dg9kU6j^X{z!l~{7?V}Q{6mpfFUa9grM#Djm*8V45j z>N|KC24)umka0L6SZ)`%^&C*FBf=g9k_87@jn3!16s-Cz@glLoge3J|`V*J8uCukK zezmnxM+06x%DC3~tXctAl9PKbl7mdR_4#j?#hdG&7B~^7#TAWG%eY5x(2g=PorWJn zj+X*xJx8Y`s6%ZzHwDS$FJV19svRHnN}KTbul^2vgJ|2o3G1@milh{Q4-%rewu%ab zXSL)-H!?4UGmCTPK8^KJ;lodcm$}8dH$Kpd_AXF28OHsZZlcfV>*!!30c3 zPjNFlxz*l(Yz1NKder~(Ta<;Dm$o6lpdi@H>kB9g7g&`LjgrKp=YU48ZjVlXe!4(X zPMllR^~VX{k^>aht$?|1J^;28v`+j!IM=Bl*iL3~^O8FCZ9fn84rro>#}uA3_Rl<@ z@%RKP9{$0QV|acWJ;Vv^$rj(L5tq zjA}+1#GUgj;|1Wlwx%v9Ob(h-J>mW#gXPZry?A)>OliKqB(?opGm~gSlIW>70(q}o zYl4@zKna&Sr9i9+Ng!0E8fq3x9pqu4XFQ`*`6B|4{(czNWqlvCKak_d0>Yz(C}{zV zQriKP>{uX?cY`l?qx$_Bvx0B?z0-|@mC4cJ&pkNt6B^}jT*zyW!w6#yF_gGG7dk2N zmK&kbL9aUpaJ8#O5=}d?%MUWqqL<ÐXmPI6tGQl8JI>L56^{gSmVN9D}_OfVPO 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 Date: Thu, 23 Jan 2025 15:44:47 -0600 Subject: [PATCH 091/121] Updated NPC README.md with hideNameTag field. --- .../main/kotlin/com/cobblemon/mod/common/api/npc/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md index bac7119cf9..e98a1bca9d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md @@ -78,6 +78,7 @@ any number of presets and the properties of those presets will be merged into th "skill": 5, "autoHealParty": true, "randomizePartyOrder": true, + "hideNameTag": false, "party": { "type": "simple", "pokemon": [ @@ -411,4 +412,7 @@ Pokémon in the party. ### ai The AI property is an array of brain configurations. This is used to configure the behaviours of the NPC. See -the documentation for brain configurations at [AI Configuration](../ai/config/README.md). \ No newline at end of file +the documentation for brain configurations at [AI Configuration](../ai/config/README.md). + +### hideNameTag +Whether the NPC's nametag should be hidden or not. Defaults to false. \ No newline at end of file From d956ca2c3c825cbd0cfd695b56e5f346afb72538 Mon Sep 17 00:00:00 2001 From: Konoha Date: Thu, 23 Jan 2025 17:25:35 -0500 Subject: [PATCH 092/121] Re-prep Inkay Easter Egg Evos :) --- .../cobblemon/species/generation6/inkay.json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation6/inkay.json b/common/src/main/resources/data/cobblemon/species/generation6/inkay.json index 0281140a23..cef35b6030 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/inkay.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/inkay.json @@ -200,6 +200,40 @@ "move": "topsyturvy" } ] + }, + { + "id": "inkay_malamar_dinnerbone", + "variant": "level_up", + "result": "malamar", + "consumeHeldItem": false, + "learnableMoves": [], + "requirements": [ + { + "variant": "level", + "minLevel": 30 + }, + { + "variant": "properties", + "target": "nickname=Dinnerbone" + } + ] + }, + { + "id": "inkay_malamar_grumm", + "variant": "level_up", + "result": "malamar", + "consumeHeldItem": false, + "learnableMoves": [], + "requirements": [ + { + "variant": "level", + "minLevel": 30 + }, + { + "variant": "properties", + "target": "nickname=Grumm" + } + ] } ] } \ No newline at end of file From 378a5ca40145608d18186384f893b44962849acd Mon Sep 17 00:00:00 2001 From: Deltric Date: Thu, 23 Jan 2025 17:01:21 -0600 Subject: [PATCH 093/121] Update evolution handler to disallow evolving while player is in battle. --- .../net/serverhandling/evolution/AcceptEvolutionHandler.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/AcceptEvolutionHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/AcceptEvolutionHandler.kt index 89ec4ad54c..4643eef86a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/AcceptEvolutionHandler.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/evolution/AcceptEvolutionHandler.kt @@ -10,6 +10,7 @@ package com.cobblemon.mod.common.net.serverhandling.evolution import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket +import com.cobblemon.mod.common.util.isInBattle import com.cobblemon.mod.common.util.party import net.minecraft.server.MinecraftServer import net.minecraft.server.level.ServerPlayer @@ -17,7 +18,7 @@ import net.minecraft.server.level.ServerPlayer object AcceptEvolutionHandler : ServerNetworkPacketHandler { override fun handle(packet: AcceptEvolutionPacket, server: MinecraftServer, player: ServerPlayer) { val pokemon = player.party()[packet.pokemonUUID] ?: return - if (pokemon.entity?.isBusy == true || pokemon.entity?.isBattling == true) return + if (player.isInBattle() || pokemon.entity?.isBusy == true) return val evolution = pokemon.evolutionProxy.server().firstOrNull { evolution -> evolution.id.equals(packet.evolutionId, true) } ?: return pokemon.evolutionProxy.server().start(evolution) } From 16a5316a69b88003adaa5fb6d042e0cb2b5671ad Mon Sep 17 00:00:00 2001 From: Deltric Date: Thu, 23 Jan 2025 19:02:14 -0600 Subject: [PATCH 094/121] Updated UnvalidatedPlaySoundS2CPacket to be public instead of internal and made its fields mutable. --- CHANGELOG.md | 4 +-- .../sound/UnvalidatedPlaySoundS2CPacket.kt | 16 ++++----- .../mod/common/util/PlayerExtensions.kt | 33 +++++++++++++++++-- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc272ab8d9..57f1d9e678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -167,6 +167,7 @@ ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. +- Updated `UnvalidatedPlaySoundS2CPacket` to be public instead of internal and made its fields mutable. ### Molang & Datapacks - Added flows for: @@ -2089,5 +2090,4 @@ Thank you so much to all of our community translators that bring the mod to the - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`. ## [1.0.0 (November 12th, 2022)](#1-0-0) -- Initial release. - +- Initial release. \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/sound/UnvalidatedPlaySoundS2CPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/sound/UnvalidatedPlaySoundS2CPacket.kt index 7ec3e76b46..9d5d637c5a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/sound/UnvalidatedPlaySoundS2CPacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/sound/UnvalidatedPlaySoundS2CPacket.kt @@ -25,14 +25,14 @@ import net.minecraft.resources.ResourceLocation * @author Licious * @since December 29th, 2022 */ -internal class UnvalidatedPlaySoundS2CPacket( - val sound: ResourceLocation, - val category: SoundSource, - val x: Double, - val y: Double, - val z: Double, - val volume: Float, - val pitch: Float +class UnvalidatedPlaySoundS2CPacket( + var sound: ResourceLocation, + var category: SoundSource, + var x: Double, + var y: Double, + var z: Double, + var volume: Float, + var pitch: Float ) : NetworkPacket { override val id = ID diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/PlayerExtensions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/PlayerExtensions.kt index 69763a3fcc..d595602e18 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/PlayerExtensions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/PlayerExtensions.kt @@ -36,6 +36,7 @@ import net.minecraft.util.Mth import net.minecraft.world.InteractionHand import net.minecraft.world.entity.Entity import net.minecraft.world.entity.LivingEntity +import net.minecraft.world.entity.item.ItemEntity import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.item.ItemStack @@ -46,7 +47,10 @@ import net.minecraft.world.phys.BlockHitResult import net.minecraft.world.phys.Vec3 import net.minecraft.world.phys.HitResult import java.util.* +import kotlin.math.PI +import kotlin.math.cos import kotlin.math.min +import kotlin.math.sin // Stuff like getting their party fun ServerPlayer.party() = Cobblemon.storage.getParty(this) @@ -396,7 +400,7 @@ fun Player.giveOrDropItemStack(stack: ItemStack, playSound: Boolean = true) { val inserted = this.inventory.add(stack) if (inserted && stack.isEmpty) { stack.count = 1 - this.drop(stack, false)?.makeFakeItem() + this.dropFakeItem(stack) if (playSound) { this.level().playSound(null, this.x, this.y, this.z, SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, 0.2f, ((this.random.nextFloat() - this.random.nextFloat()) * 0.7f + 1.0f) * 2.0f) } @@ -410,6 +414,31 @@ fun Player.giveOrDropItemStack(stack: ItemStack, playSound: Boolean = true) { } } +/** + * Utility function to mimic the [Player.drop] method but as a fake item entity. + * Avoids cases where other mods listen to that drop method and expect a real item to be dropped. + */ +fun Player.dropFakeItem(stack: ItemStack): ItemEntity { + val d = this.eyeY - 0.3 + val itemEntity = ItemEntity(this.level(), this.x, d, this.z, stack) + + val f = 0.3F + val g = sin(this.xRot * (PI / 180.0)).toFloat() + val h = cos(this.xRot * (PI / 180.0)).toFloat() + val i = sin(this.yRot * (PI / 180.0)).toFloat() + val j = cos(this.yRot * (PI / 180.0)).toFloat() + val k = this.random.nextFloat() * (PI * 2) + val l = 0.02F * this.random.nextFloat() + itemEntity.deltaMovement = Vec3( + (-i * h * f).toDouble() + cos(k) * l.toDouble(), + (-g * f + 0.1f + (this.random.nextFloat() - this.random.nextFloat()) * 0.1f).toDouble(), + (j * h * f).toDouble() + sin(k) * l.toDouble() + ) + + itemEntity.makeFakeItem() + return itemEntity +} + /** Retrieves the battle theme associated with this player, or the default PVP theme if null. */ fun ServerPlayer.getBattleTheme() = Cobblemon.playerDataManager.getGenericData(this).battleTheme?.let { BuiltInRegistries.SOUND_EVENT.get(it) } ?: CobblemonSounds.PVP_BATTLE @@ -423,4 +452,4 @@ fun Player.isPartyBusy() = fun Player.isUsingPokedex() = isUsingItem && ((mainHandItem.item is PokedexItem && usedItemHand == InteractionHand.MAIN_HAND) || - (offhandItem.item is PokedexItem && usedItemHand == InteractionHand.OFF_HAND)) + (offhandItem.item is PokedexItem && usedItemHand == InteractionHand.OFF_HAND)) \ No newline at end of file From 21f2945dc4ace8cfc6e5bff08116ba0b1ebfcbb7 Mon Sep 17 00:00:00 2001 From: Gustavo Puerari Date: Wed, 22 Jan 2025 19:19:38 +0000 Subject: [PATCH 095/121] Translated using Weblate (Portuguese (Brazil)) Currently translated at 41.4% (2648 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/ --- .../assets/cobblemon/lang/pt_br.json | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/pt_br.json b/common/src/main/resources/assets/cobblemon/lang/pt_br.json index fe840e1241..a74487ad56 100644 --- a/common/src/main/resources/assets/cobblemon/lang/pt_br.json +++ b/common/src/main/resources/assets/cobblemon/lang/pt_br.json @@ -2717,5 +2717,32 @@ "cobblemon.species.starly.name": "Starly", "cobblemon.species.staravia.name": "Staravia", "cobblemon.species.staravia.desc": "Formam revoadas surpreendentemente grandes e constantemente brigam entre si. Suspeito que aqueles com plumas magníficas em suas cabeças são os mais fortes.", - "cobblemon.species.staraptor.name": "Staraptor" + "cobblemon.species.staraptor.name": "Staraptor", + "cobblemon.species.roserade.desc": "Nos buquês de suas mãos estão escondidos chicotes farpados carregados de veneno. Roserade se move graciosamente enquanto encurrala suas presas e as ataca sem dó com seus chicotes.", + "cobblemon.species.bastiodon.desc": "Seu rosto é resistente — tal qual um diamante — e sua dureza fornece grande proteção. Pouco se sabe sobre essa espécie e seu habitat natural.", + "cobblemon.species.staraptor.desc": "Deixou o seu bando depois que ganhou força o suficiente para sobreviver sozinho. A força impressionante com a qual Staraptor voa permite com que ele carregue presas grandes e pesadas.", + "cobblemon.species.bidoof.name": "Bidoof", + "cobblemon.species.bibarel.name": "Bibarel", + "cobblemon.species.kricketot.desc": "Quando as árvores mudam de cor, mais desses Pokémon aparecem. O som que eles criam ao chocar suas antenas se assemelham à uma marimba, um instrumento de terras estrangeiras.", + "cobblemon.species.kricketune.name": "Kricketune", + "cobblemon.species.kricketune.desc": "Usa seus braços em forma de espada para produzir sons cuja melodia pode variar de indivíduo para indivíduo. Buscar por sua música favorita é uma missão pessoal deles.", + "cobblemon.species.shinx.name": "Shinx", + "cobblemon.species.shinx.desc": "Balança o corpo para gerar eletricidade. Seu tamanho contrapõe sua agressividade — é necessário paciência para domar esse Pokémon.", + "cobblemon.species.luxio.name": "Luxio", + "cobblemon.species.luxio.desc": "Tem orgulho em usar suas garras eletrificadas como armas. Parece ser um Pokémon benevolente, compartilhando os espólios de sua caçada com outros da sua espécie.", + "cobblemon.species.luxray.name": "Luxray", + "cobblemon.species.luxray.desc": "Formam matilhas, cada uma tendo um macho como líder. Lendas dizem que, quando os olhos de Luxray reluzem como o ouro, esse Pokémon pode ver através de qualquer coisa.", + "cobblemon.species.budew.name": "Budew", + "cobblemon.species.budew.desc": "Quando a luz do sol se intensifica, o botão no topo da cabeça desse Pokémon se abre. Isso costuma ser um sinal para as pessoas de que o inverno rigoroso acabou e a temporada das flores começou.", + "cobblemon.species.roserade.name": "Roserade", + "cobblemon.species.cranidos.name": "Cranidos", + "cobblemon.species.cranidos.desc": "Muito raro de se ver. Cranidos duelam entre si ao chocarem suas cabeças uma nas outras e o som que resulta disso ecoa pela área como o badalar de um sino.", + "cobblemon.species.rampardos.name": "Rampardos", + "cobblemon.species.rampardos.desc": "Se sabe pouco de sua biologia. Pode derrubar árvores imensas ao golpeá-las com sua cabeça polida.", + "cobblemon.species.shieldon.name": "Shieldon", + "cobblemon.species.shieldon.desc": "Muito sobre esse Pokémon ainda é um mistério, já que poucos o viram. Entretanto, sabemos que é calmo e não gosta de conflito, e também adora polir seu rosto usando árvores e rochas.", + "cobblemon.species.bastiodon.name": "Bastiodon", + "cobblemon.species.bidoof.desc": "Bidoof tem um rosto genuíno e raramente se espanta com alguma coisa. Há registros de incidentes onde estes Pokémon entram em uma vila e roem suas casas sem se importar nem um pouco.", + "cobblemon.species.bibarel.desc": "O pelo de Bibarel repele água e é um material perfeito para reter calor. Esses Pokémon moram nas barragens que criam.", + "cobblemon.species.kricketot.name": "Kricketot" } From f2392db3be11013dd3dfd8d223bb80398ed9a59c Mon Sep 17 00:00:00 2001 From: Deltric Date: Fri, 24 Jan 2025 04:46:48 +0000 Subject: [PATCH 096/121] [#1377] Fixed held items being stolen from NPCs --- CHANGELOG.md | 4 ++-- .../mod/common/pokemon/helditem/CobblemonHeldItemManager.kt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc272ab8d9..0ff067a9f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -164,6 +164,7 @@ - Fix PokemonProperties ability=myAbility being declared as forced despite being legal for the Pokémon - Fixed type formatting in Pokédex scanner mode when dual types require two lines - Fix trading sometimes crashing the game/server +- Fixed NPC held items being able to be stolen by players ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. @@ -2089,5 +2090,4 @@ Thank you so much to all of our community translators that bring the mod to the - Added species, ability, and move translations for `ko_ko`, `jp_jp`, `fr_fr`, `es_es`, `it_it`, and `zh_cn`. ## [1.0.0 (November 12th, 2022)](#1-0-0) -- Initial release. - +- Initial release. \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/CobblemonHeldItemManager.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/CobblemonHeldItemManager.kt index f1decf9805..f0e95f26e5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/CobblemonHeldItemManager.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/helditem/CobblemonHeldItemManager.kt @@ -124,6 +124,10 @@ object CobblemonHeldItemManager : BaseCobblemonHeldItemManager() { if (battle.isPvP && !consumeHeldItems) { return } + // Block stealing from NPCs + if (battle.isPvN) { + return + } // if items aren't consumed, then we don't want to give them to wild pokemon (dupe) if (this.giveItemEffect.contains(effectId) && (pokemon.actor is PlayerBattleActor || consumeHeldItems)) { this.give(pokemon, itemID) From 7fcb9e8b4d57d9b7dc25f13718ec347e249e3ea1 Mon Sep 17 00:00:00 2001 From: Carmendar Date: Fri, 24 Jan 2025 02:19:37 -0600 Subject: [PATCH 097/121] Riolu can stare into your soul, Charizard now uses all of his quirks, Corphish & Crawdaunt no longer T-pose. --- .../bedrock/pokemon/posers/0006_charizard/charizard.json | 4 +++- .../bedrock/pokemon/posers/0341_corphish/corphish.json | 7 ++++++- .../bedrock/pokemon/posers/0342_crawdaunt/crawdaunt.json | 6 +++++- .../cobblemon/bedrock/pokemon/posers/0447_riolu/riolu.json | 6 +++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0006_charizard/charizard.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0006_charizard/charizard.json index 1d4382f4b6..fba7c76f53 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0006_charizard/charizard.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0006_charizard/charizard.json @@ -58,7 +58,9 @@ "isTouchingWater": false, "animations": ["q.look('head_ai')", "q.bedrock('charizard', 'ground_idle')"], "quirks": [ - "q.bedrock_quirk('charizard', 'blink')" + "q.bedrock_quirk('charizard', 'blink')", + "q.bedrock_quirk('charizard', 'ground_quirk')", + "q.bedrock_primary_quirk('charizard', 'idle_quirk', 20, 40, 1, q.curve('symmetrical'))" ] }, "walking": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0341_corphish/corphish.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0341_corphish/corphish.json index 39b5f7687c..956f1002de 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0341_corphish/corphish.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0341_corphish/corphish.json @@ -14,7 +14,12 @@ }, "walking": { "poseTypes": ["WALK"], - "animations": ["q.bedrock('corphish', 'ground_idle')"] + "animations": [ + "q.bedrock('corphish', 'ground_idle')", + "q.biped_walk(0.66, 0.6, 'leg_left_back', 'leg_right_back')", + "q.quadruped_walk(0.66, 0.6, 'leg_left_front', 'leg_right_front', 'leg_left_middle', 'leg_right_middle')", + "q.bimanual_swing(0.33, 0.3, 'arm_left', 'arm_right')" + ] } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0342_crawdaunt/crawdaunt.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0342_crawdaunt/crawdaunt.json index 3a2d273042..d7a37b3685 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0342_crawdaunt/crawdaunt.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0342_crawdaunt/crawdaunt.json @@ -14,7 +14,11 @@ }, "walking": { "poseTypes": ["WALK"], - "animations": ["q.bedrock('crawdaunt', 'ground_idle')"] + "animations": [ + "q.bedrock('crawdaunt', 'ground_idle')", + "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')", + "q.bimanual_swing(0.33, 0.3, 'shoulder_left', 'shoulder_right')" + ] } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0447_riolu/riolu.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0447_riolu/riolu.json index 18bfed71a3..80ee59710f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0447_riolu/riolu.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0447_riolu/riolu.json @@ -10,13 +10,17 @@ "poses": { "standing": { "poseTypes": ["STAND", "FLOAT", "NONE", "PORTRAIT", "PROFILE"], - "animations": ["q.bedrock('riolu', 'ground_idle')"], + "animations": [ + "q.look('head')", + "q.bedrock('riolu', 'ground_idle')" + ], "quirks": ["q.bedrock_quirk('riolu', 'blink')"] }, "walking": { "poseTypes": ["WALK", "SWIM"], "isBattle": false, "animations": [ + "q.look('head')", "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')", "q.bimanual_swing(0.66, 0.6, 'arm_left', 'arm_right')", "q.bedrock('riolu', 'ground_idle')" From a6b5453b345bb9199a08017777a35926de9aa009 Mon Sep 17 00:00:00 2001 From: aeroeng15 Date: Fri, 24 Jan 2025 08:22:25 +0000 Subject: [PATCH 098/121] Fix held items disappearing for evolutions on re-logs --- CHANGELOG.md | 1 + .../mod/common/api/pokemon/evolution/Evolution.kt | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 076b29add7..c1d0915c32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -168,6 +168,7 @@ - Wild shiny sounds now respect the `shinyNoticeParticlesDistance` config setting. - Fixed Pokémon being able to evolve mid-battle - Fixed NPC held items being able to be stolen by players +- Corrected evolutions requiring a held item consuming it on evolving rather than when meeting requirements ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt index 28903de02f..2392efd619 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/Evolution.kt @@ -105,9 +105,6 @@ interface Evolution : EvolutionLike { * @param pokemon The [Pokemon] being evolved. */ fun evolve(pokemon: Pokemon): Boolean { - if (this.consumeHeldItem) { - pokemon.swapHeldItem(ItemStack.EMPTY) - } if (this.optional) { // All the networking is handled under the hood, see EvolutionController. return pokemon.evolutionProxy.server().add(this) @@ -223,6 +220,10 @@ interface Evolution : EvolutionLike { this.shed(pokemon) + if (this.consumeHeldItem) { + pokemon.swapHeldItem(ItemStack.EMPTY) + } + val ownerPlayer = pokemon.getOwnerPlayer() if (ownerPlayer != null && ownerPlayer.level().gameRules.getBoolean(CobblemonGameRules.DO_POKEMON_LOOT)) { drops.drop( From b436c42cb1b34eb5d58e5b9917a92fa967da21b4 Mon Sep 17 00:00:00 2001 From: Deltric Date: Thu, 23 Jan 2025 01:45:58 -0600 Subject: [PATCH 099/121] Hide name tag field for NPCs --- CHANGELOG.md | 2 ++ .../kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt | 3 +++ .../kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt | 2 ++ .../cobblemon/mod/common/client/render/npc/NPCRenderer.kt | 7 +++++++ .../cobblemon/mod/common/util/adapters/NPCClassAdapter.kt | 1 + 5 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d0915c32..ddc2f5050b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -194,6 +194,8 @@ - For Pokémon: - `pokemon.apply(PokemonProperties)`: Applies the given properties to the Pokémon. - `pokemon.owner`: Returns the owner of the Pokémon or 0.0 if there is no owner or they are not online. +- Added NPC field: + - `hideNameTag`: Hides the name tag of the NPC. ## [1.6.0 - The Record Catch Update (December 25th, 2024)](#1-6-0) #### "Now that there's a fishing mechanic, the mod is actually good!" diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt index 4874f4bdb5..1fd6968324 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt @@ -57,6 +57,7 @@ class NPCClass { var isInvulnerable = false var isLeashable = true var allowProjectileHits = true + var hideNameTag = false // If you're adding stuff here, add it to NPCPreset and NPCClassAdapter too @@ -97,6 +98,7 @@ class NPCClass { buffer.writeBoolean(isInvulnerable) buffer.writeBoolean(isLeashable) buffer.writeBoolean(allowProjectileHits) + buffer.writeBoolean(hideNameTag) } fun decode(buffer: RegistryFriendlyByteBuf) { @@ -148,5 +150,6 @@ class NPCClass { isInvulnerable = buffer.readBoolean() isLeashable = buffer.readBoolean() allowProjectileHits = buffer.readBoolean() + hideNameTag = buffer.readBoolean() } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt index 703b6c84d8..cc32daec50 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPreset.kt @@ -37,6 +37,7 @@ class NPCPreset { var isInvulnerable: Boolean? = null var isLeashable: Boolean? = null var allowProjectileHits: Boolean? = null + var hideNameTag: Boolean? = null fun applyTo(npcClass: NPCClass) { resourceIdentifier?.let { npcClass.resourceIdentifier = it } @@ -63,5 +64,6 @@ class NPCPreset { isInvulnerable?.let { npcClass.isInvulnerable = it } isLeashable?.let { npcClass.isLeashable = it } allowProjectileHits?.let { npcClass.allowProjectileHits = it } + hideNameTag?.let { npcClass.hideNameTag = it } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt index 2ccbd1c5ad..fe3ef308c7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt @@ -60,4 +60,11 @@ class NPCRenderer(context: Context) : LivingEntityRenderer { obj.get("isInvulnerable")?.let { npcClass.isInvulnerable = it.asBoolean } obj.get("isLeashable")?.let { npcClass.isLeashable = it.asBoolean } obj.get("allowProjectileHits")?.let { npcClass.allowProjectileHits = it.asBoolean } + obj.get("hideNameTag")?.let { npcClass.hideNameTag = it.asBoolean } return npcClass } From a09cf1b93d1574c34734b4807759f9e2db5378ce Mon Sep 17 00:00:00 2001 From: Deltric Date: Thu, 23 Jan 2025 15:44:47 -0600 Subject: [PATCH 100/121] Updated NPC README.md with hideNameTag field. --- .../main/kotlin/com/cobblemon/mod/common/api/npc/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md index bac7119cf9..e98a1bca9d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/README.md @@ -78,6 +78,7 @@ any number of presets and the properties of those presets will be merged into th "skill": 5, "autoHealParty": true, "randomizePartyOrder": true, + "hideNameTag": false, "party": { "type": "simple", "pokemon": [ @@ -411,4 +412,7 @@ Pokémon in the party. ### ai The AI property is an array of brain configurations. This is used to configure the behaviours of the NPC. See -the documentation for brain configurations at [AI Configuration](../ai/config/README.md). \ No newline at end of file +the documentation for brain configurations at [AI Configuration](../ai/config/README.md). + +### hideNameTag +Whether the NPC's nametag should be hidden or not. Defaults to false. \ No newline at end of file From 2aec4f972f93044f94001523e7053788dbe38a27 Mon Sep 17 00:00:00 2001 From: Deltric Date: Fri, 24 Jan 2025 04:23:02 -0600 Subject: [PATCH 101/121] Updated npc name tag hiding to allow individual entity based hiding. --- CHANGELOG.md | 1 + .../mod/common/client/render/npc/NPCRenderer.kt | 2 +- .../com/cobblemon/mod/common/entity/npc/NPCEntity.kt | 12 +++++++++++- .../net/messages/client/spawn/SpawnNPCPacket.kt | 7 ++++++- .../kotlin/com/cobblemon/mod/common/util/DataKeys.kt | 1 + 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddc2f5050b..8565561f76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -174,6 +174,7 @@ - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. - Updated fields in `SpawnNPCPacket` and `SpawnPokemonPacket` to be visible and mutable. - Updated `UnvalidatedPlaySoundS2CPacket` to be public instead of internal and made its fields mutable. +- Added `hideNameTag` field and `HideNPCNameTag` nbt tag to `NPCEntity` to allow hiding the name tag of the NPC. ### Molang & Datapacks - Added flows for: diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt index fe3ef308c7..993d0684de 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/npc/NPCRenderer.kt @@ -62,7 +62,7 @@ class NPCRenderer(context: Context) : LivingEntityRenderer appliedAspects.forEach { list.add(StringTag.valueOf(it)) } }) nbt.put(DataKeys.NPC_VARIATION_ASPECTS, ListTag().also { list -> variationAspects.forEach { list.add(StringTag.valueOf(it)) } }) @@ -383,6 +391,7 @@ class NPCEntity(world: Level) : AgeableMob(CobblemonEntities.NPC, world), Npc, P override fun load(nbt: CompoundTag) { npc = NPCClasses.getByIdentifier(ResourceLocation.parse(nbt.getString(DataKeys.NPC_CLASS))) ?: NPCClasses.classes.first() entityData.set(LEVEL, nbt.getInt(DataKeys.NPC_LEVEL).takeIf { it != 0 } ?: 1) + entityData.set(HIDE_NAME_TAG, nbt.getBoolean(DataKeys.NPC_HIDE_NAME_TAG)) super.load(nbt) data = MoLangFunctions.readMoValueFromNBT(nbt.getCompound(DataKeys.NPC_DATA)) as VariableStruct config = if (nbt.contains(DataKeys.NPC_CONFIG)) MoLangFunctions.readMoValueFromNBT(nbt.getCompound(DataKeys.NPC_CONFIG)) as VariableStruct else VariableStruct() @@ -490,6 +499,7 @@ class NPCEntity(world: Level) : AgeableMob(CobblemonEntities.NPC, world), Npc, P fun initialize(level: Int) { variationAspects.clear() + entityData.set(HIDE_NAME_TAG, npc.hideNameTag) entityData.set(LEVEL, level) npc.config.forEach { it.applyDefault(this) } npc.variations.values.forEach { this.variationAspects.addAll(it.provideAspects(this)) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnNPCPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnNPCPacket.kt index 7139e95f74..a9a1eafcbf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnNPCPacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/spawn/SpawnNPCPacket.kt @@ -37,6 +37,7 @@ class SpawnNPCPacket( var name: Component, var poseType: PoseType, var texture: NPCPlayerTexture, + var hideNameTag: Boolean, vanillaSpawnPacket: ClientboundAddEntityPacket ) : SpawnExtraDataEntityPacket(vanillaSpawnPacket) { @@ -50,6 +51,7 @@ class SpawnNPCPacket( entity.name, entity.entityData.get(NPCEntity.POSE_TYPE), entity.entityData.get(NPCEntity.NPC_PLAYER_TEXTURE), + entity.hideNameTag, vanillaSpawnPacket ) @@ -64,6 +66,7 @@ class SpawnNPCPacket( if (this.texture.model != NPCPlayerModelType.NONE) { buffer.writeByteArray(this.texture.texture) } + buffer.writeBoolean(this.hideNameTag) } override fun applyData(entity: NPCEntity) { @@ -74,6 +77,7 @@ class SpawnNPCPacket( entity.entityData.set(NPCEntity.ASPECTS, aspects) entity.entityData.set(NPCEntity.POSE_TYPE, poseType) entity.entityData.set(NPCEntity.NPC_PLAYER_TEXTURE, texture) + entity.entityData.set(NPCEntity.HIDE_NAME_TAG, this.hideNameTag) } override fun checkType(entity: Entity): Boolean = entity is NPCEntity @@ -93,9 +97,10 @@ class SpawnNPCPacket( } else { NPCPlayerTexture(byteArrayOf(), model) } + val hideNameTag = buffer.readBoolean() val vanillaPacket = decodeVanillaPacket(buffer) - return SpawnNPCPacket(npc, aspects, level, battleIds, name, poseType, texture, vanillaPacket) + return SpawnNPCPacket(npc, aspects, level, battleIds, name, poseType, texture, hideNameTag, vanillaPacket) } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt index 1489c5ef79..31ba92c628 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt @@ -225,6 +225,7 @@ object DataKeys { const val NPC_HITBOX_WIDTH = "Width" const val NPC_HITBOX_HEIGHT = "Height" const val NPC_HITBOX_FIXED = "Fixed" + const val NPC_HIDE_NAME_TAG = "HideNPCNameTag" // PokemonProperties const val ELEMENTAL_TYPE = "ElementalType" From 61b767158ad58eb555b3c8dd9f05b5beb5fc9c34 Mon Sep 17 00:00:00 2001 From: aeroeng15 Date: Fri, 24 Jan 2025 22:58:15 +0000 Subject: [PATCH 102/121] Fix default form in battle targeting --- CHANGELOG.md | 1 + .../common/client/gui/battle/subscreen/BattleTargetSelection.kt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d0915c32..b84ac9e7b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -169,6 +169,7 @@ - Fixed Pokémon being able to evolve mid-battle - Fixed NPC held items being able to be stolen by players - Corrected evolutions requiring a held item consuming it on evolving rather than when meeting requirements +- Fixed Pokémon showing only the default form when selecting a battle target ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleTargetSelection.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleTargetSelection.kt index e8c766b3d0..201964d174 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleTargetSelection.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleTargetSelection.kt @@ -191,6 +191,8 @@ class BattleTargetSelection( matrices.pushPose() matrices.translate(x + TARGET_WIDTH - (25 / 2.0) - 2, y + 5.0, 0.0) matrices.scale(2.5F, 2.5F, 1F) + // Grab aspects for right variant + state.currentAspects = battlePokemon.state.currentAspects drawProfilePokemon( species = battlePokemon.species.resourceIdentifier, matrixStack = matrices, From ff27676187afc8d03fdd0ceea80313cadf3fa01b Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 25 Jan 2025 09:48:23 +1000 Subject: [PATCH 103/121] Started playing around with more generalised wandering through mediums --- .../mod/common/api/ai/PathfindingMedium.kt | 14 +++++ .../entity/pokemon/ai/goals/WildRestGoal.kt | 56 ------------------- .../mod/common/pokemon/ai/RestBehaviour.kt | 1 - .../mod/common/util/EntityExtensions.kt | 13 ++++- 4 files changed, 26 insertions(+), 58 deletions(-) create mode 100644 common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt delete mode 100644 common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/WildRestGoal.kt diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt new file mode 100644 index 0000000000..fe1c943214 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt @@ -0,0 +1,14 @@ +package com.cobblemon.mod.common.api.ai + +/** + * The medium that an entity might be in which motivates what type of wandering it should do. + * + * @author Hiroku + * @since January 25th, 2025 + */ +enum class PathfindingMedium { + LAND, + WATER, + LAVA, + AIR +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/WildRestGoal.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/WildRestGoal.kt deleted file mode 100644 index e90a74b74e..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/WildRestGoal.kt +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2023 Cobblemon Contributors - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -package com.cobblemon.mod.common.entity.pokemon.ai.goals - -import com.cobblemon.mod.common.api.pokemon.status.Statuses -import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.pokemon.status.PersistentStatusContainer -import net.minecraft.world.entity.ai.goal.Goal -import java.util.* - -/** - * AI goal for sleeping in the wild. - * - * @author Hiroku - * @since July 18th, 2022 - */ -class WildRestGoal(private val pokemonEntity: PokemonEntity) : Goal() { - override fun getFlags(): EnumSet = EnumSet.allOf(Flag::class.java) - - override fun canUse(): Boolean { - val rest = pokemonEntity.behaviour.resting - if (!pokemonEntity.pokemon.isWild() || pokemonEntity.random.nextFloat() < 1 - rest.sleepChance || !pokemonEntity.canSleep() || pokemonEntity.isBusy || !rest.depth.canSleep(pokemonEntity)) { - return false - } - return true - } - - override fun isInterruptable(): Boolean { - return false - } - - override fun canContinueToUse(): Boolean { - return if (pokemonEntity.canSleep() && !pokemonEntity.behaviour.resting.depth.shouldWake(pokemonEntity)) { - true - } else { - wake() - false - } - } - - override fun start() { - pokemonEntity.pokemon.status = PersistentStatusContainer(Statuses.SLEEP) - } - - fun wake() { - if (pokemonEntity.battleId == null) { - pokemonEntity.pokemon.status = null - } - } -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/RestBehaviour.kt b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/RestBehaviour.kt index e07164cf33..c541927df5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/RestBehaviour.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/RestBehaviour.kt @@ -23,7 +23,6 @@ import net.minecraft.world.level.biome.Biome class RestBehaviour { val canSleep = false val times = TimeRange.timeRanges["night"]!! - val sleepChance = 1 / 600F val blocks = mutableListOf>() val biomes = mutableListOf>() val light = IntRange(0, 15) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt index 766cfabae2..3345c2d2fd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/EntityExtensions.kt @@ -8,9 +8,9 @@ package com.cobblemon.mod.common.util +import com.cobblemon.mod.common.api.ai.PathfindingMedium import com.google.common.collect.ImmutableMap import com.mojang.serialization.Dynamic -import com.mojang.serialization.DynamicOps import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.nbt.NbtOps @@ -18,7 +18,9 @@ import net.minecraft.nbt.Tag import net.minecraft.network.syncher.EntityDataAccessor import net.minecraft.network.syncher.SynchedEntityData import net.minecraft.world.entity.Entity +import net.minecraft.world.entity.PathfinderMob import net.minecraft.world.level.block.Blocks +import net.minecraft.world.level.pathfinder.PathType.WALKABLE import net.minecraft.world.phys.AABB import net.minecraft.world.phys.Vec3 import net.minecraft.world.phys.shapes.BooleanOp @@ -220,6 +222,15 @@ fun Entity.isStandingOnSand(): Boolean { return false } +fun PathfinderMob.getPathfindingMedium(): PathfindingMedium { + return when { + this.isUnderWater -> PathfindingMedium.WATER + this.isInLava -> PathfindingMedium.LAVA + navigation.nodeEvaluator.getPathType(this, blockPosition()) == WALKABLE -> PathfindingMedium.LAND + else -> PathfindingMedium.AIR + } +} + fun Entity.isStandingOnRedSand(): Boolean { val redSandDepth = 2 // Define the depth you want to check for (i in 1..redSandDepth) { From 8c04081af5581afdf1f25de710852c863ea39ca1 Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 25 Jan 2025 10:00:50 +1000 Subject: [PATCH 104/121] Fixed uncaught exception from fishing reeling in blocked entity spawns --- CHANGELOG.md | 1 + .../common/entity/fishing/PokeRodFishingBobberEntity.kt | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b84ac9e7b7..f8b08cb0c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -170,6 +170,7 @@ - Fixed NPC held items being able to be stolen by players - Corrected evolutions requiring a held item consuming it on evolving rather than when meeting requirements - Fixed Pokémon showing only the default form when selecting a battle target +- Fixed a possible error coming out of reeling fishing rods in specific situations. ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt index 139d92a658..fb5d7844cb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt @@ -698,10 +698,9 @@ class PokeRodFishingBobberEntity(type: EntityType Date: Sat, 25 Jan 2025 10:37:19 +1000 Subject: [PATCH 105/121] Corrected luck of the sea bucket weights and simplified calculation code --- CHANGELOG.md | 1 + .../fishing/PokeRodFishingBobberEntity.kt | 36 ++++++------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8b08cb0c1..d7ad7d58d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -171,6 +171,7 @@ - Corrected evolutions requiring a held item consuming it on evolving rather than when meeting requirements - Fixed Pokémon showing only the default form when selecting a battle target - Fixed a possible error coming out of reeling fishing rods in specific situations. +- Fixed incorrect weights being used when Poké Fishing with Luck of the Sea. ### Developer - Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt index fb5d7844cb..0a22e9f4d7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt @@ -35,6 +35,7 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace import com.cobblemon.mod.common.util.cobblemonResource import com.cobblemon.mod.common.util.lang import com.cobblemon.mod.common.util.toBlockPos +import com.cobblemon.mod.common.util.weightedSelection import net.minecraft.advancements.CriteriaTriggers import net.minecraft.client.resources.sounds.EntityBoundSoundInstance import net.minecraft.core.BlockPos @@ -183,33 +184,16 @@ class PokeRodFishingBobberEntity(type: EntityType, luckOfTheSeaLevel: Int): SpawnBucket { - val baseIncreases = listOf(2.5F, 0.5F, 0.2F) // Base increases for the first three buckets beyond the first + val baseValues = listOf(93.8F, 5.0F, 1.0F, 0.2F) + val adjustments = listOf(-4.1F, 2.5F, 1.0F, 0.6F) + val adjustedWeights = buckets.mapIndexed { index, bucket -> - if (index == 0) { - // Placeholder, will be recalculated - 0.0F - } else { - val increase = if (index < baseIncreases.size) baseIncreases[index] else baseIncreases.last() + (index - baseIncreases.size + 1) * 0.15F - bucket.weight + increase * luckOfTheSeaLevel - } - }.toMutableList() + val base = baseValues[index] + val adjustment = adjustments[index] + bucket to (base + adjustment * luckOfTheSeaLevel) + }.toMap() - // Recalculate the first bucket's weight to ensure the total is 100% - val totalAdjustedWeight = adjustedWeights.sum() - adjustedWeights[0] // Corrected to ensure the list contains Floats - adjustedWeights[0] = 100.0F - totalAdjustedWeight + buckets[0].weight - - // Random selection based on adjusted weights - val weightSum = adjustedWeights.sum() - val chosenSum = kotlin.random.Random.nextDouble(weightSum.toDouble()).toFloat() // Ensure usage of Random from kotlin.random package - var sum = 0.0F - adjustedWeights.forEachIndexed { index, weight -> - sum += weight - if (sum >= chosenSum) { - return buckets[index] - } - } - - return buckets.first() // Fallback + return buckets.weightedSelection { adjustedWeights[it]!! }!! } fun isOpenOrWaterAround(pos: BlockPos): Boolean { @@ -335,7 +319,7 @@ class PokeRodFishingBobberEntity(type: EntityType chosenBucket = event.chosenBucket From ea499a935e7232fbae79f5273a45f81214dfdb95 Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 25 Jan 2025 11:02:58 +1000 Subject: [PATCH 106/121] Updated fishing bucket rates --- .../mod/common/entity/fishing/PokeRodFishingBobberEntity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt index 0a22e9f4d7..9fa86c4865 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt @@ -184,8 +184,8 @@ class PokeRodFishingBobberEntity(type: EntityType, luckOfTheSeaLevel: Int): SpawnBucket { - val baseValues = listOf(93.8F, 5.0F, 1.0F, 0.2F) - val adjustments = listOf(-4.1F, 2.5F, 1.0F, 0.6F) + val baseValues = listOf(94.3F, 5.0F, 0.5F, 0.2F) + val adjustments = listOf(-3.75F, 2.5F, 0.9F, 0.35F) val adjustedWeights = buckets.mapIndexed { index, bucket -> val base = baseValues[index] From f920639e3f5de82f87bdff0899ecbcbfe025458f Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 25 Jan 2025 11:35:10 +1000 Subject: [PATCH 107/121] Protect luck of the sea adjustments against custom buckets --- .../mod/common/entity/fishing/PokeRodFishingBobberEntity.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt index 9fa86c4865..3e07e1fa84 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt @@ -188,6 +188,9 @@ class PokeRodFishingBobberEntity(type: EntityType + if (index >= baseValues.size) { + return@mapIndexed bucket to bucket.weight + } val base = baseValues[index] val adjustment = adjustments[index] bucket to (base + adjustment * luckOfTheSeaLevel) From 938b7a7a94194c5457e235b1d9b4f9f47b559f2e Mon Sep 17 00:00:00 2001 From: Polymeta <40173118+Polymeta@users.noreply.github.com> Date: Sat, 25 Jan 2025 01:38:00 +0000 Subject: [PATCH 108/121] flip UVs to make particle sprite point the other direction Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com> --- .../cobblemon/mod/common/client/render/SnowstormParticle.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt index 24885da388..c3404608b0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt @@ -204,8 +204,8 @@ class SnowstormParticle( val spriteURange = sprite.u1 - sprite.u0 val spriteVRange = sprite.v1 - sprite.v0 - val minU = uvs.startU * spriteURange + sprite.u0 - val maxU = uvs.endU * spriteURange + sprite.u0 + val maxU = uvs.startU * spriteURange + sprite.u0 + val minU = uvs.endU * spriteURange + sprite.u0 val minV = uvs.startV * spriteVRange + sprite.v0 val maxV = uvs.endV * spriteVRange + sprite.v0 From 29b763ef1976cb1884c4891beccdbbcf56048e6c Mon Sep 17 00:00:00 2001 From: Veraxiel <86495981+Veraxiel@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:40:50 -0500 Subject: [PATCH 109/121] Updated spawns and tags. --- .../spawn_pool_world/0027_sandshrew.json | 3 +- .../spawn_pool_world/0028_sandslash.json | 3 +- .../spawn_pool_world/0081_magnemite.json | 6 +- .../spawn_pool_world/0082_magneton.json | 6 +- .../spawn_pool_world/0104_cubone.json | 3 +- .../spawn_pool_world/0105_marowak.json | 3 +- .../spawn_pool_world/0128_tauros.json | 58 +++++++++++++------ .../spawn_pool_world/0136_flareon.json | 3 +- .../spawn_pool_world/0227_skarmory.json | 3 +- .../spawn_pool_world/0331_cacnea.json | 3 +- .../spawn_pool_world/0332_cacturne.json | 3 +- .../spawn_pool_world/0343_baltoy.json | 3 +- .../spawn_pool_world/0344_claydol.json | 3 +- .../spawn_pool_world/0462_magnezone.json | 6 +- .../spawn_pool_world/0556_maractus.json | 3 +- .../spawn_pool_world/0561_sigilyph.json | 3 +- .../spawn_pool_world/0591_amoonguss.json | 51 ++++++++++++++++ .../spawn_pool_world/0599_klink.json | 2 +- .../spawn_pool_world/0600_klang.json | 2 +- .../spawn_pool_world/0601_klinklang.json | 2 +- .../tags/worldgen/biome/is_arid.json | 3 +- utilityscripts/cobblemon_spawn_csv_to_json.py | 4 ++ 22 files changed, 132 insertions(+), 44 deletions(-) create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0027_sandshrew.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0027_sandshrew.json index d829755faf..21422b0784 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0027_sandshrew.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0027_sandshrew.json @@ -16,7 +16,8 @@ "weight": 9.0, "condition": { "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0028_sandslash.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0028_sandslash.json index 7c3ade8983..fdcdf30b1b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0028_sandslash.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0028_sandslash.json @@ -16,7 +16,8 @@ "weight": 1.0, "condition": { "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json index e92ff2e743..af9909ec36 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0081_magnemite.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "8-33", - "weight": 8.4, + "weight": 84.0, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -30,9 +30,9 @@ "pokemon": "magnemite", "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "8-33", - "weight": 84.0, + "weight": 1.8, "weightMultiplier": { "multiplier": 5.0, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json index 8e568d6716..17e1571aeb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0082_magneton.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "30-47", - "weight": 1.52, + "weight": 15.2, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -30,9 +30,9 @@ "pokemon": "magneton", "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "30-47", - "weight": 15.2, + "weight": 0.19, "weightMultiplier": { "multiplier": 5.0, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json index 7e9c02a288..3e12afe49a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0104_cubone.json @@ -19,7 +19,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json index 3b6680a66b..ff0e423f18 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0105_marowak.json @@ -19,7 +19,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json index c592c0fe2d..8dd847e647 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0128_tauros.json @@ -34,8 +34,8 @@ } }, { - "id": "tauros-paldean-2", - "pokemon": "tauros paldean", + "id": "tauros-combat-2", + "pokemon": "tauros paldean bull_breed=combat", "presets": [ "natural" ], @@ -43,7 +43,7 @@ "context": "grounded", "bucket": "common", "level": "24-49", - "weight": 2.0, + "weight": 1.8, "weightMultiplier": { "multiplier": 0.25, "condition": { @@ -59,8 +59,8 @@ } }, { - "id": "tauros-paldean-3", - "pokemon": "tauros paldean", + "id": "tauros-blaze-3", + "pokemon": "tauros paldean bull_breed=blaze", "presets": [ "natural" ], @@ -68,13 +68,23 @@ "context": "grounded", "bucket": "common", "level": "24-49", - "weight": 2.0, - "weightMultiplier": { - "multiplier": 0.25, - "condition": { - "timeRange": "night" + "weight": 0.1, + "weightMultipliers": [ + { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + { + "multiplier": 5.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:lava" + ] + } } - }, + ], "condition": { "minSkyLight": 8, "maxSkyLight": 15, @@ -84,8 +94,8 @@ } }, { - "id": "tauros-paldean-4", - "pokemon": "tauros paldean", + "id": "tauros-aqua-4", + "pokemon": "tauros paldean bull_breed=aqua", "presets": [ "natural" ], @@ -93,13 +103,23 @@ "context": "grounded", "bucket": "common", "level": "24-49", - "weight": 2.0, - "weightMultiplier": { - "multiplier": 0.25, - "condition": { - "timeRange": "night" + "weight": 0.1, + "weightMultipliers": [ + { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + { + "multiplier": 5.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } } - }, + ], "condition": { "minSkyLight": 8, "maxSkyLight": 15, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json index 00f033d6b7..8a034443c6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0136_flareon.json @@ -18,7 +18,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ] } }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0227_skarmory.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0227_skarmory.json index e73324f2f8..7999fe9493 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0227_skarmory.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0227_skarmory.json @@ -19,7 +19,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_sandy", + "#cobblemon:is_badlands", + "#cobblemon:is_desert", "#cobblemon:is_sky" ], "timeRange": "day" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json index 7c57337bf2..6fbbe7c748 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0331_cacnea.json @@ -24,7 +24,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json index 73a7d547cf..de853e9418 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0332_cacturne.json @@ -24,7 +24,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json index f9936e805f..0412fe16a0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0343_baltoy.json @@ -18,7 +18,8 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ], "minY": 0 }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json index fcaf813540..1c3646e9ca 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0344_claydol.json @@ -18,7 +18,8 @@ "minSkyLight": 0, "maxSkyLight": 7, "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ], "minY": 0 }, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json index 4a92b0322e..3e8eb33842 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0462_magnezone.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "uncommon", "level": "42-54", - "weight": 0.08, + "weight": 0.8, "condition": { "biomes": [ "#cobblemon:is_overworld" @@ -30,9 +30,9 @@ "pokemon": "magnezone", "type": "pokemon", "context": "grounded", - "bucket": "uncommon", + "bucket": "common", "level": "42-54", - "weight": 0.8, + "weight": 0.01, "weightMultiplier": { "multiplier": 5.0, "condition": { diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0556_maractus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0556_maractus.json index 5384e91875..92d676cfb6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0556_maractus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0556_maractus.json @@ -24,7 +24,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ] } } diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json index 8ea85ef17f..b6de7e7e7b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0561_sigilyph.json @@ -18,7 +18,8 @@ "minSkyLight": 8, "maxSkyLight": 15, "biomes": [ - "#cobblemon:is_sandy" + "#cobblemon:is_badlands", + "#cobblemon:is_desert" ], "structures": [ "#cobblemon:ruin" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json new file mode 100644 index 0000000000..6af3d28af2 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json @@ -0,0 +1,51 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "amoonguss-1", + "pokemon": "amoonguss", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "39-46", + "weight": 1.0, + "condition": { + "minSkyLight": 0, + "maxSkyLight": 7, + "biomes": [ + "#cobblemon:is_mushroom" + ] + } + }, + { + "id": "amoonguss-2", + "pokemon": "amoonguss", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "39-46", + "weight": 1.0, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "day" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_mushroom" + ] + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0599_klink.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0599_klink.json index 83fb2321d3..d9859774f9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0599_klink.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0599_klink.json @@ -59,7 +59,7 @@ "context": "grounded", "bucket": "common", "level": "5-30", - "weight": 9.0, + "weight": 1.8, "condition": { "biomes": [ "#cobblemon:is_overworld" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0600_klang.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0600_klang.json index 71b0456671..fb7d9c9e5c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0600_klang.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0600_klang.json @@ -59,7 +59,7 @@ "context": "grounded", "bucket": "common", "level": "38-44", - "weight": 0.9, + "weight": 0.18, "condition": { "biomes": [ "#cobblemon:is_overworld" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0601_klinklang.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0601_klinklang.json index 8aa4002029..c7e34829a5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0601_klinklang.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0601_klinklang.json @@ -59,7 +59,7 @@ "context": "grounded", "bucket": "common", "level": "49-52", - "weight": 0.1, + "weight": 0.02, "condition": { "biomes": [ "#cobblemon:is_overworld" diff --git a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_arid.json b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_arid.json index 47c0aaea80..5d53aa8da7 100644 --- a/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_arid.json +++ b/common/src/main/resources/data/cobblemon/tags/worldgen/biome/is_arid.json @@ -1,7 +1,8 @@ { "replace": false, "values": [ - "#cobblemon:is_sandy", + "#cobblemon:is_badlands", + "#cobblemon:is_desert", "#cobblemon:is_savanna" ] } diff --git a/utilityscripts/cobblemon_spawn_csv_to_json.py b/utilityscripts/cobblemon_spawn_csv_to_json.py index 6e7f0801a4..18868420f6 100644 --- a/utilityscripts/cobblemon_spawn_csv_to_json.py +++ b/utilityscripts/cobblemon_spawn_csv_to_json.py @@ -414,6 +414,10 @@ def transform_pokemon_to_json(pokemon_rows, invalid_biome_tags, drops_df): multiplier_condition["timeRange"] = "dawn" case "Beehive": multiplier_condition["neededNearbyBlocks"] = ["#minecraft:beehives"] + case "Water": + multiplier_condition["neededNearbyBlocks"] = ["#minecraft:water"] + case "Lava": + multiplier_condition["neededNearbyBlocks"] = ["#minecraft:lava"] case "Full Moon": multiplier_condition["moonPhase"] = 0 case "New Moon": From 9bf526e93e8ab67e342ef907e11d56ac9e02bc25 Mon Sep 17 00:00:00 2001 From: Polymeta <40173118+Polymeta@users.noreply.github.com> Date: Sat, 25 Jan 2025 02:00:11 +0000 Subject: [PATCH 110/121] deleted typo'd amoonguss file Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com> --- .../spawn_pool_world/0591_amoongus.json | 51 ------------------- 1 file changed, 51 deletions(-) delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json deleted file mode 100644 index 920d8e5203..0000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoongus.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "amoongus-1", - "pokemon": "amoongus", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "39-46", - "weight": 1.0, - "condition": { - "minSkyLight": 0, - "maxSkyLight": 7, - "biomes": [ - "#cobblemon:is_mushroom" - ] - } - }, - { - "id": "amoongus-2", - "pokemon": "amoongus", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "39-46", - "weight": 1.0, - "weightMultiplier": { - "multiplier": 0.25, - "condition": { - "timeRange": "day" - } - }, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:is_mushroom" - ] - } - } - ] -} \ No newline at end of file From 578ff3770546f20cf947c22bcd6cca44c6c1a42e Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 25 Jan 2025 14:29:18 +1000 Subject: [PATCH 111/121] More tweaks to bucket jumps for luck of the sea enchants --- .../mod/common/entity/fishing/PokeRodFishingBobberEntity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt index 3e07e1fa84..d645fce11e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt @@ -185,7 +185,7 @@ class PokeRodFishingBobberEntity(type: EntityType, luckOfTheSeaLevel: Int): SpawnBucket { val baseValues = listOf(94.3F, 5.0F, 0.5F, 0.2F) - val adjustments = listOf(-3.75F, 2.5F, 0.9F, 0.35F) + val adjustments = listOf(-4.1F, 2.5F, 1.0F, 0.6F) val adjustedWeights = buckets.mapIndexed { index, bucket -> if (index >= baseValues.size) { From 34b433784935b88723ac70fd1648dbc6f647d657 Mon Sep 17 00:00:00 2001 From: Carmendar Date: Sat, 25 Jan 2025 03:14:00 -0600 Subject: [PATCH 112/121] Updated Eiscue Noice lang --- common/src/main/resources/assets/cobblemon/lang/en_us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/en_us.json b/common/src/main/resources/assets/cobblemon/lang/en_us.json index ca867701ce..59dcbc98b7 100644 --- a/common/src/main/resources/assets/cobblemon/lang/en_us.json +++ b/common/src/main/resources/assets/cobblemon/lang/en_us.json @@ -1090,7 +1090,7 @@ "cobblemon.ui.pokedex.info.form.squawkabilly-color-green": "Green", "cobblemon.ui.pokedex.info.form.squawkabilly-color-yellow": "Yellow", "cobblemon.ui.pokedex.info.form.maushold-family-four": "Family", - "cobblemon.ui.pokedex.info.form.no_ice": "No Ice", + "cobblemon.ui.pokedex.info.form.noice-face": "Noice", "cobblemon.ui.pokedex.info.form.color-light_gray": "Light Gray", "cobblemon.ui.pokedex.info.form.color-gray": "Gray", @@ -6060,7 +6060,7 @@ "cobblemon.species.stonjourner.desc": "Once a year, on a specific date and at a specific time, they gather out of nowhere and form up in a circle.", "cobblemon.species.eiscue.name": "Eiscue", "cobblemon.species.eiscue.desc": "Eiscue live in coastal, frozen seas, making their nests on glaciers and sliding playfully along the ice. The single hair on their heads radiate an intense cold, freezing the seawater around them into a protective block of ice. Although this helmet is heavy, it is very buoyant, allowing Eiscue to travel long distances by simply floating on the current.", - "cobblemon.species.eiscue-noice.desc": "When subject to a particularly forceful blow, the ice blocks that cover an Eiscue's head shatters completely, leaving their small heads exposed. Although they usually tend to avoid this shattering, there are cases where they are seen causing it intentionally. Because they are much quicker without their block, they oftentimes shatter it before diving for their prey.", + "cobblemon.species.eiscue-noiceface.desc": "When subject to a particularly forceful blow, the ice blocks that cover an Eiscue's head shatters completely, leaving their small heads exposed. Although they usually tend to avoid this shattering, there are cases where they are seen causing it intentionally. Because they are much quicker without their block, they oftentimes shatter it before diving for their prey.", "cobblemon.species.indeedee.name": "Indeedee", "cobblemon.species.indeedee.desc": "Through its horns, it can pick up on the emotions of creatures around it. Positive emotions are the source of its strength.", "cobblemon.species.morpeko.name": "Morpeko", From 17d6837e34113d2dee53b37ec73c8024d863235a Mon Sep 17 00:00:00 2001 From: Gustavo Puerari Date: Fri, 24 Jan 2025 18:21:28 +0000 Subject: [PATCH 113/121] Translated using Weblate (Portuguese (Brazil)) Currently translated at 42.1% (2695 of 6391 strings) Translation: Cobblemon/Mod Translate-URL: http://lang.cobblemon.com/projects/cobblemon/mod/pt_BR/ --- .../assets/cobblemon/lang/pt_br.json | 96 ++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/cobblemon/lang/pt_br.json b/common/src/main/resources/assets/cobblemon/lang/pt_br.json index a74487ad56..102a5aef0c 100644 --- a/common/src/main/resources/assets/cobblemon/lang/pt_br.json +++ b/common/src/main/resources/assets/cobblemon/lang/pt_br.json @@ -2744,5 +2744,99 @@ "cobblemon.species.bastiodon.name": "Bastiodon", "cobblemon.species.bidoof.desc": "Bidoof tem um rosto genuíno e raramente se espanta com alguma coisa. Há registros de incidentes onde estes Pokémon entram em uma vila e roem suas casas sem se importar nem um pouco.", "cobblemon.species.bibarel.desc": "O pelo de Bibarel repele água e é um material perfeito para reter calor. Esses Pokémon moram nas barragens que criam.", - "cobblemon.species.kricketot.name": "Kricketot" + "cobblemon.species.kricketot.name": "Kricketot", + "cobblemon.species.ambipom.desc": "Para reforçar sua afinidade, membros dessa espécie formam um círculo conectando suas recém adquiridas caudas duplas. Em raras ocasiões, humanos foram aceitos nesses círculos.", + "cobblemon.species.buneary.desc": "Minha hipótese sobre o porquê de Buneary enrolar suas orelhas é por sua audição ser boa demais. Eu concluo que o Pokémon protege sua audição limitando os sons que podem entrar em suas orelhas.", + "cobblemon.species.stunky.name": "Stunky", + "cobblemon.species.bronzor.desc": "Flutua usando uma energia misteriosa. O padrão em suas costas é considerado sagrado e pode ser encontrado em retratações de antigos cemitérios e outros lugares desgastados pelo tempo.", + "cobblemon.species.mimejr.desc": "Vez ou outra aparece em mercados movimentados. Imita as pessoas tal qual uma criança faria e então observa suas reações com olhos reluzentes.", + "cobblemon.species.vespiquen.desc": "Ordena seus súditos a construir sua colmeia. Vespiqueen enfrentará qualquer intruso que tente se infiltrar e se alimentar do néctar da colmeia.", + "cobblemon.species.floatzel.desc": "Tem uma longa e esbelta boia que protege Floatzel de se afogar mesmo em mares tempestuosos. É comum encontrar essa espécie nas redondezas de vilarejos pesqueiros de tempos em tempos.", + "cobblemon.species.lopunny.desc": "Seu pelo é quente e inesperadamente leve. Esse Pokémon dá chutes como se fosse um mestre do caratê, afastando oponentes com facilidade.", + "cobblemon.species.mothim.desc": "Dispersa escamas reluzentes enquanto bate suas asas. Apesar de se alimentar principalmente de néctar de flores, Mothim dificilmente é visto em jardins floridos.", + "cobblemon.species.cherrim.desc": "É imóvel, salvo esporádicos tremores. É possível encontra uma grande gama de Pokémon reunidas ao seu redor, atraída pelo odor produzido pelas pétalas dobradas de Cherrim.", + "cobblemon.species.honchkrow.desc": "Um grito desse Pokémon e um bando de Murkrow virão voando. Nesses momentos, parece que a mortalha da noite caiu e lançou o mundo em uma escuridão eterna.", + "cobblemon.species.chingling.desc": "Esse Pokémon me causou uma dor de cabeça insuportável quando fez menção de gritar, mas não houve som algum. Talvez haja alguns sons que o ouvido humano é incapaz de ouvir.", + "cobblemon.species.gible.name": "Gible", + "cobblemon.species.riolu.desc": "Apesar de parecer infantil, tem a misteriosa habilidade de ler a mente de humanos. Aqueles puros de coração recebem a aprovação de Riolu, enquanto aqueles com más intenções recebem apenas seu ódio.", + "cobblemon.species.spiritomb.desc": "Roga maldições ao ter pensamentos perversos. Registros contam que esse Pokémon nasceu da reunião de cento e oito espíritos malignos.", + "cobblemon.species.gible.desc": "Se abriga em cavernas intocadas pela luz do sol. Seus dentes afiados podem cair quando estão gastos ou após um impacto, mas eles crescem novamente dentro de alguns dias.", + "cobblemon.species.garchomp.desc": "Voa pelos céus em velocidades ofuscantes — uma cena incrível! Tem um comportamento feral. É necessário cuidado máximo ao encontrar Garchomp na natureza.", + "cobblemon.species.hippowdon.desc": "Se irritam facilmente e atacam sem o menor aviso. Ergue vendavais de areia e esmaga a moral de seus inimigos, e só então avança.", + "cobblemon.species.croagunk.desc": "Um ser venenoso de personalidade covarde. Apesar dessas características, essa espécie é popular por conta de seu som peculiar e traços cômicos.", + "cobblemon.species.finneon.desc": "Que linda cena é esse Pokémon nadando com suas nadadeiras rosas. A linda aparência de Finneon o rendeu o apelido: \"peixe elegância.\"", + "cobblemon.species.mantyke.desc": "Apesar de redondo, esse Pokémon é um ótimo nadador. Eu descobri que se Mantyke passa tempo demais com cardumes de Remoraid, eventualmente consegue evoluir.", + "cobblemon.species.burmy.name": "Burmy", + "cobblemon.species.burmy.desc": "Se seu manto for minimamente danificado, Burmy imediatamente o repara com o que estiver por perto. O Pokémon dentro do manto é magro e vulnerável ao frio.", + "cobblemon.species.wormadam.name": "Wormadam", + "cobblemon.species.wormadam.desc": "Quando Burmy evoluiu, seu manto se tornou parte do corpo desse Pokémon. O manto nunca se desfaz.", + "cobblemon.species.mothim.name": "Mothim", + "cobblemon.species.combee.name": "Combee", + "cobblemon.species.combee.desc": "Juram lealdade à sua Pokémon rainha e trabalham assiduamente para coletar néctar. Cada enxame produz um mel de sabor diferente.", + "cobblemon.species.vespiquen.name": "Vespiquen", + "cobblemon.species.pachirisu.name": "Pachirisu", + "cobblemon.species.pachirisu.desc": "Uma espécie conectada à linha evolutiva de Pikachu. Apesar de Pachirisu ser um Pokémon calmo, ainda representa perigo caso alguém toque sua cauda ou bochechas eletrificadas.", + "cobblemon.species.buizel.name": "Buizel", + "cobblemon.species.buizel.desc": "Move-se livremente pela água usando sua cauda dupla como impulso. A semelhança com o propulsor de um barco à vapor é coincidência.", + "cobblemon.species.floatzel.name": "Floatzel", + "cobblemon.species.cherubi.name": "Cherubi", + "cobblemon.species.cherubi.desc": "Quando a fruta que cresce ao lado de seu corpo estiver grande e suculenta, Cherubi usa os seus nutrientes para evoluir. A fruta então se desprende e serve de alimento para outras criaturas.", + "cobblemon.species.cherrim.name": "Cherrim", + "cobblemon.species.shellos.name": "Shellos", + "cobblemon.species.shellos.desc": "Encontrado facilmente em praias de mares quentes. Shellos são surpreendentemente amigáveis e rastejarão em direção a qualquer pessoa que veem. Cuidado para não acabar coberto de muco!", + "cobblemon.species.gastrodon.name": "Gastrodon", + "cobblemon.species.gastrodon.desc": "Come areia da praia par sobreviver. Se Gastrodon encontrar outro de uma cor diferente, uma batalha feroz há de acontecer.", + "cobblemon.species.ambipom.name": "Ambipom", + "cobblemon.species.drifloon.name": "Drifloon", + "cobblemon.species.drifloon.desc": "Conhecido por atrair crianças e levá-las para o além. Alguns acreditam que Drifloon são criados a partir de almas humanas, mas esses rumores ainda não foram confirmados.", + "cobblemon.species.drifblim.name": "Drifblim", + "cobblemon.species.drifblim.desc": "Flutua pela escuridão, perfeitamente silencioso. Seu aspecto efêmero e melancólico toca alguns profundamente — de vez em quando algumas pessoas escrevem uma canção ou um poema dedicado à Drifblim.", + "cobblemon.species.buneary.name": "Buneary", + "cobblemon.species.lopunny.name": "Lopunny", + "cobblemon.species.mismagius.name": "Mismagius", + "cobblemon.species.mismagius.desc": "A magia dos cânticos de Mismagius protegem do azar, então as pessoas adquiriram o costume de convidar este Pokémon a entrar em seus lares. Porém, caso o Pokémon se aborreça, é seguro afirmar que um desastre está por vir.", + "cobblemon.species.honchkrow.name": "Honchkrow", + "cobblemon.species.glameow.name": "Glameow", + "cobblemon.species.glameow.desc": "Encanta os humanos com sua cauda espiral e olhar penetrante. Suas garras retráteis são afiadíssimas e tornam esse Pokémon um oponente complicado.", + "cobblemon.species.purugly.name": "Purugly", + "cobblemon.species.purugly.desc": "Apesar de imprudente e difícil de domar, Purugly é muito popular devido ao seu pelo, cuja beleza supera até mesmo a do veludo.", + "cobblemon.species.chingling.name": "Chingling", + "cobblemon.species.stunky.desc": "O veneno que é disparado de seu rabo é acompanhado por um odor maligno com tanta potência que apenas uma tragada pode causar perda de memória.", + "cobblemon.species.skuntank.name": "Skuntank", + "cobblemon.species.skuntank.desc": "Libera um fluido venenoso para derrubar suas presas. Às vezes deixa sua presa abatida para trás por não conseguir suportar o odor do próprio fluido.", + "cobblemon.species.bronzor.name": "Bronzor", + "cobblemon.species.bronzong.name": "Bronzong", + "cobblemon.species.bronzong.desc": "Alguns acreditam que o seu grito similar a um sino abre buracos para outro mundo. Bronzong foi venerado como uma divindade em tempos antigos.", + "cobblemon.species.bonsly.name": "Bonsly", + "cobblemon.species.bonsly.desc": "Suas lágrimas amolecem o coração daqueles que o observam, mas não se engane! A liberação dessa água corporal é meramente um mecanismo fisiológico para se manter saudável.", + "cobblemon.species.mimejr.name": "Mime Jr.", + "cobblemon.species.happiny.name": "Happiny", + "cobblemon.species.happiny.desc": "Uma imitação de Chansey, carrega sua pedra arredondada em sua bolsa e a ama profundamente. Se dá bem com crianças e às vezes se diverte brincando de casinha com elas.", + "cobblemon.species.chatot.name": "Chatot", + "cobblemon.species.chatot.desc": "Um artista versátil capaz de imitar a fala humana. Acredita-se que Chatot mais velhos e mais experientes podem até mesmo entender o significado das palavras que imitam.", + "cobblemon.species.spiritomb.name": "Spiritomb", + "cobblemon.species.gabite.name": "Gabite", + "cobblemon.species.gabite.desc": "Apesar de Gabite ter um comportamento violento, quando eu o entreguei uma bola de gude que estava fitando com interesse, de repente tornou-se um tanto dócil.", + "cobblemon.species.garchomp.name": "Garchomp", + "cobblemon.species.munchlax.name": "Munchlax", + "cobblemon.species.munchlax.desc": "Seu estômago robusto permite que devore sem esforço até mesmo comida podre. Visita vilas frequentemente, buscando por restos de comida que de outra forma virariam adubo.", + "cobblemon.species.riolu.name": "Riolu", + "cobblemon.species.lucario.name": "Lucario", + "cobblemon.species.lucario.desc": "Uma criatura valente. Lucario emite ondas de energia e as controla com precisão, usando-as para sentir seres a grandes distâncias. Eu classifiquei esse poder como \"aura\".", + "cobblemon.species.hippopotas.name": "Hippopotas", + "cobblemon.species.hippopotas.desc": "Apesar de grandes e lentos, Hippopotas são difíceis de detectar devido à sua tendência de cavar e se esconder abaixo do solo. Quando fica agitado ou ansioso, expele areia de suas narinas.", + "cobblemon.species.hippowdon.name": "Hippowdon", + "cobblemon.species.skorupi.name": "Skorupi", + "cobblemon.species.skorupi.desc": "Suas garras não apenas são extremamente afiadas como também peçonhentas, fazendo de Skorupi um Pokémon altamente perigoso. Porém, parece que fica fraco em temperaturas frias.", + "cobblemon.species.drapion.name": "Drapion", + "cobblemon.species.drapion.desc": "Tem um comportamento bruto e feroz. Com sua força e casco resistente a qualquer tipo de corte, Drapion anda por aí causando estragos.", + "cobblemon.species.croagunk.name": "Croagunk", + "cobblemon.species.toxicroak.name": "Toxicroak", + "cobblemon.species.toxicroak.desc": "Suas garras carmesim contém uma toxina virulenta. Essa toxina pode ser diluída, misturada com vários tipos de ervas e cozida por mais de dois dias para criar um tônico estimulante.", + "cobblemon.species.carnivine.name": "Carnivine", + "cobblemon.species.carnivine.desc": "Apesar de ser um Pokémon planta, tem um comportamento voraz e rebelde. Carnivine ataca suas presas com sua enorme boca aberta.", + "cobblemon.species.finneon.name": "Finneon", + "cobblemon.species.lumineon.name": "Lumineon", + "cobblemon.species.lumineon.desc": "Usa suas nadadeiras brilhantes para caçar suas presas. A visão de um cardume de Lumineon perto da superfície do mar à noite é de tirar o fôlego — é como se houvessem estrelas brilhantes logo ali.", + "cobblemon.species.mantyke.name": "Mantyke" } From 59d42fb32822e247a77548c16ccc71a85231bce1 Mon Sep 17 00:00:00 2001 From: FrankTheFarmer Date: Sun, 26 Jan 2025 06:19:18 +1000 Subject: [PATCH 114/121] Updated Charcadet's eye height. Git being dumb --- .../resources/data/cobblemon/species/generation9/charcadet.json | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json b/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json index 2af18290bb..6ee8e96557 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/charcadet.json @@ -42,6 +42,7 @@ "eggCycles": 35, "baseFriendship": 50, "shoulderMountable": true, + "standingEyeHeight": 0.67, "baseScale": 0.55, "hitbox": { "width": 0.6, From ef4690d4fef27813fb40b41c66cd78a6678d36da Mon Sep 17 00:00:00 2001 From: Carmendar Date: Sat, 25 Jan 2025 16:26:48 -0600 Subject: [PATCH 115/121] Wobbuffet -w- --- .../0202_wobbuffet/wobbuffet.animation.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0202_wobbuffet/wobbuffet.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0202_wobbuffet/wobbuffet.animation.json index d34a178a46..8044e5578a 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0202_wobbuffet/wobbuffet.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0202_wobbuffet/wobbuffet.animation.json @@ -37,9 +37,11 @@ "rotation": ["math.sin(q.anim_time*90*1.5-150)*1.5", 0, "math.sin(q.anim_time*90*1.5-60)*2"] }, "stache": { + "position": [0, 0, 2], "scale": 0 }, "lil_stache": { + "position": [0, -1, 0], "scale": 0 } } @@ -244,9 +246,11 @@ } }, "stache": { + "position": [0, 0, 2], "scale": 0 }, "lil_stache": { + "position": [0, -1, 0], "scale": 0 }, "body": { @@ -290,9 +294,11 @@ "rotation": ["5+math.sin(q.anim_time*90*1.5-150)*1.5", 0, "math.sin(q.anim_time*90*1.5-60)*2"] }, "stache": { + "position": [0, 0, 2], "scale": 0 }, "lil_stache": { + "position": [0, -1, 0], "scale": 0 } } @@ -343,9 +349,11 @@ "rotation": [-0.19072, "math.sin(q.anim_time*90*0.5-130)*-3", -4.75382] }, "stache": { + "position": [0, 0, 2], "scale": 0 }, "lil_stache": { + "position": [0, -1, 0], "scale": 0 } } @@ -1712,9 +1720,11 @@ } }, "stache": { + "position": [0, 0, 2], "scale": 0 }, "lil_stache": { + "position": [0, -1, 0], "scale": 0 } } @@ -2232,9 +2242,11 @@ } }, "stache": { + "position": [0, 0, 2], "scale": 0 }, "lil_stache": { + "position": [0, -1, 0], "scale": 0 }, "mouth_open_happy": { @@ -2531,9 +2543,11 @@ } }, "stache": { + "position": [0, 0, 2], "scale": 0 }, "lil_stache": { + "position": [0, -1, 0], "scale": 0 } } @@ -2825,9 +2839,11 @@ } }, "stache": { + "position": [0, 0, 2], "scale": 0 }, "lil_stache": { + "position": [0, -1, 0], "scale": 0 } }, @@ -3597,9 +3613,11 @@ } }, "stache": { + "position": [0, 0, 2], "scale": 0 }, "lil_stache": { + "position": [0, -1, 0], "scale": 0 }, "body": { From c66de51e39dd5144bde3550f630b58f67a835b65 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 26 Jan 2025 08:53:26 +1000 Subject: [PATCH 116/121] Snapnoshot --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 93a3922960..af61c069c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,6 @@ parchment_version = 2024.07.28@zip mod_id=cobblemon mod_version=1.6.1 -snapshot=true +snapshot=false fabric.loom.multiProjectOptimisation=false \ No newline at end of file From e6f147bd94ab4203652bdb07ffe924220ecf38e5 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 26 Jan 2025 09:34:42 +1000 Subject: [PATCH 117/121] Changelog [skip-ci] --- CHANGELOG.md | 154 +++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f57a9567b..0fe78b40f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,36 +1,17 @@ # Changelog -## [1.6.1 (Release TBD)](#1-6-1) +## [1.6.1 (January 26th, 2025)](#1-6-1) ### Additions -- Added config setting `maxPokedexScanningDetectionRange` to control from what distance the player can scan Pokémon using the Pokédex. -- Added the `is_standing_on_blocks(depth, blocks...)` MoLang function, which returns whether the specified entity is standing on a specific block or set of blocks. Example usage: `q.is_standing_on_blocks(2, minecraft:sand)` -- Added config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true. -- Added molang particle queries for getting distance to targeted entities. -- Added debug renderer for poseable entity locators. -- Added `baseScale` property to NPCs. -- Added cry for Spinda. -- Added the player to `PokerodReelEvent`. -- Pokédex and Dialogue API screens now close when the inventory keybind is pressed. -- Added Galarica Nuts, used for crafting Galarica Cuffs and Wreaths. Dropped from certain Pokémon. -- Added specific compatibility with Repurposed Structures. (Thank you, TelepathicGrunt!) -- Added an evolution method for Karrablast to evolve into Escavalier in single-player mode. +- Added crossover paintings from Close Combat: Premonition, Altar, Slumber, and Nomad. +- Added Galarica Nuts, used for crafting Galarica Cuffs and Wreaths. Dropped from certain Pokémon. Take a wild guess which. +- Added compatibility with Repurposed Structures. (Thank you, TelepathicGrunt!) +- Added an evolution method for Karrablast to evolve into Escavalier in singleplayer. - Pokédexes can now be placed in Chiseled Bookshelves. -- Added crossover paintings from Close Combat, Premonition, Altar, Slumber, and Nomad. -- Added optional box argument to the /pc command - -### Changes -- Pokémon will now be dynamically revealed to the Pokédex as they're seen instead of revealing entire parties at the end of battle regardless. -- Unseen wild Pokémon will update their name from '???' to their real name as soon as a battle starts to reflect the battle UI showing the actual species name. -- Pokémon under the illusion effect will reveal their disguise to the Pokédex first and then the base Pokémon once the disguise is broken. -- Added more support for a variety of Fabric/NeoForge Convention tags. -- Reformatted some tags to be more consistent. -- Edited some recipes to utilize tags instead of direct item ids, for greater mod compatibility. -- Berries will drop if broken at age 0 -- Improved Fortune drops on Mint Seeds -- New Slowpoke shiny texture. -- Updated drops for many Pokémon. -- Completely resynced Pokémon move and stat data based on later games. Learnsets have changed considerably to maximise available moves. -- Adjusted the evolution sound to match the timing of the particle effect. +- Added optional box argument to the /pc command. +- Pokédex and Dialogue screens now close when the inventory keybind is pressed. +- Added config setting `maxPokedexScanningDetectionRange` to control from what distance the player can scan Pokémon using the Pokédex. +- Added config setting `hideUnimplementedPokemonInThePokedex` which hides unimplemented Pokémon from the Pokédex when set to true. +- Added debug renderer for posable entity locators. ### Pokémon Added @@ -63,7 +44,7 @@ - Galarian Slowking #### Gen 9 -- Paldean Tauros's +- Paldean Tauros ### Added cries to the following Pokémon - All Nidorans @@ -74,7 +55,7 @@ ### Animation updates for the following Pokémon - Primeape -- Munchlax +- Munchlax - Snorlax - Poliwrath - Goldeen @@ -110,35 +91,46 @@ ### Cry updates for the following Pokémon - Sceptile +### Changes +- Completely re-synced Pokémon move and stat data based on later games. Learnsets have changed considerably to maximise available moves. +- Pokémon will now be dynamically revealed to the Pokédex as they're seen in battle instead of revealing entire parties at the end of battle. +- Unseen wild Pokémon will update their name from '???' to their real name as soon as a battle starts to match how the battle UI shows the actual species name. +- Pokémon under the illusion effect will reveal their disguise to the Pokédex first and then the base Pokémon once the disguise is broken. +- Berries will now drop from berry trees if broken at age 0 so you aren't punished for mistaken planting. +- Increased Fortune drops on Mint Seeds. +- Updated Slowpoke's shiny texture. +- Updated drops for many Pokémon. +- Adjusted the evolution sound to match the timing of the particle effect. +- Made berry trees shear-able by dispenser blocks. I'm sure nobody will make unholy contraptions with this. +- Edited some recipes to utilize tags instead of direct item IDs, for better mod compatibility. +- Added more support for a variety of Fabric/NeoForge conventional tags. +- Reformatted some tags to be more consistent. + ### Fixes - Fixed Pokédex sometimes crashing when switching forms. - Fixed Pokédex interface not transitioning out when closed. -- Fixed texture dimensions for the interact interface. -- Fixed crash related to Tom's Simple Storage mod and Fossil Machine. +- Fixed texture dimensions for the player and Pokémon interact interface. +- Fixed crash related to Tom's Simple Storage mod and the Fossil Machine. - Fixed not being able to retrieve a fossil from the Fossil Machine with an empty hand. -- Fixed Pokémon being collidable while being captured by a Poké Ball. +- Fixed Pokémon being collidable (collidible? collissionable? kaleidoscopable?) while being captured by a Poké Ball. - Fixed `full_party`, `own_zangoose_seviper`, `use_revive` and `use_candy` Advancement triggers. - Fixed `healing_machine` Advancement by using the correct 1.21 trigger. - Fix Display Cases not dropping items if destroyed through explosions. - Fixed an issue where the first Pokémon in the pastured Pokémon list clipped into the interface. - Fixed all Pokémon facing South on spawn. -- Parametric particle motion now works. -- Event spawned particles now work. -- Particles can now have independent coordinate spaces. -- Fixed bait being consumed when not reeling in any Pokémon. +- Fixed bait being consumed even when not reeling in any Pokémon. - Fixed Miltank milk magically disappearing out of your bucket. - Fixed Pokémon nicknames migrating from 1.5.2 not being displayed properly. -- Fixed capitalization in one of our config fields, but allowing typo'd version to still be valid. -- Fixed Poké Rods not working if lure or luck of the sea enchantments get removed by other mods. -- Fixed crashes related to Pokémon when they are ready to evolve while holding an enchanted item. -- Fixed crashes that sometimes occur when evolving Nincada. -- Fixed plants not being compostible on NeoForge. +- Fixed capitalization in one of our config options. It was a very important fix. Very important. Old configs are fine. +- Fixed Poké Rods not working if Lure or Luck of the Sea enchantments get removed by other mods. +- Fixed crashes related to Pokémon when they are ready to evolve while holding an enchanted item. Very specific. +- Fixed a crash that sometimes occurred when evolving Nincada. +- Fixed Cobblemon plants not being compostable on NeoForge. - Fixed hide UI (F1 key) not hiding the party overlay. - Fixed NPC MoLang command `player_lose_command` not working. -- Corrected misaligned tooltips with editboxes in the NPC editor screen. +- Fixed misaligned tooltips with edit boxes in the NPC editor screen. - Fixed Pokémon riding two boats when attempting to deploy a platform on water. -- Made berry trees be shearable by dispenser blocks. -- Fixed the summary screen showing there's experience to reach the next level when at level cap. +- Fixed the summary screen showing there's experience to reach the next level when they are at the level cap. - Fixed Pokémon forgetting moves when evolving on specific cases. - Fixed Adorn compatibility, including improvements when using JEI/REI (Apricorn items now show up under the collapsed entries rather than standalone). - Fixed error message appearing on battle log when using Solar Beam with Sunny Day. @@ -146,60 +138,68 @@ - Fixed `/pokedex grant all` command not giving male/female/shininess completion for some Pokémon. - Fixed `/pokedex grant only` and `/pokedex remove only` not respecting the form parameter passed. - Fixed variant forms appearing incorrectly in the Pokédex when the normal form had not been unlocked. -- Fixed Pokémon occasionally being shot into the sky during battle. +- Fixed Pokémon occasionally being shot into the sky during battle. No Pokémon were harmed by this bug, probably. - Fixed NPC editing GUI not updating aspects until a game restart. -- Fix some users being unable to open their PC if a Pokémon in said PC had a lot of pp raises beyond normal bounds -- Fix some color variants (dubwool, conkeldurr and undyed wooloo) missing in the Pokédex -- Fix invalid species or held_items causing Players to not be able to load into their world anymore (commonly happening after removing addons/mods) +- Fixed some users being unable to open their PC if a Pokémon in it had a lot of PP raises beyond normal bounds. How did you get those, anyway? Tell me or the Bellossom gets it. +- Fixed some color variants (Dubwool, Conkeldurr and Undyed wooloo) being missing in the Pokédex. +- Fixed invalid species or held items causing Players to not be able to load into their world anymore (commonly happening after removing addons/mods). - Fixed Wooloo variants not being automatically registered in the owner's Pokédex when dyed. -- Fixed Vivichoke Dip and Leek and Potato Stew not returning a bowl upon consumption. -- Fixed Fossil Restoration Machine not accepting Hay Bales. -- Fixed Potion items so that they no longer apply over double their intended healing value. -- Fixed Fast Ball capture rate applying to all Pokémon. -- Fix "learned new move" messages appearing for already known moves on Pokémon evolutions. -- Fix Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames. -- Fixed Berries not giving bonus yields when planted in their preferred biomes -- Fix NeoForge not supporting "SodiumDynamicLights" -- Fix Players disconnecting from servers if they made changes to certain config options -- Fix JSON stores not loading properly if player with shouldered Pokémon is migrating from 1.5.2 into 1.6 -- Fix PokemonProperties ability=myAbility being declared as forced despite being legal for the Pokémon -- Fixed type formatting in Pokédex scanner mode when dual types require two lines -- Fix trading sometimes crashing the game/server -- Wild shiny sounds now respect the `shinyNoticeParticlesDistance` config setting. -- Fixed Pokémon being able to evolve mid-battle -- Fixed NPC held items being able to be stolen by players -- Corrected evolutions requiring a held item consuming it on evolving rather than when meeting requirements -- Fixed Pokémon showing only the default form when selecting a battle target +- Fixed Vivichoke Dip and Leek & Potato Stew not returning a bowl upon consumption. +- Fixed Fossil Restoration Tank not accepting Hay Bales as organic material. +- Fixed Potion items applying double their intended healing value. +- Fixed Fast Ball capture bonuses applying to all Pokémon, making it the Best Ball instead of the Mediocre Edge-Case Ball. +- Fixed "learned new move" messages appearing for already-known moves on Pokémon evolutions. +- Fixed Pokémon Item Models breaking shadows nearby when being placed in Display Cases or Item Frames. +- Fixed berries not giving bonus yields when planted in their preferred biomes. I'm sure we've fixed that 5 times now. +- Fixed the NeoForge version not supporting "SodiumDynamicLights". +- Fixed players disconnecting from servers if they made changes to certain config options. +- Fixed players with shouldered Pokémon not being able to rejoin their 1.5.2 worlds using 1.6. +- Fixed `PokemonProperties` utilizing `ability=` being treated as a forced ability even when it is a legal ability for the Pokémon. +- Fixed type formatting in Pokédex scanner mode when dual types require two lines. +- Fixed trading sometimes crashing the game or server. +- Fixed Wild shiny sounds not respecting the `shinyNoticeParticlesDistance` config setting. +- Fixed Pokémon being able to evolve mid-battle. +- Fixed NPC held items being able to be stolen by players. Don't be a thief! +- Fixed evolutions that require a held item consuming it as soon as meeting requirements when it should only be consumed upon evolution. +- Fixed Pokémon showing only the default form when selecting them as a target in battle. - Fixed a possible error coming out of reeling fishing rods in specific situations. - Fixed incorrect weights being used when Poké Fishing with Luck of the Sea. +- Parametric particle motion now works. +- Event-spawned particles now work. +- Particles can now have independent coordinate spaces. ### Developer -- Updated the Pokédex data updated events to always include a Pokemon instance, and optionally a DisguiseData instance. +- Updated the Pokédex data updated events to always include a `Pokemon` instance, and optionally a `DisguiseData` instance. - Updated fields in `SpawnNPCPacket` and `SpawnPokemonPacket` to be visible and mutable. - Updated `UnvalidatedPlaySoundS2CPacket` to be public instead of internal and made its fields mutable. - Added `hideNameTag` field and `HideNPCNameTag` nbt tag to `NPCEntity` to allow hiding the name tag of the NPC. +- Added the player to `PokerodReelEvent` so you know who is doing the reeling. -### Molang & Datapacks +### MoLang & Datapacks - Added flows for: - `forme_change`: Triggered when a Pokémon changes form in battle. - - `mega_evolution`: Triggered when a Pokémon mega evolves in battle. (Note: Third party mods are required for this feature currently) - - `zpower_used`: Triggered when a Pokémon uses a Z-Power move in battle. (Note: Third party mods are required for this feature currently) - - `terastallization`: Triggered when a Pokémon terastallizes in battle. (Note: Third party mods are required for this feature currently) + - `mega_evolution`: Triggered when a Pokémon mega evolves in battle. (Note: Third-party mods are required for this feature currently) + - `zpower_used`: Triggered when a Pokémon uses a Z-Power move in battle. (Note: Third-party mods are required for this feature currently) + - `terastallization`: Triggered when a Pokémon terastallizes in battle. (Note: Third-party mods are required for this feature currently) - `battle_fainted`: Triggered when a Pokémon faints in battle. - - `battle_fled`: Triggered when a Player flees from battle. + - `battle_fled`: Triggered when a player flees from battle. - `battle_started_pre`: Triggered when a battle starts. Cancelable! - `battle_started_post`: Triggered when a battle starts. - - `apricorn_harvested`: Triggered when an apricorn is harvested. + - `apricorn_harvested`: Triggered when an Apricorn is harvested. - `thrown_pokeball_hit`: Triggered when a thrown Pokéball hits a Pokémon. - `level_up`: Triggered when a Pokémon levels up. - `pokemon_fainted`: Triggered when a Pokémon faints. - - `pokemon_gained`: Triggered when a Player gains a Pokémon. -- Added molang functions: + - `pokemon_gained`: Triggered when a player gains a Pokémon. +- Added MoLang functions: - For Pokémon: - `pokemon.apply(PokemonProperties)`: Applies the given properties to the Pokémon. - `pokemon.owner`: Returns the owner of the Pokémon or 0.0 if there is no owner or they are not online. + - For all entities: + - `entity.is_standing_on_blocks(depth, blocks...)`: Returns whether the specified entity is standing on a specific block or set of blocks. Example usage: `q.is_standing_on_blocks(2, minecraft:sand)` - Added NPC field: - `hideNameTag`: Hides the name tag of the NPC. + - Added `baseScale` property to NPCs. +- Added MoLang particle queries for getting distance to targeted entities. ## [1.6.0 - The Record Catch Update (December 25th, 2024)](#1-6-0) #### "Now that there's a fishing mechanic, the mod is actually good!" From d85e30f3a68256eacfc4b23e51535cbfc203a6a6 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 26 Jan 2025 22:15:17 +1000 Subject: [PATCH 118/121] But what if we didn't break the yarn mapping --- CHANGELOG.md | 2 +- .../mod/common/client/gui/pc/GrabbedStorageSlot.kt | 2 +- .../com/cobblemon/mod/common/client/gui/pc/StorageSlot.kt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fe78b40f3..061371477a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -175,7 +175,7 @@ - Added `hideNameTag` field and `HideNPCNameTag` nbt tag to `NPCEntity` to allow hiding the name tag of the NPC. - Added the player to `PokerodReelEvent` so you know who is doing the reeling. -### MoLang & Datapacks +### MoLang & Datapacks - Added flows for: - `forme_change`: Triggered when a Pokémon changes form in battle. - `mega_evolution`: Triggered when a Pokémon mega evolves in battle. (Note: Third-party mods are required for this feature currently) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/GrabbedStorageSlot.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/GrabbedStorageSlot.kt index cea99a98be..a53c9b53b2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/GrabbedStorageSlot.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/GrabbedStorageSlot.kt @@ -18,7 +18,7 @@ class GrabbedStorageSlot( ) : StorageSlot(x, y, parent, {}) { init { - isSelected = true + isSlotSelected = true } override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageSlot.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageSlot.kt index 96448e1291..74ab23c4da 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageSlot.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/StorageSlot.kt @@ -46,7 +46,7 @@ open class StorageSlot( private val slotOverlayMoveIconResource = cobblemonResource("textures/gui/pasture/pc_slot_icon_move.png") } - protected var isSelected = false; + protected var isSlotSelected = false; override fun playDownSound(soundManager: SoundManager) { } @@ -84,7 +84,7 @@ open class StorageSlot( context.disableScissor() - if (!isSelected) { + if (!isSlotSelected) { // Ensure elements are not hidden behind Pokémon render matrices.pushPose() matrices.translate(0.0, 0.0, 100.0) @@ -129,7 +129,7 @@ open class StorageSlot( matrices.translate(0.0, 0.0, 500.0) val config = parent.pcGui.configuration - if (pokemon.tetheringId != null && !isSelected) { + if (pokemon.tetheringId != null && !isSlotSelected) { if (isStationary()) { blitk( matrixStack = matrices, From 01f7d13e3f46e7f808a264f02493d8c973b50e29 Mon Sep 17 00:00:00 2001 From: Polymeta <40173118+Polymeta@users.noreply.github.com> Date: Sun, 26 Jan 2025 21:32:32 +0000 Subject: [PATCH 119/121] update tag and preset list [skip-ci] Signed-off-by: Polymeta <40173118+Polymeta@users.noreply.github.com> --- .../{1.6.0 => 1.6.1}/BiomeTags.md | 585 +++++++++++++++--- .../{1.6.0 => 1.6.1}/BlocksTags.md | 20 +- .../{1.6.0 => 1.6.1}/EntityTypesTags.md | 0 .../{1.6.0 => 1.6.1}/ItemTags.md | 67 +- .../{1.6.0 => 1.6.1}/spawnPresetList.md | 60 +- 5 files changed, 578 insertions(+), 154 deletions(-) rename docs/cobblemon-tags/{1.6.0 => 1.6.1}/BiomeTags.md (79%) rename docs/cobblemon-tags/{1.6.0 => 1.6.1}/BlocksTags.md (99%) rename docs/cobblemon-tags/{1.6.0 => 1.6.1}/EntityTypesTags.md (100%) rename docs/cobblemon-tags/{1.6.0 => 1.6.1}/ItemTags.md (97%) rename docs/cobblemon-tags/{1.6.0 => 1.6.1}/spawnPresetList.md (77%) diff --git a/docs/cobblemon-tags/1.6.0/BiomeTags.md b/docs/cobblemon-tags/1.6.1/BiomeTags.md similarity index 79% rename from docs/cobblemon-tags/1.6.0/BiomeTags.md rename to docs/cobblemon-tags/1.6.1/BiomeTags.md index 4ff854d40e..68ef68b0ae 100644 --- a/docs/cobblemon-tags/1.6.0/BiomeTags.md +++ b/docs/cobblemon-tags/1.6.1/BiomeTags.md @@ -7,7 +7,8 @@ This file contains tags related to different biomes in cobblemon, as well as som