diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a3961283f..061371477a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,33 +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. - -### 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. +- 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 @@ -40,10 +24,19 @@ - Escavalier - Rufflet - Braviary +- Foongus +- Amoonguss + +#### Gen 6 +- Binacle +- Barbaracle #### Gen 7 - Dewpider - Araquanid +- Alolan Geodude +- Alolan Graveler +- Alolan Golem #### Gen 8 - Galarian Slowpoke @@ -51,11 +44,18 @@ - Galarian Slowking #### Gen 9 -- Paldean Tauros's +- Paldean Tauros + +### Added cries to the following Pokémon +- All Nidorans +- Shellder, Cloyster +- Pinsir +- Tyrogue, Hitmontop +- Spinda ### Animation updates for the following Pokémon - Primeape -- Munchlax +- Munchlax - Snorlax - Poliwrath - Goldeen @@ -77,46 +77,60 @@ - Slowbro - Slowking - Eiscue -- Binacle -- Barbaracle - Tauros - Goldeen - Seaking - Charcadet +- Armarouge +- Ceruledge - Pinsir - Geodude - Graveler - Golem +### 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. @@ -124,38 +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 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. -### Molang & Datapacks +### 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. +- 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 - 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!" @@ -2058,5 +2102,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/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/Cobblemon.kt b/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt index e20bd77360..8a9828aa74 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt @@ -221,7 +221,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) @@ -259,6 +259,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/ai/PathfindingMedium.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt new file mode 100644 index 0000000000..65396ae566 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/ai/PathfindingMedium.kt @@ -0,0 +1,24 @@ +/* + * 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 + */ +enum class PathfindingMedium { + LAND, + WATER, + LAVA, + AIR +} \ No newline at end of file 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 e35b577984..28d0e3fe71 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/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/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/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/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/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/api/npc/NPCClass.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClass.kt index 5e80539821..b1bddf8e1a 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 @@ -98,6 +99,7 @@ class NPCClass { buffer.writeBoolean(isInvulnerable) buffer.writeBoolean(isLeashable) buffer.writeBoolean(allowProjectileHits) + buffer.writeBoolean(hideNameTag) } fun decode(buffer: RegistryFriendlyByteBuf) { @@ -150,5 +152,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 a6007fc373..2efbe22586 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/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 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/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/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/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( 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 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 e5362044da..0ac1ad4145 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/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 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/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, 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/PCGUI.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt index 6116a57f69..9e0fc9a816 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 = 0 ) : 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/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, 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/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 { 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/client/pokedex/PokedexScannerRenderer.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/pokedex/PokedexScannerRenderer.kt index 5d46417369..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 @@ -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,15 @@ 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) { + val splitLines = typeText.string.split("/") drawScaledText( context = graphics, font = CobblemonResources.DEFAULT_LARGE, - text = lang("type.suffix", pokedexEntityData.form.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.form.secondaryType!!.displayName).bold(), + text = text(splitLines[1]).bold(), x = centerX + xOffset + xOffsetText, y = centerY + yOffset + yOffsetText + 3, shadow = true, 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 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/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/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 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/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/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/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..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 @@ -60,4 +60,11 @@ class NPCRenderer(context: Context) : LivingEntityRenderer) { 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/datafixer/fix/FeatureFix.kt b/common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/FeatureFix.kt index 25ec9e7ee5..ff6ae296f8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/FeatureFix.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/datafixer/fix/FeatureFix.kt @@ -29,14 +29,14 @@ class FeatureFix(output: Schema) : PokemonFix(output) { if (features.result().isPresent) { return dynamic //already has Features nbt format... no work needed } - var featureTag = emptyList() + 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/entity/fishing/PokeRodFishingBobberEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/fishing/PokeRodFishingBobberEntity.kt index 139d92a658..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 @@ -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,19 @@ 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(94.3F, 5.0F, 0.5F, 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 + if (index >= baseValues.size) { + return@mapIndexed bucket to bucket.weight } - }.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 +322,7 @@ class PokeRodFishingBobberEntity(type: EntityType chosenBucket = event.chosenBucket @@ -698,10 +685,9 @@ class PokeRodFishingBobberEntity(type: EntityType appliedAspects.forEach { list.add(StringTag.valueOf(it)) } }) nbt.put(DataKeys.NPC_VARIATION_ASPECTS, ListTag().also { list -> variationAspects.forEach { list.add(StringTag.valueOf(it)) } }) @@ -397,6 +405,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) loadScriptingFromNBT(nbt) appliedAspects.addAll(nbt.getList(DataKeys.NPC_ASPECTS, Tag.TAG_STRING.toInt()).map { it.asString }) @@ -503,6 +512,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) remakeBrain() npc.variations.values.forEach { this.variationAspects.addAll(it.provideAspects(this)) } 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 2b63912538..38ad2211c8 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 @@ -1696,17 +1696,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/entity/pokemon/PokemonServerDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt index e34a9f495b..fa62c2bfd8 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 */ @@ -260,6 +261,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) } } 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/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/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/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/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..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 @@ -30,13 +30,14 @@ 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, + 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/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) { 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/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..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) 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) } 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 2a122e9246..91ecaacd12 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,32 +9,28 @@ 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 // Hiro note: I honestly want to move to not using this at all. There is always a Pokemon behind the data, // it's just that sometimes it's harder to reach or there's a Zoroark or Ditto throwing a curveball. It makes // in shittier in events to have to cater to two distinct classes of data that can be scanned. 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() 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 5b4d5acaa6..22a18a4b7e 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 } 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 ebd94562d4..28f93eff12 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,10 +129,21 @@ class Species : ClientDataSynchronizer, ShowdownIdentifiable { }, ApplyPresets().apply { condition = Either.left("!q.entity.is_in_party".asExpression()) - presets.add(cobblemonResource("wanders")) presets.add(cobblemonResource("pokemon_sleeps")) presets.add(cobblemonResource("pokemon_breeding")) }, + 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/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 e07164cf33..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. @@ -23,7 +25,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) @@ -32,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/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) 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() 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 d5ce8cbdf4..93e816bb08 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 @@ -233,6 +233,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" const val SCRIPTED_BRAIN_IS_CUSTOM = "BehavioursAreCustom" const val SCRIPTED_BRAIN_PRESETS = "BrainPresets" 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 3b3bf01444..34b7b5e3c8 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,6 +8,7 @@ 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 net.minecraft.core.BlockPos @@ -17,8 +18,10 @@ 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.Block 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 @@ -197,6 +200,15 @@ fun Entity.isStandingOnSand(): Boolean { return isStandingOn(setOf(Blocks.SAND)) } +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 { return isStandingOn(setOf(Blocks.RED_SAND)) } 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 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 1821f43cbd..f55dc95c0a 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) @@ -414,7 +418,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) } @@ -428,6 +432,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 @@ -441,4 +470,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 diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/NPCClassAdapter.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/NPCClassAdapter.kt index b48f00686d..d8661ece82 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/NPCClassAdapter.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/NPCClassAdapter.kt @@ -83,6 +83,7 @@ object NPCClassAdapter : JsonDeserializer { 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 } 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), 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/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/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/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/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/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": { 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/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/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/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] } } } 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]} ] }, { 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", 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/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 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/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/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')" 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')" 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": { 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": [ 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": [] 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/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/lang/de_de.json b/common/src/main/resources/assets/cobblemon/lang/de_de.json index 1a4200828e..90464106e6 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,88 @@ "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": "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", + "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", + "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" } 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 c133d88b01..d4d77fa7fb 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", @@ -1090,7 +1091,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", @@ -4423,7 +4424,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", @@ -6206,7 +6207,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", @@ -7130,4 +7131,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 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..d5f2139951 100644 --- a/common/src/main/resources/assets/cobblemon/lang/es_es.json +++ b/common/src/main/resources/assets/cobblemon/lang/es_es.json @@ -5482,8 +5482,8 @@ "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", - "upgrade.cobblemon.pokerod": "Mejora de Poke Caña", + "item.cobblemon.smithing_template.pokerod.base_slot_description": "Añadir caña de pescar", + "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", @@ -6269,5 +6269,129 @@ "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", + "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×", + "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", + "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.", + "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" } 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..102a5aef0c 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,300 @@ "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", + "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.", + "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", + "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", + "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", + "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", + "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" } 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..fd007a68cd 100644 --- a/common/src/main/resources/assets/cobblemon/lang/ru_ru.json +++ b/common/src/main/resources/assets/cobblemon/lang/ru_ru.json @@ -1,52 +1,52 @@ { - "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.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.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×", @@ -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,30 +508,30 @@ "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": "Показ.", "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": "Команда", @@ -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": "Ландорус", @@ -6000,36 +6000,136 @@ "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.", - "item.cobblemon.smithing_template.pokerod.additions_slot_description": "Добавить покеболл", - "item.cobblemon.smithing_template.pokerod.ingredients": "Покеболлы", - "item.cobblemon.smithing_template.pokerod.base_slot_description": "Добавить удочку" + "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.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": "Психическое семечко", + "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": "Нажата кнопка ПокеНава", + "cobblemon.ui.stash.gold": "Склад монет", + "cobblemon.ui.stash.netherite": "Склад лома" } 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..127b2b7bed 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互換了攻擊和防禦！", @@ -5529,5 +5529,548 @@ "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": "精靈球", + "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": "奶油", + "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": "玉石磚", + "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": "將動過手腳的花束投向對手進行攻擊。必定會命中並擊中要害。", + "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": "閃電猛衝" } diff --git a/common/src/main/resources/assets/cobblemon/sounds.json b/common/src/main/resources/assets/cobblemon/sounds.json index a10e19ae28..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 } ] @@ -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": { 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 523ef3b456..ab89b71a13 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/evolution/evolution_full.ogg and b/common/src/main/resources/assets/cobblemon/sounds/evolution/evolution_full.ogg differ 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 d73c436e64..621b0ab7c9 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/cloyster/cloyster_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/cloyster/cloyster_cry.ogg differ 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 d73c436e64..0e7837e0f5 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/hitmontop/hitmontop_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/hitmontop/hitmontop_cry.ogg differ 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 d73c436e64..a5f8568583 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoking/nidoking_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoking/nidoking_cry.ogg differ 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 d73c436e64..80949eb836 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoqueen/nidoqueen_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoqueen/nidoqueen_cry.ogg differ 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 d73c436e64..ebb413454e 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoranf/nidoranf_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoranf/nidoranf_cry.ogg differ 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 d73c436e64..c3cd023fa1 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoranm/nidoranm_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidoranm/nidoranm_cry.ogg differ 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 d73c436e64..c0b3a06db1 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidorina/nidorina_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidorina/nidorina_cry.ogg differ 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 d73c436e64..fe7d200463 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidorino/nidorino_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/nidorino/nidorino_cry.ogg differ 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 d73c436e64..a91a2e2b92 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/pinsir/pinsir_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/pinsir/pinsir_cry.ogg differ 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 40f819cf90..d31744050e 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/sceptile/sceptile_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/sceptile/sceptile_cry.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/pokemon/shellder/shellder_cry.ogg b/common/src/main/resources/assets/cobblemon/sounds/pokemon/shellder/shellder_cry.ogg index d73c436e64..1e3d4b52ec 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/shellder/shellder_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/shellder/shellder_cry.ogg differ 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 d73c436e64..591cf97ccd 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/spinda/spinda_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/spinda/spinda_cry.ogg differ 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 d73c436e64..0052575ea6 100644 Binary files a/common/src/main/resources/assets/cobblemon/sounds/pokemon/tyrogue/tyrogue_cry.ogg and b/common/src/main/resources/assets/cobblemon/sounds/pokemon/tyrogue/tyrogue_cry.ogg differ 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 13422919b0..d0287cc022 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan_shiny.png index c4474601b9..7a622f92c0 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan_shiny.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0103_exeggutor/exeggutor_alolan_shiny.png differ 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 dd54374ad1..69fd4cf4cd 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0330_flygon/flygon_transparency.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0330_flygon/flygon_transparency.png differ 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 dd54374ad1..93a65a11f7 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0330_flygon/flygon_transparency_shiny.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0330_flygon/flygon_transparency_shiny.png differ 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 0000000000..a6e4313552 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0616_shelmet/shelmet.png differ 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 0000000000..7f463141e6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0616_shelmet/shelmet_shiny.png differ 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 0000000000..328738a7b9 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0617_accelgor/accelgor.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0617_accelgor/accelgor_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0617_accelgor/accelgor_shiny.png new file mode 100644 index 0000000000..f800f1fa99 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0617_accelgor/accelgor_shiny.png differ diff --git a/common/src/main/resources/cobblemon-common.accesswidener b/common/src/main/resources/cobblemon-common.accesswidener index dc749343c2..b9c6f8a159 100644 --- a/common/src/main/resources/cobblemon-common.accesswidener +++ b/common/src/main/resources/cobblemon-common.accesswidener @@ -119,4 +119,6 @@ transitive-accessible method net/minecraft/client/renderer/block/model/ItemModel transitive-accessible method net/minecraft/client/renderer/block/model/ItemOverrides ()V 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/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/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/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/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 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/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/0035_clefairy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0035_clefairy.json index e41b98f430..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 @@ -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/0036_clefable.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0036_clefable.json index 0fddcc1dd7..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 @@ -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/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/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/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/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/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..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 @@ -26,6 +26,106 @@ "biomes": [ "#cobblemon:is_grassland" ] + }, + "anticondition": { + "biomes": [ + "#cobblemon:is_hills" + ] + } + }, + { + "id": "tauros-combat-2", + "pokemon": "tauros paldean bull_breed=combat", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-49", + "weight": 1.8, + "weightMultiplier": { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_highlands" + ] + } + }, + { + "id": "tauros-blaze-3", + "pokemon": "tauros paldean bull_breed=blaze", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-49", + "weight": 0.1, + "weightMultipliers": [ + { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + { + "multiplier": 5.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:lava" + ] + } + } + ], + "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "biomes": [ + "#cobblemon:is_highlands" + ] + } + }, + { + "id": "tauros-aqua-4", + "pokemon": "tauros paldean bull_breed=aqua", + "presets": [ + "natural" + ], + "type": "pokemon", + "context": "grounded", + "bucket": "common", + "level": "24-49", + "weight": 0.1, + "weightMultipliers": [ + { + "multiplier": 0.25, + "condition": { + "timeRange": "night" + } + }, + { + "multiplier": 5.0, + "condition": { + "neededNearbyBlocks": [ + "#minecraft:water" + ] + } + } + ], + "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/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/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..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 @@ -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/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..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 @@ -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" 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..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 @@ -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" @@ -78,23 +80,6 @@ "#minecraft:lava" ] } - }, - { - "id": "magcargo-5", - "pokemon": "magcargo", - "presets": [ - "lava" - ], - "type": "pokemon", - "context": "surface", - "bucket": "common", - "level": "38-43", - "weight": 1.0, - "condition": { - "biomes": [ - "#cobblemon:is_volcanic" - ] - } } ] } \ No newline at end of file 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/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/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/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/0338_solrock.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0338_solrock.json index 3f8658b8d6..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 @@ -95,6 +95,24 @@ "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": [ + "aether:skyroot_grove", + "aether:skyroot_meadow" + ] + } } ] } \ 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..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 }, @@ -49,7 +50,7 @@ } }, { - "id": "baltoy-3", + "id": "baltoy-4", "pokemon": "baltoy", "type": "pokemon", "context": "grounded", 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..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 }, @@ -49,7 +50,7 @@ } }, { - "id": "claydol-3", + "id": "claydol-4", "pokemon": "claydol", "type": "pokemon", "context": "grounded", 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/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/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/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 7da45f4310..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" @@ -106,7 +107,24 @@ } }, { - "id": "sigilyph-6", + "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", 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_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/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/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/spawn_pool_world/0605_elgyem.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0605_elgyem.json index 94211fa0d3..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 @@ -65,7 +65,7 @@ } }, { - "id": "elgyem-3", + "id": "elgyem-5", "pokemon": "elgyem", "type": "pokemon", "context": "grounded", 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..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 @@ -65,7 +65,7 @@ } }, { - "id": "beheeyem-3", + "id": "beheeyem-5", "pokemon": "beheeyem", "type": "pokemon", "context": "grounded", 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..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 @@ -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": { 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..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 @@ -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": { 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/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 a7b222a31e..4ae0632623 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 } ] }, @@ -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": [ @@ -202,9 +227,6 @@ "toughclaws", "h:toughclaws" ], - "eggGroups": [ - "flying" - ], "baseStats": { "hp": 80, "attack": 135, @@ -213,122 +235,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..2d9a692d74 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 } ] }, @@ -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": [], @@ -202,9 +228,6 @@ "trace", "h:trace" ], - "eggGroups": [ - "human_like" - ], "baseStats": { "hp": 55, "attack": 50, @@ -213,129 +236,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/arbok.json b/common/src/main/resources/data/cobblemon/species/generation1/arbok.json index 07e36bf444..2fd6a9f1fb 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 } ] }, @@ -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 f0fedea1ee..6328635aaa 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": [ @@ -62,7 +61,7 @@ }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -96,10 +95,8 @@ "egg:thrash", "tm:aerialace", "tm:agility", - "tm:bite", "tm:bodyslam", "tm:bulldoze", - "tm:burnup", "tm:charm", "tm:closecombat", "tm:covet", @@ -107,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", @@ -162,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": [], @@ -185,7 +196,6 @@ "hisuian_form" ], "aspects": [ - "hisuian", "hisuian" ], "abilities": [ @@ -193,9 +203,6 @@ "flashfire", "h:rockhead" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 95, "attack": 115, @@ -204,20 +211,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", @@ -246,7 +239,6 @@ "egg:thrash", "tm:aerialace", "tm:agility", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:closecombat", @@ -254,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", @@ -292,7 +275,6 @@ "tm:rockblast", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:scaryface", @@ -310,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 ece7a4080b..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": [ @@ -180,9 +196,6 @@ "competitive", "h:competitive" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 90, "attack": 85, @@ -199,12 +212,7 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 290, - "experienceGroup": "slow", - "catchRate": 3, "eggCycles": 120, - "baseFriendship": 35, - "behaviour": {}, "drops": { "amount": 6, "entries": [ @@ -245,7 +253,6 @@ "tm:ancientpower", "tm:bravebird", "tm:calmmind", - "tm:confusion", "tm:doubleteam", "tm:dreameater", "tm:dualwingbeat", @@ -253,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", @@ -293,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 610a1419f5..9ee5832aeb 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 } ] }, @@ -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": [], @@ -185,9 +208,6 @@ "adaptability", "h:adaptability" ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 65, "attack": 150, @@ -196,104 +216,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/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 8dad27ca69..ea7a643b67 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 } ] }, @@ -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": [], @@ -224,10 +229,6 @@ "megalauncher", "h:megalauncher" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 79, "attack": 103, @@ -236,153 +237,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 +258,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/bulbasaur.json b/common/src/main/resources/data/cobblemon/species/generation1/bulbasaur.json index f4629bc414..73a370fe23 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 } ] }, @@ -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 184613136e..8b56f00995 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 } ] }, @@ -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": [], @@ -183,118 +195,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/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..806340827e 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 } ] }, @@ -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 e81d60e26c..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": { @@ -78,7 +80,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, @@ -117,8 +119,6 @@ "tm:airslash", "tm:ancientpower", "tm:beatup", - "tm:bellydrum", - "tm:bite", "tm:blastburn", "tm:blazekick", "tm:bodyslam", @@ -126,22 +126,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 +144,6 @@ "tm:firepledge", "tm:firepunch", "tm:firespin", - "tm:flameburst", "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", @@ -159,7 +153,6 @@ "tm:focuspunch", "tm:furycutter", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:heatcrash", "tm:heatwave", @@ -168,7 +161,6 @@ "tm:hurricane", "tm:hyperbeam", "tm:incinerate", - "tm:inferno", "tm:irontail", "tm:megakick", "tm:megapunch", @@ -188,12 +180,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 +197,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": [], @@ -235,10 +253,6 @@ "toughclaws", "h:toughclaws" ], - "eggGroups": [ - "monster", - "dragon" - ], "baseStats": { "hp": 78, "attack": 130, @@ -247,156 +261,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 +287,6 @@ "drought", "h:drought" ], - "eggGroups": [ - "monster", - "dragon" - ], "baseStats": { "hp": 78, "attack": 104, @@ -433,156 +295,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 +317,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/charmander.json b/common/src/main/resources/data/cobblemon/species/generation1/charmander.json index d63cdf05c2..1813f64dc6 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 } ] }, @@ -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..7c6035e222 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 } ] }, @@ -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..9ca1b3c316 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 } ] }, @@ -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..5969278cb4 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 } ] }, @@ -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..75797303fd 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 } ] }, @@ -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 41d54ed006..b1aaf4b71a 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": [ @@ -96,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", @@ -125,7 +117,6 @@ "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:growl", "tm:headbutt", "tm:icebeam", "tm:icywind", @@ -134,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", @@ -152,7 +140,6 @@ "tm:sandstorm", "tm:scorchingsands", "tm:screech", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -162,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": [ { @@ -184,6 +198,10 @@ { "variant": "biome", "biomeAnticondition": "#cobblemon:evolution/regional/cubone_alolabiome" + }, + { + "variant": "biome", + "biomeAnticondition": "#minecraft:is_nether" } ] }, @@ -211,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" } ] } @@ -233,138 +276,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", @@ -384,6 +296,10 @@ { "variant": "biome", "biomeCondition": "#cobblemon:evolution/regional/cubone_kantobiome" + }, + { + "variant": "biome", + "biomeAnticondition": "#minecraft:is_nether" } ] }, @@ -407,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/dewgong.json b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json index 82e4900e2d..cf9fde9dee 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 } ] }, @@ -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 070d6ae39a..13ece43bc6 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 @@ -108,7 +112,6 @@ "tm:allyswitch", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:beatup", "tm:bodyslam", "tm:bulldoze", @@ -123,35 +126,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 +159,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": [ { @@ -209,9 +222,6 @@ "tanglinghair", "h:sandforce" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 10, "attack": 55, @@ -220,20 +230,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", @@ -263,7 +259,6 @@ "tm:allyswitch", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:beatup", "tm:bodyslam", "tm:bulldoze", @@ -274,32 +269,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", @@ -320,8 +306,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..2b8beecd2f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/ditto.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/ditto.json @@ -62,13 +62,12 @@ }, { "item": "cobblemon:metal_powder", - "percentage": 5 + "percentage": 5.0 } ] }, "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..e59183b3c4 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 } ] }, @@ -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..1659b910a8 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 } ] }, @@ -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..753e03d9fd 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 } ] }, @@ -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 b3beb7d9da..89091a6fa0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/dugtrio.json @@ -65,19 +65,23 @@ } }, "drops": { - "amount": 3, + "amount": 5, "entries": [ + { + "item": "minecraft:dirt", + "quantityRange": "0-2" + }, { "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 } ] }, @@ -113,7 +117,6 @@ "tm:allyswitch", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:beatup", "tm:bodyslam", "tm:bulldoze", @@ -128,39 +131,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 +168,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": [], @@ -198,7 +211,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -206,9 +218,6 @@ "tanglinghair", "h:sandforce" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 35, "attack": 100, @@ -225,12 +234,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 149, - "experienceGroup": "medium_fast", - "catchRate": 50, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:sandtomb", "1:rototiller", @@ -265,7 +268,6 @@ "tm:allyswitch", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:beatup", "tm:bodyslam", "tm:bulldoze", @@ -279,36 +281,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", @@ -330,11 +321,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": [], @@ -348,15 +364,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 ae692a43ab..9930eca2b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/eevee.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/eevee.json @@ -49,17 +49,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:eviolite", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -94,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", @@ -124,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": [ { @@ -283,124 +281,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/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..12b0a5cddc 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 } ] }, @@ -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 c179433cef..26ee66a437 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": [], @@ -169,46 +183,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": [ @@ -222,7 +198,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -252,9 +228,7 @@ "tm:bulletseed", "tm:charge", "tm:chargebeam", - "tm:chloroblast", "tm:curse", - "tm:discharge", "tm:doubleedge", "tm:electricterrain", "tm:electroball", @@ -273,7 +247,6 @@ "tm:hyperbeam", "tm:iceball", "tm:leafstorm", - "tm:leechseed", "tm:protect", "tm:raindance", "tm:recycle", @@ -286,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 d80b47fefc..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": [ { @@ -224,125 +229,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..c0e819f744 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 } ] }, @@ -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": [], @@ -225,9 +237,6 @@ "frisk", "h:harvest" ], - "eggGroups": [ - "grass" - ], "baseStats": { "hp": 95, "attack": 105, @@ -236,27 +245,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, + "height": 11, "fixed": false }, "standingEyeHeight": 0.96, - "behaviour": {}, "moves": [ "1:dragonhammer", "1:seedbomb", @@ -290,10 +284,7 @@ "egg:poisonpowder", "egg:sleeppowder", "egg:stunspore", - "tm:absorb", "tm:ancientpower", - "tm:barrage", - "tm:bestow", "tm:block", "tm:bodyslam", "tm:breakingswipe", @@ -302,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", @@ -325,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", @@ -361,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", @@ -382,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 58754d9497..25b9724045 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, @@ -84,7 +84,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -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": [ @@ -218,10 +228,6 @@ "steadfast", "h:scrappy" ], - "eggGroups": [ - "flying", - "field" - ], "baseStats": { "hp": 52, "attack": 95, @@ -230,20 +236,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": [ @@ -297,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", @@ -338,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..88b22496bb 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 } ] }, @@ -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 5fe2668280..7fa78b7f4d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/flareon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/flareon.json @@ -47,17 +47,16 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:fire_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -101,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", @@ -123,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", @@ -140,7 +132,6 @@ "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:lavaplume", "tm:mudslap", "tm:mysticalfire", "tm:naturalgift", @@ -148,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 850fc9cb58..e0ffdbfb6c 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 } ] }, @@ -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": [], @@ -224,9 +251,6 @@ "shadowtag", "h:shadowtag" ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 60, "attack": 65, @@ -235,153 +259,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 +281,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..eb49579fb5 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" }, { @@ -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": [ { @@ -217,38 +229,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": [ @@ -296,7 +276,6 @@ "egg:screech", "egg:wideguard", "egg:zapcannon", - "tm:autotomize", "tm:block", "tm:bodyslam", "tm:brickbreak", @@ -304,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", @@ -318,7 +294,6 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focuspunch", @@ -337,7 +312,6 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", @@ -345,7 +319,6 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:smackdown", - "tm:spark", "tm:stealthrock", "tm:steelroller", "tm:stoneedge", @@ -353,7 +326,6 @@ "tm:sunnyday", "tm:supercellslam", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", @@ -361,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..2a2552daea 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 } ] }, @@ -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..1044c44a70 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 } ] }, @@ -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..8659b783c3 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", @@ -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..53013a4ea2 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 } ] }, @@ -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 cdd7202744..220a385045 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": { @@ -72,20 +72,20 @@ "amount": 6, "entries": [ { - "item": "minecraft:flint", + "item": "minecraft:gravel", "quantityRange": "0-3" }, { "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 } ] }, @@ -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": [], @@ -212,7 +227,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -220,38 +234,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": [ @@ -261,15 +243,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 } ] }, @@ -301,7 +283,6 @@ "egg:wideguard", "egg:zapcannon", "tm:allyswitch", - "tm:autotomize", "tm:block", "tm:bodypress", "tm:bodyslam", @@ -310,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", @@ -326,7 +304,6 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", @@ -353,7 +330,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:scaryface", @@ -362,9 +338,7 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:spark", "tm:stealthrock", - "tm:steamroller", "tm:steelroller", "tm:stompingtantrum", "tm:stoneedge", @@ -372,7 +346,6 @@ "tm:sunnyday", "tm:supercellslam", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", @@ -380,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 725a4e26cb..17992362eb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/graveler.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/graveler.json @@ -72,20 +72,20 @@ "amount": 5, "entries": [ { - "item": "minecraft:flint", + "item": "minecraft:gravel", "quantityRange": "0-2" }, { "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 } ] }, @@ -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": [ @@ -214,7 +227,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -222,38 +234,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": [ @@ -263,15 +243,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 } ] }, @@ -302,7 +282,6 @@ "egg:wideguard", "egg:zapcannon", "tm:allyswitch", - "tm:autotomize", "tm:block", "tm:bodyslam", "tm:brickbreak", @@ -310,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", @@ -325,7 +301,6 @@ "tm:facade", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:fling", "tm:focusblast", @@ -346,7 +321,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:sandstorm", @@ -356,7 +330,6 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:spark", "tm:stealthrock", "tm:steelroller", "tm:stompingtantrum", @@ -365,7 +338,6 @@ "tm:sunnyday", "tm:supercellslam", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", @@ -373,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 a6a8f4485f..606e0bebb8 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": [ { @@ -223,37 +225,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 - } - } - }, "moves": [ "1:pound", "1:poisongas", @@ -282,20 +253,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", @@ -309,7 +275,6 @@ "tm:gigadrain", "tm:gigaimpact", "tm:gunkshot", - "tm:harden", "tm:helpinghand", "tm:hex", "tm:hyperbeam", @@ -317,21 +282,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", @@ -344,19 +302,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", @@ -368,7 +322,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 5ffdd442db..64a7807559 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/growlithe.json @@ -57,6 +57,9 @@ "canSleep": true, "willSleepOnBed": true, "light": "0-4" + }, + "entityInteract": { + "avoidedBySkeleton": true } }, "drops": { @@ -98,9 +101,7 @@ "egg:ragingfury", "egg:thrash", "tm:agility", - "tm:bite", "tm:bodyslam", - "tm:burnup", "tm:charm", "tm:closecombat", "tm:covet", @@ -108,33 +109,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 +144,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": [ { @@ -193,9 +200,6 @@ "flashfire", "h:rockhead" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 60, "attack": 75, @@ -204,20 +208,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", @@ -241,15 +231,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", @@ -257,15 +244,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", @@ -292,10 +274,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 7c21551073..40b5f8bdb6 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 } ] }, @@ -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": [], @@ -201,10 +221,6 @@ "moldbreaker", "h:moldbreaker" ], - "eggGroups": [ - "water_2", - "dragon" - ], "baseStats": { "hp": 95, "attack": 155, @@ -213,128 +229,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/haunter.json b/common/src/main/resources/data/cobblemon/species/generation1/haunter.json index fbc0ab7911..1c211a4598 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 } ] }, @@ -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..ae835d689c 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 } ] }, @@ -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..c3b830403b 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 } ] }, @@ -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..5ef1adad30 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 } ] }, @@ -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..89b83e42ee 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 } ] }, @@ -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..bf6eec9534 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 } ] }, @@ -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 e2a94134cc..5f9376565f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jolteon.json @@ -47,17 +47,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:thunder_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:magnet", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -103,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", @@ -126,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", @@ -147,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", @@ -165,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 85cefc63cf..405606f30e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/jynx.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/jynx.json @@ -49,13 +49,12 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -97,10 +96,7 @@ "tm:calmmind", "tm:captivate", "tm:charm", - "tm:confusion", - "tm:copycat", "tm:covet", - "tm:doubleslap", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -110,7 +106,6 @@ "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:flash", "tm:fling", @@ -123,7 +118,6 @@ "tm:hail", "tm:headbutt", "tm:healbell", - "tm:heartstamp", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", @@ -131,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", @@ -163,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", @@ -178,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..b83cad74ab 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 } ] }, @@ -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..5526793494 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 } ] }, @@ -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 d4ba9b08f0..95fb38d00e 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": [ @@ -58,11 +57,11 @@ }, { "item": "cobblemon:twisted_spoon", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -89,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", @@ -112,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", @@ -125,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", @@ -155,7 +145,6 @@ "tm:swift", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:thief", "tm:thunderpunch", @@ -165,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 7d61be5c09..5488c55a41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/kangaskhan.json @@ -48,13 +48,12 @@ "height": 1.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -94,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", @@ -125,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", @@ -141,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", @@ -168,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": [ @@ -209,9 +225,6 @@ "parentalbond", "h:parentalbond" ], - "eggGroups": [ - "monster" - ], "baseStats": { "hp": 105, "attack": 125, @@ -220,150 +233,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..1ec8d43275 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 } ] }, @@ -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": [], @@ -194,147 +197,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..2592659e0f 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": [ { @@ -181,7 +181,7 @@ { "id": "koffing_weezinggalar", "variant": "level_up", - "result": "weezing galarian", + "result": "weezing", "consumeHeldItem": false, "learnableMoves": [ "doublehit" @@ -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", @@ -363,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/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 abd269b018..c85c4456a9 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 } ] }, @@ -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": [ @@ -219,158 +232,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/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 6c37be93e4..2f0774058e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machamp.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machamp.json @@ -48,21 +48,20 @@ "height": 1.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -102,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", @@ -124,7 +119,6 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:foresight", "tm:gigaimpact", "tm:headbutt", "tm:heavyslam", @@ -133,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", @@ -161,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", @@ -178,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": [], @@ -204,156 +214,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..0d8eef5263 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/machoke.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/machoke.json @@ -48,21 +48,20 @@ "height": 1.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -100,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", @@ -120,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", @@ -153,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 c3a3da73c0..4fd1740278 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": [ @@ -98,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", @@ -118,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", @@ -151,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..e9ab6dfc61 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", @@ -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 28182570de..e2d508810c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/magmar.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/magmar.json @@ -47,21 +47,20 @@ "height": 1.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -94,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", @@ -133,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", @@ -157,8 +141,6 @@ "tm:scorchingsands", "tm:screech", "tm:sleeptalk", - "tm:smog", - "tm:smokescreen", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -169,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..a690e4f1a4 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 } ] }, @@ -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 443d4f91d6..c89ef1732b 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": [ @@ -61,7 +60,7 @@ }, { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -95,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", @@ -126,7 +118,6 @@ "tm:focuspunch", "tm:furycutter", "tm:gigaimpact", - "tm:growl", "tm:headbutt", "tm:hyperbeam", "tm:icebeam", @@ -137,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", @@ -156,7 +144,6 @@ "tm:sandstorm", "tm:scorchingsands", "tm:screech", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", @@ -167,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": [], @@ -200,30 +220,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, @@ -281,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", @@ -311,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", @@ -331,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", @@ -351,8 +335,6 @@ "tm:scorchingsands", "tm:screech", "tm:shadowball", - "tm:shadowbone", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:spite", @@ -363,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 a4024c10a3..93798b2cfa 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/meowth.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/meowth.json @@ -109,9 +109,7 @@ "tm:aerialace", "tm:agility", "tm:amnesia", - "tm:assist", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:captivate", "tm:charm", @@ -126,22 +124,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", @@ -149,8 +140,6 @@ "tm:lastresort", "tm:metalclaw", "tm:nastyplot", - "tm:nightslash", - "tm:odorsleuth", "tm:painsplit", "tm:payback", "tm:payday", @@ -158,17 +147,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", @@ -176,7 +162,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -188,7 +173,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": [ { @@ -230,9 +243,6 @@ "technician", "h:rattled" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 40, "attack": 35, @@ -241,20 +251,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": [ @@ -300,9 +296,7 @@ "tm:aerialace", "tm:agility", "tm:amnesia", - "tm:assist", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:captivate", "tm:charm", @@ -319,19 +313,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", @@ -339,26 +325,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", @@ -377,7 +358,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": [ { @@ -420,9 +427,6 @@ "toughclaws", "h:unnerve" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 50, "attack": 65, @@ -439,21 +443,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": { @@ -504,15 +503,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", @@ -527,7 +522,6 @@ "tm:metalsound", "tm:metronome", "tm:nastyplot", - "tm:nightslash", "tm:payback", "tm:payday", "tm:playrough", @@ -535,12 +529,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", @@ -553,14 +545,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": [ { @@ -597,147 +615,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/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 5162190601..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": [ @@ -250,9 +294,6 @@ "steadfast", "h:steadfast" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 106, "attack": 190, @@ -261,182 +302,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 +329,6 @@ "insomnia", "h:insomnia" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 106, "attack": 150, @@ -473,182 +337,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..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": [ @@ -177,9 +195,6 @@ "berserk", "h:berserk" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 90, "attack": 85, @@ -196,12 +211,7 @@ "special_defence": 3, "speed": 0 }, - "baseExperienceYield": 290, - "experienceGroup": "slow", - "catchRate": 3, "eggCycles": 120, - "baseFriendship": 35, - "behaviour": {}, "drops": { "amount": 6, "entries": [ @@ -246,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", @@ -258,8 +266,6 @@ "tm:hypervoice", "tm:imprison", "tm:lashout", - "tm:leer", - "tm:memento", "tm:nastyplot", "tm:painsplit", "tm:payback", @@ -285,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 cb5c7b96fd..42b334c302 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json @@ -53,17 +53,16 @@ "height": 1.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:light_clay", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -105,7 +104,6 @@ "egg:wakeupslap", "tm:aerialace", "tm:allyswitch", - "tm:barrier", "tm:batonpass", "tm:bodyslam", "tm:brickbreak", @@ -113,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", @@ -125,7 +120,6 @@ "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:firepunch", "tm:flash", "tm:fling", @@ -137,10 +131,8 @@ "tm:grassknot", "tm:guardswap", "tm:headbutt", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:infestation", @@ -149,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", @@ -170,8 +158,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", - "tm:quickguard", "tm:raindance", "tm:recycle", "tm:reflect", @@ -190,7 +176,6 @@ "tm:suckerpunch", "tm:sunnyday", "tm:taunt", - "tm:teeterdance", "tm:telekinesis", "tm:terablast", "tm:thief", @@ -198,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": [], @@ -233,9 +257,6 @@ "screencleaner", "h:icebody" ], - "eggGroups": [ - "human_like" - ], "baseStats": { "hp": 50, "attack": 65, @@ -252,18 +273,12 @@ "special_defence": 0, "speed": 2 }, - "baseExperienceYield": 161, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 25, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -307,7 +322,6 @@ "egg:wakeupslap", "tm:allyswitch", "tm:avalanche", - "tm:barrier", "tm:batonpass", "tm:blizzard", "tm:bodyslam", @@ -315,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", @@ -366,7 +366,6 @@ "tm:psychicterrain", "tm:psyshock", "tm:raindance", - "tm:rapidspin", "tm:recycle", "tm:reflect", "tm:rest", @@ -383,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 7e2bc4b7b7..f2fe20dc4f 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 } ] }, @@ -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": [], @@ -217,7 +230,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -225,37 +237,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 - } - } - }, "moves": [ "1:venomdrench", "1:pound", @@ -285,21 +266,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", @@ -315,7 +291,6 @@ "tm:gigadrain", "tm:gigaimpact", "tm:gunkshot", - "tm:harden", "tm:haze", "tm:helpinghand", "tm:hex", @@ -325,20 +300,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", @@ -351,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", @@ -376,7 +340,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..edae6c5955 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 } ] }, @@ -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..1766e87600 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 } ] }, @@ -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..df20561b31 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 } ] }, @@ -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..8679b2bbf8 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 } ] }, @@ -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 80c13ca49e..027eb545cc 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 } ] }, @@ -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": [], @@ -206,16 +218,12 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ "snowcloak", "h:snowwarning" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 73, "attack": 67, @@ -232,12 +240,6 @@ "special_defence": 0, "speed": 2 }, - "baseExperienceYield": 177, - "experienceGroup": "medium_fast", - "catchRate": 75, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 7, "entries": [ @@ -251,7 +253,7 @@ }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -290,7 +292,6 @@ "egg:secretpower", "egg:sheercold", "tm:agility", - "tm:aurorabeam", "tm:auroraveil", "tm:avalanche", "tm:babydolleyes", @@ -306,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", @@ -355,7 +344,6 @@ "tm:roleplay", "tm:safeguard", "tm:secretpower", - "tm:sheercold", "tm:sleeptalk", "tm:snowscape", "tm:spite", @@ -363,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..e6e85f518d 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 } ] }, @@ -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..6c2d569e8f 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 } ] }, @@ -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..3c2887d428 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 } ] }, @@ -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 fcbe54d464..7594cc74a6 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 } ] }, @@ -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": [], @@ -213,7 +228,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -221,9 +235,6 @@ "technician", "h:rattled" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 65, "attack": 60, @@ -232,20 +243,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": [ @@ -255,11 +252,11 @@ }, { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -297,10 +294,8 @@ "tm:aerialace", "tm:agility", "tm:amnesia", - "tm:assist", "tm:assurance", "tm:beatup", - "tm:bite", "tm:bodyslam", "tm:burningjealousy", "tm:captivate", @@ -318,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", @@ -340,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", @@ -370,7 +352,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:takedown", "tm:taunt", "tm:terablast", @@ -382,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 2031c3eb03..8b09e1c162 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 } ] }, @@ -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": [], @@ -170,9 +177,6 @@ "noguard", "h:noguard" ], - "eggGroups": [ - "flying" - ], "baseStats": { "hp": 83, "attack": 80, @@ -181,85 +185,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/pidgeotto.json b/common/src/main/resources/data/cobblemon/species/generation1/pidgeotto.json index c1cce9590f..e684a24b76 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 } ] }, @@ -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 2f37ed35c2..c45bc2ab1b 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 } ] }, @@ -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": [ @@ -258,133 +262,9 @@ "aspects": [ "partner-cap" ], - "abilities": [ - "static", - "h:lightningrod" - ], "eggGroups": [ "undiscovered" ], - "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", - "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" - ], "evolutions": [], "battleOnly": false }, @@ -404,157 +284,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 +305,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..3106299de6 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" @@ -59,7 +64,7 @@ "entries": [ { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -97,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", @@ -131,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": [ @@ -176,9 +190,6 @@ "aerilate", "h:aerilate" ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 65, "attack": 155, @@ -187,111 +198,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/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..08b733fb05 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 } ] }, @@ -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..804b6ae4ca 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 } ] }, @@ -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 daada4438e..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": [ { @@ -191,31 +192,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": [ @@ -255,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", @@ -281,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..19a94929ba 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 } ] }, @@ -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 fd6a30fa2b..6248c34047 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 } ] }, @@ -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": [], @@ -226,10 +232,6 @@ "surgesurfer", "h:surgesurfer" ], - "eggGroups": [ - "field", - "fairy" - ], "baseStats": { "hp": 60, "attack": 85, @@ -238,34 +240,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" } }, "moves": [ @@ -305,8 +293,6 @@ "tm:agility", "tm:alluringvoice", "tm:allyswitch", - "tm:bestow", - "tm:bide", "tm:bodyslam", "tm:brickbreak", "tm:calmmind", @@ -316,8 +302,6 @@ "tm:covet", "tm:dig", "tm:disarmingvoice", - "tm:discharge", - "tm:doubleslap", "tm:doubleteam", "tm:drainingkiss", "tm:echoedvoice", @@ -330,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", @@ -374,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", @@ -391,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 a3a296ac57..2f6b1f11df 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 } ] }, @@ -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": [], @@ -187,7 +193,6 @@ "galarian_form" ], "aspects": [ - "galarian", "galarian" ], "abilities": [ @@ -195,40 +200,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": [ @@ -238,7 +209,7 @@ }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -272,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", @@ -305,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 0b6273bd84..af60217778 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/raticate.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/raticate.json @@ -61,9 +61,6 @@ "resting": { "canSleep": true, "light": "0-4" - }, - "combat": { - "willDefendSelf": true } }, "drops": { @@ -75,7 +72,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -104,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", @@ -118,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", @@ -160,8 +148,6 @@ "tm:superfang", "tm:swagger", "tm:swordsdance", - "tm:tackle", - "tm:tailwhip", "tm:takedown", "tm:taunt", "tm:terablast", @@ -173,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": [], @@ -193,7 +206,6 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ @@ -201,9 +213,6 @@ "hustle", "h:thickfat" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 71, @@ -212,20 +221,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": [ @@ -235,7 +230,7 @@ }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -268,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", @@ -284,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", @@ -318,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", @@ -339,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 4b30d1dc1d..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": [ { @@ -201,31 +212,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": [ @@ -266,10 +252,8 @@ "egg:uproar", "tm:assurance", "tm:beatup", - "tm:bite", "tm:blizzard", "tm:bodyslam", - "tm:counter", "tm:covet", "tm:crunch", "tm:darkpulse", @@ -279,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", @@ -306,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", @@ -323,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..e9a813c894 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 } ] }, @@ -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 b37121b26c..9758c47611 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 @@ -111,13 +115,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 +127,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 +138,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 +172,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": [ { @@ -222,9 +244,6 @@ "snowcloak", "h:slushrush" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 50, "attack": 75, @@ -233,20 +252,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": 3, "entries": [ @@ -297,37 +302,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", @@ -339,21 +336,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", @@ -369,7 +359,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 a5f26a2b1f..d4501d8313 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/sandslash.json @@ -63,15 +63,19 @@ } }, "drops": { - "amount": 2, + "amount": 4, "entries": [ + { + "item": "minecraft:armadillo_scute", + "quantityRange": "0-2" + }, { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -109,13 +113,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 +125,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 +140,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 +175,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": [], @@ -205,16 +230,12 @@ "alolan_form" ], "aspects": [ - "alolan", "alolan" ], "abilities": [ "snowcloak", "h:slushrush" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 100, @@ -223,20 +244,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": 4, "entries": [ @@ -246,11 +253,11 @@ }, { "item": "cobblemon:quick_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -293,17 +300,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", @@ -312,14 +314,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", @@ -328,9 +328,7 @@ "tm:iceball", "tm:icebeam", "tm:icepunch", - "tm:iceshard", "tm:icespinner", - "tm:iciclecrash", "tm:iciclespear", "tm:icywind", "tm:irondefense", @@ -339,24 +337,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", @@ -373,7 +363,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..65958ce44c 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 } ] }, @@ -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..acd0a64f2a 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": { @@ -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 } ] }, @@ -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 f47227cd2e..88434a31f9 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 } ] }, @@ -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": [], @@ -241,10 +264,6 @@ "shellarmor", "h:shellarmor" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 95, "attack": 75, @@ -253,167 +272,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 +305,6 @@ "galarian_form" ], "aspects": [ - "galarian", "galarian" ], "abilities": [ @@ -440,10 +312,6 @@ "owntempo", "h:regenerator" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 95, "attack": 100, @@ -460,18 +328,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 } } }, @@ -484,7 +350,7 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -512,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", @@ -528,10 +391,8 @@ "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:confusion", "tm:curse", "tm:dig", - "tm:disable", "tm:dive", "tm:doubleedge", "tm:drainpunch", @@ -546,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", @@ -587,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", @@ -614,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 7912eae5f4..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": [ { @@ -250,39 +266,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": { + "walk": { + "walkSpeed": 0.125 + }, "swim": { - "canSwimInWater": true, - "canSwimInLava": false, + "swimSpeed": "0.2", "canBreatheUnderwater": true, - "swimSpeed": "0.2" + "canSwimInWater": true, + "canSwimInLava": false } + }, + "resting": { + "canSleep": true, + "willSleepOnBed": true, + "light": "0-16" } }, "drops": { @@ -320,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", @@ -332,10 +328,8 @@ "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:confusion", "tm:curse", "tm:dig", - "tm:disable", "tm:dive", "tm:earthquake", "tm:endure", @@ -345,10 +339,8 @@ "tm:flamethrower", "tm:foulplay", "tm:grassknot", - "tm:growl", "tm:hail", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hydropump", "tm:icebeam", @@ -370,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", @@ -391,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 ab873ee7e8..b6d4c3f989 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/snorlax.json @@ -52,13 +52,13 @@ "moving": { "walk": { "walkSpeed": 0.147 - }, - "resting": { - "canSleep": true, - "willSleepOnBed": false, - "depth": "normal", - "light": "0-15" } + }, + "resting": { + "canSleep": true, + "willSleepOnBed": false, + "depth": "normal", + "light": "0-15" } }, "drops": { @@ -74,11 +74,11 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:leftovers", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -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": [], @@ -251,187 +276,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/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..b07e1e15bf 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 } ] }, @@ -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 0fba255546..ebf2d498ee 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": [ @@ -89,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 7640984426..2d59d3d59a 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": [ @@ -104,7 +103,6 @@ "tm:headbutt", "tm:helpinghand", "tm:highhorsepower", - "tm:hornattack", "tm:hyperbeam", "tm:icebeam", "tm:icywind", @@ -116,9 +114,6 @@ "tm:outrage", "tm:payback", "tm:protect", - "tm:pursuit", - "tm:rage", - "tm:ragingbull", "tm:raindance", "tm:rest", "tm:retaliate", @@ -143,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": [ @@ -180,9 +199,6 @@ "angerpoint", "h:cudchew" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 110, @@ -199,12 +215,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 172, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:tailwhip", @@ -231,7 +241,6 @@ "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:drillrun", "tm:earthquake", "tm:endeavor", @@ -245,7 +254,6 @@ "tm:lashout", "tm:outrage", "tm:protect", - "tm:ragingbull", "tm:raindance", "tm:rest", "tm:reversal", @@ -261,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 @@ -299,9 +322,6 @@ "angerpoint", "h:cudchew" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 110, @@ -318,12 +338,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 172, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:tailwhip", @@ -349,7 +363,6 @@ "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:drillrun", "tm:earthquake", "tm:endeavor", @@ -369,7 +382,6 @@ "tm:outrage", "tm:overheat", "tm:protect", - "tm:ragingbull", "tm:raindance", "tm:rest", "tm:reversal", @@ -384,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 @@ -415,17 +442,14 @@ "paldean_form" ], "aspects": [ - "aqua-breed", - "paldean" + "paldean", + "aqua-breed" ], "abilities": [ "intimidate", "angerpoint", "h:cudchew" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 110, @@ -442,12 +466,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 172, - "experienceGroup": "slow", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:tailwhip", @@ -465,7 +483,6 @@ "60:closecombat", "egg:curse", "egg:endeavor", - "tm:aquajet", "tm:bodypress", "tm:bodyslam", "tm:bulkup", @@ -475,7 +492,6 @@ "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doublekick", "tm:drillrun", "tm:earthquake", "tm:endeavor", @@ -491,7 +507,6 @@ "tm:liquidation", "tm:outrage", "tm:protect", - "tm:ragingbull", "tm:raindance", "tm:rest", "tm:reversal", @@ -506,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..9048956060 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", @@ -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..c7b59b8f4d 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 } ] }, @@ -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..a0dfda15f1 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 } ] }, @@ -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..c3b184a1c8 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 } ] }, @@ -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 40794fc8cb..f595b61310 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.0 } ] }, @@ -124,27 +125,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 +145,7 @@ "tm:safeguard", "tm:scaryface", "tm:seedbomb", - "tm:skullbash", - "tm:sleeppowder", "tm:sleeptalk", - "tm:sludge", "tm:sludgebomb", "tm:solarbeam", "tm:stompingtantrum", @@ -163,20 +153,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": [], @@ -202,10 +216,6 @@ "thickfat", "h:thickfat" ], - "eggGroups": [ - "monster", - "grass" - ], "baseStats": { "hp": 80, "attack": 100, @@ -214,125 +224,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 +246,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/victreebel.json b/common/src/main/resources/data/cobblemon/species/generation1/victreebel.json index 88e3b137f7..4c1124dc66 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 } ] }, @@ -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..b25d5bffeb 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 } ] }, @@ -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 a9140b48f7..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": [ { @@ -176,43 +188,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": [ @@ -255,7 +230,6 @@ "tm:bulletseed", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:doubleedge", "tm:electricterrain", "tm:electroball", @@ -272,7 +246,6 @@ "tm:gyroball", "tm:iceball", "tm:leafstorm", - "tm:leechseed", "tm:protect", "tm:raindance", "tm:recycle", @@ -284,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 7480cb88e2..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": [ { @@ -206,31 +212,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": [ @@ -278,7 +259,6 @@ "egg:secretpower", "egg:sheercold", "tm:agility", - "tm:aurorabeam", "tm:auroraveil", "tm:babydolleyes", "tm:batonpass", @@ -292,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", @@ -336,7 +304,6 @@ "tm:roleplay", "tm:safeguard", "tm:secretpower", - "tm:sheercold", "tm:sleeptalk", "tm:snowscape", "tm:spite", @@ -344,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..81f2e6d6ed 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 } ] }, @@ -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..62d10df026 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 } ] }, @@ -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 9b435fc7a4..e0c59dc378 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 + "percentage": 5.0 + }, + { + "item": "cobblemon:smoke_ball", + "percentage": 5.0 } ] }, @@ -96,14 +100,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 +111,6 @@ "tm:flamethrower", "tm:flash", "tm:gigaimpact", - "tm:grudge", "tm:gunkshot", "tm:gyroball", "tm:haze", @@ -119,13 +118,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 +131,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 +147,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": [], @@ -185,45 +191,20 @@ "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": [ { "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 } ] }, @@ -260,45 +241,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", @@ -306,19 +276,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", @@ -330,7 +292,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..d21f25f363 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 } ] }, @@ -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 0ba2ee3d3a..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": [ @@ -180,9 +197,6 @@ "defiant", "h:defiant" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 90, "attack": 125, @@ -199,12 +213,7 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 290, - "experienceGroup": "slow", - "catchRate": 3, "eggCycles": 120, - "baseFriendship": 35, - "behaviour": {}, "drops": { "amount": 6, "entries": [ @@ -249,10 +258,7 @@ "tm:bulkup", "tm:closecombat", "tm:coaching", - "tm:counter", - "tm:detect", "tm:doubleedge", - "tm:drillpeck", "tm:dualwingbeat", "tm:endeavor", "tm:endure", @@ -269,10 +275,8 @@ "tm:lowsweep", "tm:megakick", "tm:payback", - "tm:peck", "tm:pluck", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -294,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 d3ada30d42..911443b7c8 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 } ] }, @@ -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": [], @@ -213,10 +232,6 @@ "moldbreaker", "h:moldbreaker" ], - "eggGroups": [ - "monster", - "field" - ], "baseStats": { "hp": 90, "attack": 95, @@ -225,144 +240,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..5d89a84ec0 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": [ @@ -67,7 +66,7 @@ }, { "item": "cobblemon:poison_barb", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -103,7 +102,6 @@ "egg:ragepowder", "egg:sonicboom", "egg:twineedle", - "tm:absorb", "tm:acidspray", "tm:agility", "tm:assurance", @@ -111,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", @@ -134,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", @@ -154,10 +143,7 @@ "tm:sludgewave", "tm:smartstrike", "tm:solarbeam", - "tm:sonicboom", - "tm:spiderweb", "tm:spite", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -169,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..b09a9acd76 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 } ] }, @@ -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..c37a834ecc 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 } ] }, @@ -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 71c95bb616..1d3948fe16 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/bellossom.json @@ -51,17 +51,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:absorb_bulb", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -96,8 +95,6 @@ "egg:synthesis", "egg:teeterdance", "egg:tickle", - "tm:absorb", - "tm:acid", "tm:acidspray", "tm:afteryou", "tm:batonpass", @@ -111,7 +108,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:fling", "tm:gastroacid", @@ -120,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..43c042874a 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 } ] }, @@ -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 0bebc0f09d..0c9f826b72 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": [ @@ -79,7 +78,6 @@ "tm:batonpass", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:cut", "tm:dazzlinggleam", "tm:dreameater", @@ -99,8 +97,6 @@ "tm:grassyglide", "tm:grassyterrain", "tm:healbell", - "tm:healblock", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", "tm:imprison", @@ -108,8 +104,6 @@ "tm:lastresort", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", - "tm:lifedew", "tm:lightscreen", "tm:magicalleaf", "tm:magiccoat", @@ -119,7 +113,6 @@ "tm:nastyplot", "tm:naturalgift", "tm:naturepower", - "tm:perishsong", "tm:pollenpuff", "tm:protect", "tm:psychic", @@ -127,7 +120,6 @@ "tm:psychocut", "tm:psychup", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:safeguard", @@ -159,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..777a1b7c9a 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 } ] }, @@ -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 85675b63c6..3b2ac583b5 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": [ @@ -87,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", @@ -114,7 +110,6 @@ "tm:grassknot", "tm:gravity", "tm:headbutt", - "tm:healpulse", "tm:helpinghand", "tm:hypervoice", "tm:icywind", @@ -127,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", @@ -146,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 30d28d9ae9..4d1fa3790c 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 } ] }, @@ -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": [ @@ -204,10 +210,6 @@ "weakarmor", "h:cursedbody" ], - "eggGroups": [ - "water_1", - "water_3" - ], "baseStats": { "hp": 60, "attack": 55, @@ -224,18 +226,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 } } }, @@ -270,7 +267,6 @@ "egg:waterpulse", "tm:amnesia", "tm:ancientpower", - "tm:astonish", "tm:blizzard", "tm:bodyslam", "tm:brine", @@ -278,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", @@ -300,7 +291,6 @@ "tm:lightscreen", "tm:liquidation", "tm:meteorbeam", - "tm:mirrorcoat", "tm:naturepower", "tm:nightshade", "tm:powergem", @@ -323,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..5f4381ecb1 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 } ] }, @@ -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..6bd06f85a1 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 } ] }, @@ -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 ed2dbf5d33..fb17a9ffc2 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 } ] }, @@ -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": [ { @@ -195,123 +192,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/delibird.json b/common/src/main/resources/data/cobblemon/species/generation2/delibird.json index d7f104a015..c7934c5260 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 } ] }, @@ -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..68c5e0738c 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 } ] }, @@ -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 b3d8c1e876..11456fedf5 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": [ @@ -94,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", @@ -119,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", @@ -145,8 +135,6 @@ "tm:pounce", "tm:protect", "tm:psychup", - "tm:pursuit", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -182,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 2bac92d306..d943416bac 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": [ @@ -81,7 +80,6 @@ "72:fireblast", "78:eruption", "tm:agility", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:calmmind", @@ -89,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", @@ -112,8 +105,6 @@ "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:lavaplume", - "tm:leer", "tm:overheat", "tm:protect", "tm:quash", @@ -123,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", @@ -144,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 e2bb0e0049..0a6c3ee6ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/espeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/espeon.json @@ -47,17 +47,16 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:sun_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:twisted_spoon", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -102,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", @@ -125,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", @@ -146,7 +138,6 @@ "tm:magicalleaf", "tm:magiccoat", "tm:magicroom", - "tm:morningsun", "tm:mudslap", "tm:naturalgift", "tm:payday", @@ -160,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", @@ -176,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..1e20111ed2 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 } ] }, @@ -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..a1fbb04811 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 } ] }, @@ -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..bf502e9877 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 } ] }, @@ -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 9652b30cb4..62e28fc3c2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/furret.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/furret.json @@ -48,17 +48,16 @@ "height": 1.42, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -93,7 +92,6 @@ "tm:agility", "tm:amnesia", "tm:aquatail", - "tm:assist", "tm:assurance", "tm:babydolleyes", "tm:batonpass", @@ -105,10 +103,8 @@ "tm:chargebeam", "tm:charm", "tm:chillingwater", - "tm:coil", "tm:covet", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:echoedvoice", @@ -121,10 +117,7 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:followme", - "tm:foresight", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:growl", @@ -138,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", @@ -174,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 d6002fa6f1..6a4a1af3f9 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": [ @@ -101,7 +100,6 @@ "tm:allyswitch", "tm:amnesia", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:beatup", "tm:bodyslam", @@ -109,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", @@ -124,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", @@ -142,10 +135,7 @@ "tm:lightscreen", "tm:lowkick", "tm:magiccoat", - "tm:meanlook", - "tm:mirrorcoat", "tm:nastyplot", - "tm:odorsleuth", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -156,7 +146,6 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:razorwind", "tm:recycle", "tm:reflect", "tm:rest", @@ -168,7 +157,6 @@ "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:stomp", "tm:stompingtantrum", "tm:storedpower", "tm:strength", @@ -176,7 +164,6 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -187,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 9383ed1c78..e58feadc17 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": [ @@ -105,8 +104,6 @@ "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:counter", - "tm:crabhammer", "tm:crosspoison", "tm:crunch", "tm:cut", @@ -119,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", @@ -135,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", @@ -190,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": [ { @@ -209,7 +228,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/granbull.json b/common/src/main/resources/data/cobblemon/species/generation2/granbull.json index efadd091b9..2059a98975 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 } ] }, @@ -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 00be97d53a..3179fe45f8 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 } ] }, @@ -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": [ @@ -198,9 +210,6 @@ "skilllink", "h:skilllink" ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 80, "attack": 185, @@ -209,131 +218,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/hitmontop.json b/common/src/main/resources/data/cobblemon/species/generation2/hitmontop.json index 76ed75d085..3bab40e9b7 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 } ] }, @@ -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 764ddca3a2..2fb13933d5 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": [ @@ -86,7 +85,6 @@ "tm:ancientpower", "tm:bodyslam", "tm:bravebird", - "tm:burnup", "tm:calmmind", "tm:chargebeam", "tm:defog", @@ -97,7 +95,6 @@ "tm:earthquake", "tm:echoedvoice", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firespin", @@ -109,7 +106,6 @@ "tm:futuresight", "tm:gigadrain", "tm:gigaimpact", - "tm:gust", "tm:heatwave", "tm:helpinghand", "tm:hurricane", @@ -119,7 +115,6 @@ "tm:incinerate", "tm:ironhead", "tm:laserfocus", - "tm:lifedew", "tm:lightscreen", "tm:mysticalfire", "tm:naturalgift", @@ -129,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", @@ -159,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 dcf72d6874..74881d91e2 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": [ @@ -88,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", @@ -115,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 314373596b..a50539859e 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": [ @@ -62,11 +61,11 @@ }, { "item": "minecraft:blaze_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -102,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", @@ -130,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", @@ -162,7 +147,6 @@ "tm:shadowball", "tm:sleeptalk", "tm:sludgebomb", - "tm:smog", "tm:snarl", "tm:snatch", "tm:solarbeam", @@ -182,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": [], @@ -208,9 +222,6 @@ "solarpower", "h:solarpower" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 90, @@ -219,135 +230,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..eb28148b11 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": [ @@ -99,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", @@ -125,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", @@ -155,7 +140,6 @@ "tm:shadowball", "tm:sleeptalk", "tm:sludgebomb", - "tm:smog", "tm:snarl", "tm:snatch", "tm:solarbeam", @@ -173,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 56c6da8758..2a50e66a0a 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": [ @@ -94,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", @@ -110,7 +106,6 @@ "tm:endure", "tm:facade", "tm:faketears", - "tm:feintattack", "tm:fireblast", "tm:flamethrower", "tm:flash", @@ -119,7 +114,6 @@ "tm:gravity", "tm:headbutt", "tm:healbell", - "tm:healpulse", "tm:helpinghand", "tm:hypervoice", "tm:icywind", @@ -131,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", @@ -149,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 eb0df10252..0342846d15 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": [ @@ -59,7 +58,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -92,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", @@ -110,7 +104,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", "tm:fling", "tm:gigadrain", @@ -122,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..91fcd80453 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 } ] }, @@ -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..d5403dd581 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 } ] }, @@ -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..7b1d3f22b0 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 } ] }, @@ -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 678700c115..b2da222cf2 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": [ @@ -79,7 +78,6 @@ "90:skyattack", "tm:acrobatics", "tm:aerialace", - "tm:aeroblast", "tm:aircutter", "tm:airslash", "tm:ancientpower", @@ -97,7 +95,6 @@ "tm:dive", "tm:doubleedge", "tm:dragonpulse", - "tm:dragonrush", "tm:dragontail", "tm:dreameater", "tm:dualwingbeat", @@ -105,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", @@ -128,7 +123,6 @@ "tm:laserfocus", "tm:lightscreen", "tm:liquidation", - "tm:mist", "tm:naturalgift", "tm:ominouswind", "tm:protect", @@ -136,9 +130,7 @@ "tm:psychicnoise", "tm:psychup", "tm:psyshock", - "tm:punishment", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:rocksmash", @@ -172,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 769f680a0b..e0cb96506e 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": [ @@ -93,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", @@ -146,8 +130,6 @@ "tm:scaryface", "tm:screech", "tm:sleeptalk", - "tm:smog", - "tm:smokescreen", "tm:substitute", "tm:sunnyday", "tm:takedown", @@ -155,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..d032c6ccd0 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 } ] }, @@ -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..5eb8fdd814 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 } ] }, @@ -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..d301cb89e7 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 } ] }, @@ -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..ac0f4a9c06 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 } ] }, @@ -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..437712d8fa 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 } ] }, @@ -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 6f150f8cbb..8f8b5c9378 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": [ @@ -90,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", @@ -114,7 +110,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:grudge", "tm:headbutt", "tm:healbell", @@ -127,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", @@ -145,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", @@ -174,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..d6858f2ca5 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 } ] }, @@ -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..9dafd5bc70 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 } ] }, @@ -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 25a4616fd0..86748b3867 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/pichu.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/pichu.json @@ -50,10 +50,13 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { - "amount": 2, + "amount": 3, "entries": [ + { + "item": "cobblemon:light_ball", + "percentage": 2.5 + }, { "item": "cobblemon:thunder_stone", "percentage": 2.5 @@ -84,14 +87,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", @@ -99,8 +99,6 @@ "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:flail", "tm:flash", "tm:fling", "tm:grassknot", @@ -108,15 +106,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", @@ -128,22 +122,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": [ { @@ -179,116 +185,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/piloswine.json b/common/src/main/resources/data/cobblemon/species/generation2/piloswine.json index 873e3588fb..6541a91e2b 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 } ] }, @@ -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 47fba62bd5..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": [ { @@ -173,6 +187,28 @@ "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/politoed.json b/common/src/main/resources/data/cobblemon/species/generation2/politoed.json index 512c5bd227..89cb4bfc51 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 } ] }, @@ -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..5b570c02e1 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 } ] }, @@ -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..2993618259 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 } ] }, @@ -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..65acfe68d0 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 } ] }, @@ -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 1e1096d370..d79bb349bd 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 } ] }, @@ -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": [ @@ -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..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": [ @@ -219,52 +227,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", @@ -294,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", @@ -326,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", @@ -345,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", @@ -361,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 4057c4dd1e..a73a16810a 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": [ @@ -77,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", @@ -125,7 +117,6 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -137,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..dfcf04125b 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", @@ -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 653f520ace..a0d4f9fc9c 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 } ] }, @@ -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": [], @@ -200,9 +217,6 @@ "technician", "h:technician" ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 70, "attack": 150, @@ -211,132 +225,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..9c26d7eca1 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": [ @@ -89,7 +88,6 @@ "egg:tidyup", "tm:amnesia", "tm:aquatail", - "tm:assist", "tm:assurance", "tm:babydolleyes", "tm:batonpass", @@ -103,7 +101,6 @@ "tm:chillingwater", "tm:covet", "tm:cut", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:echoedvoice", @@ -115,10 +112,7 @@ "tm:fling", "tm:focusenergy", "tm:focuspunch", - "tm:followme", - "tm:foresight", "tm:furycutter", - "tm:furyswipes", "tm:grassknot", "tm:growl", "tm:headbutt", @@ -130,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", @@ -164,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..51ca404e60 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 } ] }, @@ -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 9936e8eefa..aa011a53ac 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": [ @@ -58,7 +57,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -91,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", @@ -109,7 +103,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", "tm:fling", "tm:gigadrain", @@ -119,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 6d39b06055..908449c521 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 } ] }, @@ -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": [], @@ -249,7 +275,6 @@ "galarian_form" ], "aspects": [ - "galarian", "galarian" ], "abilities": [ @@ -257,10 +282,6 @@ "owntempo", "h:regenerator" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 95, "attack": 65, @@ -269,29 +290,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 } } }, @@ -304,7 +312,7 @@ }, { "item": "cobblemon:chesto_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -337,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", @@ -351,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", @@ -372,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", @@ -412,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", @@ -426,7 +423,6 @@ "tm:surf", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -444,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 d5899c429a..1396b8d791 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": [ @@ -92,8 +91,6 @@ "tm:calmmind", "tm:captivate", "tm:charm", - "tm:confusion", - "tm:copycat", "tm:covet", "tm:drainingkiss", "tm:dreameater", @@ -101,7 +98,6 @@ "tm:encore", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:flash", "tm:fling", @@ -109,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", @@ -142,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 1b8970f106..11a6e92b42 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": [ @@ -100,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", @@ -135,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", @@ -155,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", @@ -190,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": [ { @@ -208,7 +221,8 @@ "variant": "time_range", "range": "night" } - ] + ], + "permanent": true } ], "forms": [ @@ -229,42 +243,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": [ @@ -311,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", @@ -329,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", @@ -356,7 +324,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -368,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": [ { @@ -388,7 +380,8 @@ "variant": "time_range", "range": "day" } - ] + ], + "permanent": true } ], "battleOnly": false 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 244599ef4d..e4561d8f7c 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": [ @@ -97,7 +96,6 @@ "egg:ragepowder", "egg:sonicboom", "egg:twineedle", - "tm:absorb", "tm:acidspray", "tm:agility", "tm:assurance", @@ -105,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", @@ -124,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", @@ -156,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 6ffd4ee2b8..7625398c08 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 } ] }, @@ -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": [], @@ -227,9 +251,6 @@ "sandforce", "h:sandforce" ], - "eggGroups": [ - "mineral" - ], "baseStats": { "hp": 75, "attack": 125, @@ -238,153 +259,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/sudowoodo.json b/common/src/main/resources/data/cobblemon/species/generation2/sudowoodo.json index 80bd7d179d..21922ea749 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 } ] }, @@ -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 85e954e0e9..1660731c77 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": [ @@ -80,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", @@ -94,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", @@ -110,10 +103,7 @@ "tm:ironhead", "tm:irontail", "tm:laserfocus", - "tm:leer", "tm:liquidation", - "tm:mirrorcoat", - "tm:mist", "tm:ominouswind", "tm:protect", "tm:quash", @@ -125,7 +115,6 @@ "tm:sandstorm", "tm:scald", "tm:shadowball", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:snarl", @@ -138,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..30b087b856 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 } ] }, @@ -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 dee1ab346b..96ea56b0e0 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": [ @@ -98,7 +97,6 @@ "tm:ancientpower", "tm:babydolleyes", "tm:batonpass", - "tm:bestow", "tm:bodyslam", "tm:charm", "tm:covet", @@ -110,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", @@ -163,7 +149,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:telekinesis", "tm:terablast", @@ -172,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 530503c395..4f3dd10bbf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json @@ -49,21 +49,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -102,7 +101,6 @@ "tm:ancientpower", "tm:babydolleyes", "tm:batonpass", - "tm:bestow", "tm:bodyslam", "tm:brickbreak", "tm:charm", @@ -118,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", @@ -142,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", @@ -185,7 +170,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:tailwind", "tm:telekinesis", @@ -196,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..5dfdd12fd3 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 } ] }, @@ -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 eda8ccb4c4..cc1db3cef2 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 } ] }, @@ -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": [], @@ -216,9 +233,6 @@ "blaze", "h:frisk" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 73, "attack": 84, @@ -227,26 +241,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", @@ -286,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", @@ -333,7 +313,6 @@ "tm:playrough", "tm:poltergeist", "tm:protect", - "tm:quickattack", "tm:rest", "tm:reversal", "tm:roar", @@ -343,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 3225f827a3..fe5bb8397d 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 } ] }, @@ -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": [], @@ -245,9 +283,6 @@ "sandstream", "h:sandstream" ], - "eggGroups": [ - "monster" - ], "baseStats": { "hp": 100, "attack": 164, @@ -256,175 +291,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/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 57ad6d7f70..8569ea06e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/umbreon.json @@ -47,17 +47,16 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:moon_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:black_glasses", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -105,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", @@ -144,8 +136,6 @@ "tm:lashout", "tm:lastresort", "tm:lightscreen", - "tm:meanlook", - "tm:moonlight", "tm:mudslap", "tm:naturalgift", "tm:payback", @@ -154,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", @@ -176,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 0ad5fbf8f8..6b8ca2cd9e 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": [ @@ -59,8 +58,7 @@ ] }, "moves": [ - "1:hiddenpower", - "tm:hiddenpower" + "1:hiddenpower" ], "evolutions": [], "forms": [ @@ -79,38 +77,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 +95,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 +113,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 +131,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 +149,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 +167,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 +185,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 +203,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 +221,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 +239,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 +257,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 +275,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 +293,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 +311,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 +329,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 +347,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 +365,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 +383,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 +401,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 +419,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 +437,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 +455,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 +473,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 +491,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 +509,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 +518,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 +533,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..733debea91 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": [ @@ -58,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 } ] }, @@ -106,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", @@ -125,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", @@ -144,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", @@ -166,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", @@ -180,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..17adfe2b81 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 } ] }, @@ -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 503c377dc3..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": [ { @@ -223,41 +233,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": [ @@ -304,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", @@ -319,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", @@ -354,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..3429760deb 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 } ] }, @@ -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 54a4823827..181afd18c5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/absol.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/absol.json @@ -48,17 +48,20 @@ "height": 2.1, "fixed": false }, - "behaviour": {}, "drops": { - "amount": 2, + "amount": 3, "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 + }, + { + "item": "cobblemon:life_orb", + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -96,7 +99,6 @@ "tm:airslash", "tm:assurance", "tm:batonpass", - "tm:bite", "tm:blizzard", "tm:bodyslam", "tm:bounce", @@ -107,7 +109,6 @@ "tm:curse", "tm:cut", "tm:darkpulse", - "tm:detect", "tm:doubleedge", "tm:doubleteam", "tm:dreameater", @@ -115,8 +116,6 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feint", - "tm:feintattack", "tm:fireblast", "tm:flamethrower", "tm:flash", @@ -136,24 +135,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", @@ -161,11 +151,9 @@ "tm:rocktomb", "tm:roleplay", "tm:sandstorm", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -189,7 +177,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": [ @@ -213,9 +243,6 @@ "magicbounce", "h:magicbounce" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 65, "attack": 150, @@ -224,150 +251,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..4eafbca2de 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 } ] }, @@ -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": [], @@ -231,9 +269,6 @@ "filter", "h:filter" ], - "eggGroups": [ - "monster" - ], "baseStats": { "hp": 70, "attack": 140, @@ -242,156 +277,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..7e0601aff9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json @@ -48,20 +48,19 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "entries": [ { "item": "minecraft:white_wool", - "quantityRange": "1-2" + "quantityRange": "0-2" }, { "item": "minecraft:chicken" }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -101,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", @@ -130,9 +125,7 @@ "tm:firespin", "tm:flamethrower", "tm:fly", - "tm:furyattack", "tm:gigaimpact", - "tm:growl", "tm:haze", "tm:healbell", "tm:heatwave", @@ -144,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", @@ -183,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": [], @@ -209,10 +222,6 @@ "pixilate", "h:pixilate" ], - "eggGroups": [ - "flying", - "dragon" - ], "baseStats": { "hp": 75, "attack": 110, @@ -221,141 +230,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/anorith.json b/common/src/main/resources/data/cobblemon/species/generation3/anorith.json index dbfce93a64..29cdcbd081 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 } ] }, @@ -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..4ef31048e6 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 } ] }, @@ -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 49fee1d54c..d883953832 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": [ @@ -83,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", @@ -110,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 9986d4ac83..af02a122d4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/banette.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/banette.json @@ -47,13 +47,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { - "amount": 1, + "amount": 2, "entries": [ + { + "item": "minecraft:phantom_membrane", + "percentage": 5.0 + }, { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -83,7 +86,6 @@ "egg:pursuit", "egg:shadowsneak", "tm:allyswitch", - "tm:astonish", "tm:burningjealousy", "tm:calmmind", "tm:chargebeam", @@ -91,17 +93,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", @@ -130,7 +128,6 @@ "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:roleplay", @@ -138,7 +135,6 @@ "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:shockwave", "tm:skillswap", "tm:skittersmack", @@ -161,7 +157,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": [], @@ -186,9 +217,6 @@ "prankster", "h:prankster" ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 64, "attack": 165, @@ -197,127 +225,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/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 7817b0fc4c..a4e28380bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json @@ -47,17 +47,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:bright_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -79,7 +78,6 @@ "35:bugbuzz", "37:rage", "40:quiverdance", - "tm:absorb", "tm:acrobatics", "tm:aerialace", "tm:aircutter", @@ -96,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", @@ -121,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 2636da2c74..6754923041 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": [ @@ -61,7 +60,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, @@ -117,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", @@ -147,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", @@ -163,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", @@ -181,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", @@ -208,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": [], @@ -234,9 +251,6 @@ "speedboost", "h:speedboost" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 80, "attack": 160, @@ -245,166 +259,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/breloom.json b/common/src/main/resources/data/cobblemon/species/generation3/breloom.json index a7651f0f7f..3f872ae704 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 } ] }, @@ -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..8915ac2e89 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 } ] }, @@ -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 32382fe82f..7659622a08 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/camerupt.json @@ -49,17 +49,16 @@ "height": 1.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "minecraft:magma_cream", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -106,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", @@ -129,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", @@ -165,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": [], @@ -208,9 +216,6 @@ "sheerforce", "h:sheerforce" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 70, "attack": 120, @@ -219,142 +224,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/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 f5a432dd95..b9dba48ed2 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 } ] }, @@ -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": [ @@ -157,117 +162,15 @@ "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": [ { "item": "cobblemon:heat_rock", - "percentage": 5 + "percentage": 5.0 } ] }, - "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,117 +189,15 @@ "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": [ { "item": "cobblemon:damp_rock", - "percentage": 5 + "percentage": 5.0 } ] }, - "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,117 +216,15 @@ "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": [ { "item": "cobblemon:icy_rock", - "percentage": 5 + "percentage": 5.0 } ] }, - "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/chimecho.json b/common/src/main/resources/data/cobblemon/species/generation3/chimecho.json index 0fb1cf3b58..0c8c6d180e 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 } ] }, @@ -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..a5247616bc 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 } ] }, @@ -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 a492efdc35..dde3b703bc 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": [ @@ -61,7 +60,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -108,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", @@ -136,7 +128,6 @@ "tm:focusenergy", "tm:focuspunch", "tm:furycutter", - "tm:growl", "tm:headbutt", "tm:heatwave", "tm:helpinghand", @@ -147,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", @@ -182,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..01aa66d554 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 } ] }, @@ -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 98dc18d3cf..ce52a030dc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json @@ -48,17 +48,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -92,7 +91,6 @@ "egg:tickle", "egg:wakeupslap", "egg:wish", - "tm:assist", "tm:attract", "tm:babydolleyes", "tm:batonpass", @@ -102,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", @@ -133,7 +124,6 @@ "tm:irontail", "tm:laserfocus", "tm:lastresort", - "tm:mudbomb", "tm:mudslap", "tm:nastyplot", "tm:payback", @@ -149,8 +139,6 @@ "tm:safeguard", "tm:shadowball", "tm:shockwave", - "tm:simplebeam", - "tm:sing", "tm:sleeptalk", "tm:solarbeam", "tm:stompingtantrum", @@ -158,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 34ae423d78..8d09ab294d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json @@ -43,12 +43,12 @@ "catchRate": 3, "eggCycles": 120, "baseFriendship": 0, - "behaviour": {}, "drops": { - "amount": 1, + "amount": 5, "entries": [ { - "item": "minecraft:eye_of_ender" + "item": "minecraft:eye_of_ender", + "quantityRange": "3-5" } ] }, @@ -101,7 +101,6 @@ "tm:imprison", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", @@ -119,13 +118,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", @@ -153,7 +149,6 @@ "tm:switcheroo", "tm:takedown", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:throatchop", "tm:thunder", @@ -165,8 +160,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": [ @@ -186,13 +228,6 @@ "aspects": [ "attack-forme" ], - "abilities": [ - "pressure", - "h:pressure" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 50, "attack": 180, @@ -209,21 +244,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - }, "moves": [ "1:leer", "1:wrap", @@ -273,7 +293,6 @@ "tm:imprison", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", @@ -291,11 +310,9 @@ "tm:psychic", "tm:psychicnoise", "tm:psychicterrain", - "tm:psychoboost", "tm:psychoshift", "tm:psychup", "tm:psyshock", - "tm:pursuit", "tm:raindance", "tm:recycle", "tm:reflect", @@ -324,7 +341,6 @@ "tm:takedown", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:throatchop", "tm:thunder", @@ -336,9 +352,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 @@ -359,13 +421,6 @@ "aspects": [ "defense-forme" ], - "abilities": [ - "pressure", - "h:pressure" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 50, "attack": 70, @@ -382,21 +437,6 @@ "special_defence": 1, "speed": 0 }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - }, "moves": [ "1:leer", "1:wrap", @@ -424,7 +464,6 @@ "tm:calmmind", "tm:chargebeam", "tm:cosmicpower", - "tm:counter", "tm:cut", "tm:darkpulse", "tm:drainpunch", @@ -451,7 +490,6 @@ "tm:irondefense", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", @@ -459,7 +497,6 @@ "tm:megakick", "tm:megapunch", "tm:meteorbeam", - "tm:mirrorcoat", "tm:nightshade", "tm:painsplit", "tm:poisonjab", @@ -469,12 +506,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", @@ -504,7 +539,6 @@ "tm:takedown", "tm:taunt", "tm:telekinesis", - "tm:teleport", "tm:terablast", "tm:throatchop", "tm:thunder", @@ -516,8 +550,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 @@ -538,13 +621,6 @@ "aspects": [ "speed-forme" ], - "abilities": [ - "pressure", - "h:pressure" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 50, "attack": 95, @@ -561,21 +637,6 @@ "special_defence": 0, "speed": 3 }, - "baseExperienceYield": 300, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - }, "moves": [ "1:leer", "1:wrap", @@ -609,7 +670,6 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extremespeed", "tm:facade", "tm:firepunch", "tm:flash", @@ -628,7 +688,6 @@ "tm:imprison", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", @@ -646,13 +705,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", @@ -691,8 +747,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..427ad0159c 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 } ] }, @@ -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 5a1c8984c9..746a62fe12 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json @@ -47,17 +47,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -84,7 +83,6 @@ "tm:aircutter", "tm:bugbite", "tm:bugbuzz", - "tm:confusion", "tm:defog", "tm:dualwingbeat", "tm:electroweb", @@ -94,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", @@ -122,7 +114,6 @@ "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:tailwind", "tm:terablast", "tm:thief", @@ -131,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 7ad7e8b670..f8c8ca3b29 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": [ @@ -86,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", @@ -121,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", @@ -135,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 5a1003f447..9d04eb98d2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/exploud.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/exploud.json @@ -48,13 +48,12 @@ "height": 1.7, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:chesto_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -91,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", @@ -116,9 +110,7 @@ "tm:fling", "tm:focusblast", "tm:gigaimpact", - "tm:hammerarm", "tm:headbutt", - "tm:howl", "tm:hydropump", "tm:hyperbeam", "tm:hypervoice", @@ -133,7 +125,6 @@ "tm:mudslap", "tm:outrage", "tm:overheat", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -150,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", @@ -173,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..c8104273bb 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", @@ -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..dad1d32b15 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 } ] }, @@ -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 d3161702ca..ea28f35623 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 } ] }, @@ -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": [], @@ -249,7 +273,8 @@ "h:pixilate" ], "eggGroups": [ - "amorphous" + "amorphous", + "human_like" ], "baseStats": { "hp": 68, @@ -259,162 +284,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..381379a2a1 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": [ @@ -58,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 } ] }, @@ -95,10 +94,7 @@ "egg:iciclecrash", "egg:rollout", "egg:switcheroo", - "tm:astonish", "tm:avalanche", - "tm:bide", - "tm:bite", "tm:blizzard", "tm:block", "tm:bodyslam", @@ -106,7 +102,6 @@ "tm:chillingwater", "tm:crunch", "tm:darkpulse", - "tm:disable", "tm:doubleteam", "tm:earthquake", "tm:endure", @@ -115,7 +110,6 @@ "tm:faketears", "tm:flash", "tm:foulplay", - "tm:freezedry", "tm:frostbreath", "tm:gigaimpact", "tm:gyroball", @@ -127,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", @@ -146,7 +136,6 @@ "tm:scaryface", "tm:selfdestruct", "tm:shadowball", - "tm:sheercold", "tm:signalbeam", "tm:sleeptalk", "tm:snowscape", @@ -154,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": [], @@ -186,10 +196,6 @@ "refrigerate", "h:refrigerate" ], - "eggGroups": [ - "fairy", - "mineral" - ], "baseStats": { "hp": 80, "attack": 120, @@ -198,114 +204,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/gorebyss.json b/common/src/main/resources/data/cobblemon/species/generation3/gorebyss.json index 506aedacda..ce008f2a2c 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 } ] }, @@ -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 ba9db327c3..3c1caadb4d 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": [ @@ -92,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", @@ -116,7 +112,6 @@ "tm:incinerate", "tm:ironhead", "tm:irontail", - "tm:lavaplume", "tm:megakick", "tm:megapunch", "tm:metalclaw", @@ -124,7 +119,6 @@ "tm:mudslap", "tm:overheat", "tm:poweruppunch", - "tm:precipiceblades", "tm:protect", "tm:rest", "tm:roar", @@ -160,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": [ @@ -187,9 +216,6 @@ "desolateland", "h:desolateland" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 180, @@ -198,124 +224,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/grovyle.json b/common/src/main/resources/data/cobblemon/species/generation3/grovyle.json index 6a4039ed2e..1b6314700c 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 } ] }, @@ -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 3621435dae..7daa24e8a2 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": [ @@ -61,7 +60,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -95,7 +94,6 @@ "egg:zenheadbutt", "tm:allyswitch", "tm:amnesia", - "tm:belch", "tm:bodypress", "tm:bodyslam", "tm:bounce", @@ -105,7 +103,6 @@ "tm:chargebeam", "tm:chillingwater", "tm:confuseray", - "tm:confusion", "tm:covet", "tm:dazzlinggleam", "tm:dig", @@ -117,7 +114,6 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:firepunch", "tm:flash", @@ -128,7 +124,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:headbutt", "tm:healbell", "tm:helpinghand", @@ -142,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", @@ -164,7 +156,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:recycle", "tm:reflect", @@ -174,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", @@ -189,7 +178,6 @@ "tm:swift", "tm:takedown", "tm:taunt", - "tm:teeterdance", "tm:telekinesis", "tm:terablast", "tm:thief", @@ -200,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 f8805735ad..2d58b5994f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/hariyama.json @@ -48,21 +48,20 @@ "height": 2.05, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -100,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", @@ -166,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", @@ -180,7 +162,6 @@ "tm:superpower", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -190,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..6a7709090b 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 } ] }, @@ -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..46dca8b5c4 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 } ] }, @@ -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 d749bbc54d..18e79870e3 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", @@ -77,10 +76,8 @@ "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", "tm:cosmicpower", "tm:dazzlinggleam", - "tm:doomdesire", "tm:doubleedge", "tm:drainpunch", "tm:dreameater", @@ -99,7 +96,6 @@ "tm:grassknot", "tm:gravity", "tm:headbutt", - "tm:healingwish", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", @@ -108,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", @@ -131,7 +124,6 @@ "tm:raindance", "tm:recycle", "tm:reflect", - "tm:refresh", "tm:rest", "tm:safeguard", "tm:sandstorm", @@ -156,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..cf4b010924 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 } ] }, @@ -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..14e018ee21 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 } ] }, @@ -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 8fa56cac69..02cc774e74 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": [ @@ -75,7 +74,6 @@ "81:doubleedge", "90:waterspout", "tm:ancientpower", - "tm:aquaring", "tm:aquatail", "tm:avalanche", "tm:blizzard", @@ -103,7 +101,6 @@ "tm:ironhead", "tm:liquidation", "tm:muddywater", - "tm:originpulse", "tm:protect", "tm:raindance", "tm:rest", @@ -113,7 +110,6 @@ "tm:rocktomb", "tm:safeguard", "tm:scaryface", - "tm:sheercold", "tm:shockwave", "tm:signalbeam", "tm:sleeptalk", @@ -127,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": [ @@ -154,9 +170,6 @@ "primordialsea", "h:primordialsea" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 150, @@ -165,92 +178,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/lairon.json b/common/src/main/resources/data/cobblemon/species/generation3/lairon.json index df5bdbe79a..1cb6575bdf 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 } ] }, @@ -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 0bdb6ec1da..2e5b6d1433 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": [ @@ -94,7 +93,6 @@ "tm:chargebeam", "tm:charm", "tm:chillingwater", - "tm:confusion", "tm:covet", "tm:cut", "tm:defog", @@ -102,7 +100,6 @@ "tm:dive", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -120,9 +117,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:guardsplit", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:honeclaws", "tm:hyperbeam", @@ -134,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", @@ -181,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": [ @@ -207,13 +238,6 @@ "aspects": [ "mega" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 80, "attack": 100, @@ -222,150 +246,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..e0670ee8b4 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": [ @@ -92,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", @@ -116,8 +113,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:healblock", - "tm:healpulse", "tm:helpinghand", "tm:honeclaws", "tm:hyperbeam", @@ -127,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", @@ -155,7 +143,6 @@ "tm:shadowball", "tm:shadowclaw", "tm:shockwave", - "tm:simplebeam", "tm:sleeptalk", "tm:solarbeam", "tm:steelwing", @@ -178,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": [ @@ -200,13 +231,6 @@ "aspects": [ "mega" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 80, "attack": 130, @@ -215,143 +239,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/lileep.json b/common/src/main/resources/data/cobblemon/species/generation3/lileep.json index 673a10aca8..6d71188e23 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 } ] }, @@ -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 a2ad857c5e..7cd7b43745 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 } ] }, @@ -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": [], @@ -198,45 +211,14 @@ "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": [ { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -267,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", @@ -288,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", @@ -313,8 +287,6 @@ "tm:sunnyday", "tm:surf", "tm:swift", - "tm:switcheroo", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -325,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..9fadb8fe28 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 } ] }, @@ -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 5d78796218..a373cf6628 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/loudred.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/loudred.json @@ -48,13 +48,12 @@ "height": 1.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -84,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", @@ -116,7 +109,6 @@ "tm:megapunch", "tm:mudslap", "tm:overheat", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -132,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", @@ -151,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..6c904f6ca0 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 } ] }, @@ -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..b8572f3f78 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 } ] }, @@ -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 15c8256f70..c50b372bfd 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": [ @@ -96,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", @@ -154,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", @@ -167,7 +150,6 @@ "tm:superpower", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -176,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 d907d7920c..3f484896f5 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": [ @@ -61,7 +60,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -89,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", @@ -131,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", @@ -145,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": [], @@ -170,9 +182,6 @@ "intimidate", "h:intimidate" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 70, "attack": 75, @@ -181,103 +190,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/marshtomp.json b/common/src/main/resources/data/cobblemon/species/generation3/marshtomp.json index 756ab9f73e..483e438113 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 } ] }, @@ -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..32cefe2e99 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 } ] }, @@ -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 631699cd63..4f08c5ec9e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/mawile.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/mawile.json @@ -56,15 +56,19 @@ } }, "drops": { - "amount": 2, + "amount": 3, "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.0 } ] }, @@ -98,9 +102,7 @@ "egg:tickle", "tm:ancientpower", "tm:assurance", - "tm:astonish", "tm:batonpass", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -112,10 +114,8 @@ "tm:embargo", "tm:endure", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:falseswipe", - "tm:feintattack", "tm:fireblast", "tm:firefang", "tm:flamethrower", @@ -126,7 +126,6 @@ "tm:foulplay", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:guardswap", "tm:headbutt", "tm:helpinghand", @@ -144,50 +143,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": [ @@ -212,10 +240,6 @@ "hugepower", "h:hugepower" ], - "eggGroups": [ - "field", - "fairy" - ], "baseStats": { "hp": 50, "attack": 105, @@ -224,142 +248,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..8f30822f44 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json @@ -47,21 +47,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -100,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", @@ -147,7 +133,6 @@ "tm:lowkick", "tm:lowsweep", "tm:magiccoat", - "tm:meditate", "tm:megakick", "tm:megapunch", "tm:metronome", @@ -157,7 +142,6 @@ "tm:poisonjab", "tm:pound", "tm:powerswap", - "tm:powertrick", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -166,9 +150,7 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:quickguard", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -201,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": [], @@ -227,9 +244,6 @@ "purepower", "h:purepower" ], - "eggGroups": [ - "human_like" - ], "baseStats": { "hp": 60, "attack": 100, @@ -238,159 +252,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..149134ee6e 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": [ @@ -97,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", @@ -146,7 +132,6 @@ "tm:poisonjab", "tm:pound", "tm:powerswap", - "tm:powertrick", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -155,9 +140,7 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:quickguard", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -189,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 9884be0478..f421d1c8ba 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 } ] }, @@ -105,8 +109,6 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:bulletpunch", - "tm:confusion", "tm:cosmicpower", "tm:cut", "tm:doubleedge", @@ -124,7 +126,6 @@ "tm:grassknot", "tm:gravity", "tm:gyroball", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -140,8 +141,6 @@ "tm:magnetrise", "tm:metalclaw", "tm:meteorbeam", - "tm:meteormash", - "tm:miracleeye", "tm:mudslap", "tm:poweruppunch", "tm:protect", @@ -151,7 +150,6 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:pursuit", "tm:raindance", "tm:reflect", "tm:rest", @@ -177,14 +175,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": [], @@ -210,9 +248,6 @@ "toughclaws", "h:toughclaws" ], - "eggGroups": [ - "mineral" - ], "baseStats": { "hp": 80, "attack": 145, @@ -221,138 +256,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/metang.json b/common/src/main/resources/data/cobblemon/species/generation3/metang.json index 10ca7d62a4..853b854b43 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 } ] }, @@ -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..9d9a908aa4 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 } ] }, @@ -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..ba80002d1f 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 } ] }, @@ -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 3b7dadc7e9..0bdb394588 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/minun.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/minun.json @@ -48,21 +48,20 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -104,9 +103,7 @@ "tm:charge", "tm:chargebeam", "tm:charm", - "tm:copycat", "tm:covet", - "tm:discharge", "tm:echoedvoice", "tm:electricterrain", "tm:electroball", @@ -114,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..c1d5409bc5 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 } ] }, @@ -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 6ec63c5672..2122ca3064 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": [ @@ -60,7 +59,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -94,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", @@ -116,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", @@ -129,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", @@ -178,7 +162,6 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -186,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..a16e1298d3 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 } ] }, @@ -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 12a5f9c004..b8bdc2a53d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/plusle.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/plusle.json @@ -48,21 +48,20 @@ "height": 0.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -100,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", @@ -115,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", @@ -163,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 abab6047cb..c8826776f4 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": [ @@ -88,9 +87,7 @@ "egg:mefirst", "egg:poisonfang", "tm:assurance", - "tm:astonish", "tm:beatup", - "tm:bite", "tm:charm", "tm:covet", "tm:crunch", @@ -105,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", @@ -126,7 +118,6 @@ "tm:retaliate", "tm:roar", "tm:rocksmash", - "tm:sandattack", "tm:scaryface", "tm:shadowball", "tm:sleeptalk", @@ -138,7 +129,6 @@ "tm:sunnyday", "tm:superfang", "tm:swagger", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -147,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 e05a414782..b57d7d1845 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": [ @@ -94,7 +93,6 @@ "tm:dive", "tm:doubleedge", "tm:dracometeor", - "tm:dragonascent", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -105,7 +103,6 @@ "tm:echoedvoice", "tm:endure", "tm:energyball", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:flamethrower", @@ -163,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": [ @@ -190,9 +225,6 @@ "deltastream", "h:deltastream" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 105, "attack": 180, @@ -201,126 +233,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..1e9ca650ad 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": [ @@ -97,7 +96,6 @@ "tm:gigaimpact", "tm:gravity", "tm:hail", - "tm:hammerarm", "tm:headbutt", "tm:heavyslam", "tm:hyperbeam", @@ -107,7 +105,6 @@ "tm:iciclespear", "tm:icywind", "tm:ironhead", - "tm:lockon", "tm:megakick", "tm:megapunch", "tm:poweruppunch", @@ -126,7 +123,6 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snowscape", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", @@ -136,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 cf7dddc317..481125e748 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": [ @@ -96,7 +95,6 @@ "tm:focuspunch", "tm:gigaimpact", "tm:gravity", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -104,7 +102,6 @@ "tm:icepunch", "tm:irondefense", "tm:ironhead", - "tm:lockon", "tm:megakick", "tm:megapunch", "tm:meteorbeam", @@ -117,7 +114,6 @@ "tm:rockpolish", "tm:rockslide", "tm:rocksmash", - "tm:rockthrow", "tm:rocktomb", "tm:rollout", "tm:safeguard", @@ -128,7 +124,6 @@ "tm:sleeptalk", "tm:smackdown", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -141,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 f01c9346dc..d0349d8a7b 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": [ @@ -95,7 +94,6 @@ "tm:focuspunch", "tm:gigaimpact", "tm:gravity", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heavyslam", @@ -105,7 +103,6 @@ "tm:icespinner", "tm:irondefense", "tm:ironhead", - "tm:lockon", "tm:magnetrise", "tm:megakick", "tm:megapunch", @@ -132,7 +129,6 @@ "tm:stealthrock", "tm:steelbeam", "tm:steelroller", - "tm:stomp", "tm:stompingtantrum", "tm:strength", "tm:substitute", @@ -144,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..ac7bc0115f 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 } ] }, @@ -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..1c667adf96 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 } ] }, @@ -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 1e2d05a052..3831d11ddf 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": [ @@ -60,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 } ] }, @@ -104,7 +103,6 @@ "egg:torment", "tm:aerialace", "tm:allyswitch", - "tm:astonish", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", @@ -114,9 +112,7 @@ "tm:cut", "tm:darkpulse", "tm:dazzlinggleam", - "tm:detect", "tm:dig", - "tm:disable", "tm:drainpunch", "tm:dreameater", "tm:embargo", @@ -124,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", @@ -151,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", @@ -179,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", @@ -217,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": [ @@ -242,9 +274,6 @@ "magicbounce", "h:magicbounce" ], - "eggGroups": [ - "human_like" - ], "baseStats": { "hp": 50, "attack": 85, @@ -253,168 +282,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..04199e17d0 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 } ] }, @@ -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": [], @@ -206,9 +234,6 @@ "aerilate", "h:aerilate" ], - "eggGroups": [ - "dragon" - ], "baseStats": { "hp": 95, "attack": 145, @@ -217,133 +242,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..5aa2aa4575 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 } ] }, @@ -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": [], @@ -241,10 +256,6 @@ "lightningrod", "h:lightningrod" ], - "eggGroups": [ - "monster", - "dragon" - ], "baseStats": { "hp": 70, "attack": 110, @@ -253,171 +264,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/sealeo.json b/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json index 46f27a0b21..800ce0a54c 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 } ] }, @@ -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 3698fcdc6e..5dc54f87b1 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": [ @@ -85,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", @@ -108,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", @@ -138,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 d57b0a30bf..921cceccb1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json @@ -47,21 +47,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -98,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", @@ -116,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", @@ -136,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", @@ -161,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", @@ -181,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 a2bd1e52b9..4943eeda9f 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 } ] }, @@ -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": [], @@ -196,9 +213,6 @@ "strongjaw", "h:strongjaw" ], - "eggGroups": [ - "water_2" - ], "baseStats": { "hp": 70, "attack": 140, @@ -207,130 +221,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/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..992f2280e5 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 } ] }, @@ -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 191664d77a..08bd5c00d8 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": [ @@ -60,7 +59,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -102,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", @@ -129,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", @@ -144,8 +137,6 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", - "tm:harden", "tm:headbutt", "tm:heatwave", "tm:hex", @@ -157,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", @@ -206,7 +189,6 @@ "tm:swift", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:taunt", @@ -221,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 e93bb3dd19..ee9e68a3bb 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": [ @@ -85,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", @@ -126,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", @@ -153,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 3fbf770ee4..b446b36275 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": [ @@ -88,7 +87,6 @@ "egg:tickle", "egg:wakeupslap", "egg:wish", - "tm:assist", "tm:attract", "tm:babydolleyes", "tm:batonpass", @@ -98,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", @@ -126,7 +118,6 @@ "tm:icywind", "tm:irontail", "tm:lastresort", - "tm:mudbomb", "tm:mudslap", "tm:nastyplot", "tm:payback", @@ -141,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..8cbde3ba97 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 } ] }, @@ -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 7f9b71ee89..bf536890d6 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": [ @@ -92,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", @@ -114,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", @@ -133,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..2954ab6560 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 } ] }, @@ -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..517a3c9124 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 } ] }, @@ -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 b122c45a4c..d81bfaf64f 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": [ @@ -98,7 +97,6 @@ "tm:chargebeam", "tm:chillingwater", "tm:confuseray", - "tm:confusion", "tm:covet", "tm:dazzlinggleam", "tm:dreameater", @@ -106,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", @@ -120,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", @@ -134,7 +127,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:recycle", "tm:reflect", @@ -143,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", @@ -166,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 ea1b046a54..cd318ee090 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": [ @@ -95,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", @@ -114,8 +109,6 @@ "tm:facade", "tm:featherdance", "tm:fly", - "tm:furyattack", - "tm:growl", "tm:haze", "tm:healbell", "tm:heatwave", @@ -123,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", @@ -155,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 5b914c3f8b..a95ace9709 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json @@ -47,17 +47,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:black_sludge", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -87,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", @@ -125,9 +120,7 @@ "tm:mudshot", "tm:mudslap", "tm:painsplit", - "tm:poisongas", "tm:poisonjab", - "tm:pound", "tm:poweruppunch", "tm:protect", "tm:raindance", @@ -139,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", @@ -163,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 f4c82ed05e..bc9430d878 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 } ] }, @@ -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": [], @@ -237,10 +254,6 @@ "swiftswim", "h:swiftswim" ], - "eggGroups": [ - "monster", - "water_1" - ], "baseStats": { "hp": 100, "attack": 150, @@ -249,171 +262,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/swellow.json b/common/src/main/resources/data/cobblemon/species/generation3/swellow.json index d6c63d180e..086dcb2881 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 } ] }, @@ -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 99c4c86929..4e6493cd91 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": [ @@ -61,7 +60,7 @@ }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -98,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", @@ -129,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", @@ -157,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..c0a3ed7243 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 } ] }, @@ -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..53a2a5acf4 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 } ] }, @@ -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 3fbcc239d4..97ba415e22 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": [ @@ -89,7 +88,6 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:bestow", "tm:bodypress", "tm:bodyslam", "tm:brutalswing", @@ -101,7 +99,6 @@ "tm:defog", "tm:doubleedge", "tm:dragondance", - "tm:dragonhammer", "tm:dragonpulse", "tm:dragontail", "tm:dualwingbeat", @@ -116,8 +113,6 @@ "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", - "tm:growth", - "tm:gust", "tm:headbutt", "tm:helpinghand", "tm:hurricane", @@ -125,8 +120,6 @@ "tm:leafblade", "tm:leafstorm", "tm:leaftornado", - "tm:leechseed", - "tm:leer", "tm:magicalleaf", "tm:naturalgift", "tm:naturepower", @@ -135,8 +128,6 @@ "tm:petalblizzard", "tm:protect", "tm:raindance", - "tm:razorleaf", - "tm:razorwind", "tm:rest", "tm:roar", "tm:rocksmash", @@ -144,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", @@ -164,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..72066d58ef 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 } ] }, @@ -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..91f22a8ee5 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 } ] }, @@ -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..0e7903a9f2 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 } ] }, @@ -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..99e7a02aff 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 } ] }, @@ -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..e25df579c6 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 } ] }, @@ -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..d0c26a20b1 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 } ] }, @@ -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 b6eb9cdccd..5f516526c6 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": [ @@ -83,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", @@ -109,7 +103,6 @@ "tm:megakick", "tm:megapunch", "tm:mudslap", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", @@ -120,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 ed74cad841..daa5cc9de9 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": [ @@ -67,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 71ab7c9334..761ee00231 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": [ @@ -69,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 b33f4450c8..69d6ca5e56 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json @@ -46,21 +46,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -101,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", @@ -145,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", @@ -172,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", @@ -185,7 +164,6 @@ "tm:sunnyday", "tm:surf", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -199,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 075260ad8b..fe0dd18d94 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zigzagoon.json @@ -57,7 +57,8 @@ "resting": { "canSleep": true, "willSleepOnBed": true, - "light": "0-4" + "light": "0-4", + "canSeeSky": false } }, "drops": { @@ -92,8 +93,6 @@ "egg:simplebeam", "egg:tickle", "tm:babydolleyes", - "tm:bellydrum", - "tm:bestow", "tm:blizzard", "tm:bodyslam", "tm:chargebeam", @@ -104,13 +103,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 +118,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": [ { @@ -193,42 +205,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": [ @@ -260,7 +236,6 @@ "tm:babydolleyes", "tm:blizzard", "tm:bodyslam", - "tm:counter", "tm:dig", "tm:doubleedge", "tm:endure", @@ -277,18 +252,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", @@ -299,7 +269,6 @@ "tm:sunnyday", "tm:surf", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -309,7 +278,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 337fc70462..5014e02287 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": [ @@ -58,11 +57,11 @@ }, { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -114,9 +113,7 @@ "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:grasswhistle", "tm:grassyglide", - "tm:growth", "tm:hail", "tm:hardpress", "tm:headbutt", @@ -124,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", @@ -155,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", @@ -172,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": [], @@ -199,10 +212,6 @@ "snowwarning", "h:snowwarning" ], - "eggGroups": [ - "monster", - "grass" - ], "baseStats": { "hp": 90, "attack": 132, @@ -211,130 +220,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/ambipom.json b/common/src/main/resources/data/cobblemon/species/generation4/ambipom.json index 73c8dfb5d4..6968c40748 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 } ] }, @@ -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 8b58af219c..00a3f198e7 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", @@ -103,7 +102,6 @@ "tm:electricterrain", "tm:endure", "tm:energyball", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:flamethrower", @@ -123,7 +121,6 @@ "tm:gunkshot", "tm:hail", "tm:headbutt", - "tm:healingwish", "tm:heatwave", "tm:heavyslam", "tm:hex", @@ -139,7 +136,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:judgment", "tm:laserfocus", "tm:lastresort", "tm:lightscreen", @@ -153,7 +149,6 @@ "tm:outrage", "tm:overheat", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poisonjab", "tm:powergem", @@ -162,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", @@ -180,7 +172,6 @@ "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", - "tm:seismictoss", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", @@ -221,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": [ @@ -241,210 +299,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 +318,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 +337,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", @@ -771,7 +392,6 @@ "tm:electricterrain", "tm:endure", "tm:energyball", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:flamethrower", @@ -790,7 +410,6 @@ "tm:gunkshot", "tm:hail", "tm:headbutt", - "tm:healingwish", "tm:heatwave", "tm:heavyslam", "tm:hex", @@ -806,7 +425,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:judgment", "tm:laserfocus", "tm:lastresort", "tm:lightscreen", @@ -820,7 +438,6 @@ "tm:outrage", "tm:overheat", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poisonjab", "tm:powergem", @@ -829,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", @@ -847,7 +461,6 @@ "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", - "tm:seismictoss", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", @@ -888,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 @@ -909,210 +589,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 +608,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 +627,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 +646,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 +665,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 +684,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", @@ -2107,7 +738,6 @@ "tm:electricterrain", "tm:endure", "tm:energyball", - "tm:extremespeed", "tm:facade", "tm:fireblast", "tm:flamethrower", @@ -2125,7 +755,6 @@ "tm:gravity", "tm:gunkshot", "tm:hail", - "tm:healingwish", "tm:heatwave", "tm:heavyslam", "tm:hex", @@ -2141,7 +770,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:judgment", "tm:laserfocus", "tm:lastresort", "tm:lightscreen", @@ -2155,7 +783,6 @@ "tm:outrage", "tm:overheat", "tm:payback", - "tm:perishsong", "tm:phantomforce", "tm:poisonjab", "tm:powergem", @@ -2164,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", @@ -2182,7 +806,6 @@ "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", - "tm:seismictoss", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", @@ -2221,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 @@ -2242,210 +929,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 +948,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 +967,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 +986,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 +1005,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 +1024,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 +1043,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 +1062,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..d360576504 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", @@ -83,9 +82,7 @@ "tm:batonpass", "tm:calmmind", "tm:chargebeam", - "tm:confusion", "tm:dazzlinggleam", - "tm:detect", "tm:doubleedge", "tm:drainingkiss", "tm:drainpunch", @@ -96,7 +93,6 @@ "tm:energyball", "tm:expandingforce", "tm:explosion", - "tm:extrasensory", "tm:facade", "tm:fireblast", "tm:firepunch", @@ -121,7 +117,6 @@ "tm:magicroom", "tm:metronome", "tm:mudslap", - "tm:mysticalpower", "tm:nastyplot", "tm:naturalgift", "tm:payback", @@ -169,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..49ac49d46c 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 } ] }, @@ -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..d213a9ddf9 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 } ] }, @@ -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 56a9f66b4b..c4754b0177 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": [ @@ -69,8 +68,10 @@ "tm:bugbite", "tm:electroweb", "tm:stringshot", - "tm:tackle", - "tm:terablast" + "tm:terablast", + "tutor:bugbite", + "tutor:electroweb", + "tutor:stringshot" ], "evolutions": [ { @@ -128,44 +129,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 +186,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/carnivine.json b/common/src/main/resources/data/cobblemon/species/generation4/carnivine.json index b48f09292e..78e040a845 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 } ] }, @@ -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..0c86b3670b 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 } ] }, @@ -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 de9516b4fc..d0d1aa4438 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json @@ -49,17 +49,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -91,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", @@ -135,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": [], @@ -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", @@ -218,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", @@ -254,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 5079863673..ac92174e49 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": [ @@ -85,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", @@ -123,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..ded42ea452 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 } ] }, @@ -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 c8f64a5ef1..a7c6374922 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", @@ -65,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", @@ -90,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", @@ -106,7 +98,6 @@ "tm:psychic", "tm:psychicterrain", "tm:psychocut", - "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", @@ -118,7 +109,6 @@ "tm:shadowball", "tm:signalbeam", "tm:skillswap", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:storedpower", @@ -132,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 8547de5ff5..7e8aac6516 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": [ @@ -81,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", @@ -100,7 +96,6 @@ "tm:headbutt", "tm:hex", "tm:hyperbeam", - "tm:hypnosis", "tm:icebeam", "tm:icywind", "tm:incinerate", @@ -108,7 +103,6 @@ "tm:lashout", "tm:lastresort", "tm:nastyplot", - "tm:nightmare", "tm:nightshade", "tm:ominouswind", "tm:payback", @@ -118,7 +112,6 @@ "tm:psychic", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:retaliate", @@ -151,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 62797f1579..e903b91024 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", @@ -77,7 +76,6 @@ "tm:bulldoze", "tm:cut", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -105,7 +103,6 @@ "tm:ironhead", "tm:irontail", "tm:magnetrise", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:outrage", @@ -116,7 +113,6 @@ "tm:raindance", "tm:rest", "tm:roar", - "tm:roaroftime", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", @@ -126,7 +122,6 @@ "tm:scaryface", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:stealthrock", "tm:steelbeam", @@ -143,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": [ @@ -165,13 +194,6 @@ "aspects": [ "origin-forme" ], - "abilities": [ - "pressure", - "h:telepathy" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 100, @@ -180,20 +202,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", @@ -218,7 +226,6 @@ "tm:bulkup", "tm:bulldoze", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -239,7 +246,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:outrage", @@ -250,7 +256,6 @@ "tm:raindance", "tm:rest", "tm:roar", - "tm:roaroftime", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", @@ -258,7 +263,6 @@ "tm:scaleshot", "tm:scaryface", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:stealthrock", "tm:steelbeam", @@ -273,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..2eac760bcd 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 } ] }, @@ -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..103c951f22 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 } ] }, @@ -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..aa8243aeee 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 } ] }, @@ -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 897cf68ccf..b130b5b33a 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": [ @@ -57,11 +56,11 @@ }, { "item": "cobblemon:electirizer", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -92,7 +91,6 @@ "egg:karatechop", "egg:meditate", "egg:rollingkick", - "tm:barrier", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", @@ -100,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", @@ -114,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", @@ -145,7 +133,6 @@ "tm:poweruppunch", "tm:protect", "tm:psychic", - "tm:quickattack", "tm:raindance", "tm:reflect", "tm:rest", @@ -154,7 +141,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:rollingkick", "tm:screech", "tm:shockwave", "tm:signalbeam", @@ -171,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..fefc68998f 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 } ] }, @@ -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..32e29f3b88 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", @@ -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..c61d2fe443 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 } ] }, @@ -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 8ee1d50f84..563a812b1f 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": [ @@ -58,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 } ] }, @@ -102,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", @@ -116,8 +112,6 @@ "tm:confuseray", "tm:crunch", "tm:curse", - "tm:destinybond", - "tm:disable", "tm:doubleteam", "tm:drainingkiss", "tm:dreameater", @@ -138,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", @@ -172,7 +162,6 @@ "tm:spite", "tm:substitute", "tm:suckerpunch", - "tm:switcheroo", "tm:takedown", "tm:taunt", "tm:telekinesis", @@ -184,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..396e1835c1 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 } ] }, @@ -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 9e087eefd5..f09df93ab7 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 } ] }, @@ -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": [], @@ -290,7 +324,8 @@ "h:innerfocus" ], "eggGroups": [ - "amorphous" + "amorphous", + "human_like" ], "baseStats": { "hp": 68, @@ -300,209 +335,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..878093323e 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 } ] }, @@ -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": [], @@ -199,10 +225,6 @@ "sandforce", "h:sandforce" ], - "eggGroups": [ - "monster", - "dragon" - ], "baseStats": { "hp": 108, "attack": 170, @@ -211,126 +233,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..166a44840e 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 } ] }, @@ -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": [], @@ -199,141 +206,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/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 04effea1b1..6082b32263 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", @@ -74,9 +73,7 @@ "tm:cut", "tm:darkpulse", "tm:defog", - "tm:destinybond", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -117,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", @@ -138,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": [ @@ -164,9 +195,6 @@ "levitate", "h:levitate" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 150, "attack": 120, @@ -175,20 +203,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", @@ -217,9 +231,7 @@ "tm:cut", "tm:darkpulse", "tm:defog", - "tm:destinybond", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -261,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", @@ -282,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 9ccbab198a..e72185c212 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/glaceon.json @@ -47,17 +47,16 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:ice_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:never_melt_ice", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -104,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", @@ -140,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", @@ -170,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 4dafb06ed6..3abb2f746b 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": [ @@ -79,10 +78,8 @@ "egg:tailwhip", "egg:wakeupslap", "tm:aerialace", - "tm:assist", "tm:assurance", "tm:attract", - "tm:bite", "tm:captivate", "tm:charm", "tm:covet", @@ -92,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", @@ -113,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", @@ -137,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 51160779e0..cd75906ecd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/gliscor.json @@ -49,25 +49,24 @@ "height": 1.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 4, "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 } ] }, @@ -114,8 +113,6 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:counter", - "tm:crabhammer", "tm:crosspoison", "tm:crunch", "tm:cut", @@ -128,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", @@ -146,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", @@ -177,8 +163,6 @@ "tm:screech", "tm:skittersmack", "tm:skyattack", - "tm:skyuppercut", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:spikes", @@ -203,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 cbe039d59e..5710ed9736 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 } ] }, @@ -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": [ @@ -184,6 +188,7 @@ "variant": "level_up", "result": "torterra tree=oak", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -203,6 +208,7 @@ "variant": "level_up", "result": "torterra tree=swamp", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -226,6 +232,7 @@ "variant": "level_up", "result": "torterra tree=birch", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -245,6 +252,7 @@ "variant": "level_up", "result": "torterra tree=darkoak", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -264,6 +272,7 @@ "variant": "level_up", "result": "torterra tree=acacia", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -283,6 +292,7 @@ "variant": "level_up", "result": "torterra tree=azalea", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -302,6 +312,7 @@ "variant": "level_up", "result": "torterra tree=jungle", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -321,6 +332,7 @@ "variant": "level_up", "result": "torterra tree=spruce", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -340,6 +352,7 @@ "variant": "level_up", "result": "torterra tree=mangrove", "consumeHeldItem": true, + "permanent": true, "learnableMoves": [ "earthquake" ], @@ -359,6 +372,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..3117664e58 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 } ] }, @@ -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": [ { @@ -159,7 +164,8 @@ "variant": "time_range", "range": "day" } - ] + ], + "permanent": true } ] } \ No newline at end of file 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..575cb42346 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", @@ -95,10 +94,7 @@ "tm:incinerate", "tm:irondefense", "tm:ironhead", - "tm:lavaplume", - "tm:leer", "tm:lunge", - "tm:magmastorm", "tm:metalclaw", "tm:metalsound", "tm:naturepower", @@ -131,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..9e8c5d136e 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 } ] }, @@ -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..f05f5f5c31 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 } ] }, @@ -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..a841dda15d 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 } ] }, @@ -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..95dc8d961e 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 } ] }, @@ -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 eed18579de..e9b20528cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/leafeon.json @@ -47,17 +47,16 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:leaf_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -104,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", @@ -144,7 +136,6 @@ "tm:leafage", "tm:leafblade", "tm:leafstorm", - "tm:leechseed", "tm:magicalleaf", "tm:mudshot", "tm:mudslap", @@ -152,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", @@ -172,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..cf66bd47f4 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 } ] }, @@ -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 188962a0a9..dec457dc50 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 } ] }, @@ -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": [], @@ -248,10 +257,6 @@ "scrappy", "h:scrappy" ], - "eggGroups": [ - "field", - "human_like" - ], "baseStats": { "hp": 65, "attack": 136, @@ -260,161 +265,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..6209bf9912 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/lucario.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/lucario.json @@ -50,13 +50,16 @@ "height": 2.45, "fixed": false }, - "behaviour": {}, "drops": { - "amount": 1, + "amount": 2, "entries": [ { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 + }, + { + "item": "cobblemon:expert_belt", + "percentage": 5.0 } ] }, @@ -103,67 +106,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", @@ -171,8 +153,6 @@ "tm:protect", "tm:psychic", "tm:psychup", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -188,7 +168,6 @@ "tm:screech", "tm:shadowball", "tm:shadowclaw", - "tm:skyuppercut", "tm:sleeptalk", "tm:steelbeam", "tm:stoneedge", @@ -206,7 +185,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": [], @@ -232,10 +250,6 @@ "adaptability", "h:adaptability" ], - "eggGroups": [ - "field", - "human_like" - ], "baseStats": { "hp": 70, "attack": 145, @@ -244,169 +258,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/lumineon.json b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json index 892a6a7ab0..b820b8b2b8 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 } ] }, @@ -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..577e65db57 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 } ] }, @@ -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 3900008adb..b68d7ec1b8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/luxray.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/luxray.json @@ -48,17 +48,16 @@ "height": 1.6, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:quick_claw", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:shuca_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -87,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", @@ -109,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", @@ -131,7 +123,6 @@ "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:spark", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -139,7 +130,6 @@ "tm:superpower", "tm:swagger", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -147,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 5fa594d727..213cadf293 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/magmortar.json @@ -47,21 +47,20 @@ "height": 2.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -94,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", @@ -136,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", @@ -163,8 +147,6 @@ "tm:scorchingsands", "tm:screech", "tm:sleeptalk", - "tm:smog", - "tm:smokescreen", "tm:solarbeam", "tm:stompingtantrum", "tm:strength", @@ -180,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..46606d6b49 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 } ] }, @@ -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..069d2242f9 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 } ] }, @@ -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 ae02e46558..aa34e37a27 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", @@ -83,8 +82,6 @@ "tm:chargebeam", "tm:charm", "tm:confuseray", - "tm:confusion", - "tm:copycat", "tm:dazzlinggleam", "tm:doubleedge", "tm:drainingkiss", @@ -94,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", @@ -114,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", @@ -162,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 d396dc0729..fc2f53d2b7 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": [ @@ -95,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", @@ -158,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": [ { @@ -194,7 +207,7 @@ { "id": "mimejr_mrmimegalar", "variant": "level_up", - "result": "mrmime galarian", + "result": "mrmime", "consumeHeldItem": false, "learnableMoves": [], "requirements": [ @@ -233,144 +246,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", @@ -396,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/generation4/mismagius.json b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json index 73d1082d04..bde3d3471d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mismagius.json @@ -47,21 +47,20 @@ "height": 2.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -89,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", @@ -113,7 +109,6 @@ "tm:futuresight", "tm:gigaimpact", "tm:grassknot", - "tm:growl", "tm:grudge", "tm:headbutt", "tm:healbell", @@ -125,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", @@ -148,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", @@ -177,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..176aa676d9 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 } ] }, @@ -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 5eb14265d8..c0cafadb57 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json @@ -47,17 +47,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -83,8 +82,6 @@ "tm:airslash", "tm:bugbite", "tm:bugbuzz", - "tm:camouflage", - "tm:confusion", "tm:defog", "tm:dreameater", "tm:dualwingbeat", @@ -95,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", @@ -121,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 e904e8b1ac..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,13 +53,13 @@ "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": { @@ -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 9e93aa3659..3e8066a0a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/pachirisu.json @@ -50,13 +50,12 @@ "height": 1.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -95,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", @@ -116,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", @@ -137,10 +125,8 @@ "tm:magnetrise", "tm:mudshot", "tm:mudslap", - "tm:nuzzle", "tm:playrough", "tm:protect", - "tm:quickattack", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -148,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", @@ -162,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 93bbc50043..692faae637 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", @@ -67,7 +66,6 @@ "88:hydropump", "tm:aerialace", "tm:ancientpower", - "tm:aquaring", "tm:aquatail", "tm:aurasphere", "tm:avalanche", @@ -83,7 +81,6 @@ "tm:cut", "tm:dive", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -127,10 +124,8 @@ "tm:scaryface", "tm:shadowclaw", "tm:shockwave", - "tm:slash", "tm:sleeptalk", "tm:snowscape", - "tm:spacialrend", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -148,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": [ @@ -170,13 +199,6 @@ "aspects": [ "origin-forme" ], - "abilities": [ - "pressure", - "h:telepathy" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 90, "attack": 100, @@ -185,20 +207,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", @@ -214,7 +222,6 @@ "88:hydropump", "tm:aerialace", "tm:ancientpower", - "tm:aquaring", "tm:aquatail", "tm:aurasphere", "tm:avalanche", @@ -227,7 +234,6 @@ "tm:bulldoze", "tm:chillingwater", "tm:dracometeor", - "tm:dragonbreath", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", @@ -263,10 +269,8 @@ "tm:scaleshot", "tm:scaryface", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snowscape", - "tm:spacialrend", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", @@ -282,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..9824049548 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 } ] }, @@ -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..09eae59ae8 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 } ] }, @@ -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..765ce887c1 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 } ] }, @@ -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..9feacb056c 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 } ] }, @@ -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 c205e7e5a8..6b10917929 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json @@ -47,13 +47,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -81,10 +80,8 @@ "egg:tailwhip", "egg:wakeupslap", "tm:aerialace", - "tm:assist", "tm:assurance", "tm:attract", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:captivate", @@ -96,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", @@ -119,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", @@ -139,7 +126,6 @@ "tm:sunnyday", "tm:superfang", "tm:swagger", - "tm:tailwhip", "tm:taunt", "tm:terablast", "tm:thief", @@ -147,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 1d8a0c7b16..236a9fb149 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", @@ -75,9 +74,7 @@ "tm:brickbreak", "tm:bulldoze", "tm:confuseray", - "tm:crushgrip", "tm:darkestlariat", - "tm:dizzypunch", "tm:doubleedge", "tm:drainpunch", "tm:earthpower", @@ -88,10 +85,8 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:foresight", "tm:gigaimpact", "tm:gravity", - "tm:hammerarm", "tm:hardpress", "tm:headbutt", "tm:heatcrash", @@ -106,7 +101,6 @@ "tm:megapunch", "tm:naturepower", "tm:payback", - "tm:pound", "tm:powershift", "tm:poweruppunch", "tm:protect", @@ -123,7 +117,6 @@ "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -136,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..d07b6210d2 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 } ] }, @@ -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 8436e9d968..ee23d45f9d 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": [ @@ -93,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", @@ -136,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", @@ -156,7 +138,6 @@ "tm:roleplay", "tm:screech", "tm:shadowclaw", - "tm:skyuppercut", "tm:sleeptalk", "tm:strength", "tm:substitute", @@ -170,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..8680e9d646 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 } ] }, @@ -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 42bbf59ea6..f2ffc0f094 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", @@ -63,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", @@ -109,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": [ @@ -134,13 +154,6 @@ "aspects": [ "heat-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -149,20 +162,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", @@ -179,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", @@ -226,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 @@ -252,13 +273,6 @@ "aspects": [ "wash-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -267,20 +281,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", @@ -297,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", @@ -344,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 @@ -370,13 +392,6 @@ "aspects": [ "frost-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -385,20 +400,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", @@ -415,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", @@ -462,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 @@ -488,13 +511,6 @@ "aspects": [ "fan-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -503,20 +519,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", @@ -534,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", @@ -580,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 @@ -606,13 +630,6 @@ "aspects": [ "mow-appliance" ], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 50, "attack": 65, @@ -621,20 +638,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", @@ -651,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", @@ -698,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 12cb7fca12..da1e556eec 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", @@ -78,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", @@ -98,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", @@ -113,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": [ @@ -138,9 +156,6 @@ "serenegrace", "h:serenegrace" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 103, @@ -157,12 +172,6 @@ "special_defence": 0, "speed": 3 }, - "baseExperienceYield": 300, - "experienceGroup": "medium_slow", - "catchRate": 45, - "eggCycles": 120, - "baseFriendship": 100, - "behaviour": {}, "moves": [ "1:growth", "10:magicalleaf", @@ -196,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", @@ -213,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", @@ -232,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 983ba72734..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": [ { @@ -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/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 97619d74bc..eff44d4921 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": [ @@ -85,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", @@ -105,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", @@ -125,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 1e9a9b22b7..884b91ed87 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json @@ -48,13 +48,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -87,9 +86,6 @@ "egg:smog", "tm:acidspray", "tm:assurance", - "tm:astonish", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:burningjealousy", "tm:corrosivegas", @@ -103,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", @@ -124,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", @@ -171,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 673ab7cc57..35d05de4f5 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": [ @@ -101,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", @@ -147,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 b907ad26cb..5b8624783f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/spiritomb.json @@ -48,17 +48,16 @@ "height": 0.8, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:smoke_ball", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -96,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", @@ -128,7 +120,6 @@ "tm:psybeam", "tm:psychic", "tm:psyshock", - "tm:pursuit", "tm:quash", "tm:raindance", "tm:rest", @@ -136,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", @@ -158,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..c63d127a38 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 } ] }, @@ -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..4e2690d9e6 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 } ] }, @@ -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 11590cb975..cb06c0093e 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": [ @@ -86,9 +85,6 @@ "egg:smog", "tm:acidspray", "tm:assurance", - "tm:astonish", - "tm:belch", - "tm:bite", "tm:bodyslam", "tm:corrosivegas", "tm:crunch", @@ -100,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", @@ -118,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", @@ -163,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 3cb6784ae5..1a03517ef8 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": [ @@ -58,7 +57,7 @@ }, { "item": "cobblemon:big_root", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -92,7 +91,6 @@ "egg:ragepowder", "egg:wakeupslap", "egg:wringout", - "tm:absorb", "tm:aerialace", "tm:amnesia", "tm:ancientpower", @@ -103,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", @@ -120,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", @@ -148,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 f9fc85a8c1..951d781778 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json @@ -49,21 +49,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -111,7 +110,6 @@ "tm:aurasphere", "tm:babydolleyes", "tm:batonpass", - "tm:bestow", "tm:bodyslam", "tm:brickbreak", "tm:charm", @@ -127,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", @@ -153,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", @@ -198,7 +182,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:sweetkiss", "tm:swift", "tm:tailwind", "tm:telekinesis", @@ -209,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..70f068665e 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 } ] }, @@ -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 1554bfe979..04bc718efe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json @@ -48,17 +48,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:black_sludge", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -97,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", @@ -146,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", @@ -178,7 +160,6 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:smellingsalts", "tm:snatch", "tm:spite", "tm:stoneedge", @@ -201,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..aa562d0b22 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 } ] }, @@ -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 56219dc647..30530c2cec 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", @@ -81,7 +80,6 @@ "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:confusion", "tm:dazzlinggleam", "tm:drainingkiss", "tm:drainpunch", @@ -90,10 +88,8 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", "tm:firepunch", - "tm:flail", "tm:flash", "tm:fling", "tm:foulplay", @@ -113,10 +109,8 @@ "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:memento", "tm:metronome", "tm:mudslap", - "tm:mysticalpower", "tm:nastyplot", "tm:naturalgift", "tm:painsplit", @@ -162,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..3c5400f60a 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 } ] }, @@ -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 4b5570a7b3..5137467883 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/weavile.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/weavile.json @@ -48,21 +48,20 @@ "height": 1.35, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -104,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", @@ -144,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", @@ -161,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", @@ -177,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", @@ -203,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 f75dbbac9b..faba237aaf 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": [ @@ -53,7 +52,7 @@ }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -79,7 +78,6 @@ "tm:bugbuzz", "tm:bulletseed", "tm:captivate", - "tm:confusion", "tm:dig", "tm:dreameater", "tm:dualwingbeat", @@ -88,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", @@ -102,9 +98,7 @@ "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:quiverdance", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:safeguard", "tm:seedbomb", @@ -120,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": [], @@ -147,13 +162,6 @@ "aspects": [ "sandy-cloak" ], - "abilities": [ - "anticipation", - "h:overcoat" - ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 60, "attack": 79, @@ -170,12 +178,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 148, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:protect", @@ -198,7 +200,6 @@ "tm:bugbuzz", "tm:bulldoze", "tm:captivate", - "tm:confusion", "tm:dig", "tm:dreameater", "tm:dualwingbeat", @@ -208,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", @@ -221,7 +219,6 @@ "tm:psybeam", "tm:psychic", "tm:psychup", - "tm:quiverdance", "tm:raindance", "tm:rest", "tm:rockblast", @@ -241,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": [], @@ -268,13 +286,6 @@ "aspects": [ "trash-cloak" ], - "abilities": [ - "anticipation", - "h:overcoat" - ], - "eggGroups": [ - "bug" - ], "baseStats": { "hp": 60, "attack": 69, @@ -291,12 +302,6 @@ "special_defence": 1, "speed": 0 }, - "baseExperienceYield": 148, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 15, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:tackle", "1:protect", @@ -319,7 +324,6 @@ "tm:bugbite", "tm:bugbuzz", "tm:captivate", - "tm:confusion", "tm:dig", "tm:dreameater", "tm:dualwingbeat", @@ -327,7 +331,6 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:flail", "tm:flash", "tm:flashcannon", "tm:gigadrain", @@ -339,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", @@ -362,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..f423a72a53 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 } ] }, @@ -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 bdb68611fd..e130dc93df 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", @@ -47,7 +48,6 @@ "height": 1.7, "fixed": false }, - "behaviour": {}, "moves": [ "1:acidspray", "1:doubleteam", @@ -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..618862ca85 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 } ] }, @@ -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 5076e60a7f..c25518342c 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", @@ -64,7 +65,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -90,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", @@ -109,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", @@ -130,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 fa6ac7f7c8..c5f69e5d65 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/audino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/audino.json @@ -47,17 +47,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:oran_berry", - "percentage": 10 + "percentage": 5.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 10 + "percentage": 5.0 } ] }, @@ -94,7 +93,6 @@ "tm:amnesia", "tm:attract", "tm:babydolleyes", - "tm:bestow", "tm:blizzard", "tm:bodyslam", "tm:calmmind", @@ -104,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", @@ -122,10 +118,7 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:growl", "tm:healbell", - "tm:healingwish", - "tm:healpulse", "tm:helpinghand", "tm:hyperbeam", "tm:hypervoice", @@ -137,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", @@ -155,7 +144,6 @@ "tm:psyshock", "tm:raindance", "tm:reflect", - "tm:refresh", "tm:rest", "tm:retaliate", "tm:roleplay", @@ -163,7 +151,6 @@ "tm:secretpower", "tm:shadowball", "tm:signalbeam", - "tm:simplebeam", "tm:skillswap", "tm:sleeptalk", "tm:snatch", @@ -172,7 +159,6 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:sweetkiss", "tm:takedown", "tm:telekinesis", "tm:terablast", @@ -184,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": [ @@ -212,9 +240,6 @@ "healer", "h:healer" ], - "eggGroups": [ - "fairy" - ], "baseStats": { "hp": 103, "attack": 60, @@ -223,149 +248,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/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 111d31e507..07504a283c 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 } ] }, @@ -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": [ @@ -187,114 +192,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 +216,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", @@ -363,9 +236,7 @@ "egg:endeavor", "egg:lastrespects", "tm:agility", - "tm:aquajet", "tm:aquatail", - "tm:bite", "tm:blizzard", "tm:chillingwater", "tm:crunch", @@ -373,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", @@ -393,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..f3a43af823 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 } ] }, @@ -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..90cf54114d 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 } ] }, @@ -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 0e15e5883f..3f108181b3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json @@ -48,17 +48,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "minecraft:iron_helmet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chople_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -99,7 +98,6 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", "tm:flashcannon", "tm:fling", "tm:focusblast", @@ -107,7 +105,6 @@ "tm:furycutter", "tm:gigaimpact", "tm:grassknot", - "tm:guillotine", "tm:headbutt", "tm:honeclaws", "tm:hyperbeam", @@ -115,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", @@ -142,10 +133,8 @@ "tm:roleplay", "tm:sandstorm", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -163,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": [ @@ -178,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 fe9a7d038f..a847fd39a9 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": [ @@ -87,9 +86,7 @@ "tm:bounce", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:doubleedge", - "tm:doublekick", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -97,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..fa27b81741 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 } ] }, @@ -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 7b6a34296e..bb78380929 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": [ @@ -66,7 +65,7 @@ }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -96,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", @@ -123,8 +116,6 @@ "tm:payback", "tm:poisonjab", "tm:protect", - "tm:pursuit", - "tm:rage", "tm:raindance", "tm:rest", "tm:retaliate", @@ -135,10 +126,8 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:skullbash", "tm:sleeptalk", "tm:smartstrike", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -147,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 2be9218f8d..bb37d71235 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 } ] }, @@ -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": [], @@ -187,9 +201,6 @@ "sheerforce", "h:tintedlens" ], - "eggGroups": [ - "flying" - ], "baseStats": { "hp": 110, "attack": 83, @@ -206,12 +217,6 @@ "special_defence": 0, "speed": 0 }, - "baseExperienceYield": 179, - "experienceGroup": "slow", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 5, "entries": [ @@ -228,7 +233,7 @@ }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -264,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", @@ -285,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", @@ -310,7 +310,6 @@ "tm:shadowball", "tm:shadowclaw", "tm:skyattack", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:storedpower", @@ -321,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..341a381b31 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 } ] }, @@ -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 a7eeee2f96..494072b918 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json @@ -47,17 +47,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -101,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", @@ -126,7 +122,6 @@ "tm:lightscreen", "tm:mudslap", "tm:playrough", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", @@ -135,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 2f1503ed14..4efe9e8b09 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": [ @@ -85,7 +84,6 @@ "tm:coaching", "tm:cut", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:facade", "tm:falseswipe", @@ -99,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", @@ -119,7 +113,6 @@ "tm:roar", "tm:rockpolish", "tm:rocksmash", - "tm:sacredsword", "tm:safeguard", "tm:sandstorm", "tm:scaryface", @@ -143,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..b082b6019c 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 } ] }, @@ -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..cf98eaef61 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 } ] }, @@ -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 5a88c533c4..e1013de9b9 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": 3, "entries": [ @@ -60,7 +59,7 @@ }, { "item": "cobblemon:hard_stone", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -92,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", @@ -110,7 +106,6 @@ "tm:knockoff", "tm:meteorbeam", "tm:naturepower", - "tm:nightslash", "tm:poisonjab", "tm:protect", "tm:rest", @@ -119,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", @@ -141,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..00263cd234 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 } ] }, @@ -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 730d6eae33..76c2a3a660 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 } ] }, @@ -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": [], @@ -202,13 +222,6 @@ "aspects": [ "zen-mode" ], - "abilities": [ - "sheerforce", - "h:zenmode" - ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 105, "attack": 30, @@ -226,17 +239,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", @@ -255,8 +262,6 @@ "44:flareblitz", "50:thrash", "56:superpower", - "tm:bellydrum", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -265,7 +270,6 @@ "tm:burningjealousy", "tm:dig", "tm:earthquake", - "tm:ember", "tm:encore", "tm:endeavor", "tm:endure", @@ -289,7 +293,6 @@ "tm:grassknot", "tm:guardswap", "tm:gyroball", - "tm:hammerarm", "tm:headbutt", "tm:heatwave", "tm:hyperbeam", @@ -307,7 +310,6 @@ "tm:poweruppunch", "tm:protect", "tm:psychic", - "tm:rage", "tm:rest", "tm:reversal", "tm:roar", @@ -325,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", @@ -338,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 @@ -358,48 +388,22 @@ ], "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": [ { "item": "cobblemon:ice_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -428,8 +432,6 @@ "egg:takedown", "egg:yawn", "tm:avalanche", - "tm:bellydrum", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -447,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", @@ -473,7 +471,6 @@ "tm:megapunch", "tm:overheat", "tm:payback", - "tm:powdersnow", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -487,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": [], @@ -519,16 +538,13 @@ "galarian_form" ], "aspects": [ - "zen-mode", - "galarian" + "galarian", + "zen-mode" ], "abilities": [ "gorillatactics", "h:zenmode" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 105, "attack": 160, @@ -546,11 +562,6 @@ "speed": 0 }, "baseExperienceYield": 189, - "experienceGroup": "medium_slow", - "catchRate": 60, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:iciclecrash", "1:powdersnow", @@ -568,8 +579,6 @@ "50:thrash", "56:superpower", "tm:avalanche", - "tm:bellydrum", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -604,7 +613,6 @@ "tm:icebeam", "tm:icefang", "tm:icepunch", - "tm:iciclecrash", "tm:incinerate", "tm:irondefense", "tm:ironhead", @@ -613,7 +621,6 @@ "tm:megapunch", "tm:overheat", "tm:payback", - "tm:powdersnow", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -627,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, @@ -647,11 +677,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/darumaka.json b/common/src/main/resources/data/cobblemon/species/generation5/darumaka.json index 477dd1982c..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": [ { @@ -186,35 +192,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": [ @@ -252,8 +229,6 @@ "egg:takedown", "egg:yawn", "tm:avalanche", - "tm:bellydrum", - "tm:bite", "tm:blizzard", "tm:brickbreak", "tm:dig", @@ -265,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", @@ -283,7 +255,6 @@ "tm:megakick", "tm:megapunch", "tm:overheat", - "tm:powdersnow", "tm:poweruppunch", "tm:protect", "tm:rest", @@ -294,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 a2a3bfd546..29202bebf9 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", @@ -54,7 +54,6 @@ "height": 1.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ @@ -93,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", @@ -143,7 +132,6 @@ "tm:substitute", "tm:sunnyday", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderwave", @@ -151,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": [ { @@ -185,121 +191,7 @@ "gen5" ], "aspects": [ - "on-summer-sea" - ], - "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" + "summer" ], "evolutions": [ { @@ -334,121 +226,7 @@ "gen5" ], "aspects": [ - "on-autumn-sea" - ], - "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" + "autumn" ], "evolutions": [ { @@ -483,121 +261,7 @@ "gen5" ], "aspects": [ - "on-winter-sea" - ], - "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" + "winter" ], "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 3664a837d9..7e6143b48b 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": [ @@ -87,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", @@ -107,7 +99,6 @@ "tm:firefang", "tm:focusenergy", "tm:headbutt", - "tm:headsmash", "tm:hypervoice", "tm:icefang", "tm:incinerate", @@ -122,7 +113,6 @@ "tm:scaryface", "tm:screech", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:snarl", "tm:spite", @@ -130,7 +120,6 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -139,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 aac6eb0f9d..b9e99f0c29 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 } ] }, @@ -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": [ @@ -233,129 +243,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 b430914488..91362a5f9e 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": 3, "entries": [ @@ -88,7 +87,6 @@ "tm:aerialace", "tm:brickbreak", "tm:bulldoze", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", @@ -98,9 +96,7 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", "tm:fling", - "tm:furyswipes", "tm:helpinghand", "tm:highhorsepower", "tm:honeclaws", @@ -109,10 +105,8 @@ "tm:metalsound", "tm:mudshot", "tm:mudslap", - "tm:mudsport", "tm:poisonjab", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockclimb", "tm:rockslide", @@ -121,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..c37bac83e1 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 } ] }, @@ -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 c8143b6a89..e27bd528e1 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", @@ -111,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", @@ -126,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", @@ -150,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 9f95a13505..ecfc6bc604 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": [ @@ -57,7 +56,7 @@ }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -85,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", @@ -108,7 +104,6 @@ "tm:gravity", "tm:guardswap", "tm:gyroball", - "tm:healblock", "tm:helpinghand", "tm:imprison", "tm:infestation", @@ -124,9 +119,7 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:rockslide", @@ -153,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 97e6ad8458..2e443ec160 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": [ @@ -90,7 +89,6 @@ "tm:agility", "tm:batonpass", "tm:beatup", - "tm:bite", "tm:bugbite", "tm:crunch", "tm:cut", @@ -98,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", @@ -123,7 +115,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:screech", "tm:shadowclaw", @@ -139,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 99356c1c5f..1e8c1be2ba 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": 2, "entries": [ @@ -91,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", @@ -114,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", @@ -134,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..b0b9d22d54 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 } ] }, @@ -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..2c503fc6c0 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 } ] }, @@ -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 cc9d194eb9..f87d71fada 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", @@ -48,17 +49,16 @@ "height": 2.1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "minecraft:iron_helmet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:occa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -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 c220d1ca15..ab356ea4b4 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": 4, "entries": [ @@ -58,11 +57,11 @@ }, { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -94,7 +93,6 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:crushclaw", "tm:curse", "tm:cut", "tm:dig", @@ -104,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", @@ -121,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..26003e502b 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 } ] }, @@ -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 c1e954c18f..06a0e86f3b 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", @@ -88,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", @@ -124,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..aade84ca32 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 } ] }, @@ -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..625894be44 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 } ] }, @@ -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 afdf8b8c02..e9210828fa 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 } ] }, @@ -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": [], @@ -186,135 +194,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..64aed2948f 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", @@ -81,7 +80,6 @@ "tm:energyball", "tm:explosion", "tm:facade", - "tm:fellstinger", "tm:flamecharge", "tm:flamethrower", "tm:flash", @@ -101,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", @@ -119,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", @@ -136,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": [ @@ -158,124 +184,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 +204,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 +224,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 +244,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/gigalith.json b/common/src/main/resources/data/cobblemon/species/generation5/gigalith.json index 8a1580b6a5..c7acfb4055 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 } ] }, @@ -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..25502c3761 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 } ] }, @@ -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 0b432dc15e..069e696af2 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": [ @@ -93,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", @@ -115,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", @@ -160,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 8d6aa9b089..4f50582947 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": [ @@ -57,11 +56,11 @@ }, { "item": "cobblemon:twisted_spoon", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:persim_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -97,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", @@ -122,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", @@ -172,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 767252a417..92cf2b4ca3 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": [ @@ -57,11 +56,11 @@ }, { "item": "cobblemon:twisted_spoon", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -94,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", @@ -116,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", @@ -162,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..e46be27b70 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 } ] }, @@ -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..836a74a331 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 } ] }, @@ -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..4a4b2708bf 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 } ] }, @@ -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 1b82bef2fb..0be958b811 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": [ @@ -62,7 +61,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -93,7 +92,6 @@ "tm:aerialace", "tm:afteryou", "tm:babydolleyes", - "tm:bite", "tm:charm", "tm:covet", "tm:crunch", @@ -103,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", @@ -123,7 +116,6 @@ "tm:roar", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", @@ -132,7 +124,6 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunderbolt", @@ -141,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..47f0acd347 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 } ] }, @@ -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..d61189b8cf 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 } ] }, @@ -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 a907601696..0c7df89965 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": [ @@ -97,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", @@ -127,10 +121,8 @@ "tm:magnetrise", "tm:pinmissile", "tm:poisonjab", - "tm:poisonsting", "tm:pounce", "tm:protect", - "tm:pursuit", "tm:raindance", "tm:rest", "tm:risingvoltage", @@ -139,10 +131,8 @@ "tm:shockwave", "tm:signalbeam", "tm:skittersmack", - "tm:slash", "tm:sleeptalk", "tm:speedswap", - "tm:spiderweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -155,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 307f65b857..5bbb4226d7 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, @@ -47,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -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 8f21e73785..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", @@ -44,7 +44,6 @@ "catchRate": 3, "eggCycles": 80, "baseFriendship": 35, - "behaviour": {}, "moves": [ "1:aquajet", "1:leer", @@ -64,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", @@ -78,7 +75,6 @@ "tm:covet", "tm:cut", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:facade", "tm:falseswipe", @@ -91,7 +87,6 @@ "tm:hyperbeam", "tm:icywind", "tm:lastresort", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:megahorn", @@ -100,7 +95,6 @@ "tm:poisonjab", "tm:protect", "tm:psychup", - "tm:quickguard", "tm:raindance", "tm:reflect", "tm:rest", @@ -109,9 +103,7 @@ "tm:reversal", "tm:roar", "tm:rocksmash", - "tm:sacredsword", "tm:safeguard", - "tm:secretsword", "tm:sleeptalk", "tm:smartstrike", "tm:stoneedge", @@ -130,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": [ @@ -149,123 +169,7 @@ "mythical" ], "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" + "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..4f6432b464 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" } } }, @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:black_glasses", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -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..cf24d8ed91 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" } } }, @@ -65,11 +65,11 @@ "entries": [ { "item": "cobblemon:black_glasses", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:tanga_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -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 5b1efd98bf..5ab0afe2ca 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", @@ -77,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", @@ -94,9 +91,7 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:freezedry", "tm:gigaimpact", - "tm:glaciate", "tm:hail", "tm:helpinghand", "tm:honeclaws", @@ -110,7 +105,6 @@ "tm:ironhead", "tm:laserfocus", "tm:lightscreen", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -128,9 +122,7 @@ "tm:scaryface", "tm:shadowball", "tm:shadowclaw", - "tm:sheercold", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:steelwing", @@ -142,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": [ @@ -168,9 +191,6 @@ "turboblaze", "h:turboblaze" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 125, "attack": 120, @@ -188,11 +208,6 @@ "speed": 0 }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:dragonrage", "1:ancientpower", @@ -220,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", @@ -237,8 +250,6 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:freezedry", - "tm:fusionflare", "tm:gigaimpact", "tm:hail", "tm:helpinghand", @@ -246,7 +257,6 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", - "tm:iceburn", "tm:icefang", "tm:iciclespear", "tm:icywind", @@ -254,7 +264,6 @@ "tm:ironhead", "tm:laserfocus", "tm:lightscreen", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -272,9 +281,7 @@ "tm:scaryface", "tm:shadowball", "tm:shadowclaw", - "tm:sheercold", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:steelwing", @@ -286,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 @@ -313,9 +351,6 @@ "teravolt", "h:teravolt" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 125, "attack": 170, @@ -333,11 +368,6 @@ "speed": 0 }, "baseExperienceYield": 350, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, - "behaviour": {}, "moves": [ "1:dragonrage", "1:ancientpower", @@ -365,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", @@ -382,9 +410,6 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:freezedry", - "tm:freezeshock", - "tm:fusionbolt", "tm:gigaimpact", "tm:hail", "tm:helpinghand", @@ -399,7 +424,6 @@ "tm:ironhead", "tm:laserfocus", "tm:lightscreen", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -417,9 +441,7 @@ "tm:scaryface", "tm:shadowball", "tm:shadowclaw", - "tm:sheercold", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:snowscape", "tm:steelwing", @@ -431,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..7c9ce0b487 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 } ] }, @@ -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 0b3938928b..9c137c586e 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", @@ -79,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", @@ -100,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", @@ -131,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": [ @@ -156,9 +172,6 @@ "intimidate", "h:intimidate" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 89, "attack": 145, @@ -175,100 +188,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..dbb33bd848 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": [ @@ -90,7 +89,6 @@ "egg:harden", "egg:morningsun", "egg:thrash", - "tm:absorb", "tm:acrobatics", "tm:amnesia", "tm:bodyslam", @@ -98,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", @@ -134,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 8099900202..236c52611b 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": [ @@ -58,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 } ] }, @@ -104,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", @@ -137,8 +131,6 @@ "tm:lunge", "tm:magicalleaf", "tm:magiccoat", - "tm:mefirst", - "tm:mindreader", "tm:naturepower", "tm:payback", "tm:poisonjab", @@ -146,8 +138,6 @@ "tm:pounce", "tm:protect", "tm:raindance", - "tm:razorleaf", - "tm:razorwind", "tm:reflect", "tm:rest", "tm:retaliate", @@ -157,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 767c240a4c..a4665b7c34 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": [ @@ -58,7 +57,7 @@ }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -88,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", @@ -105,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", @@ -122,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", @@ -159,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 a4961d6339..08864a6529 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/lilligant.json @@ -52,21 +52,20 @@ "height": 2.3, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ - { - "item": "cobblemon:big_root", - "percentage": 5 - }, { "item": "cobblemon:revival_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 + }, + { + "item": "cobblemon:absorb_bulb", + "percentage": 5.0 } ] }, @@ -99,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", @@ -112,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": [], @@ -187,9 +187,6 @@ "hustle", "h:leafguard" ], - "eggGroups": [ - "grass" - ], "baseStats": { "hp": 70, "attack": 105, @@ -206,28 +203,22 @@ "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": [ { "item": "cobblemon:revival_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -263,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", @@ -281,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", @@ -316,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 bf58b059c9..d90c5d5544 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": [ @@ -92,7 +91,6 @@ "tm:aerialace", "tm:afteryou", "tm:babydolleyes", - "tm:bite", "tm:charm", "tm:covet", "tm:crunch", @@ -102,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", @@ -122,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", @@ -138,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 c3302c9fd6..cd9e2dcf90 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": [ @@ -69,7 +68,7 @@ }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -108,7 +107,6 @@ "tm:assurance", "tm:attract", "tm:block", - "tm:bonerush", "tm:bravebird", "tm:cut", "tm:darkpulse", @@ -120,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", @@ -134,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", @@ -171,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 b319833bce..6e8689b93c 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": [ @@ -58,11 +57,11 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:sticky_barb", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -92,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", @@ -108,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", @@ -135,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 78c205e8a3..9f7861a61f 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", @@ -72,7 +71,6 @@ "tm:charm", "tm:closecombat", "tm:coaching", - "tm:confusion", "tm:covet", "tm:dazzlinggleam", "tm:disarmingvoice", @@ -109,7 +107,6 @@ "tm:magicroom", "tm:metronome", "tm:payback", - "tm:perishsong", "tm:playrough", "tm:poweruppunch", "tm:protect", @@ -117,10 +114,8 @@ "tm:psychic", "tm:psychup", "tm:psyshock", - "tm:quickattack", "tm:raindance", "tm:recycle", - "tm:relicsong", "tm:rest", "tm:retaliate", "tm:reversal", @@ -132,7 +127,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:sing", "tm:skillswap", "tm:sleeptalk", "tm:snatch", @@ -142,7 +136,6 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:teeterdance", "tm:telekinesis", "tm:terablast", "tm:thunder", @@ -153,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": [ @@ -177,13 +215,6 @@ "aspects": [ "pirouette-forme" ], - "abilities": [ - "serenegrace", - "h:serenegrace" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 128, @@ -200,125 +231,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..8cbc479675 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": [ @@ -98,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", @@ -141,7 +128,6 @@ "tm:rocktomb", "tm:roleplay", "tm:sleeptalk", - "tm:smellingsalts", "tm:stoneedge", "tm:strength", "tm:substitute", @@ -154,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 033c712c26..0631989725 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json @@ -48,17 +48,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:expert_belt", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -104,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", @@ -152,7 +139,6 @@ "tm:rocktomb", "tm:roleplay", "tm:sleeptalk", - "tm:smellingsalts", "tm:stoneedge", "tm:strength", "tm:substitute", @@ -167,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 6a1935f714..35d1444075 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": [ @@ -98,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", @@ -117,7 +113,6 @@ "tm:lastresort", "tm:mudslap", "tm:playrough", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", @@ -125,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 6966e745ea..1d40c37c20 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": [ @@ -85,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", @@ -102,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", @@ -119,7 +110,6 @@ "tm:psychic", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:reflect", "tm:rest", @@ -132,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", @@ -145,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 c84dc62550..6d87f31e6e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json @@ -47,13 +47,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -86,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", @@ -104,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", @@ -124,7 +115,6 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", "tm:reflect", "tm:rest", @@ -137,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", @@ -150,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 f7c2e631c6..7aafa29776 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 } ] }, @@ -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": [ { @@ -204,127 +213,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/palpitoad.json b/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json index 1b65158aac..ae987ab96b 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 } ] }, @@ -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 4861546f42..86280e81a1 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": [ @@ -93,10 +92,7 @@ "egg:roleplay", "egg:tickle", "tm:acrobatics", - "tm:aquaring", "tm:aquatail", - "tm:astonish", - "tm:bite", "tm:blizzard", "tm:brine", "tm:covet", @@ -111,7 +107,6 @@ "tm:fling", "tm:flipturn", "tm:focuspunch", - "tm:furyswipes", "tm:gastroacid", "tm:grassknot", "tm:gunkshot", @@ -124,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", @@ -141,7 +132,6 @@ "tm:rocktomb", "tm:roleplay", "tm:scald", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:substitute", @@ -150,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 f48b7e01ba..d16076c6e6 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": [ @@ -94,8 +93,6 @@ "egg:spikyshield", "egg:tickle", "tm:acrobatics", - "tm:astonish", - "tm:bite", "tm:bulletseed", "tm:covet", "tm:crunch", @@ -109,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", @@ -122,9 +117,6 @@ "tm:irontail", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", @@ -132,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", @@ -152,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 bd748d36eb..020ae17e6a 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": [ @@ -96,9 +95,6 @@ "egg:tickle", "tm:acrobatics", "tm:amnesia", - "tm:astonish", - "tm:belch", - "tm:bite", "tm:burningjealousy", "tm:covet", "tm:crunch", @@ -112,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", @@ -128,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", @@ -153,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 98d02b0d7f..ff914c4603 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": [ @@ -97,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", @@ -135,10 +127,8 @@ "tm:roleplay", "tm:sandstorm", "tm:scaryface", - "tm:scratch", "tm:screech", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:snatch", @@ -155,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 98328feebb..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": [ { @@ -212,110 +214,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/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..3def9a2541 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 } ] }, @@ -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 817fb3e74b..bb5c168508 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": [ @@ -86,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", @@ -102,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", @@ -116,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", @@ -149,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 ffabded803..289432d27e 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", @@ -68,7 +67,6 @@ "80:outrage", "88:blueflare", "tm:ancientpower", - "tm:blueflare", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", @@ -78,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", @@ -100,7 +95,6 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:fusionflare", "tm:gigaimpact", "tm:heatcrash", "tm:heatwave", @@ -113,7 +107,6 @@ "tm:laserfocus", "tm:lightscreen", "tm:mysticalfire", - "tm:nobleroar", "tm:outrage", "tm:overheat", "tm:payback", @@ -133,7 +126,6 @@ "tm:scorchingsands", "tm:shadowball", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:solarbeam", "tm:steelwing", @@ -147,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 b562a34459..aa37c6adb8 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": [ @@ -57,7 +56,7 @@ }, { "item": "cobblemon:persim_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -87,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", @@ -119,8 +114,6 @@ "tm:gravity", "tm:guardswap", "tm:gyroball", - "tm:hammerarm", - "tm:healblock", "tm:helpinghand", "tm:hyperbeam", "tm:icepunch", @@ -143,9 +136,7 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:rockslide", @@ -176,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 140ade3ceb..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": [ { @@ -211,111 +221,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..e7253d2574 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 } ] }, @@ -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": [], @@ -209,9 +226,6 @@ "torrent", "h:sharpness" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 90, "attack": 108, @@ -228,41 +242,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": [ - { - "item": "cobblemon:mystic_water", - "percentage": 25 - }, - { - "item": "cobblemon:shell_bell", - "percentage": 25 - } - ] - }, "moves": [ "1:megahorn", "1:ceaselessedge", @@ -295,19 +275,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", @@ -331,7 +306,6 @@ "tm:lashout", "tm:liquidation", "tm:megahorn", - "tm:nightslash", "tm:protect", "tm:psychocut", "tm:raindance", @@ -339,37 +313,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 756b120013..b9357d3bb2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json @@ -47,21 +47,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -81,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", @@ -104,10 +100,8 @@ "tm:grassknot", "tm:helpinghand", "tm:icepunch", - "tm:karatechop", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -117,7 +111,6 @@ "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -138,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 1acebd6b57..e17db986c1 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", @@ -54,7 +54,6 @@ "height": 1.9, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "entries": [ @@ -64,7 +63,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -98,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", @@ -149,7 +138,6 @@ "tm:retaliate", "tm:rocksmash", "tm:safeguard", - "tm:sandattack", "tm:seedbomb", "tm:shadowball", "tm:sleeptalk", @@ -160,7 +148,6 @@ "tm:sunnyday", "tm:swordsdance", "tm:synthesis", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:throatchop", @@ -169,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": [], @@ -188,139 +200,7 @@ "gen5" ], "aspects": [ - "on-summer-sea" - ], - "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" + "summer" ], "preEvolution": "deerling", "evolutions": [], @@ -340,139 +220,7 @@ "gen5" ], "aspects": [ - "on-autumn-sea" - ], - "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" + "autumn" ], "preEvolution": "deerling", "evolutions": [], @@ -492,139 +240,7 @@ "gen5" ], "aspects": [ - "on-winter-sea" - ], - "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" + "winter" ], "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..a0f02be19a 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 } ] }, @@ -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 2d12012b93..1587286402 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json @@ -50,17 +50,16 @@ "height": 1.65, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:black_belt", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -95,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", @@ -115,9 +111,7 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:firepunch", "tm:fling", "tm:focusblast", @@ -126,9 +120,7 @@ "tm:gigaimpact", "tm:grassknot", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", - "tm:highjumpkick", "tm:hyperbeam", "tm:icepunch", "tm:incinerate", @@ -137,7 +129,6 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -148,7 +139,6 @@ "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -159,7 +149,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:scaryface", "tm:sleeptalk", "tm:sludgebomb", @@ -185,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 99ad16e571..71c85807d0 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": [ @@ -93,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", @@ -113,9 +109,7 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", "tm:faketears", - "tm:feintattack", "tm:firepunch", "tm:fling", "tm:focusblast", @@ -123,9 +117,7 @@ "tm:foulplay", "tm:grassknot", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", - "tm:highjumpkick", "tm:icepunch", "tm:incinerate", "tm:irondefense", @@ -133,7 +125,6 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -142,7 +133,6 @@ "tm:poisonjab", "tm:poweruppunch", "tm:protect", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -152,7 +142,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:scaryface", "tm:sleeptalk", "tm:sludgebomb", @@ -176,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..5ea0529b9d 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 } ] }, @@ -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..d14c2b11b9 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 } ] }, @@ -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..305dc80d34 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 } ] }, @@ -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 dac1dc4fa2..2c40848c1b 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": [ @@ -92,7 +91,6 @@ "tm:batonpass", "tm:bugbite", "tm:bugbuzz", - "tm:camouflage", "tm:charm", "tm:cut", "tm:dreameater", @@ -100,7 +98,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:flail", "tm:flash", "tm:gigadrain", "tm:grassknot", @@ -110,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", @@ -129,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 ece3622f59..82ef45b2be 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", @@ -47,7 +48,6 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ @@ -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..3dd3253df2 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 } ] }, @@ -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 8f237f8ac8..67a7844a1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simipour.json @@ -46,21 +46,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -87,10 +86,7 @@ "egg:roleplay", "egg:tickle", "tm:acrobatics", - "tm:aquaring", "tm:aquatail", - "tm:astonish", - "tm:bite", "tm:blizzard", "tm:brickbreak", "tm:brine", @@ -107,7 +103,6 @@ "tm:flipturn", "tm:focusblast", "tm:focuspunch", - "tm:furyswipes", "tm:gastroacid", "tm:gigaimpact", "tm:grassknot", @@ -122,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", @@ -141,7 +132,6 @@ "tm:rocktomb", "tm:roleplay", "tm:scald", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:substitute", @@ -152,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 6de9df6971..8065111341 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json @@ -46,21 +46,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -88,8 +87,6 @@ "egg:spikyshield", "egg:tickle", "tm:acrobatics", - "tm:astonish", - "tm:bite", "tm:brickbreak", "tm:bulletseed", "tm:covet", @@ -105,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", @@ -120,9 +115,6 @@ "tm:irontail", "tm:knockoff", "tm:leafstorm", - "tm:leechseed", - "tm:leer", - "tm:lick", "tm:lowkick", "tm:lowsweep", "tm:magicalleaf", @@ -130,7 +122,6 @@ "tm:naturalgift", "tm:naturepower", "tm:payback", - "tm:playnice", "tm:poweruppunch", "tm:protect", "tm:recycle", @@ -139,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", @@ -154,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 b542830d7a..f959767b35 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json @@ -46,21 +46,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -89,9 +88,6 @@ "egg:tickle", "tm:acrobatics", "tm:amnesia", - "tm:astonish", - "tm:belch", - "tm:bite", "tm:brickbreak", "tm:burningjealousy", "tm:covet", @@ -106,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", @@ -125,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", @@ -143,7 +134,6 @@ "tm:rocktomb", "tm:roleplay", "tm:scorchingsands", - "tm:scratch", "tm:shadowclaw", "tm:sleeptalk", "tm:solarbeam", @@ -155,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..d565f5c77a 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 } ] }, @@ -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 ad9d567d67..c023ce19d8 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": [ @@ -83,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", @@ -106,7 +102,6 @@ "tm:gravity", "tm:guardswap", "tm:gyroball", - "tm:healblock", "tm:helpinghand", "tm:imprison", "tm:infestation", @@ -122,9 +117,7 @@ "tm:psychicterrain", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:rockslide", @@ -151,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 aebb73ba84..170882288e 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": [ @@ -62,7 +61,7 @@ }, { "item": "cobblemon:chilan_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -96,7 +95,6 @@ "tm:aerialace", "tm:afteryou", "tm:babydolleyes", - "tm:bite", "tm:charm", "tm:covet", "tm:crunch", @@ -106,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", @@ -128,7 +121,6 @@ "tm:roar", "tm:rocksmash", "tm:rocktomb", - "tm:sandattack", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", @@ -139,7 +131,6 @@ "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thunder", @@ -149,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 7aa2826fc8..056c951fbf 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 } ] }, @@ -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": [ @@ -192,10 +201,6 @@ "mimicry", "h:mimicry" ], - "eggGroups": [ - "water_1", - "amorphous" - ], "baseStats": { "hp": 109, "attack": 81, @@ -204,29 +209,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", @@ -251,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", @@ -263,8 +244,6 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:fissure", - "tm:flail", "tm:flashcannon", "tm:foulplay", "tm:icefang", @@ -279,7 +258,6 @@ "tm:payback", "tm:protect", "tm:raindance", - "tm:reflecttype", "tm:rest", "tm:revenge", "tm:rockslide", @@ -290,7 +268,6 @@ "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:snaptrap", "tm:spite", "tm:stealthrock", "tm:steelbeam", @@ -299,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 348582a84f..b8dd8f2d33 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": [ @@ -58,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 } ] }, @@ -94,7 +93,6 @@ "tm:batonpass", "tm:bugbite", "tm:bugbuzz", - "tm:camouflage", "tm:charm", "tm:cut", "tm:dreameater", @@ -102,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", @@ -114,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", @@ -132,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 eaaaba92ee..1099636e7a 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", @@ -82,7 +83,7 @@ }, { "item": "cobblemon:wacan_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -117,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", @@ -134,7 +132,6 @@ "tm:flipturn", "tm:fly", "tm:gigaimpact", - "tm:gust", "tm:hail", "tm:helpinghand", "tm:hurricane", @@ -144,10 +141,6 @@ "tm:icywind", "tm:knockoff", "tm:liquidation", - "tm:luckychant", - "tm:mefirst", - "tm:mirrormove", - "tm:mudsport", "tm:pluck", "tm:protect", "tm:raindance", @@ -162,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..d30a7b04b9 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 } ] }, @@ -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..9b031f6c76 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 } ] }, @@ -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 7a568d7ea4..f67a531d8f 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": [ @@ -84,7 +83,6 @@ "tm:coaching", "tm:cut", "tm:doubleedge", - "tm:doublekick", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -97,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", @@ -115,7 +110,6 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:sacredsword", "tm:safeguard", "tm:sandstorm", "tm:scaryface", @@ -136,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 1f4250ffd0..be985ad879 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/throh.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/throh.json @@ -47,21 +47,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -81,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", @@ -105,10 +102,8 @@ "tm:icepunch", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:matblock", "tm:megakick", "tm:megapunch", "tm:painsplit", @@ -125,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", @@ -137,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 b376f15f1f..1e3c64e96f 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", @@ -66,8 +65,6 @@ "tm:acrobatics", "tm:agility", "tm:assurance", - "tm:astonish", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -77,7 +74,6 @@ "tm:crunch", "tm:darkpulse", "tm:defog", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -92,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", @@ -130,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": [ @@ -168,9 +187,6 @@ "voltabsorb", "h:voltabsorb" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 79, "attack": 105, @@ -187,112 +203,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/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 618f1c33a6..b0b69b50ad 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", @@ -67,9 +66,6 @@ "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:astonish", - "tm:bite", - "tm:bleakwindstorm", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -80,7 +76,6 @@ "tm:defog", "tm:embargo", "tm:endure", - "tm:extrasensory", "tm:facade", "tm:fling", "tm:fly", @@ -88,8 +83,6 @@ "tm:foulplay", "tm:gigaimpact", "tm:grassknot", - "tm:gust", - "tm:hammerarm", "tm:heatwave", "tm:hurricane", "tm:hyperbeam", @@ -98,7 +91,6 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:metronome", "tm:nastyplot", "tm:payback", @@ -128,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": [ @@ -156,9 +168,6 @@ "regenerator", "h:regenerator" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 79, "attack": 100, @@ -175,102 +184,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/tranquill.json b/common/src/main/resources/data/cobblemon/species/generation5/tranquill.json index 38386ad4a5..37a9b7448c 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 } ] }, @@ -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..8a9b612466 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 } ] }, @@ -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..21f95d7780 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 } ] }, @@ -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..37fe7eb653 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 } ] }, @@ -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 2fbd826e85..4baf6519c1 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", @@ -74,7 +73,6 @@ "tm:bounce", "tm:brickbreak", "tm:chargebeam", - "tm:confusion", "tm:dazzlinggleam", "tm:doubleedge", "tm:embargo", @@ -83,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", @@ -104,7 +100,6 @@ "tm:helpinghand", "tm:hyperbeam", "tm:incinerate", - "tm:inferno", "tm:laserfocus", "tm:lastresort", "tm:lightscreen", @@ -119,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", @@ -149,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 039a94bdd3..063aefc92d 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": [ @@ -86,7 +85,6 @@ "tm:coaching", "tm:cut", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:energyball", "tm:facade", @@ -102,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", @@ -118,7 +113,6 @@ "tm:reversal", "tm:roar", "tm:rocksmash", - "tm:sacredsword", "tm:safeguard", "tm:scaryface", "tm:seedbomb", @@ -143,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..3d51e9b636 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 } ] }, @@ -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 7e54bb8974..565ddaa80c 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": [ @@ -107,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", @@ -153,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..dc2ae937e9 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 } ] }, @@ -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..0a003fb72a 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 } ] }, @@ -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..baacb1bd70 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 } ] }, @@ -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 5fd4985ecd..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": [ { @@ -194,10 +209,6 @@ "wanderingspirit", "h:wanderingspirit" ], - "eggGroups": [ - "mineral", - "amorphous" - ], "baseStats": { "hp": 38, "attack": 55, @@ -206,20 +217,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": [ @@ -248,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", @@ -284,7 +273,6 @@ "tm:sandstorm", "tm:shadowball", "tm:skillswap", - "tm:slam", "tm:sleeptalk", "tm:substitute", "tm:terablast", @@ -294,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 845442befa..db23b0091f 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": [ @@ -57,7 +56,7 @@ }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -91,9 +90,7 @@ "tm:bulldoze", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:doubleedge", - "tm:doublekick", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -101,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 66e0bcffa7..76bd79c9c6 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", @@ -70,7 +69,6 @@ "tm:ancientpower", "tm:bodypress", "tm:bodyslam", - "tm:boltstrike", "tm:breakingswipe", "tm:brickbreak", "tm:brutalswing", @@ -81,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", @@ -101,7 +97,6 @@ "tm:fly", "tm:focusblast", "tm:focuspunch", - "tm:fusionbolt", "tm:gigaimpact", "tm:haze", "tm:helpinghand", @@ -112,7 +107,6 @@ "tm:laserfocus", "tm:lightscreen", "tm:magnetrise", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -133,7 +127,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:stealthrock", "tm:steelwing", @@ -154,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 cff94eff21..fba511da8d 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": [ @@ -61,7 +60,7 @@ }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -103,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", @@ -135,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", @@ -159,7 +146,6 @@ "tm:roar", "tm:rocksmash", "tm:scaryface", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:skittersmack", @@ -181,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": [], @@ -201,16 +219,8 @@ "hisuian_form" ], "aspects": [ - "hisuian", "hisuian" ], - "abilities": [ - "illusion", - "h:illusion" - ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 55, "attack": 100, @@ -219,26 +229,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": [ @@ -248,7 +244,7 @@ }, { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -275,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", @@ -307,10 +299,8 @@ "tm:imprison", "tm:knockoff", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:ominouswind", @@ -325,10 +315,8 @@ "tm:roar", "tm:rocksmash", "tm:scaryface", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", @@ -346,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 fb6ce62913..aa0f5b532a 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": [ @@ -61,7 +60,7 @@ "quantityRange": "1-3" }, { - "item": "cobblemon:roseli_berry", + "item": "cobblemon:colbur_berry", "percentage": 2.5 } ] @@ -98,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", @@ -124,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", @@ -161,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": [ { @@ -198,13 +208,6 @@ "aspects": [ "hisuian" ], - "abilities": [ - "illusion", - "h:illusion" - ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 35, "attack": 60, @@ -213,34 +216,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": [ - { - "item": "minecraft:sweet_berries", - "quantityRange": "1-3" - }, - { - "item": "cobblemon:colbur_berry", - "percentage": 2.5 - } - ] - }, "moves": [ "1:scratch", "1:leer", @@ -260,17 +235,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", @@ -284,8 +255,6 @@ "tm:imprison", "tm:knockoff", "tm:lashout", - "tm:leer", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:painsplit", @@ -295,10 +264,8 @@ "tm:raindance", "tm:rest", "tm:roar", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", - "tm:shadowsneak", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", @@ -314,7 +281,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 bdd1bf29f8..1019f34105 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": [ @@ -58,7 +57,7 @@ }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -88,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", @@ -109,7 +101,6 @@ "tm:firefang", "tm:focusenergy", "tm:headbutt", - "tm:headsmash", "tm:helpinghand", "tm:hypervoice", "tm:icefang", @@ -126,7 +117,6 @@ "tm:scaryface", "tm:screech", "tm:shockwave", - "tm:slam", "tm:sleeptalk", "tm:snarl", "tm:spite", @@ -135,7 +125,6 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -144,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 7460acefa2..3b3a064bc7 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 } ] }, @@ -99,13 +103,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 +115,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 +130,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 +141,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": [], @@ -170,13 +185,6 @@ "aspects": [ "blade-forme" ], - "abilities": [ - "stancechange", - "h:stancechange" - ], - "eggGroups": [ - "mineral" - ], "baseStats": { "hp": 60, "attack": 140, @@ -193,19 +201,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", @@ -227,7 +222,6 @@ "tm:aerialace", "tm:afteryou", "tm:airslash", - "tm:autotomize", "tm:block", "tm:brickbreak", "tm:brutalswing", @@ -241,19 +235,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", @@ -261,13 +250,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", @@ -275,9 +261,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..81565d8f69 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 } ] }, @@ -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 b88f28e023..7ed5d9bade 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json @@ -46,17 +46,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -87,8 +86,6 @@ "egg:wish", "tm:afteryou", "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", "tm:attract", "tm:calmmind", "tm:captivate", @@ -96,7 +93,6 @@ "tm:charm", "tm:covet", "tm:dazzlinggleam", - "tm:disable", "tm:disarmingvoice", "tm:drainingkiss", "tm:drainpunch", @@ -107,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", @@ -123,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..8aea6a0705 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 } ] }, @@ -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 d10c7cb6f8..7ec995f420 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 } ] }, @@ -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": [], @@ -200,10 +207,6 @@ "icebody", "h:sturdy" ], - "eggGroups": [ - "monster", - "mineral" - ], "baseStats": { "hp": 95, "attack": 127, @@ -212,30 +215,16 @@ "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": [ { "item": "cobblemon:never_melt_ice", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -267,8 +256,6 @@ "egg:sharpen", "tm:auroraveil", "tm:avalanche", - "tm:barrier", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -283,7 +270,6 @@ "tm:facade", "tm:gigaimpact", "tm:gyroball", - "tm:harden", "tm:hardpress", "tm:heavyslam", "tm:highhorsepower", @@ -297,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", @@ -313,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 08bbf10e51..bfd0e73ab1 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", @@ -63,7 +64,7 @@ "entries": [ { "item": "cobblemon:rindo_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -100,8 +101,6 @@ "tm:brutalswing", "tm:bulkup", "tm:bulldoze", - "tm:clamp", - "tm:crosschop", "tm:cut", "tm:dig", "tm:dive", @@ -117,7 +116,6 @@ "tm:fling", "tm:focusblast", "tm:furycutter", - "tm:furyswipes", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", @@ -135,7 +133,6 @@ "tm:mudshot", "tm:mudslap", "tm:naturepower", - "tm:nightslash", "tm:payback", "tm:poisonjab", "tm:poweruppunch", @@ -149,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", @@ -168,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 7557b1fe0b..e46dda5217 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": [ { @@ -173,7 +175,7 @@ { "id": "bergmite_avalugghisui", "variant": "level_up", - "result": "avalugg hisuian", + "result": "avalugg", "consumeHeldItem": false, "learnableMoves": [ "rockslide" @@ -212,108 +214,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", @@ -341,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/species/generation6/binacle.json b/common/src/main/resources/data/cobblemon/species/generation6/binacle.json index cc8981ad61..d64725d1f4 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", @@ -94,8 +95,6 @@ "tm:blizzard", "tm:brickbreak", "tm:bulldoze", - "tm:clamp", - "tm:crosschop", "tm:cut", "tm:dig", "tm:dualchop", @@ -107,7 +106,6 @@ "tm:falseswipe", "tm:fling", "tm:furycutter", - "tm:furyswipes", "tm:grassknot", "tm:helpinghand", "tm:honeclaws", @@ -119,7 +117,6 @@ "tm:mudshot", "tm:mudslap", "tm:naturepower", - "tm:nightslash", "tm:payback", "tm:poisonjab", "tm:poweruppunch", @@ -133,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", @@ -150,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..8c2d906339 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 } ] }, @@ -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 848ef0f3ab..b7e5a27157 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/carbink.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/carbink.json @@ -49,21 +49,20 @@ "height": 1.15, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -99,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", @@ -119,7 +115,6 @@ "tm:meteorbeam", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:naturepower", "tm:powergem", "tm:protect", @@ -131,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", @@ -146,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..ca7f3cc40e 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 } ] }, @@ -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..3602cc8ae2 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 } ] }, @@ -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 a304e14128..0f65c60860 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json @@ -49,13 +49,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -88,7 +87,6 @@ "tm:cut", "tm:dazzlinggleam", "tm:dig", - "tm:discharge", "tm:drainingkiss", "tm:eerieimpulse", "tm:electricterrain", @@ -96,7 +94,6 @@ "tm:electroweb", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:flash", "tm:fling", @@ -110,8 +107,6 @@ "tm:magnetrise", "tm:mistyterrain", "tm:naturalgift", - "tm:nuzzle", - "tm:paraboliccharge", "tm:playrough", "tm:protect", "tm:raindance", @@ -128,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..2af97412bc 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 } ] }, @@ -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 1a9d367e02..439c8b831d 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", @@ -79,7 +78,6 @@ "tm:charm", "tm:covet", "tm:dazzlinggleam", - "tm:diamondstorm", "tm:drainingkiss", "tm:earthpower", "tm:encore", @@ -88,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", @@ -108,7 +103,6 @@ "tm:meteorbeam", "tm:metronome", "tm:mistyexplosion", - "tm:moonblast", "tm:mysticalfire", "tm:naturepower", "tm:playrough", @@ -122,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", @@ -140,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": [ @@ -172,9 +199,6 @@ "magicbounce", "h:magicbounce" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 50, "attack": 160, @@ -183,120 +207,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/diggersby.json b/common/src/main/resources/data/cobblemon/species/generation6/diggersby.json index 45b23bf270..765f6e62e8 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 } ] }, @@ -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..3b3ce869df 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 } ] }, @@ -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..4d0dfef74b 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 } ] }, @@ -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 5808ab8911..72ceed06ed 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": [ @@ -73,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", @@ -89,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", @@ -116,7 +110,6 @@ "tm:rest", "tm:roleplay", "tm:safeguard", - "tm:scratch", "tm:shadowball", "tm:shockwave", "tm:signalbeam", @@ -130,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..514d276f2d 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 } ] }, @@ -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 44eeebdfd2..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": [ { @@ -184,114 +191,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 +223,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 +255,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 +287,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/fletchinder.json b/common/src/main/resources/data/cobblemon/species/generation6/fletchinder.json index fc51bd8c19..5c02272e8c 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 } ] }, @@ -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 ea359bb556..c2ba0a9824 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/floette.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/floette.json @@ -64,11 +64,11 @@ "amount": 2, "entries": [ { - "item": "minecraft:lily_of_the_valley" + "item": "minecraft:poppy" }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -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": [ @@ -183,117 +192,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 +221,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 +250,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 +279,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,10 +308,6 @@ "aspects": [ "flower-eternal" ], - "abilities": [ - "flowerveil", - "h:symbiosis" - ], "eggGroups": [ "undiscovered" ], @@ -758,20 +319,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": [ @@ -780,7 +328,7 @@ }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -798,6 +346,7 @@ "38:aromatherapy", "43:mistyterrain", "46:moonblast", + "50:lightofruin", "51:petaldance", "58:solarbeam", "egg:camouflage", @@ -808,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", @@ -825,7 +371,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:flash", "tm:gigadrain", "tm:grassknot", @@ -833,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", @@ -858,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 95e5a859aa..981134f299 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 } ] }, @@ -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": [], @@ -184,127 +196,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 +215,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 +234,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 +253,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/froakie.json b/common/src/main/resources/data/cobblemon/species/generation6/froakie.json index 27cee43c1a..ceaeb9b2b7 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 } ] }, @@ -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..24e4141a9e 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 } ] }, @@ -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 d70bf61379..59dd04c101 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": [ @@ -62,7 +61,7 @@ }, { "item": "cobblemon:silk_scarf", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -86,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", @@ -100,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", @@ -132,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": [ @@ -151,102 +159,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 +177,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 +195,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 +213,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 +231,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 +249,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 +267,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 +285,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 +303,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..89e4c2372b 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": [ @@ -56,7 +55,7 @@ }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -89,7 +88,6 @@ "tm:bulkup", "tm:bulldoze", "tm:bulletseed", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthquake", @@ -102,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", @@ -120,7 +114,6 @@ "tm:playrough", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:retaliate", "tm:roar", @@ -137,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 f97e377de9..870228ab4c 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": [ @@ -63,7 +62,7 @@ }, { "item": "cobblemon:haban_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -90,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", @@ -116,10 +109,8 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:feint", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:focusblast", "tm:focuspunch", @@ -133,7 +124,6 @@ "tm:irontail", "tm:knockoff", "tm:laserfocus", - "tm:lifedew", "tm:megakick", "tm:megapunch", "tm:muddywater", @@ -158,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": [], @@ -189,7 +202,6 @@ "hisuian_form" ], "aspects": [ - "hisuian", "hisuian" ], "abilities": [ @@ -197,9 +209,6 @@ "shellarmor", "h:gooey" ], - "eggGroups": [ - "dragon" - ], "baseStats": { "hp": 80, "attack": 100, @@ -208,26 +217,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": [ @@ -241,7 +236,7 @@ }, { "item": "cobblemon:bluk_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -270,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", @@ -293,10 +282,8 @@ "tm:earthquake", "tm:endure", "tm:facade", - "tm:feint", "tm:fireblast", "tm:firepunch", - "tm:flail", "tm:flamethrower", "tm:flashcannon", "tm:gigaimpact", @@ -310,7 +297,6 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:lifedew", "tm:muddywater", "tm:mudshot", "tm:outrage", @@ -322,7 +308,6 @@ "tm:rocktomb", "tm:sandstorm", "tm:scaryface", - "tm:shelter", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", @@ -332,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 928a809369..48b2664014 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": [ @@ -83,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", @@ -115,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": [ { @@ -184,92 +186,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..300830a973 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 } ] }, @@ -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": [], @@ -194,14 +215,6 @@ "aspects": [ "pumpkin-size-small" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 55, "attack": 85, @@ -210,114 +223,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 +244,6 @@ "aspects": [ "pumpkin-size-large" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 75, "attack": 95, @@ -354,114 +252,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 +273,6 @@ "aspects": [ "pumpkin-size-super" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 85, "attack": 100, @@ -498,114 +281,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..badfe093ca 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 } ] }, @@ -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": [], @@ -222,126 +229,6 @@ "eggGroups": [ "undiscovered" ], - "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", - "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" - ], "evolutions": [], "battleOnly": false }, @@ -376,142 +263,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..59a767b6cb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json @@ -49,21 +49,20 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -108,10 +107,8 @@ "tm:bulkup", "tm:closecombat", "tm:coaching", - "tm:crosschop", "tm:cut", "tm:defog", - "tm:detect", "tm:dig", "tm:drainpunch", "tm:dualchop", @@ -119,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", @@ -168,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", @@ -186,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 a9439e4bd1..63ac353605 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", @@ -77,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", @@ -98,7 +93,6 @@ "tm:flash", "tm:focusblast", "tm:gigaimpact", - "tm:glare", "tm:grassknot", "tm:hyperbeam", "tm:hypervoice", @@ -110,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", @@ -131,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 35edec3a3a..c0c7b750d3 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", @@ -72,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", @@ -113,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 65a254f9f0..c32258446f 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", @@ -71,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", @@ -97,10 +93,8 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:guardsplit", "tm:gunkshot", "tm:hyperbeam", - "tm:hyperspacehole", "tm:icepunch", "tm:knockoff", "tm:laserfocus", @@ -111,7 +105,6 @@ "tm:magicroom", "tm:nastyplot", "tm:phantomforce", - "tm:powersplit", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -153,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": [ @@ -174,13 +209,6 @@ "aspects": [ "unbound" ], - "abilities": [ - "magician", - "h:magician" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 80, "attack": 160, @@ -189,20 +217,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", @@ -221,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", @@ -247,10 +260,8 @@ "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:guardsplit", "tm:gunkshot", "tm:hyperbeam", - "tm:hyperspacefury", "tm:icepunch", "tm:knockoff", "tm:laserfocus", @@ -261,7 +272,6 @@ "tm:magicroom", "tm:nastyplot", "tm:phantomforce", - "tm:powersplit", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -303,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..cef35b6030 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": [ { @@ -190,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 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..0b0b717619 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 } ] }, @@ -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 7874060632..24f225b535 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": [ @@ -93,10 +92,8 @@ "tm:dig", "tm:doubleedge", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:fireblast", "tm:firefang", @@ -110,9 +107,7 @@ "tm:hypervoice", "tm:incinerate", "tm:irontail", - "tm:leer", "tm:mudslap", - "tm:nobleroar", "tm:overheat", "tm:payback", "tm:protect", @@ -130,7 +125,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -140,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..f093b21740 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 } ] }, @@ -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 3261e13e33..76a6d568f0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json @@ -43,13 +43,12 @@ "catchRate": 75, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:colbur_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -80,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", @@ -98,7 +94,6 @@ "tm:energyball", "tm:expandingforce", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:flash", "tm:gigaimpact", @@ -108,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", @@ -127,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", @@ -151,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": [], @@ -184,31 +205,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", @@ -236,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", @@ -253,9 +246,7 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", - "tm:fakeout", "tm:faketears", "tm:flash", "tm:futuresight", @@ -265,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", @@ -289,7 +278,6 @@ "tm:rest", "tm:roleplay", "tm:safeguard", - "tm:scratch", "tm:shadowball", "tm:shockwave", "tm:signalbeam", @@ -306,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..b41bfd5d55 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 } ] }, @@ -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 15900a3d41..754df0952d 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": [ @@ -90,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", @@ -109,7 +105,6 @@ "tm:echoedvoice", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:falseswipe", "tm:firepunch", @@ -122,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", @@ -145,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 7684efa743..a39e425a67 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": [ @@ -59,11 +58,11 @@ }, { "item": "cobblemon:mental_herb", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -96,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", @@ -122,7 +117,6 @@ "tm:embargo", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:falseswipe", "tm:firepunch", @@ -134,7 +128,6 @@ "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", - "tm:hammerarm", "tm:helpinghand", "tm:honeclaws", "tm:hyperbeam", @@ -142,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", @@ -172,10 +158,7 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:seismictoss", "tm:shadowclaw", - "tm:skyuppercut", - "tm:slash", "tm:sleeptalk", "tm:sludgebomb", "tm:snarl", @@ -183,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", @@ -198,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 72ed089502..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": [ { @@ -188,14 +208,6 @@ "aspects": [ "pumpkin-size-small" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 44, "attack": 66, @@ -204,103 +216,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 +245,6 @@ "aspects": [ "pumpkin-size-large" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 54, "attack": 66, @@ -345,103 +253,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 +282,6 @@ "aspects": [ "pumpkin-size-super" ], - "abilities": [ - "pickup", - "frisk", - "h:insomnia" - ], - "eggGroups": [ - "amorphous" - ], "baseStats": { "hp": 59, "attack": 66, @@ -486,103 +290,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..2819e64b75 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": [ @@ -58,11 +57,11 @@ }, { "item": "minecraft:blaze_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -97,10 +96,8 @@ "tm:dig", "tm:doubleedge", "tm:echoedvoice", - "tm:ember", "tm:endeavor", "tm:endure", - "tm:entrainment", "tm:facade", "tm:fireblast", "tm:firefang", @@ -116,9 +113,7 @@ "tm:hypervoice", "tm:incinerate", "tm:irontail", - "tm:leer", "tm:mudslap", - "tm:nobleroar", "tm:overheat", "tm:payback", "tm:protect", @@ -136,7 +131,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:temperflare", @@ -147,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..faa6f59605 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 } ] }, @@ -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 481074b002..f861a77147 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": [ @@ -85,7 +84,6 @@ "tm:bulkup", "tm:bulldoze", "tm:bulletseed", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:endeavor", @@ -96,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", @@ -112,7 +106,6 @@ "tm:playrough", "tm:protect", "tm:raindance", - "tm:razorleaf", "tm:rest", "tm:retaliate", "tm:roar", @@ -128,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 d659466770..1b33e0160a 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": [ @@ -62,7 +61,7 @@ }, { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -85,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", @@ -120,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": [ @@ -187,9 +189,6 @@ "shellarmor", "h:gooey" ], - "eggGroups": [ - "dragon" - ], "baseStats": { "hp": 58, "attack": 75, @@ -198,26 +197,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": [ @@ -231,7 +215,7 @@ }, { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -254,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", @@ -278,7 +255,6 @@ "tm:icespinner", "tm:ironhead", "tm:irontail", - "tm:lifedew", "tm:muddywater", "tm:mudshot", "tm:outrage", @@ -288,7 +264,6 @@ "tm:rockslide", "tm:rocktomb", "tm:sandstorm", - "tm:shelter", "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", @@ -296,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 0cacfc0b97..6f2c8cd16b 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": [ @@ -56,11 +55,11 @@ }, { "item": "minecraft:cake", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -88,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", @@ -104,7 +98,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:flamethrower", "tm:flash", @@ -117,7 +110,6 @@ "tm:magiccoat", "tm:metronome", "tm:mistyexplosion", - "tm:playnice", "tm:playrough", "tm:protect", "tm:psychic", @@ -127,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 ea9ab96a5b..10d6e4dccc 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": [ @@ -83,7 +82,6 @@ "egg:wish", "tm:afteryou", "tm:allyswitch", - "tm:aromatherapy", "tm:attract", "tm:calmmind", "tm:captivate", @@ -91,7 +89,6 @@ "tm:charm", "tm:covet", "tm:dazzlinggleam", - "tm:disable", "tm:disarmingvoice", "tm:drainingkiss", "tm:dreameater", @@ -101,9 +98,7 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", - "tm:flail", "tm:flash", "tm:flashcannon", "tm:gyroball", @@ -113,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 d70f645e79..8481a1af0d 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": [ @@ -87,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", @@ -102,7 +96,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:fairywind", "tm:faketears", "tm:flamethrower", "tm:flash", @@ -112,7 +105,6 @@ "tm:lightscreen", "tm:magiccoat", "tm:mistyexplosion", - "tm:playnice", "tm:playrough", "tm:protect", "tm:psychic", @@ -122,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 f06bd55975..2df4828358 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/sylveon.json @@ -47,17 +47,16 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:shiny_stone", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:fairy_feather", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -102,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", @@ -140,7 +132,6 @@ "tm:magiccoat", "tm:mistyexplosion", "tm:mistyterrain", - "tm:moonblast", "tm:mudslap", "tm:mysticalfire", "tm:naturalgift", @@ -150,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", @@ -167,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..dbf3c28fb3 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 } ] }, @@ -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..f246c93762 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 } ] }, @@ -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..c966136814 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 } ] }, @@ -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..22e4f94a43 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 } ] }, @@ -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 ca4ddbe700..d84882332b 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 } ] }, @@ -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": [], @@ -174,111 +180,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..d7aa431e2e 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", @@ -100,9 +99,7 @@ "tm:hydropump", "tm:hyperbeam", "tm:incinerate", - "tm:leer", "tm:liquidation", - "tm:mist", "tm:mistyterrain", "tm:mudshot", "tm:overheat", @@ -123,8 +120,6 @@ "tm:sludgewave", "tm:smackdown", "tm:solarbeam", - "tm:steameruption", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -135,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 8e4ff52b42..1a5c0a4276 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", @@ -72,8 +71,6 @@ "75:closecombat", "80:outrage", "85:gigaimpact", - "tm:aromatherapy", - "tm:aurorabeam", "tm:block", "tm:bodyslam", "tm:calmmind", @@ -89,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", @@ -123,7 +114,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:terrainpulse", @@ -131,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": [ @@ -152,115 +166,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/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 46aa147c7b..b135ab64f3 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", @@ -72,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", @@ -129,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": [ @@ -153,13 +169,6 @@ "aspects": [ "10-percent" ], - "abilities": [ - "aurabreak", - "h:aurabreak" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 54, "attack": 100, @@ -168,19 +177,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", @@ -207,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", @@ -230,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", @@ -262,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 @@ -285,16 +299,13 @@ "restricted" ], "aspects": [ - "10-percent", - "power-construct" + "power-construct", + "10-percent" ], "abilities": [ "powerconstruct", "h:powerconstruct" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 54, "attack": 100, @@ -303,19 +314,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", @@ -342,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", @@ -365,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", @@ -397,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 @@ -427,30 +443,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", @@ -477,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", @@ -500,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", @@ -532,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 @@ -561,9 +570,6 @@ "powerconstruct", "h:powerconstruct" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 216, "attack": 100, @@ -572,20 +578,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", @@ -612,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", @@ -635,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", @@ -667,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..772a13c9b6 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 } ] }, @@ -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..520cb376d8 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 } ] }, @@ -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 e8b82cd5c0..322d6df46d 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": [ @@ -77,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", @@ -90,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", @@ -133,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 82b648236a..e570130f2e 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": [ @@ -74,9 +73,6 @@ "egg:feint", "egg:grasswhistle", "egg:synthesis", - "tm:acupressure", - "tm:aromatherapy", - "tm:aromaticmist", "tm:bounce", "tm:bulletseed", "tm:charm", @@ -87,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", @@ -99,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..3c5c78e641 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 } ] }, @@ -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..7da8ba1398 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 } ] }, @@ -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 4b026756a9..a102f83679 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": [ @@ -84,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", @@ -131,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 15926e5ed5..905000e434 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": [ @@ -75,10 +74,8 @@ "60:heavyslam", "65:doubleedge", "70:skullbash", - "tm:absorb", "tm:acrobatics", "tm:airslash", - "tm:autotomize", "tm:block", "tm:bodyslam", "tm:brutalswing", @@ -99,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", @@ -117,7 +110,6 @@ "tm:seedbomb", "tm:selfdestruct", "tm:shockwave", - "tm:skullbash", "tm:sleeptalk", "tm:smackdown", "tm:smartstrike", @@ -128,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 1ce98cd000..77e41f84db 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": [ @@ -57,11 +56,11 @@ }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cell_battery", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -82,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", @@ -112,8 +108,6 @@ "tm:shockwave", "tm:skittersmack", "tm:sleeptalk", - "tm:spark", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -122,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..830c187ee5 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 } ] }, @@ -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 5613760cdc..c75e4bcc61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json @@ -48,14 +48,11 @@ "height": 1, "fixed": false }, - "behaviour": {}, "moves": [ "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 5e1815aa57..8c9ef401a8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json @@ -48,12 +48,9 @@ "height": 1, "fixed": false }, - "behaviour": {}, "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..3ff8438f1b 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 } ] }, @@ -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 b202d2a855..0d3bd89377 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 } ] }, @@ -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": [ @@ -228,124 +243,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..2c18f75cd2 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 } ] }, @@ -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": [], @@ -215,9 +240,6 @@ "overgrow", "h:scrappy" ], - "eggGroups": [ - "flying" - ], "baseStats": { "hp": 88, "attack": 112, @@ -226,26 +248,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", @@ -275,7 +277,6 @@ "tm:aerialace", "tm:aircutter", "tm:airslash", - "tm:astonish", "tm:aurasphere", "tm:batonpass", "tm:bravebird", @@ -296,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", @@ -319,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", @@ -333,7 +328,6 @@ "tm:scaryface", "tm:seedbomb", "tm:shadowclaw", - "tm:shadowsneak", "tm:sleeptalk", "tm:smackdown", "tm:solarbeam", @@ -343,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..970f73176a 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 } ] }, @@ -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..c1c184ea53 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 } ] }, @@ -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 d192eec5e7..a8cddb4b72 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": [ @@ -78,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", @@ -105,8 +101,6 @@ "tm:shockwave", "tm:skittersmack", "tm:sleeptalk", - "tm:spark", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -114,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 df9606e8f4..1e76dca78b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json @@ -47,13 +47,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:pecha_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -83,8 +82,6 @@ "egg:lastresort", "egg:thunderfang", "egg:yawn", - "tm:bide", - "tm:bite", "tm:block", "tm:bodyslam", "tm:bulldoze", @@ -106,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", @@ -138,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", @@ -151,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 021fe60aab..b156623897 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": [ @@ -80,8 +79,6 @@ "65:thrash", "70:gigaimpact", "tm:amnesia", - "tm:belch", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -93,8 +90,6 @@ "tm:dracometeor", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragonrage", - "tm:dragonrush", "tm:dragontail", "tm:drainpunch", "tm:dualchop", @@ -107,7 +102,6 @@ "tm:gastroacid", "tm:gigaimpact", "tm:gyroball", - "tm:hammerarm", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", @@ -136,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 fdd18ac2d0..a20a173e9c 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": 4, "entries": [ @@ -59,7 +58,7 @@ }, { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:roseli_berry", @@ -90,8 +89,6 @@ "egg:focuspunch", "tm:aerialace", "tm:aquatail", - "tm:autotomize", - "tm:bide", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", @@ -100,10 +97,8 @@ "tm:bulldoze", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:doubleedge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragondance", @@ -123,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", @@ -143,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", @@ -156,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..eff9131204 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 } ] }, @@ -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 1cc5283b48..55202aa98c 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": 3, "entries": [ @@ -85,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", @@ -111,9 +107,7 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:leer", "tm:lowkick", - "tm:nobleroar", "tm:outrage", "tm:payback", "tm:protect", @@ -131,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 7be11e98e5..670d4db99a 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": [ @@ -82,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", @@ -111,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..ec459f5600 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 } ] }, @@ -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 ed5ae48593..1eb98a2f3e 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": 5, "entries": [ @@ -60,7 +59,7 @@ }, { "item": "cobblemon:razor_claw", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:roseli_berry", @@ -96,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", @@ -144,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", @@ -170,7 +159,6 @@ "tm:screech", "tm:shadowclaw", "tm:shockwave", - "tm:skyuppercut", "tm:sleeptalk", "tm:stealthrock", "tm:stompingtantrum", @@ -178,7 +166,6 @@ "tm:sunnyday", "tm:superpower", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -187,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..d0b21721f4 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 } ] }, @@ -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 94d3f862f9..58412c3fbd 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": [ @@ -85,7 +84,6 @@ "tm:calmmind", "tm:chargebeam", "tm:confuseray", - "tm:confusion", "tm:cosmicpower", "tm:dazzlinggleam", "tm:defog", @@ -102,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", @@ -136,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..27f89b0e9a 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 } ] }, @@ -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 0e3d5e9659..6709323bdb 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": [ @@ -57,11 +56,11 @@ }, { "item": "cobblemon:hard_stone", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -91,10 +90,8 @@ "egg:odorsleuth", "egg:suckerpunch", "egg:thrash", - "tm:accelerock", "tm:agility", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", @@ -103,7 +100,6 @@ "tm:closecombat", "tm:covet", "tm:crunch", - "tm:crushclaw", "tm:dig", "tm:doubleedge", "tm:doubleteam", @@ -116,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", @@ -151,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": [], @@ -184,9 +199,6 @@ "vitalspirit", "h:noguard" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 85, "attack": 115, @@ -195,20 +207,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", @@ -235,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", @@ -262,7 +257,6 @@ "tm:foulplay", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hypervoice", "tm:irondefense", "tm:ironhead", @@ -271,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", @@ -290,9 +282,7 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:shadowclaw", @@ -305,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": [], @@ -340,9 +365,6 @@ "toughclaws", "h:toughclaws" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 75, "attack": 117, @@ -351,20 +373,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", @@ -396,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", @@ -421,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", @@ -443,9 +442,7 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", @@ -456,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 94ea27168d..316549af03 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", @@ -78,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", @@ -102,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", @@ -122,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", @@ -143,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", @@ -159,7 +145,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:synchronoise", "tm:takedown", "tm:terablast", "tm:thunderbolt", @@ -167,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": [ @@ -191,158 +210,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/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 bb246f8a01..ddf7b1ab65 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", @@ -82,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", @@ -103,7 +98,6 @@ "tm:hyperbeam", "tm:icepunch", "tm:ironhead", - "tm:jumpkick", "tm:knockoff", "tm:laserfocus", "tm:lastresort", @@ -118,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", @@ -146,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 18b91db93f..6caa077641 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/mimikyu.json @@ -51,17 +51,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:chesto_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -87,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", @@ -107,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", @@ -120,9 +114,7 @@ "tm:leechlife", "tm:lightscreen", "tm:magicroom", - "tm:mimic", "tm:mistyterrain", - "tm:nightmare", "tm:nightshade", "tm:painsplit", "tm:payback", @@ -135,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", @@ -160,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": [ @@ -182,35 +196,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", @@ -232,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", @@ -252,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", @@ -265,9 +245,7 @@ "tm:leechlife", "tm:lightscreen", "tm:magicroom", - "tm:mimic", "tm:mistyterrain", - "tm:nightmare", "tm:nightshade", "tm:painsplit", "tm:payback", @@ -280,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", @@ -305,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 3f3e4ea79e..7bece2e53c 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, @@ -147,13 +169,6 @@ "aspects": [ "meteor-form" ], - "abilities": [ - "shieldsdown", - "h:shieldsdown" - ], - "eggGroups": [ - "mineral" - ], "baseStats": { "hp": 60, "attack": 60, @@ -171,82 +186,17 @@ "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": [] } - ] + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:float_stone", + "percentage": 5.0 + } + ] + } } \ No newline at end of file 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..b2d4155b16 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": [ @@ -83,10 +82,8 @@ "egg:poisonpowder", "egg:spotlight", "egg:stunspore", - "tm:absorb", "tm:afteryou", "tm:amnesia", - "tm:astonish", "tm:confuseray", "tm:dazzlinggleam", "tm:drainingkiss", @@ -97,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", @@ -115,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..ea136d5b22 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 } ] }, @@ -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 5f573e94ea..93650778c7 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": [ @@ -77,7 +76,6 @@ "56:gastroacid", "63:toxic", "70:dragonrush", - "tm:acid", "tm:acrobatics", "tm:aerialace", "tm:aircutter", @@ -92,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", @@ -116,7 +110,6 @@ "tm:leechlife", "tm:nastyplot", "tm:outrage", - "tm:peck", "tm:pinmissile", "tm:poisonjab", "tm:protect", @@ -147,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 f00f6f6e2c..8c0f5bc684 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", @@ -71,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", @@ -106,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", @@ -131,7 +122,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:solarbeam", @@ -146,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": [ @@ -169,13 +194,6 @@ "aspects": [ "dusk-fusion" ], - "abilities": [ - "prismarmor", - "h:prismarmor" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 97, "attack": 157, @@ -193,10 +211,6 @@ "speed": 0 }, "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "moves": [ "1:moonlight", "1:morningsun", @@ -220,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", @@ -255,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", @@ -280,7 +286,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:solarbeam", @@ -296,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 @@ -320,13 +360,6 @@ "aspects": [ "dawn-fusion" ], - "abilities": [ - "prismarmor", - "h:prismarmor" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 97, "attack": 113, @@ -344,10 +377,6 @@ "speed": 0 }, "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 0, "moves": [ "1:moonlight", "1:morningsun", @@ -371,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", @@ -406,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", @@ -432,7 +453,6 @@ "tm:shadowclaw", "tm:shockwave", "tm:signalbeam", - "tm:slash", "tm:sleeptalk", "tm:smartstrike", "tm:solarbeam", @@ -447,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 @@ -476,9 +531,6 @@ "neuroforce", "h:neuroforce" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 97, "attack": 167, @@ -496,112 +548,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..99c378ea29 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": [ @@ -78,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", @@ -95,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", @@ -132,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 5082a905d6..bcf7bfe0ce 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json @@ -48,17 +48,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:wise_glasses", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:nanab_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -92,7 +91,6 @@ "tm:calmmind", "tm:chargebeam", "tm:chillingwater", - "tm:confusion", "tm:covet", "tm:dreameater", "tm:earthquake", @@ -102,9 +100,7 @@ "tm:endure", "tm:energyball", "tm:expandingforce", - "tm:extrasensory", "tm:facade", - "tm:feintattack", "tm:fling", "tm:focusblast", "tm:foulplay", @@ -114,7 +110,6 @@ "tm:hyperbeam", "tm:hypervoice", "tm:imprison", - "tm:instruct", "tm:knockoff", "tm:lastresort", "tm:lightscreen", @@ -160,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 68a468ac6b..5bf0a7a0b0 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": [ @@ -56,11 +55,11 @@ }, { "item": "minecraft:honey_bottle", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:pinap_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -101,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", @@ -139,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": [ @@ -163,121 +168,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 +187,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 +206,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 65a78007d3..b436a93a28 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": 4, "entries": [ @@ -58,11 +57,11 @@ }, { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:passho_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -87,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", @@ -99,7 +96,6 @@ "tm:chillingwater", "tm:confuseray", "tm:curse", - "tm:destinybond", "tm:earthpower", "tm:earthquake", "tm:embargo", @@ -111,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", @@ -134,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 4d61aeb9a6..e3e3daea75 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json @@ -46,17 +46,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:muscle_band", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:payapa_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -87,7 +86,6 @@ "tm:assurance", "tm:batonpass", "tm:beatup", - "tm:bestow", "tm:block", "tm:bodyslam", "tm:brickbreak", @@ -97,7 +95,6 @@ "tm:chillingwater", "tm:closecombat", "tm:coaching", - "tm:counter", "tm:curse", "tm:doubleedge", "tm:drainpunch", @@ -106,7 +103,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:feint", "tm:fling", "tm:focusblast", "tm:focusenergy", @@ -120,7 +116,6 @@ "tm:irontail", "tm:knockoff", "tm:laserfocus", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -128,8 +123,6 @@ "tm:painsplit", "tm:payback", "tm:protect", - "tm:quickattack", - "tm:quickguard", "tm:raindance", "tm:rest", "tm:retaliate", @@ -140,7 +133,6 @@ "tm:rocktomb", "tm:scaryface", "tm:seedbomb", - "tm:seismictoss", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", @@ -149,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 abe6beeaf7..2dc84db58e 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": [ @@ -87,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", @@ -125,7 +115,6 @@ "tm:sleeptalk", "tm:snatch", "tm:speedswap", - "tm:stomp", "tm:substitute", "tm:swift", "tm:taunt", @@ -133,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 e255c14c9b..453e9869ac 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": [ @@ -73,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", @@ -104,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..a3ec84f756 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 } ] }, @@ -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..5fffc81571 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 } ] }, @@ -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..a70664846d 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 } ] }, @@ -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 9741908de0..930f79284c 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": [ @@ -90,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", @@ -107,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", @@ -124,9 +118,7 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", @@ -137,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": [ { @@ -207,30 +221,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", @@ -251,7 +241,6 @@ "egg:odorsleuth", "egg:suckerpunch", "egg:thrash", - "tm:bite", "tm:bodyslam", "tm:bulldoze", "tm:charm", @@ -268,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", @@ -285,9 +271,7 @@ "tm:rockclimb", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", @@ -298,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 47b190e9b8..b379dd1219 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 } ] }, @@ -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": [ { @@ -196,120 +210,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/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..62b2b84c63 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 } ] }, @@ -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 0284368dd2..d1e7df01b9 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": 3, "entries": [ @@ -87,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", @@ -108,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", @@ -129,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 33c4d15675..3bf35bf345 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": [ @@ -59,7 +58,7 @@ }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -84,10 +83,8 @@ "egg:poisonpowder", "egg:spotlight", "egg:stunspore", - "tm:absorb", "tm:afteryou", "tm:amnesia", - "tm:astonish", "tm:chargebeam", "tm:confuseray", "tm:dazzlinggleam", @@ -101,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", @@ -121,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", @@ -136,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 3666e63489..235d4ad8fe 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", @@ -81,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", @@ -99,7 +95,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -113,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", @@ -144,7 +132,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -156,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": [], @@ -177,35 +201,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", @@ -236,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", @@ -254,7 +246,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -268,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", @@ -299,7 +283,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -311,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,35 +352,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", @@ -391,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", @@ -409,7 +397,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -423,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", @@ -454,7 +434,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -466,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 @@ -487,35 +503,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", @@ -546,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", @@ -564,7 +548,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -578,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", @@ -609,7 +585,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -621,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 @@ -642,35 +654,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", @@ -701,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", @@ -719,7 +699,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -733,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", @@ -764,7 +736,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -776,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 @@ -797,35 +805,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", @@ -856,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", @@ -874,7 +850,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -888,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", @@ -919,7 +887,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -931,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 @@ -952,35 +956,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", @@ -1011,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", @@ -1029,7 +1001,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1043,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", @@ -1074,7 +1038,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1086,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 @@ -1107,35 +1107,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", @@ -1166,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", @@ -1184,7 +1152,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1198,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", @@ -1229,7 +1189,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1241,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 @@ -1262,35 +1258,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", @@ -1321,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", @@ -1339,7 +1303,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1353,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", @@ -1384,7 +1340,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1396,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 @@ -1417,35 +1409,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", @@ -1476,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", @@ -1494,7 +1454,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1508,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", @@ -1539,7 +1491,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1551,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 @@ -1572,35 +1560,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", @@ -1631,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", @@ -1649,7 +1605,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1663,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", @@ -1694,7 +1642,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1706,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 @@ -1727,35 +1711,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", @@ -1786,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", @@ -1804,7 +1756,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1818,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", @@ -1849,7 +1793,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -1861,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 @@ -1882,35 +1862,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", @@ -1941,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", @@ -1959,7 +1907,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -1973,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", @@ -2004,7 +1944,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -2016,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 @@ -2037,35 +2013,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", @@ -2096,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", @@ -2114,7 +2058,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -2128,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", @@ -2159,7 +2095,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -2171,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 @@ -2192,35 +2164,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", @@ -2251,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", @@ -2269,7 +2209,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -2283,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", @@ -2314,7 +2246,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -2326,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 @@ -2347,35 +2315,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", @@ -2406,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", @@ -2424,7 +2360,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -2438,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", @@ -2469,7 +2397,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -2481,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 @@ -2502,35 +2466,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", @@ -2561,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", @@ -2579,7 +2511,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -2593,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", @@ -2624,7 +2548,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -2636,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 @@ -2657,35 +2617,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", @@ -2716,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", @@ -2734,7 +2662,6 @@ "tm:gigaimpact", "tm:grasspledge", "tm:hail", - "tm:healblock", "tm:heatwave", "tm:hyperbeam", "tm:hypervoice", @@ -2748,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", @@ -2779,7 +2699,6 @@ "tm:surf", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:tailwind", "tm:takedown", "tm:terablast", @@ -2791,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 9efa5055ba..3fdf37b98c 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", @@ -104,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", @@ -128,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 662b86a9e6..5f16352965 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": [ @@ -77,8 +76,6 @@ "65:stealthrock", "70:doubleedge", "tm:allyswitch", - "tm:autotomize", - "tm:bide", "tm:bind", "tm:block", "tm:bodypress", @@ -93,7 +90,6 @@ "tm:gigaimpact", "tm:gravity", "tm:gyroball", - "tm:harden", "tm:heatcrash", "tm:heavyslam", "tm:highhorsepower", @@ -113,7 +109,6 @@ "tm:rockblast", "tm:rockpolish", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:roleplay", "tm:safeguard", @@ -124,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 fe2c1db000..dc97597a74 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/steenee.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/steenee.json @@ -48,13 +48,12 @@ "height": 1.4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -78,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", @@ -109,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 0fcae7639b..fb3feac4bd 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", @@ -76,7 +75,6 @@ "tm:closecombat", "tm:darkestlariat", "tm:dazzlinggleam", - "tm:disable", "tm:dualchop", "tm:echoedvoice", "tm:endure", @@ -92,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", @@ -116,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", @@ -136,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 a474964dfb..0af293591c 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", @@ -69,7 +68,6 @@ "65:hydropump", "70:soak", "75:mistyterrain", - "tm:aquaring", "tm:blizzard", "tm:brine", "tm:calmmind", @@ -87,7 +85,6 @@ "tm:gravity", "tm:guardswap", "tm:haze", - "tm:healpulse", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", @@ -98,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", @@ -127,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 4a5ef42dff..9ab76b12a6 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", @@ -77,7 +76,6 @@ "tm:charge", "tm:dazzlinggleam", "tm:defog", - "tm:discharge", "tm:echoedvoice", "tm:eerieimpulse", "tm:electricterrain", @@ -85,7 +83,6 @@ "tm:electroweb", "tm:endure", "tm:facade", - "tm:fairywind", "tm:falseswipe", "tm:fly", "tm:gigaimpact", @@ -95,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", @@ -114,7 +107,6 @@ "tm:skyattack", "tm:skydrop", "tm:sleeptalk", - "tm:spark", "tm:steelwing", "tm:storedpower", "tm:substitute", @@ -126,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 67a76f5de2..579b2472f0 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", @@ -69,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", @@ -96,10 +89,7 @@ "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:meanlook", - "tm:moonblast", "tm:naturepower", - "tm:naturesmadness", "tm:playrough", "tm:powerswap", "tm:protect", @@ -109,7 +99,6 @@ "tm:psychocut", "tm:psychup", "tm:psyshock", - "tm:psywave", "tm:reflect", "tm:rest", "tm:safeguard", @@ -120,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 222e0b0f8c..b84d21e783 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json @@ -49,13 +49,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -88,9 +87,7 @@ "tm:charge", "tm:chargebeam", "tm:covet", - "tm:defensecurl", "tm:disarmingvoice", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -99,9 +96,6 @@ "tm:endeavor", "tm:endure", "tm:facade", - "tm:fakeout", - "tm:fellstinger", - "tm:flail", "tm:fling", "tm:gigaimpact", "tm:grassknot", @@ -113,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", @@ -127,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..b5e8a35280 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 } ] }, @@ -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..8bfe1b8e09 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 } ] }, @@ -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..f0b74d8bed 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 } ] }, @@ -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 042ae3d80a..314e8eb53b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tsareena.json @@ -48,13 +48,12 @@ "height": 2.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:persim_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -85,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", @@ -123,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", @@ -137,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..c63db6ccca 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 } ] }, @@ -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 ebf5bd5ffc..3da49fdba5 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", @@ -69,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", @@ -89,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", @@ -106,7 +98,6 @@ "tm:sunnyday", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:terrainpulse", @@ -114,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 c3a4da73c0..656665e9bd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json @@ -47,17 +47,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:wepear_berry", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:cell_battery", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -89,7 +88,6 @@ "tm:agility", "tm:airslash", "tm:batonpass", - "tm:bite", "tm:bugbite", "tm:bugbuzz", "tm:bulldoze", @@ -97,7 +95,6 @@ "tm:chargebeam", "tm:crunch", "tm:dig", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -108,8 +105,6 @@ "tm:flashcannon", "tm:fly", "tm:gigaimpact", - "tm:guillotine", - "tm:harden", "tm:hyperbeam", "tm:irondefense", "tm:laserfocus", @@ -132,8 +127,6 @@ "tm:skydrop", "tm:sleeptalk", "tm:solarbeam", - "tm:spark", - "tm:stickyweb", "tm:stringshot", "tm:strugglebug", "tm:substitute", @@ -144,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 91f801ea1d..c6772e068e 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 } ] }, @@ -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": [ @@ -159,13 +166,6 @@ "aspects": [ "school-form" ], - "abilities": [ - "schooling", - "h:schooling" - ], - "eggGroups": [ - "water_2" - ], "baseStats": { "hp": 45, "attack": 140, @@ -174,19 +174,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 +183,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..712ade3c17 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": [ @@ -82,7 +81,6 @@ "tm:charge", "tm:chargebeam", "tm:dazzlinggleam", - "tm:discharge", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -95,9 +93,6 @@ "tm:grassknot", "tm:gravity", "tm:hyperbeam", - "tm:hypnosis", - "tm:ingrain", - "tm:iondeluge", "tm:lightscreen", "tm:magiccoat", "tm:magnetrise", @@ -112,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 bf251d0ffa..5cb90ecb2f 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": [ @@ -81,8 +80,6 @@ "egg:lastresort", "egg:thunderfang", "egg:yawn", - "tm:bide", - "tm:bite", "tm:bulldoze", "tm:chillingwater", "tm:crunch", @@ -94,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", @@ -121,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 1d9b0ee17b..a7331af61f 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", @@ -81,7 +80,6 @@ "tm:charge", "tm:closecombat", "tm:coaching", - "tm:discharge", "tm:drainpunch", "tm:dualchop", "tm:echoedvoice", @@ -91,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", @@ -112,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", @@ -142,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 575320027e..ebd09e3fd7 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", @@ -64,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", @@ -80,7 +75,6 @@ "tm:flashcannon", "tm:gigaimpact", "tm:gyroball", - "tm:harden", "tm:headbutt", "tm:heavyslam", "tm:highhorsepower", @@ -102,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": [ @@ -128,98 +136,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..84f11f9f1c 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", @@ -56,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", @@ -69,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 4c9a37ceb0..4a410d5383 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 } ] }, @@ -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": [], @@ -164,106 +176,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 +195,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 +214,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 +233,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 +252,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 +271,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 +290,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 +309,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 +329,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..5ed8392cea 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": [ @@ -58,7 +57,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -85,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", @@ -105,7 +101,6 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:gyroball", "tm:headbutt", "tm:heavyslam", @@ -115,7 +110,6 @@ "tm:irondefense", "tm:ironhead", "tm:leafstorm", - "tm:leechseed", "tm:lightscreen", "tm:magicalleaf", "tm:outrage", @@ -123,7 +117,6 @@ "tm:pounce", "tm:protect", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -132,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": [], @@ -165,121 +178,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/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..83102736bb 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 } ] }, @@ -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..59a1c6593d 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 } ] }, @@ -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 ad976dff79..18c69596e3 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": [ @@ -64,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..04067f89b8 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 } ] }, @@ -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 1da3375a7f..b1638c1abe 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", @@ -69,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", @@ -87,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", @@ -133,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": [ @@ -159,9 +171,6 @@ "asoneglastrier", "h:asoneglastrier" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 165, @@ -179,11 +188,6 @@ "speed": 0 }, "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 100, - "behaviour": {}, "moves": [ "1:glaciallance", "1:tackle", @@ -218,7 +222,6 @@ "88:futuresight", "tm:agility", "tm:allyswitch", - "tm:aromatherapy", "tm:assurance", "tm:avalanche", "tm:batonpass", @@ -229,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", @@ -243,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", @@ -299,7 +291,6 @@ "tm:solarbeam", "tm:solarblade", "tm:speedswap", - "tm:stomp", "tm:stompingtantrum", "tm:storedpower", "tm:substitute", @@ -307,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", @@ -320,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 @@ -347,9 +367,6 @@ "asonespectrier", "h:asonespectrier" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 100, "attack": 85, @@ -367,11 +384,6 @@ "speed": 0 }, "baseExperienceYield": 340, - "experienceGroup": "slow", - "catchRate": 3, - "eggCycles": 120, - "baseFriendship": 100, - "behaviour": {}, "moves": [ "1:astralbarrage", "1:tackle", @@ -406,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", @@ -435,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", @@ -460,7 +462,6 @@ "tm:payday", "tm:phantomforce", "tm:pollenpuff", - "tm:pound", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -481,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..c91c22a935 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 } ] }, @@ -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 2a0e395957..fd7557daac 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 } ] }, @@ -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": [], @@ -162,105 +167,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/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 137dcddfc5..8a88ef663c 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": [ @@ -61,11 +60,11 @@ }, { "item": "minecraft:rabbit_foot", - "percentage": 25 + "percentage": 25.0 }, { "item": "cobblemon:charcoal_stick", - "percentage": 25 + "percentage": 25.0 } ] }, @@ -99,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", @@ -120,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", @@ -135,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", @@ -152,7 +141,6 @@ "tm:superfang", "tm:swift", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:temperflare", @@ -162,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": [], @@ -183,132 +199,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/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 62bd83b03f..70e5c91562 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 } ] }, @@ -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": [], @@ -175,126 +191,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..45e1437f2c 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 } ] }, @@ -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": [], @@ -181,127 +198,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..d606374e7d 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 } ] }, @@ -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": [], @@ -189,126 +203,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/corvisquire.json b/common/src/main/resources/data/cobblemon/species/generation8/corvisquire.json index d3a9f28e1c..5d2db2dcbe 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 } ] }, @@ -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 7621731306..e8b03c9fe8 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 } ] }, @@ -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": [ @@ -175,123 +183,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 +202,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/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..c813f5618d 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 } ] }, @@ -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 1b8593918c..c3fe6882ca 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json @@ -48,13 +48,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -71,7 +70,6 @@ "tm:bodypress", "tm:bugbuzz", "tm:calmmind", - "tm:confusion", "tm:endure", "tm:energyball", "tm:expandingforce", @@ -91,7 +89,6 @@ "tm:psychic", "tm:psychicterrain", "tm:psyshock", - "tm:recover", "tm:reflect", "tm:rest", "tm:safeguard", @@ -99,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..24d2f051de 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 } ] }, @@ -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..989ff58d46 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 } ] }, @@ -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 64e18147e0..a2fdf717bf 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 } ] }, @@ -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": [], @@ -183,138 +202,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/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..ff6650a2da 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 } ] }, @@ -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 30852ee5af..4909c681f7 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": [ @@ -100,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", @@ -117,7 +112,6 @@ "tm:rocktomb", "tm:scaryface", "tm:screech", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:solarbeam", @@ -131,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": [ { @@ -143,7 +159,7 @@ "electroshot" ], "requirements": [], - "requiredContext": "cobblemon:metal_alloy" + "requiredContext": "cobblemon:metal_coat" } ], "forms": [ @@ -164,112 +180,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 72ed6605d7..0aa21b478b 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" ], @@ -44,12 +45,20 @@ "catchRate": 60, "eggCycles": 25, "baseFriendship": 50, + "hitbox": { + "width": 1.1, + "height": 1.7, + "fixed": false + }, "behaviour": { "resting": { "canSleep": true, "light": "0-4" }, "moving": { + "walk": { + "walkSpeed": 0.15 + }, "swim": { "canSwimInWater": true, "canSwimInLava": false, @@ -77,7 +86,7 @@ }, { "item": "cobblemon:aspear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -102,10 +111,8 @@ "egg:soak", "tm:agility", "tm:amnesia", - "tm:aquaring", "tm:auroraveil", "tm:avalanche", - "tm:bellydrum", "tm:blizzard", "tm:bodyslam", "tm:brine", @@ -116,24 +123,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", @@ -141,17 +143,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": [ @@ -170,14 +184,11 @@ "aspects": [ "noice_face" ], - "abilities": [ - "iceface", - "h:iceface" - ], - "eggGroups": [ - "water_1", - "field" - ], + "hitbox": { + "width": 0.65, + "height": 1.35, + "fixed": false + }, "baseStats": { "hp": 75, "attack": 80, @@ -186,91 +197,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, "drops": { @@ -289,7 +215,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 6431889531..e42e9aac10 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": [ @@ -58,7 +57,7 @@ }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -82,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", @@ -95,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 ccd2b5d4cb..c6001c59fe 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", @@ -78,9 +77,7 @@ "tm:dragondance", "tm:dragonpulse", "tm:dragontail", - "tm:dynamaxcannon", "tm:endure", - "tm:eternabeam", "tm:facade", "tm:fireblast", "tm:firespin", @@ -100,7 +97,6 @@ "tm:poisontail", "tm:protect", "tm:raindance", - "tm:recover", "tm:reflect", "tm:rest", "tm:scaryface", @@ -117,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": [ @@ -139,13 +152,6 @@ "aspects": [ "eternamax" ], - "abilities": [ - "pressure", - "h:pressure" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 255, "attack": 115, @@ -154,89 +160,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/falinks.json b/common/src/main/resources/data/cobblemon/species/generation8/falinks.json index 989a20737e..1bcbed41ad 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 } ] }, @@ -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 9b1dc27fc8..c8c4d79c07 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": [ @@ -58,7 +57,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -88,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", @@ -108,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", @@ -134,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": [], @@ -157,113 +168,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..8f0d5ea410 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": [ @@ -57,11 +56,11 @@ }, { "item": "cobblemon:silver_powder", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:charti_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -90,7 +89,6 @@ "tm:acrobatics", "tm:airslash", "tm:attract", - "tm:aurorabeam", "tm:auroraveil", "tm:avalanche", "tm:blizzard", @@ -101,7 +99,6 @@ "tm:defog", "tm:endure", "tm:facade", - "tm:fairywind", "tm:featherdance", "tm:gigadrain", "tm:gigaimpact", @@ -118,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", @@ -132,7 +125,6 @@ "tm:sleeptalk", "tm:snowscape", "tm:strugglebug", - "tm:stunspore", "tm:substitute", "tm:swift", "tm:tailwind", @@ -141,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 26722de3d9..01a83880c5 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", @@ -73,7 +72,6 @@ "tm:crunch", "tm:curse", "tm:doubleedge", - "tm:doublekick", "tm:endure", "tm:facade", "tm:gigaimpact", @@ -82,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", @@ -99,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 e69f931454..677912bc2c 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": [ @@ -76,7 +75,6 @@ "egg:sleeppowder", "egg:stunspore", "egg:worryseed", - "tm:aromatherapy", "tm:bulletseed", "tm:charm", "tm:endure", @@ -86,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..9bc922723c 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 } ] }, @@ -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 7a940083cf..6ff4e24520 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": [ @@ -77,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", @@ -117,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 d3dbe3105d..83fb7fc1be 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 } ] }, @@ -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": [], @@ -178,131 +197,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..b5724211c8 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": [ @@ -59,7 +58,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -84,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", @@ -100,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", @@ -133,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 d98c39a85e..173c534aaf 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": [ @@ -76,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", @@ -91,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", @@ -122,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 f93331b002..f64de82133 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json @@ -49,13 +49,12 @@ "height": 4, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:babiri_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -82,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", @@ -101,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", @@ -145,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": [], @@ -167,125 +183,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..ecd1a4a909 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json @@ -48,13 +48,12 @@ "height": 1.2, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:babiri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -78,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", @@ -94,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", @@ -125,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 b94c482828..de52b79c75 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json @@ -50,13 +50,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:bluk_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -80,7 +79,6 @@ "egg:psychup", "tm:afteryou", "tm:allyswitch", - "tm:aromatherapy", "tm:bodyslam", "tm:calmmind", "tm:dazzlinggleam", @@ -91,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", @@ -105,9 +100,7 @@ "tm:metronome", "tm:mysticalfire", "tm:payday", - "tm:playnice", "tm:playrough", - "tm:powersplit", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -130,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": [ @@ -155,9 +173,6 @@ "synchronize", "h:psychicsurge" ], - "eggGroups": [ - "fairy" - ], "baseStats": { "hp": 70, "attack": 55, @@ -174,12 +189,6 @@ "special_defence": 2, "speed": 0 }, - "baseExperienceYield": 166, - "experienceGroup": "fast", - "catchRate": 30, - "eggCycles": 40, - "baseFriendship": 140, - "behaviour": {}, "moves": [ "1:storedpower", "1:playnice", @@ -200,7 +209,6 @@ "egg:psychup", "tm:alluringvoice", "tm:allyswitch", - "tm:aromatherapy", "tm:batonpass", "tm:bodyslam", "tm:calmmind", @@ -212,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", @@ -226,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", @@ -249,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 272f50556e..66585930e1 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 } ] }, @@ -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": [], @@ -183,139 +194,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..1a3faa94a9 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", @@ -70,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", @@ -85,7 +81,6 @@ "tm:helpinghand", "tm:icepunch", "tm:ironhead", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -107,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": [ { @@ -119,7 +129,7 @@ "wickedblow" ], "requirements": [], - "requiredContext": "cobblemon:scroll_of_darkness" + "requiredContext": "cobblemon:dusk_stone" }, { "id": "kubfu_urshifurapidstrike", @@ -130,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 220fab0d2d..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,37 +80,35 @@ "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": [ { "id": "milcery_alcremiestrawberryvanillacream", "variant": "level_up", "result": "alcremie decoration=strawberry cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -130,7 +128,7 @@ "id": "milcery_alcremielovevanillacream", "variant": "level_up", "result": "alcremie decoration=love cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -150,7 +148,7 @@ "id": "milcery_alcremieberryvanillacream", "variant": "level_up", "result": "alcremie decoration=berry cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -170,7 +168,7 @@ "id": "milcery_alcremieclovervanillacream", "variant": "level_up", "result": "alcremie decoration=clover cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -190,7 +188,7 @@ "id": "milcery_alcremieflowervanillacream", "variant": "level_up", "result": "alcremie decoration=flower cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -210,7 +208,7 @@ "id": "milcery_alcremiestarvanillacream", "variant": "level_up", "result": "alcremie decoration=star cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -230,7 +228,7 @@ "id": "milcery_alcremieribbonvanillacream", "variant": "level_up", "result": "alcremie decoration=ribbon cream=vanilla", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -390,7 +388,7 @@ "id": "milcery_alcremiestrawberrymatchacream", "variant": "level_up", "result": "alcremie decoration=strawberry cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -410,7 +408,7 @@ "id": "milcery_alcremielovematchacream", "variant": "level_up", "result": "alcremie decoration=love cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -430,7 +428,7 @@ "id": "milcery_alcremieberrymatchacream", "variant": "level_up", "result": "alcremie decoration=berry cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -450,7 +448,7 @@ "id": "milcery_alcremieclovermatchacream", "variant": "level_up", "result": "alcremie decoration=clover cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -470,7 +468,7 @@ "id": "milcery_alcremieflowermatchacream", "variant": "level_up", "result": "alcremie decoration=flower cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -490,7 +488,7 @@ "id": "milcery_alcremiestarmatchacream", "variant": "level_up", "result": "alcremie decoration=star cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -510,7 +508,7 @@ "id": "milcery_alcremieribbonmatchacream", "variant": "level_up", "result": "alcremie decoration=ribbon cream=matcha", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -670,7 +668,7 @@ "id": "milcery_alcremiestrawberrylemoncream", "variant": "level_up", "result": "alcremie decoration=strawberry cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -690,7 +688,7 @@ "id": "milcery_alcremielovelemoncream", "variant": "level_up", "result": "alcremie decoration=love cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -710,7 +708,7 @@ "id": "milcery_alcremieberrylemoncream", "variant": "level_up", "result": "alcremie decoration=berry cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -730,7 +728,7 @@ "id": "milcery_alcremiecloverlemoncream", "variant": "level_up", "result": "alcremie decoration=clover cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -750,7 +748,7 @@ "id": "milcery_alcremieflowerlemoncream", "variant": "level_up", "result": "alcremie decoration=flower cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -770,7 +768,7 @@ "id": "milcery_alcremiestarlemoncream", "variant": "level_up", "result": "alcremie decoration=star cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -790,7 +788,7 @@ "id": "milcery_alcremieribbonlemoncream", "variant": "level_up", "result": "alcremie decoration=ribbon cream=lemon", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -950,7 +948,7 @@ "id": "milcery_alcremiestrawberryrubyswirl", "variant": "level_up", "result": "alcremie decoration=strawberry cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -970,7 +968,7 @@ "id": "milcery_alcremieloverubyswirl", "variant": "level_up", "result": "alcremie decoration=love cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -990,7 +988,7 @@ "id": "milcery_alcremieberryrubyswirl", "variant": "level_up", "result": "alcremie decoration=berry cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1010,7 +1008,7 @@ "id": "milcery_alcremiecloverrubyswirl", "variant": "level_up", "result": "alcremie decoration=clover cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1030,7 +1028,7 @@ "id": "milcery_alcremieflowerrubyswirl", "variant": "level_up", "result": "alcremie decoration=flower cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1050,7 +1048,7 @@ "id": "milcery_alcremiestarrubyswirl", "variant": "level_up", "result": "alcremie decoration=star cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1070,7 +1068,7 @@ "id": "milcery_alcremieribbonrubyswirl", "variant": "level_up", "result": "alcremie decoration=ribbon cream=ruby_swirl", - "consumeHeldItem": true, + "consumeHeldItem": false, "learnableMoves": [ "decorate" ], @@ -1226,6 +1224,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", 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..50358d6b26 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 } ] }, @@ -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 fd4a3f22da..d2ed3b067e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json @@ -50,13 +50,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:roseli_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -85,9 +84,7 @@ "egg:tickle", "tm:agility", "tm:assurance", - "tm:aurawheel", "tm:batonpass", - "tm:bite", "tm:brickbreak", "tm:bulletseed", "tm:charge", @@ -102,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", @@ -130,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": [ @@ -173,131 +183,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..6aa6c04dd6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json @@ -50,13 +50,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:aspear_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -105,7 +104,6 @@ "tm:afteryou", "tm:allyswitch", "tm:avalanche", - "tm:barrier", "tm:batonpass", "tm:blizzard", "tm:block", @@ -114,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", @@ -166,7 +150,6 @@ "tm:psychicterrain", "tm:psyshock", "tm:raindance", - "tm:rapidspin", "tm:recycle", "tm:reflect", "tm:rest", @@ -175,7 +158,6 @@ "tm:screech", "tm:shadowball", "tm:skillswap", - "tm:slackoff", "tm:sleeptalk", "tm:solarbeam", "tm:stompingtantrum", @@ -184,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..f0e9a0658e 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 } ] }, @@ -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 a131d68df8..acdd9fe9ab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json @@ -48,13 +48,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:razz_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -87,7 +86,6 @@ "tm:bugbuzz", "tm:calmmind", "tm:confuseray", - "tm:confusion", "tm:endure", "tm:energyball", "tm:expandingforce", @@ -98,7 +96,6 @@ "tm:guardswap", "tm:helpinghand", "tm:hyperbeam", - "tm:hypnosis", "tm:imprison", "tm:infestation", "tm:irondefense", @@ -106,7 +103,6 @@ "tm:lightscreen", "tm:magiccoat", "tm:magicroom", - "tm:mirrorcoat", "tm:payback", "tm:powerswap", "tm:protect", @@ -115,7 +111,6 @@ "tm:psychicterrain", "tm:psychocut", "tm:psyshock", - "tm:recover", "tm:reflect", "tm:rest", "tm:safeguard", @@ -123,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": [], @@ -155,114 +170,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..066dcbcb92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/perrserker.json @@ -50,17 +50,16 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:razor_claw", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:wepear_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -105,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", @@ -127,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", @@ -140,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", @@ -158,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 3b081fbad1..fd36e24fb1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json @@ -49,13 +49,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:spell_tag", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -78,9 +77,6 @@ "66:curse", "egg:allyswitch", "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:astonish", "tm:batonpass", "tm:calmmind", "tm:confuseray", @@ -96,8 +92,6 @@ "tm:imprison", "tm:lightscreen", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:metronome", "tm:nastyplot", "tm:nightshade", @@ -113,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": [], @@ -148,107 +156,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/raboot.json b/common/src/main/resources/data/cobblemon/species/generation8/raboot.json index fa23b053d8..4d2a8766ae 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 } ] }, @@ -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 8a156ddb93..d84245b678 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", @@ -65,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", @@ -84,7 +80,6 @@ "tm:firefang", "tm:focusenergy", "tm:gigaimpact", - "tm:hammerarm", "tm:hyperbeam", "tm:icefang", "tm:laserfocus", @@ -101,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 b28e06412e..2d8f30729a 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", @@ -79,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", @@ -101,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 c61fcfc657..e3a8a1fc0b 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": [ @@ -58,7 +57,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 25 + "percentage": 25.0 } ] }, @@ -89,8 +88,6 @@ "tm:assurance", "tm:bodypress", "tm:bodyslam", - "tm:boomburst", - "tm:branchpoke", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", @@ -98,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", @@ -120,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", @@ -136,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", @@ -163,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": [], @@ -186,142 +200,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/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 51baf71492..25bdfa3759 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json @@ -50,13 +50,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -82,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", @@ -101,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", @@ -132,7 +123,6 @@ "tm:shadowball", "tm:shadowclaw", "tm:skillswap", - "tm:slam", "tm:sleeptalk", "tm:stealthrock", "tm:stoneedge", @@ -145,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 bb77d00a67..4dd9a3a740 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json @@ -48,13 +48,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:soft_sand", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -77,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", @@ -93,7 +89,6 @@ "tm:facade", "tm:firefang", "tm:gigaimpact", - "tm:glare", "tm:headbutt", "tm:highhorsepower", "tm:hurricane", @@ -101,7 +96,6 @@ "tm:irondefense", "tm:ironhead", "tm:lastresort", - "tm:minimize", "tm:mudshot", "tm:mudslap", "tm:outrage", @@ -111,7 +105,6 @@ "tm:rockblast", "tm:rockslide", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", @@ -119,8 +112,6 @@ "tm:scorchingsands", "tm:screech", "tm:skittersmack", - "tm:skullbash", - "tm:slam", "tm:sleeptalk", "tm:stealthrock", "tm:stoneedge", @@ -128,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": [], @@ -150,111 +163,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..d5837266ea 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": [ @@ -62,11 +61,11 @@ }, { "item": "minecraft:rabbit_foot", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:charcoal_stick", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -94,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", @@ -109,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 2cf54c4af2..ee32783d28 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": [ @@ -76,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", @@ -100,7 +94,6 @@ "tm:rockblast", "tm:rockslide", "tm:rocktomb", - "tm:sandattack", "tm:sandstorm", "tm:sandtomb", "tm:scaleshot", @@ -108,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 9c4a363495..acb3892398 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": [ @@ -74,9 +73,6 @@ "60:shellsmash", "egg:allyswitch", "tm:allyswitch", - "tm:aromatherapy", - "tm:aromaticmist", - "tm:astonish", "tm:batonpass", "tm:calmmind", "tm:confuseray", @@ -89,8 +85,6 @@ "tm:hex", "tm:imprison", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:metronome", "tm:nastyplot", "tm:nightshade", @@ -103,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": [ { @@ -147,95 +154,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..cb08a14345 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": [ @@ -66,7 +65,7 @@ }, { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -107,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", @@ -127,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", @@ -152,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 6c92b3d418..0cd2121d7d 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": [ @@ -76,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", @@ -104,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..85a777e753 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 } ] }, @@ -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 74851d6229..6a2eb7a71f 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", @@ -72,9 +71,7 @@ "tm:crunch", "tm:curse", "tm:darkpulse", - "tm:disable", "tm:doubleedge", - "tm:doublekick", "tm:drainingkiss", "tm:endure", "tm:facade", @@ -99,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..7d02f9869c 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 } ] }, @@ -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 f39a7dfaab..2ddc9ccee7 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": [ @@ -58,7 +57,7 @@ }, { "item": "cobblemon:miracle_seed", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -84,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", @@ -102,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", @@ -136,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 358c505a98..a12c9955e3 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": [ @@ -68,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": [ { @@ -101,7 +97,7 @@ }, { "variant": "properties", - "target": "nature=hardy" + "target": "toxel nature=hardy" } ] }, @@ -118,7 +114,7 @@ }, { "variant": "properties", - "target": "nature=brave" + "target": "toxel nature=brave" } ] }, @@ -135,7 +131,7 @@ }, { "variant": "properties", - "target": "nature=adamant" + "target": "toxel nature=adamant" } ] }, @@ -152,7 +148,7 @@ }, { "variant": "properties", - "target": "nature=naughty" + "target": "toxel nature=naughty" } ] }, @@ -169,7 +165,7 @@ }, { "variant": "properties", - "target": "nature=docile" + "target": "toxel nature=docile" } ] }, @@ -186,7 +182,7 @@ }, { "variant": "properties", - "target": "nature=impish" + "target": "toxel nature=impish" } ] }, @@ -203,7 +199,7 @@ }, { "variant": "properties", - "target": "nature=lax" + "target": "toxel nature=lax" } ] }, @@ -220,7 +216,7 @@ }, { "variant": "properties", - "target": "nature=hasty" + "target": "toxel nature=hasty" } ] }, @@ -237,7 +233,7 @@ }, { "variant": "properties", - "target": "nature=jolly" + "target": "toxel nature=jolly" } ] }, @@ -254,7 +250,7 @@ }, { "variant": "properties", - "target": "nature=naive" + "target": "toxel nature=naive" } ] }, @@ -271,7 +267,7 @@ }, { "variant": "properties", - "target": "nature=rash" + "target": "toxel nature=rash" } ] }, @@ -288,7 +284,7 @@ }, { "variant": "properties", - "target": "nature=sassy" + "target": "toxel nature=sassy" } ] }, @@ -307,7 +303,7 @@ }, { "variant": "properties", - "target": "nature=quirky" + "target": "toxel nature=quirky" } ] }, @@ -324,7 +320,7 @@ }, { "variant": "properties", - "target": "nature=lonely" + "target": "toxel nature=lonely" } ] }, @@ -341,7 +337,7 @@ }, { "variant": "properties", - "target": "nature=bold" + "target": "toxel nature=bold" } ] }, @@ -358,7 +354,7 @@ }, { "variant": "properties", - "target": "nature=relaxed" + "target": "toxel nature=relaxed" } ] }, @@ -375,7 +371,7 @@ }, { "variant": "properties", - "target": "nature=timid" + "target": "toxel nature=timid" } ] }, @@ -392,7 +388,7 @@ }, { "variant": "properties", - "target": "nature=serious" + "target": "toxel nature=serious" } ] }, @@ -409,7 +405,7 @@ }, { "variant": "properties", - "target": "nature=modest" + "target": "toxel nature=modest" } ] }, @@ -426,7 +422,7 @@ }, { "variant": "properties", - "target": "nature=mild" + "target": "toxel nature=mild" } ] }, @@ -443,7 +439,7 @@ }, { "variant": "properties", - "target": "nature=quiet" + "target": "toxel nature=quiet" } ] }, @@ -460,7 +456,7 @@ }, { "variant": "properties", - "target": "nature=bashful" + "target": "toxel nature=bashful" } ] }, @@ -477,7 +473,7 @@ }, { "variant": "properties", - "target": "nature=calm" + "target": "toxel nature=calm" } ] }, @@ -494,7 +490,7 @@ }, { "variant": "properties", - "target": "nature=gentle" + "target": "toxel nature=gentle" } ] }, @@ -513,7 +509,7 @@ }, { "variant": "properties", - "target": "nature=careful" + "target": "toxel nature=careful" } ] } 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..43666a770f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json @@ -50,13 +50,12 @@ "height": 1, "fixed": false }, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -86,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", @@ -105,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", @@ -133,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", @@ -147,7 +134,6 @@ "tm:swift", "tm:takedown", "tm:taunt", - "tm:tearfullook", "tm:terablast", "tm:thief", "tm:throatchop", @@ -155,7 +141,6 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:toxic", "tm:toxicspikes", @@ -163,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": [], @@ -189,31 +200,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", @@ -240,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", @@ -259,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", @@ -293,7 +268,6 @@ "tm:sludgebomb", "tm:sludgewave", "tm:snarl", - "tm:spark", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -301,7 +275,6 @@ "tm:swift", "tm:takedown", "tm:taunt", - "tm:tearfullook", "tm:terablast", "tm:thief", "tm:throatchop", @@ -309,7 +282,6 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:toxic", "tm:toxicspikes", @@ -318,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": [], @@ -339,145 +337,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 +359,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", @@ -556,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", @@ -575,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", @@ -609,7 +436,6 @@ "tm:sludgebomb", "tm:sludgewave", "tm:snarl", - "tm:spark", "tm:storedpower", "tm:substitute", "tm:sunnyday", @@ -617,7 +443,6 @@ "tm:swift", "tm:takedown", "tm:taunt", - "tm:tearfullook", "tm:terablast", "tm:thief", "tm:throatchop", @@ -625,7 +450,6 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderpunch", - "tm:thundershock", "tm:thunderwave", "tm:toxic", "tm:toxicspikes", @@ -634,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 395f5e8d6f..9ad0cb3b07 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", @@ -80,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", @@ -105,7 +101,6 @@ "tm:irondefense", "tm:ironhead", "tm:lashout", - "tm:leer", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -138,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": [], @@ -162,35 +186,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", @@ -211,7 +206,6 @@ "52:focuspunch", "tm:acrobatics", "tm:aerialace", - "tm:aquajet", "tm:aurasphere", "tm:bodypress", "tm:bodyslam", @@ -221,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", @@ -243,7 +234,6 @@ "tm:icespinner", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:lowsweep", @@ -264,7 +254,6 @@ "tm:stoneedge", "tm:substitute", "tm:superpower", - "tm:surgingstrikes", "tm:swift", "tm:swordsdance", "tm:takedown", @@ -276,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": [], @@ -297,130 +312,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 +334,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", @@ -492,7 +358,6 @@ "52:focuspunch", "tm:acrobatics", "tm:aerialace", - "tm:aquajet", "tm:aurasphere", "tm:bodypress", "tm:bodyslam", @@ -502,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", @@ -524,7 +386,6 @@ "tm:icespinner", "tm:irondefense", "tm:ironhead", - "tm:leer", "tm:liquidation", "tm:lowkick", "tm:lowsweep", @@ -545,7 +406,6 @@ "tm:stoneedge", "tm:substitute", "tm:superpower", - "tm:surgingstrikes", "tm:swift", "tm:swordsdance", "tm:takedown", @@ -557,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 db65623200..18874a6271 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": [ @@ -82,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", @@ -101,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 64318539d0..1240936d9c 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": [ @@ -78,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", @@ -91,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", @@ -113,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 bd59da428c..e1bec47f59 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", @@ -70,7 +69,6 @@ "tm:agility", "tm:airslash", "tm:assurance", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -87,7 +85,6 @@ "tm:focusenergy", "tm:gigaimpact", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:icefang", @@ -98,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", @@ -127,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": [ @@ -149,13 +165,6 @@ "aspects": [ "crowned" ], - "abilities": [ - "intrepidsword", - "h:intrepidsword" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 92, "attack": 150, @@ -164,108 +173,17 @@ "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": [ - { - "item": "minecraft:diamond_sword" - } - ] - }, - "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 } - ] + ], + "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..08861e3496 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", @@ -67,7 +66,6 @@ "77:closecombat", "88:gigaimpact", "tm:agility", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -86,7 +84,6 @@ "tm:guardswap", "tm:heavyslam", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:icefang", @@ -96,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", @@ -115,7 +109,6 @@ "tm:safeguard", "tm:sandstorm", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:solarbeam", @@ -129,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": [ @@ -153,13 +169,6 @@ "aspects": [ "crowned" ], - "abilities": [ - "dauntlessshield", - "h:dauntlessshield" - ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 92, "attack": 120, @@ -168,112 +177,17 @@ "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": [ - { - "item": "cobblemon:ability_shield" - } - ] - }, - "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 } - ] + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:ability_shield" + } + ] + } } \ No newline at end of file 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..b3a2b6b44f 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", @@ -72,7 +71,6 @@ "tm:aerialace", "tm:assurance", "tm:bind", - "tm:bite", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -91,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", @@ -125,7 +118,6 @@ "tm:rockslide", "tm:rocktomb", "tm:scaryface", - "tm:scratch", "tm:seedbomb", "tm:sleeptalk", "tm:snarl", @@ -143,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": [ @@ -168,134 +186,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..ebee32958e 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 } ] }, @@ -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": [], @@ -176,14 +187,6 @@ "aspects": [ "female" ], - "abilities": [ - "swiftswim", - "adaptability", - "h:moldbreaker" - ], - "eggGroups": [ - "water_2" - ], "baseStats": { "hp": 120, "attack": 92, @@ -192,113 +195,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..caa0e90a13 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", @@ -65,7 +64,6 @@ "75:springtidestorm", "tm:agility", "tm:alluringvoice", - "tm:astonish", "tm:bodyslam", "tm:calmmind", "tm:dazzlinggleam", @@ -73,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", @@ -103,7 +96,6 @@ "tm:scaryface", "tm:sleeptalk", "tm:sludgebomb", - "tm:springtidestorm", "tm:substitute", "tm:sunnyday", "tm:superpower", @@ -115,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": [ @@ -140,9 +154,6 @@ "overcoat", "h:overcoat" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 74, "attack": 115, @@ -151,92 +162,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/kleavor.json b/common/src/main/resources/data/cobblemon/species/generation8a/kleavor.json index 0bd817d9de..d51b20cc7d 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 } ] }, @@ -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..327045c3df 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 } ] }, @@ -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 ff908e34eb..8b6b8f6f8a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/sneasler.json @@ -51,21 +51,20 @@ "height": 2.5, "fixed": false }, - "behaviour": {}, "drops": { "amount": 3, "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 } ] }, @@ -101,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", @@ -122,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", @@ -152,7 +140,6 @@ "tm:substitute", "tm:sunnyday", "tm:swift", - "tm:switcheroo", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -166,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 08405a7083..4ddcb950d4 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": [ @@ -59,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 } ] }, @@ -108,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", @@ -130,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", @@ -165,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", @@ -178,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": [], @@ -215,9 +229,6 @@ "mindseye", "h:mindseye" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 113, "attack": 70, @@ -235,11 +246,7 @@ "speed": 0 }, "baseExperienceYield": 278, - "experienceGroup": "medium_fast", "catchRate": 5, - "eggCycles": 20, - "baseFriendship": 50, - "behaviour": {}, "moves": [ "1:scratch", "1:leer", @@ -260,7 +267,6 @@ "70:bloodmoon", "tm:avalanche", "tm:bellydrum", - "tm:bloodmoon", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", @@ -282,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", @@ -312,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", @@ -335,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..a67fdba959 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 } ] }, @@ -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..5c60445132 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 } ] }, @@ -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 e93dfa57c7..de07f75ac7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json @@ -41,17 +41,16 @@ "catchRate": 45, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:big_root", - "percentage": 10 + "percentage": 10.0 }, { "item": "cobblemon:kebia_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -77,7 +76,6 @@ "egg:strengthsap", "egg:synthesis", "egg:weatherball", - "tm:absorb", "tm:alluringvoice", "tm:bulletseed", "tm:charm", @@ -87,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", @@ -118,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 b26b7b9b75..633656a30d 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", @@ -75,7 +74,6 @@ "tm:dragonpulse", "tm:dragontail", "tm:earthquake", - "tm:electroshot", "tm:endure", "tm:facade", "tm:flashcannon", @@ -89,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", @@ -106,7 +100,6 @@ "tm:rocksmash", "tm:rocktomb", "tm:scaryface", - "tm:slash", "tm:sleeptalk", "tm:smackdown", "tm:snarl", @@ -120,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 495eb9a9c0..60b27960fc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json @@ -42,13 +42,12 @@ "catchRate": 25, "eggCycles": 40, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -72,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", @@ -105,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..5d4e008cdb 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 } ] }, @@ -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 0ddf0e4706..98bd9445cb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json @@ -43,13 +43,12 @@ "catchRate": 10, "eggCycles": 40, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:haban_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -78,7 +77,6 @@ "tm:aerialace", "tm:aquatail", "tm:avalanche", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -89,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", @@ -126,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..0a053c9d6b 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 } ] }, @@ -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 3875e80aa8..c80a9c33f1 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": [ @@ -55,7 +54,7 @@ }, { "item": "cobblemon:razz_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -105,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", @@ -140,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 c68f8ec7d3..d1c1fff7e2 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": 5, "entries": [ @@ -55,7 +54,7 @@ }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -80,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", @@ -101,8 +96,6 @@ "tm:hyperbeam", "tm:infestation", "tm:leafstorm", - "tm:leechseed", - "tm:megadrain", "tm:nightshade", "tm:painsplit", "tm:phantomforce", @@ -110,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 678fd89a99..d180ade897 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": 3, "entries": [ @@ -80,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", @@ -99,8 +94,6 @@ "tm:hex", "tm:infestation", "tm:leafstorm", - "tm:leechseed", - "tm:megadrain", "tm:nightshade", "tm:painsplit", "tm:phantomforce", @@ -108,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 194a680f10..ae63ed2055 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", @@ -60,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", @@ -79,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", @@ -107,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 b6fcd55b8e..71d570d901 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": [ @@ -73,7 +72,6 @@ "egg:ragepowder", "egg:rollout", "egg:worryseed", - "tm:bite", "tm:bulletseed", "tm:crunch", "tm:endeavor", @@ -84,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", @@ -111,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..e32f5a5ca8 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 } ] }, @@ -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..e0829c9046 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 } ] }, @@ -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..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, @@ -91,12 +92,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 +103,6 @@ "tm:heatwave", "tm:helpinghand", "tm:incinerate", - "tm:lavaplume", - "tm:leer", "tm:nightshade", "tm:overheat", "tm:protect", @@ -119,7 +113,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 e82bc13023..2ea72030ed 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", @@ -78,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", @@ -107,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 08df9277ea..8a1e199dd1 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", @@ -67,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", @@ -94,7 +87,6 @@ "tm:psychic", "tm:reflect", "tm:rest", - "tm:ruination", "tm:scaryface", "tm:sleeptalk", "tm:snarl", @@ -107,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..53c1085503 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 } ] }, @@ -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..12f16da364 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 } ] }, @@ -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 de78bfb7fe..bc4f131ad2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json @@ -41,13 +41,12 @@ "catchRate": 190, "eggCycles": 30, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:haban_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -74,7 +73,6 @@ "tm:aerialace", "tm:agility", "tm:aquatail", - "tm:bite", "tm:bodyslam", "tm:breakingswipe", "tm:crunch", @@ -83,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", @@ -103,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", @@ -125,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..be51dca710 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 } ] }, @@ -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 fbf3096321..bcf1f2ed6d 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", @@ -65,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", @@ -84,7 +79,6 @@ "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:growth", "tm:gyroball", "tm:hyperbeam", "tm:infestation", @@ -93,7 +87,6 @@ "tm:pollenpuff", "tm:pounce", "tm:protect", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -104,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 7dfeb26313..586c7e57c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json @@ -41,17 +41,16 @@ "catchRate": 120, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:big_root", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:kebia_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -73,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..4a1c3f369a 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 } ] }, @@ -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 27fbbe60c4..89ea612c0f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json @@ -43,17 +43,16 @@ "catchRate": 45, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:rocky_helmet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -92,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", @@ -119,10 +111,8 @@ "tm:endure", "tm:facade", "tm:fireblast", - "tm:flail", "tm:flamethrower", "tm:gigaimpact", - "tm:glare", "tm:gyroball", "tm:headbutt", "tm:heavyslam", @@ -130,7 +120,6 @@ "tm:hex", "tm:hurricane", "tm:hyperbeam", - "tm:hyperdrill", "tm:hypervoice", "tm:icebeam", "tm:icespinner", @@ -145,8 +134,6 @@ "tm:pounce", "tm:protect", "tm:psychup", - "tm:pursuit", - "tm:rage", "tm:raindance", "tm:rest", "tm:rockslide", @@ -179,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": [], @@ -203,164 +226,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/espathra.json b/common/src/main/resources/data/cobblemon/species/generation9/espathra.json index 8189e4c68a..2e7f1c0af8 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 } ] }, @@ -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 24019e5468..1983855d36 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": [ @@ -59,11 +58,11 @@ }, { "item": "cobblemon:razor_fang", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:persim_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -101,7 +100,6 @@ "tm:allyswitch", "tm:amnesia", "tm:assurance", - "tm:astonish", "tm:batonpass", "tm:beatup", "tm:bodyslam", @@ -109,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", @@ -138,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", @@ -153,7 +143,6 @@ "tm:psychup", "tm:psyshock", "tm:raindance", - "tm:razorwind", "tm:reflect", "tm:rest", "tm:roar", @@ -161,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", @@ -177,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 0469fe3d14..4a09725119 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": [ @@ -82,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", @@ -97,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", @@ -128,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..969d142d80 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 } ] }, @@ -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..cbb746bf8d 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 } ] }, @@ -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 5068e8d97f..c88d04a7d6 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": [ @@ -73,7 +72,6 @@ "77:painsplit", "84:moonblast", "91:perishsong", - "tm:astonish", "tm:calmmind", "tm:chargebeam", "tm:charm", @@ -93,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", @@ -121,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 b6b140cfa3..94d6c8d39f 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": [ @@ -72,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", @@ -102,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..e6715f941d 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 } ] }, @@ -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..39a40a0b8b 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 } ] }, @@ -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 fdf6ac9f3c..5dd5cd413a 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", @@ -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": [ { @@ -277,9 +278,6 @@ "runaway", "h:runaway" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 45, "attack": 30, @@ -288,19 +286,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 +302,9 @@ "swimSpeed": 0.3, "canSwimInWater": false, "canBreatheUnderwater": true - } + }, + "wanderChance": 500, + "canLook": false }, "resting": { "canSleep": true, @@ -332,28 +319,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/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..b040e95c97 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 } ] }, @@ -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 656d342ecc..f64607c0e5 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", @@ -65,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", @@ -93,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", @@ -115,7 +103,6 @@ "tm:sleeptalk", "tm:smartstrike", "tm:snarl", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", @@ -124,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..61651600dd 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 } ] }, @@ -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 1a39fbbc7b..04bde2383a 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", @@ -67,7 +66,6 @@ "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:defensecurl", "tm:dig", "tm:doubleedge", "tm:earthpower", @@ -78,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", @@ -94,7 +89,6 @@ "tm:playrough", "tm:protect", "tm:psyshock", - "tm:rapidspin", "tm:rest", "tm:reversal", "tm:roar", @@ -118,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 6603dd9473..ea1c6ff36a 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": [ @@ -86,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", @@ -122,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 6b6360a5f4..b3834f44b9 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": [ @@ -54,7 +53,7 @@ }, { "item": "cobblemon:kasib_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -83,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", @@ -123,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", @@ -138,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 1648c93f4b..9df6371f3b 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", @@ -68,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", @@ -88,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", @@ -109,7 +102,6 @@ "tm:powerwhip", "tm:protect", "tm:raindance", - "tm:recover", "tm:recycle", "tm:reflect", "tm:rest", @@ -120,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 5c8a938d35..58f7851a8f 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", @@ -68,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", @@ -109,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 fe1722d231..6d5452a1fc 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", @@ -67,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", @@ -84,8 +81,6 @@ "tm:icespinner", "tm:icywind", "tm:playrough", - "tm:powdersnow", - "tm:present", "tm:protect", "tm:raindance", "tm:rest", @@ -99,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 d3029f144c..2900de6c72 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", @@ -67,7 +66,6 @@ "tm:brickbreak", "tm:bulldoze", "tm:calmmind", - "tm:confusion", "tm:doubleedge", "tm:electricterrain", "tm:endure", @@ -82,8 +80,6 @@ "tm:hyperbeam", "tm:irondefense", "tm:ironhead", - "tm:leer", - "tm:metalburst", "tm:metalclaw", "tm:metalsound", "tm:protect", @@ -91,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", @@ -104,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 d8a4e30ef9..fff4b78fea 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", @@ -62,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", @@ -100,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 c1af3b3b69..3cdbaa4876 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", @@ -70,7 +69,6 @@ "tm:crunch", "tm:darkpulse", "tm:doubleedge", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonpulse", "tm:dragontail", @@ -116,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 68ab0f6c73..c914b9c156 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", @@ -70,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", @@ -84,7 +80,6 @@ "tm:flareblitz", "tm:flashcannon", "tm:gigaimpact", - "tm:gust", "tm:heatwave", "tm:helpinghand", "tm:hurricane", @@ -93,7 +88,6 @@ "tm:lunge", "tm:metalsound", "tm:meteorbeam", - "tm:morningsun", "tm:overheat", "tm:pounce", "tm:protect", @@ -113,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 efa3b84802..bf2be5895d 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", @@ -62,7 +61,6 @@ "77:stealthrock", "84:stoneedge", "91:gigaimpact", - "tm:bite", "tm:blizzard", "tm:bodypress", "tm:bodyslam", @@ -111,7 +109,6 @@ "tm:rest", "tm:rockblast", "tm:rockslide", - "tm:rockthrow", "tm:rocktomb", "tm:sandstorm", "tm:sandtomb", @@ -137,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 2652704ad4..8fc2c6b26d 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", @@ -63,7 +62,6 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", - "tm:defensecurl", "tm:doubleedge", "tm:earthpower", "tm:earthquake", @@ -77,7 +75,6 @@ "tm:hardpress", "tm:heavyslam", "tm:highhorsepower", - "tm:hornattack", "tm:hyperbeam", "tm:icefang", "tm:icespinner", @@ -89,7 +86,6 @@ "tm:mudshot", "tm:mudslap", "tm:protect", - "tm:rapidspin", "tm:rest", "tm:rockslide", "tm:rocktomb", @@ -111,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 72e94d12a8..2d55c7e0c8 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", @@ -73,8 +72,6 @@ "tm:coaching", "tm:confuseray", "tm:dazzlinggleam", - "tm:destinybond", - "tm:disable", "tm:doubleteam", "tm:drainpunch", "tm:electricterrain", @@ -83,7 +80,6 @@ "tm:energyball", "tm:expandingforce", "tm:falseswipe", - "tm:feint", "tm:firepunch", "tm:fling", "tm:focusblast", @@ -95,7 +91,6 @@ "tm:hex", "tm:hyperbeam", "tm:hypervoice", - "tm:hypnosis", "tm:icepunch", "tm:icywind", "tm:imprison", @@ -107,8 +102,6 @@ "tm:magicalleaf", "tm:metronome", "tm:mistyterrain", - "tm:moonblast", - "tm:nightslash", "tm:poisonjab", "tm:protect", "tm:psybeam", @@ -117,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", @@ -140,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..42d4486733 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 } ] }, @@ -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 310bd11b7a..b21c3b6c00 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json @@ -42,17 +42,16 @@ "catchRate": 25, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 2, "entries": [ { "item": "cobblemon:rocky_helmet", - "percentage": 5 + "percentage": 5.0 }, { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -90,7 +89,6 @@ "tm:endure", "tm:facade", "tm:falseswipe", - "tm:feintattack", "tm:flashcannon", "tm:fling", "tm:focusblast", @@ -98,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", @@ -124,9 +114,7 @@ "tm:rocktomb", "tm:sandstorm", "tm:scaryface", - "tm:scratch", "tm:shadowclaw", - "tm:slash", "tm:sleeptalk", "tm:snarl", "tm:spite", @@ -144,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..e24aefa77d 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 } ] }, @@ -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 f546ddb737..6f9f857b29 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", @@ -71,8 +70,6 @@ "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:collisioncourse", - "tm:counter", "tm:crunch", "tm:dig", "tm:doubleedge", @@ -132,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 f7357ce3e9..65e3aae16f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json @@ -41,13 +41,12 @@ "catchRate": 30, "eggCycles": 20, "baseFriendship": 0, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:coba_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -76,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", @@ -115,7 +106,6 @@ "tm:suckerpunch", "tm:sunnyday", "tm:swordsdance", - "tm:tackle", "tm:takedown", "tm:taunt", "tm:terablast", @@ -123,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 aa139d41f6..c58f73cad7 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": [ @@ -62,7 +61,7 @@ }, { "item": "cobblemon:tanga_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -88,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", @@ -110,10 +106,7 @@ "tm:hyperbeam", "tm:hypervoice", "tm:icefang", - "tm:jawlock", "tm:lashout", - "tm:leer", - "tm:lick", "tm:outrage", "tm:painsplit", "tm:payback", @@ -132,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 d3495055bf..5486a077b5 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": [ @@ -86,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", @@ -103,10 +100,7 @@ "tm:helpinghand", "tm:honeclaws", "tm:icefang", - "tm:jawlock", "tm:lashout", - "tm:leer", - "tm:lick", "tm:payback", "tm:playrough", "tm:protect", @@ -122,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 a0e2c4af89..a567c0d8f3 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 } ] }, @@ -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": [], @@ -167,115 +174,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/meowscarada.json b/common/src/main/resources/data/cobblemon/species/generation9/meowscarada.json index 9b7e46170f..9072197120 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 } ] }, @@ -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 ec6a6d00ef..86ce243b08 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", @@ -70,9 +69,7 @@ "tm:confuseray", "tm:crunch", "tm:dazzlinggleam", - "tm:discharge", "tm:dracometeor", - "tm:dragonbreath", "tm:dragoncheer", "tm:dragonclaw", "tm:dragonpulse", @@ -80,7 +77,6 @@ "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", - "tm:electrodrift", "tm:endure", "tm:facade", "tm:flashcannon", @@ -90,10 +86,8 @@ "tm:hyperbeam", "tm:lightscreen", "tm:metalsound", - "tm:mirrorcoat", "tm:outrage", "tm:overheat", - "tm:paraboliccharge", "tm:powergem", "tm:protect", "tm:reflect", @@ -111,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 7459638837..9af88cc1ca 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", @@ -60,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", @@ -83,7 +78,6 @@ "tm:mudslap", "tm:nastyplot", "tm:nightshade", - "tm:partingshot", "tm:poisonjab", "tm:poltergeist", "tm:protect", @@ -94,7 +88,6 @@ "tm:psychup", "tm:psyshock", "tm:rest", - "tm:scratch", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", @@ -112,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..7fcf621bbd 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 } ] }, @@ -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 71767ec65c..0706810b65 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": [ @@ -68,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", @@ -90,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 2f66a4f6e4..006593010d 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", @@ -67,8 +66,6 @@ "tm:brickbreak", "tm:bulletseed", "tm:charm", - "tm:counter", - "tm:doublekick", "tm:encore", "tm:endure", "tm:energyball", @@ -76,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", @@ -105,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", @@ -123,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": [ @@ -150,114 +158,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 +183,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 +208,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 +226,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 +253,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 +280,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 +307,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..c63616fe03 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": [ @@ -60,7 +59,7 @@ }, { "item": "cobblemon:oran_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -85,7 +84,6 @@ "egg:stockpile", "egg:stuffcheeks", "egg:swallow", - "tm:belch", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -118,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": [], @@ -160,9 +172,6 @@ "gluttony", "h:thickfat" ], - "eggGroups": [ - "field" - ], "baseStats": { "hp": 115, "attack": 90, @@ -171,19 +180,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", @@ -205,7 +201,6 @@ "egg:stockpile", "egg:stuffcheeks", "egg:swallow", - "tm:belch", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -238,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 7f5132725f..099b05ce6f 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", @@ -56,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", @@ -76,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", @@ -92,7 +87,6 @@ "tm:lowsweep", "tm:metalclaw", "tm:outrage", - "tm:poisonfang", "tm:poisonjab", "tm:poisontail", "tm:protect", @@ -120,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 0832bd3829..d6e7ef9344 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": [ @@ -50,7 +49,7 @@ }, { "item": "cobblemon:shuca_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -75,7 +74,6 @@ "tm:bodypress", "tm:bodyslam", "tm:bulldoze", - "tm:coil", "tm:curse", "tm:dig", "tm:doubleedge", @@ -85,7 +83,6 @@ "tm:facade", "tm:flashcannon", "tm:gigaimpact", - "tm:harden", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", @@ -93,7 +90,6 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", - "tm:metalburst", "tm:metalsound", "tm:mudshot", "tm:mudslap", @@ -104,7 +100,6 @@ "tm:rocktomb", "tm:sandstorm", "tm:sandtomb", - "tm:shedtail", "tm:sleeptalk", "tm:smackdown", "tm:spikes", @@ -112,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 a91421864d..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": [], @@ -181,14 +195,6 @@ "aspects": [ "hero-form" ], - "abilities": [ - "zerotohero", - "h:zerotohero" - ], - "eggGroups": [ - "field", - "water_2" - ], "baseStats": { "hp": 100, "attack": 160, @@ -197,20 +203,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 +211,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 } } }, @@ -246,9 +243,7 @@ "61:wavecrash", "tm:acrobatics", "tm:agility", - "tm:aquajet", "tm:aquatail", - "tm:astonish", "tm:aurasphere", "tm:blizzard", "tm:bodyslam", @@ -261,7 +256,6 @@ "tm:counter", "tm:disarmingvoice", "tm:dive", - "tm:doublehit", "tm:drainingkiss", "tm:drainpunch", "tm:encore", @@ -285,9 +279,7 @@ "tm:icepunch", "tm:icywind", "tm:ironhead", - "tm:jetpunch", "tm:liquidation", - "tm:mist", "tm:outrage", "tm:protect", "tm:psychup", @@ -296,7 +288,6 @@ "tm:reversal", "tm:sleeptalk", "tm:substitute", - "tm:supersonic", "tm:surf", "tm:swift", "tm:takedown", @@ -305,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 2ce171d3ab..65b29048b8 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": [ @@ -73,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", @@ -115,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 c02b335b14..22d2fc2a07 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json @@ -42,13 +42,12 @@ "catchRate": 80, "eggCycles": 15, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -74,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", @@ -124,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 a5c061232b..270214a269 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json @@ -42,13 +42,12 @@ "catchRate": 45, "eggCycles": 15, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:cheri_berry", - "percentage": 10 + "percentage": 10.0 } ] }, @@ -77,9 +76,7 @@ "egg:sweetkiss", "egg:wish", "tm:agility", - "tm:armthrust", "tm:batonpass", - "tm:bite", "tm:bodypress", "tm:brickbreak", "tm:bulkup", @@ -90,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", @@ -145,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 094c3532d7..602864ce67 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", @@ -61,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 725290ae5a..df8e09de1c 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": [ @@ -68,8 +67,6 @@ "48:shadowball", "54:memento", "60:leafstorm", - "tm:absorb", - "tm:astonish", "tm:calmmind", "tm:curse", "tm:endure", @@ -81,10 +78,7 @@ "tm:imprison", "tm:irondefense", "tm:leafstorm", - "tm:lifedew", "tm:magicalleaf", - "tm:megadrain", - "tm:memento", "tm:nastyplot", "tm:nightshade", "tm:painsplit", @@ -92,7 +86,6 @@ "tm:poltergeist", "tm:protect", "tm:psychup", - "tm:ragepowder", "tm:reflect", "tm:rest", "tm:scald", @@ -100,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": [ { @@ -137,89 +142,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/quaquaval.json b/common/src/main/resources/data/cobblemon/species/generation9/quaquaval.json index 129f6776a5..36fa8e2b2c 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 } ] }, @@ -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..233f85b5b8 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 } ] }, @@ -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..b430b6ed2e 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 } ] }, @@ -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 6504c355c1..1ff9fa3c41 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": [ @@ -78,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", @@ -102,7 +98,6 @@ "tm:leechlife", "tm:lightscreen", "tm:lunge", - "tm:memento", "tm:mudshot", "tm:mudslap", "tm:poltergeist", @@ -117,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", @@ -136,7 +128,6 @@ "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:tackle", "tm:takedown", "tm:terablast", "tm:thief", @@ -144,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 ea51b781eb..2b4fbfa2d6 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", @@ -70,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", @@ -99,7 +95,6 @@ "tm:sleeptalk", "tm:snarl", "tm:solarbeam", - "tm:stomp", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", @@ -109,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 50e7f87fd2..90454ad548 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": [ @@ -67,7 +66,6 @@ "tm:bugbite", "tm:bugbuzz", "tm:cosmicpower", - "tm:defensecurl", "tm:dig", "tm:endure", "tm:facade", @@ -76,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..ac7f6e849f 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 } ] }, @@ -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 258fa03e45..9704ec3124 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", @@ -68,7 +67,6 @@ "tm:acrobatics", "tm:aerialace", "tm:airslash", - "tm:bite", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", @@ -78,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", @@ -103,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", @@ -132,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 fb8c83ef6f..0c52fd5fa7 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", @@ -67,7 +66,6 @@ "tm:bulldoze", "tm:charge", "tm:chargebeam", - "tm:discharge", "tm:earthpower", "tm:earthquake", "tm:eerieimpulse", @@ -84,9 +82,7 @@ "tm:hyperbeam", "tm:irondefense", "tm:lightscreen", - "tm:magneticflux", "tm:metalsound", - "tm:mirrorcoat", "tm:mudshot", "tm:powergem", "tm:protect", @@ -97,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 f7986fe417..1502e2b9da 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": [ @@ -52,7 +51,7 @@ }, { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -79,7 +78,6 @@ "egg:ragepowder", "egg:rollout", "egg:worryseed", - "tm:bite", "tm:bulletseed", "tm:burningjealousy", "tm:crunch", @@ -95,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", @@ -117,7 +108,6 @@ "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", - "tm:spicyextract", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", @@ -129,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 6ed9785292..00e6b777ba 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", @@ -63,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", @@ -90,7 +86,6 @@ "tm:grassknot", "tm:gyroball", "tm:helpinghand", - "tm:howl", "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", @@ -101,10 +96,7 @@ "tm:metronome", "tm:mistyexplosion", "tm:mistyterrain", - "tm:nobleroar", - "tm:perishsong", "tm:playrough", - "tm:pound", "tm:protect", "tm:psybeam", "tm:psychic", @@ -120,7 +112,6 @@ "tm:rocktomb", "tm:sandstorm", "tm:scaryface", - "tm:sing", "tm:sleeptalk", "tm:snowscape", "tm:stealthrock", @@ -139,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 db47d7f67b..2d6aff6d87 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json @@ -44,13 +44,12 @@ "catchRate": 60, "eggCycles": 20, "baseFriendship": 50, - "behaviour": {}, "drops": { "amount": 1, "entries": [ { "item": "cobblemon:rawst_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -69,8 +68,6 @@ "48:shadowball", "54:memento", "60:leafstorm", - "tm:absorb", - "tm:astonish", "tm:calmmind", "tm:curse", "tm:endure", @@ -83,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", @@ -95,7 +88,6 @@ "tm:poltergeist", "tm:protect", "tm:psychup", - "tm:ragepowder", "tm:reflect", "tm:rest", "tm:scald", @@ -103,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": [], @@ -130,93 +134,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/skeledirge.json b/common/src/main/resources/data/cobblemon/species/generation9/skeledirge.json index b7c549ce2a..d2918156e8 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 } ] }, @@ -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 c380c7e080..9da61c61cc 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", @@ -75,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", @@ -94,8 +90,6 @@ "tm:lowkick", "tm:lowsweep", "tm:lunge", - "tm:morningsun", - "tm:poisonpowder", "tm:protect", "tm:raindance", "tm:rest", @@ -103,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 eec08961d1..2a0450ff53 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": [ @@ -73,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 d4cf454560..fc7a31b07c 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": [ @@ -82,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", @@ -100,7 +95,6 @@ "tm:leechlife", "tm:lowkick", "tm:lunge", - "tm:memento", "tm:painsplit", "tm:poisonjab", "tm:pounce", @@ -111,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", @@ -131,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..1204086f2a 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 } ] }, @@ -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 d51fae79f9..a6419db87a 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 } ] }, @@ -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": [ @@ -162,105 +169,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 +193,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 +217,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/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 10c9a9545a..f63c1a9003 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": [ @@ -90,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", @@ -112,8 +107,6 @@ "tm:mudshot", "tm:mudslap", "tm:playrough", - "tm:populationbomb", - "tm:pound", "tm:protect", "tm:raindance", "tm:rest", @@ -124,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 144f1a96b0..faec38f35a 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": [ @@ -79,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", @@ -93,7 +88,6 @@ "tm:knockoff", "tm:leechlife", "tm:lunge", - "tm:memento", "tm:poisonjab", "tm:pounce", "tm:protect", @@ -103,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 425d1b953b..5cc74d4e29 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 } ] }, @@ -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": [ @@ -152,87 +154,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 +173,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..36c2d0a06a 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", @@ -91,7 +90,6 @@ "tm:powergem", "tm:protect", "tm:raindance", - "tm:rapidspin", "tm:rest", "tm:roar", "tm:rockpolish", @@ -107,7 +105,6 @@ "tm:supercellslam", "tm:surf", "tm:takedown", - "tm:terastarstorm", "tm:thunder", "tm:thunderbolt", "tm:toxic", @@ -115,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": [ @@ -141,9 +162,6 @@ "terashell", "h:terashell" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 95, "attack": 95, @@ -161,84 +179,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 +203,6 @@ "teraformzero", "h:teraformzero" ], - "eggGroups": [ - "undiscovered" - ], "baseStats": { "hp": 160, "attack": 105, @@ -283,85 +220,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..dc9573df52 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", @@ -72,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", @@ -87,7 +83,6 @@ "tm:rest", "tm:rockslide", "tm:rocktomb", - "tm:ruination", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", @@ -96,7 +91,6 @@ "tm:spikes", "tm:spite", "tm:stealthrock", - "tm:stomp", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", @@ -104,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..2c927e242b 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 } ] }, @@ -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..8204b067a6 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 } ] }, @@ -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 af15eeef55..712ac4d945 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": [ @@ -81,9 +80,7 @@ "egg:rapidspin", "egg:tickle", "egg:toxic", - "tm:absorb", "tm:acidspray", - "tm:acupressure", "tm:bulletseed", "tm:confuseray", "tm:dazzlinggleam", @@ -96,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", @@ -124,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 8afd4d450c..a6bd17b2ce 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": [ @@ -51,7 +50,7 @@ }, { "item": "cobblemon:yache_berry", - "percentage": 5 + "percentage": 5.0 } ] }, @@ -82,9 +81,7 @@ "egg:rapidspin", "egg:tickle", "egg:toxic", - "tm:absorb", "tm:acidspray", - "tm:acupressure", "tm:bulletseed", "tm:confuseray", "tm:dazzlinggleam", @@ -98,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", @@ -129,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..01f67b3683 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 } ] }, @@ -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 113073775f..1484bf1ffb 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", @@ -63,7 +62,6 @@ "65:grassyterrain", "70:knockoff", "75:leafstorm", - "tm:absorb", "tm:bodypress", "tm:bodyslam", "tm:bulletseed", @@ -76,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", @@ -106,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_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" 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/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}}" 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}}" 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/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 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/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/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/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
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 | 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 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/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) 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 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) diff --git a/utilityscripts/cobblemon_spawn_csv_to_json.py b/utilityscripts/cobblemon_spawn_csv_to_json.py index 0c92884381..18868420f6 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' @@ -402,26 +414,30 @@ 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" + 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 +709,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():