From d593f6e42648a0f46542d0fb34420ef07031433a Mon Sep 17 00:00:00 2001 From: soupbag Date: Mon, 1 Dec 2025 22:13:37 -0800 Subject: [PATCH 1/5] Updated species files, misc fixes - resolves player vs player battles crashing overall due to code in meltanbox - adds pt_br from #118 1.6 branch, thanks ednzinho! - adds species and spawns changes from cobb 1.6 #119 - let cobblemon handle the species and spawns for pokemon they added models for from 1.7.0 - adds updated cobblemon species files as of 1.7.1 and set to implemented for gens - adjusts ub spawnrates to account for new end spawns - reverts pokemon uuid random since it wasn't the issue - note: revert jade orb commit to fix compile error in testing - bumped mod version - updated changelog draft :skull: --- CHANGELOG.md | 210 +- .../common/world/item/PokemonStoringItem.kt | 2 +- .../common/world/item/legends/MeltanBox.kt | 6 +- .../assets/generations_core/lang/pt_br.json | 3416 +++++++++++++++++ .../spawn_pool_world/0165_ledyba.json | 26 - .../spawn_pool_world/0166_ledian.json | 26 - .../spawn_pool_world/0175_togepi.json | 31 - .../spawn_pool_world/0176_togetic.json | 31 - .../spawn_pool_world/0183_marill.json | 26 - .../spawn_pool_world/0184_azumarill.json | 26 - .../spawn_pool_world/0187_hoppip.json | 25 - .../spawn_pool_world/0188_skiploom.json | 25 - .../spawn_pool_world/0189_jumpluff.json | 25 - .../spawn_pool_world/0191_sunkern.json | 25 - .../spawn_pool_world/0192_sunflora.json | 25 - .../spawn_pool_world/0201_unown.json | 26 - .../spawn_pool_world/0202_wobbuffet.json | 30 - .../spawn_pool_world/0203_girafarig.json | 25 - .../spawn_pool_world/0206_dunsparce.json | 30 - .../spawn_pool_world/0222_corsola.json | 45 - .../spawn_pool_world/0223_remoraid.json | 25 - .../spawn_pool_world/0224_octillery.json | 25 - .../spawn_pool_world/0225_delibird.json | 24 - .../spawn_pool_world/0226_mantine.json | 25 - .../spawn_pool_world/0228_houndour.json | 24 - .../spawn_pool_world/0229_houndoom.json | 24 - .../spawn_pool_world/0287_slakoth.json | 25 - .../spawn_pool_world/0288_vigoroth.json | 25 - .../spawn_pool_world/0289_slaking.json | 25 - .../spawn_pool_world/0298_azurill.json | 26 - .../spawn_pool_world/0307_meditite.json | 24 - .../spawn_pool_world/0308_medicham.json | 24 - .../spawn_pool_world/0309_electrike.json | 25 - .../spawn_pool_world/0310_manectric.json | 25 - .../spawn_pool_world/0325_spoink.json | 25 - .../spawn_pool_world/0326_grumpig.json | 25 - .../spawn_pool_world/0333_swablu.json | 25 - .../spawn_pool_world/0334_altaria.json | 25 - .../spawn_pool_world/0341_corphish.json | 25 - .../spawn_pool_world/0342_crawdaunt.json | 25 - .../spawn_pool_world/0349_feebas.json | 25 - .../spawn_pool_world/0350_milotic.json | 25 - .../spawn_pool_world/0352_kecleon.json | 25 - .../spawn_pool_world/0353_shuppet.json | 25 - .../spawn_pool_world/0354_banette.json | 25 - .../spawn_pool_world/0359_absol.json | 24 - .../spawn_pool_world/0360_wynaut.json | 30 - .../spawn_pool_world/0361_snorunt.json | 30 - .../spawn_pool_world/0362_glalie.json | 30 - .../spawn_pool_world/0363_spheal.json | 25 - .../spawn_pool_world/0364_sealeo.json | 25 - .../spawn_pool_world/0365_walrein.json | 25 - .../spawn_pool_world/0366_clampearl.json | 25 - .../spawn_pool_world/0371_bagon.json | 24 - .../spawn_pool_world/0372_shelgon.json | 24 - .../spawn_pool_world/0373_salamence.json | 24 - .../spawn_pool_world/0422_shellos.json | 25 - .../spawn_pool_world/0423_gastrodon.json | 25 - .../spawn_pool_world/0431_glameow.json | 27 - .../spawn_pool_world/0432_purugly.json | 27 - .../spawn_pool_world/0436_bronzor.json | 25 - .../spawn_pool_world/0437_bronzong.json | 25 - .../spawn_pool_world/0451_skorupi.json | 25 - .../spawn_pool_world/0452_drapion.json | 25 - .../spawn_pool_world/0453_croagunk.json | 25 - .../spawn_pool_world/0454_toxicroak.json | 25 - .../spawn_pool_world/0456_finneon.json | 25 - .../spawn_pool_world/0457_lumineon.json | 25 - .../spawn_pool_world/0458_mantyke.json | 25 - .../spawn_pool_world/0468_togekiss.json | 31 - .../spawn_pool_world/0478_froslass.json | 30 - .../spawn_pool_world/0479_rotom.json | 26 - .../spawn_pool_world/0493_arceus.json | 2 +- .../spawn_pool_world/0509_purrloin.json | 25 - .../spawn_pool_world/0510_liepard.json | 25 - .../spawn_pool_world/0511_pansage.json | 25 - .../spawn_pool_world/0512_simisage.json | 25 - .../spawn_pool_world/0513_pansear.json | 25 - .../spawn_pool_world/0514_simisear.json | 25 - .../spawn_pool_world/0515_panpour.json | 25 - .../spawn_pool_world/0516_simipour.json | 25 - .../spawn_pool_world/0517_munna.json | 25 - .../spawn_pool_world/0518_musharna.json | 25 - .../spawn_pool_world/0522_blitzle.json | 25 - .../spawn_pool_world/0523_zebstrika.json | 25 - .../spawn_pool_world/0529_drilbur.json | 25 - .../spawn_pool_world/0530_excadrill.json | 25 - .../spawn_pool_world/0540_sewaddle.json | 25 - .../spawn_pool_world/0541_swadloon.json | 25 - .../spawn_pool_world/0542_leavanny.json | 25 - .../spawn_pool_world/0559_scraggy.json | 25 - .../spawn_pool_world/0560_scrafty.json | 25 - .../spawn_pool_world/0568_trubbish.json | 25 - .../spawn_pool_world/0569_garbodor.json | 25 - .../spawn_pool_world/0572_minccino.json | 25 - .../spawn_pool_world/0573_cinccino.json | 25 - .../spawn_pool_world/0574_gothita.json | 27 - .../spawn_pool_world/0575_gothorita.json | 27 - .../spawn_pool_world/0576_gothitelle.json | 27 - .../spawn_pool_world/0577_solosis.json | 27 - .../spawn_pool_world/0578_duosion.json | 27 - .../spawn_pool_world/0579_reuniclus.json | 27 - .../spawn_pool_world/0580_ducklett.json | 25 - .../spawn_pool_world/0581_swanna.json | 25 - .../spawn_pool_world/0582_vanillite.json | 25 - .../spawn_pool_world/0583_vanillish.json | 25 - .../spawn_pool_world/0584_vanilluxe.json | 25 - .../spawn_pool_world/0588_karrablast.json | 25 - .../spawn_pool_world/0589_escavalier.json | 25 - .../spawn_pool_world/0590_foongus.json | 26 - .../spawn_pool_world/0591_amoonguss.json | 26 - .../cobblemon/spawn_pool_world/0610_axew.json | 32 - .../spawn_pool_world/0611_fraxure.json | 32 - .../spawn_pool_world/0612_haxorus.json | 32 - .../spawn_pool_world/0616_shelmet.json | 25 - .../spawn_pool_world/0617_accelgor.json | 25 - .../spawn_pool_world/0618_stunfisk.json | 43 - .../spawn_pool_world/0619_mienfoo.json | 25 - .../spawn_pool_world/0620_mienshao.json | 25 - .../spawn_pool_world/0621_druddigon.json | 32 - .../spawn_pool_world/0627_rufflet.json | 25 - .../spawn_pool_world/0628_braviary.json | 43 - .../spawn_pool_world/0672_skiddo.json | 25 - .../spawn_pool_world/0673_gogoat.json | 25 - .../spawn_pool_world/0676_furfrou.json | 27 - .../spawn_pool_world/0677_espurr.json | 27 - .../spawn_pool_world/0678_meowstic.json | 27 - .../spawn_pool_world/0686_inkay.json | 25 - .../spawn_pool_world/0687_malamar.json | 25 - .../spawn_pool_world/0688_binacle.json | 25 - .../spawn_pool_world/0689_barbaracle.json | 25 - .../spawn_pool_world/0692_clauncher.json | 25 - .../spawn_pool_world/0693_clawitzer.json | 25 - .../spawn_pool_world/0701_hawlucha.json | 25 - .../spawn_pool_world/0702_dedenne.json | 25 - .../spawn_pool_world/0714_noibat.json | 26 - .../spawn_pool_world/0715_noivern.json | 26 - .../spawn_pool_world/0731_pikipek.json | 25 - .../spawn_pool_world/0732_trumbeak.json | 25 - .../spawn_pool_world/0733_toucannon.json | 25 - .../spawn_pool_world/0734_yungoos.json | 26 - .../spawn_pool_world/0735_gumshoos.json | 26 - .../spawn_pool_world/0747_mareanie.json | 25 - .../spawn_pool_world/0748_toxapex.json | 25 - .../spawn_pool_world/0751_dewpider.json | 25 - .../spawn_pool_world/0752_araquanid.json | 25 - .../spawn_pool_world/0769_sandygast.json | 25 - .../spawn_pool_world/0770_palossand.json | 25 - .../spawn_pool_world/0779_bruxish.json | 25 - .../spawn_pool_world/0780_drampa.json | 25 - .../spawn_pool_world/0789_cosmog.json | 2 +- .../spawn_pool_world/0793_nihilego.json | 2 +- .../spawn_pool_world/0794_buzzwole.json | 2 +- .../spawn_pool_world/0795_pheromosa.json | 2 +- .../spawn_pool_world/0796_xurkitree.json | 2 +- .../spawn_pool_world/0797_celesteela.json | 2 +- .../spawn_pool_world/0798_kartana.json | 2 +- .../spawn_pool_world/0799_guzzlord.json | 2 +- .../spawn_pool_world/0800_necrozma.json | 2 +- .../spawn_pool_world/0805_stakataka.json | 2 +- .../spawn_pool_world/0806_blacephalon.json | 2 +- .../spawn_pool_world/0819_skwovet.json | 25 - .../spawn_pool_world/0820_greedent.json | 25 - .../spawn_pool_world/0833_chewtle.json | 25 - .../spawn_pool_world/0834_drednaw.json | 25 - .../spawn_pool_world/0843_silicobra.json | 25 - .../spawn_pool_world/0844_sandaconda.json | 25 - .../spawn_pool_world/0845_cramorant.json | 25 - .../spawn_pool_world/0848_toxel.json | 24 - .../spawn_pool_world/0849_toxtricity.json | 24 - .../spawn_pool_world/0852_clobbopus.json | 25 - .../spawn_pool_world/0853_grapploct.json | 25 - .../spawn_pool_world/0854_sinistea.json | 24 - .../spawn_pool_world/0855_polteageist.json | 24 - .../spawn_pool_world/0856_hatenna.json | 25 - .../spawn_pool_world/0857_hattrem.json | 25 - .../spawn_pool_world/0858_hatterene.json | 25 - .../spawn_pool_world/0864_cursola.json | 26 - .../spawn_pool_world/0866_mrrime.json | 25 - .../spawn_pool_world/0871_pincurchin.json | 25 - .../spawn_pool_world/0877_morpeko.json | 24 - .../spawn_pool_world/0917_tarountula.json | 25 - .../spawn_pool_world/0918_spidops.json | 25 - .../spawn_pool_world/0928_smoliv.json | 25 - .../spawn_pool_world/0929_dolliv.json | 25 - .../spawn_pool_world/0930_arboliva.json | 25 - .../spawn_pool_world/0938_tadbulb.json | 26 - .../spawn_pool_world/0939_bellibolt.json | 26 - .../spawn_pool_world/0940_wattrel.json | 25 - .../spawn_pool_world/0941_kilowattrel.json | 25 - .../spawn_pool_world/0946_bramblin.json | 25 - .../spawn_pool_world/0947_brambleghast.json | 25 - .../spawn_pool_world/0948_toedscool.json | 25 - .../spawn_pool_world/0949_toedscruel.json | 25 - .../spawn_pool_world/0950_klawf.json | 25 - .../spawn_pool_world/0951_capsakid.json | 25 - .../spawn_pool_world/0952_scovillain.json | 25 - .../spawn_pool_world/0953_rellor.json | 25 - .../spawn_pool_world/0954_rabsca.json | 25 - .../spawn_pool_world/0960_wiglett.json | 25 - .../spawn_pool_world/0961_wugtrio.json | 25 - .../spawn_pool_world/0963_finizen.json | 25 - .../spawn_pool_world/0964_palafin.json | 25 - .../spawn_pool_world/0967_cyclizar.json | 25 - .../spawn_pool_world/0968_orthworm.json | 25 - .../spawn_pool_world/0973_flamigo.json | 27 - .../spawn_pool_world/0976_veluza.json | 25 - .../spawn_pool_world/0977_dondozo.json | 25 - .../spawn_pool_world/0981_farigiraf.json | 25 - .../spawn_pool_world/0982_dudunsparce.json | 30 - .../spawn_pool_world/1012_poltchageist.json | 24 - .../spawn_pool_world/1013_sinistcha.json | 24 - .../spawn_pool_world/1024_terapagos.json | 2 +- .../cobblemon/species/generation1/mrmime.json | 476 --- .../species/generation1/pikachu.json | 2053 ---------- .../species/generation2/azumarill.json | 222 -- .../cobblemon/species/generation2/celebi.json | 201 +- .../species/generation2/corsola.json | 375 -- .../species/generation2/delibird.json | 221 -- .../species/generation2/dunsparce.json | 288 -- .../cobblemon/species/generation2/entei.json | 190 +- .../species/generation2/girafarig.json | 270 -- .../cobblemon/species/generation2/hooh.json | 238 -- .../cobblemon/species/generation2/hoppip.json | 215 -- .../species/generation2/houndoom.json | 272 -- .../species/generation2/houndour.json | 252 -- .../species/generation2/jumpluff.json | 189 - .../cobblemon/species/generation2/ledian.json | 177 - .../cobblemon/species/generation2/ledyba.json | 201 - .../cobblemon/species/generation2/lugia.json | 261 -- .../species/generation2/mantine.json | 216 -- .../cobblemon/species/generation2/marill.json | 257 -- .../species/generation2/octillery.json | 194 - .../cobblemon/species/generation2/raikou.json | 183 +- .../species/generation2/remoraid.json | 228 -- .../species/generation2/skiploom.json | 197 - .../species/generation2/suicune.json | 186 +- .../species/generation2/sunflora.json | 178 - .../species/generation2/sunkern.json | 189 - .../cobblemon/species/generation2/togepi.json | 257 -- .../species/generation2/togetic.json | 259 -- .../cobblemon/species/generation2/unown.json | 66 - .../species/generation2/wobbuffet.json | 83 - .../cobblemon/species/generation3/absol.json | 282 -- .../species/generation3/altaria.json | 263 -- .../species/generation3/azurill.json | 178 - .../cobblemon/species/generation3/bagon.json | 195 - .../species/generation3/banette.json | 244 -- .../species/generation3/beautifly.json | 179 +- .../species/generation3/cascoon.json | 131 +- .../species/generation3/castform.json | 441 +-- .../species/generation3/corphish.json | 191 - .../species/generation3/crawdaunt.json | 185 - .../species/generation3/delcatty.json | 226 +- .../cobblemon/species/generation3/deoxys.json | 826 +++- .../cobblemon/species/generation3/dustox.json | 184 +- .../species/generation3/electrike.json | 182 - .../cobblemon/species/generation3/feebas.json | 165 - .../cobblemon/species/generation3/glalie.json | 228 -- .../species/generation3/groudon.json | 282 +- .../species/generation3/grumpig.json | 229 -- .../cobblemon/species/generation3/gulpin.json | 180 +- .../species/generation3/jirachi.json | 180 +- .../species/generation3/kecleon.json | 205 - .../cobblemon/species/generation3/kyogre.json | 290 +- .../cobblemon/species/generation3/latias.json | 282 -- .../cobblemon/species/generation3/latios.json | 274 -- .../species/generation3/manectric.json | 215 -- .../species/generation3/medicham.json | 265 -- .../species/generation3/meditite.json | 239 -- .../species/generation3/milotic.json | 193 - .../cobblemon/species/generation3/regice.json | 176 +- .../species/generation3/regirock.json | 177 +- .../species/generation3/registeel.json | 185 +- .../species/generation3/salamence.json | 263 -- .../cobblemon/species/generation3/sealeo.json | 167 - .../species/generation3/seviper.json | 220 +- .../species/generation3/shelgon.json | 184 - .../species/generation3/shuppet.json | 217 -- .../species/generation3/silcoon.json | 128 +- .../cobblemon/species/generation3/skitty.json | 213 +- .../species/generation3/slaking.json | 219 -- .../species/generation3/slakoth.json | 202 - .../species/generation3/snorunt.json | 201 - .../cobblemon/species/generation3/spheal.json | 184 - .../cobblemon/species/generation3/spoink.json | 220 -- .../cobblemon/species/generation3/swablu.json | 210 - .../cobblemon/species/generation3/swalot.json | 189 +- .../species/generation3/vigoroth.json | 215 -- .../species/generation3/walrein.json | 175 - .../species/generation3/wurmple.json | 134 +- .../cobblemon/species/generation3/wynaut.json | 95 - .../species/generation3/zangoose.json | 243 +- .../species/generation4/abomasnow.json | 287 +- .../cobblemon/species/generation4/arceus.json | 1761 +++++---- .../cobblemon/species/generation4/azelf.json | 186 +- .../species/generation4/bronzong.json | 227 -- .../species/generation4/bronzor.json | 224 -- .../cobblemon/species/generation4/burmy.json | 264 +- .../species/generation4/cherrim.json | 332 +- .../species/generation4/cherubi.json | 180 +- .../species/generation4/cresselia.json | 179 +- .../species/generation4/croagunk.json | 250 -- .../species/generation4/darkrai.json | 188 +- .../cobblemon/species/generation4/dialga.json | 374 +- .../species/generation4/drapion.json | 208 - .../species/generation4/finneon.json | 188 - .../species/generation4/froslass.json | 222 -- .../species/generation4/gastrodon.json | 176 - .../species/generation4/giratina.json | 345 +- .../species/generation4/glameow.json | 167 - .../species/generation4/heatran.json | 173 +- .../species/generation4/lumineon.json | 167 - .../species/generation4/manaphy.json | 173 +- .../species/generation4/mantyke.json | 191 - .../species/generation4/mesprit.json | 183 +- .../cobblemon/species/generation4/mothim.json | 175 +- .../cobblemon/species/generation4/palkia.json | 354 +- .../cobblemon/species/generation4/phione.json | 167 +- .../species/generation4/purugly.json | 149 - .../species/generation4/regigigas.json | 165 +- .../cobblemon/species/generation4/rotom.json | 737 ---- .../species/generation4/shaymin.json | 298 +- .../species/generation4/shellos.json | 188 - .../species/generation4/skorupi.json | 210 - .../species/generation4/skuntank.json | 197 +- .../cobblemon/species/generation4/snover.json | 184 +- .../cobblemon/species/generation4/stunky.json | 188 +- .../species/generation4/togekiss.json | 218 -- .../species/generation4/toxicroak.json | 225 -- .../cobblemon/species/generation4/uxie.json | 179 +- .../species/generation4/wormadam.json | 345 +- .../species/generation5/accelgor.json | 134 - .../species/generation5/amoonguss.json | 142 - .../cobblemon/species/generation5/audino.json | 299 +- .../cobblemon/species/generation5/axew.json | 202 - .../species/generation5/bisharp.json | 183 +- .../species/generation5/blitzle.json | 161 - .../species/generation5/braviary.json | 320 -- .../species/generation5/cinccino.json | 166 - .../species/generation5/cobalion.json | 171 +- .../species/generation5/drilbur.json | 173 - .../species/generation5/druddigon.json | 195 - .../species/generation5/ducklett.json | 171 - .../species/generation5/duosion.json | 194 - .../species/generation5/eelektrik.json | 148 - .../species/generation5/eelektross.json | 175 - .../species/generation5/escavalier.json | 154 - .../species/generation5/excadrill.json | 164 - .../species/generation5/foongus.json | 154 - .../species/generation5/fraxure.json | 186 - .../species/generation5/garbodor.json | 208 - .../species/generation5/genesect.json | 439 +-- .../species/generation5/gothita.json | 202 - .../species/generation5/gothitelle.json | 190 - .../species/generation5/gothorita.json | 200 - .../species/generation5/haxorus.json | 186 - .../species/generation5/karrablast.json | 154 - .../cobblemon/species/generation5/keldeo.json | 243 +- .../cobblemon/species/generation5/kyurem.json | 554 +-- .../species/generation5/landorus.json | 156 +- .../species/generation5/leavanny.json | 178 - .../species/generation5/liepard.json | 167 - .../species/generation5/mandibuzz.json | 173 +- .../species/generation5/meloetta.json | 191 +- .../species/generation5/mienfoo.json | 190 - .../species/generation5/mienshao.json | 181 - .../species/generation5/minccino.json | 180 - .../cobblemon/species/generation5/munna.json | 177 - .../species/generation5/musharna.json | 160 - .../species/generation5/palpitoad.json | 166 +- .../species/generation5/panpour.json | 170 - .../species/generation5/pansage.json | 173 - .../species/generation5/pansear.json | 169 - .../species/generation5/pawniard.json | 175 +- .../species/generation5/purrloin.json | 180 - .../species/generation5/reshiram.json | 153 +- .../species/generation5/reuniclus.json | 203 - .../species/generation5/rufflet.json | 187 - .../cobblemon/species/generation5/sawk.json | 149 +- .../species/generation5/scrafty.json | 211 - .../species/generation5/scraggy.json | 230 -- .../species/generation5/seismitoad.json | 164 +- .../species/generation5/sewaddle.json | 175 - .../species/generation5/shelmet.json | 151 - .../species/generation5/simipour.json | 142 - .../species/generation5/simisage.json | 139 - .../species/generation5/simisear.json | 144 - .../species/generation5/solosis.json | 197 - .../species/generation5/stunfisk.json | 286 -- .../species/generation5/swadloon.json | 164 - .../cobblemon/species/generation5/swanna.json | 158 - .../species/generation5/terrakion.json | 170 +- .../cobblemon/species/generation5/throh.json | 147 +- .../species/generation5/thundurus.json | 160 +- .../species/generation5/tornadus.json | 169 +- .../species/generation5/trubbish.json | 166 - .../species/generation5/tympole.json | 176 +- .../cobblemon/species/generation5/tynamo.json | 89 - .../species/generation5/vanillish.json | 151 - .../species/generation5/vanillite.json | 158 - .../species/generation5/vanilluxe.json | 141 - .../species/generation5/victini.json | 168 +- .../species/generation5/virizion.json | 171 +- .../species/generation5/vullaby.json | 163 +- .../species/generation5/zebstrika.json | 148 - .../cobblemon/species/generation5/zekrom.json | 158 +- .../species/generation6/aromatisse.json | 168 +- .../species/generation6/barbaracle.json | 178 - .../species/generation6/binacle.json | 178 - .../species/generation6/clauncher.json | 155 - .../species/generation6/clawitzer.json | 146 - .../species/generation6/dedenne.json | 163 - .../species/generation6/diancie.json | 292 +- .../cobblemon/species/generation6/espurr.json | 187 - .../species/generation6/furfrou.json | 131 - .../cobblemon/species/generation6/gogoat.json | 157 - .../species/generation6/hawlucha.json | 216 -- .../species/generation6/heliolisk.json | 147 +- .../species/generation6/helioptile.json | 127 +- .../cobblemon/species/generation6/hoopa.json | 409 +- .../cobblemon/species/generation6/inkay.json | 211 - .../cobblemon/species/generation6/litleo.json | 194 +- .../species/generation6/malamar.json | 180 - .../species/generation6/meowstic.json | 342 -- .../cobblemon/species/generation6/noibat.json | 184 - .../species/generation6/noivern.json | 181 - .../species/generation6/pancham.json | 190 +- .../species/generation6/pangoro.json | 192 +- .../cobblemon/species/generation6/pyroar.json | 184 +- .../cobblemon/species/generation6/skiddo.json | 165 - .../species/generation6/slurpuff.json | 165 +- .../species/generation6/spritzee.json | 164 +- .../species/generation6/swirlix.json | 175 +- .../species/generation6/volcanion.json | 138 +- .../species/generation6/yveltal.json | 136 +- .../species/generation6/zygarde.json | 752 +++- .../species/generation7/araquanid.json | 259 -- .../species/generation7/blacephalon.json | 157 +- .../species/generation7/bruxish.json | 167 - .../species/generation7/buzzwole.json | 162 +- .../species/generation7/celesteela.json | 163 +- .../species/generation7/charjabug.json | 151 +- .../species/generation7/cosmoem.json | 107 +- .../cobblemon/species/generation7/cosmog.json | 116 +- .../species/generation7/dewpider.json | 163 - .../cobblemon/species/generation7/drampa.json | 182 - .../species/generation7/grubbin.json | 159 +- .../species/generation7/gumshoos.json | 271 -- .../species/generation7/guzzlord.json | 161 +- .../species/generation7/kartana.json | 161 +- .../cobblemon/species/generation7/lunala.json | 172 +- .../species/generation7/lycanroc.json | 452 ++- .../species/generation7/magearna.json | 325 +- .../species/generation7/mareanie.json | 176 - .../species/generation7/marshadow.json | 154 +- .../cobblemon/species/generation7/minior.json | 210 +- .../species/generation7/necrozma.json | 713 +++- .../species/generation7/nihilego.json | 175 +- .../species/generation7/oranguru.json | 167 +- .../species/generation7/oricorio.json | 343 +- .../species/generation7/palossand.json | 162 - .../species/generation7/passimian.json | 169 +- .../species/generation7/pheromosa.json | 159 +- .../species/generation7/pikipek.json | 157 - .../species/generation7/rockruff.json | 357 +- .../species/generation7/sandygast.json | 176 - .../species/generation7/silvally.json | 3352 ++++++++++++---- .../species/generation7/solgaleo.json | 154 +- .../species/generation7/stakataka.json | 153 +- .../species/generation7/tapubulu.json | 136 +- .../species/generation7/tapufini.json | 140 +- .../species/generation7/tapukoko.json | 134 +- .../species/generation7/tapulele.json | 132 +- .../species/generation7/togedemaru.json | 271 -- .../species/generation7/toucannon.json | 157 - .../species/generation7/toxapex.json | 163 - .../species/generation7/trumbeak.json | 160 - .../species/generation7/typenull.json | 154 +- .../species/generation7/vikavolt.json | 279 +- .../species/generation7/xurkitree.json | 157 +- .../species/generation7/yungoos.json | 165 - .../species/generation7/zeraora.json | 150 +- .../melmetal.json | 199 +- .../{generation7 => generation7b}/meltan.json | 123 +- .../species/generation8/appletun.json | 217 +- .../cobblemon/species/generation8/applin.json | 123 +- .../species/generation8/blipbug.json | 108 +- .../species/generation8/calyrex.json | 540 ++- .../cobblemon/species/generation8/carkol.json | 173 +- .../species/generation8/chewtle.json | 134 - .../species/generation8/clobbopus.json | 132 - .../species/generation8/coalossal.json | 237 +- .../species/generation8/cramorant.json | 233 -- .../species/generation8/cursola.json | 137 - .../species/generation8/dottler.json | 132 +- .../species/generation8/drednaw.json | 201 - .../species/generation8/duraludon.json | 214 +- .../species/generation8/eternatus.json | 206 +- .../species/generation8/flapple.json | 229 +- .../species/generation8/frosmoth.json | 156 +- .../species/generation8/glastrier.json | 137 +- .../species/generation8/grapploct.json | 124 - .../species/generation8/greedent.json | 129 - .../species/generation8/hatenna.json | 140 - .../species/generation8/hatterene.json | 189 - .../species/generation8/hattrem.json | 137 - .../species/generation8/indeedee.json | 344 +- .../cobblemon/species/generation8/kubfu.json | 177 + .../species/generation8/morpeko.json | 191 - .../cobblemon/species/generation8/mrrime.json | 168 - .../species/generation8/orbeetle.json | 226 +- .../species/generation8/pincurchin.json | 120 - .../species/generation8/polteageist.json | 171 - .../species/generation8/regidrago.json | 130 +- .../species/generation8/regieleki.json | 130 +- .../species/generation8/rolycoly.json | 164 +- .../species/generation8/runerigus.json | 155 +- .../species/generation8/sandaconda.json | 176 - .../species/generation8/silicobra.json | 133 - .../species/generation8/sinistea.json | 235 -- .../species/generation8/skwovet.json | 131 - .../cobblemon/species/generation8/snom.json | 138 +- .../species/generation8/spectrier.json | 136 +- .../cobblemon/species/generation8/toxel.json | 125 - .../species/generation8/toxtricity.json | 389 -- .../species/generation8/urshifu.json | 477 +++ .../cobblemon/species/generation8/zacian.json | 175 +- .../species/generation8/zamazenta.json | 179 +- .../cobblemon/species/generation8/zarude.json | 294 +- .../enamorus.json | 199 +- .../species/generation9/arboliva.json | 117 - .../species/generation9/archaludon.json | 89 +- .../species/generation9/arctibax.json | 109 +- .../species/generation9/baxcalibur.json | 112 +- .../species/generation9/bellibolt.json | 111 - .../species/generation9/bombirdier.json | 132 +- .../species/generation9/brambleghast.json | 111 - .../species/generation9/bramblin.json | 126 - .../species/generation9/brutebonnet.json | 90 +- .../species/generation9/capsakid.json | 120 - .../species/generation9/chienpao.json | 91 +- .../cobblemon/species/generation9/chiyu.json | 104 +- .../species/generation9/cyclizar.json | 121 - .../species/generation9/dipplin.json | 84 +- .../cobblemon/species/generation9/dolliv.json | 114 - .../species/generation9/dondozo.json | 114 - .../species/generation9/dudunsparce.json | 202 - .../species/generation9/farigiraf.json | 148 - .../species/generation9/fezandipiti.json | 128 +- .../species/generation9/finizen.json | 122 - .../species/generation9/flamigo.json | 128 - .../species/generation9/fluttermane.json | 121 +- .../species/generation9/frigibax.json | 108 +- .../species/generation9/gougingfire.json | 99 +- .../species/generation9/greattusk.json | 98 +- .../species/generation9/greavard.json | 132 +- .../species/generation9/houndstone.json | 128 +- .../species/generation9/hydrapple.json | 89 +- .../species/generation9/ironboulder.json | 91 +- .../species/generation9/ironbundle.json | 88 +- .../species/generation9/ironcrown.json | 90 +- .../species/generation9/ironhands.json | 98 +- .../species/generation9/ironjugulis.json | 110 +- .../species/generation9/ironleaves.json | 175 + .../species/generation9/ironmoth.json | 100 +- .../species/generation9/ironthorns.json | 107 +- .../species/generation9/irontreads.json | 104 +- .../species/generation9/ironvaliant.json | 119 +- .../species/generation9/kilowattrel.json | 125 - .../species/generation9/kingambit.json | 138 +- .../cobblemon/species/generation9/klawf.json | 123 - .../species/generation9/koraidon.json | 103 +- .../cobblemon/species/generation9/lokix.json | 100 +- .../species/generation9/miraidon.json | 95 +- .../species/generation9/munkidori.json | 98 +- .../cobblemon/species/generation9/nymble.json | 82 +- .../species/generation9/ogerpon.json | 401 +- .../species/generation9/oinkologne.json | 227 -- .../species/generation9/okidogi.json | 110 +- .../species/generation9/orthworm.json | 115 - .../species/generation9/palafin.json | 171 - .../cobblemon/species/generation9/pawmi.json | 101 +- .../cobblemon/species/generation9/pawmo.json | 110 +- .../cobblemon/species/generation9/pawmot.json | 114 +- .../species/generation9/poltchageist.json | 215 -- .../cobblemon/species/generation9/rabsca.json | 134 - .../species/generation9/ragingbolt.json | 96 +- .../cobblemon/species/generation9/rellor.json | 112 - .../species/generation9/roaringmoon.json | 104 +- .../species/generation9/sandyshocks.json | 97 +- .../species/generation9/scovillain.json | 120 - .../species/generation9/screamtail.json | 94 +- .../species/generation9/sinistcha.json | 194 - .../species/generation9/slitherwing.json | 88 +- .../cobblemon/species/generation9/smoliv.json | 117 - .../species/generation9/spidops.json | 121 - .../species/generation9/tadbulb.json | 118 - .../species/generation9/tarountula.json | 126 - .../cobblemon/species/generation9/tinglu.json | 82 +- .../species/generation9/toedscool.json | 141 - .../species/generation9/toedscruel.json | 124 - .../cobblemon/species/generation9/veluza.json | 113 - .../species/generation9/wattrel.json | 136 - .../species/generation9/wiglett.json | 107 - .../species/generation9/wochien.json | 83 +- .../species/generation9/wugtrio.json | 96 - gradle.properties | 4 +- settings.gradle.kts | 2 +- 609 files changed, 29660 insertions(+), 60062 deletions(-) create mode 100644 common/src/main/resources/assets/generations_core/lang/pt_br.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0165_ledyba.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0166_ledian.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0175_togepi.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0176_togetic.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0183_marill.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0184_azumarill.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0187_hoppip.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0188_skiploom.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0189_jumpluff.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0191_sunkern.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0192_sunflora.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0201_unown.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0202_wobbuffet.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0203_girafarig.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0206_dunsparce.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0222_corsola.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0223_remoraid.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0224_octillery.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0225_delibird.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0226_mantine.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0228_houndour.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0229_houndoom.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0287_slakoth.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0288_vigoroth.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0289_slaking.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0298_azurill.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0307_meditite.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0308_medicham.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0309_electrike.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0310_manectric.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0325_spoink.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0326_grumpig.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0333_swablu.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0334_altaria.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0341_corphish.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0342_crawdaunt.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0349_feebas.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0350_milotic.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0352_kecleon.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0353_shuppet.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0354_banette.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0359_absol.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0360_wynaut.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0361_snorunt.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0362_glalie.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0363_spheal.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0364_sealeo.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0365_walrein.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clampearl.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0371_bagon.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0372_shelgon.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0373_salamence.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0422_shellos.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0423_gastrodon.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0431_glameow.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0432_purugly.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0436_bronzor.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0437_bronzong.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0451_skorupi.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0452_drapion.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0453_croagunk.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0454_toxicroak.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0456_finneon.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0457_lumineon.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0458_mantyke.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0468_togekiss.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0478_froslass.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0509_purrloin.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0510_liepard.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0511_pansage.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0512_simisage.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0513_pansear.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0514_simisear.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0515_panpour.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0516_simipour.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0517_munna.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0518_musharna.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0522_blitzle.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0523_zebstrika.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0529_drilbur.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0530_excadrill.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0540_sewaddle.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0541_swadloon.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0542_leavanny.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0559_scraggy.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0560_scrafty.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0568_trubbish.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0569_garbodor.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0572_minccino.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0573_cinccino.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0574_gothita.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0575_gothorita.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0576_gothitelle.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0577_solosis.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0578_duosion.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0579_reuniclus.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0580_ducklett.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0581_swanna.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0582_vanillite.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0583_vanillish.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0584_vanilluxe.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0588_karrablast.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0589_escavalier.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0590_foongus.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0610_axew.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0611_fraxure.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0612_haxorus.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0616_shelmet.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0617_accelgor.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0618_stunfisk.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0619_mienfoo.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0620_mienshao.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0621_druddigon.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0627_rufflet.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0628_braviary.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0672_skiddo.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0673_gogoat.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0676_furfrou.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0677_espurr.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0678_meowstic.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0686_inkay.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0687_malamar.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0688_binacle.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0689_barbaracle.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0692_clauncher.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0693_clawitzer.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0701_hawlucha.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0702_dedenne.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0714_noibat.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0715_noivern.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0731_pikipek.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0732_trumbeak.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0733_toucannon.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0734_yungoos.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0735_gumshoos.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0747_mareanie.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0748_toxapex.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0751_dewpider.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0752_araquanid.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0769_sandygast.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0770_palossand.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0779_bruxish.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0780_drampa.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0819_skwovet.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0820_greedent.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0833_chewtle.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0834_drednaw.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0843_silicobra.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0844_sandaconda.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0845_cramorant.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0848_toxel.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0849_toxtricity.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0852_clobbopus.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0853_grapploct.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0854_sinistea.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0855_polteageist.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0856_hatenna.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0857_hattrem.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0858_hatterene.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0864_cursola.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0866_mrrime.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0871_pincurchin.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0877_morpeko.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0917_tarountula.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0918_spidops.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0928_smoliv.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0929_dolliv.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0930_arboliva.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0938_tadbulb.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0939_bellibolt.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0940_wattrel.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0941_kilowattrel.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0946_bramblin.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0947_brambleghast.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0948_toedscool.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0949_toedscruel.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0950_klawf.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0951_capsakid.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0952_scovillain.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0953_rellor.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0954_rabsca.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0960_wiglett.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0961_wugtrio.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0963_finizen.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0964_palafin.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0967_cyclizar.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0968_orthworm.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0973_flamigo.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0976_veluza.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0977_dondozo.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0981_farigiraf.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0982_dudunsparce.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/1012_poltchageist.json delete mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/1013_sinistcha.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation1/mrmime.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation1/pikachu.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/azumarill.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/corsola.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/delibird.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/girafarig.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/hooh.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/hoppip.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/houndoom.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/houndour.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/ledian.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/ledyba.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/lugia.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/mantine.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/marill.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/octillery.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/remoraid.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/skiploom.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/sunflora.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/sunkern.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/togepi.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/togetic.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/unown.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/absol.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/altaria.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/azurill.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/bagon.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/banette.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/corphish.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/electrike.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/feebas.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/glalie.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/grumpig.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/kecleon.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/latias.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/latios.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/manectric.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/medicham.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/meditite.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/milotic.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/salamence.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/sealeo.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/shelgon.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/shuppet.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/slaking.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/slakoth.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/snorunt.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/spheal.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/spoink.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/swablu.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/walrein.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation3/wynaut.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/bronzong.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/bronzor.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/croagunk.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/drapion.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/finneon.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/froslass.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/glameow.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/lumineon.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/mantyke.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/purugly.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/rotom.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/shellos.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/skorupi.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/togekiss.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/accelgor.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/axew.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/blitzle.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/braviary.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/cinccino.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/drilbur.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/druddigon.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/ducklett.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/duosion.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/eelektross.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/escavalier.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/excadrill.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/foongus.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/fraxure.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/garbodor.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/gothita.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/gothorita.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/haxorus.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/karrablast.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/leavanny.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/liepard.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/mienshao.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/minccino.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/munna.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/musharna.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/panpour.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/pansage.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/pansear.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/purrloin.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/rufflet.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/scrafty.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/scraggy.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/shelmet.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/simipour.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/simisage.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/simisear.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/solosis.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/swadloon.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/swanna.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/trubbish.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/tynamo.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/vanillish.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/vanillite.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/binacle.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/clauncher.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/dedenne.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/espurr.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/furfrou.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/gogoat.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/inkay.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/malamar.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/meowstic.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/noibat.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/noivern.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation6/skiddo.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/araquanid.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/bruxish.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/dewpider.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/drampa.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/mareanie.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/palossand.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/pikipek.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/sandygast.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/toucannon.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/toxapex.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation7/yungoos.json rename common/src/main/resources/data/cobblemon/species/{generation7 => generation7b}/melmetal.json (64%) rename common/src/main/resources/data/cobblemon/species/{generation7 => generation7b}/meltan.json (61%) delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/chewtle.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/cramorant.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/cursola.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/drednaw.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/grapploct.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/greedent.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/hatenna.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/hatterene.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/hattrem.json create mode 100644 common/src/main/resources/data/cobblemon/species/generation8/kubfu.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/morpeko.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/mrrime.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/polteageist.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/silicobra.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/sinistea.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/skwovet.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/toxel.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json create mode 100644 common/src/main/resources/data/cobblemon/species/generation8/urshifu.json rename common/src/main/resources/data/cobblemon/species/{generation8 => generation8a}/enamorus.json (54%) delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/arboliva.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/bramblin.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/capsakid.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/dolliv.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/dondozo.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/finizen.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/flamigo.json create mode 100644 common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/klawf.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/orthworm.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/palafin.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/rabsca.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/rellor.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/scovillain.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/smoliv.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/spidops.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/tarountula.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/toedscool.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/veluza.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/wattrel.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/wiglett.json delete mode 100644 common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 37f888e1c..62c968f7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,204 @@ -# 5.0.0 +# 1.2.0 + +Additions +- Added Cobblemon 1.7 compatibility + +# 1.1.0 + +Additions +- Added Cobblemon 1.6 compatibility + - Please be sure to update your Generations 1-9 Resource Packs to avoid any model issues! +- Added Terastallization! + + - ---Explaination--- + - Comes with a Tera battle overlay effect, Tera sound, and visual effect +- Legendary Pokemon will now be guaranteed 3 Perfect IVs +- Added Pokemon icons for profiles and portraits +- Added Exp All functionality +- Added world and Time Capsule conversions for all Generations items +- Added external transformations to the shift right click wheel + - Perfect for Mega Evolving your favorites outside of battle! +- Added Statue functionality for non-OP players + - Up to 2 statues can be placed per chunk +- Added a Brazilian Portuguese translation— thanks ednzinho! +- Rewrote a majority of the codebase from Java to Kotlin + +Changes +- Updated to Cobblemon species and spawn files for all new Cobblemon +- Moved Ruby Rod to use Cobblemon 1.6's fishing loot table +- Improved Pokemon shoulder rendering + +Bug Fixes +- Fixed shift clicking RKS Machine output items disappearing +- Fixed Aqua armor set having no texture on armor stands +- Fixed Zygarde Cubes disappearing when used in offhand +- Fixed Dusk Ball Displays showing as Dive Ball +- Fixed Calyrex Rider form not receiving typing, ability, or stats +- Fixed Kyurem retaining Fusion Bolt/Flare after fusing and unfusing +- Fixed Rotom being unable to learn certain moves in certain forms +- Fixed Rusty Shield not transforming into Crowned Shield upon summoning of Doggo +- Add movepool to Crowned forms of Doggos + - Zacian/Zamazenta: Iron Head should transform into Behemoth Blade/Bash in battle +- Fixed Abundant Shrine lang +- Fixed Special textures not working for statues on servers +- Fixed High Plains Vivillon texture +- Fixed Shiny Entei Doll appearing as a regular Entei + +# 1.0.2 + +Changelog +- Fixed an invisibility, rendering, and crashing bug with 1.0.1— please update if you're experiencing issues! +- Fixed Megas causing HA to not revert properly +- Fixed Megas not reverting if not active in battle +- Tweaked Ogerpon details to support future Tera implementation + +Next up: 1.21.1! + +# 1.0.1 + +Changelog +- Added Ore Generation for Mega Stone, Z-Crystals, and Meteorite. +- Mega Shards are now stackable. +- Raised legend spawn rates across the board based on player feedback, and moved Diancie to spawn in mountains. +- Adjusted spawns for Ditto, Unown, Rotom, Togepi, Marill, Solosis, Gothita, and Bagon evo lines based on player feedback. +- Fixed spawns for Bronzor, Corphish, Drilbur, and Noibat evo lines. +- Added about a dozen Pokemon to ocean land spawns +- Added config option 'enableZygardeCubeOverflow' to allow Zygarde Cubes to continue collecting cells when full. +- Fixed Zygarde Cell spawn rate with the addition of the collectibles spawn bucket. +- Zygarde's abilities are no longer affected by ability changing items. +- Added Zygarde to default Caught section of the config. +- Zygarde cell spawning is now prevented by scarecrows. +- Scarecrow is now based on a configurable radius on the x, y, and z axis vs per chunk. Default is 32 in every direction. +- Fixed an issue with Lake Trio Crystals causing crashes. +- Ruby Rod should now break after getting enough Lake Trio Shards. +- Fixed an issue with Bird Shrine interaction. +- Fixed Cooking Pots not dropping their inventory. +- Fixed Pokemon changed by the RKS machine lacking moves when the new species shares no moves with the old one. +- Fixed errors in a few RKS recipes. +- Chisel statues now have upper/lower scale bounds of 5x and 0.5x, respectively. +- Fixed statues of Pokemon with aspects displaying incorrectly. +- Added Ultrite Smithing Template to Ancient Cities, End Cities, Beast Ball loot. +- Added TMs 230-237 to the loot ball pool. +- Added Ogerpon masks and Genesect drives to loot ball pool. +- Fixed X and Y Mega evolutions not working correctly in battle. +- Fixed full-set bonus buffs for armor being applied incorrectly. + +Known Issues +- Client-side invisibility and log spam at times, fixed in 1.0.2. + +# 1.0 +Haven't been following the BETA's? Here's a quick recap: +- We are a Cobblemon sidemod that hooks in and adds extra features, including gamelike Pokémon models you're familiar with +- You can disable our models if you wish, they are just resourcepacks and use Cobblemon's blocky models instead. +- We highly recommend our modpack- there's several mods/resourcepacks you need for the full Generations experience +- Check out our wiki for a general guide on things- most mechanics have received overhauls. Our wiki is at generations.gg. You can also create an account, and edit pages to fix any issues you spot +- We said we were keeping it simple, but turns out we ended up with most of our previous features. Some missing mechanics such as Ultra Space are being worked on now. Others, such as outbreaks can often be found as Cobblemon sidemods- we're compatible with most! We'll add our own toggleable features for missing mechanics over time as well, for things such as Outbreaks in this example +- You must download the new resourcepacks if you have old ones, the ones from the previous BETA's are no longer compatible +- Yes, we have the full dex + +From our last beta, here's the changes/fixes: +- Added 6,875 Special Pokémon using shaders, rather than textures for zero bloat + - All Pokémon now have the following specials: + - Galaxy: Darkens Pokémon and adds dark, heavy purples/blacks, while also applying an animated star-y mask + - Sketch: Shifts Pokémon mostly black, while adding a sketch-like white outline effect + - Shadow: Converts Pokemon to a grayscale, then Darkens Pokémon towards mostly deep, dark blues + - Vintage: Applies a nice soft grayscale texture that looks good on pretty much everyone + - Pastel: A brightened effect with pink & blue pastel shading. This will mostly only look good on Pokémon that are brighter to begin with + - These won't be perfect for every Pokémon, experiment! We'll still add normal nice specials with textures over time such as cosplay's and whatnot we had before- that'll take some time + - Creators: These are not a global configuration, they are individually configured in each of their config.jsons, so you can turn off any of these on anyone in favor of a custom one (ie if you want to have a custom textures Shadow Pikachu instead of using the Shadow shader) +- Added Mew DNA Fiber extraction using DNA Splicers +- Added DNA Extraction information on Mew Summary screen +- Added Ultrite tier of tools and armors, end game content which can also have trimming on +- Added tooltips to moves in battle when you hover over them to display their description +- Added Syrupy Apple +- Added Ball Loot messages to inform you what you've received +- Added Timed PokeBall Loots +- Added Silver Knowledge Symbol +- Added JEI/REI compatibility support for RKS Machine +- Added JourneyMap and Xaero's compatibility support for entity icons +- Added some support for Mr Crayfish's catalogue +- Changed Curry to be a bit more basic for now, due to the constant issues, we'll tackle this in a future update +- Reworked RKS recipes to allow for shapeless recipes instead of specific placements +- Reworked Iceroot/Shaderoot so they vanish on use instead of enchanted/unenchanted versions +- Fixed crash with mail +- Fixed statue bounding box +- Fixed Chisel menu not updating +- Fixed crash when flavor is null on Curry +- Fixed Compressed Stone recipe due to conflict with Deeplsate Tiles +- Fixed Elevator sound being too loud +- Fixed Tao and Regigigas Shrine not rendering +- Fixed sprite shading in GUI's +- Fixed MultiBlocks replacing other blocks when placed nearby +- Fixed some misc blocks missing tags, such as being breakable +- Fixed Time Capsules ignoring untradeable tag +- Fixed Scarecrows being per chunk, now 32 block radius +- Fixed Lighting Lantern missing data +- Fixed Megas losing their abilities +- Fixed Shaderoot and Iceroot not dropping from carrots +- Fixed Rotom Catalog not working +- Fixed Psychic TMs displaying as Bug type +- Fixed Reveal Glass not toggling Therian Forms +- Fixed Iron Valiant unable to be made from Gallade +- Fixed Krabby PokeDoll texture +- Fixed Shadow Lugia's eyes +- Fixed HDTV's lang entry +- Fixed Ditto being stretchy in animations +- Fixed Terapagos Stellar being a bit wonky +- Fixed Vivillon being a bit wonky +- Fixed Zubat glowing +- Fixed Shoulder Mounts being invisible +- Fixed an error with Heartflame Mask +- Fixed couch sitting positions and heights +- Fixed Pastel Bean Bags +- Fixed Box's sprite being too basic +- Fixed Female Pikachu missing sprite +- Fixed Park Ball texture being wrong color +- Fixed a handful of blocks not dropping when broken such as Double Street Lamps +- Fixed Defog, Mystical Fire, Roost showing as Blank TMs +- Fixed Pokémon able to have moves they aren't supposed to when converted to another species in an RSK Machine +- Fixed Plasma Armor textures missing +- Fixed RKS Machine giving you a blank Pokémon sprite item if you click the Time Capsule before it is finished the process of making a Pokemon +- Fixed BiomesOPlenty Dryland, Wasteland, Wasteland Steppe having no spawns +- Fixed Corsola, Clauncher, Clawitzer, Mareanie, Toxapex, Bruxish, Pincurchin not spawning due to invalid is_reef spawn set, now spawn in is_warm_ocean +- Fixed Silicon tools being better than Netherite +- Fixed Solgaleo's face +- Fixed Hisuian Electrode missing its mouth +- Fixed Genesect form change to match the drive it holds +- Changed Curry to be a bit more basic curry-ntly, due to the constant issues. Curry will default to Milcery Rating for now until Curry Dex is implemented in full. We'll tackle this in a future update. +- Fixed Yet Another Chance Booster in the modpack conflicting with shiny rate config edits +- Fixed armors not having armor values +- Fixed Zygarde Cell spawnrates +- Fixed Zygarde 50% being able to be created from only 10 Cells +- Fixed Zygarde Cube opening menus when collecting +- Decreased Zygarde Cell collection noise +- Fixed Zygarde Cell collection text firing off twice +- Fixed lang typos +- Fixed and added new lang to Chinese and French +- Fixed Arceus's eyes +- Fixed RKS Machine causing multiplayer networking issues +- Fixed recipe for crafting Unown Block letters +- Fixed Dacite Shore no spawns +- Fixed a few dozen Pokemon spawns +- Fixed Swift, Substitute, Grassy Terrain, Supercell Slam showing as Blank TMs +- Fixed Supercell Slam lang +- Fixed an error with Heartflame Mask +- Fixed Tentacool/Tentacruel having gray instead of red orbs +- Fixed Kyruem fusion and defusion with DNA Splicer +- Fixed Shaderoot and Iceroot not dropping from carrots +- Reworked Iceroots and Shaderoots so they vanish on use instead of enchanted and unenchanted versions +- Pillars should now connect properly +- Fixed Pokeball chests being 1 pixel up +- Fixed overwriting Time Capsule Pokemon +- Fixed Ruby, Sapphire, Silicon, Crystal, Evolution Stone Blocks un-craft recipe +- Fixed and reogranized symbol loading order +- Fixed Kantoian Pikachu not being able to evolve +- Fixed Arceus/Silvally type changes when holding their respective item +- Fixed Silvally/Arceus being able to have any type without having to hold the respective plate +- Fixed Pokémon able to have moves they aren't supposed to when converted to another species in an RKS Machine +- Fixed Chisel menu not updating. Statue GUI picture should now update when you change things +- Fixed Time Capsules ignoring untradeable tags + +# BETA 5.0.0 Our FINAL BETA is here! Please report bugs- new and old in case we missed something important. We hope to have our official release in a couple weeks, we just want some time to collect new bug report and have some time to fix any that arise. @@ -41,13 +241,13 @@ Note: This is BETA 5.0. When we release, we're going back down to 1.0 and adjust -# 4.1.1 +# BETA 4.1.1 - Fix Server Load Crash - Fix Wooden Fence Gates missing from Forge fence_gates/wooden tag - Fix Gates ItemTag missing - Make Snow Layer not survival on Ball Loots, Display Blocks and Pokedolls -# 4.1.0 +# BETA 4.1.0 Model Loading: - Adjusted model loading to ensure proper unloading over time; added config triggered logging for loading/unloading processes. Spawns: @@ -67,9 +267,9 @@ Shrines: Overlays: - Revised overlay code to support hotbar display in the camera and accommodate pumpkin overlays. -# 4.0.2 +# BETA 4.0.2 - Fix Crash when trying to render the Celestial Altar -# 4.0.1 +# BETA 4.0.1 - Fix Rendering not displaying on MacOS and Linux - Update Glowing Charge Cobblestone texture \ No newline at end of file diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/PokemonStoringItem.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/PokemonStoringItem.kt index 2366e088c..77fa37dca 100644 --- a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/PokemonStoringItem.kt +++ b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/PokemonStoringItem.kt @@ -32,7 +32,7 @@ abstract class PokemonStoringItem(properties: Properties) : Item(properties), Po val item = player.getItemInHand(usedHand) val pokemon = item.getPokemon() if (pokemon != null) { - storage.getParty((player as ServerPlayer)).add(pokemon.also { it.uuid = UUID.randomUUID() }.also { it.refreshOriginalTrainer() }) + storage.getParty((player as ServerPlayer)).add(pokemon.also { it.refreshOriginalTrainer() }) item.shrink(1) item.removePokemon() item.setLore(mutableListOf()) diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/legends/MeltanBox.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/legends/MeltanBox.kt index 7535e3e22..c23f975dd 100644 --- a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/legends/MeltanBox.kt +++ b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/legends/MeltanBox.kt @@ -17,16 +17,16 @@ import net.minecraft.world.entity.player.Player import net.minecraft.world.item.ItemStack import net.minecraft.world.level.Level -fun Iterable?.any(function: (T) -> Boolean): Boolean = this?.any(function) ?: false +fun Iterable?.anySafe(predicate: (T) -> Boolean): Boolean = this?.any(predicate) ?: false class MeltanBox(settings: Properties) : PostBattleUpdatingWithItem( settings, LegendKeys.MELMETAL, "pixelmon.meltanbox.amountfull", { player, _, battle: BattleData -> - player.entity?.party()?.map(Pokemon::species)?.map(Species::resourceIdentifier)?.map(ResourceLocation::toString).any { it == "cobblemon:metalan" } && battle.pokemon.types.any { it == ElementalTypes.STEEL } + player.entity?.party()?.map(Pokemon::species)?.map(Species::resourceIdentifier)?.map(ResourceLocation::toString).anySafe { it == "cobblemon:meltan" } && battle.pokemon.types.anySafe { it == ElementalTypes.STEEL } }) { override fun postSpawn(level: Level, player: Player, usedHand: InteractionHand) { player.setItemInHand(usedHand, ItemStack(MELTAN_BOX_CHARGED)) } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/generations_core/lang/pt_br.json b/common/src/main/resources/assets/generations_core/lang/pt_br.json new file mode 100644 index 000000000..ada1d4d09 --- /dev/null +++ b/common/src/main/resources/assets/generations_core/lang/pt_br.json @@ -0,0 +1,3416 @@ +{ + "block.generations_core.abundant_shrine": "Santuário Abundante", + "block.generations_core.abundant_shrine.tooltip": "§7DICA: Você precisa de algo para revelar os segredos internos.", + "block.generations_core.arceus_doll": "Boneco de Arceus", + "block.generations_core.articuno_doll": "Boneco de Articuno", + "block.generations_core.azelf_doll": "Boneco de Azelf", + "block.generations_core.azurill_doll": "Boneco de Azurill", + "block.generations_core.ballonlea_blue_mushroom": "Cogumelo Azul de Ballonlea", + "block.generations_core.ballonlea_green_mushroom": "Cogumelo Verde de Ballonlea", + "block.generations_core.ballonlea_pink_mushroom": "Cogumelo Rosa de Ballonlea", + "block.generations_core.ballonlea_yellow_mushroom": "Cogumelo Amarelo de Ballonlea", + "block.generations_core.baltoy_doll": "Boneco de Baltoy", + "block.generations_core.beast_ball_loot": "Recompensa de Beast Ball", + "block.generations_core.bench": "Banco", + "block.generations_core.black_couch_arm_left": "Braço Esquerdo de Sofá Preto", + "block.generations_core.black_couch_arm_right": "Braço Direito de Sofá Preto", + "block.generations_core.black_couch_corner_left": "Canto Esquerdo de Sofá Preto", + "block.generations_core.black_couch_corner_right": "Canto Direito de Sofá Preto", + "block.generations_core.black_couch_middle": "Meio de Sofá Preto", + "block.generations_core.black_couch_ottoman": "Puff de Sofá Preto", + "block.generations_core.black_elevator": "Elevador Preto", + "block.generations_core.black_marble": "Mármore Preto", + "block.generations_core.black_marble_button": "Botão de Mármore Preto", + "block.generations_core.black_marble_pressure_plate": "Placa de Pressão de Mármore Preto", + "block.generations_core.black_marble_slab": "Laje de Mármore Preto", + "block.generations_core.black_marble_stairs": "Escadas de Mármore Preto", + "block.generations_core.black_marble_wall": "Parede de Mármore Preto", + "block.generations_core.black_pastel_bean_bag": "Puff Pastel Preto", + "block.generations_core.black_pc": "PC Preto", + "block.generations_core.black_poke_brick": "Tijolo Poké Preto", + "block.generations_core.black_poke_brick_button": "Botão de Tijolo Poké Preto", + "block.generations_core.black_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Preto", + "block.generations_core.black_poke_brick_slab": "Laje de Tijolo Poké Preto", + "block.generations_core.black_poke_brick_stairs": "Escadas de Tijolo Poké Preto", + "block.generations_core.black_poke_brick_wall": "Parede de Tijolo Poké Preto", + "block.generations_core.black_shingles": "Telhas Pretas", + "block.generations_core.black_shingles_slab": "Laje de Telhas Pretas", + "block.generations_core.black_shingles_stairs": "Escadas de Telhas Pretas", + "block.generations_core.black_shingles_wall": "Parede de Telhas Pretas", + "block.generations_core.black_street_lamp": "Poste de Rua Preto", + "block.generations_core.black_swivel_chair": "Cadeira Giratória Preta", + "block.generations_core.black_vending_machine": "Máquina de Vendas Preta", + "block.generations_core.blastoise_doll": "Boneco de Blastoise", + "block.generations_core.bleach_stone": "Pedra Descolorida", + "block.generations_core.bleach_stone_slab": "Laje de Pedra Descolorida", + "block.generations_core.bleach_stone_stairs": "Escadas de Pedra Descolorida", + "block.generations_core.bleach_stone_wall": "Parede de Pedra Descolorida", + "block.generations_core.blue_couch_arm_left": "Braço Esquerdo de Sofá Azul", + "block.generations_core.blue_couch_arm_right": "Braço Direito de Sofá Azul", + "block.generations_core.blue_couch_corner_left": "Canto Esquerdo de Sofá Azul", + "block.generations_core.blue_couch_corner_right": "Canto Direito de Sofá Azul", + "block.generations_core.blue_couch_middle": "Meio de Sofá Azul", + "block.generations_core.blue_couch_ottoman": "Puff de Sofá Azul", + "block.generations_core.blue_elevator": "Elevador Azul", + "block.generations_core.blue_marble": "Mármore Azul", + "block.generations_core.blue_marble_button": "Botão de Mármore Azul", + "block.generations_core.blue_marble_pressure_plate": "Placa de Pressão de Mármore Azul", + "block.generations_core.blue_marble_slab": "Laje de Mármore Azul", + "block.generations_core.blue_marble_stairs": "Escadas de Mármore Azul", + "block.generations_core.blue_marble_wall": "Parede de Mármore Azul", + "block.generations_core.blue_pastel_bean_bag": "Puff Pastel Azul", + "block.generations_core.blue_pc": "PC Azul", + "block.generations_core.blue_poke_brick": "Tijolo Poké Azul", + "block.generations_core.blue_poke_brick_button": "Botão de Tijolo Poké Azul", + "block.generations_core.blue_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Azul", + "block.generations_core.blue_poke_brick_slab": "Laje de Tijolo Poké Azul", + "block.generations_core.blue_poke_brick_stairs": "Escadas de Tijolo Poké Azul", + "block.generations_core.blue_poke_brick_wall": "Parede de Tijolo Poké Azul", + "block.generations_core.blue_shingles": "Telhas Azuis", + "block.generations_core.blue_shingles_slab": "Laje de Telhas Azuis", + "block.generations_core.blue_shingles_stairs": "Escadas de Telhas Azuis", + "block.generations_core.blue_shingles_wall": "Parede de Telhas Azuis", + "block.generations_core.blue_street_lamp": "Poste de Rua Azul", + "block.generations_core.blue_swivel_chair": "Cadeira Giratória Azul", + "block.generations_core.blue_vending_machine": "Máquina de Vendas Azul", + "block.generations_core.blueghost_doll": "Boneco de Blueghost", + "block.generations_core.book_shelf": "Estante de Livros", + "block.generations_core.box": "Caixa", + "block.generations_core.bridge_block": "Bloco de Ponte", + "block.generations_core.bridge_block_slab": "Laje de Bloco de Ponte", + "block.generations_core.bridge_block_stairs": "Escadas de Bloco de Ponte", + "block.generations_core.bridge_block_wall": "Parede de Bloco de Ponte", + "block.generations_core.bright_charge_cobblestone": "Pedregulho de Carga Brilhante", + "block.generations_core.bright_charge_cobblestone_slab": "Laje de Pedregulho de Carga Brilhante", + "block.generations_core.bright_charge_cobblestone_stairs": "Escadas de Pedregulho de Carga Brilhante", + "block.generations_core.bright_charge_cobblestone_wall": "Parede de Pedregulho de Carga Brilhante", + "block.generations_core.bright_sandstone": "Arenito Brilhante", + "block.generations_core.bright_sandstone_slab": "Laje de Arenito Brilhante", + "block.generations_core.bright_sandstone_stairs": "Escadas de Arenito Brilhante", + "block.generations_core.bright_sandstone_wall": "Parede de Arenito Brilhante", + "block.generations_core.broken_castle_pillar": "Pilar de Castelo Quebrado", + "block.generations_core.brown_couch_arm_left": "Braço Esquerdo de Sofá Marrom", + "block.generations_core.brown_couch_arm_right": "Braço Direito de Sofá Marrom", + "block.generations_core.brown_couch_corner_left": "Canto Esquerdo de Sofá Marrom", + "block.generations_core.brown_couch_corner_right": "Canto Direito de Sofá Marrom", + "block.generations_core.brown_couch_middle": "Meio de Sofá Marrom", + "block.generations_core.brown_couch_ottoman": "Puff de Sofá Marrom", + "block.generations_core.brown_elevator": "Elevador Marrom", + "block.generations_core.brown_marble": "Mármore Marrom", + "block.generations_core.brown_marble_button": "Botão de Mármore Marrom","block.generations_core.brown_marble_pressure_plate": "Placa de Pressão de Mármore Marrom", + "block.generations_core.brown_marble_slab": "Laje de Mármore Marrom", + "block.generations_core.brown_marble_stairs": "Escadas de Mármore Marrom", + "block.generations_core.brown_marble_wall": "Parede de Mármore Marrom", + "block.generations_core.brown_pastel_bean_bag": "Puff Pastel Marrom", + "block.generations_core.brown_pc": "PC Marrom", + "block.generations_core.brown_poke_brick": "Tijolo Poké Marrom", + "block.generations_core.brown_poke_brick_button": "Botão de Tijolo Poké Marrom", + "block.generations_core.brown_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Marrom", + "block.generations_core.brown_poke_brick_slab": "Laje de Tijolo Poké Marrom", + "block.generations_core.brown_poke_brick_stairs": "Escadas de Tijolo Poké Marrom", + "block.generations_core.brown_poke_brick_wall": "Parede de Tijolo Poké Marrom", + "block.generations_core.brown_shingles": "Telhas Marrons", + "block.generations_core.brown_shingles_slab": "Laje de Telhas Marrons", + "block.generations_core.brown_shingles_stairs": "Escadas de Telhas Marrons", + "block.generations_core.brown_shingles_wall": "Parede de Telhas Marrons", + "block.generations_core.brown_street_lamp": "Poste de Rua Marrom", + "block.generations_core.brown_swivel_chair": "Cadeira Giratória Marrom", + "block.generations_core.brown_vending_machine": "Máquina de Vendas Marrom", + "block.generations_core.burst_turf": "Gramado Explosivo", + "block.generations_core.bush": "Arbusto", + "block.generations_core.castle_block": "Bloco de Castelo", + "block.generations_core.castle_block_slab": "Laje de Bloco de Castelo", + "block.generations_core.castle_block_stairs": "Escadas de Bloco de Castelo", + "block.generations_core.castle_block_wall": "Parede de Bloco de Castelo", + "block.generations_core.castle_brick": "Tijolo de Castelo", + "block.generations_core.castle_brick_2": "Tijolo de Castelo 2", + "block.generations_core.castle_brick_2_slab": "Laje de Tijolo de Castelo 2", + "block.generations_core.castle_brick_2_stairs": "Escadas de Tijolo de Castelo 2", + "block.generations_core.castle_brick_2_wall": "Parede de Tijolo de Castelo 2", + "block.generations_core.castle_brick_slab": "Laje de Tijolo de Castelo", + "block.generations_core.castle_brick_stairs": "Escadas de Tijolo de Castelo", + "block.generations_core.castle_brick_wall": "Parede de Tijolo de Castelo", + "block.generations_core.castle_floor": "Piso de Castelo", + "block.generations_core.castle_floor_slab": "Laje de Piso de Castelo", + "block.generations_core.castle_floor_stairs": "Escadas de Piso de Castelo", + "block.generations_core.castle_floor_wall": "Parede de Piso de Castelo", + "block.generations_core.castle_pillar": "Pilar de Castelo", + "block.generations_core.castle_wall": "Parede de Castelo", + "block.generations_core.castle_wall_2": "Parede de Castelo 2", + "block.generations_core.castle_wall_2_slab": "Laje de Parede de Castelo 2", + "block.generations_core.castle_wall_2_stairs": "Escadas de Parede de Castelo 2", + "block.generations_core.castle_wall_2_wall": "Parede de Parede de Castelo 2", + "block.generations_core.castle_wall_3": "Parede de Castelo 3", + "block.generations_core.castle_wall_3_slab": "Laje de Parede de Castelo 3", + "block.generations_core.castle_wall_3_stairs": "Escadas de Parede de Castelo 3", + "block.generations_core.castle_wall_3_wall": "Parede de Parede de Castelo 3", + "block.generations_core.castle_wall_4": "Parede de Castelo 4", + "block.generations_core.castle_wall_4_slab": "Laje de Parede de Castelo 4", + "block.generations_core.castle_wall_4_stairs": "Escadas de Parede de Castelo 4", + "block.generations_core.castle_wall_4_wall": "Parede de Parede de Castelo 4", + "block.generations_core.castle_wall_slab": "Laje de Parede de Castelo", + "block.generations_core.castle_wall_stairs": "Escadas de Parede de Castelo", + "block.generations_core.castle_wall_wall": "Parede de Parede de Castelo", + "block.generations_core.cave_rock": "Rocha de Caverna", + "block.generations_core.cave_rock_floor": "Piso de Rocha de Caverna", + "block.generations_core.cave_rock_floor_slab": "Laje de Piso de Rocha de Caverna", + "block.generations_core.cave_rock_floor_stairs": "Escadas de Piso de Rocha de Caverna", + "block.generations_core.cave_rock_floor_wall": "Parede de Piso de Rocha de Caverna", + "block.generations_core.cave_rock_slab": "Laje de Rocha de Caverna", + "block.generations_core.cave_rock_stairs": "Escadas de Rocha de Caverna", + "block.generations_core.cave_rock_wall": "Parede de Rocha de Caverna", + "block.generations_core.celebi_doll": "Boneco de Celebi", + "block.generations_core.celestial_altar": "Altar Celestial", + "block.generations_core.charge_cobblestone": "Pedregulho de Carga", + "block.generations_core.charge_cobblestone_slab": "Laje de Pedregulho de Carga", + "block.generations_core.charge_cobblestone_stairs": "Escadas de Pedregulho de Carga", + "block.generations_core.charge_cobblestone_wall": "Parede de Pedregulho de Carga", + "block.generations_core.charge_dripstone_block": "Bloco de Espeleotema de Carga", + "block.generations_core.charge_stone": "Pedra de Carga", + "block.generations_core.charge_stone_blast_furnace": "Alto Forno de Pedra de Carga", + "block.generations_core.charge_stone_brick_slab": "Laje de Tijolo de Pedra de Carga", + "block.generations_core.charge_stone_brick_stairs": "Escadas de Tijolo de Pedra de Carga", + "block.generations_core.charge_stone_brick_wall": "Parede de Tijolo de Pedra de Carga", + "block.generations_core.charge_stone_bricks": "Tijolos de Pedra de Carga", + "block.generations_core.charge_stone_button": "Botão de Pedra de Carga", + "block.generations_core.charge_stone_furnace": "Forno de Pedra de Carga", + "block.generations_core.charge_stone_pressure_plate": "Placa de Pressão de Pedra de Carga", + "block.generations_core.charge_stone_slab": "Laje de Pedra de Carga", + "block.generations_core.charge_stone_smoker": "Defumador de Pedra de Carga", + "block.generations_core.charge_stone_stairs": "Escadas de Pedra de Carga", + "block.generations_core.charge_stone_wall": "Parede de Pedra de Carga", + "block.generations_core.charizard_doll": "Boneco de Charizard", + "block.generations_core.cherish_ball_display": "Expositor de Cherish Ball", + "block.generations_core.cherish_ball_loot": "Recompensa de Cherish Ball", + "block.generations_core.chikorita_doll": "Boneco de Chikorita", + "block.generations_core.chiseled_charge_stone_bricks": "Tijolos de Pedra de Carga Ciselados", + "block.generations_core.chiseled_volcanic_stone_bricks": "Tijolos de Pedra Vulcânica Ciselados", + "block.generations_core.clefairy_doll": "Boneco de Clefairy", + "block.generations_core.cobble_ruins_1": "Ruínas de Pedregulho 1", + "block.generations_core.cobble_ruins_1_slab": "Laje de Ruínas de Pedregulho 1", + "block.generations_core.cobble_ruins_1_stairs": "Escadas de Ruínas de Pedregulho 1", + "block.generations_core.cobble_ruins_1_wall": "Parede de Ruínas de Pedregulho 1", + "block.generations_core.cobble_ruins_2": "Ruínas de Pedregulho 2", + "block.generations_core.cobble_ruins_2_slab": "Laje de Ruínas de Pedregulho 2", + "block.generations_core.cobble_ruins_2_stairs": "Escadas de Ruínas de Pedregulho 2", + "block.generations_core.cobble_ruins_2_wall": "Parede de Ruínas de Pedregulho 2", + "block.generations_core.cobble_ruins_3": "Ruínas de Pedregulho 3", + "block.generations_core.cobble_ruins_3_slab": "Laje de Ruínas de Pedregulho 3", + "block.generations_core.cobble_ruins_3_stairs": "Escadas de Ruínas de Pedregulho 3","block.generations_core.cobble_ruins_3_wall": "Parede de Ruínas de Pedregulho 3", + "block.generations_core.cobble_ruins_4": "Ruínas de Pedregulho 4", + "block.generations_core.cobble_ruins_4_slab": "Laje de Ruínas de Pedregulho 4", + "block.generations_core.cobble_ruins_4_stairs": "Escadas de Ruínas de Pedregulho 4", + "block.generations_core.cobble_ruins_4_wall": "Parede de Ruínas de Pedregulho 4", + "block.generations_core.compressed_polished_andesite": "Andesito Polido Comprimido", + "block.generations_core.compressed_polished_andesite_slab": "Laje de Andesito Polido Comprimido", + "block.generations_core.compressed_polished_andesite_stairs": "Escadas de Andesito Polido Comprimido", + "block.generations_core.compressed_polished_andesite_wall": "Parede de Andesito Polido Comprimido", + "block.generations_core.compressed_polished_deepslate": "Ardósia Profunda Polida Comprimida", + "block.generations_core.compressed_polished_deepslate_slab": "Laje de Ardósia Profunda Polida Comprimida", + "block.generations_core.compressed_polished_deepslate_stairs": "Escadas de Ardósia Profunda Polida Comprimida", + "block.generations_core.compressed_polished_deepslate_wall": "Parede de Ardósia Profunda Polida Comprimida", + "block.generations_core.compressed_polished_diorite": "Diorito Polido Comprimido", + "block.generations_core.compressed_polished_diorite_slab": "Laje de Diorito Polido Comprimido", + "block.generations_core.compressed_polished_diorite_stairs": "Escadas de Diorito Polido Comprimido", + "block.generations_core.compressed_polished_diorite_wall": "Parede de Diorito Polido Comprimido", + "block.generations_core.compressed_polished_granite": "Granito Polido Comprimido", + "block.generations_core.compressed_polished_granite_slab": "Laje de Granito Polido Comprimido", + "block.generations_core.compressed_polished_granite_stairs": "Escadas de Granito Polido Comprimido", + "block.generations_core.compressed_polished_granite_wall": "Parede de Granito Polido Comprimido", + "block.generations_core.cooking_pot": "Panela de Cozimento", + "block.generations_core.cool_stone": "Pedra Fresca", + "block.generations_core.cool_stone_slab": "Laje de Pedra Fresca", + "block.generations_core.cool_stone_stairs": "Escadas de Pedra Fresca", + "block.generations_core.cool_stone_wall": "Parede de Pedra Fresca", + "block.generations_core.couch": "Sofá", + "block.generations_core.cracked_castle_block": "Bloco de Castelo Rachado", + "block.generations_core.cracked_castle_block_slab": "Laje de Bloco de Castelo Rachado", + "block.generations_core.cracked_castle_block_stairs": "Escadas de Bloco de Castelo Rachado", + "block.generations_core.cracked_castle_block_wall": "Parede de Bloco de Castelo Rachado", + "block.generations_core.cracked_charge_stone_bricks": "Tijolos de Pedra de Carga Rachados", + "block.generations_core.cracked_volcanic_stone_bricks": "Tijolos de Pedra Vulcânica Rachados", + "block.generations_core.crate": "Caixote", + "block.generations_core.cresselia_doll": "Boneco de Cresselia", + "block.generations_core.crystal_block": "Bloco de Cristal", + "block.generations_core.crystal_light": "Luz de Cristal", + "block.generations_core.crystal_ore": "Minério de Cristal", + "block.generations_core.crystal_slab": "Laje de Cristal", + "block.generations_core.crystal_stairs": "Escadas de Cristal", + "block.generations_core.crystal_wall": "Parede de Cristal", + "block.generations_core.cubone_doll": "Boneco de Cubone", + "block.generations_core.cursed_carved_pumpkin": "Abóbora Esculpida Amaldiçoada", + "block.generations_core.cursed_jack_o_lantern": "Jack O' Lantern Amaldiçoada", + "block.generations_core.cursed_pumpkin": "Abóbora Amaldiçoada", + "block.generations_core.cyan_couch_arm_left": "Braço Esquerdo de Sofá Ciano", + "block.generations_core.cyan_couch_arm_right": "Braço Direito de Sofá Ciano", + "block.generations_core.cyan_couch_corner_left": "Canto Esquerdo de Sofá Ciano", + "block.generations_core.cyan_couch_corner_right": "Canto Direito de Sofá Ciano", + "block.generations_core.cyan_couch_middle": "Meio de Sofá Ciano", + "block.generations_core.cyan_couch_ottoman": "Puff de Sofá Ciano", + "block.generations_core.cyan_elevator": "Elevador Ciano", + "block.generations_core.cyan_marble": "Mármore Ciano", + "block.generations_core.cyan_marble_button": "Botão de Mármore Ciano", + "block.generations_core.cyan_marble_pressure_plate": "Placa de Pressão de Mármore Ciano", + "block.generations_core.cyan_marble_slab": "Laje de Mármore Ciano", + "block.generations_core.cyan_marble_stairs": "Escadas de Mármore Ciano", + "block.generations_core.cyan_marble_wall": "Parede de Mármore Ciano", + "block.generations_core.cyan_pastel_bean_bag": "Puff Pastel Ciano", + "block.generations_core.cyan_pc": "PC Ciano", + "block.generations_core.cyan_poke_brick": "Tijolo Poké Ciano", + "block.generations_core.cyan_poke_brick_button": "Botão de Tijolo Poké Ciano", + "block.generations_core.cyan_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Ciano", + "block.generations_core.cyan_poke_brick_slab": "Laje de Tijolo Poké Ciano", + "block.generations_core.cyan_poke_brick_stairs": "Escadas de Tijolo Poké Ciano", + "block.generations_core.cyan_poke_brick_wall": "Parede de Tijolo Poké Ciano", + "block.generations_core.cyan_shingles": "Telhas Ciano", + "block.generations_core.cyan_shingles_slab": "Laje de Telhas Ciano", + "block.generations_core.cyan_shingles_stairs": "Escadas de Telhas Ciano", + "block.generations_core.cyan_shingles_wall": "Parede de Telhas Ciano", + "block.generations_core.cyan_street_lamp": "Poste de Rua Ciano", + "block.generations_core.cyan_swivel_chair": "Cadeira Giratória Ciano", + "block.generations_core.cyan_vending_machine": "Máquina de Vendas Ciano", + "block.generations_core.cyndaquil_doll": "Boneco de Cyndaquil", + "block.generations_core.dark_crystal": "Cristal Escuro", + "block.generations_core.dark_crystal.tooltip": "§7DICA: Ele está te guiando para um pentagrama. Você precisará de 5 no total e prevalecer contra a luz.", + "block.generations_core.dark_prismarine_pillar": "Pilar de Prismarinho Escuro", + "block.generations_core.dark_prismarine_pillar_broken": "Pilar de Prismarinho Escuro Quebrado", + "block.generations_core.darkrai_doll": "Boneco de Darkrai", + "block.generations_core.dawn_stone_block": "Bloco de Pedra do Amanhecer", + "block.generations_core.deepslate_crystal_ore": "Minério de Cristal de Ardósia Profunda", + "block.generations_core.deepslate_megastone_ore": "Minério de Mega Stone de Ardósia Profunda", + "block.generations_core.deepslate_meteorite_ore": "Minério de Meteorito de Ardósia Profunda", + "block.generations_core.deepslate_ruby_ore": "Minério de Rubi de Ardósia Profunda", + "block.generations_core.deepslate_sapphire_ore": "Minério de Safira de Ardósia Profunda", + "block.generations_core.deepslate_silicon_ore": "Minério de Silício de Ardósia Profunda", + "block.generations_core.deepslate_tera_shard_ore": "Minério de Caco Tera de Ardósia Profunda", + "block.generations_core.deepslate_z_crystal_ore": "Minério de Cristal Z de Ardósia Profunda", + "block.generations_core.deoxys_doll": "Boneco de Deoxys", + "block.generations_core.desk": "Mesa de Escritório", + "block.generations_core.dialga_doll": "Boneco de Dialga", + "block.generations_core.ditto_doll": "Boneco de Ditto", + "block.generations_core.dive_ball_display": "Expositor de Dive Ball", + "block.generations_core.dive_ball_loot": "Recompensa de Dive Ball", + "block.generations_core.double_ballonlea_blue_mushroom": "Cogumelo Azul Duplo de Ballonlea", + "block.generations_core.double_ballonlea_green_mushroom": "Cogumelo Verde Duplo de Ballonlea", + "block.generations_core.double_ballonlea_pink_mushroom": "Cogumelo Rosa Duplo de Ballonlea", + "block.generations_core.double_ballonlea_yellow_mushroom": "Cogumelo Amarelo Duplo de Ballonlea", + "block.generations_core.double_street_lamp": "Poste de Rua Duplo", + "block.generations_core.dream_ball_loot": "Recompensa de Dream Ball", + "block.generations_core.dusk_ball_loot": "Recompensa de Dusk Ball", + "block.generations_core.dusk_stone_block": "Bloco de Pedra do Luar", + "block.generations_core.duskull_doll": "Boneco de Duskull", + "block.generations_core.dusty_ruins_wall": "Parede de Ruínas Empoeiradas", + "block.generations_core.eevee_doll": "Boneco de Eevee", + "block.generations_core.ekans_doll": "Boneco de Ekans", + "block.generations_core.empty_ball_display": "Expositor de Pokebola Vazio", + "block.generations_core.enchanted_obsidian": "Obsidiana Encantada", + "block.generations_core.enchanted_obsidian_button": "Botão de Obsidiana Encantada", + "block.generations_core.enchanted_obsidian_pressure_plate": "Placa de Pressão de Obsidiana Encantada", + "block.generations_core.enchanted_obsidian_slab": "Laje de Obsidiana Encantada", + "block.generations_core.enchanted_obsidian_stairs": "Escadas de Obsidiana Encantada", + "block.generations_core.enchanted_obsidian_wall": "Parede de Obsidiana Encantada", + "block.generations_core.entei_doll": "Boneco de Entei", + "block.generations_core.fast_ball_display": "Expositor de Fast Ball", + "block.generations_core.fast_ball_loot": "Recompensa de Fast Ball", + "block.generations_core.fiery_shrine": "Santuário Flamejante", + "block.generations_core.fire_stone_block": "Bloco de Fire Stone", + "block.generations_core.flabebe_flower_az": "Flor de Flabebe Az", + "block.generations_core.flabebe_flower_blue": "Flor Azul de Flabebe", + "block.generations_core.flabebe_flower_orange": "Flor Laranja de Flabebe", + "block.generations_core.flabebe_flower_red": "Flor Vermelha de Flabebe", + "block.generations_core.flabebe_flower_white": "Flor Branca de Flabebe", + "block.generations_core.flabebe_flower_yellow": "Flor Amarela de Flabebe", + "block.generations_core.floor_1": "Chão 1", + "block.generations_core.floor_1_slab": "Laje de Chão 1", + "block.generations_core.floor_1_stairs": "Escadas de Chão 1", + "block.generations_core.floor_1_wall": "Parede de Chão 1", + "block.generations_core.floor_2": "Chão 2", + "block.generations_core.floor_2_slab": "Laje de Chão 2", + "block.generations_core.floor_2_stairs": "Escadas de Chão 2", + "block.generations_core.floor_2_wall": "Parede de Chão 2", + "block.generations_core.floor_3": "Chão 3", + "block.generations_core.floor_3_slab": "Laje de Chão 3", + "block.generations_core.floor_3_stairs": "Escadas de Chão 3", + "block.generations_core.floor_3_wall": "Parede de Chão 3", + "block.generations_core.floor_4": "Chão 4", + "block.generations_core.floor_4_slab": "Laje de Chão 4", + "block.generations_core.floor_4_stairs": "Escadas de Chão 4", + "block.generations_core.floor_4_wall": "Parede de Chão 4", + "block.generations_core.foongus_cushion": "Almofada de Foongus", + "block.generations_core.fridge": "Geladeira", + "block.generations_core.friend_ball_display": "Expositor de Friend Ball", + "block.generations_core.friend_ball_loot": "Recompensa de Friend Ball", + "block.generations_core.frozen_shrine": "Santuário Congelado", + "block.generations_core.ghost_bookshelf": "Estante de Livros Fantasma", + "block.generations_core.ghost_brick_slab": "Laje de Tijolo Fantasma", + "block.generations_core.ghost_brick_stairs": "Escadas de Tijolo Fantasma", + "block.generations_core.ghost_brick_wall": "Parede de Tijolo Fantasma", + "block.generations_core.ghost_bricks": "Tijolos Fantasma", + "block.generations_core.ghost_button": "Botão Fantasma", + "block.generations_core.ghost_crafting_table": "Bancada Fantasma", + "block.generations_core.ghost_door": "Porta Fantasma", + "block.generations_core.ghost_fence": "Cerca Fantasma", + "block.generations_core.ghost_fence_gate": "Portão de Cerca Fantasma", + "block.generations_core.ghost_hanging_sign": "Placa Suspensa Fantasma", + "block.generations_core.ghost_lantern": "Lanterna Fantasma", + "block.generations_core.ghost_log": "Tora Fantasma", + "block.generations_core.ghost_obelisk": "Obelisco Fantasma", + "block.generations_core.ghost_obelisk_slab": "Laje de Obelisco Fantasma", + "block.generations_core.ghost_obelisk_stairs": "Escadas de Obelisco Fantasma", + "block.generations_core.ghost_obelisk_wall": "Parede de Obelisco Fantasma", + "block.generations_core.ghost_pillar": "Pilar Fantasma", + "block.generations_core.ghost_planks": "Tábuas Fantasma", + "block.generations_core.ghost_pressure_plate": "Placa de Pressão Fantasma", + "block.generations_core.ghost_sign": "Placa Fantasma", + "block.generations_core.ghost_slab": "Laje Fantasma", + "block.generations_core.ghost_stairs": "Escadas Fantasma", + "block.generations_core.ghost_trapdoor": "Alçapão Fantasma", + "block.generations_core.ghost_wood": "Madeira Fantasma", + "block.generations_core.gigaton_ball_loot": "Recompensa de Gigaton Ball", + "block.generations_core.giratina_altered_doll": "Boneco de Giratina Forma Alterada", + "block.generations_core.giratina_origin_doll": "Boneco de Giratina Forma Original", + "block.generations_core.glowing_charge_cobblestone": "Pedregulho de Carga Brilhante", + "block.generations_core.glowing_charge_cobblestone_slab": "Laje de Pedregulho de Carga Brilhante", + "block.generations_core.glowing_charge_cobblestone_stairs": "Escadas de Pedregulho de Carga Brilhante", + "block.generations_core.glowing_charge_cobblestone_wall": "Parede de Pedregulho de Carga Brilhante", + "block.generations_core.golden_temple_chiseled_sandstone": "Arenito Ciselado de Templo Dourado", + "block.generations_core.golden_temple_cut_sandstone": "Arenito Cortado de Templo Dourado", + "block.generations_core.golden_temple_cut_sandstone_slab": "Laje de Arenito Cortado de Templo Dourado", + "block.generations_core.golden_temple_dark_prismarine": "Prismarinho Escuro de Templo Dourado", + "block.generations_core.golden_temple_dark_prismarine_slab": "Laje de Prismarinho Escuro de Templo Dourado", + "block.generations_core.golden_temple_dark_prismarine_stairs": "Escadas de Prismarinho Escuro de Templo Dourado", + "block.generations_core.golden_temple_dark_prismarine_wall": "Parede de Prismarinho Escuro de Templo Dourado", + "block.generations_core.golden_temple_prismarine": "Prismarinho de Templo Dourado", + "block.generations_core.golden_temple_prismarine_brick_slab": "Laje de Tijolo de Prismarinho de Templo Dourado", + "block.generations_core.golden_temple_prismarine_brick_stairs": "Escadas de Tijolo de Prismarinho de Templo Dourado", + "block.generations_core.golden_temple_prismarine_brick_wall": "Parede de Tijolo de Prismarinho de Templo Dourado", + "block.generations_core.golden_temple_prismarine_bricks": "Tijolos de Prismarinho de Templo Dourado", + "block.generations_core.golden_temple_prismarine_slab": "Laje de Prismarinho de Templo Dourado", + "block.generations_core.golden_temple_prismarine_stairs": "Escadas de Prismarinho de Templo Dourado", + "block.generations_core.golden_temple_prismarine_wall": "Parede de Prismarinho de Templo Dourado", + "block.generations_core.golden_temple_sand": "Areia de Templo Dourado", + "block.generations_core.golden_temple_sandstone": "Arenito de Templo Dourado", + "block.generations_core.golden_temple_sandstone_slab": "Laje de Arenito de Templo Dourado", + "block.generations_core.golden_temple_sandstone_stairs": "Escadas de Arenito de Templo Dourado", + "block.generations_core.golden_temple_sandstone_wall": "Parede de Arenito de Templo Dourado", + "block.generations_core.golden_temple_smooth_sandstone": "Arenito Liso de Templo Dourado", + "block.generations_core.golden_temple_smooth_sandstone_slab": "Laje de Arenito Liso de Templo Dourado", + "block.generations_core.golden_temple_smooth_sandstone_stairs": "Escadas de Arenito Liso de Templo Dourado", + "block.generations_core.golden_temple_smooth_sandstone_wall": "Parede de Arenito Liso de Templo Dourado", + "block.generations_core.gray_castle_brick": "Tijolo de Castelo Cinza", + "block.generations_core.gray_castle_brick_2": "Tijolo de Castelo Cinza 2", + "block.generations_core.gray_castle_brick_2_slab": "Laje de Tijolo de Castelo Cinza 2", + "block.generations_core.gray_castle_brick_2_stairs": "Escadas de Tijolo de Castelo Cinza 2", + "block.generations_core.gray_castle_brick_2_wall": "Parede de Tijolo de Castelo Cinza 2", + "block.generations_core.gray_castle_brick_slab": "Laje de Tijolo de Castelo Cinza", + "block.generations_core.gray_castle_brick_stairs": "Escadas de Tijolo de Castelo Cinza", + "block.generations_core.gray_castle_brick_wall": "Parede de Tijolo de Castelo Cinza", + "block.generations_core.gray_cave_rock_floor": "Piso de Rocha de Caverna Cinza", + "block.generations_core.gray_cave_rock_floor_slab": "Laje de Piso de Rocha de Caverna Cinza", + "block.generations_core.gray_cave_rock_floor_stairs": "Escadas de Piso de Rocha de Caverna Cinza", + "block.generations_core.gray_cave_rock_floor_wall": "Parede de Piso de Rocha de Caverna Cinza", + "block.generations_core.gray_couch_arm_left": "Braço Esquerdo de Sofá Cinza", + "block.generations_core.gray_couch_arm_right": "Braço Direito de Sofá Cinza", + "block.generations_core.gray_couch_corner_left": "Canto Esquerdo de Sofá Cinza", + "block.generations_core.gray_couch_corner_right": "Canto Direito de Sofá Cinza", + "block.generations_core.gray_couch_middle": "Meio de Sofá Cinza", + "block.generations_core.gray_couch_ottoman": "Puff de Sofá Cinza", + "block.generations_core.gray_elevator": "Elevador Cinza", + "block.generations_core.gray_marble": "Mármore Cinza", + "block.generations_core.gray_marble_button": "Botão de Mármore Cinza", + "block.generations_core.gray_marble_pressure_plate": "Placa de Pressão de Mármore Cinza", + "block.generations_core.gray_marble_slab": "Laje de Mármore Cinza", + "block.generations_core.gray_marble_stairs": "Escadas de Mármore Cinza", + "block.generations_core.gray_marble_wall": "Parede de Mármore Cinza", + "block.generations_core.gray_pastel_bean_bag": "Puff Pastel Cinza", + "block.generations_core.gray_pc": "PC Cinza", + "block.generations_core.gray_poke_brick": "Tijolo Poké Cinza", + "block.generations_core.gray_poke_brick_button": "Botão de Tijolo Poké Cinza", + "block.generations_core.gray_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Cinza", + "block.generations_core.gray_poke_brick_slab": "Laje de Tijolo Poké Cinza", + "block.generations_core.gray_poke_brick_stairs": "Escadas de Tijolo Poké Cinza", + "block.generations_core.gray_poke_brick_wall": "Parede de Tijolo Poké Cinza", + "block.generations_core.gray_shingles": "Telhas Cinzas", + "block.generations_core.gray_shingles_slab": "Laje de Telhas Cinzas", + "block.generations_core.gray_shingles_stairs": "Escadas de Telhas Cinzas", + "block.generations_core.gray_shingles_wall": "Parede de Telhas Cinzas", + "block.generations_core.gray_street_lamp": "Poste de Rua Cinza", + "block.generations_core.gray_swivel_chair": "Cadeira Giratória Cinza", + "block.generations_core.gray_vending_machine": "Máquina de Vendas Cinza", + "block.generations_core.great_ball_display": "Expositor de Great Ball", + "block.generations_core.great_ball_loot": "Recompensa de Great Ball", + "block.generations_core.greatball_chest": "Baú de Great Ball", + "block.generations_core.greatball_cushion": "Almofada de Great Ball", + "block.generations_core.green_couch_arm_left": "Braço Esquerdo de Sofá Verde", + "block.generations_core.green_couch_arm_right": "Braço Direito de Sofá Verde", + "block.generations_core.green_couch_corner_left": "Canto Esquerdo de Sofá Verde", + "block.generations_core.green_couch_corner_right": "Canto Direito de Sofá Verde", + "block.generations_core.green_couch_middle": "Meio de Sofá Verde", + "block.generations_core.green_couch_ottoman": "Puff de Sofá Verde", + "block.generations_core.green_elevator": "Elevador Verde", + "block.generations_core.green_marble": "Mármore Verde", + "block.generations_core.green_marble_button": "Botão de Mármore Verde", + "block.generations_core.green_marble_pressure_plate": "Placa de Pressão de Mármore Verde", + "block.generations_core.green_marble_slab": "Laje de Mármore Verde", + "block.generations_core.green_marble_stairs": "Escadas de Mármore Verde", + "block.generations_core.green_marble_wall": "Parede de Mármore Verde", + "block.generations_core.green_pastel_bean_bag": "Puff Pastel Verde", + "block.generations_core.green_pc": "PC Verde", + "block.generations_core.green_poke_brick": "Tijolo Poké Verde", + "block.generations_core.green_poke_brick_button": "Botão de Tijolo Poké Verde", + "block.generations_core.green_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Verde", + "block.generations_core.green_poke_brick_slab": "Laje de Tijolo Poké Verde", + "block.generations_core.green_poke_brick_stairs": "Escadas de Tijolo Poké Verde", + "block.generations_core.green_poke_brick_wall": "Parede de Tijolo Poké Verde", + "block.generations_core.green_shingles": "Telhas Verdes", + "block.generations_core.green_shingles_slab": "Laje de Telhas Verdes", + "block.generations_core.green_shingles_stairs": "Escadas de Telhas Verdes", + "block.generations_core.green_shingles_wall": "Parede de Telhas Verdes", + "block.generations_core.green_street_lamp": "Poste de Rua Verde", + "block.generations_core.green_swivel_chair": "Cadeira Giratória Verde", + "block.generations_core.green_vending_machine": "Máquina de Vendas Verde", + "block.generations_core.groudon_doll": "Boneco de Groudon", + "block.generations_core.groudon_shrine": "Santuário de Groudon", + "block.generations_core.group_ballonlea_blue_mushroom": "Grupo de Cogumelos Azuis de Ballonlea", + "block.generations_core.group_ballonlea_green_mushroom": "Grupo de Cogumelos Verdes de Ballonlea", + "block.generations_core.group_ballonlea_pink_mushroom": "Grupo de Cogumelos Rosas de Ballonlea", + "block.generations_core.group_ballonlea_yellow_mushroom": "Grupo de Cogumelos Amarelos de Ballonlea", + "block.generations_core.gulpin_doll": "Boneco de Gulpin", + "block.generations_core.haunted_pillar": "Pilar Assombrado", + "block.generations_core.haunted_pillar_broken": "Pilar Assombrado Quebrado", + "block.generations_core.hdtv": "HDTV", + "block.generations_core.heal_ball_display": "Expositor de Heal Ball", + "block.generations_core.heal_ball_loot": "Recompensa de Heal Ball", + "block.generations_core.heavy_ball_display": "Expositor de Heavy Ball", + "block.generations_core.heavy_ball_loot": "Recompensa de Heavy Ball", + "block.generations_core.heracross_doll": "Boneco de Heracross", + "block.generations_core.ho_oh_shrine": "Santuário de Ho-Oh", + "block.generations_core.hooh_doll": "Boneco de Ho-Oh", + "block.generations_core.house_floor_1": "Chão de Casa 1", + "block.generations_core.house_floor_2": "Chão de Casa 2", + "block.generations_core.house_floor_3": "Chão de Casa 3", + "block.generations_core.house_floor_4": "Chão de Casa 4", + "block.generations_core.house_floor_5": "Chão de Casa 5", + "block.generations_core.house_floor_6": "Chão de Casa 6", + "block.generations_core.house_floor_7": "Chão de Casa 7", + "block.generations_core.house_floor_8": "Chão de Casa 8", + "block.generations_core.house_lamp": "Luminária de Casa", + "block.generations_core.ice_brick": "Ice Brick", + "block.generations_core.ice_brick_slab": "Laje de Tijolo de Gelo", + "block.generations_core.ice_brick_stairs": "Escadas de Tijolo de Gelo", + "block.generations_core.ice_brick_wall": "Parede de Tijolo de Gelo", + "block.generations_core.ice_cave_rock_floor": "Piso de Rocha de Caverna de Gelo", + "block.generations_core.ice_cave_rock_floor_slab": "Laje de Piso de Rocha de Caverna de Gelo", + "block.generations_core.ice_cave_rock_floor_stairs": "Escadas de Piso de Rocha de Caverna de Gelo", + "block.generations_core.ice_cave_rock_floor_wall": "Parede de Piso de Rocha de Caverna de Gelo", + "block.generations_core.ice_pillar": "Pilar de Gelo", + "block.generations_core.ice_pillar_broken": "Pilar de Gelo Quebrado", + "block.generations_core.ice_pillar_side": "Lateral de Pilar de Gelo", + "block.generations_core.ice_pillar_side_slab": "Laje de Lateral de Pilar de Gelo", + "block.generations_core.ice_pillar_side_stairs": "Escadas de Lateral de Pilar de Gelo", + "block.generations_core.ice_pillar_side_wall": "Parede de Lateral de Pilar de Gelo", + "block.generations_core.ice_pillar_top": "Topo de Pilar de Gelo", + "block.generations_core.ice_pillar_top_slab": "Laje de Topo de Pilar de Gelo", + "block.generations_core.ice_pillar_top_stairs": "Escadas de Topo de Pilar de Gelo", + "block.generations_core.ice_pillar_top_wall": "Parede de Topo de Pilar de Gelo", + "block.generations_core.ice_stone_block": "Bloco de Ice Stone", + "block.generations_core.infested_charge_cobblestone": "Pedregulho de Carga Infestado", + "block.generations_core.infested_charge_stone": "Pedra de Carga Infestada", + "block.generations_core.infested_charge_stone_bricks": "Tijolos de Pedra de Carga Infestada", + "block.generations_core.infested_chiseled_charge_stone_bricks": "Tijolos de Pedra de Carga Ciselados Infestados", + "block.generations_core.infested_chiseled_volcanic_stone_bricks": "Tijolos de Pedra Vulcânica Ciselados Infestados", + "block.generations_core.infested_cracked_charge_stone_bricks": "Tijolos de Pedra de Carga Rachados Infestados", + "block.generations_core.infested_cracked_volcanic_stone_bricks": "Tijolos de Pedra Vulcânica Rachados Infestados", + "block.generations_core.infested_mossy_charge_stone_bricks": "Tijolos de Pedra de Carga Musgosos Infestados", + "block.generations_core.infested_mossy_volcanic_stone_bricks": "Tijolos de Pedra Vulcânica Musgosos Infestados", + "block.generations_core.infested_volcanic_cobblestone": "Pedregulho Vulcânico Infestado", + "block.generations_core.infested_volcanic_stone": "Pedra Vulcânica Infestada", + "block.generations_core.infested_volcanic_stone_bricks": "Tijolos de Pedra Vulcânica Infestada", + "block.generations_core.jet_ball_loot": "Recompensa de Jet Ball", + "block.generations_core.jigglypuff_doll": "Boneco de Jigglypuff", + "block.generations_core.jirachi_doll": "Boneco de Jirachi", + "block.generations_core.kecleon_doll": "Boneco de Kecleon", + "block.generations_core.krabby_doll": "Boneco de Krabby", + "block.generations_core.kyogre_doll": "Boneco de Kyogre", + "block.generations_core.kyogre_shrine": "Santuário de Kyogre", + "block.generations_core.lapras_doll": "Boneco de Lapras", + "block.generations_core.latias_doll": "Boneco de Latias", + "block.generations_core.latios_doll": "Boneco de Latios", + "block.generations_core.leaden_ball_loot": "Recompensa de Leaden Ball", + "block.generations_core.leaf_stone_block": "Bloco de Leaf Stone", + "block.generations_core.level_ball_display": "Expositor de Level Ball", + "block.generations_core.level_ball_loot": "Recompensa de Level Ball", + "block.generations_core.light_blue_couch_arm_left": "Braço Esquerdo de Sofá Azul Claro", + "block.generations_core.light_blue_couch_arm_right": "Braço Direito de Sofá Azul Claro", + "block.generations_core.light_blue_couch_corner_left": "Canto Esquerdo de Sofá Azul Claro", + "block.generations_core.light_blue_couch_corner_right": "Canto Direito de Sofá Azul Claro", + "block.generations_core.light_blue_couch_middle": "Meio de Sofá Azul Claro", + "block.generations_core.light_blue_couch_ottoman": "Puff de Sofá Azul Claro", + "block.generations_core.light_blue_elevator": "Elevador Azul Claro", + "block.generations_core.light_blue_marble": "Mármore Azul Claro", + "block.generations_core.light_blue_marble_button": "Botão de Mármore Azul Claro", + "block.generations_core.light_blue_marble_pressure_plate": "Placa de Pressão de Mármore Azul Claro", + "block.generations_core.light_blue_marble_slab": "Laje de Mármore Azul Claro", + "block.generations_core.light_blue_marble_stairs": "Escadas de Mármore Azul Claro", + "block.generations_core.light_blue_marble_wall": "Parede de Mármore Azul Claro", + "block.generations_core.light_blue_pastel_bean_bag": "Puff Pastel Azul Claro", + "block.generations_core.light_blue_pc": "PC Azul Claro", + "block.generations_core.light_blue_poke_brick": "Tijolo Poké Azul Claro", + "block.generations_core.light_blue_poke_brick_button": "Botão de Tijolo Poké Azul Claro", + "block.generations_core.light_blue_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Azul Claro", + "block.generations_core.light_blue_poke_brick_slab": "Laje de Tijolo Poké Azul Claro", + "block.generations_core.light_blue_poke_brick_stairs": "Escadas de Tijolo Poké Azul Claro", + "block.generations_core.light_blue_poke_brick_wall": "Parede de Tijolo Poké Azul Claro", + "block.generations_core.light_blue_shingles": "Telhas Azuis Claras", + "block.generations_core.light_blue_shingles_slab": "Laje de Telhas Azuis Claras", + "block.generations_core.light_blue_shingles_stairs": "Escadas de Telhas Azuis Claras", + "block.generations_core.light_blue_shingles_wall": "Parede de Telhas Azuis Claras", + "block.generations_core.light_blue_street_lamp": "Poste de Rua Azul Claro", + "block.generations_core.light_blue_swivel_chair": "Cadeira Giratória Azul Claro", + "block.generations_core.light_blue_vending_machine": "Máquina de Vendas Azul Claro", + "block.generations_core.light_crystal": "Cristal de Luz", + "block.generations_core.light_crystal.tooltip": "§7DICA: Ele está te guiando para um pentagrama. Você precisará de 5 no total e prevalecer contra o escuro.", + "block.generations_core.light_gray_couch_arm_left": "Braço Esquerdo de Sofá Cinza Claro", + "block.generations_core.light_gray_couch_arm_right": "Braço Direito de Sofá Cinza Claro", + "block.generations_core.light_gray_couch_corner_left": "Canto Esquerdo de Sofá Cinza Claro", + "block.generations_core.light_gray_couch_corner_right": "Canto Direito de Sofá Cinza Claro", + "block.generations_core.light_gray_couch_middle": "Meio de Sofá Cinza Claro", + "block.generations_core.light_gray_couch_ottoman": "Puff de Sofá Cinza Claro", + "block.generations_core.light_gray_elevator": "Elevador Cinza Claro", + "block.generations_core.light_gray_marble": "Mármore Cinza Claro", + "block.generations_core.light_gray_marble_button": "Botão de Mármore Cinza Claro", + "block.generations_core.light_gray_marble_pressure_plate": "Placa de Pressão de Mármore Cinza Claro", + "block.generations_core.light_gray_marble_slab": "Laje de Mármore Cinza Claro", + "block.generations_core.light_gray_marble_stairs": "Escadas de Mármore Cinza Claro", + "block.generations_core.light_gray_marble_wall": "Parede de Mármore Cinza Claro", + "block.generations_core.light_gray_pastel_bean_bag": "Puff Pastel Cinza Claro", + "block.generations_core.light_gray_pc": "PC Cinza Claro", + "block.generations_core.light_gray_poke_brick": "Tijolo Poké Cinza Claro", + "block.generations_core.light_gray_poke_brick_button": "Botão de Tijolo Poké Cinza Claro", + "block.generations_core.light_gray_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Cinza Claro", + "block.generations_core.light_gray_poke_brick_slab": "Laje de Tijolo Poké Cinza Claro", + "block.generations_core.light_gray_poke_brick_stairs": "Escadas de Tijolo Poké Cinza Claro", + "block.generations_core.light_gray_poke_brick_wall": "Parede de Tijolo Poké Cinza Claro", + "block.generations_core.light_gray_shingles": "Telhas Cinzas Claras", + "block.generations_core.light_gray_shingles_slab": "Laje de Telhas Cinzas Claras", + "block.generations_core.light_gray_shingles_stairs": "Escadas de Telhas Cinzas Claras", + "block.generations_core.light_gray_shingles_wall": "Parede de Telhas Cinzas Claras", + "block.generations_core.light_gray_street_lamp": "Poste de Rua Cinza Claro", + "block.generations_core.light_gray_swivel_chair": "Cadeira Giratória Cinza Claro", + "block.generations_core.light_gray_vending_machine": "Máquina de Vendas Cinza Claro", + "block.generations_core.lightning_lantern": "Lanterna de Relâmpago", + "block.generations_core.lime_couch_arm_left": "Braço Esquerdo de Sofá Lima", + "block.generations_core.lime_couch_arm_right": "Braço Direito de Sofá Lima", + "block.generations_core.lime_couch_corner_left": "Canto Esquerdo de Sofá Lima", + "block.generations_core.lime_couch_corner_right": "Canto Direito de Sofá Lima", + "block.generations_core.lime_couch_middle": "Meio de Sofá Lima", + "block.generations_core.lime_couch_ottoman": "Puff de Sofá Lima", + "block.generations_core.lime_elevator": "Elevador Lima", + "block.generations_core.lime_marble": "Mármore Lima", + "block.generations_core.lime_marble_button": "Botão de Mármore Lima", + "block.generations_core.lime_marble_pressure_plate": "Placa de Pressão de Mármore Lima", + "block.generations_core.lime_marble_slab": "Laje de Mármore Lima", + "block.generations_core.lime_marble_stairs": "Escadas de Mármore Lima", + "block.generations_core.lime_marble_wall": "Parede de Mármore Lima", + "block.generations_core.lime_pastel_bean_bag": "Puff Pastel Lima", + "block.generations_core.lime_pc": "PC Lima", + "block.generations_core.lime_poke_brick": "Tijolo Poké Lima", + "block.generations_core.lime_poke_brick_button": "Botão de Tijolo Poké Lima", + "block.generations_core.lime_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Lima", + "block.generations_core.lime_poke_brick_slab": "Laje de Tijolo Poké Lima", + "block.generations_core.lime_poke_brick_stairs": "Escadas de Tijolo Poké Lima", + "block.generations_core.lime_poke_brick_wall": "Parede de Tijolo Poké Lima", + "block.generations_core.lime_shingles": "Telhas Limas", + "block.generations_core.lime_shingles_slab": "Laje de Telhas Limas", + "block.generations_core.lime_shingles_stairs": "Escadas de Telhas Limas", + "block.generations_core.lime_shingles_wall": "Parede de Telhas Limas", + "block.generations_core.lime_street_lamp": "Poste de Rua Lima", + "block.generations_core.lime_swivel_chair": "Cadeira Giratória Lima", + "block.generations_core.lime_vending_machine": "Máquina de Vendas Lima", + "block.generations_core.litten_doll": "Boneco de Litten", + "block.generations_core.litwick_candle": "Vela de Litwick", + "block.generations_core.litwick_candles": "Velas de Litwick", + "block.generations_core.lotad_doll": "Boneco de Lotad", + "block.generations_core.love_ball_display": "Expositor de Love Ball", + "block.generations_core.love_ball_loot": "Recompensa de Love Ball", + "block.generations_core.lugia_doll": "Boneco de Lugia", + "block.generations_core.lugia_shrine": "Santuário de Lugia", + "block.generations_core.lunar_shrine": "Santuário Lunar", + "block.generations_core.lunar_shrine.tooltip": "§7DICA: Parece vazio, estranhamente como a sensação de uma dor de coração. Um ritual de invocação deve ocorrer aqui. Um grito profundo e malévolo é subitamente ouvido no seu ouvido esquerdo – “Almas”. Quase imediatamente depois, um grito angelical de tom mais alto é ouvido no seu direito – “Almas”. Assustador.", + "block.generations_core.lure_ball_display": "Expositor de Lure Ball", + "block.generations_core.lure_ball_loot": "Recompensa de Lure Ball", + "block.generations_core.luxury_ball_display": "Expositor de Luxury Ball", + "block.generations_core.luxury_ball_loot": "Recompensa de Luxury Ball", + "block.generations_core.magenta_couch_arm_left": "Braço Esquerdo de Sofá Magenta", + "block.generations_core.magenta_couch_arm_right": "Braço Direito de Sofá Magenta", + "block.generations_core.magenta_couch_corner_left": "Canto Esquerdo de Sofá Magenta", + "block.generations_core.magenta_couch_corner_right": "Canto Direito de Sofá Magenta", + "block.generations_core.magenta_couch_middle": "Meio de Sofá Magenta", + "block.generations_core.magenta_couch_ottoman": "Puff de Sofá Magenta", + "block.generations_core.magenta_elevator": "Elevador Magenta", + "block.generations_core.magenta_marble": "Mármore Magenta", + "block.generations_core.magenta_marble_button": "Botão de Mármore Magenta", + "block.generations_core.magenta_marble_pressure_plate": "Placa de Pressão de Mármore Magenta", + "block.generations_core.magenta_marble_slab": "Laje de Mármore Magenta", + "block.generations_core.magenta_marble_stairs": "Escadas de Mármore Magenta", + "block.generations_core.magenta_marble_wall": "Parede de Mármore Magenta", + "block.generations_core.magenta_pastel_bean_bag": "Puff Pastel Magenta", + "block.generations_core.magenta_pc": "PC Magenta", + "block.generations_core.magenta_poke_brick": "Tijolo Poké Magenta", + "block.generations_core.magenta_poke_brick_button": "Botão de Tijolo Poké Magenta", + "block.generations_core.magenta_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Magenta", + "block.generations_core.magenta_poke_brick_slab": "Laje de Tijolo Poké Magenta", + "block.generations_core.magenta_poke_brick_stairs": "Escadas de Tijolo Poké Magenta", + "block.generations_core.magenta_poke_brick_wall": "Parede de Tijolo Poké Magenta", + "block.generations_core.magenta_shingles": "Telhas Magenta", + "block.generations_core.magenta_shingles_slab": "Laje de Telhas Magenta", + "block.generations_core.magenta_shingles_stairs": "Escadas de Telhas Magenta", + "block.generations_core.magenta_shingles_wall": "Parede de Telhas Magenta", + "block.generations_core.magenta_street_lamp": "Poste de Rua Magenta", + "block.generations_core.magenta_swivel_chair": "Cadeira Giratória Magenta", + "block.generations_core.magenta_vending_machine": "Máquina de Vendas Magenta", + "block.generations_core.manaphy_doll": "Boneco de Manaphy", + "block.generations_core.marill_doll": "Boneco de Marill", + "block.generations_core.master_ball_display": "Expositor de Master Ball", + "block.generations_core.master_ball_loot": "Recompensa de Master Ball", + "block.generations_core.masterball_chest": "Baú de Master Ball", + "block.generations_core.masterball_cushion": "Almofada de Master Ball", + "block.generations_core.megastone_ore": "Minério de Mega Stone", + "block.generations_core.meloetta_music_box": "Caixa de Música de Meloetta", + "block.generations_core.meloetta_music_box.tooltip": "§7DICA: Você ouve uma melodia maravilhosa vindo de dentro. Você precisa ouvir mais.", + "block.generations_core.meowth_doll": "Boneco de Meowth", + "block.generations_core.mesprit_doll": "Boneco de Mesprit", + "block.generations_core.meteorite_ore": "Minério de Meteorito", + "block.generations_core.mew_doll": "Boneco de Mew", + "block.generations_core.mewtwo_doll": "Boneco de Mewtwo", + "block.generations_core.mirror_glass": "Vidro Espelhado", + "block.generations_core.mirror_glass_slab": "Laje de Vidro Espelhado", + "block.generations_core.mirror_glass_stairs": "Escadas de Vidro Espelhado", + "block.generations_core.mirror_glass_wall": "Parede de Vidro Espelhado", + "block.generations_core.mirrored_floor_1": "Chão Espelhado 1", + "block.generations_core.mirrored_floor_1_slab": "Laje de Chão Espelhado 1", + "block.generations_core.mirrored_floor_1_stairs": "Escadas de Chão Espelhado 1", + "block.generations_core.mirrored_floor_1_wall": "Parede de Chão Espelhado 1", + "block.generations_core.mirrored_floor_2": "Chão Espelhado 2", + "block.generations_core.mirrored_floor_2_slab": "Laje de Chão Espelhado 2", + "block.generations_core.mirrored_floor_2_stairs": "Escadas de Chão Espelhado 2", + "block.generations_core.mirrored_floor_2_wall": "Parede de Chão Espelhado 2", + "block.generations_core.mirrored_floor_3": "Chão Espelhado 3", + "block.generations_core.mirrored_floor_3_slab": "Laje de Chão Espelhado 3", + "block.generations_core.mirrored_floor_3_stairs": "Escadas de Chão Espelhado 3", + "block.generations_core.mirrored_floor_3_wall": "Parede de Chão Espelhado 3", + "block.generations_core.moltres_doll": "Boneco de Moltres", + "block.generations_core.moon_ball_display": "Expositor de Moon Ball", + "block.generations_core.moon_ball_loot": "Recompensa de Moon Ball", + "block.generations_core.moon_stone_block": "Bloco de Moon Stone", + "block.generations_core.mossy_charge_cobblestone": "Pedregulho de Carga Musgoso", + "block.generations_core.mossy_charge_cobblestone_slab": "Laje de Pedregulho de Carga Musgoso", + "block.generations_core.mossy_charge_cobblestone_stairs": "Escadas de Pedregulho de Carga Musgoso", + "block.generations_core.mossy_charge_cobblestone_wall": "Parede de Pedregulho de Carga Musgoso", + "block.generations_core.mossy_charge_stone_brick_slab": "Laje de Tijolo de Pedra de Carga Musgoso", + "block.generations_core.mossy_charge_stone_brick_stairs": "Escadas de Tijolo de Pedra de Carga Musgoso", + "block.generations_core.mossy_charge_stone_brick_wall": "Parede de Tijolo de Pedra de Carga Musgoso", + "block.generations_core.mossy_charge_stone_bricks": "Tijolos de Pedra de Carga Musgosos", + "block.generations_core.mossy_volcanic_cobblestone": "Pedregulho Vulcânico Musgoso", + "block.generations_core.mossy_volcanic_cobblestone_slab": "Laje de Pedregulho Vulcânico Musgoso", + "block.generations_core.mossy_volcanic_cobblestone_stairs": "Escadas de Pedregulho Vulcânico Musgoso", + "block.generations_core.mossy_volcanic_cobblestone_wall": "Parede de Pedregulho Vulcânico Musgoso", + "block.generations_core.mossy_volcanic_stone_brick_slab": "Laje de Tijolo de Pedra Vulcânica Musgoso", + "block.generations_core.mossy_volcanic_stone_brick_stairs": "Escadas de Tijolo de Pedra Vulcânica Musgoso", + "block.generations_core.mossy_volcanic_stone_brick_wall": "Parede de Tijolo de Pedra Vulcânica Musgoso", + "block.generations_core.mossy_volcanic_stone_bricks": "Tijolos de Pedra Vulcânica Musgosos", + "block.generations_core.mudkip_doll": "Boneco de Mudkip", + "block.generations_core.nest_ball_display": "Expositor de Nest Ball", + "block.generations_core.nest_ball_loot": "Recompensa de Nest Ball", + "block.generations_core.net_ball_display": "Expositor de Net Ball", + "block.generations_core.net_ball_loot": "Recompensa de Net Ball", + "block.generations_core.normal_sandstone": "Arenito Normal", + "block.generations_core.normal_sandstone_slab": "Laje de Arenito Normal", + "block.generations_core.normal_sandstone_stairs": "Escadas de Arenito Normal", + "block.generations_core.normal_sandstone_wall": "Parede de Arenito Normal", + "block.generations_core.ocean_block": "Bloco Oceânico", + "block.generations_core.ocean_block_slab": "Laje de Bloco Oceânico", + "block.generations_core.ocean_block_stairs": "Escadas de Bloco Oceânico", + "block.generations_core.ocean_block_wall": "Parede de Bloco Oceânico", + "block.generations_core.orange_couch_arm_left": "Braço Esquerdo de Sofá Laranja", + "block.generations_core.orange_couch_arm_right": "Braço Direito de Sofá Laranja", + "block.generations_core.orange_couch_corner_left": "Canto Esquerdo de Sofá Laranja", + "block.generations_core.orange_couch_corner_right": "Canto Direito de Sofá Laranja", + "block.generations_core.orange_couch_middle": "Meio de Sofá Laranja", + "block.generations_core.orange_couch_ottoman": "Puff de Sofá Laranja", + "block.generations_core.orange_elevator": "Elevador Laranja", + "block.generations_core.orange_marble": "Mármore Laranja", + "block.generations_core.orange_marble_button": "Botão de Mármore Laranja", + "block.generations_core.orange_marble_pressure_plate": "Placa de Pressão de Mármore Laranja", + "block.generations_core.orange_marble_slab": "Laje de Mármore Laranja", + "block.generations_core.orange_marble_stairs": "Escadas de Mármore Laranja", + "block.generations_core.orange_marble_wall": "Parede de Mármore Laranja", + "block.generations_core.orange_pastel_bean_bag": "Puff Pastel Laranja", + "block.generations_core.orange_pc": "PC Laranja", + "block.generations_core.orange_poke_brick": "Tijolo Poké Laranja", + "block.generations_core.orange_poke_brick_button": "Botão de Tijolo Poké Laranja", + "block.generations_core.orange_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Laranja", + "block.generations_core.orange_poke_brick_slab": "Laje de Tijolo Poké Laranja", + "block.generations_core.orange_poke_brick_stairs": "Escadas de Tijolo Poké Laranja", + "block.generations_core.orange_poke_brick_wall": "Parede de Tijolo Poké Laranja", + "block.generations_core.orange_shingles": "Telhas Laranjas", + "block.generations_core.orange_shingles_slab": "Laje de Telhas Laranjas", + "block.generations_core.orange_shingles_stairs": "Escadas de Telhas Laranjas", + "block.generations_core.orange_shingles_wall": "Parede de Telhas Laranjas", + "block.generations_core.orange_street_lamp": "Poste de Rua Laranja", + "block.generations_core.orange_swivel_chair": "Cadeira Giratória Laranja", + "block.generations_core.orange_vending_machine": "Máquina de Vendas Laranja", + "block.generations_core.origin_ball_loot": "Recompensa de Origin Ball", + "block.generations_core.palkia_doll": "Boneco de Palkia", + "block.generations_core.park_ball_display": "Expositor de Park Ball", + "block.generations_core.park_ball_loot": "Recompensa de Park Ball", + "block.generations_core.pichu_doll": "Boneco de Pichu", + "block.generations_core.pikachu_doll": "Boneco de Pikachu", + "block.generations_core.pink_couch_arm_left": "Braço Esquerdo de Sofá Rosa", + "block.generations_core.pink_couch_arm_right": "Braço Direito de Sofá Rosa", + "block.generations_core.pink_couch_corner_left": "Canto Esquerdo de Sofá Rosa", + "block.generations_core.pink_couch_corner_right": "Canto Direito de Sofá Rosa", + "block.generations_core.pink_couch_middle": "Meio de Sofá Rosa", + "block.generations_core.pink_couch_ottoman": "Puff de Sofá Rosa", + "block.generations_core.pink_elevator": "Elevador Rosa", + "block.generations_core.pink_marble": "Mármore Rosa", + "block.generations_core.pink_marble_button": "Botão de Mármore Rosa", + "block.generations_core.pink_marble_pressure_plate": "Placa de Pressão de Mármore Rosa", + "block.generations_core.pink_marble_slab": "Laje de Mármore Rosa", + "block.generations_core.pink_marble_stairs": "Escadas de Mármore Rosa", + "block.generations_core.pink_marble_wall": "Parede de Mármore Rosa", + "block.generations_core.pink_pastel_bean_bag": "Puff Pastel Rosa", + "block.generations_core.pink_pc": "PC Rosa", + "block.generations_core.pink_poke_brick": "Tijolo Poké Rosa", + "block.generations_core.pink_poke_brick_button": "Botão de Tijolo Poké Rosa", + "block.generations_core.pink_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Rosa", + "block.generations_core.pink_poke_brick_slab": "Laje de Tijolo Poké Rosa", + "block.generations_core.pink_poke_brick_stairs": "Escadas de Tijolo Poké Rosa", + "block.generations_core.pink_poke_brick_wall": "Parede de Tijolo Poké Rosa", + "block.generations_core.pink_shingles": "Telhas Rosas", + "block.generations_core.pink_shingles_slab": "Laje de Telhas Rosas", + "block.generations_core.pink_shingles_stairs": "Escadas de Telhas Rosas", + "block.generations_core.pink_shingles_wall": "Parede de Telhas Rosas", + "block.generations_core.pink_street_lamp": "Poste de Rua Rosa", + "block.generations_core.pink_swivel_chair": "Cadeira Giratória Rosa", + "block.generations_core.pink_vending_machine": "Máquina de Vendas Rosa", + "block.generations_core.pointed_charge_dripstone": "Espeleotema Pontiagudo de Carga", + "block.generations_core.poke_ball_display": "Expositor de Poke Ball","block.generations_core.poke_ball_loot": "Recompensa de Poke Ball", + "block.generations_core.pokeball_chest": "Baú de Pokebola", + "block.generations_core.pokeball_cushion": "Almofada de Pokebola", + "block.generations_core.pokeball_pillar": "Pilar de Pokebola", + "block.generations_core.pokecenter_door": "Porta de PokéCenter", + "block.generations_core.pokecenter_roof": "Telhado de PokéCenter", + "block.generations_core.pokecenter_roof_2": "Telhado de PokéCenter 2", + "block.generations_core.pokecenter_roof_2_slab": "Laje de Telhado de PokéCenter 2", + "block.generations_core.pokecenter_roof_2_stairs": "Escadas de Telhado de PokéCenter 2", + "block.generations_core.pokecenter_roof_2_wall": "Parede de Telhado de PokéCenter 2", + "block.generations_core.pokecenter_roof_slab": "Laje de Telhado de PokéCenter", + "block.generations_core.pokecenter_roof_stairs": "Escadas de Telhado de PokéCenter", + "block.generations_core.pokecenter_roof_wall": "Parede de Telhado de PokéCenter", + "block.generations_core.pokecenter_scarlet_sign": "Placa Scarlet de PokéCenter", + "block.generations_core.pokecenter_sign": "Placa de PokéCenter", + "block.generations_core.pokemart_sign": "Placa de PokéMart", + "block.generations_core.poliwhirl_doll": "Boneco de Poliwhirl", + "block.generations_core.popplio_doll": "Boneco de Popplio", + "block.generations_core.powder_blue_marble": "Mármore Azul Pó", + "block.generations_core.powder_blue_marble_button": "Botão de Mármore Azul Pó", + "block.generations_core.powder_blue_marble_pressure_plate": "Placa de Pressão de Mármore Azul Pó", + "block.generations_core.powder_blue_marble_slab": "Laje de Mármore Azul Pó", + "block.generations_core.powder_blue_marble_stairs": "Escadas de Mármore Azul Pó", + "block.generations_core.powder_blue_marble_wall": "Parede de Mármore Azul Pó", + "block.generations_core.premier_ball_display": "Expositor de Premier Ball", + "block.generations_core.premier_ball_loot": "Recompensa de Premier Ball", + "block.generations_core.prismarine_pillar": "Pilar de Prismarinho", + "block.generations_core.prismarine_pillar_broken": "Pilar de Prismarinho Quebrado", + "block.generations_core.prison_bottle": "Garrafa Prisão", + "block.generations_core.prison_bottle_stem": "Base de Garrafa Prisão", + "block.generations_core.prison_bottle_stem.tooltip": "§7DICA: Você ouve uma voz dentro, te guiando. \"Me liberte! Faça meus anéis com Blocos de Ouro\".", + "block.generations_core.purple_couch_arm_left": "Braço Esquerdo de Sofá Roxo", + "block.generations_core.purple_couch_arm_right": "Braço Direito de Sofá Roxo", + "block.generations_core.purple_couch_corner_left": "Canto Esquerdo de Sofá Roxo", + "block.generations_core.purple_couch_corner_right": "Canto Direito de Sofá Roxo", + "block.generations_core.purple_couch_middle": "Meio de Sofá Roxo", + "block.generations_core.purple_couch_ottoman": "Puff de Sofá Roxo", + "block.generations_core.purple_elevator": "Elevador Roxo", + "block.generations_core.purple_marble": "Mármore Roxo", + "block.generations_core.purple_marble_button": "Botão de Mármore Roxo", + "block.generations_core.purple_marble_pressure_plate": "Placa de Pressão de Mármore Roxo", + "block.generations_core.purple_marble_slab": "Laje de Mármore Roxo", + "block.generations_core.purple_marble_stairs": "Escadas de Mármore Roxo", + "block.generations_core.purple_marble_wall": "Parede de Mármore Roxo", + "block.generations_core.purple_pastel_bean_bag": "Puff Pastel Roxo", + "block.generations_core.purple_pc": "PC Roxo", + "block.generations_core.purple_poke_brick": "Tijolo Poké Roxo", + "block.generations_core.purple_poke_brick_button": "Botão de Tijolo Poké Roxo", + "block.generations_core.purple_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Roxo", + "block.generations_core.purple_poke_brick_slab": "Laje de Tijolo Poké Roxo", + "block.generations_core.purple_poke_brick_stairs": "Escadas de Tijolo Poké Roxo", + "block.generations_core.purple_poke_brick_wall": "Parede de Tijolo Poké Roxo", + "block.generations_core.purple_shingles": "Telhas Roxas", + "block.generations_core.purple_shingles_slab": "Laje de Telhas Roxas", + "block.generations_core.purple_shingles_stairs": "Escadas de Telhas Roxas", + "block.generations_core.purple_shingles_wall": "Parede de Telhas Roxas", + "block.generations_core.purple_street_lamp": "Poste de Rua Roxo", + "block.generations_core.purple_swivel_chair": "Cadeira Giratória Roxa", + "block.generations_core.purple_vending_machine": "Máquina de Vendas Roxa", + "block.generations_core.purpleghost_doll": "Boneco de Fantasma Roxo", + "block.generations_core.quick_ball_display": "Expositor de Quick Ball", + "block.generations_core.quick_ball_loot": "Recompensa de Quick Ball", + "block.generations_core.raikou_doll": "Boneco de Raikou", + "block.generations_core.rayquaza_doll": "Boneco de Rayquaza", + "block.generations_core.red_couch_arm_left": "Braço Esquerdo de Sofá Vermelho", + "block.generations_core.red_couch_arm_right": "Braço Direito de Sofá Vermelho", + "block.generations_core.red_couch_corner_left": "Canto Esquerdo de Sofá Vermelho", + "block.generations_core.red_couch_corner_right": "Canto Direito de Sofá Vermelho", + "block.generations_core.red_couch_middle": "Meio de Sofá Vermelho", + "block.generations_core.red_couch_ottoman": "Puff de Sofá Vermelho", + "block.generations_core.red_elevator": "Elevador Vermelho", + "block.generations_core.red_marble": "Mármore Vermelho", + "block.generations_core.red_marble_button": "Botão de Mármore Vermelho", + "block.generations_core.red_marble_pressure_plate": "Placa de Pressão de Mármore Vermelho", + "block.generations_core.red_marble_slab": "Laje de Mármore Vermelho", + "block.generations_core.red_marble_stairs": "Escadas de Mármore Vermelho", + "block.generations_core.red_marble_wall": "Parede de Mármore Vermelho", + "block.generations_core.red_pastel_bean_bag": "Puff Pastel Vermelho", + "block.generations_core.red_pc": "PC Vermelho", + "block.generations_core.red_poke_brick": "Tijolo Poké Vermelho", + "block.generations_core.red_poke_brick_button": "Botão de Tijolo Poké Vermelho", + "block.generations_core.red_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Vermelho", + "block.generations_core.red_poke_brick_slab": "Laje de Tijolo Poké Vermelho", + "block.generations_core.red_poke_brick_stairs": "Escadas de Tijolo Poké Vermelho", + "block.generations_core.red_poke_brick_wall": "Parede de Tijolo Poké Vermelho", + "block.generations_core.red_shingles": "Telhas Vermelhas", + "block.generations_core.red_shingles_slab": "Laje de Telhas Vermelhas", + "block.generations_core.red_shingles_stairs": "Escadas de Telhas Vermelhas", + "block.generations_core.red_shingles_wall": "Parede de Telhas Vermelhas", + "block.generations_core.red_street_lamp": "Poste de Rua Vermelho", + "block.generations_core.red_swivel_chair": "Cadeira Giratória Vermelha", + "block.generations_core.red_vending_machine": "Máquina de Vendas Vermelha", + "block.generations_core.regice_doll": "Boneco de Regice", + "block.generations_core.regice_shrine": "Santuário de Regice", + "block.generations_core.regice_shrine.tooltip": "§7DICA: Vibrações silenciosas, que parecem um leve grito, fluem para seus ouvidos. Tudo o que você consegue distinguir é “Chave” e “Feitiço”.", + "block.generations_core.regidrago_shrine": "Santuário de Regidrago", + "block.generations_core.regidrago_shrine.tooltip": "§7DICA: Vibrações silenciosas, que parecem um leve grito, fluem para seus ouvidos. Tudo o que você consegue distinguir é “Chave” e “Feitiço”.", + "block.generations_core.regieleki_shrine": "Santuário de Regieleki", + "block.generations_core.regieleki_shrine.tooltip": "§7DICA: Vibrações silenciosas, que parecem um leve grito, fluem para seus ouvidos. Tudo o que você consegue distinguir é “Chave” e “Feitiço”.", + "block.generations_core.regigigas_doll": "Boneco de Regigigas", + "block.generations_core.regigigas_shrine": "Santuário de Regigigas", + "block.generations_core.regigigas_shrine.tooltip": "§7DICA: Imagens de todos os 5 Regis no passado distante começam a inundá-lo. Eles estão brincando. Você sente uma sensação esmagadora de... carinho? Regigigas claramente não tem desejo de ser despertado a menos que você tenha despertado seus amigos.", + "block.generations_core.regirock_doll": "Boneco de Regirock", + "block.generations_core.regirock_shrine": "Santuário de Regirock", + "block.generations_core.regirock_shrine.tooltip": "§7DICA: Vibrações silenciosas, que parecem um leve grito, fluem para seus ouvidos. Tudo o que você consegue distinguir é “Chave” e “Feitiço”.", + "block.generations_core.registeel_doll": "Boneco de Registeel", + "block.generations_core.registeel_shrine": "Santuário de Registeel", + "block.generations_core.registeel_shrine.tooltip": "§7DICA: Vibrações silenciosas, que parecem um leve grito, fluem para seus ouvidos. Tudo o que você consegue distinguir é “Chave” e “Feitiço”.", + "block.generations_core.repeat_ball_display": "Expositor de Repeat Ball", + "block.generations_core.repeat_ball_loot": "Recompensa de Repeat Ball", + "block.generations_core.rhydon_doll": "Boneco de Rhydon", + "block.generations_core.rich_soil_1": "Solo Rico 1", + "block.generations_core.rich_soil_2": "Solo Rico 2", + "block.generations_core.rich_soil_3": "Solo Rico 3", + "block.generations_core.rich_soil_4": "Solo Rico 4", + "block.generations_core.rks_machine": "Máquina RKS", + "block.generations_core.rock": "Rocha", + "block.generations_core.rock_slab": "Laje de Rocha", + "block.generations_core.rock_stairs": "Escadas de Rocha", + "block.generations_core.rock_wall": "Parede de Rocha", + "block.generations_core.rotom_pc": "PC Rotom", + "block.generations_core.rowlet_doll": "Boneco de Rowlet", + "block.generations_core.ruby_block": "Bloco de Rubi", + "block.generations_core.ruby_ore": "Minério de Rubi", + "block.generations_core.ruby_slab": "Laje de Rubi", + "block.generations_core.ruby_stairs": "Escadas de Rubi", + "block.generations_core.ruby_wall": "Parede de Rubi", + "block.generations_core.ruins_sand": "Areia de Ruínas", + "block.generations_core.ruins_wall": "Parede de Ruínas", + "block.generations_core.sableye_doll": "Boneco de Sableye", + "block.generations_core.safari_ball_display": "Expositor de Safari Ball", + "block.generations_core.safari_ball_loot": "Recompensa de Safari Ball", + "block.generations_core.sapphire_block": "Bloco de Safira", + "block.generations_core.sapphire_ore": "Minério de Safira", + "block.generations_core.sapphire_slab": "Laje de Safira", + "block.generations_core.sapphire_stairs": "Escadas de Safira", + "block.generations_core.sapphire_wall": "Parede de Safira", + "block.generations_core.scarecrow": "Espantalho", + "block.generations_core.seedot_doll": "Boneco de Seedot", + "block.generations_core.shaymin_land_doll": "Boneco de Shaymin Forma Terrestre", + "block.generations_core.shaymin_sky_doll": "Boneco de Shaymin Forma Celeste", + "block.generations_core.shelf": "Prateleira", + "block.generations_core.shiny_arceus_doll": "Boneco de Arceus Shiny", + "block.generations_core.shiny_articuno_doll": "Boneco de Articuno Shiny", + "block.generations_core.shiny_azelf_doll": "Boneco de Azelf Shiny", + "block.generations_core.shiny_azurill_doll": "Boneco de Azurill Shiny", + "block.generations_core.shiny_baltoy_doll": "Boneco de Baltoy Shiny", + "block.generations_core.shiny_blastoise_doll": "Boneco de Blastoise Shiny", + "block.generations_core.shiny_celebi_doll": "Boneco de Celebi Shiny", + "block.generations_core.shiny_charizard_doll": "Boneco de Charizard Shiny", + "block.generations_core.shiny_chikorita_doll": "Boneco de Chikorita Shiny", + "block.generations_core.shiny_clefairy_doll": "Boneco de Clefairy Shiny", + "block.generations_core.shiny_cresselia_doll": "Boneco de Cresselia Shiny", + "block.generations_core.shiny_cubone_doll": "Boneco de Cubone Shiny", + "block.generations_core.shiny_cyndaquil_doll": "Boneco de Cyndaquil Shiny", + "block.generations_core.shiny_darkrai_doll": "Boneco de Darkrai Shiny", + "block.generations_core.shiny_deoxys_doll": "Boneco de Deoxys Shiny", + "block.generations_core.shiny_dialga_doll": "Boneco de Dialga Shiny", + "block.generations_core.shiny_ditto_doll": "Boneco de Ditto Shiny", + "block.generations_core.shiny_duskull_doll": "Boneco de Duskull Shiny", + "block.generations_core.shiny_eevee_doll": "Boneco de Eevee Shiny", + "block.generations_core.shiny_ekans_doll": "Boneco de Ekans Shiny", + "block.generations_core.shiny_entei_doll": "Boneco de Entei Shiny", + "block.generations_core.shiny_giratina_altered_doll": "Boneco de Giratina Forma Alterada Shiny", + "block.generations_core.shiny_giratina_origin_doll": "Boneco de Giratina Forma Original Shiny", + "block.generations_core.shiny_groudon_doll": "Boneco de Groudon Shiny", + "block.generations_core.shiny_gulpin_doll": "Boneco de Gulpin Shiny", + "block.generations_core.shiny_heracross_doll": "Boneco de Heracross Shiny", + "block.generations_core.shiny_hooh_doll": "Boneco de Ho-Oh Shiny", + "block.generations_core.shiny_jigglypuff_doll": "Boneco de Jigglypuff Shiny", + "block.generations_core.shiny_jirachi_doll": "Boneco de Jirachi Shiny", + "block.generations_core.shiny_kecleon_doll": "Boneco de Kecleon Shiny", + "block.generations_core.shiny_krabby_doll": "Boneco de Krabby Shiny", + "block.generations_core.shiny_kyogre_doll": "Boneco de Kyogre Shiny", + "block.generations_core.shiny_lapras_doll": "Boneco de Lapras Shiny", + "block.generations_core.shiny_latias_doll": "Boneco de Latias Shiny", + "block.generations_core.shiny_latios_doll": "Boneco de Latios Shiny", + "block.generations_core.shiny_litten_doll": "Boneco de Litten Shiny", + "block.generations_core.shiny_lotad_doll": "Boneco de Lotad Shiny", + "block.generations_core.shiny_lugia_doll": "Boneco de Lugia Shiny", + "block.generations_core.shiny_manaphy_doll": "Boneco de Manaphy Shiny", + "block.generations_core.shiny_marill_doll": "Boneco de Marill Shiny", + "block.generations_core.shiny_meowth_doll": "Boneco de Meowth Shiny", + "block.generations_core.shiny_mesprit_doll": "Boneco de Mesprit Shiny", + "block.generations_core.shiny_mew_doll": "Boneco de Mew Shiny", + "block.generations_core.shiny_mewtwo_doll": "Boneco de Mewtwo Shiny", + "block.generations_core.shiny_moltres_doll": "Boneco de Moltres Shiny", + "block.generations_core.shiny_mudkip_doll": "Boneco de Mudkip Shiny", + "block.generations_core.shiny_palkia_doll": "Boneco de Palkia Shiny", + "block.generations_core.shiny_pichu_doll": "Boneco de Pichu Shiny", + "block.generations_core.shiny_pikachu_doll": "Boneco de Pikachu Shiny", + "block.generations_core.shiny_poliwhirl_doll": "Boneco de Poliwhirl Shiny", + "block.generations_core.shiny_popplio_doll": "Boneco de Popplio Shiny", + "block.generations_core.shiny_raikou_doll": "Boneco de Raikou Shiny", + "block.generations_core.shiny_rayquaza_doll": "Boneco de Rayquaza Shiny", + "block.generations_core.shiny_regice_doll": "Boneco de Regice Shiny", + "block.generations_core.shiny_regigigas_doll": "Boneco de Regigigas Shiny", + "block.generations_core.shiny_regirock_doll": "Boneco de Regirock Shiny", + "block.generations_core.shiny_registeel_doll": "Boneco de Registeel Shiny", + "block.generations_core.shiny_rhydon_doll": "Boneco de Rhydon Shiny", + "block.generations_core.shiny_rowlet_doll": "Boneco de Rowlet Shiny", + "block.generations_core.shiny_sableye_doll": "Boneco de Sableye Shiny", + "block.generations_core.shiny_seedot_doll": "Boneco de Seedot Shiny", + "block.generations_core.shiny_shaymin_land_doll": "Boneco de Shaymin Forma Terrestre Shiny", + "block.generations_core.shiny_shaymin_sky_doll": "Boneco de Shaymin Forma Celeste Shiny", + "block.generations_core.shiny_skitty_doll": "Boneco de Skitty Shiny", + "block.generations_core.shiny_smoochum_doll": "Boneco de Smoochum Shiny", + "block.generations_core.shiny_snorlax_doll": "Boneco de Snorlax Shiny", + "block.generations_core.shiny_stone_block": "Bloco de Shiny Stone", + "block.generations_core.shiny_substitute_doll": "Boneco Substituto Shiny", + "block.generations_core.shiny_suicune_doll": "Boneco de Suicune Shiny", + "block.generations_core.shiny_swablu_doll": "Boneco de Swablu Shiny", + "block.generations_core.shiny_togepi_doll": "Boneco de Togepi Shiny", + "block.generations_core.shiny_torchic_doll": "Boneco de Torchic Shiny", + "block.generations_core.shiny_totodile_doll": "Boneco de Totodile Shiny", + "block.generations_core.shiny_treecko_doll": "Boneco de Treecko Shiny", + "block.generations_core.shiny_uxie_doll": "Boneco de Uxie Shiny", + "block.generations_core.shiny_venusaur_doll": "Boneco de Venusaur Shiny", + "block.generations_core.shiny_wailmer_doll": "Boneco de Wailmer Shiny", + "block.generations_core.shiny_wynaut_doll": "Boneco de Wynaut Shiny", + "block.generations_core.shiny_zapdos_doll": "Boneco de Zapdos Shiny", + "block.generations_core.shiny_zeraora_doll": "Boneco de Zeraora Shiny", + "block.generations_core.shop_display_case_1": "Estante de Exposição de Loja 1", + "block.generations_core.shop_display_case_2": "Estante de Exposição de Loja 2", + "block.generations_core.shop_display_large_shelf_1": "Prateleira Grande de Exposição de Loja 1", + "block.generations_core.shop_display_large_shelf_2": "Prateleira Grande de Exposição de Loja 2", + "block.generations_core.shop_display_small_1": "Expositor Pequeno de Loja 1", + "block.generations_core.shop_display_small_2": "Expositor Pequeno de Loja 2", + "block.generations_core.silicon_block": "Bloco de Silício", + "block.generations_core.silicon_ore": "Minério de Silício", + "block.generations_core.skitty_doll": "Boneco de Skitty", + "block.generations_core.smoochum_doll": "Boneco de Smoochum", + "block.generations_core.smooth_charge_stone": "Pedra de Carga Lisa", + "block.generations_core.smooth_charge_stone_slab": "Laje de Pedra de Carga Lisa", + "block.generations_core.smooth_volcanic_stone": "Pedra Vulcânica Lisa", + "block.generations_core.smooth_volcanic_stone_slab": "Laje de Pedra Vulcânica Lisa", + "block.generations_core.snorlax_bean_bag": "Puff de Snorlax", + "block.generations_core.snorlax_doll": "Boneco de Snorlax", + "block.generations_core.sport_ball_display": "Expositor de Sport Ball", + "block.generations_core.sport_ball_loot": "Recompensa de Sport Ball", + "block.generations_core.static_shrine": "Santuário Estático", + "block.generations_core.strange_ball_loot": "Recompensa de Strange Ball", + "block.generations_core.stripped_ghost_log": "Tora Fantasma Descascada", + "block.generations_core.stripped_ghost_wood": "Madeira Fantasma Descascada", + "block.generations_core.stripped_ultra_dark_log": "Tora Ultra Escura Descascada", + "block.generations_core.stripped_ultra_dark_wood": "Madeira Ultra Escura Descascada", + "block.generations_core.stripped_ultra_jungle_log": "Tora Ultra Selva Descascada", + "block.generations_core.stripped_ultra_jungle_wood": "Madeira Ultra Selva Descascada", + "block.generations_core.substitute_doll": "Boneco Substituto", + "block.generations_core.subway_floor_cross": "Piso de Metrô Cruzado", + "block.generations_core.subway_floor_cross_slab": "Laje de Piso de Metrô Cruzado", + "block.generations_core.subway_floor_cross_stairs": "Escadas de Piso de Metrô Cruzado", + "block.generations_core.subway_floor_cross_wall": "Parede de Piso de Metrô Cruzado", + "block.generations_core.subway_floor_full_cross": "Piso de Metrô Cruzado Completo", + "block.generations_core.subway_floor_full_cross_slab": "Laje de Piso de Metrô Cruzado Completo", + "block.generations_core.subway_floor_full_cross_stairs": "Escadas de Piso de Metrô Cruzado Completo", + "block.generations_core.subway_floor_full_cross_wall": "Parede de Piso de Metrô Cruzado Completo", + "block.generations_core.subway_floor_path": "Caminho de Piso de Metrô", + "block.generations_core.subway_floor_path_slab": "Laje de Caminho de Piso de Metrô", + "block.generations_core.subway_floor_path_stairs": "Escadas de Caminho de Piso de Metrô", + "block.generations_core.subway_floor_path_wall": "Parede de Caminho de Piso de Metrô", + "block.generations_core.subway_floor_plain": "Piso de Metrô Simples", + "block.generations_core.subway_floor_plain_slab": "Laje de Piso de Metrô Simples", + "block.generations_core.subway_floor_plain_stairs": "Escadas de Piso de Metrô Simples", + "block.generations_core.subway_floor_plain_wall": "Parede de Piso de Metrô Simples", + "block.generations_core.subway_wall": "Parede de Metrô", + "block.generations_core.subway_wall_2": "Parede de Metrô 2", + "block.generations_core.subway_wall_2_slab": "Laje de Parede de Metrô 2", + "block.generations_core.subway_wall_2_stairs": "Escadas de Parede de Metrô 2", + "block.generations_core.subway_wall_slab": "Laje de Parede de Metrô", + "block.generations_core.subway_wall_stairs": "Escadas de Parede de Metrô", + "block.generations_core.suicune_doll": "Boneco de Suicune", + "block.generations_core.sun_stone_block": "Bloco de Sun Stone", + "block.generations_core.swablu_doll": "Boneco de Swablu", + "block.generations_core.switch": "Interruptor", + "block.generations_core.table_pc": "PC de Mesa", + "block.generations_core.tall_ballonlea_blue_mushroom": "Cogumelo Azul Alto de Ballonlea", + "block.generations_core.tall_ballonlea_green_mushroom": "Cogumelo Verde Alto de Ballonlea", + "block.generations_core.tall_ballonlea_pink_mushroom": "Cogumelo Rosa Alto de Ballonlea", + "block.generations_core.tall_ballonlea_yellow_mushroom": "Cogumelo Amarelo Alto de Ballonlea", + "block.generations_core.tao_trio_shrine": "Santuário do Trio Tao", + "block.generations_core.tao_trio_shrine.tooltip": "§7DICA: Está irradiando uma aura sem vida. Está em silêncio mortal, mas você começa a ver gritos de batalha? Ainda mais estranho, você começa a sentir o sabor de poderosas explosões de ondas sonoras – ataques de um passado distante. Uma batalha feroz ocorreu há muito tempo. De repente, você sabe o que precisa ser feito – coletar Almas de Dragão.", + "block.generations_core.tapu_shrine": "Santuário Tapu", + "block.generations_core.temple_block": "Bloco de Templo", + "block.generations_core.temple_block_slab": "Laje de Bloco de Templo", + "block.generations_core.temple_block_stairs": "Escadas de Bloco de Templo", + "block.generations_core.temple_block_wall": "Parede de Bloco de Templo", + "block.generations_core.temple_brick": "Tijolo de Templo", + "block.generations_core.temple_brick_slab": "Laje de Tijolo de Templo", + "block.generations_core.temple_brick_stairs": "Escadas de Tijolo de Templo", + "block.generations_core.temple_brick_wall": "Parede de Tijolo de Templo", + "block.generations_core.tera_shard_ore": "Minério de Tera Shard", + "block.generations_core.thunder_stone_block": "Bloco de Thunder Stone", + "block.generations_core.timer_ball_display": "Expositor de Timer Ball", + "block.generations_core.timer_ball_loot": "Recompensa de Timer Ball", + "block.generations_core.timespace_altar": "Altar de Tempo-Espaço", + "block.generations_core.togepi_doll": "Boneco de Togepi", + "block.generations_core.torchic_doll": "Boneco de Torchic", + "block.generations_core.totodile_doll": "Boneco de Totodile", + "block.generations_core.trash_can": "Lixeira", + "block.generations_core.treecko_doll": "Boneco de Treecko","block.generations_core.ultra_ball_display": "Expositor de Ultra Ball", + "block.generations_core.ultra_ball_loot": "Recompensa de Ultra Ball", + "block.generations_core.ultra_black": "Ultra Preto", + "block.generations_core.ultra_black_button": "Botão Ultra Preto", + "block.generations_core.ultra_black_pressure_plate": "Placa de Pressão Ultra Preta", + "block.generations_core.ultra_black_slab": "Laje Ultra Preta", + "block.generations_core.ultra_black_stairs": "Escadas Ultra Pretas", + "block.generations_core.ultra_black_wall": "Parede Ultra Preta", + "block.generations_core.ultra_blue": "Ultra Azul", + "block.generations_core.ultra_blue_button": "Botão Ultra Azul", + "block.generations_core.ultra_blue_pressure_plate": "Placa de Pressão Ultra Azul", + "block.generations_core.ultra_blue_slab": "Laje Ultra Azul", + "block.generations_core.ultra_blue_stairs": "Escadas Ultra Azuis", + "block.generations_core.ultra_blue_wall": "Parede Ultra Azul", + "block.generations_core.ultra_brown": "Ultra Marrom", + "block.generations_core.ultra_brown_button": "Botão Ultra Marrom", + "block.generations_core.ultra_brown_pressure_plate": "Placa de Pressão Ultra Marrom", + "block.generations_core.ultra_brown_slab": "Laje Ultra Marrom", + "block.generations_core.ultra_brown_stairs": "Escadas Ultra Marrons", + "block.generations_core.ultra_brown_wall": "Parede Ultra Marrom", + "block.generations_core.ultra_chiseled_sandstone": "Arenito Cinzelado Ultra", + "block.generations_core.ultra_cut_sandstone": "Arenito Talhado Ultra", + "block.generations_core.ultra_cut_sandstone_slab": "Laje de Arenito Talhado Ultra", + "block.generations_core.ultra_cyan": "Ultra Ciano", + "block.generations_core.ultra_cyan_button": "Botão Ultra Ciano", + "block.generations_core.ultra_cyan_pressure_plate": "Placa de Pressão Ultra Ciano", + "block.generations_core.ultra_cyan_slab": "Laje Ultra Ciano", + "block.generations_core.ultra_cyan_stairs": "Escadas Ultra Ciano", + "block.generations_core.ultra_cyan_wall": "Parede Ultra Ciano", + "block.generations_core.ultra_dark_bookshelf": "Estante Ultra Escura", + "block.generations_core.ultra_dark_button": "Botão Ultra Escuro", + "block.generations_core.ultra_dark_crafting_table": "Bancada de Trabalho Ultra Escura", + "block.generations_core.ultra_dark_door": "Porta Ultra Escura", + "block.generations_core.ultra_dark_fence": "Cerca Ultra Escura", + "block.generations_core.ultra_dark_fence_gate": "Portão de Cerca Ultra Escura", + "block.generations_core.ultra_dark_hanging_sign": "Placa Suspensa Ultra Escura", + "block.generations_core.ultra_dark_log": "Tora Ultra Escura", + "block.generations_core.ultra_dark_planks": "Tábuas Ultra Escuras", + "block.generations_core.ultra_dark_pressure_plate": "Placa de Pressão Ultra Escura", + "block.generations_core.ultra_dark_sign": "Placa Ultra Escura", + "block.generations_core.ultra_dark_slab": "Laje Ultra Escura", + "block.generations_core.ultra_dark_stairs": "Escadas Ultra Escuras", + "block.generations_core.ultra_dark_trapdoor": "Alçapão Ultra Escuro", + "block.generations_core.ultra_dark_wood": "Madeira Ultra Escura", + "block.generations_core.ultra_gray": "Ultra Cinza", + "block.generations_core.ultra_gray_button": "Botão Ultra Cinza", + "block.generations_core.ultra_gray_pressure_plate": "Placa de Pressão Ultra Cinza", + "block.generations_core.ultra_gray_slab": "Laje Ultra Cinza", + "block.generations_core.ultra_gray_stairs": "Escadas Ultra Cinzas", + "block.generations_core.ultra_gray_wall": "Parede Ultra Cinza", + "block.generations_core.ultra_green": "Ultra Verde", + "block.generations_core.ultra_green_button": "Botão Ultra Verde", + "block.generations_core.ultra_green_pressure_plate": "Placa de Pressão Ultra Verde", + "block.generations_core.ultra_green_slab": "Laje Ultra Verde", + "block.generations_core.ultra_green_stairs": "Escadas Ultra Verdes", + "block.generations_core.ultra_green_wall": "Parede Ultra Verde", + "block.generations_core.ultra_jungle_bookshelf": "Estante Ultra Selva", + "block.generations_core.ultra_jungle_button": "Botão Ultra Selva", + "block.generations_core.ultra_jungle_crafting_table": "Bancada de Trabalho Ultra Selva", + "block.generations_core.ultra_jungle_door": "Porta Ultra Selva", + "block.generations_core.ultra_jungle_fence": "Cerca Ultra Selva", + "block.generations_core.ultra_jungle_fence_gate": "Portão de Cerca Ultra Selva", + "block.generations_core.ultra_jungle_hanging_sign": "Placa Suspensa Ultra Selva", + "block.generations_core.ultra_jungle_log": "Tora Ultra Selva", + "block.generations_core.ultra_jungle_planks": "Tábuas Ultra Selva", + "block.generations_core.ultra_jungle_pressure_plate": "Placa de Pressão Ultra Selva", + "block.generations_core.ultra_jungle_sign": "Placa Ultra Selva", + "block.generations_core.ultra_jungle_slab": "Laje Ultra Selva", + "block.generations_core.ultra_jungle_stairs": "Escadas Ultra Selva", + "block.generations_core.ultra_jungle_trapdoor": "Alçapão Ultra Selva", + "block.generations_core.ultra_jungle_wood": "Madeira Ultra Selva", + "block.generations_core.ultra_light_blue": "Ultra Azul Claro", + "block.generations_core.ultra_light_blue_button": "Botão Ultra Azul Claro", + "block.generations_core.ultra_light_blue_pressure_plate": "Placa de Pressão Ultra Azul Claro", + "block.generations_core.ultra_light_blue_slab": "Laje Ultra Azul Claro", + "block.generations_core.ultra_light_blue_stairs": "Escadas Ultra Azuis Claras", + "block.generations_core.ultra_light_blue_wall": "Parede Ultra Azul Claro", + "block.generations_core.ultra_light_gray": "Ultra Cinza Claro", + "block.generations_core.ultra_light_gray_button": "Botão Ultra Cinza Claro", + "block.generations_core.ultra_light_gray_pressure_plate": "Placa de Pressão Ultra Cinza Claro", + "block.generations_core.ultra_light_gray_slab": "Laje Ultra Cinza Claro", + "block.generations_core.ultra_light_gray_stairs": "Escadas Ultra Cinzas Claras", + "block.generations_core.ultra_light_gray_wall": "Parede Ultra Cinza Claro", + "block.generations_core.ultra_lime": "Ultra Limão", + "block.generations_core.ultra_lime_button": "Botão Ultra Limão", + "block.generations_core.ultra_lime_pressure_plate": "Placa de Pressão Ultra Limão", + "block.generations_core.ultra_lime_slab": "Laje Ultra Limão", + "block.generations_core.ultra_lime_stairs": "Escadas Ultra Limão", + "block.generations_core.ultra_lime_wall": "Parede Ultra Limão", + "block.generations_core.ultra_magenta": "Ultra Magenta", + "block.generations_core.ultra_magenta_button": "Botão Ultra Magenta", + "block.generations_core.ultra_magenta_pressure_plate": "Placa de Pressão Ultra Magenta", + "block.generations_core.ultra_magenta_slab": "Laje Ultra Magenta", + "block.generations_core.ultra_magenta_stairs": "Escadas Ultra Magenta", + "block.generations_core.ultra_magenta_wall": "Parede Ultra Magenta", + "block.generations_core.ultra_orange": "Ultra Laranja", + "block.generations_core.ultra_orange_button": "Botão Ultra Laranja", + "block.generations_core.ultra_orange_pressure_plate": "Placa de Pressão Ultra Laranja", + "block.generations_core.ultra_orange_slab": "Laje Ultra Laranja", + "block.generations_core.ultra_orange_stairs": "Escadas Ultra Laranja", + "block.generations_core.ultra_orange_wall": "Parede Ultra Laranja", + "block.generations_core.ultra_pink": "Ultra Rosa", + "block.generations_core.ultra_pink_button": "Botão Ultra Rosa", + "block.generations_core.ultra_pink_pressure_plate": "Placa de Pressão Ultra Rosa", + "block.generations_core.ultra_pink_slab": "Laje Ultra Rosa", + "block.generations_core.ultra_pink_stairs": "Escadas Ultra Rosa", + "block.generations_core.ultra_pink_wall": "Parede Ultra Rosa", + "block.generations_core.ultra_purple": "Ultra Roxo", + "block.generations_core.ultra_purple_button": "Botão Ultra Roxo", + "block.generations_core.ultra_purple_pressure_plate": "Placa de Pressão Ultra Roxa", + "block.generations_core.ultra_purple_slab": "Laje Ultra Roxa", + "block.generations_core.ultra_purple_stairs": "Escadas Ultra Roxas", + "block.generations_core.ultra_purple_wall": "Parede Ultra Roxa", + "block.generations_core.ultra_red": "Ultra Vermelho", + "block.generations_core.ultra_red_button": "Botão Ultra Vermelho", + "block.generations_core.ultra_red_pressure_plate": "Placa de Pressão Ultra Vermelha", + "block.generations_core.ultra_red_slab": "Laje Ultra Vermelha", + "block.generations_core.ultra_red_stairs": "Escadas Ultra Vermelhas", + "block.generations_core.ultra_red_wall": "Parede Ultra Vermelha", + "block.generations_core.ultra_sand": "Areia Ultra", + "block.generations_core.ultra_sandstone": "Arenito Ultra", + "block.generations_core.ultra_sandstone_slab": "Laje de Arenito Ultra", + "block.generations_core.ultra_sandstone_stairs": "Escadas de Arenito Ultra", + "block.generations_core.ultra_sandstone_wall": "Parede de Arenito Ultra", + "block.generations_core.ultra_smooth_sandstone": "Arenito Liso Ultra", + "block.generations_core.ultra_smooth_sandstone_slab": "Laje de Arenito Liso Ultra", + "block.generations_core.ultra_smooth_sandstone_stairs": "Escadas de Arenito Liso Ultra", + "block.generations_core.ultra_smooth_sandstone_wall": "Parede de Arenito Liso Ultra", + "block.generations_core.ultra_white": "Ultra Branco", + "block.generations_core.ultra_white_button": "Botão Ultra Branco", + "block.generations_core.ultra_white_pressure_plate": "Placa de Pressão Ultra Branca", + "block.generations_core.ultra_white_slab": "Laje Ultra Branca", + "block.generations_core.ultra_white_stairs": "Escadas Ultra Brancas", + "block.generations_core.ultra_white_wall": "Parede Ultra Branca", + "block.generations_core.ultra_yellow": "Ultra Amarelo", + "block.generations_core.ultra_yellow_button": "Botão Ultra Amarelo", + "block.generations_core.ultra_yellow_pressure_plate": "Placa de Pressão Ultra Amarela", + "block.generations_core.ultra_yellow_slab": "Laje Ultra Amarela", + "block.generations_core.ultra_yellow_stairs": "Escadas Ultra Amarelas", + "block.generations_core.ultra_yellow_wall": "Parede Ultra Amarela", + "block.generations_core.ultraball_chest": "Baú de Ultra Ball", + "block.generations_core.ultrite_block": "Bloco de Ultrita", + "block.generations_core.unown_block_a": "Bloco Unown A", + "block.generations_core.unown_block_b": "Bloco Unown B", + "block.generations_core.unown_block_blank": "Bloco Unown Vazio", + "block.generations_core.unown_block_c": "Bloco Unown C", + "block.generations_core.unown_block_d": "Bloco Unown D", + "block.generations_core.unown_block_e": "Bloco Unown E", + "block.generations_core.unown_block_exclamation_mark": "Bloco Unown Ponto de Exclamação", + "block.generations_core.unown_block_f": "Bloco Unown F", + "block.generations_core.unown_block_g": "Bloco Unown G", + "block.generations_core.unown_block_h": "Bloco Unown H", + "block.generations_core.unown_block_i": "Bloco Unown I", + "block.generations_core.unown_block_j": "Bloco Unown J", + "block.generations_core.unown_block_k": "Bloco Unown K", + "block.generations_core.unown_block_l": "Bloco Unown L", + "block.generations_core.unown_block_m": "Bloco Unown M", + "block.generations_core.unown_block_n": "Bloco Unown N", + "block.generations_core.unown_block_o": "Bloco Unown O", + "block.generations_core.unown_block_p": "Bloco Unown P", + "block.generations_core.unown_block_q": "Bloco Unown Q", + "block.generations_core.unown_block_question_mark": "Bloco Unown Ponto de Interrogação", + "block.generations_core.unown_block_r": "Bloco Unown R", + "block.generations_core.unown_block_s": "Bloco Unown S", + "block.generations_core.unown_block_t": "Bloco Unown T", + "block.generations_core.unown_block_u": "Bloco Unown U", + "block.generations_core.unown_block_v": "Bloco Unown V", + "block.generations_core.unown_block_w": "Bloco Unown W", + "block.generations_core.unown_block_x": "Bloco Unown X", + "block.generations_core.unown_block_y": "Bloco Unown Y", + "block.generations_core.unown_block_z": "Bloco Unown Z", + "block.generations_core.uxie_doll": "Boneco de Uxie", + "block.generations_core.venusaur_doll": "Boneco de Venusaur", + "block.generations_core.volcanic_cobblestone": "Pedregulho Vulcânico", + "block.generations_core.volcanic_cobblestone_slab": "Laje de Pedregulho Vulcânico", + "block.generations_core.volcanic_cobblestone_stairs": "Escadas de Pedregulho Vulcânico", + "block.generations_core.volcanic_cobblestone_wall": "Parede de Pedregulho Vulcânico", + "block.generations_core.volcanic_firestone": "Pedra de Fogo Vulcânica", + "block.generations_core.volcanic_rock": "Rocha Vulcânica", + "block.generations_core.volcanic_rock_slab": "Laje de Rocha Vulcânica", + "block.generations_core.volcanic_rock_stairs": "Escadas de Rocha Vulcânica", + "block.generations_core.volcanic_rock_wall": "Parede de Rocha Vulcânica", + "block.generations_core.volcanic_stone": "Pedra Vulcânica", + "block.generations_core.volcanic_stone_blast_furnace": "Forno de Fundição de Pedra Vulcânica", + "block.generations_core.volcanic_stone_brick_slab": "Laje de Tijolos de Pedra Vulcânica", + "block.generations_core.volcanic_stone_brick_stairs": "Escadas de Tijolos de Pedra Vulcânica", + "block.generations_core.volcanic_stone_brick_wall": "Parede de Tijolos de Pedra Vulcânica", + "block.generations_core.volcanic_stone_bricks": "Tijolos de Pedra Vulcânica", + "block.generations_core.volcanic_stone_button": "Botão de Pedra Vulcânica", + "block.generations_core.volcanic_stone_furnace": "Forno de Pedra Vulcânica", + "block.generations_core.volcanic_stone_pressure_plate": "Placa de Pressão de Pedra Vulcânica", + "block.generations_core.volcanic_stone_slab": "Laje de Pedra Vulcânica", + "block.generations_core.volcanic_stone_smoker": "Defumador de Pedra Vulcânica", + "block.generations_core.volcanic_stone_stairs": "Escadas de Pedra Vulcânica", + "block.generations_core.volcanic_stone_wall": "Parede de Pedra Vulcânica", + "block.generations_core.wailmer_doll": "Boneco de Wailmer", + "block.generations_core.warning_block": "Bloco de Aviso", + "block.generations_core.water_quartz": "Quartzo Aquático", + "block.generations_core.water_quartz_slab": "Laje de Quartzo Aquático", + "block.generations_core.water_quartz_stairs": "Escadas de Quartzo Aquático", + "block.generations_core.water_quartz_wall": "Parede de Quartzo Aquático", + "block.generations_core.water_stone_block": "Bloco de Water Stone", + "block.generations_core.white_castle_brick": "Tijolo de Castelo Branco", + "block.generations_core.white_castle_brick_2": "Tijolo de Castelo Branco 2", + "block.generations_core.white_castle_brick_2_slab": "Laje de Tijolo de Castelo Branco 2", + "block.generations_core.white_castle_brick_2_stairs": "Escadas de Tijolo de Castelo Branco 2", + "block.generations_core.white_castle_brick_2_wall": "Parede de Tijolo de Castelo Branco 2", + "block.generations_core.white_castle_brick_slab": "Laje de Tijolo de Castelo Branco", + "block.generations_core.white_castle_brick_stairs": "Escadas de Tijolo de Castelo Branco", + "block.generations_core.white_castle_brick_wall": "Parede de Tijolo de Castelo Branco", + "block.generations_core.white_couch_arm_left": "Braço Esquerdo de Sofá Branco", + "block.generations_core.white_couch_arm_right": "Braço Direito de Sofá Branco", + "block.generations_core.white_couch_corner_left": "Canto Esquerdo de Sofá Branco", + "block.generations_core.white_couch_corner_right": "Canto Direito de Sofá Branco", + "block.generations_core.white_couch_middle": "Meio de Sofá Branco", + "block.generations_core.white_couch_ottoman": "Puff de Sofá Branco", + "block.generations_core.white_elevator": "Elevador Branco", + "block.generations_core.white_marble": "Mármore Branco", + "block.generations_core.white_marble_button": "Botão de Mármore Branco", + "block.generations_core.white_marble_pressure_plate": "Placa de Pressão de Mármore Branco", + "block.generations_core.white_marble_slab": "Laje de Mármore Branco", + "block.generations_core.white_marble_stairs": "Escadas de Mármore Branco", + "block.generations_core.white_marble_wall": "Parede de Mármore Branco", + "block.generations_core.white_pastel_bean_bag": "Puff Pastel Branco", + "block.generations_core.white_pc": "PC Branco", + "block.generations_core.white_poke_brick": "Tijolo Poké Branco", + "block.generations_core.white_poke_brick_button": "Botão de Tijolo Poké Branco", + "block.generations_core.white_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Branco", + "block.generations_core.white_poke_brick_slab": "Laje de Tijolo Poké Branco", + "block.generations_core.white_poke_brick_stairs": "Escadas de Tijolo Poké Branco", + "block.generations_core.white_poke_brick_wall": "Parede de Tijolo Poké Branco", + "block.generations_core.white_shingles": "Telhas Brancas", + "block.generations_core.white_shingles_slab": "Laje de Telhas Brancas", + "block.generations_core.white_shingles_stairs": "Escadas de Telhas Brancas", + "block.generations_core.white_shingles_wall": "Parede de Telhas Brancas", + "block.generations_core.white_street_lamp": "Poste de Rua Branco", + "block.generations_core.white_swivel_chair": "Cadeira Giratória Branca", + "block.generations_core.white_vending_machine": "Máquina de Vendas Branca", + "block.generations_core.wing_ball_loot": "Recompensa de Wing Ball", + "block.generations_core.work_desk": "Mesa de Trabalho", + "block.generations_core.wynaut_doll": "Boneco de Wynaut", + "block.generations_core.yellow_couch_arm_left": "Braço Esquerdo de Sofá Amarelo", + "block.generations_core.yellow_couch_arm_right": "Braço Direito de Sofá Amarelo", + "block.generations_core.yellow_couch_corner_left": "Canto Esquerdo de Sofá Amarelo", + "block.generations_core.yellow_couch_corner_right": "Canto Direito de Sofá Amarelo", + "block.generations_core.yellow_couch_middle": "Meio de Sofá Amarelo", + "block.generations_core.yellow_couch_ottoman": "Puff de Sofá Amarelo", + "block.generations_core.yellow_elevator": "Elevador Amarelo", + "block.generations_core.yellow_marble": "Mármore Amarelo", + "block.generations_core.yellow_marble_button": "Botão de Mármore Amarelo", + "block.generations_core.yellow_marble_pressure_plate": "Placa de Pressão de Mármore Amarelo", + "block.generations_core.yellow_marble_slab": "Laje de Mármore Amarelo", + "block.generations_core.yellow_marble_stairs": "Escadas de Mármore Amarelo", + "block.generations_core.yellow_marble_wall": "Parede de Mármore Amarelo", + "block.generations_core.yellow_pastel_bean_bag": "Puff Pastel Amarelo", + "block.generations_core.yellow_pc": "PC Amarelo", + "block.generations_core.yellow_poke_brick": "Tijolo Poké Amarelo", + "block.generations_core.yellow_poke_brick_button": "Botão de Tijolo Poké Amarelo", + "block.generations_core.yellow_poke_brick_pressure_plate": "Placa de Pressão de Tijolo Poké Amarelo", + "block.generations_core.yellow_poke_brick_slab": "Laje de Tijolo Poké Amarelo", + "block.generations_core.yellow_poke_brick_stairs": "Escadas de Tijolo Poké Amarelo", + "block.generations_core.yellow_poke_brick_wall": "Parede de Tijolo Poké Amarelo", + "block.generations_core.yellow_shingles": "Telhas Amarelas", + "block.generations_core.yellow_shingles_slab": "Laje de Telhas Amarelas", + "block.generations_core.yellow_shingles_stairs": "Escadas de Telhas Amarelas", + "block.generations_core.yellow_shingles_wall": "Parede de Telhas Amarelas", + "block.generations_core.yellow_street_lamp": "Poste de Rua Amarelo", + "block.generations_core.yellow_swivel_chair": "Cadeira Giratória Amarela", + "block.generations_core.yellow_vending_machine": "Máquina de Vendas Amarela", + "block.generations_core.z_block": "Bloco Z", + "block.generations_core.z_crystal_ore": "Minério de Z Crystal", + "block.generations_core.zapdos_doll": "Boneco de Zapdos", + "block.generations_core.zeraora_doll": "Boneco de Zeraora", + "cobblemon.move.alluringvoice": "Voz Sedutora", + "cobblemon.move.alluringvoice.desc": "O usuário ataca com sua voz angelical e também confunde o alvo se seus atributos foram aumentados durante o turno.", + "cobblemon.move.alluringvoice.name": "Voz Sedutora", + "cobblemon.move.dragoncheer": "Grito de Dragão", + "cobblemon.move.dragoncheer.desc": "O usuário solta um grito dracônico para aumentar a chance de acerto crítico de seus aliados. Isso anima mais os tipos Dragão.", + "cobblemon.move.dragoncheer.name": "Grito de Dragão", + "cobblemon.move.ficklebeam": "Raio Caprichoso", + "cobblemon.move.ficklebeam.desc": "Dispara um feixe de luz para causar dano. Às vezes, todas as cabeças do usuário disparam feixes em uníssono, dobrando o poder.", + "cobblemon.move.ficklebeam.name": "Raio Caprichoso", + "cobblemon.move.hardpress": "Pressão Dura", + "cobblemon.move.hardpress.desc": "O alvo é esmagado com um braço, uma garra ou algo parecido para infligir dano. Quanto mais HP o alvo tiver, maior será o poder.", + "cobblemon.move.hardpress.name": "Pressão Dura", + "cobblemon.move.psychicnoise": "Ruído Psíquico", + "cobblemon.move.psychicnoise.desc": "O usuário ataca com ondas sonoras desagradáveis, impedindo o alvo de recuperar HP através de movimentos, habilidades ou itens equipados por dois turnos.", + "cobblemon.move.psychicnoise.name": "Ruído Psíquico", + "cobblemon.move.supercellslam": "Pancada Supercélula", + "cobblemon.move.supercellslam.desc": "O usuário eletrifica seu corpo e cai sobre o alvo para infligir dano. Se o movimento errar, o usuário sofre dano em seu lugar.", + "cobblemon.move.supercellslam.name": "Pancada Supercélula", + "cobblemon.move.syrupbomb": "Bomba de Xarope", + "cobblemon.move.syrupbomb.desc": "Libera uma explosão de xarope pegajoso no alvo e faz com que sua Velocidade caia a cada turno por três turnos.", + "cobblemon.move.syrupbomb.name": "Bomba de Xarope", + "cobblemon.move.temperfale.desc": "Impulsionado pelo desespero, o usuário ataca o alvo. Este poder é dobrado se o movimento anterior falhou.", + "cobblemon.move.temperflare": "Chama de Temperamento", + "cobblemon.move.temperflare.name": "Chama de Temperamento", + "cobblemon.move.upperhand": "Vantagem", + "cobblemon.move.upperhand.desc": "O usuário ataca com a base da palma da mão, fazendo o alvo recuar. Falha se o alvo não estiver se preparando para um movimento de prioridade.", + "cobblemon.move.upperhand.name": "Vantagem", + "cobblemon.species.ponytagalar.name": "Ponyta de Galar", + "container.box": "Caixa", + "container.charge_stone_blast_furnace": "Forno de Fundição de Charge Stone", + "container.charge_stone_furnace": "Forno de Charge Stone", + "container.charge_stone_smoker": "Defumador de Charge Stone", + "container.cooking_pot": "Panela de Cozimento", + "container.great_walkmon": "Great Walkmon", + "container.greatball_chest": "Baú de Great Ball", + "container.hi_tech_earbuds": "Fones de Ouvido de Alta Tecnologia", + "container.iceroot_carrot": "Cenoura de Raiz de Gelo", + "container.master_walkmon": "Master Walkmon", + "container.masterball_chest": "Baú de Master Ball", + "container.melody_flute": "Flauta Melódica", + "container.poke_walkmon": "Poke Walkmon", + "container.pokeball_chest": "Baú de Pokebola", + "container.shaderoot_carrot": "Cenoura de Raiz Sombria", + "container.trashcan": "Lixeira", + "container.ultra_walkmon": "Ultra Walkmon", + "container.ultraball_chest": "Baú de Ultra Ball", + "container.volcanic_stone_blast_furnace": "Forno de Fundição de Pedra Vulcânica", + "container.volcanic_stone_furnace": "Forno de Pedra Vulcânica", + "container.volcanic_stone_smoker": "Defumador de Pedra Vulcânica", + "entity.generations_core.statue": "Estátua", + "entity.generations_core.zygarde_cell": "Células de Zygarde", + "enum.flavor.bitter": "Amargo", + "enum.flavor.dry": "Seco", + "enum.flavor.sour": "Azedo", + "enum.flavor.spicy": "Picante", + "enum.flavor.sweet": "Doce", + "generations_core.ability.formchange": "%s mudou de forma!", + "generations_core.blocks.balllootset": "Conjunto de Recompensa de Bola Personalizado: %s", + "generations_core.blocks.claimedloot": "Você já resgatou esta recompensa!", + "generations_core.blocks.lootfound": "Você encontrou um(a) %s!", + "generations_core.blocks.lootmode": "Modo de Recompensa: %s", + "generations_core.blocks.lootmode.once": "Primeiro a chegar, primeiro a ser servido", + "generations_core.blocks.lootmode.once_per_player": "Permanente, limite de 1 drop", + "generations_core.blocks.lootmode.timed": "Drops programados", + "generations_core.blocks.lootmode.unlimited": "Permanente, drops ilimitados", + "generations_core.blocks.ownerchanged": "Dono do bloco alterado para o servidor!", + "generations_core.blocks.timedclaim": "Você já resgatou esta recompensa programada! Tente novamente mais tarde!", + "generations_core.blocks.visible": "Visibilidade da Recompensa de Bola: %s", + "generations_core.curry.apple": "Maçã", + "generations_core.curry.beanmedley": "Mix de Feijão", + "generations_core.curry.boiledegg": "Ovo Cozido", + "generations_core.curry.bone": "Osso", + "generations_core.curry.burgersteak": "Bife de Hambúrguer", + "generations_core.curry.cheesecovered": "Coberto com Queijo", + "generations_core.curry.coconut": "Coco", + "generations_core.curry.decorative": "Decorativo", + "generations_core.curry.friedfood": "Comida Frita", + "generations_core.curry.gigantamax": "Gigantamax", + "generations_core.curry.herbmedley": "Mix de Ervas", + "generations_core.curry.instantnoodle": "Macarrão Instantâneo", + "generations_core.curry.juicy": "Suculento", + "generations_core.curry.leek": "Alho-poró", + "generations_core.curry.mushroommedley": "Mix de Cogumelos", + "generations_core.curry.none": "Simples", + "generations_core.curry.pasta": "Massa", + "generations_core.curry.plentyofpotato": "Batata", + "generations_core.curry.rich": "Rico", + "generations_core.curry.salad": "Salada", + "generations_core.curry.sausage": "Salsicha", + "generations_core.curry.seasoned": "Temperado", + "generations_core.curry.smokedtail": "Rabo Defumado", + "generations_core.curry.toast": "Torrada", + "generations_core.curry.tropical": "Tropical", + "generations_core.curry.whippedcream": "Chantilly", + "generations_core.item.melody_flute.full_imbued1": "Totalmente imbuído com a essência de %s.", + "generations_core.item.melody_flute.full_imbued2": "Shift + clique direito em um(a) %s", + "generations_core.item.melody_flute.full_imbued3": "para gerar %s.", + "generations_core.item.melody_flute.imbued": "Imbuído: %s", + "generations_core.item.melody_flute.no_item": "Esta flauta ressoa com penas.", + "generations_core.item.melody_flute.not_full_imbued1": "Imbua ao derrotar %s Pokémon do tipo %s.", + "generations_core.item.melody_flute.not_full_imbued2": "Em seguida, Shift + clique direito em um(a) %s", + "generations_core.item.melody_flute.not_full_imbued3": "para gerar %s.", + "generations_core.item.timeglass.amount": "Você derrotou %s Pokémon dos tipos Grama, Psíquico ou Fada de 100 em um Bioma de Floresta de Flores", + "generations_core.item.timeglass.wrongbiome": "Você só pode invocar Celebi em um Bioma de Floresta de Flores", + "generations_core.pokemon.defused": "%s foi desfundido(a) de %s.", + "generations_core.pokemon.encoded": "%s foi codificado(a).", + "generations_core.pokemon.extracted_dna_fiber_succeed": "Extração de fibra de DNA de %s bem-sucedida!", + "generations_core.pokemon.extracted_dna_fibers_max": "Você extraiu todas as fibras de DNA que podia de %s.", + "generations_core.pokemon.extracted_fibers_max": "A quantidade máxima de fibras de DNA foi extraída de %s.", + "generations_core.pokemon.fused": "%s foi fundido(a) com %s.", + "generations_core.special.shadow.already": "O coração de %s já está fechado.", + "generations_core.special.shadow.failure": "%s recusou-se a fechar seu coração.", + "generations_core.special.shadow.success": "O coração de %s foi fechado.", + "generations_core.timeglass.amount": "§7Pokémon dos tipos Grama, Psíquico ou Fada restantes: ", + "generations_core.timeglass.wrongbiome": "§7Este item só funciona em um bioma de Floresta de Flores!", + "generations_core.ui.dna_fibers_extracted": "Fibras de DNA", + "generations_core.ui.interact.head_pat": "Carinho na Cabeça", + "gui.recipe_viewer.category.rks_machine": "Máquina RKS", + "gui.zygarde_cube": "Cubo de Zygarde", + "gui.zygarde_cube.merge_10.accept": "Suas Células se fundiram para formar um Zygarde 10%!", + "gui.zygarde_cube.merge_10.name": "Criar 10%", + "gui.zygarde_cube.merge_10_power_construct.accept": "Suas Células se fundiram para formar um Zygarde 10% com Power Construct!", + "gui.zygarde_cube.merge_10_power_construct.name": "Criar 10% com Power Construct", + "gui.zygarde_cube.merge_10_with_40_to_50.accept": "Seu Zygarde 10% foi combinado com 40 Células para criar um Zygarde 50%!", + "gui.zygarde_cube.merge_10_with_40_to_50.name": "Converter 10% para 50% com Power Construct", + "gui.zygarde_cube.merge_10_with_90_to_10_power_construct.accept": "Seu Zygarde 10% foi combinado com 90 Células para criar um Zygarde 10% com Power Construct!", + "gui.zygarde_cube.merge_10_with_90_to_10_power_construct.name": "Converter 10% para 10% Power Construct","gui.zygarde_cube.merge_10_with_90_to_50_power_construct.accept": "Seu Zygarde 10% foi combinado com 90 Células para criar um Zygarde 50% com Power Construct!","gui.zygarde_cube.merge_10_with_90_to_50_power_construct.name": "Converter 10% para 50% com Power Construct", + "gui.zygarde_cube.merge_50.accept": "Suas Células se fundiram para formar um Zygarde 50%!", + "gui.zygarde_cube.merge_50.name": "Criar 50%", + "gui.zygarde_cube.merge_50_power_construct.accept": "Suas Células se fundiram para formar um Zygarde 50% com Power Construct!", + "gui.zygarde_cube.merge_50_power_construct.name": "Criar 50% com Power Construct", + "gui.zygarde_cube.merge_50_with_50_to_50_power_construct.accept": "Seu Zygarde 50% foi combinado com 50 Células para criar um Zygarde 50% com Power Construct!", + "gui.zygarde_cube.merge_50_with_50_to_50_power_construct.name": "Converter 50% para 50% com Power Construct", + "gui.zygarde_cube.select": "Fundir Células de Zygarde", + "item.generations_core.ability_ribbon": "Fita de Habilidade", + "item.generations_core.ability_symbol": "Símbolo de Habilidade", + "item.generations_core.ability_symbol_silver": "Símbolo de Habilidade Prateado", + "item.generations_core.ability_urge": "Impulso de Habilidade", + "item.generations_core.ability_urge.desc": "Não implementado atualmente", + "item.generations_core.abomasite": "Abomasite", + "item.generations_core.absolite": "Absolite", + "item.generations_core.adamant_crystal": "Cristal Adamantino", + "item.generations_core.adamant_orb": "Orbe Adamantina", + "item.generations_core.adamant_orb.tooltip": "§7DICA: Este item parece estar relacionado ao Trio da Criação. Se você criou uma Corrente Vermelha, pode ativar um Altar.", + "item.generations_core.adrenaline_orb": "Orbe de Adrenalina", + "item.generations_core.adventure_guide": "Guia de Aventura", + "item.generations_core.adventure_guide.desc": "Não implementado atualmente", + "item.generations_core.aerodactylite": "Aerodactylite", + "item.generations_core.aether_boots": "Botas de Aether", + "item.generations_core.aether_chestplate": "Peitoral de Aether", + "item.generations_core.aether_helmet": "Capacete de Aether", + "item.generations_core.aether_leggings": "Calças de Aether", + "item.generations_core.aggronite": "Aggronite", + "item.generations_core.alakazite": "Alakazite", + "item.generations_core.alert_ribbon": "Fita de Alerta", + "item.generations_core.alola_cap": "Boné de Alola", + "item.generations_core.alola_champion_ribbon": "Fita de Campeão de Alola", + "item.generations_core.aloraichium_z": "Aloraichium Z", + "item.generations_core.altarianite": "Altarianite", + "item.generations_core.amethyst_axe": "Machado de Ametista", + "item.generations_core.amethyst_hammer": "Martelo de Ametista", + "item.generations_core.amethyst_hoe": "Enxada de Ametista", + "item.generations_core.amethyst_pickaxe": "Picareta de Ametista", + "item.generations_core.amethyst_shovel": "Pá de Ametista", + "item.generations_core.amethyst_sword": "Espada de Ametista", + "item.generations_core.ampharosite": "Ampharosite", + "item.generations_core.amulet_coin": "Amuleto da Moeda", + "item.generations_core.apricorn_box": "Caixa de Apricorn", + "item.generations_core.apricorn_box.desc": "Não implementado atualmente", + "item.generations_core.aqua_boots": "Botas Aqua", + "item.generations_core.aqua_chestplate": "Peitoral Aqua", + "item.generations_core.aqua_helmet": "Capacete Aqua", + "item.generations_core.aqua_leggings": "Calças Aqua", + "item.generations_core.aqua_suit": "Traje Aqua", + "item.generations_core.aqua_suit.desc": "Não implementado atualmente", + "item.generations_core.armor_pass": "Passe de Armadura", + "item.generations_core.armor_pass.desc": "Não implementado atualmente", + "item.generations_core.armorite_ore": "Minério de Armorita", + "item.generations_core.armorite_ore.desc": "Não implementado atualmente", + "item.generations_core.artist_ribbon": "Fita de Artista", + "item.generations_core.audinite": "Audinite", + "item.generations_core.aurora_ticket": "Ticket Aurora", + "item.generations_core.aurora_ticket.desc": "Não implementado atualmente", + "item.generations_core.autograph": "Autógrafo", + "item.generations_core.autograph.desc": "Não implementado atualmente", + "item.generations_core.azalea_town_disc": "Disco da Cidade de Azalea", + "item.generations_core.azure_flute": "Flauta Celeste", + "item.generations_core.azure_flute.desc": "Não implementado atualmente", + "item.generations_core.bachs_food_tin": "Lata de Comida de Bach", + "item.generations_core.balance_badge": "Insígnia de Equilíbrio", + "item.generations_core.balm_mushroom": "Cogumelo de Bálsamo", + "item.generations_core.band_autograph": "Autógrafo da Banda", + "item.generations_core.band_autograph.desc": "Não implementado atualmente", + "item.generations_core.banettite": "Banettite", + "item.generations_core.basement_key_1": "Chave do Porão 1", + "item.generations_core.basement_key_1.desc": "Não implementado atualmente", + "item.generations_core.basement_key_2": "Chave do Porão 2", + "item.generations_core.basement_key_2.desc": "Não implementado atualmente", + "item.generations_core.basic_badge": "Insígnia Básica", + "item.generations_core.basic_citrus_poke_puff": "Poké Poff Cítrico Básico", + "item.generations_core.basic_mint_poke_puff": "Poké Poff de Menta Básico", + "item.generations_core.basic_mocha_poke_puff": "Poké Poff de Moca Básico", + "item.generations_core.basic_spice_poke_puff": "Poké Poff Picante Básico", + "item.generations_core.basic_sweet_poke_puff": "Poké Poff Doce Básico", + "item.generations_core.battle_champion_ribbon": "Fita de Campeão de Batalha", + "item.generations_core.battle_royale_master_ribbon": "Fita Mestra de Battle Royale", + "item.generations_core.battle_tree_great_ribbon": "Fita Grande da Árvore de Batalha", + "item.generations_core.battle_tree_master_ribbon": "Fita Mestra da Árvore de Batalha", + "item.generations_core.beach_glass": "Vidro de Praia", + "item.generations_core.beacon_badge": "Insígnia de Farol", + "item.generations_core.beauty_master_ribbon": "Fita Mestra de Beleza", + "item.generations_core.beauty_ribbon_great": "Fita de Beleza Grande", + "item.generations_core.beauty_ribbon_hoenn": "Fita de Beleza de Hoenn", + "item.generations_core.beauty_ribbon_hyper": "Fita de Beleza Hiper", + "item.generations_core.beauty_ribbon_master_hoenn": "Fita Mestra de Beleza de Hoenn", + "item.generations_core.beauty_ribbon_master_sinnoh": "Fita Mestra de Beleza de Sinnoh", + "item.generations_core.beauty_ribbon_sinnoh": "Fita de Beleza de Sinnoh", + "item.generations_core.beauty_ribbon_super": "Fita de Beleza Super", + "item.generations_core.beauty_ribbon_ultra": "Fita de Beleza Ultra", + "item.generations_core.beedrillite": "Beedrillite", + "item.generations_core.belle_costume": "Fantasia Belle", + "item.generations_core.belligerent_wing": "Asa Beligerante", + "item.generations_core.berry_planter": "Plantador de Berry", + "item.generations_core.berry_planter.desc": "Não implementado atualmente", + "item.generations_core.berry_pouch": "Bolsa de Berry", + "item.generations_core.berry_pouch.desc": "Não implementado atualmente", + "item.generations_core.best_friends_ribbon": "Fita de Melhores Amigos", + "item.generations_core.big_malasada": "Grande Malasada", + "item.generations_core.big_mushroom": "Cogumelo Grande", + "item.generations_core.big_nugget": "Pepita Grande", + "item.generations_core.big_pearl": "Pérola Grande", + "item.generations_core.bike_frame": "Quadro de Bicicleta", + "item.generations_core.bike_handlebars": "Guidão de Bicicleta", + "item.generations_core.bike_seat": "Assento de Bicicleta", + "item.generations_core.bike_voucher": "Vale-Bicicleta", + "item.generations_core.bike_voucher.desc": "Não implementado atualmente", + "item.generations_core.bike_wheel": "Roda de Bicicleta", + "item.generations_core.birthday_ribbon": "Fita de Aniversário", + "item.generations_core.black_flute": "Flauta Preta", + "item.generations_core.black_mane_hair": "Cabelo de Crina Preta", + "item.generations_core.black_mane_hair.tooltip": "§7DICA: Este corcel majestoso requer uma oferta generosa de cenouras se você deseja contemplá-lo.", + "item.generations_core.blastoisinite": "Blastoisinite", + "item.generations_core.blazikenite": "Blazikenite", + "item.generations_core.blue_card": "Cartão Azul", + "item.generations_core.blue_card.desc": "Não implementado atualmente", + "item.generations_core.blue_flute": "Flauta Azul", + "item.generations_core.blue_juice": "Suco Azul", + "item.generations_core.blue_orb": "Orbe Azul", + "item.generations_core.blue_petal": "Pétala Azul", + "item.generations_core.blue_scarf": "Lenço Azul", + "item.generations_core.blue_scarf.desc": "Não implementado atualmente", + "item.generations_core.blue_shard": "Fragmento Azul", + "item.generations_core.blue_sphere": "Esfera Azul", + "item.generations_core.blue_sphere.desc": "Não implementado atualmente", + "item.generations_core.bobs_food_tin": "Lata de Comida de Bob", + "item.generations_core.boiled_egg": "Ovo Cozido", + "item.generations_core.bolt_badge": "Insígnia do Raio", + "item.generations_core.booster_energy": "Energia Impulsionadora", + "item.generations_core.bottle_cap": "Tampa de Garrafa", + "item.generations_core.boulder_badge": "Insígnia da Rocha", + "item.generations_core.brave_symbol": "Símbolo de Coragem", + "item.generations_core.brave_symbol_silver": "Símbolo de Coragem Prateado", + "item.generations_core.bread": "Pão", + "item.generations_core.brittle_bones": "Ossos Quebradiços", + "item.generations_core.bug_badge": "Insígnia do Inseto", + "item.generations_core.bug_candy": "Doce de Inseto", + "item.generations_core.bug_memory_drive": "Drive de Memória Inseto", + "item.generations_core.bug_tera_shard": "Fragmento Tera Inseto", + "item.generations_core.buginium_z": "Buginium Z", + "item.generations_core.burn_drive": "Drive de Queimadura", + "item.generations_core.camera": "Câmera", + "item.generations_core.cameruptite": "Cameruptite", + "item.generations_core.camping_gear": "Equipamento de Acampamento", + "item.generations_core.camping_gear.desc": "Não implementado atualmente", + "item.generations_core.card_key_1": "Cartão Chave 1", + "item.generations_core.card_key_1.desc": "Não implementado atualmente", + "item.generations_core.card_key_2": "Cartão Chave 2", + "item.generations_core.card_key_2.desc": "Não implementado atualmente", + "item.generations_core.careless_ribbon": "Fita Descuidada", + "item.generations_core.carrot_seeds": "Sementes de Cenoura", + "item.generations_core.carrot_seeds.desc": "Não implementado atualmente", + "item.generations_core.cascade_badge": "Insígnia da Cascata", + "item.generations_core.cascarrafa_city_disc": "Disco da Cidade de Cascarrafa", + "item.generations_core.casteliacone": "Casteliacone", + "item.generations_core.catching_charm": "Amuleto de Captura", + "item.generations_core.cerulean_city_disc": "Disco da Cidade de Cerulean", + "item.generations_core.chalky_stone": "Pedra Calcária", + "item.generations_core.champion_ribbon": "Fita de Campeão", + "item.generations_core.charge_stone_axe": "Machado de Charge Stone", + "item.generations_core.charge_stone_hammer": "Martelo de Charge Stone", + "item.generations_core.charge_stone_hoe": "Enxada de Charge Stone", + "item.generations_core.charge_stone_pickaxe": "Picareta de Charge Stone", + "item.generations_core.charge_stone_shovel": "Pá de Charge Stone", + "item.generations_core.charge_stone_sword": "Espada de Charge Stone", + "item.generations_core.charizardite_x": "Charizardite X", + "item.generations_core.charizardite_y": "Charizardite Y", + "item.generations_core.chill_drive": "Drive de Resfriamento", + "item.generations_core.chisel": "Cinzel", + "item.generations_core.classic_ribbon": "Fita Clássica", + "item.generations_core.clear_amulet": "Amuleto Claro", + "item.generations_core.clear_bell": "Sino Transparente", + "item.generations_core.clear_bell.desc": "Não implementado atualmente", + "item.generations_core.cleverness_master_ribbon": "Fita Mestra de Inteligência", + "item.generations_core.cliff_badge": "Insígnia do Penhasco", + "item.generations_core.coal_badge": "Insígnia do Carvão", + "item.generations_core.cobble_badge": "Insígnia de Cobble", + "item.generations_core.coconut_milk": "Leite de Coco", + "item.generations_core.coin": "Moeda", + "item.generations_core.coin.desc": "Não implementado atualmente", + "item.generations_core.coin_case": "Estojo de Moedas", + "item.generations_core.coin_case.desc": "Não implementado atualmente", + "item.generations_core.colorful_shake": "Milkshake Colorido", + "item.generations_core.colress_machine": "Máquina de Colress", + "item.generations_core.colress_machine.desc": "Não implementado atualmente", + "item.generations_core.comet_shard": "Fragmento de Cometa", + "item.generations_core.common_stone": "Pedra Comum", + "item.generations_core.common_stone.desc": "Não implementado atualmente", + "item.generations_core.complete_shield_badge": "Insígnia de Escudo Completa", + "item.generations_core.complete_sword_badge": "Insígnia de Espada Completa", + "item.generations_core.contest_costume_1": "Fantasia de Concurso 1", + "item.generations_core.contest_costume_1.desc": "Não implementado atualmente", + "item.generations_core.contest_costume_2": "Fantasia de Concurso 2", + "item.generations_core.contest_costume_2.desc": "Não implementado atualmente", + "item.generations_core.contest_pass": "Passe de Concurso", + "item.generations_core.contest_pass.desc": "Não implementado atualmente", + "item.generations_core.contest_star_ribbon": "Fita Estrela de Concurso", + "item.generations_core.cool_ribbon_great": "Fita de Estilo Grande", + "item.generations_core.cool_ribbon_hoenn": "Fita de Estilo de Hoenn", + "item.generations_core.cool_ribbon_hyper": "Fita de Estilo Hiper", + "item.generations_core.cool_ribbon_master_hoenn": "Fita Mestra de Estilo de Hoenn", + "item.generations_core.cool_ribbon_master_sinnoh": "Fita Mestra de Estilo de Sinnoh", + "item.generations_core.cool_ribbon_sinnoh": "Fita de Estilo de Sinnoh", + "item.generations_core.cool_ribbon_super": "Fita de Estilo Super", + "item.generations_core.cool_ribbon_ultra": "Fita de Estilo Ultra", + "item.generations_core.coolness_master_ribbon": "Fita Mestra de Estilo", + "item.generations_core.copper_plate": "Placa de Cobre", + "item.generations_core.coraleye_badge": "Insígnia Coraleye", + "item.generations_core.cornerstone_mask": "Máscara de Pedra Angular", + "item.generations_core.country_ribbon": "Fita de País", + "item.generations_core.coupon_1": "Cupom 1", + "item.generations_core.coupon_1.desc": "Não implementado atualmente", + "item.generations_core.coupon_2": "Cupom 2", + "item.generations_core.coupon_2.desc": "Não implementado atualmente", + "item.generations_core.coupon_3": "Cupom 3", + "item.generations_core.coupon_3.desc": "Não implementado atualmente", + "item.generations_core.courage_candy": "Doce de Coragem", + "item.generations_core.courage_candy.desc": "Não implementado atualmente", + "item.generations_core.courage_candy_l": "Doce de Coragem G", + "item.generations_core.courage_candy_l.desc": "Não implementado atualmente", + "item.generations_core.courage_candy_xl": "Doce de Coragem GG", + "item.generations_core.courage_candy_xl.desc": "Não implementado atualmente", + "item.generations_core.crown_pass": "Passe Coroa", + "item.generations_core.crown_pass.desc": "Não implementado atualmente", + "item.generations_core.crowned_shield": "Escudo Coroado", + "item.generations_core.crowned_sword": "Espada Coroada", + "item.generations_core.crumbled_rock_key_1": "Chave de Rocha Despedaçada 1", + "item.generations_core.crumbled_rock_key_1.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.crumbled_rock_key_2": "Chave de Rocha Despedaçada 2", + "item.generations_core.crumbled_rock_key_2.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.crumbled_rock_key_3": "Chave de Rocha Despedaçada 3", + "item.generations_core.crumbled_rock_key_3.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.crumbled_rock_key_4": "Chave de Rocha Despedaçada 4", + "item.generations_core.crumbled_rock_key_4.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.crystal": "Cristal", + "item.generations_core.crystal_axe": "Machado de Cristal", + "item.generations_core.crystal_hammer": "Martelo de Cristal", + "item.generations_core.crystal_hoe": "Enxada de Cristal", + "item.generations_core.crystal_of_emotion": "Cristal da Emoção", + "item.generations_core.crystal_of_emotion.tooltip": "§7DICA: Há ainda mais neste item estranho. Colete os outros cristais e talvez você possa criar uma corrente especial.", + "item.generations_core.crystal_of_emotion.tooltip.enchanted": "§7DICA: Tente carregá-lo derrotando Pokémon de um tipo relevante.", + "item.generations_core.crystal_of_knowledge": "Cristal do Conhecimento", + "item.generations_core.crystal_of_knowledge.tooltip": "§7DICA: Há ainda mais neste item estranho. Colete os outros cristais e talvez você possa criar uma corrente especial.", + "item.generations_core.crystal_of_knowledge.tooltip.enchanted": "§7DICA: Tente carregá-lo derrotando Pokémon de um tipo relevante.", + "item.generations_core.crystal_of_willpower": "Cristal da Força de Vontade", + "item.generations_core.crystal_of_willpower.tooltip": "§7DICA: Há ainda mais neste item estranho. Colete os outros cristais e talvez você possa criar uma corrente especial.", + "item.generations_core.crystal_of_willpower.tooltip.enchanted": "§7DICA: Tente carregá-lo derrotando Pokémon de um tipo relevante.", + "item.generations_core.crystal_pickaxe": "Picareta de Cristal", + "item.generations_core.crystal_shovel": "Pá de Cristal", + "item.generations_core.crystal_sword": "Espada de Cristal", + "item.generations_core.crystallized_boots": "Botas Cristalizadas", + "item.generations_core.crystallized_chestplate": "Peitoral Cristalizado", + "item.generations_core.crystallized_helmet": "Capacete Cristalizado", + "item.generations_core.crystallized_leggings": "Calças Cristalizadas", + "item.generations_core.curry": "Curry", + "item.generations_core.cute_ribbon_great": "Fita de Fofura Grande", + "item.generations_core.cute_ribbon_hoenn": "Fita de Fofura de Hoenn", + "item.generations_core.cute_ribbon_hyper": "Fita de Fofura Hiper", + "item.generations_core.cute_ribbon_master_hoenn": "Fita Mestra de Fofura de Hoenn", + "item.generations_core.cute_ribbon_master_sinnoh": "Fita Mestra de Fofura de Sinnoh", + "item.generations_core.cute_ribbon_sinnoh": "Fita de Fofura de Sinnoh", + "item.generations_core.cute_ribbon_super": "Fita de Fofura Super", + "item.generations_core.cute_ribbon_ultra": "Fita de Fofura Ultra", + "item.generations_core.cuteness_master_ribbon": "Fita Mestra de Fofura", + "item.generations_core.cynthia_disc": "Disco de Cynthia", + "item.generations_core.dark_badge": "Insígnia da Escuridão", + "item.generations_core.dark_candy": "Doce Sombrio", + "item.generations_core.dark_memory_drive": "Drive de Memória Sombrio", + "item.generations_core.dark_soul": "Alma Sombria", + "item.generations_core.dark_soul.tooltip": "§7DICA: Darkrai aparece fracamente, você precisa de mais.", + "item.generations_core.dark_stone": "Pedra Sombria", + "item.generations_core.dark_stone.tooltip": "§7DICA: Não está reagindo. Mais Dragões podem resolver.", + "item.generations_core.dark_tera_shard": "Fragmento Tera Sombrio", + "item.generations_core.darkinium_z": "Darkinium Z", + "item.generations_core.data_cards": "Cartões de Dados", + "item.generations_core.data_cards.desc": "Não implementado atualmente", + "item.generations_core.dawn_stone_axe": "Machado de Dawn Stone", + "item.generations_core.dawn_stone_boots": "Botas de Dawn Stone", + "item.generations_core.dawn_stone_chestplate": "Peitoral de Dawn Stone", + "item.generations_core.dawn_stone_hammer": "Martelo de Dawn Stone", + "item.generations_core.dawn_stone_helmet": "Capacete de Dawn Stone", + "item.generations_core.dawn_stone_hoe": "Enxada de Dawn Stone", + "item.generations_core.dawn_stone_leggings": "Calças de Dawn Stone", + "item.generations_core.dawn_stone_pickaxe": "Picareta de Dawn Stone", + "item.generations_core.dawn_stone_shovel": "Pá de Dawn Stone", + "item.generations_core.dawn_stone_sword": "Espada de Dawn Stone", + "item.generations_core.decidium_z": "Decidium Z", + "item.generations_core.deoxys_disc": "Disco de Deoxys", + "item.generations_core.devon_parts": "Peças Devon", + "item.generations_core.devon_parts.desc": "Não implementado atualmente", + "item.generations_core.devon_scope": "Escopo Devon", + "item.generations_core.devon_scope.desc": "Não implementado atualmente", + "item.generations_core.devon_scuba_gear": "Equipamento de Mergulho Devon", + "item.generations_core.devon_scuba_gear.desc": "Não implementado atualmente", + "item.generations_core.diamond_hammer": "Martelo de Diamante", + "item.generations_core.diancite": "Diancite","item.generations_core.dire_hit_2": "Ataque Direto 2", + "item.generations_core.dire_hit_2.desc": "Não implementado atualmente", + "item.generations_core.dire_hit_3": "Ataque Direto 3", + "item.generations_core.dire_hit_3.desc": "Não implementado atualmente", + "item.generations_core.discharged_eleki_key_1": "Chave Eleki Descarregada 1", + "item.generations_core.discharged_eleki_key_1.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.discharged_eleki_key_2": "Chave Eleki Descarregada 2", + "item.generations_core.discharged_eleki_key_2.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.discharged_eleki_key_3": "Chave Eleki Descarregada 3", + "item.generations_core.discharged_eleki_key_3.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.discharged_eleki_key_4": "Chave Eleki Descarregada 4", + "item.generations_core.discharged_eleki_key_4.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.discount_coupon": "Cupom de Desconto", + "item.generations_core.discount_coupon.desc": "Não implementado atualmente", + "item.generations_core.dna_splicers": "Splicers de DNA", + "item.generations_core.double_ability_ribbon": "Fita de Habilidade Dupla", + "item.generations_core.douse_drive": "Drive de Imersão", + "item.generations_core.downcast_ribbon": "Fita Desanimada", + "item.generations_core.dowsing_machine_1": "Máquina de Dowsing 1", + "item.generations_core.dowsing_machine_1.desc": "Não implementado atualmente", + "item.generations_core.dowsing_machine_2": "Máquina de Dowsing 2", + "item.generations_core.dowsing_machine_2.desc": "Não implementado atualmente", + "item.generations_core.dowsing_mchn": "Máquina de Dowsing", + "item.generations_core.dowsing_mchn.desc": "Não implementado atualmente", + "item.generations_core.draco_plate": "Placa Draco", + "item.generations_core.drago_key": "Chave Drago", + "item.generations_core.drago_key.tooltip": "§7DICA: Este item parece estar relacionado a um dos Regis. Encontre o santuário deles no Templo Snowpoint.", + "item.generations_core.dragon_badge": "Insígnia do Dragão", + "item.generations_core.dragon_candy": "Doce de Dragão", + "item.generations_core.dragon_memory_drive": "Drive de Memória Dragão", + "item.generations_core.dragon_skull": "Crânio de Dragão", + "item.generations_core.dragon_skull.desc": "Não implementado atualmente", + "item.generations_core.dragon_soul": "Alma de Dragão", + "item.generations_core.dragon_soul.tooltip": "§7DICA: Ele grita. Eles procuram seus mestres - o Trio Tao. Um Orbe é necessário para selar essas almas. Com uma certa Gema, você pode manipulá-lo em direção a um Tao específico.", + "item.generations_core.dragon_stone": "Pedra de Dragão", + "item.generations_core.dragon_stone.tooltip": "§7DICA: Não está reagindo. Mais Dragões podem resolver.", + "item.generations_core.dragon_tera_shard": "Fragmento Tera Dragão", + "item.generations_core.dragonium_z": "Dragonium Z", + "item.generations_core.dread_plate": "Placa de Pavor", + "item.generations_core.dropped_item_red": "Item Derrubado Vermelho", + "item.generations_core.dropped_item_red.desc": "Não implementado atualmente", + "item.generations_core.dropped_item_yellow": "Item Derrubado Amarelo", + "item.generations_core.dropped_item_yellow.desc": "Não implementado atualmente", + "item.generations_core.dusk_stone_axe": "Machado de Dusk Stone", + "item.generations_core.dusk_stone_boots": "Botas de Dusk Stone", + "item.generations_core.dusk_stone_chestplate": "Peitoral de Dusk Stone", + "item.generations_core.dusk_stone_hammer": "Martelo de Dusk Stone", + "item.generations_core.dusk_stone_helmet": "Capacete de Dusk Stone", + "item.generations_core.dusk_stone_hoe": "Enxada de Dusk Stone", + "item.generations_core.dusk_stone_leggings": "Calças de Dusk Stone", + "item.generations_core.dusk_stone_pickaxe": "Picareta de Dusk Stone", + "item.generations_core.dusk_stone_shovel": "Pá de Dusk Stone", + "item.generations_core.dusk_stone_sword": "Espada de Dusk Stone", + "item.generations_core.dynamax_band": "Faixa Dynamax", + "item.generations_core.dynamax_candy": "Doce Dynamax", + "item.generations_core.dynamo_badge": "Insígnia Dynamo", + "item.generations_core.dynite_ore": "Minério de Dynita", + "item.generations_core.earth_badge": "Insígnia da Terra", + "item.generations_core.earth_plate": "Placa da Terra", + "item.generations_core.earth_ribbon": "Fita da Terra", + "item.generations_core.eevium_z": "Eevium Z", + "item.generations_core.effort_ribbon": "Fita de Esforço", + "item.generations_core.electric_candy": "Doce Elétrico", + "item.generations_core.electric_memory_drive": "Drive de Memória Elétrico", + "item.generations_core.electric_tera_shard": "Fragmento Tera Elétrico", + "item.generations_core.electrium_z": "Electrium Z", + "item.generations_core.elegant_wing": "Asa Elegante", + "item.generations_core.eleki_key": "Chave Eleki", + "item.generations_core.eleki_key.tooltip": "§7DICA: Este item parece estar relacionado a um dos Regis. Encontre o santuário deles no Templo Snowpoint.", + "item.generations_core.elevator_key": "Chave do Elevador", + "item.generations_core.elevator_key.desc": "Não implementado atualmente", + "item.generations_core.endorsement": "Endosso", + "item.generations_core.endorsement.desc": "Não implementado atualmente", + "item.generations_core.energy_powder": "Pó de Energia", + "item.generations_core.enigma_fragment": "Fragmento Enigma", + "item.generations_core.enigma_fragment.desc": "Um item misterioso obtido ao descobrir novos biomas.", + "item.generations_core.enigma_fragment.tooltip": "§7DICA: Você parece ganhar um a cada novo bioma descoberto. Se coletar o suficiente, talvez possa criar algo.", + "item.generations_core.enigma_shard": "Fragmento Enigma", + "item.generations_core.enigma_shard.tooltip": "§7DICA: Você deve explorar mais... Talvez com o suficiente deles você possa criar algo relacionado à Dupla Eon.", + "item.generations_core.enigma_stone": "Pedra Enigma", + "item.generations_core.enigma_stone.tooltip": "§7DICA: Você deve tentar capturar ou derrotar Pokémon do Tipo Psíquico ou Dragão", + "item.generations_core.entei_statue": "Estátua de Entei", + "item.generations_core.eon_flute": "Flauta Eon", + "item.generations_core.eon_flute.desc": "Não implementado atualmente", + "item.generations_core.eon_ticket": "Ticket Eon", + "item.generations_core.eon_ticket.desc": "Não implementado atualmente", + "item.generations_core.escape_rope": "Corda de Fuga", + "item.generations_core.eterna_city_disc": "Disco da Cidade de Eterna", + "item.generations_core.event_ribbon": "Fita de Evento", + "item.generations_core.exp_all": "Exp Tudo", + "item.generations_core.exp_all.desc": "Não implementado atualmente", + "item.generations_core.exp_charm": "Amuleto de Exp", + "item.generations_core.expert_battler_ribbon": "Fita de Batalhador Especialista", + "item.generations_core.explorer_kit": "Kit de Explorador", + "item.generations_core.explorer_kit.desc": "Não implementado atualmente", + "item.generations_core.faded_blue_orb": "Orbe Azul Desbotada", + "item.generations_core.faded_blue_orb.tooltip": "§7DICA: Este item parece estar relacionado ao Trio do Clima. Tente carregá-lo derrotando Pokémon de um tipo relevante. Depois, encontre um santuário relevante.", + "item.generations_core.faded_jade_orb": "Orbe Jade Desbotada", + "item.generations_core.faded_jade_orb.tooltip": "§7DICA: Este item parece estar relacionado ao Trio do Clima. Tente carregá-lo derrotando Pokémon de um tipo relevante. Depois, vá a uma altitude MUITO alta.", + "item.generations_core.faded_red_orb": "Orbe Vermelha Desbotada", + "item.generations_core.faded_red_orb.tooltip": "§7DICA: Este item parece estar relacionado ao Trio do Clima. Tente carregá-lo derrotando Pokémon de um tipo relevante. Depois, encontre um santuário relevante.", + "item.generations_core.fairium_z": "Fairium Z", + "item.generations_core.fairy_2_badge": "Insígnia da Fada 2", + "item.generations_core.fairy_badge": "Insígnia da Fada", + "item.generations_core.fairy_candy": "Doce de Fada", + "item.generations_core.fairy_feather": "Pena de Fada", + "item.generations_core.fairy_memory_drive": "Drive de Memória Fada", + "item.generations_core.fairy_tera_shard": "Fragmento Tera Fada", + "item.generations_core.fame_checker": "Verificador de Fama", + "item.generations_core.fame_checker.desc": "Não implementado atualmente", + "item.generations_core.fancy_apple": "Maçã Chique", + "item.generations_core.fashion_case": "Estojo de Moda", + "item.generations_core.fashion_case.desc": "Não implementado atualmente", + "item.generations_core.feather_badge": "Insígnia de Pena", + "item.generations_core.fen_badge": "Insígnia de Fen", + "item.generations_core.festival_ticket": "Ticket de Festival", + "item.generations_core.festival_ticket.desc": "Não implementado atualmente", + "item.generations_core.fiery_wing": "Asa Ardente", + "item.generations_core.fighting_badge": "Insígnia de Luta", + "item.generations_core.fighting_candy": "Doce de Luta", + "item.generations_core.fighting_memory_drive": "Drive de Memória Luta", + "item.generations_core.fighting_tera_shard": "Fragmento Tera Luta", + "item.generations_core.fightinium_z": "Fightinium Z", + "item.generations_core.film": "Filme", + "item.generations_core.fire_badge": "Insígnia de Fogo", + "item.generations_core.fire_candy": "Doce de Fogo", + "item.generations_core.fire_memory_drive": "Drive de Memória Fogo", + "item.generations_core.fire_stone_axe": "Machado de Fire Stone", + "item.generations_core.fire_stone_boots": "Botas de Fire Stone", + "item.generations_core.fire_stone_chestplate": "Peitoral de Fire Stone", + "item.generations_core.fire_stone_hammer": "Martelo de Fire Stone", + "item.generations_core.fire_stone_helmet": "Capacete de Fire Stone", + "item.generations_core.fire_stone_hoe": "Enxada de Fire Stone", + "item.generations_core.fire_stone_leggings": "Calças de Fire Stone", + "item.generations_core.fire_stone_pickaxe": "Picareta de Fire Stone", + "item.generations_core.fire_stone_shovel": "Pá de Fire Stone", + "item.generations_core.fire_stone_sword": "Espada de Fire Stone", + "item.generations_core.fire_tera_shard": "Fragmento Tera Fogo", + "item.generations_core.firium_z": "Firium Z", + "item.generations_core.fist_plate": "Placa do Punho", + "item.generations_core.flame_plate": "Placa da Chama", + "item.generations_core.flare_boots": "Botas Flare", + "item.generations_core.flare_chestplate": "Peitoral Flare", + "item.generations_core.flare_helmet": "Capacete Flare", + "item.generations_core.flare_leggings": "Calças Flare", + "item.generations_core.fluffy_tail": "Cauda Fofa", + "item.generations_core.flying_candy": "Doce Voador", + "item.generations_core.flying_memory_drive": "Drive de Memória Voador", + "item.generations_core.flying_tera_shard": "Fragmento Tera Voador", + "item.generations_core.flyinium_z": "Flyinium Z", + "item.generations_core.fog_badge": "Insígnia do Nevoeiro", + "item.generations_core.footprint_ribbon": "Fita de Pegada", + "item.generations_core.forage_bag": "Saco de Forrageamento", + "item.generations_core.forage_bag.desc": "Não implementado atualmente", + "item.generations_core.forest_badge": "Insígnia da Floresta", + "item.generations_core.fragmented_drago_key_1": "Chave Drago Fragmentada 1", + "item.generations_core.fragmented_drago_key_1.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.fragmented_drago_key_2": "Chave Drago Fragmentada 2", + "item.generations_core.fragmented_drago_key_2.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.fragmented_drago_key_3": "Chave Drago Fragmentada 3", + "item.generations_core.fragmented_drago_key_3.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.fragmented_drago_key_4": "Chave Drago Fragmentada 4", + "item.generations_core.fragmented_drago_key_4.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.freedom_badge": "Insígnia da Liberdade", + "item.generations_core.freeze_badge": "Insígnia de Congelamento", + "item.generations_core.fresh_cream": "Creme Fresco", + "item.generations_core.fresh_water": "Água Fresca", + "item.generations_core.fried_food": "Comida Frita", + "item.generations_core.fruit_bunch": "Cacho de Frutas", + "item.generations_core.full_incense": "Incenso Total", + "item.generations_core.galactic_boots": "Botas Galácticas", + "item.generations_core.galactic_chestplate": "Peitoral Galáctico", + "item.generations_core.galactic_helmet": "Capacete Galáctico", + "item.generations_core.galactic_key": "Chave Galáctica", + "item.generations_core.galactic_key.desc": "Não implementado atualmente", + "item.generations_core.galactic_leggings": "Calças Galácticas", + "item.generations_core.galar_champ_ribbon": "Fita de Campeão de Galar", + "item.generations_core.galarica_twig": "Galho de Galarica", + "item.generations_core.galarica_twig.desc": "Não implementado atualmente", + "item.generations_core.galladite": "Galladite", + "item.generations_core.garchompite": "Garchompite", + "item.generations_core.gardevoirite": "Gardevoirite", + "item.generations_core.gb_sounds": "Sons GB", + "item.generations_core.gengarite": "Gengarite", + "item.generations_core.ghost_badge": "Insígnia Fantasma", + "item.generations_core.ghost_boat": "Barco Fantasma", + "item.generations_core.ghost_boat_with_chest": "Barco Fantasma com Baú", + "item.generations_core.ghost_candy": "Doce Fantasma", + "item.generations_core.ghost_memory_drive": "Drive de Memória Fantasma", + "item.generations_core.ghost_tera_shard": "Fragmento Tera Fantasma", + "item.generations_core.ghostium_z": "Ghostium Z", + "item.generations_core.gift_box": "Caixa de Presente", + "item.generations_core.gigantamix": "Gigantamix", + "item.generations_core.glacier_badge": "Insígnia da Geleira", + "item.generations_core.glalitite": "Glalitite", + "item.generations_core.go_goggles": "Óculos Go", + "item.generations_core.go_goggles.desc": "Não implementado atualmente", + "item.generations_core.gold_bottle_cap": "Tampa de Garrafa Dourada", + "item.generations_core.gold_leaf": "Folha de Ouro", + "item.generations_core.gold_teeth": "Dentes de Ouro", + "item.generations_core.gold_teeth.desc": "Não implementado atualmente", + "item.generations_core.golden_hammer": "Martelo Dourado", + "item.generations_core.golden_nanab_berry": "Berry Nanab Dourada", + "item.generations_core.golden_nanab_berry.desc": "Não implementado atualmente", + "item.generations_core.golden_pinap_berry": "Berry Pinap Dourada", + "item.generations_core.golden_pinap_berry.desc": "Não implementado atualmente", + "item.generations_core.golden_razz_berry": "Berry Razz Dourada", + "item.generations_core.golden_razz_berry.desc": "Não implementado atualmente", + "item.generations_core.goldenrod_city_disc": "Disco da Cidade de Goldenrod", + "item.generations_core.good_rod": "Vara Boa", + "item.generations_core.gorgeous_ribbon": "Fita Linda", + "item.generations_core.gorgeous_royal_ribbon": "Fita Real Linda", + "item.generations_core.gracidea": "Gracidea", + "item.generations_core.gram": "Gram", + "item.generations_core.gram.desc": "Não implementado atualmente", + "item.generations_core.grass_badge": "Insígnia de Grama", + "item.generations_core.grass_candy": "Doce de Grama", + "item.generations_core.grass_memory_drive": "Drive de Memória Grama", + "item.generations_core.grass_tera_shard": "Fragmento Tera Grama", + "item.generations_core.grassium_z": "Grassium Z", + "item.generations_core.great_ability_ribbon": "Fita de Habilidade Grande", + "item.generations_core.great_walkmon": "Great Walkmon", + "item.generations_core.green_juice": "Suco Verde", + "item.generations_core.green_petal": "Pétala Verde", + "item.generations_core.green_scarf": "Lenço Verde", + "item.generations_core.green_scarf.desc": "Não implementado atualmente", + "item.generations_core.green_shard": "Fragmento Verde", + "item.generations_core.green_sphere": "Esfera Verde", + "item.generations_core.green_sphere.desc": "Não implementado atualmente", + "item.generations_core.green_tea": "Chá Verde", + "item.generations_core.green_tea.desc": "Não implementado atualmente", + "item.generations_core.grip_claw": "Garra de Aperto", + "item.generations_core.griseous_core": "Núcleo Griseous", + "item.generations_core.griseous_orb": "Orbe Griseous", + "item.generations_core.griseous_orb.tooltip": "§7DICA: Este item parece estar relacionado ao Trio da Criação. Se você criou uma Corrente Vermelha, pode ativar um Altar.", + "item.generations_core.ground_candy": "Doce Terrestre", + "item.generations_core.ground_memory_drive": "Drive de Memória Terrestre", + "item.generations_core.ground_tera_shard": "Fragmento Tera Terrestre", + "item.generations_core.groundium_z": "Groundium Z", + "item.generations_core.grubby_hanky": "Lenço Sujo", + "item.generations_core.grubby_hanky.desc": "Não implementado atualmente", + "item.generations_core.guts_symbol": "Símbolo de Coragem", + "item.generations_core.guts_symbol_silver": "Símbolo de Coragem Prateado", + "item.generations_core.gyaradosite": "Gyaradosite", + "item.generations_core.harmony_badge": "Insígnia da Harmonia", + "item.generations_core.health_candy": "Doce de Saúde", + "item.generations_core.health_candy.desc": "Não implementado atualmente", + "item.generations_core.health_candy_l": "Doce de Saúde G", + "item.generations_core.health_candy_l.desc": "Não implementado atualmente", + "item.generations_core.health_candy_xl": "Doce de Saúde GG", + "item.generations_core.health_candy_xl.desc": "Não implementado atualmente", + "item.generations_core.heart_scale": "Escama de Coração", + "item.generations_core.hearthflame_mask": "Máscara de Chama do Coração", + "item.generations_core.heat_badge": "Insígnia de Calor", + "item.generations_core.heracronite": "Heracronite", + "item.generations_core.hi_tech_earbuds": "Fones de Ouvido Hi Tech", + "item.generations_core.hidden_button": "Botão Escondido", + "item.generations_core.hidden_cube": "Cubo Escondido", + "item.generations_core.hidden_iron_door": "Porta de Ferro Escondida", + "item.generations_core.hidden_lever": "Alavanca Escondida", + "item.generations_core.hidden_pressure_plate": "Placa de Pressão Escondida", + "item.generations_core.hidden_wooden_door": "Porta de Madeira Escondida", + "item.generations_core.hive_badge": "Insígnia da Colmeia", + "item.generations_core.hoenn_cap": "Boné de Hoenn", + "item.generations_core.hoenn_champion_ribbon": "Fita de Campeão de Hoenn", + "item.generations_core.holo_caster_1": "Holo Caster 1", + "item.generations_core.holo_caster_1.desc": "Não implementado atualmente", + "item.generations_core.holo_caster_2": "Holo Caster 2", + "item.generations_core.holo_caster_2.desc": "Não implementado atualmente", + "item.generations_core.honey": "Mel", + "item.generations_core.honor_of_kalos": "Honra de Kalos", + "item.generations_core.honor_of_kalos.desc": "Não implementado atualmente", + "item.generations_core.hoopa_ring": "Anel de Hoopa", + "item.generations_core.hoopa_ring.tooltip": "§7DICA: Se você coletar 6 e inseri-los em um Haste de Garrafa, poderá criar uma Garrafa Prisão. Uma Haste de Garrafa pode ser criada com Rubis, Terracota Esmaltada Branca e um Orbe.", + "item.generations_core.houndoominite": "Houndoominite", + "item.generations_core.ice_badge": "Insígnia de Gelo", + "item.generations_core.ice_candy": "Doce de Gelo", + "item.generations_core.ice_memory_drive": "Drive de Memória Gelo", + "item.generations_core.ice_stone_axe": "Machado de Ice Stone", + "item.generations_core.ice_stone_boots": "Botas de Ice Stone", + "item.generations_core.ice_stone_chestplate": "Peitoral de Ice Stone", + "item.generations_core.ice_stone_hammer": "Martelo de Ice Stone", + "item.generations_core.ice_stone_helmet": "Capacete de Ice Stone", + "item.generations_core.ice_stone_hoe": "Enxada de Ice Stone", + "item.generations_core.ice_stone_leggings": "Calças de Ice Stone", + "item.generations_core.ice_stone_pickaxe": "Picareta de Ice Stone", + "item.generations_core.ice_stone_shovel": "Pá de Ice Stone", + "item.generations_core.ice_stone_sword": "Espada de Ice Stone", + "item.generations_core.ice_tera_shard": "Fragmento Tera Gelo", + "item.generations_core.iceberg_badge": "Insígnia do Iceberg", + "item.generations_core.iceberg_key": "Chave do Iceberg", + "item.generations_core.iceberg_key.tooltip": "§7DICA: Este item parece estar relacionado a um dos Regis. Encontre o santuário deles no Templo Snowpoint.", + "item.generations_core.iceroot_carrot": "Cenoura de Raiz de Gelo", + "item.generations_core.icicle_badge": "Insígnia do Pingente", + "item.generations_core.icicle_plate": "Placa do Pingente", + "item.generations_core.icirrus_city_disc": "Disco da Cidade de Icirrus", + "item.generations_core.icium_z": "Icium Z", + "item.generations_core.icy_wing": "Asa Gelada", + "item.generations_core.incinium_z": "Incinium Z", + "item.generations_core.inert_relic_song": "Canção Relíquia Inerte", + "item.generations_core.inert_relic_song.tooltip": "Canção Relíquia - Shota Kageyama.", + "item.generations_core.insect_badge": "Insígnia do Inseto", + "item.generations_core.insect_plate": "Placa do Inseto", + "item.generations_core.instant_noodles": "Macarrão Instantâneo", + "item.generations_core.intriguing_stone": "Pedra Intrigante", + "item.generations_core.intriguing_stone.desc": "Não implementado atualmente", + "item.generations_core.iris_disc": "Disco de Iris", + "item.generations_core.iron_hammer": "Martelo de Ferro", + "item.generations_core.iron_key": "Chave de Ferro", + "item.generations_core.iron_key.tooltip": "§7DICA: Este item parece estar relacionado a um dos Regis. Encontre o santuário deles no Templo Snowpoint.", + "item.generations_core.iron_plate": "Placa de Ferro", + "item.generations_core.item_drop": "Item Drop", + "item.generations_core.item_drop.desc": "Não implementado atualmente", + "item.generations_core.item_urge": "Impulso de Item", + "item.generations_core.item_urge.desc": "Não implementado atualmente", + "item.generations_core.jade_orb": "Orbe Jade", + "item.generations_core.jade_orb.tooltip": "§7DICA: Este item pode ensinar Ascensão do Dragão a um certo Pokémon.", + "item.generations_core.jadestar_badge": "Insígnia Jadestar", + "item.generations_core.jet_badge": "Insígnia de Jato", + "item.generations_core.jewel_of_life": "Jóia da Vida", + "item.generations_core.journal": "Diário", + "item.generations_core.journal.desc": "Não implementado atualmente", + "item.generations_core.jubilife_village_disc": "Disco da Vila Jubilife", + "item.generations_core.kalos_cap": "Boné de Kalos", + "item.generations_core.kalos_champion_ribbon": "Fita de Campeão de Kalos", + "item.generations_core.kangaskhanite": "Kangaskhanite", + "item.generations_core.kanto_cap": "Boné de Kanto", + "item.generations_core.kanto_disc": "Disco de Kanto", + "item.generations_core.key_stone": "Key Stone", + "item.generations_core.key_stone_2": "Key Stone 2", + "item.generations_core.key_stone_2.desc": "Não implementado atualmente", + "item.generations_core.key_to_room_1": "Chave para o Quarto 1", + "item.generations_core.key_to_room_1.desc": "Não implementado atualmente", + "item.generations_core.key_to_room_2": "Chave para o Quarto 2", + "item.generations_core.key_to_room_2.desc": "Não implementado atualmente", + "item.generations_core.key_to_room_4": "Chave para o Quarto 4", + "item.generations_core.key_to_room_4.desc": "Não implementado atualmente", + "item.generations_core.key_to_room_6": "Chave para o Quarto 6", + "item.generations_core.key_to_room_6.desc": "Não implementado atualmente", + "item.generations_core.knowledge_symbol": "Símbolo do Conhecimento", + "item.generations_core.knowledge_symbol_silver": "Símbolo do Conhecimento Prateado", + "item.generations_core.knuckle_badge": "Insígnia do Punho", + "item.generations_core.komala_coffee": "Café Komala", + "item.generations_core.kommonium_z": "Kommonium Z", + "item.generations_core.lagging_tail": "Cauda de Atraso", + "item.generations_core.lake_of_rage_disc": "Disco do Lago da Fúria", + "item.generations_core.large_leek": "Alho-Poró Grande", + "item.generations_core.latiasite": "Latiasite", + "item.generations_core.latiosite": "Latiosite", + "item.generations_core.lava_cookie": "Biscoito de Lava", + "item.generations_core.lava_crystal": "Cristal de Lava", + "item.generations_core.lava_crystal.tooltip": "§7DICA: Você vê uma imagem fraca de Heatran por dentro. Você precisará de mais, e um Orbe.", + "item.generations_core.lavender_town_disc": "Disco da Cidade de Lavender", + "item.generations_core.laverre_city_disc": "Disco da Cidade de Laverre", + "item.generations_core.lax_incense": "Incenso Relaxado", + "item.generations_core.leaf_letter": "Carta de Folha", + "item.generations_core.leaf_letter.desc": "Não implementado atualmente", + "item.generations_core.leaf_stone_axe": "Machado de Leaf Stone", + "item.generations_core.leaf_stone_boots": "Botas de Leaf Stone", + "item.generations_core.leaf_stone_chestplate": "Peitoral de Leaf Stone", + "item.generations_core.leaf_stone_hammer": "Martelo de Leaf Stone", + "item.generations_core.leaf_stone_helmet": "Capacete de Leaf Stone", + "item.generations_core.leaf_stone_hoe": "Enxada de Leaf Stone", + "item.generations_core.leaf_stone_leggings": "Calças de Leaf Stone", + "item.generations_core.leaf_stone_pickaxe": "Picareta de Leaf Stone", + "item.generations_core.leaf_stone_shovel": "Pá de Leaf Stone", + "item.generations_core.leaf_stone_sword": "Espada de Leaf Stone", + "item.generations_core.leek": "Alho-Poró", + "item.generations_core.legend_badge": "Insígnia da Lenda", + "item.generations_core.legend_finder": "Localizador de Lendas", + "item.generations_core.legend_plate": "Placa da Lenda", + "item.generations_core.legend_ribbon": "Fita da Lenda", + "item.generations_core.legendary_clue": "Pista Lendária", + "item.generations_core.legendary_clue.desc": "Não implementado atualmente", + "item.generations_core.lemonade": "Limonada", + "item.generations_core.lens_case": "Estojo de Lentes", + "item.generations_core.lens_case.desc": "Não implementado atualmente", + "item.generations_core.letter": "Carta", + "item.generations_core.letter.desc": "Não implementado atualmente", + "item.generations_core.liberty_pass": "Passe da Liberdade", + "item.generations_core.liberty_pass.desc": "Não implementado atualmente", + "item.generations_core.libre_costume": "Fantasia Libre", + "item.generations_core.lift_key": "Chave do Elevador", + "item.generations_core.lift_key.desc": "Não implementado atualmente", + "item.generations_core.light_soul": "Alma Clara", + "item.generations_core.light_soul.tooltip": "§7DICA: Cresselia aparece fracamente, você precisa de mais.", + "item.generations_core.light_stone": "Pedra Clara", + "item.generations_core.light_stone.tooltip": "§7DICA: Não está reagindo. Mais Dragões podem resolver.", + "item.generations_core.lillie_disc": "Disco de Lillie", + "item.generations_core.lock_capsule_1": "Cápsula de Bloqueio 1", + "item.generations_core.lock_capsule_1.desc": "Não implementado atualmente", + "item.generations_core.lock_capsule_2": "Cápsula de Bloqueio 2", + "item.generations_core.lock_capsule_2.desc": "Não implementado atualmente", + "item.generations_core.lone_earring": "Brinco Solitário", + "item.generations_core.looker_ticket": "Ticket do Looker", + "item.generations_core.looker_ticket.desc": "Não implementado atualmente", + "item.generations_core.loot_sack": "Saco de Saque", + "item.generations_core.loot_sack.desc": "Não implementado atualmente", + "item.generations_core.lopunnite": "Lopunnite", + "item.generations_core.lost_item_1": "Item Perdido 1", + "item.generations_core.lost_item_1.desc": "Não implementado atualmente", + "item.generations_core.lost_item_2": "Item Perdido 2", + "item.generations_core.lost_item_2.desc": "Não implementado atualmente", + "item.generations_core.lucarionite": "Lucarionite", + "item.generations_core.luck_incense": "Incenso da Sorte", + "item.generations_core.luck_symbol": "Símbolo da Sorte", + "item.generations_core.luck_symbol_silver": "Símbolo da Sorte Prateado", + "item.generations_core.lucky_punch": "Soco da Sorte", + "item.generations_core.lugia_disc": "Disco de Lugia", + "item.generations_core.luminous_moss": "Musgo Luminoso", + "item.generations_core.lumiose_galette": "Galette Lumiose", + "item.generations_core.lunalium_z": "Lunalium Z", + "item.generations_core.lunar_feather": "Pena Lunar", + "item.generations_core.lunar_feather.desc": "Não implementado atualmente", + "item.generations_core.lure": "Isca", + "item.generations_core.lure.desc": "Não implementado atualmente", + "item.generations_core.lure_module": "Módulo de Isca", + "item.generations_core.lusamine_disc": "Disco de Lusamine", + "item.generations_core.lustrous_globe": "Globo Brilhante", + "item.generations_core.lustrous_orb": "Orbe Brilhante", + "item.generations_core.lustrous_orb.tooltip": "§7DICA: Este item parece estar relacionado ao Trio da Criação. Se você criou uma Corrente Vermelha, pode ativar um Altar.", + "item.generations_core.lycanium_z": "Lycanium Z", + "item.generations_core.machine_part": "Peça de Máquina", + "item.generations_core.machine_part.desc": "Não implementado atualmente", + "item.generations_core.macho_brace": "Braçadeira Macho", + "item.generations_core.magma_boots": "Botas Magma", + "item.generations_core.magma_chestplate": "Peitoral Magma", + "item.generations_core.magma_crystal": "Cristal de Magma", + "item.generations_core.magma_crystal.tooltip": "§7DICA: Contra o seu bom senso, você sente um desejo súbito de atirar este cristal na lava (clique com o botão direito)", + "item.generations_core.magma_emblem": "Emblema Magma", + "item.generations_core.magma_emblem.desc": "Não implementado atualmente", + "item.generations_core.magma_helmet": "Capacete Magma", + "item.generations_core.magma_leggings": "Calças Magma", + "item.generations_core.magma_suit": "Traje Magma", + "item.generations_core.magma_suit.desc": "Não implementado atualmente", + "item.generations_core.makeup_bag": "Bolsa de Maquiagem", + "item.generations_core.makeup_bag.desc": "Não implementado atualmente", + "item.generations_core.manectite": "Manectite", + "item.generations_core.marble": "Mármore", + "item.generations_core.mark_charm": "Amuleto de Marca", + "item.generations_core.marsh_badge": "Insígnia do Pântano", + "item.generations_core.marshadium_z": "Marshadium Z", + "item.generations_core.master_rank_ribbon": "Fita de Rank Mestre", + "item.generations_core.master_walkmon": "Master Walkmon", + "item.generations_core.mawilite": "Mawilite", + "item.generations_core.max_honey": "Mel Máximo", + "item.generations_core.max_lure": "Isca Máxima", + "item.generations_core.max_lure.desc": "Não implementado atualmente", + "item.generations_core.max_mushrooms": "Cogumelos Máximos", + "item.generations_core.max_powder": "Pó Máximo", + "item.generations_core.max_repel": "Repelente Máximo","item.generations_core.max_soup": "Sopa Máxima", + "item.generations_core.meadow_plate": "Placa do Prado", + "item.generations_core.medal_box": "Caixa de Medalhas", + "item.generations_core.medal_box.desc": "Não implementado atualmente", + "item.generations_core.medichamite": "Medichamite", + "item.generations_core.mega_bracelet": "Pulseira Mega", + "item.generations_core.mega_charm": "Amuleto Mega", + "item.generations_core.mega_cuff": "Abraçadeira Mega", + "item.generations_core.mega_ring": "Anel Mega", + "item.generations_core.mega_stone_shard": "Fragmento de Mega Stone", + "item.generations_core.melody_flute": "Flauta de Melodia", + "item.generations_core.meltan_box": "Caixa de Meltan", + "item.generations_core.meltan_box.tooltip": "§7DICA: Meltan estranhamente encontram paz nesta caixa. Colete uma colônia de exército de Meltan! Pela ciência, é claro.", + "item.generations_core.meltan_box_charged": "Caixa de Meltan Carregada", + "item.generations_core.meltan_box_charged.tooltip": "§7DICA: Meltan estranhamente encontram paz nesta caixa. Colete uma colônia de exército de Meltan! Pela ciência, é claro.", + "item.generations_core.member_card": "Cartão de Membro", + "item.generations_core.member_card.desc": "Não implementado atualmente", + "item.generations_core.metagrossite": "Metagrossite", + "item.generations_core.meteorite": "Meteorito", + "item.generations_core.meteorite.tooltip": "§7DICA: Uma energia estranha e de outro mundo está vindo deste item. Tente encantá-lo e carregá-lo derrotando Pokémon de um tipo relevante.", + "item.generations_core.meteorite_shard": "Fragmento de Meteorito", + "item.generations_core.meteorite_shard.tooltip": "§7DICA: Talvez se você coletar o suficiente possa criar algo de outro mundo.", + "item.generations_core.mew_dna_fiber": "Fibra de DNA de Mew", + "item.generations_core.mew_dna_fiber.tooltip": "§7DICA: O DNA pode ser manipulado em uma Máquina RKS.", + "item.generations_core.mew_fossil": "Fóssil de Mew", + "item.generations_core.mew_fossil.tooltip": "§7DICA: Isso pode conter vestígios de DNA valiosos para recriar algo em uma Máquina RKS.", + "item.generations_core.mewnium_z": "Mewnium Z", + "item.generations_core.mewtwo_armor": "Armadura de Mewtwo", + "item.generations_core.mewtwonite_x": "Mewtwonite X", + "item.generations_core.mewtwonite Y": "Mewtwonite Y", + "item.generations_core.mighty_candy": "Doce Poderoso", + "item.generations_core.mighty_candy.desc": "Não implementado atualmente", + "item.generations_core.mighty_candy_l": "Doce Poderoso G", + "item.generations_core.mighty_candy_l.desc": "Não implementado atualmente", + "item.generations_core.mighty_candy_xl": "Doce Poderoso GG", + "item.generations_core.mighty_candy_xl.desc": "Não implementado atualmente", + "item.generations_core.mimikium_z": "Mimikium Z", + "item.generations_core.mind_badge": "Insígnia da Mente", + "item.generations_core.mind_plate": "Placa da Mente", + "item.generations_core.mine_badge": "Insígnia da Mina", + "item.generations_core.mineral_badge": "Insígnia Mineral", + "item.generations_core.mirror": "Espelho", + "item.generations_core.mirror.tooltip": "§7DICA: Em vez de ver seu reflexo, você vê Gemas. Elas são rosa, azul e branca e estão dispostas em uma moldura.", + "item.generations_core.mixed_mushrooms": "Cogumelos Mistos", + "item.generations_core.moomoo_cheese": "Queijo Moomoo", + "item.generations_core.moomoo_milk": "Leite Moomoo", + "item.generations_core.moon_flute": "Flauta da Lua", + "item.generations_core.moon_stone_axe": "Machado de Moon Stone", + "item.generations_core.moon_stone_boots": "Botas de Moon Stone", + "item.generations_core.moon_stone_chestplate": "Peitoral de Moon Stone", + "item.generations_core.moon_stone_hammer": "Martelo de Moon Stone", + "item.generations_core.moon_stone_helmet": "Capacete de Moon Stone", + "item.generations_core.moon_stone_hoe": "Enxada de Moon Stone", + "item.generations_core.moon_stone_leggings": "Calças de Moon Stone", + "item.generations_core.moon_stone_pickaxe": "Picareta de Moon Stone", + "item.generations_core.moon_stone_shovel": "Pá de Moon Stone", + "item.generations_core.moon_stone_sword": "Espada de Moon Stone", + "item.generations_core.mt_pyre_disc": "Disco do Monte Pyre", + "item.generations_core.multi_ability_ribbon": "Fita de Habilidade Múltipla", + "item.generations_core.mystic_ticket": "Ticket Místico", + "item.generations_core.mystic_ticket.desc": "Não implementado atualmente", + "item.generations_core.n_lunarizer": "Lunarizador N", + "item.generations_core.n_solarizer": "Solarizador N", + "item.generations_core.national_champion_ribbon": "Fita de Campeão Nacional", + "item.generations_core.national_ribbon": "Fita Nacional", + "item.generations_core.nemona_disc": "Disco de Nemona", + "item.generations_core.neo_plasma_boots": "Botas Neo Plasma", + "item.generations_core.neo_plasma_chestplate": "Peitoral Neo Plasma", + "item.generations_core.neo_plasma_helmet": "Capacete Neo Plasma", + "item.generations_core.neo_plasma_leggings": "Calças Neo Plasma", + "item.generations_core.nessa_disc": "Disco de Nessa", + "item.generations_core.netherite_hammer": "Martelo de Netherite", + "item.generations_core.normal_candy": "Doce Normal", + "item.generations_core.normal_tera_shard": "Fragmento Tera Normal", + "item.generations_core.normalium_z": "Normalium Z", + "item.generations_core.npc_path_tool": "Ferramenta de Caminho de Npc", + "item.generations_core.npc_wand": "Varinha de Npc", + "item.generations_core.nugget": "Pepita", + "item.generations_core.null_candy": "Doce Nulo", + "item.generations_core.oaks_letter": "Carta do Oak", + "item.generations_core.oaks_letter.desc": "Não implementado atualmente", + "item.generations_core.oaks_parcel": "Pacote do Oak", + "item.generations_core.oaks_parcel.desc": "Não implementado atualmente", + "item.generations_core.odd_incense": "Incenso Estranho", + "item.generations_core.odd_keystone": "Pedra Chave Estranha", + "item.generations_core.old_charm": "Amuleto Antigo", + "item.generations_core.old_charm.desc": "Não implementado atualmente", + "item.generations_core.old_gateau": "Bolo Antigo", + "item.generations_core.old_letter": "Carta Antiga", + "item.generations_core.old_letter.desc": "Não implementado atualmente", + "item.generations_core.old_rod": "Vara Antiga", + "item.generations_core.old_sea_map": "Mapa Marítimo Antigo", + "item.generations_core.old_sea_map.desc": "Não implementado atualmente", + "item.generations_core.omelette": "Omelete", + "item.generations_core.once_in_a_lifetime_ribbon": "Fita de Uma Vez na Vida", + "item.generations_core.orange_petal": "Pétala Laranja", + "item.generations_core.orb": "Orbe", + "item.generations_core.orb.tooltip": "§7DICA: Este item está fluindo com energia misteriosa. Está relacionado a várias criaturas lendárias e míticas. Talvez você possa criar algo…", + "item.generations_core.pack_of_potatoes": "Pacote de Batatas", + "item.generations_core.packaged_curry": "Curry Embalado", + "item.generations_core.pair_ability_ribbon": "Fita de Habilidade em Dupla", + "item.generations_core.pair_of_tickets": "Par de Tickets", + "item.generations_core.pair_of_tickets.desc": "Não implementado atualmente", + "item.generations_core.pal_pad": "Bloco de Amigos", + "item.generations_core.pal_pad.desc": "Não implementado atualmente", + "item.generations_core.paldea_champion_ribbon": "Fita de Campeão de Paldea", + "item.generations_core.pale_sphere": "Esfera Pálida", + "item.generations_core.pale_sphere.desc": "Não implementado atualmente", + "item.generations_core.partner_cap": "Boné de Parceiro", + "item.generations_core.pass": "Passe", + "item.generations_core.pass.desc": "Não implementado atualmente", + "item.generations_core.pass_orb": "Orbe de Passe", + "item.generations_core.pass_orb.desc": "Não implementado atualmente", + "item.generations_core.pasta": "Massa", + "item.generations_core.patience_badge": "Insígnia da Paciência", + "item.generations_core.pearl": "Pérola", + "item.generations_core.pearl_string": "Fio de Pérolas", + "item.generations_core.penny_disc": "Disco de Penny", + "item.generations_core.perilous_soup": "Sopa Perigosa", + "item.generations_core.permit": "Permissão", + "item.generations_core.permit.desc": "Não implementado atualmente", + "item.generations_core.pewter_crunchies": "Crocantes de Pewter", + "item.generations_core.pewter_crunchies.desc": "Não implementado atualmente", + "item.generations_core.phd_costume": "Fantasia de Phd", + "item.generations_core.phione_egg": "Ovo de Phione", + "item.generations_core.phione_egg.tooltip": "§7DICA: Oh?", + "item.generations_core.pidgeotite": "Pidgeotite", + "item.generations_core.pikanium_z": "Pikanium Z", + "item.generations_core.pikashunium_z": "Pikashunium Z", + "item.generations_core.pinap_juice": "Suco de Pinap", + "item.generations_core.pink_juice": "Suco Rosa", + "item.generations_core.pink_nectar": "Néctar Rosa", + "item.generations_core.pink_petal": "Pétala Rosa", + "item.generations_core.pink_scarf": "Lenço Rosa", + "item.generations_core.pink_scarf.desc": "Não implementado atualmente", + "item.generations_core.pinsirite": "Pinsirite", + "item.generations_core.pioneer_ribbon": "Fita de Pioneiro", + "item.generations_core.pixie_plate": "Placa Pixie", + "item.generations_core.plain_badge": "Insígnia Simples", + "item.generations_core.plant_badge": "Insígnia de Planta", + "item.generations_core.plasma_boots": "Botas Plasma", + "item.generations_core.plasma_card": "Cartão Plasma", + "item.generations_core.plasma_card.desc": "Não implementado atualmente", + "item.generations_core.plasma_chestplate": "Peitoral Plasma", + "item.generations_core.plasma_helmet": "Capacete Plasma", + "item.generations_core.plasma_leggings": "Calças Plasma", + "item.generations_core.poffin": "Poffin", + "item.generations_core.poffin.desc": "Não implementado atualmente", + "item.generations_core.poffin_case": "Estojo de Poffin", + "item.generations_core.poffin_case.desc": "Não implementado atualmente", + "item.generations_core.point_card": "Cartão de Pontos", + "item.generations_core.point_card.desc": "Não implementado atualmente", + "item.generations_core.poison_candy": "Doce de Veneno", + "item.generations_core.poison_memory_drive": "Drive de Memória Veneno", + "item.generations_core.poison_tera_shard": "Fragmento Tera Veneno", + "item.generations_core.poisonium_z": "Poisonium Z", + "item.generations_core.poke_doll": "Boneco Pokémon", + "item.generations_core.poke_flute": "Flauta Pokémon", + "item.generations_core.poke_flute.desc": "Não implementado atualmente", + "item.generations_core.poke_radar": "Radar Pokémon", + "item.generations_core.poke_radar.desc": "Não implementado atualmente", + "item.generations_core.poke_toy": "Brinquedo Pokémon", + "item.generations_core.poke_walkmon": "Poke Walkmon", + "item.generations_core.pokeblock_case": "Estojo de Pokeblock", + "item.generations_core.pokeblock_case.desc": "Não implementado atualmente", + "item.generations_core.pokeblock_kit": "Kit de Pokeblock", + "item.generations_core.pokeblock_kit.desc": "Não implementado atualmente", + "item.generations_core.pokemail_air": "Pokemail Ar", + "item.generations_core.pokemail_air_closed": "Pokemail Ar Fechado", + "item.generations_core.pokemail_bloom": "Pokemail Florescer", + "item.generations_core.pokemail_bloom_closed": "Pokemail Florescer Fechado", + "item.generations_core.pokemail_brick": "Pokemail Tijolo", + "item.generations_core.pokemail_brick_closed": "Pokemail Tijolo Fechado", + "item.generations_core.pokemail_bridge_d": "Pokemail Ponte D", + "item.generations_core.pokemail_bridge_d_closed": "Pokemail Ponte D Fechado", + "item.generations_core.pokemail_bridge_m": "Pokemail Ponte M", + "item.generations_core.pokemail_bridge_m_closed": "Pokemail Ponte M Fechado", + "item.generations_core.pokemail_bridge_s": "Pokemail Ponte S", + "item.generations_core.pokemail_bridge_s_closed": "Pokemail Ponte S Fechado", + "item.generations_core.pokemail_bridge_t": "Pokemail Ponte T", + "item.generations_core.pokemail_bridge_t_closed": "Pokemail Ponte T Fechado", + "item.generations_core.pokemail_bridge_v": "Pokemail Ponte V", + "item.generations_core.pokemail_bridge_v_closed": "Pokemail Ponte V Fechado", + "item.generations_core.pokemail_bubble": "Pokemail Bolha", + "item.generations_core.pokemail_bubble_closed": "Pokemail Bolha Fechado", + "item.generations_core.pokemail_dream": "Pokemail Sonho", + "item.generations_core.pokemail_dream_closed": "Pokemail Sonho Fechado", + "item.generations_core.pokemail_fab": "Pokemail Fabuloso", + "item.generations_core.pokemail_fab_closed": "Pokemail Fabuloso Fechado", + "item.generations_core.pokemail_favored": "Pokemail Favorito", + "item.generations_core.pokemail_favored_closed": "Pokemail Favorito Fechado", + "item.generations_core.pokemail_flame": "Pokemail Chama", + "item.generations_core.pokemail_flame_closed": "Pokemail Chama Fechado", + "item.generations_core.pokemail_glitter": "Pokemail Brilho", + "item.generations_core.pokemail_glitter_closed": "Pokemail Brilho Fechado", + "item.generations_core.pokemail_grass": "Pokemail Grama", + "item.generations_core.pokemail_grass_closed": "Pokemail Grama Fechado", + "item.generations_core.pokemail_greet": "Pokemail Saudar", + "item.generations_core.pokemail_greet_closed": "Pokemail Saudar Fechado", + "item.generations_core.pokemail_harbor": "Pokemail Porto", + "item.generations_core.pokemail_harbor_closed": "Pokemail Porto Fechado", + "item.generations_core.pokemail_heart": "Pokemail Coração", + "item.generations_core.pokemail_heart_closed": "Pokemail Coração Fechado", + "item.generations_core.pokemail_inquiry": "Pokemail Inquérito", + "item.generations_core.pokemail_inquiry_closed": "Pokemail Inquérito Fechado", + "item.generations_core.pokemail_like": "Pokemail Gostar", + "item.generations_core.pokemail_like_closed": "Pokemail Gostar Fechado", + "item.generations_core.pokemail_mech": "Pokemail Mecânico", + "item.generations_core.pokemail_mech_closed": "Pokemail Mecânico Fechado", + "item.generations_core.pokemail_mosaic": "Pokemail Mosaico", + "item.generations_core.pokemail_mosaic_closed": "Pokemail Mosaico Fechado", + "item.generations_core.pokemail_orange": "Pokemail Laranja", + "item.generations_core.pokemail_orange_closed": "Pokemail Laranja Fechado", + "item.generations_core.pokemail_reply": "Pokemail Resposta", + "item.generations_core.pokemail_reply_closed": "Pokemail Resposta Fechado", + "item.generations_core.pokemail_retro": "Pokemail Retrô", + "item.generations_core.pokemail_retro_closed": "Pokemail Retrô Fechado", + "item.generations_core.pokemail_rsvp": "Pokemail RSVP", + "item.generations_core.pokemail_rsvp_closed": "Pokemail RSVP Fechado", + "item.generations_core.pokemail_shadow": "Pokemail Sombra", + "item.generations_core.pokemail_shadow_closed": "Pokemail Sombra Fechado", + "item.generations_core.pokemail_snow": "Pokemail Neve", + "item.generations_core.pokemail_snow_closed": "Pokemail Neve Fechado", + "item.generations_core.pokemail_space": "Pokemail Espaço", + "item.generations_core.pokemail_space_closed": "Pokemail Espaço Fechado", + "item.generations_core.pokemail_steel": "Pokemail Aço", + "item.generations_core.pokemail_steel_closed": "Pokemail Aço Fechado", + "item.generations_core.pokemail_thanks": "Pokemail Agradecimento", + "item.generations_core.pokemail_thanks_closed": "Pokemail Agradecimento Fechado", + "item.generations_core.pokemail_tropic": "Pokemail Tropical", + "item.generations_core.pokemail_tropic_closed": "Pokemail Tropical Fechado", + "item.generations_core.pokemail_tunnel": "Pokemail Túnel", + "item.generations_core.pokemail_tunnel_closed": "Pokemail Túnel Fechado", + "item.generations_core.pokemail_wave": "Pokemail Onda", + "item.generations_core.pokemail_wave_closed": "Pokemail Onda Fechado", + "item.generations_core.pokemail_wood": "Pokemail Madeira", + "item.generations_core.pokemail_wood_closed": "Pokemail Madeira Fechado", + "item.generations_core.pokemon_center_disc": "Disco do Centro Pokémon", + "item.generations_core.pokemon_wand": "Varinha Pokémon", + "item.generations_core.poketch_blue": "Pokétch Azul", + "item.generations_core.poketch_blue.desc": "Não implementado atualmente", + "item.generations_core.poketch_red": "Pokétch Vermelho", + "item.generations_core.poketch_red.desc": "Não implementado atualmente", + "item.generations_core.polished_mud_ball": "Bola de Lama Polida", + "item.generations_core.popstar_costume": "Fantasia de Popstar", + "item.generations_core.powder_jar": "Pote de Pó", + "item.generations_core.powder_jar.desc": "Não implementado atualmente", + "item.generations_core.power_plant_pass": "Passe da Usina de Força", + "item.generations_core.power_plant_pass.desc": "Não implementado atualmente", + "item.generations_core.precooked_burger": "Hambúrguer Pré-cozido", + "item.generations_core.premier_ribbon": "Fita Premier", + "item.generations_core.pretty_feather": "Pena Bonita", + "item.generations_core.pride_badge": "Insígnia do Orgulho", + "item.generations_core.primarium_z": "Primarium Z", + "item.generations_core.prism_sphere": "Esfera Prisma", + "item.generations_core.prism_sphere.desc": "Não implementado atualmente", + "item.generations_core.professors_mask": "Máscara de Professor", + "item.generations_core.professors_mask.desc": "Não implementado atualmente", + "item.generations_core.profs_letter": "Carta do Prof", + "item.generations_core.profs_letter.desc": "Não implementado atualmente", + "item.generations_core.prop_case": "Estojo de Adereços", + "item.generations_core.prop_case.desc": "Não implementado atualmente", + "item.generations_core.psychic_badge": "Insígnia Psíquica", + "item.generations_core.psychic_candy": "Doce Psíquico", + "item.generations_core.psychic_memory_drive": "Drive de Memória Psíquico", + "item.generations_core.psychic_tera_shard": "Fragmento Tera Psíquico", + "item.generations_core.psychium_z": "Psychium Z", + "item.generations_core.punching_glove": "Luva de Soco", + "item.generations_core.pungent_root": "Raiz Pungente", + "item.generations_core.pure_incense": "Incenso Puro", + "item.generations_core.purple_juice": "Suco Roxo", + "item.generations_core.purple_nectar": "Néctar Roxo", + "item.generations_core.purple_petal": "Pétala Roxa", + "item.generations_core.quake_badge": "Insígnia do Terremoto", + "item.generations_core.quick_candy": "Doce Rápido", + "item.generations_core.quick_candy.desc": "Não implementado atualmente", + "item.generations_core.quick_candy_l": "Doce Rápido G", + "item.generations_core.quick_candy_l.desc": "Não implementado atualmente", + "item.generations_core.quick_candy_xl": "Doce Rápido GG", + "item.generations_core.quick_candy_xl.desc": "Não implementado atualmente", + "item.generations_core.radiant_petal": "Pétala Radiante", + "item.generations_core.rage_candy_bar": "Barra de Doce da Fúria", + "item.generations_core.raikou_statue": "Estátua de Raikou", + "item.generations_core.rain_badge": "Insígnia de Chuva", + "item.generations_core.rainbow_badge": "Insígnia do Arco-Íris", + "item.generations_core.rainbow_flower": "Flor de Arco-Íris", + "item.generations_core.rainbow_flower.desc": "Não implementado atualmente", + "item.generations_core.rainbow_pass": "Passe Arco-Íris", + "item.generations_core.rainbow_pass.desc": "Não implementado atualmente", + "item.generations_core.rainbow_wing": "Asa de Arco-Íris", + "item.generations_core.rare_bone": "Osso Raro", + "item.generations_core.rare_soda": "Refrigerante Raro", + "item.generations_core.record_ribbon": "Fita de Recorde", + "item.generations_core.red_chain": "Corrente Vermelha", + "item.generations_core.red_chain.tooltip": "§7DICA: Não parece estar reagindo a nada. Os Cristais usados podem ter esgotado toda a sua energia. Tente encantá-la para dar-lhe algum poder.", + "item.generations_core.red_chain.tooltip.enchanted": "“DICA: Este item parece estar relacionado ao Trio da Criação, talvez se você tivesse seus respectivos Orbes, poderia ativar um altar.", + "item.generations_core.red_flute": "Flauta Vermelha", + "item.generations_core.red_juice": "Suco Vermelho", + "item.generations_core.red_nectar": "Néctar Vermelho","item.generations_core.red_orb": "Orbe Vermelho", + "item.generations_core.red_petal": "Pétala Vermelha", + "item.generations_core.red_scale": "Escama Vermelha", + "item.generations_core.red_scale.desc": "Não implementado atualmente", + "item.generations_core.red_scarf": "Lenço Vermelho", + "item.generations_core.red_shard": "Fragmento Vermelho", + "item.generations_core.red_sphere": "Esfera Vermelha", + "item.generations_core.red_sphere.desc": "Não implementado atualmente", + "item.generations_core.regice_orb": "Orbe de Regice", + "item.generations_core.regice_orb.tooltip": "§7DICA: Se você coletar os outros Orbes, Regigigas pode ser despertado", + "item.generations_core.regidrago_orb": "Orbe de Regidrago", + "item.generations_core.regidrago_orb.tooltip": "§7DICA: Se você coletar os outros Orbes, Regigigas pode ser despertado", + "item.generations_core.regieleki_orb": "Orbe de Regieleki", + "item.generations_core.regieleki_orb.tooltip": "§7DICA: Se você coletar os outros Orbes, Regigigas pode ser despertado", + "item.generations_core.regional_champion_ribbon": "Fita de Campeão Regional", + "item.generations_core.regirock_orb": "Orbe de Regirock", + "item.generations_core.regirock_orb.tooltip": "§7DICA: Se você coletar os outros Orbes, Regigigas pode ser despertado", + "item.generations_core.registeel_orb": "Orbe de Registeel", + "item.generations_core.registeel_orb.tooltip": "§7DICA: Se você coletar os outros Orbes, Regigigas pode ser despertado", + "item.generations_core.reins_of_unity": "Rédeas da Unidade", + "item.generations_core.relax_ribbon": "Fita de Relaxamento", + "item.generations_core.relic_badge": "Insígnia de Relíquia", + "item.generations_core.relic_band": "Faixa de Relíquia", + "item.generations_core.relic_copper": "Cobre de Relíquia", + "item.generations_core.relic_crown": "Coroa de Relíquia", + "item.generations_core.relic_gold": "Ouro de Relíquia", + "item.generations_core.relic_silver": "Prata de Relíquia", + "item.generations_core.relic_song": "Canção de Relíquia", + "item.generations_core.relic_song.tooltip": "§7DICA: Uma caixa de música especial pode tocar esta melodia de forma diferente.", + "item.generations_core.relic_statue": "Estátua de Relíquia", + "item.generations_core.relic_vase": "Vaso de Relíquia", + "item.generations_core.repel": "Repelente", + "item.generations_core.reset_urge": "Impulso de Reset", + "item.generations_core.reset_urge.desc": "Não implementado atualmente", + "item.generations_core.reveal_glass": "Vidro Revelador", + "item.generations_core.reveal_glass.tooltip": "§7DICA: Em vez do seu reflexo, ele exibe um pequeno Santuário Abundante no céu.", + "item.generations_core.ride_pager": "Paginador de Montaria", + "item.generations_core.ride_pager.desc": "Não implementado atualmente", + "item.generations_core.rising_badge": "Insígnia Ascendente", + "item.generations_core.rival_disc": "Disco de Rival", + "item.generations_core.rock_badge": "Insígnia de Rocha", + "item.generations_core.rock_candy": "Doce de Rocha", + "item.generations_core.rock_incense": "Incenso de Rocha", + "item.generations_core.rock_memory_drive": "Drive de Memória Rocha", + "item.generations_core.rock_peak_key": "Chave do Pico de Rocha", + "item.generations_core.rock_peak_key.tooltip": "§7DICA: Este item parece estar relacionado a um dos Regis. Encontre o santuário deles em um Templo Snowpoint.", + "item.generations_core.rock_tera_shard": "Fragmento Tera Rocha", + "item.generations_core.rocket_boots": "Botas Rocket", + "item.generations_core.rocket_chestplate": "Peitoral Rocket", + "item.generations_core.rocket_helmet": "Capacete Rocket", + "item.generations_core.rocket_leggings": "Calças Rocket", + "item.generations_core.rockium_z": "Rockium Z", + "item.generations_core.rockstar_costume": "Fantasia de Rockstar", + "item.generations_core.roller_skates": "Patins", + "item.generations_core.roller_skates.desc": "Não implementado atualmente", + "item.generations_core.rose_incense": "Incenso de Rosa", + "item.generations_core.roserade_tea": "Chá de Roserade", + "item.generations_core.roto_bargain": "Roto Barganha", + "item.generations_core.roto_bargain.desc": "Não implementado atualmente", + "item.generations_core.roto_boost": "Roto Impulso", + "item.generations_core.roto_boost.desc": "Não implementado atualmente", + "item.generations_core.roto_catch": "Roto Captura", + "item.generations_core.roto_catch.desc": "Não implementado atualmente", + "item.generations_core.roto_encounter": "Roto Encontro", + "item.generations_core.roto_encounter.desc": "Não implementado atualmente", + "item.generations_core.roto_exp_points": "Roto Pontos de Exp", + "item.generations_core.roto_exp_points.desc": "Não implementado atualmente", + "item.generations_core.roto_friendship": "Roto Amizade", + "item.generations_core.roto_friendship.desc": "Não implementado atualmente", + "item.generations_core.roto_hatch": "Roto Chocadeira", + "item.generations_core.roto_hatch.desc": "Não implementado atualmente", + "item.generations_core.roto_hp_restore": "Roto Restaurar Hp", + "item.generations_core.roto_hp_restore.desc": "Não implementado atualmente", + "item.generations_core.roto_pp_restore": "Roto Restaurar Pp", + "item.generations_core.roto_pp_restore.desc": "Não implementado atualmente", + "item.generations_core.roto_prize_money": "Roto Dinheiro de Prêmio", + "item.generations_core.roto_prize_money.desc": "Não implementado atualmente", + "item.generations_core.roto_stealth": "Roto Furtividade", + "item.generations_core.roto_stealth.desc": "Não implementado atualmente", + "item.generations_core.rotom_catalog": "Catálogo Rotom", + "item.generations_core.route_228_disc": "Disco da Rota 228", + "item.generations_core.royal_ribbon": "Fita Real", + "item.generations_core.ruby": "Rubi", + "item.generations_core.ruby_axe": "Machado de Rubi", + "item.generations_core.ruby_hammer": "Martelo de Rubi", + "item.generations_core.ruby_hoe": "Enxada de Rubi", + "item.generations_core.ruby_pickaxe": "Picareta de Rubi", + "item.generations_core.ruby_rod": "Vara de Rubi", + "item.generations_core.ruby_rod.fate_defied": "A Vara de Rubi se estilhaça ao resistir ao seu destino alterado", + "item.generations_core.ruby_rod.tooltip": "§7DICA: Peixe… Lago… Guardião…", + "item.generations_core.ruby_shovel": "Pá de Rubi", + "item.generations_core.ruby_sword": "Espada de Rubi", + "item.generations_core.rule_book": "Livro de Regras", + "item.generations_core.rule_book.desc": "Não implementado atualmente", + "item.generations_core.rumble_badge": "Insígnia do Estrondo", + "item.generations_core.rusty_fragment": "Fragmento Enferrujado", + "item.generations_core.rusty_fragment.tooltip": "§7DICA: Colete mais Fragmentos Enferrujados de Aegislash para ajudar na criação de uma Espada ou Escudo", + "item.generations_core.rusty_iron_key_1": "Chave de Ferro Enferrujada 1", + "item.generations_core.rusty_iron_key_1.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.rusty_iron_key_2": "Chave de Ferro Enferrujada 2", + "item.generations_core.rusty_iron_key_2.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.rusty_iron_key_3": "Chave de Ferro Enferrujada 3", + "item.generations_core.rusty_iron_key_3.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.rusty_iron_key_4": "Chave de Ferro Enferrujada 4", + "item.generations_core.rusty_iron_key_4.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.rusty_shield": "Escudo Enferrujado", + "item.generations_core.rusty_shield.tooltip": "§7DICA: Pokémon do Tipo Aço", + "item.generations_core.rusty_sword": "Espada Enferrujada", + "item.generations_core.rusty_sword.tooltip": "§7DICA: Pokémon do Tipo Aço", + "item.generations_core.sablenite": "Sablenite", + "item.generations_core.sacred_ash": "Cinza Sagrada", + "item.generations_core.sacred_ash.tooltip": "§HINT: Um item sagrado capaz de trazer de volta os mortos.", + "item.generations_core.sada_and_turo_disc": "Disco de Sada e Turo", + "item.generations_core.salad_mix": "Salada Mista", + "item.generations_core.salamencite": "Salamencite", + "item.generations_core.sapphire": "Safira", + "item.generations_core.sapphire_axe": "Machado de Safira", + "item.generations_core.sapphire_hammer": "Martelo de Safira", + "item.generations_core.sapphire_hoe": "Enxada de Safira", + "item.generations_core.sapphire_pickaxe": "Picareta de Safira", + "item.generations_core.sapphire_shovel": "Pá de Safira", + "item.generations_core.sapphire_sword": "Espada de Safira", + "item.generations_core.sausages": "Salsichas", + "item.generations_core.scanner": "Scanner", + "item.generations_core.scanner.desc": "Não implementado atualmente", + "item.generations_core.sceptilite": "Sceptilite", + "item.generations_core.scizorite": "Scizorite", + "item.generations_core.scroll_page": "Página de Pergaminho", + "item.generations_core.scroll_page.tooltip": "§7DICA: Este item é dado a mestres das Artes Marciais. Reúna mais páginas para completar o pergaminho e provar seu valor.", + "item.generations_core.sea_incense": "Incenso do Mar", + "item.generations_core.seal_bag": "Saco de Selos", + "item.generations_core.seal_bag.desc": "Não implementado atualmente", + "item.generations_core.seal_case": "Estojo de Selos", + "item.generations_core.seal_case.desc": "Não implementado atualmente", + "item.generations_core.searuby_badge": "Insígnia de Searuby", + "item.generations_core.secret_armor_scroll": "Pergaminho Secreto da Armadura", + "item.generations_core.secret_armor_scroll.tooltip": "§7DICA: Um Pokémon Lendário notou você - continue a provar seu valor derrotando mais Pokémon do tipo Lutador", + "item.generations_core.secret_key_1": "Chave Secreta 1", + "item.generations_core.secret_key_1.desc": "Não implementado atualmente", + "item.generations_core.secret_key_2": "Chave Secreta 2", + "item.generations_core.secret_key_2.desc": "Não implementado atualmente", + "item.generations_core.secret_medicine": "Medicina Secreta", + "item.generations_core.secret_medicine.desc": "Não implementado atualmente", + "item.generations_core.shaderoot_carrot": "Cenoura Shaderoot", + "item.generations_core.shalour_sable": "Shalour Sable", + "item.generations_core.shard_of_emotion": "Fragmento de Emoção", + "item.generations_core.shard_of_emotion.tooltip": "§7DICA: Continue pescando. Com o suficiente, você pode criar algo.", + "item.generations_core.shard_of_knowledge": "Fragmento de Conhecimento", + "item.generations_core.shard_of_knowledge.tooltip": "§7DICA: Continue pescando. Com o suficiente, você pode criar algo.", + "item.generations_core.shard_of_willpower": "Fragmento de Força de Vontade", + "item.generations_core.shard_of_willpower.tooltip": "§7DICA: Continue pescando. Com o suficiente, você pode criar algo.", + "item.generations_core.sharpedonite": "Sharpedonite", + "item.generations_core.shattered_ice_key_1": "Chave de Gelo Estilhaçada 1", + "item.generations_core.shattered_ice_key_1.tooltip": "§7DICA: Tente coletar todas as 4 partes para consertar esta chave.", + "item.generations_core.shattered_ice_key_2": "Chave de Gelo Estilhaçada 2", + "item.generations_core.shattered_ice_key_3": "Chave de Gelo Estilhaçada 3", + "item.generations_core.shattered_ice_key_4": "Chave de Gelo Estilhaçada 4", + "item.generations_core.shattered_relic_song_1": "Canção de Relíquia Estilhaçada 1", + "item.generations_core.shattered_relic_song_1.tooltip": "§7DICA: Parece ser um pedaço de um disco de música. Pode ser reparado se você obtiver todas as peças.", + "item.generations_core.shattered_relic_song_2": "Canção de Relíquia Estilhaçada 2", + "item.generations_core.shattered_relic_song_2.tooltip": "§7DICA: Parece ser um pedaço de um disco de música. Pode ser reparado se você obtiver todas as peças.", + "item.generations_core.shattered_relic_song_3": "Canção de Relíquia Estilhaçada 3", + "item.generations_core.shattered_relic_song_3.tooltip": "§7DICA: Parece ser um pedaço de um disco de música. Pode ser reparado se você obtiver todas as peças.", + "item.generations_core.shattered_relic_song_4": "Canção de Relíquia Estilhaçada 4", + "item.generations_core.shattered_relic_song_4.tooltip": "§7DICA: Parece ser um pedaço de um disco de música. Pode ser reparado se você obtiver todas as peças.", + "item.generations_core.shoal_salt": "Sal de Shoal", + "item.generations_core.shoal_shell": "Concha de Shoal", + "item.generations_core.shock_drive": "Drive de Choque", + "item.generations_core.shock_ribbon": "Fita de Choque", + "item.generations_core.silicon": "Silício", + "item.generations_core.silicon_axe": "Machado de Silício", + "item.generations_core.silicon_hammer": "Martelo de Silício", + "item.generations_core.silicon_hoe": "Enxada de Silício", + "item.generations_core.silicon_pickaxe": "Picareta de Silício", + "item.generations_core.silicon_shovel": "Pá de Silício", + "item.generations_core.silicon_sword": "Espada de Silício", + "item.generations_core.silph_scope": "Silph Scope", + "item.generations_core.silph_scope.desc": "Não implementado atualmente", + "item.generations_core.silver_leaf": "Folha de Prata", + "item.generations_core.silver_nanab_berry": "Baga Nanab de Prata", + "item.generations_core.silver_nanab_berry.desc": "Não implementado atualmente", + "item.generations_core.silver_pinap_berry": "Baga Pinap de Prata", + "item.generations_core.silver_pinap_berry.desc": "Não implementado atualmente", + "item.generations_core.silver_razz_berry": "Baga Razz de Prata", + "item.generations_core.silver_razz_berry.desc": "Não implementado atualmente", + "item.generations_core.silver_wing": "Asa de Prata", + "item.generations_core.sinister_wing": "Asa Sinistra", + "item.generations_core.sinnoh_cap": "Boné de Sinnoh", + "item.generations_core.sinnoh_champion_ribbon": "Fita de Campeão de Sinnoh", + "item.generations_core.sinnoh_stone": "Pedra de Sinnoh", + "item.generations_core.sinnoh_stone.desc": "Não implementado atualmente", + "item.generations_core.skillful_battler_ribbon": "Fita de Lutador Habilidoso", + "item.generations_core.skull_boots": "Botas de Caveira", + "item.generations_core.skull_chestplate": "Peitoral de Caveira", + "item.generations_core.skull_helmet": "Capacete de Caveira", + "item.generations_core.skull_leggings": "Calças de Caveira", + "item.generations_core.sky_plate": "Placa do Céu", + "item.generations_core.slowbronite": "Slowbronite", + "item.generations_core.slowpoke_tail": "Rabo de Slowpoke", + "item.generations_core.slumbering_weald_disc": "Disco de Slumbering Weald", + "item.generations_core.small_bouquet": "Pequeno Buquê", + "item.generations_core.smart_candy": "Doce Inteligente", + "item.generations_core.smart_candy.desc": "Não implementado atualmente", + "item.generations_core.smart_candy_l": "Doce Inteligente G", + "item.generations_core.smart_candy_l.desc": "Não implementado atualmente", + "item.generations_core.smart_candy_xl": "Doce Inteligente GG", + "item.generations_core.smart_candy_xl.desc": "Não implementado atualmente", + "item.generations_core.smart_ribbon_great": "Fita Inteligente Ótima", + "item.generations_core.smart_ribbon_hoenn": "Fita Inteligente Hoenn", + "item.generations_core.smart_ribbon_hyper": "Fita Inteligente Hiper", + "item.generations_core.smart_ribbon_master_hoenn": "Fita Inteligente Mestre Hoenn", + "item.generations_core.smart_ribbon_master_sinnoh": "Fita Inteligente Mestre Sinnoh", + "item.generations_core.smart_ribbon_sinnoh": "Fita Inteligente Sinnoh", + "item.generations_core.smart_ribbon_super": "Fita Inteligente Super", + "item.generations_core.smart_ribbon_ultra": "Fita Inteligente Ultra", + "item.generations_core.smile_ribbon": "Fita do Sorriso", + "item.generations_core.smoked_poke_tail": "Rabo de Pokémon Defumado", + "item.generations_core.snap_camera": "Câmera Snap", + "item.generations_core.snooze_ribbon": "Fita de Soneca", + "item.generations_core.snorlium_z": "Snorlium Z", + "item.generations_core.snowball": "Bola de Neve", + "item.generations_core.soda_pop": "Refrigerante", + "item.generations_core.solganium_z": "Solganium Z", + "item.generations_core.sonias_book": "Livro de Sonia", + "item.generations_core.sonias_book.desc": "Não implementado atualmente", + "item.generations_core.soot_sack": "Saco de Fuligem", + "item.generations_core.soot_sack.desc": "Não implementado atualmente", + "item.generations_core.soul_badge": "Insígnia da Alma", + "item.generations_core.soul_dew": "Orvalho da Alma", + "item.generations_core.soul_heart": "Coração de Alma", + "item.generations_core.soul_heart.tooltip": "§7DICA: Este item parece conter a alma de um Pokémon misterioso. Você pode tentar criar um corpo para ele em uma Máquina RKS.", + "item.generations_core.south_province_disc": "Disco da Província Sul", + "item.generations_core.souvenir_ribbon": "Fita de Lembrança", + "item.generations_core.sparkling_shard": "Fragmento Brilhante", + "item.generations_core.sparkling_shard.tooltip": "§7DICA: Uma presença protetora paira sobre este fragmento. Talvez se você coletar mais, terá uma sensação mais forte do que fazer.", + "item.generations_core.sparkling_stone": "Pedra Brilhante", + "item.generations_core.sparkling_stone.tooltip": "§7DICA: Capturar Pokémon de um tipo específico para cuidar parece causar uma reação.", + "item.generations_core.special_ribbon": "Fita Especial", + "item.generations_core.spice_mix": "Mistura de Especiarias", + "item.generations_core.spikeshell_badge": "Insígnia de Concha Espinhosa", + "item.generations_core.spirits_symbol": "Símbolo dos Espíritos", + "item.generations_core.spirits_symbol_silver": "Símbolo dos Espíritos de Prata", + "item.generations_core.splash_plate": "Placa de Salpico", + "item.generations_core.spooky_plate": "Placa Assustadora", + "item.generations_core.sprayduck": "Sprayduck", + "item.generations_core.sprink_lotad": "Sprink Lotad", + "item.generations_core.squirt_bottle": "Garrafa Squirt", + "item.generations_core.ss_ticket": "Ticket SS", + "item.generations_core.ss_ticket.desc": "Não implementado atualmente", + "item.generations_core.star_piece": "Pedaço de Estrela","item.generations_core.stardust": "Poeira Estelar", + "item.generations_core.static_wing": "Asa Estática", + "item.generations_core.steel_candy": "Doce de Aço", + "item.generations_core.steel_memory_drive": "Drive de Memória Aço", + "item.generations_core.steel_tera_shard": "Fragmento Tera Aço", + "item.generations_core.steelium_z": "Steelium Z", + "item.generations_core.steelixite": "Steelixite", + "item.generations_core.stellar_tera_shard": "Fragmento Tera Estelar", + "item.generations_core.stone_badge": "Insígnia de Pedra", + "item.generations_core.stone_hammer": "Martelo de Pedra", + "item.generations_core.stone_plate": "Placa de Pedra", + "item.generations_core.storage_key_1": "Chave do Depósito 1", + "item.generations_core.storage_key_1.desc": "Não implementado atualmente", + "item.generations_core.storage_key_2": "Chave do Depósito 2", + "item.generations_core.storage_key_2.desc": "Não implementado atualmente", + "item.generations_core.storm_badge": "Insígnia de Tempestade", + "item.generations_core.strange_ball": "Bola Estranha", + "item.generations_core.strange_souvenir": "Lembrança Estranha", + "item.generations_core.stretchy_spring": "Mola Elástica", + "item.generations_core.style_card": "Cartão de Estilo", + "item.generations_core.style_card.desc": "Não implementado atualmente", + "item.generations_core.suicune_statue": "Estátua de Suicune", + "item.generations_core.suite_key": "Chave da Suíte", + "item.generations_core.suite_key.desc": "Não implementado atualmente", + "item.generations_core.sun_flute": "Flauta do Sol", + "item.generations_core.sun_stone_axe": "Machado de Pedra Solar", + "item.generations_core.sun_stone_boots": "Botas de Pedra Solar", + "item.generations_core.sun_stone_chestplate": "Peitoral de Pedra Solar", + "item.generations_core.sun_stone_hammer": "Martelo de Pedra Solar", + "item.generations_core.sun_stone_helmet": "Capacete de Pedra Solar", + "item.generations_core.sun_stone_hoe": "Enxada de Pedra Solar", + "item.generations_core.sun_stone_leggings": "Calças de Pedra Solar", + "item.generations_core.sun_stone_pickaxe": "Picareta de Pedra Solar", + "item.generations_core.sun_stone_shovel": "Pá de Pedra Solar", + "item.generations_core.sun_stone_sword": "Espada de Pedra Solar", + "item.generations_core.super_lure": "Super Isca", + "item.generations_core.super_lure.desc": "Não implementado atualmente", + "item.generations_core.super_repel": "Super Repelente", + "item.generations_core.super_rod": "Super Vara", + "item.generations_core.surf_disc": "Disco de Surf", + "item.generations_core.surge_badge": "Insígnia de Surge", + "item.generations_core.swampertite": "Swampertite", + "item.generations_core.sweet_heart": "Coração Doce", + "item.generations_core.syrupy_apple": "Maçã Xaroposa", + "item.generations_core.tactics_symbol": "Símbolo de Táticas", + "item.generations_core.tactics_symbol_silver": "Símbolo de Táticas de Prata", + "item.generations_core.tapu_cocoa": "Cacau Tapu", + "item.generations_core.tapunium_z": "Tapunium Z", + "item.generations_core.teachy_tv": "Teachy Tv", + "item.generations_core.teachy_tv.desc": "Não implementado atualmente", + "item.generations_core.teal_mask": "Máscara Ciano", + "item.generations_core.team_rocket_disc": "Disco da Equipe Rocket", + "item.generations_core.tera_orb": "Orbe Tera", + "item.generations_core.thick_club": "Clava Grossa", + "item.generations_core.thunder_badge": "Insígnia de Trovão", + "item.generations_core.thunder_stone_axe": "Machado de Pedra Trovão", + "item.generations_core.thunder_stone_boots": "Botas de Pedra Trovão", + "item.generations_core.thunder_stone_chestplate": "Peitoral de Pedra Trovão", + "item.generations_core.thunder_stone_hammer": "Martelo de Pedra Trovão", + "item.generations_core.thunder_stone_helmet": "Capacete de Pedra Trovão", + "item.generations_core.thunder_stone_hoe": "Enxada de Pedra Trovão", + "item.generations_core.thunder_stone_leggings": "Calças de Pedra Trovão", + "item.generations_core.thunder_stone_pickaxe": "Picareta de Pedra Trovão", + "item.generations_core.thunder_stone_shovel": "Pá de Pedra Trovão", + "item.generations_core.thunder_stone_sword": "Espada de Pedra Trovão", + "item.generations_core.tidal_bell": "Sino da Maré", + "item.generations_core.tidal_bell.desc": "Não implementado atualmente", + "item.generations_core.time_capsule": "Cápsula do Tempo", + "item.generations_core.time_glass": "Ampulheta do Tempo", + "item.generations_core.time_glass.tooltip": "§7DICA: Tente carregá-lo derrotando Pokémon de um tipo relevante. Ele pode então reagir em um bioma de Floresta de Flores.", + "item.generations_core.tin_of_beans": "Lata de Feijões", + "item.generations_core.tiny_mushroom": "Mini Cogumelo", + "item.generations_core.tm": "TM", + "item.generations_core.tm_1": "TM 1", + "item.generations_core.tm_10": "TM 10", + "item.generations_core.tm_100": "TM 100", + "item.generations_core.tm_101": "TM 101", + "item.generations_core.tm_102": "TM 102", + "item.generations_core.tm_103": "TM 103", + "item.generations_core.tm_104": "TM 104", + "item.generations_core.tm_105": "TM 105", + "item.generations_core.tm_106": "TM 106", + "item.generations_core.tm_107": "TM 107", + "item.generations_core.tm_108": "TM 108", + "item.generations_core.tm_109": "TM 109", + "item.generations_core.tm_11": "TM 11", + "item.generations_core.tm_110": "TM 110", + "item.generations_core.tm_111": "TM 111", + "item.generations_core.tm_112": "TM 112", + "item.generations_core.tm_113": "TM 113", + "item.generations_core.tm_114": "TM 114", + "item.generations_core.tm_115": "TM 115", + "item.generations_core.tm_116": "TM 116", + "item.generations_core.tm_117": "TM 117", + "item.generations_core.tm_118": "TM 118", + "item.generations_core.tm_119": "TM 119", + "item.generations_core.tm_12": "TM 12", + "item.generations_core.tm_120": "TM 120", + "item.generations_core.tm_121": "TM 121", + "item.generations_core.tm_122": "TM 122", + "item.generations_core.tm_123": "TM 123", + "item.generations_core.tm_124": "TM 124", + "item.generations_core.tm_125": "TM 125", + "item.generations_core.tm_126": "TM 126", + "item.generations_core.tm_127": "TM 127", + "item.generations_core.tm_128": "TM 128", + "item.generations_core.tm_129": "TM 129", + "item.generations_core.tm_13": "TM 13", + "item.generations_core.tm_130": "TM 130", + "item.generations_core.tm_131": "TM 131", + "item.generations_core.tm_132": "TM 132", + "item.generations_core.tm_133": "TM 133", + "item.generations_core.tm_134": "TM 134", + "item.generations_core.tm_135": "TM 135", + "item.generations_core.tm_136": "TM 136", + "item.generations_core.tm_137": "TM 137", + "item.generations_core.tm_138": "TM 138", + "item.generations_core.tm_139": "TM 139", + "item.generations_core.tm_14": "TM 14", + "item.generations_core.tm_140": "TM 140", + "item.generations_core.tm_141": "TM 141", + "item.generations_core.tm_142": "TM 142", + "item.generations_core.tm_143": "TM 143", + "item.generations_core.tm_144": "TM 144", + "item.generations_core.tm_145": "TM 145", + "item.generations_core.tm_146": "TM 146", + "item.generations_core.tm_147": "TM 147", + "item.generations_core.tm_148": "TM 148", + "item.generations_core.tm_149": "TM 149", + "item.generations_core.tm_15": "TM 15", + "item.generations_core.tm_150": "TM 150", + "item.generations_core.tm_151": "TM 151", + "item.generations_core.tm_152": "TM 152", + "item.generations_core.tm_153": "TM 153", + "item.generations_core.tm_154": "TM 154", + "item.generations_core.tm_155": "TM 155", + "item.generations_core.tm_156": "TM 156", + "item.generations_core.tm_157": "TM 157", + "item.generations_core.tm_158": "TM 158", + "item.generations_core.tm_159": "TM 159", + "item.generations_core.tm_16": "TM 16", + "item.generations_core.tm_160": "TM 160", + "item.generations_core.tm_161": "TM 161", + "item.generations_core.tm_162": "TM 162", + "item.generations_core.tm_163": "TM 163", + "item.generations_core.tm_164": "TM 164", + "item.generations_core.tm_165": "TM 165", + "item.generations_core.tm_166": "TM 166", + "item.generations_core.tm_167": "TM 167", + "item.generations_core.tm_168": "TM 168", + "item.generations_core.tm_169": "TM 169", + "item.generations_core.tm_17": "TM 17", + "item.generations_core.tm_170": "TM 170", + "item.generations_core.tm_171": "TM 171", + "item.generations_core.tm_172": "TM 172", + "item.generations_core.tm_173": "TM 173", + "item.generations_core.tm_174": "TM 174", + "item.generations_core.tm_175": "TM 175", + "item.generations_core.tm_176": "TM 176", + "item.generations_core.tm_177": "TM 177", + "item.generations_core.tm_178": "TM 178", + "item.generations_core.tm_179": "TM 179", + "item.generations_core.tm_18": "TM 18", + "item.generations_core.tm_180": "TM 180", + "item.generations_core.tm_181": "TM 181", + "item.generations_core.tm_182": "TM 182", + "item.generations_core.tm_183": "TM 183", + "item.generations_core.tm_184": "TM 184", + "item.generations_core.tm_185": "TM 185", + "item.generations_core.tm_186": "TM 186", + "item.generations_core.tm_187": "TM 187", + "item.generations_core.tm_188": "TM 188", + "item.generations_core.tm_189": "TM 189", + "item.generations_core.tm_19": "TM 19", + "item.generations_core.tm_190": "TM 190", + "item.generations_core.tm_191": "TM 191", + "item.generations_core.tm_192": "TM 192", + "item.generations_core.tm_193": "TM 193", + "item.generations_core.tm_194": "TM 194", + "item.generations_core.tm_195": "TM 195", + "item.generations_core.tm_196": "TM 196", + "item.generations_core.tm_197": "TM 197", + "item.generations_core.tm_198": "TM 198", + "item.generations_core.tm_199": "TM 199", + "item.generations_core.tm_2": "TM 2", + "item.generations_core.tm_20": "TM 20", + "item.generations_core.tm_200": "TM 200", + "item.generations_core.tm_201": "TM 201", + "item.generations_core.tm_202": "TM 202", + "item.generations_core.tm_203": "TM 203", + "item.generations_core.tm_204": "TM 204", + "item.generations_core.tm_205": "TM 205", + "item.generations_core.tm_206": "TM 206", + "item.generations_core.tm_207": "TM 207", + "item.generations_core.tm_208": "TM 208", + "item.generations_core.tm_209": "TM 209", + "item.generations_core.tm_21": "TM 21", + "item.generations_core.tm_210": "TM 210", + "item.generations_core.tm_211": "TM 211", + "item.generations_core.tm_212": "TM 212", + "item.generations_core.tm_213": "TM 213", + "item.generations_core.tm_214": "TM 214", + "item.generations_core.tm_215": "TM 215", + "item.generations_core.tm_216": "TM 216", + "item.generations_core.tm_217": "TM 217", + "item.generations_core.tm_218": "TM 218", + "item.generations_core.tm_219": "TM 219", + "item.generations_core.tm_22": "TM 22", + "item.generations_core.tm_220": "TM 220", + "item.generations_core.tm_221": "TM 221", + "item.generations_core.tm_222": "TM 222", + "item.generations_core.tm_223": "TM 223", + "item.generations_core.tm_224": "TM 224", + "item.generations_core.tm_225": "TM 225", + "item.generations_core.tm_226": "TM 226", + "item.generations_core.tm_227": "TM 227", + "item.generations_core.tm_228": "TM 228", + "item.generations_core.tm_229": "TM 229", + "item.generations_core.tm_23": "TM 23", + "item.generations_core.tm_230": "TM 230", + "item.generations_core.tm_231": "TM 231", + "item.generations_core.tm_232": "TM 232", + "item.generations_core.tm_233": "TM 233", + "item.generations_core.tm_234": "TM 234", + "item.generations_core.tm_235": "TM 235", + "item.generations_core.tm_236": "TM 236", + "item.generations_core.tm_237": "TM 237", + "item.generations_core.tm_24": "TM 24", + "item.generations_core.tm_25": "TM 25", + "item.generations_core.tm_26": "TM 26", + "item.generations_core.tm_27": "TM 27", + "item.generations_core.tm_28": "TM 28", + "item.generations_core.tm_29": "TM 29", + "item.generations_core.tm_3": "TM 3", + "item.generations_core.tm_30": "TM 30", + "item.generations_core.tm_31": "TM 31", + "item.generations_core.tm_32": "TM 32", + "item.generations_core.tm_33": "TM 33", + "item.generations_core.tm_34": "TM 34", + "item.generations_core.tm_35": "TM 35", + "item.generations_core.tm_36": "TM 36", + "item.generations_core.tm_37": "TM 37", + "item.generations_core.tm_38": "TM 38", + "item.generations_core.tm_39": "TM 39", + "item.generations_core.tm_4": "TM 4", + "item.generations_core.tm_40": "TM 40", + "item.generations_core.tm_41": "TM 41", + "item.generations_core.tm_42": "TM 42", + "item.generations_core.tm_43": "TM 43", + "item.generations_core.tm_44": "TM 44", + "item.generations_core.tm_45": "TM 45", + "item.generations_core.tm_46": "TM 46", + "item.generations_core.tm_47": "TM 47", + "item.generations_core.tm_48": "TM 48", + "item.generations_core.tm_49": "TM 49", + "item.generations_core.tm_5": "TM 5", + "item.generations_core.tm_50": "TM 50", + "item.generations_core.tm_51": "TM 51", + "item.generations_core.tm_52": "TM 52", + "item.generations_core.tm_53": "TM 53", + "item.generations_core.tm_54": "TM 54", + "item.generations_core.tm_55": "TM 55", + "item.generations_core.tm_56": "TM 56", + "item.generations_core.tm_57": "TM 57", + "item.generations_core.tm_58": "TM 58", + "item.generations_core.tm_59": "TM 59", + "item.generations_core.tm_6": "TM 6", + "item.generations_core.tm_60": "TM 60", + "item.generations_core.tm_61": "TM 61", + "item.generations_core.tm_62": "TM 62", + "item.generations_core.tm_63": "TM 63", + "item.generations_core.tm_64": "TM 64", + "item.generations_core.tm_65": "TM 65", + "item.generations_core.tm_66": "TM 66", + "item.generations_core.tm_67": "TM 67", + "item.generations_core.tm_68": "TM 68", + "item.generations_core.tm_69": "TM 69", + "item.generations_core.tm_7": "TM 7", + "item.generations_core.tm_70": "TM 70", + "item.generations_core.tm_71": "TM 71", + "item.generations_core.tm_72": "TM 72", + "item.generations_core.tm_73": "TM 73", + "item.generations_core.tm_74": "TM 74", + "item.generations_core.tm_75": "TM 75", + "item.generations_core.tm_76": "TM 76", + "item.generations_core.tm_77": "TM 77", + "item.generations_core.tm_78": "TM 78", + "item.generations_core.tm_79": "TM 79", + "item.generations_core.tm_8": "TM 8", + "item.generations_core.tm_80": "TM 80", + "item.generations_core.tm_81": "TM 81", + "item.generations_core.tm_82": "TM 82", + "item.generations_core.tm_83": "TM 83", + "item.generations_core.tm_84": "TM 84", + "item.generations_core.tm_85": "TM 85", + "item.generations_core.tm_86": "TM 86", + "item.generations_core.tm_87": "TM 87", + "item.generations_core.tm_88": "TM 88", + "item.generations_core.tm_89": "TM 89", + "item.generations_core.tm_9": "TM 9", + "item.generations_core.tm_90": "TM 90", + "item.generations_core.tm_91": "TM 91", + "item.generations_core.tm_92": "TM 92", + "item.generations_core.tm_93": "TM 93", + "item.generations_core.tm_94": "TM 94", + "item.generations_core.tm_95": "TM 95", + "item.generations_core.tm_96": "TM 96", + "item.generations_core.tm_97": "TM 97", + "item.generations_core.tm_98": "TM 98", + "item.generations_core.tm_99": "TM 99", + "item.generations_core.tm_case": "Estojo de TM", + "item.generations_core.tm_case.desc": "Não implementado atualmente", + "item.generations_core.tm_material": "Material de TM", + "item.generations_core.tm_material.desc": "Não implementado atualmente", + "item.generations_core.tmv_pass": "Passe TMv", + "item.generations_core.tmv_pass.desc": "Não implementado atualmente", + "item.generations_core.totem_sticker": "Adesivo Totem", + "item.generations_core.totem_sticker.desc": "Não implementado atualmente", + "item.generations_core.tough_candy": "Doce Forte", + "item.generations_core.tough_candy.desc": "Não implementado atualmente", + "item.generations_core.tough_candy_l": "Doce Forte G", + "item.generations_core.tough_candy_l.desc": "Não implementado atualmente", + "item.generations_core.tough_candy_xl": "Doce Forte GG", + "item.generations_core.tough_candy_xl.desc": "Não implementado atualmente", + "item.generations_core.tough_ribbon_great": "Fita Forte Ótima", + "item.generations_core.tough_ribbon_hoenn": "Fita Forte Hoenn", + "item.generations_core.tough_ribbon_hyper": "Fita Forte Hiper", + "item.generations_core.tough_ribbon_master_hoenn": "Fita Forte Mestre Hoenn", + "item.generations_core.tough_ribbon_master_sinnoh": "Fita Forte Mestre Sinnoh", + "item.generations_core.tough_ribbon_sinnoh": "Fita Forte Sinnoh", + "item.generations_core.tough_ribbon_super": "Fita Forte Super", + "item.generations_core.tough_ribbon_ultra": "Fita Forte Ultra", + "item.generations_core.toughness_master_ribbon": "Fita Mestre de Resistência", + "item.generations_core.tower_master_ribbon": "Fita Mestre da Torre", + "item.generations_core.town_map_1": "Mapa da Cidade 1", + "item.generations_core.town_map_1.desc": "Não implementado atualmente", + "item.generations_core.town_map_2": "Mapa da Cidade 2", + "item.generations_core.town_map_2.desc": "Não implementado atualmente", + "item.generations_core.town_map_3": "Mapa da Cidade 3", + "item.generations_core.town_map_3.desc": "Não implementado atualmente", + "item.generations_core.toxic_badge": "Insígnia Tóxica", + "item.generations_core.toxic_plate": "Placa Tóxica", + "item.generations_core.training_ribbon": "Fita de Treinamento", + "item.generations_core.tranquility_badge": "Insígnia de Tranquilidade", + "item.generations_core.travel_trunk_1": "Baú de Viagem 1", + "item.generations_core.travel_trunk_1.desc": "Não implementado atualmente", + "item.generations_core.travel_trunk_2": "Baú de Viagem 2", + "item.generations_core.travel_trunk_2.desc": "Não implementado atualmente", + "item.generations_core.tri_pass": "Passe Tri", + "item.generations_core.tri_pass.desc": "Não implementado atualmente", + "item.generations_core.trio_badge": "Insígnia do Trio", + "item.generations_core.tropical_shell": "Concha Tropical", + "item.generations_core.tyranitarite": "Tyranitarite", + "item.generations_core.ultra_boots": "Ultra Botas", + "item.generations_core.ultra_chestplate": "Ultra Peitoral", + "item.generations_core.ultra_dark_boat": "Barco Ultra Escuro", + "item.generations_core.ultra_dark_boat_with_chest": "Barco Ultra Escuro Com Baú", + "item.generations_core.ultra_helmet": "Ultra Capacete", + "item.generations_core.ultra_jungle_boat": "Barco Ultra Selva", + "item.generations_core.ultra_jungle_boat_with_chest": "Barco Ultra Selva Com Baú", + "item.generations_core.ultra_leggings": "Ultra Calças", + "item.generations_core.ultra_necrozma_disc": "Disco de Ultra Necrozma", + "item.generations_core.ultra_rare_soda": "Refrigerante Ultra Raro", + "item.generations_core.ultra_walkmon": "Ultra Walkmon", + "item.generations_core.ultranecrozium_z": "Ultranecrozium Z", + "item.generations_core.ultrite_axe": "Machado de Ultrite", + "item.generations_core.ultrite_boots": "Botas de Ultrite", + "item.generations_core.ultrite_chestplate": "Peitoral de Ultrite", + "item.generations_core.ultrite_hammer": "Martelo de Ultrite", + "item.generations_core.ultrite_helmet": "Capacete de Ultrite", + "item.generations_core.ultrite_hoe": "Enxada de Ultrite", + "item.generations_core.ultrite_ingot": "Lingote de Ultrite", + "item.generations_core.ultrite_leggings": "Calças de Ultrite", + "item.generations_core.ultrite_pickaxe": "Picareta de Ultrite", + "item.generations_core.ultrite_remnant": "Remanescente de Ultrite", + "item.generations_core.ultrite_shovel": "Pá de Ultrite", + "item.generations_core.ultrite_sword": "Espada de Ultrite", + "item.generations_core.ultrite_upgrade_smithing_template": "Modelo de Forjamento de Melhoria de Ultrite", + "item.generations_core.unova_cap": "Boné de Unova", + "item.generations_core.unova_stone": "Pedra de Unova", + "item.generations_core.unova_stone.desc": "Não implementado atualmente", + "item.generations_core.unown_report": "Relatório Unown", + "item.generations_core.unown_report.desc": "Não implementado atualmente", + "item.generations_core.up_grade": "Melhoria", + "item.generations_core.venusaurite": "Venusaurite", + "item.generations_core.vermilion_city_disc": "Disco da Cidade de Vermilion", + "item.generations_core.victory_ribbon": "Fita da Vitória", + "item.generations_core.volcanic_stone_axe": "Machado de Pedra Vulcânica", + "item.generations_core.volcanic_stone_hammer": "Martelo de Pedra Vulcânica", + "item.generations_core.volcanic_stone_hoe": "Enxada de Pedra Vulcânica", + "item.generations_core.volcanic_stone_pickaxe": "Picareta de Pedra Vulcânica", + "item.generations_core.volcanic_stone_shovel": "Pá de Pedra Vulcânica", + "item.generations_core.volcanic_stone_sword": "Espada de Pedra Vulcânica", + "item.generations_core.volcano_badge": "Insígnia do Vulcão", + "item.generations_core.voltage_badge": "Insígnia de Voltagem", + "item.generations_core.vs_recorder": "Gravador Vs", + "item.generations_core.vs_recorder.desc": "Não implementado atualmente", + "item.generations_core.vs_seeker": "Vs Seeker", + "item.generations_core.vs_seeker.desc": "Não implementado atualmente", + "item.generations_core.wailmer_pail": "Balde de Wailmer", + "item.generations_core.water_badge": "Insígnia de Água", + "item.generations_core.water_candy": "Doce de Água", + "item.generations_core.water_memory_drive": "Drive de Memória Água", + "item.generations_core.water_stone_axe": "Machado de Pedra da Água", + "item.generations_core.water_stone_boots": "Botas de Pedra da Água", + "item.generations_core.water_stone_chestplate": "Peitoral de Pedra da Água", + "item.generations_core.water_stone_hammer": "Martelo de Pedra da Água", + "item.generations_core.water_stone_helmet": "Capacete de Pedra da Água", + "item.generations_core.water_stone_hoe": "Enxada de Pedra da Água", + "item.generations_core.water_stone_leggings": "Calças de Pedra da Água", + "item.generations_core.water_stone_pickaxe": "Picareta de Pedra da Água", + "item.generations_core.water_stone_shovel": "Pá de Pedra da Água", + "item.generations_core.water_stone_sword": "Espada de Pedra da Água", + "item.generations_core.water_tera_shard": "Fragmento Tera Água", + "item.generations_core.waterium_z": "Waterium Z", + "item.generations_core.wave_badge": "Insígnia de Onda", + "item.generations_core.wave_incense": "Incenso da Onda", + "item.generations_core.wellspring_mask": "Máscara de Wellspring", + "item.generations_core.white_flute": "Flauta Branca", + "item.generations_core.white_mane_hair": "Cabelo de Juba Branca","item.generations_core.white_mane_hair.tooltip": "§7DICA: Este majestoso corcel requer uma oferta generosa de cenouras se você deseja pousar seus olhos sobre ele.", + "item.generations_core.winning_ribbon": "Fita Vencedora", + "item.generations_core.wishing_chip": "Ficha do Desejo", + "item.generations_core.wishing_chip.desc": "Não implementado atualmente", + "item.generations_core.wishing_piece": "Pedaço do Desejo", + "item.generations_core.wishing_piece.desc": "Não implementado atualmente", + "item.generations_core.wishing_ribbon": "Fita do Desejo", + "item.generations_core.wishing_star": "Estrela do Desejo", + "item.generations_core.wonder_egg": "Ovo Surpresa", + "item.generations_core.wonder_egg.tooltip": "§7DICA: Oh?", + "item.generations_core.wooden_crown": "Coroa de Madeira", + "item.generations_core.wooden_crown.desc": "Não implementado atualmente", + "item.generations_core.wooden_hammer": "Martelo de Madeira", + "item.generations_core.works_key": "Chave das Obras", + "item.generations_core.works_key.desc": "Não implementado atualmente", + "item.generations_core.world_ability_ribbon": "Fita de Habilidade Mundial", + "item.generations_core.world_cap": "Boné Mundial", + "item.generations_core.world_champion_ribbon": "Fita de Campeão Mundial", + "item.generations_core.world_ribbon": "Fita Mundial", + "item.generations_core.x_accuracy_2": "X Acerto 2", + "item.generations_core.x_accuracy_2.desc": "Não implementado atualmente", + "item.generations_core.x_accuracy_3": "X Acerto 3", + "item.generations_core.x_accuracy_3.desc": "Não implementado atualmente", + "item.generations_core.x_accuracy_6": "X Acerto 6", + "item.generations_core.x_accuracy_6.desc": "Não implementado atualmente", + "item.generations_core.x_attack_2": "X Ataque 2", + "item.generations_core.x_attack_2.desc": "Não implementado atualmente", + "item.generations_core.x_attack_3": "X Ataque 3", + "item.generations_core.x_attack_3.desc": "Não implementado atualmente", + "item.generations_core.x_attack_6": "X Ataque 6", + "item.generations_core.x_attack_6.desc": "Não implementado atualmente", + "item.generations_core.x_defense_2": "X Defesa 2", + "item.generations_core.x_defense_2.desc": "Não implementado atualmente", + "item.generations_core.x_defense_3": "X Defesa 3", + "item.generations_core.x_defense_3.desc": "Não implementado atualmente", + "item.generations_core.x_defense_6": "X Defesa 6", + "item.generations_core.x_defense_6.desc": "Não implementado atualmente", + "item.generations_core.x_special_attack_2": "X Ataque Especial 2", + "item.generations_core.x_special_attack_2.desc": "Não implementado atualmente", + "item.generations_core.x_special_attack_3": "X Ataque Especial 3", + "item.generations_core.x_special_attack_3.desc": "Não implementado atualmente", + "item.generations_core.x_special_attack_6": "X Ataque Especial 6", + "item.generations_core.x_special_attack_6.desc": "Não implementado atualmente", + "item.generations_core.x_special_defense_2": "X Defesa Especial 2", + "item.generations_core.x_special_defense_2.desc": "Não implementado atualmente", + "item.generations_core.x_special_defense_3": "X Defesa Especial 3", + "item.generations_core.x_special_defense_3.desc": "Não implementado atualmente", + "item.generations_core.x_special_defense_6": "X Defesa Especial 6", + "item.generations_core.x_special_defense_6.desc": "Não implementado atualmente", + "item.generations_core.x_speed_2": "X Velocidade 2", + "item.generations_core.x_speed_2.desc": "Não implementado atualmente", + "item.generations_core.x_speed_3": "X Velocidade 3", + "item.generations_core.x_speed_3.desc": "Não implementado atualmente", + "item.generations_core.x_speed_6": "X Velocidade 6", + "item.generations_core.x_speed_6.desc": "Não implementado atualmente", + "item.generations_core.x_transceiver_blue": "X Transceptor Azul", + "item.generations_core.x_transceiver_blue.desc": "Não implementado atualmente", + "item.generations_core.x_transceiver_red": "X Transceptor Vermelho", + "item.generations_core.x_transceiver_red.desc": "Não implementado atualmente", + "item.generations_core.x_transceiver_yellow": "X Transceptor Amarelo", + "item.generations_core.x_transceiver_yellow.desc": "Não implementado atualmente", + "item.generations_core.xy_legendary_disc": "Disco Lendário Xy", + "item.generations_core.yellow_flute": "Flauta Amarela", + "item.generations_core.yellow_juice": "Suco Amarelo", + "item.generations_core.yellow_nectar": "Néctar Amarelo", + "item.generations_core.yellow_petal": "Pétala Amarela", + "item.generations_core.yellow_scarf": "Cachecol Amarelo", + "item.generations_core.yellow_scarf.desc": "Não implementado atualmente", + "item.generations_core.yellow_shard": "Fragmento Amarelo", + "item.generations_core.z_ingot": "Lingote Z", + "item.generations_core.z_power_ring": "Anel Z de Poder", + "item.generations_core.z_ring": "Anel Z", + "item.generations_core.zap_plate": "Placa Zap", + "item.generations_core.zephyr_badge": "Insígnia de Zéfiro", + "item.generations_core.zinnia_disc": "Disco de Zinnia", + "item.generations_core.zone_wand": "Varinha de Zona", + "item.generations_core.zygarde_cube": "Cubo Zygarde", + "item.generations_core.zygarde_cube.tooltip.cell_add": "Célula Zygarde coletada!", + "item.generations_core.zygarde_cube.tooltip.cell_full": "O Cubo Zygarde está cheio!", + "item.generations_core.zygarde_cube.tooltip.cell_overflow": "Devido ao Cubo Zygarde estar cheio, a célula zygarde se atomiza.", + "item.generations_core.zygarde_cube.tooltip.lore1": "Um cubo estranho capaz de armazenar até 100 Células Zygarde,", + "item.generations_core.zygarde_cube.tooltip.lore2": "bem como fundi-las para reconstruir o lendário Zygarde.", + "item.generations_core.zygarde_cube.tooltip.lore3": "Colete Células Zygarde para invocar o equilíbrio.", + "item.generations_core.zygarde_cube.tooltip.lore4": "Células coletadas: %s/%s", + "item.minecraft.smithing_template.ultrite_upgrade.additions_slot_description": "Adicionar Lingote de Ultrite", + "item.minecraft.smithing_template.ultrite_upgrade.applies_to": "Equipamento de Netherite", + "item.minecraft.smithing_template.ultrite_upgrade.base_slot_description": "Adicionar armadura, arma ou ferramenta de Ultrite", + "item.minecraft.smithing_template.ultrite_upgrade.ingredients": "Lingote de Ultrite", + "item.unimplemented_until_1_dot_6_cobblemon": "Não implementado atualmente. Será analisado no Cobblemon 1.6+.", + "itemGroup.generations_core.awards": "Prêmios", + "itemGroup.generations_core.building_blocks": "Blocos de Construção", + "itemGroup.generations_core.cuisine": "Culinária", + "itemGroup.generations_core.decorations": "Decorações", + "itemGroup.generations_core.form_items": "Itens de Forma", + "itemGroup.generations_core.held_items": "Itens Segurados", + "itemGroup.generations_core.legendary_items": "Itens Lendários", + "itemGroup.generations_core.player_items": "Itens do Jogador", + "itemGroup.generations_core.pokedolls": "PokéDolls", + "itemGroup.generations_core.pokemail": "Pokemail", + "itemGroup.generations_core.restoration": "Restauração", + "itemGroup.generations_core.shrines": "Santuários", + "itemGroup.generations_core.tms": "TMs", + "itemGroup.generations_core.unimplemented": "Não Implementado", + "itemGroup.generations_core.utility": "Utilidade", + "itemGroup.generations_core.valuables": "Valiosos", + "jukebox_song.generations_core.azalea_town": "GlitchxCity - Azalea Town", + "jukebox_song.generations_core.cascarrafa_city": "GlitchxCity - Cidade de Cascarrafa", + "jukebox_song.generations_core.cerulean_city": "GlitchxCity - Cidade de Cerulean", + "jukebox_song.generations_core.cynthia": "GlitchxCity - Cynthia", + "jukebox_song.generations_core.deoxys": "GlitchxCity - Deoxys", + "jukebox_song.generations_core.eterna_city": "GlitchxCity - Cidade Eterna", + "jukebox_song.generations_core.goldenrod_city": "GlitchxCity - Cidade de Goldenrod", + "jukebox_song.generations_core.icirrus_city": "GlitchxCity - Cidade de Icirrus", + "jukebox_song.generations_core.iris": "GlitchxCity - Iris", + "jukebox_song.generations_core.jubilife_village": "GlitchxCity - Vila Jubileu", + "jukebox_song.generations_core.kanto": "GlitchxCity - Kanto", + "jukebox_song.generations_core.lake_of_rage": "GlitchxCity - Lago da Fúria", + "jukebox_song.generations_core.lavender_town": "GlitchxCity - Cidade de Lavender", + "jukebox_song.generations_core.laverre_city": "GlitchxCity - Cidade de Laverre", + "jukebox_song.generations_core.lillie": "GlitchxCity - Lillie", + "jukebox_song.generations_core.lugia": "GlitchxCity - Lugia", + "jukebox_song.generations_core.lusamine": "GlitchxCity - Lusamine", + "jukebox_song.generations_core.meloettas_relic_song": "Canção da Relíquia - Shota Kageyama", + "jukebox_song.generations_core.mt_pyre": "GlitchxCity - Mt. Pyre", + "jukebox_song.generations_core.nemona": "GlitchxCity - Nemona", + "jukebox_song.generations_core.nessa": "GlitchxCity - Nessa", + "jukebox_song.generations_core.penny": "GlitchxCity - Penny", + "jukebox_song.generations_core.pokemon_center": "GlitchxCity - Centro Pokémon", + "jukebox_song.generations_core.rival": "GlitchxCity - Rival", + "jukebox_song.generations_core.route_228": "GlitchxCity - Rota 228", + "jukebox_song.generations_core.sada_and_turo": "GlitchxCity - Sada e Turo", + "jukebox_song.generations_core.slumbering_weald": "GlitchxCity - Floresta Adormecida", + "jukebox_song.generations_core.south_province": "GlitchxCity - Província do Sul", + "jukebox_song.generations_core.surf": "GlitchxCity - Surf", + "jukebox_song.generations_core.team_rocket": "GlitchxCity - Equipe Rocket", + "jukebox_song.generations_core.ultra_necrozma": "GlitchxCity - Ultra Necrozma", + "jukebox_song.generations_core.vermilion_city": "GlitchxCity - Cidade de Vermilion", + "jukebox_song.generations_core.xy_legendary": "GlitchxCity - Lendário Xy", + "jukebox_song.generations_core.zinnia": "GlitchxCity - Zinnia", + "move.alreadyknows": "%s já conhece %s.", + "move.cantlearn": "%s não pode aprender %s.", + "move.doesntexist": "O movimento %s não existe, então %s não pôde aprendê-lo.", + "move.learned": "%s aprendeu %s.", + "move.newmove1": "1, 2, e... Tcharam!", + "move.newmove2": "%s esqueceu %s!", + "move.newmove3": "...e aprendeu %s!", + "painting.generations_core.blue_poster.author": "Pokemon", + "painting.generations_core.blue_poster.title": "Pôster Azul", + "painting.generations_core.blue_poster_sprite.author": "Pokemon", + "painting.generations_core.blue_poster_sprite.title": "Sprite de Pôster Azul", + "painting.generations_core.blue_scroll.author": "Pokemon", + "painting.generations_core.blue_scroll.title": "Pergaminho Azul", + "painting.generations_core.clefairy_poster_sprite.author": "Pokemon", + "painting.generations_core.clefairy_poster_sprite.title": "Pôster de Clefairy", + "painting.generations_core.cute_poster.author": "Pokemon", + "painting.generations_core.cute_poster.title": "Pôster Fofo", + "painting.generations_core.cute_poster_sprite.author": "Pokemon", + "painting.generations_core.cute_poster_sprite.title": "Sprite de Pôster Fofo", + "painting.generations_core.dads_scroll.author": "Pokemon", + "painting.generations_core.dads_scroll.title": "Pergaminho do Pai", + "painting.generations_core.green_poster.author": "Pokemon", + "painting.generations_core.green_poster.title": "Pôster Verde", + "painting.generations_core.green_poster_sprite.author": "Pokemon", + "painting.generations_core.green_poster_sprite.title": "Sprite de Pôster Verde", + "painting.generations_core.green_scroll.author": "Pokemon", + "painting.generations_core.green_scroll.title": "Pergaminho Verde", + "painting.generations_core.jigglypuff_poster_sprite.author": "Pokemon", + "painting.generations_core.jigglypuff_poster_sprite.title": "Jigglypuff", + "painting.generations_core.kiss_poster_sprite.author": "Pokemon", + "painting.generations_core.kiss_poster_sprite.title": "Sprite de Pôster de Beijo", + "painting.generations_core.long_poster.author": "Pokemon", + "painting.generations_core.long_poster.title": "Pôster Longo", + "painting.generations_core.long_poster_sprite.author": "Pokemon", + "painting.generations_core.long_poster_sprite.title": "Sprite de Pôster Longo", + "painting.generations_core.national_award.author": "Pokemon", + "painting.generations_core.national_award.title": "Prêmio Nacional", + "painting.generations_core.pika_poster.author": "Pokemon", + "painting.generations_core.pika_poster.title": "Pôster Pika", + "painting.generations_core.pika_poster_sprite.author": "Pokemon", + "painting.generations_core.pika_poster_sprite.title": "Sprite de Pôster Pika", + "painting.generations_core.pikachu_poster_sprite.author": "Pokemon", + "painting.generations_core.pikachu_poster_sprite.title": "Sprite de Pôster de Pikachu", + "painting.generations_core.poke_ball_poster.author": "Pokemon", + "painting.generations_core.poke_ball_poster.title": "Pôster de Poké Bola", + "painting.generations_core.red_poster.author": "Pokemon", + "painting.generations_core.red_poster.title": "Pôster Vermelho", + "painting.generations_core.red_poster_sprite.author": "Pokemon", + "painting.generations_core.red_poster_sprite.title": "Sprite de Pôster Vermelho", + "painting.generations_core.red_scroll.author": "Pokemon", + "painting.generations_core.red_scroll.title": "Pergaminho Vermelho", + "painting.generations_core.regional_award.author": "Pokemon", + "painting.generations_core.regional_award.title": "Prêmio Regional", + "painting.generations_core.sea_poster.author": "Pokemon", + "painting.generations_core.sea_poster.title": "Pôster do Mar", + "painting.generations_core.sea_poster_sprite.author": "Pokemon", + "painting.generations_core.sea_poster_sprite.title": "Sprite de Pôster do Mar", + "painting.generations_core.sky_poster.author": "Pokemon", + "painting.generations_core.sky_poster.title": "Pôster do Céu", + "painting.generations_core.sky_poster_sprite.author": "Pokemon", + "painting.generations_core.sky_poster_sprite.title": "Sprite de Pôster do Céu", + "painting.generations_core.time_travel_award.author": "Pokemon", + "painting.generations_core.time_travel_award.title": "Prêmio de Viagem no Tempo", + "painting.generations_core.town_map_sprite.author": "Pokemon", + "painting.generations_core.town_map_sprite.title": "Sprite de Mapa da Cidade", + "upgrade.minecraft.ultrite_upgrade": "Modelo de Forjamento de Melhoria de Ultrite" +} \ No newline at end of file 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 deleted file mode 100644 index 4056e22d7..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0165_ledyba.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "ledyba-1", - "pokemon": "ledyba", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "5-20", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle", - "#cobblemon:is_forest" - ] - } - } - ] -} \ 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 deleted file mode 100644 index aa3c51869..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0166_ledian.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "ledian-1", - "pokemon": "ledian", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "18-36", - "weight": 5.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle", - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0175_togepi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0175_togepi.json deleted file mode 100644 index d8d1aec06..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0175_togepi.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "togepi-1", - "pokemon": "togepi", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "4-20", - "weight": 6, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ], - "timeRange": "day" - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0176_togetic.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0176_togetic.json deleted file mode 100644 index c958df22c..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0176_togetic.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "togetic-1", - "pokemon": "togetic", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "16-52", - "weight": 3.6, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ], - "timeRange": "day" - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0183_marill.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0183_marill.json deleted file mode 100644 index 6db370662..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0183_marill.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "marill-1", - "pokemon": "marill", - "type": "pokemon", - "presets": [ - "natural" - ], - "context": "grounded", - "bucket": "uncommon", - "level": "12-24", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_river", - "#cobblemon:is_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0184_azumarill.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0184_azumarill.json deleted file mode 100644 index 599c5d576..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0184_azumarill.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "azumarill-1", - "pokemon": "azumarill", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "18-52", - "weight": 3.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_river", - "#cobblemon:is_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0187_hoppip.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0187_hoppip.json deleted file mode 100644 index fa765c8a2..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0187_hoppip.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "hoppip-1", - "pokemon": "hoppip", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-20", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0188_skiploom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0188_skiploom.json deleted file mode 100644 index 3a8e8a5de..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0188_skiploom.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "skiploom-1", - "pokemon": "skiploom", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "18-28", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0189_jumpluff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0189_jumpluff.json deleted file mode 100644 index 5b0953aa0..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0189_jumpluff.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "jumpluff-1", - "pokemon": "jumpluff", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "27-52", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index df2fe0c3d..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0191_sunkern.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "sunkern-1", - "pokemon": "sunkern", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-24", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_floral" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index dad27077f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0192_sunflora.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "sunflora-1", - "pokemon": "sunflora", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "18-52", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_floral" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0201_unown.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0201_unown.json deleted file mode 100644 index a6836cdff..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0201_unown.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "unown-1", - "pokemon": "unown", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "4-55", - "weight": 9.0, - "minSkyLight": 0, - "maxSkyLight": 7, - "condition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0202_wobbuffet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0202_wobbuffet.json deleted file mode 100644 index ac6e319d2..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0202_wobbuffet.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "wobbuffet-1", - "pokemon": "wobbuffet", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "15-38", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_overworld" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0203_girafarig.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0203_girafarig.json deleted file mode 100644 index 791dc843a..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0203_girafarig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "girafarig-1", - "pokemon": "girafarig", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-38", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_plains" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0206_dunsparce.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0206_dunsparce.json deleted file mode 100644 index 5b8cc7982..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0206_dunsparce.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "dunsparce-1", - "pokemon": "dunsparce", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-38", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_overworld" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss" - ] - } - } - ] -} \ 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 deleted file mode 100644 index 9216c0d71..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0222_corsola.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "corsola-1", - "pokemon": "corsola", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "common", - "level": "4-33", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_warm_ocean" - ], - "timeRange": "day" - } - }, - { - "id": "corsola-galarian-1", - "pokemon": "corsola galarian", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "seafloor", - "bucket": "common", - "level": "4-33", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_warm_ocean" - ], - "timeRange": "night" - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0223_remoraid.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0223_remoraid.json deleted file mode 100644 index d25bdeb81..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0223_remoraid.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "remoraid-1", - "pokemon": "remoraid", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "10-29", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_lukewarm_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0224_octillery.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0224_octillery.json deleted file mode 100644 index 1797b52ab..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0224_octillery.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "octillery-1", - "pokemon": "octillery", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "rare", - "level": "25-44", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_lukewarm_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index 9a722d2cb..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0225_delibird.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "delibird-1", - "pokemon": "delibird", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "1-50", - "weight": 4.0, - "condition": { - "biomes": [ - "#cobblemon:is_glacial" - ] - } - } - ] -} \ 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 deleted file mode 100644 index f2dd26c55..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0226_mantine.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "mantine-1", - "pokemon": "mantine", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "25-44", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_lukewarm_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0228_houndour.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0228_houndour.json deleted file mode 100644 index ddbc2a38e..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0228_houndour.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "houndour-1", - "pokemon": "houndour", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-30", - "weight": 5.0, - "condition": { - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0229_houndoom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0229_houndoom.json deleted file mode 100644 index dff80244c..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0229_houndoom.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "houndoom-1", - "pokemon": "houndoom", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "24-40", - "weight": 5.0, - "condition": { - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0287_slakoth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0287_slakoth.json deleted file mode 100644 index 9cdeffd95..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0287_slakoth.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "slakoth-1", - "pokemon": "slakoth", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-22", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0288_vigoroth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0288_vigoroth.json deleted file mode 100644 index b1ec06d49..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0288_vigoroth.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "vigoroth-1", - "pokemon": "vigoroth", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "16-40", - "weight": 1.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0289_slaking.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0289_slaking.json deleted file mode 100644 index 76da82c47..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0289_slaking.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "slaking-1", - "pokemon": "slaking", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "36-55", - "weight": 5.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0298_azurill.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0298_azurill.json deleted file mode 100644 index b73a262c9..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0298_azurill.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "azurill-1", - "pokemon": "azurill", - "type": "pokemon", - "presets": [ - "natural" - ], - "context": "grounded", - "bucket": "common", - "level": "4-18", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_river", - "#cobblemon:is_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0307_meditite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0307_meditite.json deleted file mode 100644 index 617b810fe..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0307_meditite.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "meditite-1", - "pokemon": "meditite", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-40", - "weight": 5.0, - "condition": { - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0308_medicham.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0308_medicham.json deleted file mode 100644 index 8ef1c712f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0308_medicham.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "medicham-1", - "pokemon": "medicham", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "37-55", - "weight": 5.0, - "condition": { - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0309_electrike.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0309_electrike.json deleted file mode 100644 index 9b7220c83..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0309_electrike.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "electrike-1", - "pokemon": "electrike", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "5-30", - "weight": 5.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0310_manectric.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0310_manectric.json deleted file mode 100644 index 99bcad549..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0310_manectric.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "manectric-1", - "pokemon": "manectric", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "26-55", - "weight": 5.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_plains" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0325_spoink.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0325_spoink.json deleted file mode 100644 index 781eba48f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0325_spoink.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "spoink-1", - "pokemon": "spoink", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-34", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0326_grumpig.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0326_grumpig.json deleted file mode 100644 index dba566ab6..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0326_grumpig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "grumpig-1", - "pokemon": "grumpig", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "32-55", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0333_swablu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0333_swablu.json deleted file mode 100644 index 17a3556e2..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0333_swablu.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "swablu-1", - "pokemon": "swablu", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "3-36", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_floral" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0334_altaria.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0334_altaria.json deleted file mode 100644 index 7c885b870..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0334_altaria.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "altaria-1", - "pokemon": "altaria", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "35-55", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_floral" - ] - } - } - ] -} \ 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 deleted file mode 100644 index 3b58d4364..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0341_corphish.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "corphish-1", - "pokemon": "corphish", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "common", - "level": "6-30", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 9e7aa447c..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0342_crawdaunt.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "crawdaunt-1", - "pokemon": "crawdaunt", - "presets": [ - "underwater" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "30-55", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 3c1ed08e4..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0349_feebas.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "feebas-1", - "pokemon": "feebas", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "rare", - "level": "1-20", - "weight": 9.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_freshwater" - ] - } - } - ] -} 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 deleted file mode 100644 index eec09d39a..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0350_milotic.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "milotic-1", - "pokemon": "milotic", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "ultra-rare", - "level": "20-55", - "weight": 9.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_freshwater" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0352_kecleon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0352_kecleon.json deleted file mode 100644 index 10ed9fc51..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0352_kecleon.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "kecleon-1", - "pokemon": "kecleon", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-55", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0353_shuppet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0353_shuppet.json deleted file mode 100644 index 523be5400..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0353_shuppet.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "shuppet-1", - "pokemon": "shuppet", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "12-39", - "weight": 9.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky" - ], - "timeRange": "night" - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0354_banette.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0354_banette.json deleted file mode 100644 index c8d7e6f5f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0354_banette.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "banette-1", - "pokemon": "banette", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "37-55", - "weight": 9.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky" - ], - "timeRange": "night" - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0359_absol.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0359_absol.json deleted file mode 100644 index 43e15d9eb..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0359_absol.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "absol-1", - "pokemon": "absol", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "16-55", - "weight": 5.0, - "condition": { - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0360_wynaut.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0360_wynaut.json deleted file mode 100644 index 0a30e3efb..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0360_wynaut.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "wynaut-1", - "pokemon": "wynaut", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-16", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_overworld" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0361_snorunt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0361_snorunt.json deleted file mode 100644 index fc307e3fc..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0361_snorunt.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "snorunt-1", - "pokemon": "snorunt", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-40", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_cold" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0362_glalie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0362_glalie.json deleted file mode 100644 index 56b453383..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0362_glalie.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "glalie-1", - "pokemon": "glalie", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "40-55", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_cold" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss" - ] - } - } - ] -} \ 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 deleted file mode 100644 index e2b8f1bdd..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0363_spheal.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "spheal-1", - "pokemon": "spheal", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "common", - "level": "4-33", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_cold" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index b7ea555a4..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0364_sealeo.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "sealeo-1", - "pokemon": "sealeo", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "32-50", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_cold" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index e04f96d68..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0365_walrein.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "walrein-1", - "pokemon": "walrein", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "rare", - "level": "44-55", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_cold" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clampearl.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clampearl.json deleted file mode 100644 index 474ae547e..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0366_clampearl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "clamperl-1", - "pokemon": "clamperl", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "seafloor", - "bucket": "uncommon", - "level": "12-30", - "weight": 9.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_ocean" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 4782a691e..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0371_bagon.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "bagon-1", - "pokemon": "bagon", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "12-30", - "weight": 5.4, - "condition": { - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 965a8f9c6..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0372_shelgon.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "shelgon-1", - "pokemon": "shelgon", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "30-50", - "weight": 2.0, - "condition": { - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} 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 deleted file mode 100644 index 6ca73a471..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0373_salamence.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "salamence-1", - "pokemon": "salamence", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "50-60", - "weight": 0.3, - "condition": { - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} 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 deleted file mode 100644 index 9b388cebc..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0422_shellos.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "shellos-1", - "pokemon": "shellos", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-32", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_coast" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 945d2d27a..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0423_gastrodon.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "gastrodon-1", - "pokemon": "gastrodon", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-32", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_coast" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0431_glameow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0431_glameow.json deleted file mode 100644 index b9767abc7..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0431_glameow.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "glameow-1", - "pokemon": "glameow", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "12-29", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_temperate" - ], - "timeRange": "night", - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0432_purugly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0432_purugly.json deleted file mode 100644 index 492d54c0e..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0432_purugly.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "purugly-1", - "pokemon": "purugly", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "39-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_temperate" - ], - "timeRange": "night", - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0436_bronzor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0436_bronzor.json deleted file mode 100644 index 0e7f0c637..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0436_bronzor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "bronzor-1", - "pokemon": "bronzor", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-35", - "weight": 9.0, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_deep_dark" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0437_bronzong.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0437_bronzong.json deleted file mode 100644 index 065843bfd..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0437_bronzong.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "bronzong-1", - "pokemon": "bronzong", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "33-60", - "weight": 9.0, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_deep_dark" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0451_skorupi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0451_skorupi.json deleted file mode 100644 index 3083fe208..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0451_skorupi.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "skorupi-1", - "pokemon": "skorupi", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-42", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0452_drapion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0452_drapion.json deleted file mode 100644 index a91d0cf15..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0452_drapion.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "drapion-1", - "pokemon": "drapion", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "40-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0453_croagunk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0453_croagunk.json deleted file mode 100644 index 8301c51a0..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0453_croagunk.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "croagunk-1", - "pokemon": "croagunk", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-42", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0454_toxicroak.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0454_toxicroak.json deleted file mode 100644 index 9a9bcffd7..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0454_toxicroak.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "toxicroak-1", - "pokemon": "toxicroak", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "37-55", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0456_finneon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0456_finneon.json deleted file mode 100644 index 9a6c3e7fe..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0456_finneon.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "finneon-1", - "pokemon": "finneon", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "seafloor", - "bucket": "uncommon", - "level": "5-32", - "weight": 9.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_ocean" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0457_lumineon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0457_lumineon.json deleted file mode 100644 index 72e506141..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0457_lumineon.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "lumineon-1", - "pokemon": "lumineon", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "seafloor", - "bucket": "rare", - "level": "31-55", - "weight": 9.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_ocean" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 8f1a255eb..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0458_mantyke.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "mantyke-1", - "pokemon": "mantyke", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "common", - "level": "4-26", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_lukewarm_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0468_togekiss.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0468_togekiss.json deleted file mode 100644 index fea3cb4d1..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0468_togekiss.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "togekiss-1", - "pokemon": "togekiss", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "16-52", - "weight": 0.4, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ], - "timeRange": "day" - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0478_froslass.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0478_froslass.json deleted file mode 100644 index 3c5857d19..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0478_froslass.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "froslass-1", - "pokemon": "froslass", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "40-55", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_cold" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json deleted file mode 100644 index 328976602..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "rotom-1", - "pokemon": "rotom", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "12-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_temperate" - ], - "timeRange": "night" - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json index cb543fd0f..d9c7c46a4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0509_purrloin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0509_purrloin.json deleted file mode 100644 index ca9e44e55..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0509_purrloin.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "purrloin-1", - "pokemon": "purrloin", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-25", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0510_liepard.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0510_liepard.json deleted file mode 100644 index 794184bc0..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0510_liepard.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "liepard-1", - "pokemon": "liepard", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "20-50", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0511_pansage.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0511_pansage.json deleted file mode 100644 index 1d727939d..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0511_pansage.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "pansage-1", - "pokemon": "pansage", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-25", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0512_simisage.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0512_simisage.json deleted file mode 100644 index 1e8128379..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0512_simisage.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "simisage-1", - "pokemon": "simisage", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "20-50", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0513_pansear.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0513_pansear.json deleted file mode 100644 index 7a8d770b9..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0513_pansear.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "pansear-1", - "pokemon": "pansear", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-25", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0514_simisear.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0514_simisear.json deleted file mode 100644 index 213023d48..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0514_simisear.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "simisear-1", - "pokemon": "simisear", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "20-50", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0515_panpour.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0515_panpour.json deleted file mode 100644 index b81c3bf8f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0515_panpour.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "panpour-1", - "pokemon": "panpour", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-25", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0516_simipour.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0516_simipour.json deleted file mode 100644 index 0b1a0f4fd..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0516_simipour.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "simipour-1", - "pokemon": "simipour", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "20-50", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0517_munna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0517_munna.json deleted file mode 100644 index e71c8c434..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0517_munna.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "munna-1", - "pokemon": "munna", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "12-39", - "weight": 9.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky" - ], - "timeRange": "night" - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0518_musharna.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0518_musharna.json deleted file mode 100644 index bd7c77c2b..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0518_musharna.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "musharna-1", - "pokemon": "musharna", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "12-39", - "weight": 9.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky" - ], - "timeRange": "night" - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0522_blitzle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0522_blitzle.json deleted file mode 100644 index 339142429..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0522_blitzle.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "blitzle-1", - "pokemon": "blitzle", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "5-29", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0523_zebstrika.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0523_zebstrika.json deleted file mode 100644 index 80571921a..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0523_zebstrika.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "zebstrika-1", - "pokemon": "zebstrika", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "20-50", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0529_drilbur.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0529_drilbur.json deleted file mode 100644 index 1f578f69c..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0529_drilbur.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "drilbur-1", - "pokemon": "drilbur", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-35", - "weight": 9.0, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_deep_dark" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0530_excadrill.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0530_excadrill.json deleted file mode 100644 index dac4b633f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0530_excadrill.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "excadrill-1", - "pokemon": "excadrill", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "31-60", - "weight": 9.0, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_deep_dark" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0540_sewaddle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0540_sewaddle.json deleted file mode 100644 index 52345f178..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0540_sewaddle.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "sewaddle-1", - "pokemon": "sewaddle", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "5-22", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0541_swadloon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0541_swadloon.json deleted file mode 100644 index 19f509251..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0541_swadloon.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "swadloon-1", - "pokemon": "swadloon", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "20-40", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0542_leavanny.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0542_leavanny.json deleted file mode 100644 index 2cc01d90f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0542_leavanny.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "leavanny-1", - "pokemon": "leavanny", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "30-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0559_scraggy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0559_scraggy.json deleted file mode 100644 index 4a9e91f30..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0559_scraggy.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "scraggy-1", - "pokemon": "scraggy", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-45", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0560_scrafty.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0560_scrafty.json deleted file mode 100644 index 1d5847e49..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0560_scrafty.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "scrafty-1", - "pokemon": "scrafty", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "39-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0568_trubbish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0568_trubbish.json deleted file mode 100644 index 1e7845c3b..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0568_trubbish.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "trubbish-1", - "pokemon": "trubbish", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "6-40", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0569_garbodor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0569_garbodor.json deleted file mode 100644 index 77045d224..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0569_garbodor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "garbodor-1", - "pokemon": "garbodor", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "36-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0572_minccino.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0572_minccino.json deleted file mode 100644 index 699740d4b..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0572_minccino.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "minccino-1", - "pokemon": "minccino", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "5-30", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0573_cinccino.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0573_cinccino.json deleted file mode 100644 index 2a65a7873..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0573_cinccino.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "cinccino-1", - "pokemon": "cinccino", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "16-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0574_gothita.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0574_gothita.json deleted file mode 100644 index 2b78c8649..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0574_gothita.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "gothita-1", - "pokemon": "gothita", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "5-36", - "weight": 9.0, - "minSkyLight": 8, - "maxSkyLight": 15, - "condition": { - "biomes": [ - "#cobblemon:is_temperate" - ], - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0575_gothorita.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0575_gothorita.json deleted file mode 100644 index 34e0e3c40..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0575_gothorita.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "gothorita-1", - "pokemon": "gothorita", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "32-44", - "weight": 9.0, - "minSkyLight": 8, - "maxSkyLight": 15, - "condition": { - "biomes": [ - "#cobblemon:is_temperate" - ], - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0576_gothitelle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0576_gothitelle.json deleted file mode 100644 index 8120d6140..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0576_gothitelle.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "gothitelle-1", - "pokemon": "gothitelle", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "41-60", - "weight": 9.0, - "minSkyLight": 8, - "maxSkyLight": 15, - "condition": { - "biomes": [ - "#cobblemon:is_temperate" - ], - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0577_solosis.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0577_solosis.json deleted file mode 100644 index 1f256d0a0..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0577_solosis.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "solosis-1", - "pokemon": "solosis", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "5-36", - "weight": 9.0, - "condition": { - "minSkyLight": 8, - "maxSkyLight": 15, - "biomes": [ - "#cobblemon:is_temperate" - ], - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0578_duosion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0578_duosion.json deleted file mode 100644 index 8d81e681c..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0578_duosion.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "duosion-1", - "pokemon": "duosion", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "32-44", - "weight": 9.0, - "minSkyLight": 8, - "maxSkyLight": 15, - "condition": { - "biomes": [ - "#cobblemon:is_temperate" - ], - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0579_reuniclus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0579_reuniclus.json deleted file mode 100644 index dbc353370..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0579_reuniclus.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "reuniclus-1", - "pokemon": "reuniclus", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "41-60", - "weight": 9.0, - "minSkyLight": 8, - "maxSkyLight": 15, - "condition": { - "biomes": [ - "#cobblemon:is_temperate" - ], - "isRaining": false - } - } - ] -} 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 deleted file mode 100644 index d81297f39..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0580_ducklett.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "ducklett-1", - "pokemon": "ducklett", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "6-40", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index 13e187d80..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0581_swanna.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "swanna-1", - "pokemon": "swanna", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "35-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0582_vanillite.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0582_vanillite.json deleted file mode 100644 index 6dbf898f3..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0582_vanillite.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "vanillite-1", - "pokemon": "vanillite", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-40", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_cold" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0583_vanillish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0583_vanillish.json deleted file mode 100644 index 236bf8cc0..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0583_vanillish.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "vanillish-1", - "pokemon": "vanillish", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "35-50", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_cold" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0584_vanilluxe.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0584_vanilluxe.json deleted file mode 100644 index 35c1c9b9e..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0584_vanilluxe.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "vanilluxe-1", - "pokemon": "vanilluxe", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "47-60", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_cold" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index d0215c5ad..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0588_karrablast.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "karrablast-1", - "pokemon": "karrablast", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "10-43", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "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 deleted file mode 100644 index 3a66ea0f1..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0589_escavalier.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "escavalier-1", - "pokemon": "escavalier", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "20-60", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "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 deleted file mode 100644 index 4e76a5d60..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0590_foongus.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "foongus-1", - "pokemon": "foongus", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "9-45", - "weight": 0.2, - "condition": { - "biomes": [ - "#cobblemon:is_magical", - "#cobblemon:is_mushroom" - ], - "maxLight": 7 - } - } - ] -} \ 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 deleted file mode 100644 index 39d32d64f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0591_amoonguss.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "amoonguss-1", - "pokemon": "amoonguss", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "39-60", - "weight": 0.2, - "condition": { - "biomes": [ - "#cobblemon:is_magical", - "#cobblemon:is_mushroom" - ], - "maxLight": 7 - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0610_axew.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0610_axew.json deleted file mode 100644 index 0240313cd..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0610_axew.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "axew-1", - "pokemon": "axew", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "12-30", - "weight": 9.0, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_overworld", - "#minecraft:is_end" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss", - "#cobblemon:is_mountain" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0611_fraxure.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0611_fraxure.json deleted file mode 100644 index 7cd90e338..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0611_fraxure.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "fraxure-1", - "pokemon": "fraxure", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "24-47", - "weight": 0.9, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_overworld", - "#minecraft:is_end" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss", - "#cobblemon:is_mountain" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0612_haxorus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0612_haxorus.json deleted file mode 100644 index 070250650..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0612_haxorus.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "haxorus-1", - "pokemon": "haxorus", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "48-60", - "weight": 0.1, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_overworld", - "#minecraft:is_end" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss", - "#cobblemon:is_mountain" - ] - } - } - ] -} 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 deleted file mode 100644 index d74cb0254..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0616_shelmet.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "shelmet-1", - "pokemon": "shelmet", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "6-22", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "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 deleted file mode 100644 index 35cf3184f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0617_accelgor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "accelgor-1", - "pokemon": "accelgor", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "6-22", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0618_stunfisk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0618_stunfisk.json deleted file mode 100644 index a6182b217..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0618_stunfisk.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "stunfisk-1", - "pokemon": "stunfisk", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "6-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - }, - { - "id": "stunfisk-galarian-1", - "pokemon": "stunfisk galarian", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "6-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0619_mienfoo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0619_mienfoo.json deleted file mode 100644 index 9ea2b0e07..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0619_mienfoo.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "mienfoo-1", - "pokemon": "mienfoo", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "6-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0620_mienshao.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0620_mienshao.json deleted file mode 100644 index 40ca0816a..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0620_mienshao.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "mienshao-1", - "pokemon": "mienshao", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "50-65", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0621_druddigon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0621_druddigon.json deleted file mode 100644 index dad56cb7c..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0621_druddigon.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "druddigon-1", - "pokemon": "druddigon", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "16-60", - "weight": 0.1, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_overworld", - "#minecraft:is_end" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss", - "#cobblemon:is_mountain" - ] - } - } - ] -} 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 deleted file mode 100644 index 761f25fea..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0627_rufflet.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "rufflet-1", - "pokemon": "rufflet", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "6-54", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} \ 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 deleted file mode 100644 index cafce9807..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0628_braviary.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "braviary-1", - "pokemon": "braviary", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "54-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_badlands" - ] - } - }, - { - "id": "braviary-hisuian-1", - "pokemon": "braviary hisuian", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "54-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0672_skiddo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0672_skiddo.json deleted file mode 100644 index a125ae094..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0672_skiddo.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "skiddo-1", - "pokemon": "skiddo", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "12-40", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0673_gogoat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0673_gogoat.json deleted file mode 100644 index f7db5aa65..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0673_gogoat.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "gogoat-1", - "pokemon": "gogoat", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "32-60", - "weight": 1.8, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0676_furfrou.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0676_furfrou.json deleted file mode 100644 index ce4575437..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0676_furfrou.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "furfrou-1", - "pokemon": "furfrou", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "12-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_temperate" - ], - "timeRange": "day", - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0677_espurr.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0677_espurr.json deleted file mode 100644 index 4aee04052..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0677_espurr.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "espurr-1", - "pokemon": "espurr", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "12-30", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_temperate" - ], - "timeRange": "night", - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0678_meowstic.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0678_meowstic.json deleted file mode 100644 index 9383e0dd7..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0678_meowstic.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "meowstic-1", - "pokemon": "meowstic", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "25-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_temperate" - ], - "timeRange": "night", - "isRaining": false - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0686_inkay.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0686_inkay.json deleted file mode 100644 index cf1ab7ce3..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0686_inkay.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "inkay-1", - "pokemon": "inkay", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "8-38", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_lukewarm_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0687_malamar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0687_malamar.json deleted file mode 100644 index e344453c6..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0687_malamar.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "malamar-1", - "pokemon": "malamar", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "rare", - "level": "30-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_lukewarm_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index db1645bc9..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0688_binacle.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "binacle-1", - "pokemon": "binacle", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-44", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index 32fad0e5e..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0689_barbaracle.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "barbaracle-1", - "pokemon": "barbaracle", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "39-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index 349ed6b86..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0692_clauncher.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "clauncher-1", - "pokemon": "clauncher", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "common", - "level": "8-44", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_warm_ocean" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 3e4471d96..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0693_clawitzer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "clawitzer-1", - "pokemon": "clawitzer", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "37-55", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_warm_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0701_hawlucha.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0701_hawlucha.json deleted file mode 100644 index 66a03c805..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0701_hawlucha.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "hawlucha-1", - "pokemon": "hawlucha", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "25-60", - "weight": 9.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0702_dedenne.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0702_dedenne.json deleted file mode 100644 index 16b39490d..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0702_dedenne.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "dedenne-1", - "pokemon": "dedenne", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "12-60", - "weight": 9.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_floral" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0714_noibat.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0714_noibat.json deleted file mode 100644 index b77adcc56..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0714_noibat.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "noibat-1", - "pokemon": "noibat", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-50", - "weight": 9.0, - "condition": { - "canSeeSky": false, - "timeRange": "night", - "biomes": [ - "#cobblemon:is_deep_dark" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0715_noivern.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0715_noivern.json deleted file mode 100644 index 287da46cf..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0715_noivern.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "noivern-1", - "pokemon": "noivern", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "48-60", - "weight": 9.0, - "condition": { - "canSeeSky": false, - "timeRange": "night", - "biomes": [ - "#cobblemon:is_deep_dark" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0731_pikipek.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0731_pikipek.json deleted file mode 100644 index 5b0994ca7..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0731_pikipek.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "pikipek-1", - "pokemon": "pikipek", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-24", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0732_trumbeak.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0732_trumbeak.json deleted file mode 100644 index 605fa3a9e..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0732_trumbeak.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "trumbeak-1", - "pokemon": "trumbeak", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "14-34", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0733_toucannon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0733_toucannon.json deleted file mode 100644 index a54f95a14..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0733_toucannon.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "toucannon-1", - "pokemon": "toucannon", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "28-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_jungle" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0734_yungoos.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0734_yungoos.json deleted file mode 100644 index 56784d967..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0734_yungoos.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "yungoos-1", - "pokemon": "yungoos", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-24", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "timeRange": "day", - "biomes": [ - "#cobblemon:is_grassland" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0735_gumshoos.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0735_gumshoos.json deleted file mode 100644 index 32602b3d3..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0735_gumshoos.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "gumshoos-1", - "pokemon": "gumshoos", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "20-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "timeRange": "day", - "biomes": [ - "#cobblemon:is_grassland" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 0ccffbcb0..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0747_mareanie.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "mareanie-1", - "pokemon": "mareanie", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "8-42", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_warm_ocean" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 744e4d699..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0748_toxapex.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "toxapex-1", - "pokemon": "toxapex", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "rare", - "level": "38-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_warm_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index 908ba3062..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0751_dewpider.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "dewpider-1", - "pokemon": "dewpider", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-22", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ 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 deleted file mode 100644 index 3afa9c331..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0752_araquanid.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "araquanid-1", - "pokemon": "araquanid", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "22-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0769_sandygast.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0769_sandygast.json deleted file mode 100644 index a789c47b7..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0769_sandygast.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "sandygast-1", - "pokemon": "sandygast", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-45", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_beach" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0770_palossand.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0770_palossand.json deleted file mode 100644 index fc4f683ac..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0770_palossand.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "palossand-1", - "pokemon": "palossand", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "42-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_beach" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 48347e4b9..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0779_bruxish.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "bruxish-1", - "pokemon": "bruxish", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "8-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_warm_ocean" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0780_drampa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0780_drampa.json deleted file mode 100644 index 962b99cb1..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0780_drampa.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "drampa-1", - "pokemon": "drampa", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "10-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mountain" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json index f656bbf2f..18d7f8f3f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json index d9201f684..596e95a40 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json index ec3c97e43..ffef9b839 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json index 35d3aaef9..10e6a21b0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json index 10b3145d8..27ba84268 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json index 8ac7f17e8..723b0bd2a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json index 8ae4c31e4..47cc27b7b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json index 015b8d6a6..f79bbb571 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json index 876637ebf..6ae1289d3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json index 3351f103f..86dc432f0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json index 7641a91a7..c96dd1fb3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0819_skwovet.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0819_skwovet.json deleted file mode 100644 index e385a475e..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0819_skwovet.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "skwovet-1", - "pokemon": "skwovet", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-27", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_taiga" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0820_greedent.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0820_greedent.json deleted file mode 100644 index 115130aa2..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0820_greedent.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "greedent-1", - "pokemon": "greedent", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "24-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_taiga" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0833_chewtle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0833_chewtle.json deleted file mode 100644 index a5d945050..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0833_chewtle.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "chewtle-1", - "pokemon": "chewtle", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-25", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0834_drednaw.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0834_drednaw.json deleted file mode 100644 index 600c0f478..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0834_drednaw.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "drednaw-1", - "pokemon": "drednaw", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "22-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0843_silicobra.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0843_silicobra.json deleted file mode 100644 index ef4cf25ea..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0843_silicobra.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "silicobra-1", - "pokemon": "silicobra", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-40", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0844_sandaconda.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0844_sandaconda.json deleted file mode 100644 index 226499206..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0844_sandaconda.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "sandaconda-1", - "pokemon": "sandaconda", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "36-50", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - } - ] -} \ 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 deleted file mode 100644 index 5fd22d6a7..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0845_cramorant.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "cramorant-1", - "pokemon": "cramorant", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "25-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_coast" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0848_toxel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0848_toxel.json deleted file mode 100644 index 071080a87..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0848_toxel.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "toxel-1", - "pokemon": "toxel", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-32", - "weight": 1.98, - "condition": { - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0849_toxtricity.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0849_toxtricity.json deleted file mode 100644 index 7f4f64a60..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0849_toxtricity.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "toxtricity-1", - "pokemon": "toxtricity", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "30-60", - "weight": 1.98, - "condition": { - "biomes": [ - "#cobblemon:is_swamp" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0852_clobbopus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0852_clobbopus.json deleted file mode 100644 index 6657a0d0f..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0852_clobbopus.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "clobbopus-1", - "pokemon": "clobbopus", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "9-44", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_freezing" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0853_grapploct.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0853_grapploct.json deleted file mode 100644 index f1c1524db..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0853_grapploct.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "grapploct-1", - "pokemon": "grapploct", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "rare", - "level": "25-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_freezing" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0854_sinistea.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0854_sinistea.json deleted file mode 100644 index ffcb887e9..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0854_sinistea.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "sinistea-1", - "pokemon": "sinistea", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-48", - "weight": 4.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0855_polteageist.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0855_polteageist.json deleted file mode 100644 index bd128ed5c..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0855_polteageist.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "polteageist-1", - "pokemon": "polteageist", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "24-60", - "weight": 4.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index ca73d1440..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0856_hatenna.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "hatenna-1", - "pokemon": "hatenna", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-38", - "weight": 4.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky", - "#minecraft:is_end" - ] - } - } - ] -} 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 deleted file mode 100644 index 879e89707..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0857_hattrem.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "hattrem-1", - "pokemon": "hattrem", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "32-48", - "weight": 4.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky", - "#minecraft:is_end" - ] - } - } - ] -} 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 deleted file mode 100644 index 4089f6422..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0858_hatterene.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "hatterene-1", - "pokemon": "hatterene", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "ultra-rare", - "level": "42-60", - "weight": 4.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky", - "#minecraft:is_end" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0864_cursola.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0864_cursola.json deleted file mode 100644 index 4f94e7d8d..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0864_cursola.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "cursola-1", - "pokemon": "cursola", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "seafloor", - "bucket": "rare", - "level": "38-55", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_warm_ocean" - ], - "timeRange": "night" - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0866_mrrime.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0866_mrrime.json deleted file mode 100644 index 184c6fad6..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0866_mrrime.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "mrrime-1", - "pokemon": "mrrime", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "32-46", - "weight": 0.2, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_taiga" - ] - } - } - ] -} 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 deleted file mode 100644 index 4750d98cc..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0871_pincurchin.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "pincurchin-1", - "pokemon": "pincurchin", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "rare", - "level": "38-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_warm_ocean" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0877_morpeko.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0877_morpeko.json deleted file mode 100644 index d0857bd78..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0877_morpeko.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "morpeko-1", - "pokemon": "morpeko", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "15-60", - "weight": 4.0, - "condition": { - "biomes": [ - "#cobblemon:is_grassland" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0917_tarountula.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0917_tarountula.json deleted file mode 100644 index 76a4ac907..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0917_tarountula.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "tarountula-1", - "pokemon": "tarountula", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-30", - "weight": 4.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0918_spidops.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0918_spidops.json deleted file mode 100644 index 7f444bf0c..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0918_spidops.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "spidops-1", - "pokemon": "spidops", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "15-60", - "weight": 4.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_forest" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0928_smoliv.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0928_smoliv.json deleted file mode 100644 index 4f564753d..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0928_smoliv.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "smoliv-1", - "pokemon": "smoliv", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "3-30", - "weight": 4.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0929_dolliv.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0929_dolliv.json deleted file mode 100644 index b26956b65..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0929_dolliv.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "dolliv-1", - "pokemon": "dolliv", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "25-40", - "weight": 4.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0930_arboliva.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0930_arboliva.json deleted file mode 100644 index a6efb318a..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0930_arboliva.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "arboliva-1", - "pokemon": "arboliva", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "36-60", - "weight": 4.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_savanna" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0938_tadbulb.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0938_tadbulb.json deleted file mode 100644 index 541d5b398..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0938_tadbulb.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "tadbulb-1", - "pokemon": "tadbulb", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-30", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp", - "#cobblemon:is_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0939_bellibolt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0939_bellibolt.json deleted file mode 100644 index 13992c5dd..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0939_bellibolt.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "bellibolt-1", - "pokemon": "bellibolt", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "25-60", - "weight": 10.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_swamp", - "#cobblemon:is_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index aa5bfb351..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0940_wattrel.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "wattrel-1", - "pokemon": "wattrel", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-32", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index c25238155..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0941_kilowattrel.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "kilowattrel-1", - "pokemon": "kilowattrel", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "25-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0946_bramblin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0946_bramblin.json deleted file mode 100644 index 5ee963990..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0946_bramblin.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "bramblin-1", - "pokemon": "bramblin", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-32", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0947_brambleghast.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0947_brambleghast.json deleted file mode 100644 index adae42c66..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0947_brambleghast.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "brambleghast-1", - "pokemon": "brambleghast", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "24-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0948_toedscool.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0948_toedscool.json deleted file mode 100644 index 9c16a7aad..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0948_toedscool.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "toedscool-1", - "pokemon": "toedscool", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "common", - "level": "4-32", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mushroom" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0949_toedscruel.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0949_toedscruel.json deleted file mode 100644 index 73569ecc0..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0949_toedscruel.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "toedscruel-1", - "pokemon": "toedscruel", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "30-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_mushroom" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0950_klawf.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0950_klawf.json deleted file mode 100644 index 413104cde..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0950_klawf.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "klawf-1", - "pokemon": "klawf", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "40-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0951_capsakid.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0951_capsakid.json deleted file mode 100644 index d1170b973..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0951_capsakid.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "capsakid-1", - "pokemon": "capsakid", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-40", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0952_scovillain.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0952_scovillain.json deleted file mode 100644 index 1271a857e..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0952_scovillain.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "scovillain-1", - "pokemon": "scovillain", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "30-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_badlands" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0953_rellor.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0953_rellor.json deleted file mode 100644 index a0ead5873..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0953_rellor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "rellor-1", - "pokemon": "rellor", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "5-40", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0954_rabsca.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0954_rabsca.json deleted file mode 100644 index b7766dc90..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0954_rabsca.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "rabsca-1", - "pokemon": "rabsca", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "25-50", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0960_wiglett.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0960_wiglett.json deleted file mode 100644 index cefcb1ca9..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0960_wiglett.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "wiglett-1", - "pokemon": "wiglett", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-32", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0961_wugtrio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0961_wugtrio.json deleted file mode 100644 index ea1239003..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0961_wugtrio.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "wugtrio-1", - "pokemon": "wugtrio", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "26-55", - "weight": 2.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index 36510a7fa..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0963_finizen.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "finizen-1", - "pokemon": "finizen", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "8-44", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_lukewarm_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index 7dae97b69..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0964_palafin.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "palafin-1", - "pokemon": "palafin", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "rare", - "level": "38-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_lukewarm_ocean" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0967_cyclizar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0967_cyclizar.json deleted file mode 100644 index e6f6e738a..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0967_cyclizar.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "cyclizar-1", - "pokemon": "cyclizar", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "30-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_temperate" - ] - } - } - ] -} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0968_orthworm.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0968_orthworm.json deleted file mode 100644 index 696a66dd3..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0968_orthworm.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "orthworm-1", - "pokemon": "orthworm", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "24-40", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "biomes": [ - "#cobblemon:is_desert" - ] - } - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 4f8bc40da..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0973_flamigo.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "flamigo-1", - "pokemon": "flamigo", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "30-60", - "weight": 9.0, - "condition": { - "canSeeSky": true, - "timeRange": "day", - "biomes": [ - "#cobblemon:is_swamp", - "#cobblemon:is_ocean" - ] - } - } - ] -} 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 deleted file mode 100644 index a522683a4..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0976_veluza.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "veluza-1", - "pokemon": "veluza", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "12-40", - "weight": 9.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_ocean" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0977_dondozo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0977_dondozo.json deleted file mode 100644 index 96d434160..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0977_dondozo.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "dondozo-1", - "pokemon": "dondozo", - "presets": [ - "water" - ], - "type": "pokemon", - "context": "submerged", - "bucket": "uncommon", - "level": "12-60", - "weight": 9.9, - "condition": { - "canSeeSky": true, - "biomes": [ - "#minecraft:is_ocean" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0981_farigiraf.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0981_farigiraf.json deleted file mode 100644 index 826220886..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0981_farigiraf.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "farigiraf-1", - "pokemon": "farigiraf", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "18-55", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_plains" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0982_dudunsparce.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0982_dudunsparce.json deleted file mode 100644 index 35f956160..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0982_dudunsparce.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "dudunsparce-1", - "pokemon": "dudunsparce", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-38", - "weight": 5.94, - "condition": { - "canSeeSky": false, - "biomes": [ - "#cobblemon:is_overworld" - ] - }, - "anticondition": { - "biomes": [ - "#cobblemon:is_abyss" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1012_poltchageist.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1012_poltchageist.json deleted file mode 100644 index faeba5639..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1012_poltchageist.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "poltchageist-1", - "pokemon": "poltchageist", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "rare", - "level": "24-60", - "weight": 4.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1013_sinistcha.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1013_sinistcha.json deleted file mode 100644 index 8aa9d2f82..000000000 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1013_sinistcha.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "enabled": true, - "neededInstalledMods": [], - "neededUninstalledMods": [], - "spawns": [ - { - "id": "sinistcha-1", - "pokemon": "sinistcha", - "presets": [ - "natural" - ], - "type": "pokemon", - "context": "grounded", - "bucket": "uncommon", - "level": "4-48", - "weight": 4.0, - "condition": { - "biomes": [ - "#cobblemon:is_spooky" - ] - } - } - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json index 90da91896..48e2709a8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json @@ -13,7 +13,7 @@ "context": "grounded", "bucket": "ultra-rare", "level": "70-75", - "weight": 0.01, + "weight": 0.008, "condition": { "biomes": [ "#minecraft:is_end" diff --git a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json b/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json deleted file mode 100644 index bb2b4f685..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation1/mrmime.json +++ /dev/null @@ -1,476 +0,0 @@ -{ - "implemented": true, - "name": "Mr. Mime", - "nationalPokedexNumber": 122, - "primaryType": "psychic", - "secondaryType": "fairy", - "abilities": [ - "soundproof", - "filter", - "h:technician" - ], - "baseStats": { - "hp": 40, - "attack": 45, - "defence": 65, - "special_attack": 100, - "special_defence": 120, - "speed": 90 - }, - "features": [ - "galarian" - ], - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Galar", - "primaryType": "ice", - "secondaryType": "psychic", - "abilities": [ - "vitalspirit", - "screencleaner", - "h:icebody" - ], - "baseStats": { - "hp": 50, - "attack": 65, - "defence": 65, - "special_attack": 90, - "special_defence": 90, - "speed": 100 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 161, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 25, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:batonpass", - "1:copycat", - "1:dazzlinggleam", - "1:encore", - "1:iceshard", - "1:lightscreen", - "1:mimic", - "1:mistyterrain", - "1:pound", - "1:protect", - "1:rapidspin", - "1:recycle", - "1:reflect", - "1:roleplay", - "1:safeguard", - "12:confusion", - "16:allyswitch", - "20:icywind", - "24:doublekick", - "28:psybeam", - "32:hypnosis", - "36:mirrorcoat", - "40:suckerpunch", - "44:freezedry", - "48:psychic", - "52:teeterdance", - "egg:confuseray", - "egg:fakeout", - "egg:powersplit", - "egg:tickle", - "tm:allyswitch", - "tm:attract", - "tm:avalanche", - "tm:batonpass", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:drainpunch", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fling", - "tm:focusblast", - "tm:foulplay", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:guardswap", - "tm:hail", - "tm:helpinghand", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:iciclespear", - "tm:icywind", - "tm:irondefense", - "tm:lightscreen", - "tm:magicroom", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mistyterrain", - "tm:nastyplot", - "tm:payback", - "tm:powerswap", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:round", - "tm:safeguard", - "tm:screech", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:taunt", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:confusion", - "tutor:copycat", - "tutor:encore", - "tutor:expandingforce", - "tutor:iceshard", - "tutor:tripleaxel" - ], - "labels": [ - "gen8", - "galar_regional" - ], - "aspects": [ - "galarian" - ], - "height": 14, - "weight": 568, - "preEvolution": "mimejr", - "evolutions": [ - { - "id": "mrmime_mrrime", - "variant": "level_up", - "result": "mrrime", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 42 - } - ] - } - ], - "cannotDynamax": false, - "battleOnly": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:aspear_berry", - "percentage": 5.0 - } - ] - } - } - ], - "baseExperienceYield": 161, - "experienceGroup": "medium_fast", - "eggCycles": 25, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:barrier", - "1:batonpass", - "1:copycat", - "1:encore", - "1:guardswap", - "1:magicalleaf", - "1:mistyterrain", - "1:pound", - "1:powerswap", - "1:quickguard", - "1:wideguard", - "8:meditate", - "11:doubleslap", - "12:confusion", - "15:psywave", - "16:roleplay", - "20:protect", - "24:recycle", - "28:psybeam", - "29:substitute", - "32:mimic", - "36:lightscreen", - "36:reflect", - "36:safeguard", - "36:trick", - "40:suckerpunch", - "44:dazzlinggleam", - "48:psychic", - "52:teeterdance", - "egg:confuseray", - "egg:fakeout", - "egg:futuresight", - "egg:hypnosis", - "egg:icywind", - "egg:magicroom", - "egg:mimic", - "egg:nastyplot", - "egg:powersplit", - "egg:psychicterrain", - "egg:psychup", - "egg:teeterdance", - "egg:tickle", - "egg:trick", - "egg:wakeupslap", - "tm:aerialace", - "tm:allyswitch", - "tm:attract", - "tm:batonpass", - "tm:bodyslam", - "tm:brickbreak", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:dazzlinggleam", - "tm:doubleteam", - "tm:drainpunch", - "tm:dreameater", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:firepunch", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:guardswap", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icepunch", - "tm:icywind", - "tm:infestation", - "tm:irondefense", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:nastyplot", - "tm:naturalgift", - "tm:payback", - "tm:powerswap", - "tm:poweruppunch", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:skillswap", - "tm:sleeptalk", - "tm:snatch", - "tm:snore", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:taunt", - "tm:telekinesis", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:attract", - "tutor:barrier", - "tutor:batonpass", - "tutor:bide", - "tutor:bodyslam", - "tutor:brickbreak", - "tutor:calmmind", - "tutor:confusion", - "tutor:counter", - "tutor:covet", - "tutor:curse", - "tutor:dazzlinggleam", - "tutor:doubleedge", - "tutor:doubleslap", - "tutor:doubleteam", - "tutor:drainpunch", - "tutor:dreameater", - "tutor:dynamicpunch", - "tutor:encore", - "tutor:endure", - "tutor:expandingforce", - "tutor:facade", - "tutor:firepunch", - "tutor:flash", - "tutor:focuspunch", - "tutor:followme", - "tutor:foulplay", - "tutor:frustration", - "tutor:futuresight", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:hypnosis", - "tutor:icepunch", - "tutor:icywind", - "tutor:irondefense", - "tutor:lightscreen", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:meditate", - "tutor:megakick", - "tutor:megapunch", - "tutor:metronome", - "tutor:mimic", - "tutor:mudslap", - "tutor:nightmare", - "tutor:pound", - "tutor:protect", - "tutor:psybeam", - "tutor:psychic", - "tutor:psychup", - "tutor:psywave", - "tutor:rage", - "tutor:recycle", - "tutor:reflect", - "tutor:rest", - "tutor:return", - "tutor:roleplay", - "tutor:safeguard", - "tutor:seismictoss", - "tutor:shadowball", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:skullbash", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:solarbeam", - "tutor:submission", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", - "tutor:takedown", - "tutor:taunt", - "tutor:teeterdance", - "tutor:telekinesis", - "tutor:teleport", - "tutor:thief", - "tutor:thunder", - "tutor:thunderbolt", - "tutor:thunderpunch", - "tutor:thunderwave", - "tutor:toxic", - "tutor:trick", - "tutor:wonderroom", - "tutor:zapcannon", - "tutor:zenheadbutt" - ], - "labels": [ - "gen1", - "kanto_regional" - ], - "pokedex": [ - "cobblemon.species.mrmime.desc" - ], - "preEvolution": "mimejr", - "baseScale": 0.7, - "hitbox": { - "width": 0.8, - "height": 1.8, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 13, - "weight": 545, - "aspects": [], - "evolutions": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:light_clay", - "percentage": 5.0 - }, - { - "item": "cobblemon:babiri_berry", - "percentage": 5.0 - } - ] - } -} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json deleted file mode 100644 index c73032b4f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json +++ /dev/null @@ -1,2053 +0,0 @@ -{ - "implemented": true, - "name": "Pikachu", - "nationalPokedexNumber": 25, - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:light_ball", - "percentage": 5.0 - }, - { - "item": "cobblemon:thunder_stone", - "percentage": 5.0 - }, - { - "item": "cobblemon:oran_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "features": [ - "alolan", - "region_bias" - ], - "behaviour": { - "moving": { - "walk": { - "walkSpeed": 0.42 - } - }, - "resting": { - "canSleep": true, - "willSleepOnBed": true, - "depth": "normal", - "light": "0-4" - } - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": true, - "forms": [ - { - "name": "Cosplay", - "primaryType": "electric", - "abilities": [ - "lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 0, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:tailwhip", - "1:thundershock", - "5:growl", - "7:playnice", - "10:quickattack", - "13:electroball", - "18:thunderwave", - "21:feint", - "23:doubleteam", - "26:spark", - "29:nuzzle", - "34:discharge", - "37:slam", - "42:thunderbolt", - "45:agility", - "50:wildcharge", - "53:lightscreen", - "58:thunder", - "tm:attract", - "tm:brickbreak", - "tm:chargebeam", - "tm:confide", - "tm:dig", - "tm:doubleteam", - "tm:echoedvoice", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:frustration", - "tm:grassknot", - "tm:hiddenpower", - "tm:lightscreen", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:strength", - "tm:substitute", - "tm:swagger", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:voltswitch", - "tm:wildcharge", - "tutor:covet", - "tutor:electroball", - "tutor:electroweb", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:magnetrise", - "tutor:quickattack", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:thunderpunch", - "tutor:thundershock", - "tutor:thunderwave" - ], - "labels": [ - "gen6" - ], - "aspects": [ - "cosplay" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Rock-Star", - "primaryType": "electric", - "abilities": [ - "lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 0, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "form_change:meteormash" - ], - "labels": [ - "gen6" - ], - "aspects": [ - "rock-star" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Belle", - "primaryType": "electric", - "abilities": [ - "lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 0, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "form_change:iciclecrash" - ], - "labels": [ - "gen6" - ], - "aspects": [ - "belle" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Pop-Star", - "primaryType": "electric", - "abilities": [ - "lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 0, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "form_change:drainingkiss" - ], - "labels": [ - "gen6" - ], - "aspects": [ - "pop-star" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "PhD", - "primaryType": "electric", - "abilities": [ - "lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 0, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "form_change:electricterrain" - ], - "labels": [ - "gen6" - ], - "aspects": [ - "phd" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Libre", - "primaryType": "electric", - "abilities": [ - "lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 0, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "form_change:flyingpress" - ], - "labels": [ - "gen6" - ], - "aspects": [ - "libre" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Original", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 1, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:charm", - "1:growl", - "1:nastyplot", - "1:nuzzle", - "1:playnice", - "1:quickattack", - "1:sweetkiss", - "1:tailwhip", - "1:thundershock", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "50:wildcharge", - "egg:charge", - "egg:disarmingvoice", - "egg:fakeout", - "egg:flail", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:uproar", - "tm:upperhand", - "tm:voltswitch", - "tm:wildcharge", - "tutor:agility", - "tutor:covet", - "tutor:electroweb", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:magnetrise", - "tutor:quickattack", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:thunder", - "tutor:thunderbolt", - "tutor:thunderpunch", - "tutor:volttackle" - ], - "labels": [ - "gen7" - ], - "aspects": [ - "original" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Hoenn", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 1, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:charm", - "1:growl", - "1:nastyplot", - "1:nuzzle", - "1:playnice", - "1:quickattack", - "1:sweetkiss", - "1:tailwhip", - "1:thundershock", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "50:wildcharge", - "egg:charge", - "egg:disarmingvoice", - "egg:fakeout", - "egg:flail", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:covet", - "tutor:electroweb", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:magnetrise", - "tutor:quickattack", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:thunder", - "tutor:thunderbolt", - "tutor:thunderpunch", - "tutor:volttackle" - ], - "labels": [ - "gen7" - ], - "aspects": [ - "hoenn" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Sinnoh", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 1, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:charm", - "1:growl", - "1:nastyplot", - "1:nuzzle", - "1:playnice", - "1:quickattack", - "1:sweetkiss", - "1:tailwhip", - "1:thundershock", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "50:wildcharge", - "egg:charge", - "egg:disarmingvoice", - "egg:fakeout", - "egg:flail", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:covet", - "tutor:electroweb", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:magnetrise", - "tutor:quickattack", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:thunderbolt", - "tutor:thunderpunch", - "tutor:volttackle" - ], - "labels": [ - "gen7" - ], - "aspects": [ - "sinnoh" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Unova", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 1, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:charm", - "1:growl", - "1:nastyplot", - "1:nuzzle", - "1:playnice", - "1:quickattack", - "1:sweetkiss", - "1:tailwhip", - "1:thundershock", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "50:wildcharge", - "egg:charge", - "egg:disarmingvoice", - "egg:fakeout", - "egg:flail", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:covet", - "tutor:electroweb", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:magnetrise", - "tutor:quickattack", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:thunderbolt", - "tutor:thunderpunch", - "tutor:volttackle" - ], - "labels": [ - "gen7" - ], - "aspects": [ - "unova" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Kalos", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 1, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:charm", - "1:growl", - "1:nastyplot", - "1:nuzzle", - "1:playnice", - "1:quickattack", - "1:sweetkiss", - "1:tailwhip", - "1:thundershock", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "50:wildcharge", - "egg:charge", - "egg:disarmingvoice", - "egg:fakeout", - "egg:flail", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:covet", - "tutor:electroball", - "tutor:electroweb", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:magnetrise", - "tutor:quickattack", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:thunderbolt", - "tutor:thunderpunch", - "tutor:volttackle" - ], - "labels": [ - "gen7" - ], - "aspects": [ - "kalos" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Alola", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 1, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:charm", - "1:growl", - "1:nastyplot", - "1:nuzzle", - "1:playnice", - "1:quickattack", - "1:sweetkiss", - "1:tailwhip", - "1:thundershock", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "50:wildcharge", - "egg:charge", - "egg:disarmingvoice", - "egg:fakeout", - "egg:flail", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:covet", - "tutor:electroball", - "tutor:electroweb", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:magnetrise", - "tutor:quickattack", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:thunderbolt", - "tutor:thunderpunch", - "tutor:volttackle" - ], - "labels": [ - "gen7", - "alola_regional" - ], - "aspects": [ - "alola" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Partner", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 1, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:charm", - "1:growl", - "1:nastyplot", - "1:nuzzle", - "1:playnice", - "1:quickattack", - "1:sweetkiss", - "1:tailwhip", - "1:thundershock", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "50:wildcharge", - "egg:charge", - "egg:disarmingvoice", - "egg:fakeout", - "egg:flail", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:covet", - "tutor:electroweb", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:magnetrise", - "tutor:quickattack", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:thunder", - "tutor:thunderbolt", - "tutor:thunderpunch", - "tutor:volttackle" - ], - "labels": [ - "gen7" - ], - "aspects": [ - "partner" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Starter", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 45, - "attack": 80, - "defence": 50, - "special_attack": 75, - "special_defence": 60, - "speed": 120 - }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:growl", - "1:thundershock", - "3:tailwhip", - "6:quickattack", - "9:doublekick", - "12:doubleteam", - "15:thunderwave", - "18:lightscreen", - "21:thunderbolt", - "24:slam", - "27:agility", - "30:thunder", - "tm:brickbreak", - "tm:calmmind", - "tm:dig", - "tm:facade", - "tm:headbutt", - "tm:helpinghand", - "tm:irontail", - "tm:lightscreen", - "tm:payday", - "tm:protect", - "tm:reflect", - "tm:rest", - "tm:seismictoss", - "tm:substitute", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tutor:agility", - "tutor:brickbreak", - "tutor:calmmind", - "tutor:dig", - "tutor:doublekick", - "tutor:doubleteam", - "tutor:facade", - "tutor:floatyfall", - "tutor:growl", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:irontail", - "tutor:lightscreen", - "tutor:payday", - "tutor:pikapapow", - "tutor:protect", - "tutor:quickattack", - "tutor:reflect", - "tutor:rest", - "tutor:seismictoss", - "tutor:slam", - "tutor:splishysplash", - "tutor:substitute", - "tutor:tailwhip", - "tutor:thunder", - "tutor:thunderbolt", - "tutor:thunderpunch", - "tutor:thundershock", - "tutor:thunderwave", - "tutor:toxic", - "tutor:zippyzap" - ], - "labels": [ - "gen7" - ], - "aspects": [ - "starter" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Gmax", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "field", - "fairy" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 210, - "weight": 0, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "World", - "primaryType": "electric", - "abilities": [ - "static", - "h:lightningrod" - ], - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 50, - "special_defence": 50, - "speed": 90 - }, - "catchRate": 190, - "maleRatio": 1, - "baseExperienceYield": 112, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:charm", - "1:growl", - "1:nastyplot", - "1:nuzzle", - "1:playnice", - "1:quickattack", - "1:sweetkiss", - "1:tailwhip", - "1:thundershock", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "egg:charge", - "egg:disarmingvoice", - "egg:fakeout", - "egg:flail", - "egg:present", - "egg:tickle", - "egg:wish", - "tm:agility", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:chargebeam", - "tm:charm", - "tm:dig", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:grassknot", - "tm:helpinghand", - "tm:irontail", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:trailblaze", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:electroweb", - "tutor:irontail", - "tutor:quickattack", - "tutor:risingvoltage", - "tutor:thunderbolt", - "tutor:volttackle" - ], - "labels": [ - "gen8" - ], - "aspects": [ - "world" - ], - "height": 4, - "weight": 60, - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Alola Bias", - "maleRatio": 0.5, - "labels": [ - "alola_regional" - ], - "aspects": [ - "region-bias-alola" - ], - "evolutions": [ - { - "id": "alola_pikachu_raichu", - "variant": "item_interact", - "result": "raichu alolan=false", - "consumeHeldItem": false, - "learnableMoves": [ - "thunderpunch" - ], - "requirements": [ - { - "variant": "biome", - "biomeCondition": "#cobblemon:is_forest" - }, - { - "variant": "biome", - "biomeAnticondition": "#cobblemon:is_spooky" - } - ], - "requiredContext": "cobblemon:thunder_stone" - }, - { - "id": "alola_pikachu_alola_raichu", - "variant": "item_interact", - "result": "raichu alolan", - "consumeHeldItem": false, - "learnableMoves": [ - "psychic" - ], - "requirements": [], - "requiredContext": "cobblemon:thunder_stone" - } - ] - } - ], - "baseExperienceYield": 112, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "field", - "fairy" - ], - "moves": [ - "1:charm", - "1:growl", - "1:nastyplot", - "1:nuzzle", - "1:playnice", - "1:quickattack", - "1:sweetkiss", - "1:tailwhip", - "1:thundershock", - "4:thunderwave", - "8:doubleteam", - "12:electroball", - "16:feint", - "20:spark", - "24:agility", - "28:irontail", - "28:slam", - "32:discharge", - "36:thunderbolt", - "40:lightscreen", - "44:thunder", - "50:wildcharge", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:captivate", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:drainingkiss", - "tm:echoedvoice", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:nastyplot", - "tm:naturalgift", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:rocksmash", - "tm:round", - "tm:secretpower", - "tm:shockwave", - "tm:sleeptalk", - "tm:snore", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:agility", - "tutor:attract", - "tutor:bestow", - "tutor:bide", - "tutor:bodyslam", - "tutor:brickbreak", - "tutor:calmmind", - "tutor:charm", - "tutor:counter", - "tutor:covet", - "tutor:curse", - "tutor:defensecurl", - "tutor:detect", - "tutor:dig", - "tutor:discharge", - "tutor:doubleedge", - "tutor:doublekick", - "tutor:doubleteam", - "tutor:dynamicpunch", - "tutor:electroball", - "tutor:electroweb", - "tutor:encore", - "tutor:endeavor", - "tutor:endure", - "tutor:extremespeed", - "tutor:facade", - "tutor:fakeout", - "tutor:feint", - "tutor:flash", - "tutor:focuspunch", - "tutor:frustration", - "tutor:grassknot", - "tutor:growl", - "tutor:happyhour", - "tutor:headbutt", - "tutor:heartstamp", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:holdhands", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:lastresort", - "tutor:lightscreen", - "tutor:magnetrise", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mudslap", - "tutor:nuzzle", - "tutor:payday", - "tutor:protect", - "tutor:rage", - "tutor:raindance", - "tutor:reflect", - "tutor:refresh", - "tutor:rest", - "tutor:return", - "tutor:risingvoltage", - "tutor:rollout", - "tutor:seismictoss", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sing", - "tutor:skullbash", - "tutor:slam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:strength", - "tutor:submission", - "tutor:substitute", - "tutor:swagger", - "tutor:sweetkiss", - "tutor:sweetscent", - "tutor:swift", - "tutor:tailwhip", - "tutor:takedown", - "tutor:teeterdance", - "tutor:thunderpunch", - "tutor:thunderwave", - "tutor:toxic", - "tutor:voltswitch", - "tutor:volttackle", - "tutor:wish", - "tutor:yawn", - "tutor:zapcannon" - ], - "labels": [ - "gen1", - "kanto_regional" - ], - "pokedex": [ - "cobblemon.species.pikachu.desc" - ], - "preEvolution": "pichu", - "evolutions": [ - { - "id": "pikachu_alola_raichu", - "variant": "item_interact", - "result": "raichu alolan", - "consumeHeldItem": false, - "learnableMoves": [ - "psychic" - ], - "requirements": [ - { - "variant": "biome", - "biomeCondition": "#cobblemon:evolution/alolan" - }, - { - "variant": "biome", - "biomeAnticondition": "#minecraft:is_freezing" - } - ], - "requiredContext": "cobblemon:thunder_stone" - }, - { - "id": "pikachu_raichu", - "variant": "item_interact", - "result": "raichu alolan=false", - "consumeHeldItem": false, - "learnableMoves": [ - "thunderpunch" - ], - "requirements": [], - "requiredContext": "cobblemon:thunder_stone" - } - ], - "baseScale": 0.5, - "hitbox": { - "width": 0.7, - "height": 1.3, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 4, - "weight": 60, - "aspects": [], - "cannotDynamax": false -} diff --git a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json b/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json deleted file mode 100644 index df0d62bc1..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/azumarill.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "name": "Azumarill", - "nationalPokedexNumber": 184, - "primaryType": "water", - "secondaryType": "fairy", - "abilities": [ - "thickfat", - "hugepower", - "h:sapsipper" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:kebia_berry", - "percentage": 10.0 - } - ] - }, - "baseStats": { - "hp": 100, - "attack": 50, - "defence": 80, - "special_attack": 60, - "special_defence": 80, - "speed": 50 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 210, - "experienceGroup": "fast", - "eggCycles": 10, - "eggGroups": [ - "water_1", - "fairy" - ], - "moves": [ - "1:defensecurl", - "1:helpinghand", - "1:rollout", - "1:tackle", - "1:tailwhip", - "1:watergun", - "1:watersport", - "6:bubblebeam", - "7:bubble", - "9:charm", - "12:slam", - "15:bounce", - "21:aquatail", - "25:playrough", - "30:aquaring", - "35:raindance", - "40:hydropump", - "45:doubleedge", - "50:superpower", - "tm:alluringvoice", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:bounce", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:drainingkiss", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icepunch", - "tm:icespinner", - "tm:icywind", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:liquidation", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:naturalgift", - "tm:playrough", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:strength", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:uproar", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tm:workup", - "tutor:aquatail", - "tutor:attract", - "tutor:blizzard", - "tutor:bodyslam", - "tutor:bounce", - "tutor:bubblebeam", - "tutor:covet", - "tutor:curse", - "tutor:defensecurl", - "tutor:dive", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:focuspunch", - "tutor:frustration", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:hypervoice", - "tutor:icepunch", - "tutor:icywind", - "tutor:irontail", - "tutor:knockoff", - "tutor:liquidation", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mistyexplosion", - "tutor:mudslap", - "tutor:protect", - "tutor:raindance", - "tutor:rest", - "tutor:return", - "tutor:rocksmash", - "tutor:rollout", - "tutor:seismictoss", - "tutor:sleeptalk", - "tutor:snore", - "tutor:steelroller", - "tutor:strength", - "tutor:substitute", - "tutor:superpower", - "tutor:surf", - "tutor:swagger", - "tutor:swift", - "tutor:tackle", - "tutor:tailwhip", - "tutor:toxic", - "tutor:waterfall", - "tutor:watergun", - "tutor:waterpulse", - "tutor:whirlpool" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.azumarill.desc" - ], - "preEvolution": "marill", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 8, - "weight": 285, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 883981453..b587abdd9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/celebi.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/celebi.json @@ -1,10 +1,26 @@ { - "name": "Celebi", + "implemented": true, "nationalPokedexNumber": 251, + "name": "Celebi", "primaryType": "psychic", "secondaryType": "grass", + "maleRatio": -1, + "height": 6, + "weight": 50, + "pokedex": [ + "cobblemon.species.celebi.desc" + ], + "labels": [ + "gen2", + "mythical" + ], + "aspects": [], "abilities": [ - "naturalcure" + "naturalcure", + "h:naturalcure" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,6 +30,25 @@ "special_defence": 100, "speed": 100 }, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 300, + "experienceGroup": "medium_slow", + "catchRate": 45, + "eggCycles": 120, + "baseFriendship": 100, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 1, "entries": [ @@ -22,26 +57,16 @@ } ] }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 300, - "experienceGroup": "medium_slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], "moves": [ "1:confusion", "1:healbell", + "1:healblock", + "1:naturalgift", "10:magicalleaf", - "10:safeguard", "20:batonpass", "30:ancientpower", "40:lifedew", - "46:naturalgift", "50:leechseed", - "55:healblock", "60:recover", "70:futuresight", "80:healingwish", @@ -49,38 +74,43 @@ "100:perishsong", "tm:aerialace", "tm:allyswitch", + "tm:ancientpower", "tm:aurasphere", "tm:batonpass", "tm:calmmind", "tm:chargebeam", - "tm:confide", "tm:cut", "tm:dazzlinggleam", - "tm:doubleteam", "tm:dreameater", + "tm:dualwingbeat", "tm:earthpower", "tm:echoedvoice", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", "tm:flash", "tm:fling", - "tm:frustration", "tm:futuresight", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:imprison", + "tm:laserfocus", + "tm:lastresort", "tm:leafblade", "tm:leafstorm", "tm:lightscreen", "tm:magicalleaf", + "tm:magiccoat", "tm:magicroom", "tm:metronome", + "tm:mudslap", "tm:nastyplot", "tm:naturalgift", "tm:naturepower", @@ -93,28 +123,27 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", "tm:sandstorm", - "tm:secretpower", "tm:seedbomb", "tm:shadowball", "tm:shockwave", + "tm:signalbeam", "tm:silverwind", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:solarblade", "tm:stealthrock", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:swordsdance", + "tm:synthesis", + "tm:telekinesis", + "tm:terablast", "tm:thunderwave", - "tm:toxic", "tm:trick", "tm:trickroom", "tm:uproar", @@ -122,108 +151,98 @@ "tm:waterpulse", "tm:weatherball", "tm:wonderroom", + "tm:worryseed", "tm:zenheadbutt", + "tutor:aerialace", "tutor:allyswitch", "tutor:ancientpower", - "tutor:batonpass", - "tutor:confusion", - "tutor:curse", - "tutor:defensecurl", - "tutor:detect", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dreameater", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", "tutor:dualwingbeat", "tutor:earthpower", - "tutor:endure", + "tutor:energyball", "tutor:expandingforce", - "tutor:flash", - "tutor:frustration", - "tutor:futuresight", "tutor:gigadrain", + "tutor:gigaimpact", "tutor:grassyglide", "tutor:healbell", - "tutor:healingwish", "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:holdback", "tutor:hyperbeam", "tutor:laserfocus", "tutor:lastresort", - "tutor:leafstorm", - "tutor:leechseed", - "tutor:lifedew", "tutor:magicalleaf", "tutor:magiccoat", "tutor:magicroom", - "tutor:metronome", - "tutor:mimic", "tutor:mudslap", - "tutor:nastyplot", - "tutor:nightmare", - "tutor:perishsong", - "tutor:protect", "tutor:psychic", - "tutor:psychup", - "tutor:raindance", - "tutor:recover", + "tutor:psychocut", "tutor:rest", - "tutor:return", - "tutor:safeguard", - "tutor:sandstorm", "tutor:seedbomb", "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", "tutor:skillswap", "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", "tutor:stealthrock", - "tutor:substitute", "tutor:suckerpunch", - "tutor:sunnyday", - "tutor:swagger", - "tutor:sweetscent", "tutor:swift", - "tutor:swordsdance", "tutor:synthesis", "tutor:telekinesis", - "tutor:toxic", "tutor:trick", "tutor:uproar", "tutor:waterpulse", "tutor:wonderroom", "tutor:worryseed", - "tutor:zenheadbutt" - ], - "labels": [ - "gen2", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.celebi.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:curse", + "legacy:defensecurl", + "legacy:detect", + "legacy:doubleedge", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:nightmare", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:sweetscent", + "legacy:toxic", + "special:holdback" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 100, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 50, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "celebi", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json b/common/src/main/resources/data/cobblemon/species/generation2/corsola.json deleted file mode 100644 index 50d7d0538..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/corsola.json +++ /dev/null @@ -1,375 +0,0 @@ -{ - "name": "Corsola", - "nationalPokedexNumber": 222, - "primaryType": "water", - "secondaryType": "rock", - "abilities": [ - "hustle", - "naturalcure", - "h:regenerator" - ], - "baseStats": { - "hp": 65, - "attack": 55, - "defence": 95, - "special_attack": 65, - "special_defence": 95, - "speed": 35 - }, - "features": [ - "galarian" - ], - "catchRate": 60, - "maleRatio": 0.25, - "shoulderMountable": false, - "forms": [ - { - "name": "Galar", - "primaryType": "ghost", - "abilities": [ - "weakarmor", - "h:cursedbody" - ], - "baseStats": { - "hp": 60, - "attack": 55, - "defence": 100, - "special_attack": 65, - "special_defence": 100, - "speed": 30 - }, - "catchRate": 60, - "maleRatio": 0.25, - "baseExperienceYield": 144, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "water_3" - ], - "moves": [ - "1:harden", - "1:tackle", - "5:astonish", - "10:disable", - "15:spite", - "20:ancientpower", - "25:hex", - "30:curse", - "35:strengthsap", - "40:powergem", - "45:nightshade", - "50:grudge", - "55:mirrorcoat", - "egg:confuseray", - "egg:destinybond", - "egg:haze", - "egg:headsmash", - "egg:naturepower", - "egg:waterpulse", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:calmmind", - "tm:dig", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:gigadrain", - "tm:hail", - "tm:hex", - "tm:hydropump", - "tm:icebeam", - "tm:iciclespear", - "tm:icywind", - "tm:irondefense", - "tm:lightscreen", - "tm:liquidation", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:rockblast", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scald", - "tm:screech", - "tm:selfdestruct", - "tm:shadowball", - "tm:sleeptalk", - "tm:snore", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:throatchop", - "tm:whirlpool", - "tm:willowisp", - "tutor:astonish", - "tutor:disable", - "tutor:meteorbeam", - "tutor:spite", - "tutor:tackle" - ], - "labels": [ - "gen8", - "galar_regional" - ], - "aspects": [ - "galarian" - ], - "height": 6, - "weight": 5, - "evolutions": [ - { - "id": "corsola_cursola", - "variant": "level_up", - "result": "cursola", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 38 - } - ] - } - ], - "cannotDynamax": false, - "battleOnly": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:kasib_berry", - "percentage": 2.5 - } - ] - } - } - ], - "baseExperienceYield": 144, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "water_3" - ], - "moves": [ - "1:harden", - "1:tackle", - "4:bubble", - "5:watergun", - "10:aquaring", - "13:refresh", - "15:endure", - "20:ancientpower", - "20:spikecannon", - "23:luckychant", - "25:bubblebeam", - "27:brine", - "29:irondefense", - "30:flail", - "31:rockblast", - "35:lifedew", - "40:powergem", - "45:earthpower", - "50:recover", - "55:mirrorcoat", - "egg:amnesia", - "egg:aquaring", - "egg:barrier", - "egg:bide", - "egg:camouflage", - "egg:confuseray", - "egg:curse", - "egg:headsmash", - "egg:iciclespear", - "egg:ingrain", - "egg:liquidation", - "egg:mist", - "egg:naturepower", - "egg:rockslide", - "egg:screech", - "egg:waterpulse", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:calmmind", - "tm:captivate", - "tm:confide", - "tm:dig", - "tm:doubleteam", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:frustration", - "tm:hail", - "tm:hiddenpower", - "tm:hydropump", - "tm:icebeam", - "tm:iciclespear", - "tm:icywind", - "tm:irondefense", - "tm:lightscreen", - "tm:liquidation", - "tm:naturalgift", - "tm:naturepower", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scald", - "tm:screech", - "tm:secretpower", - "tm:selfdestruct", - "tm:shadowball", - "tm:sleeptalk", - "tm:snore", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:throatchop", - "tm:toxic", - "tm:waterpulse", - "tm:whirlpool", - "tutor:amnesia", - "tutor:ancientpower", - "tutor:attract", - "tutor:bodyslam", - "tutor:bubble", - "tutor:bubblebeam", - "tutor:confuseray", - "tutor:curse", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:earthpower", - "tutor:earthquake", - "tutor:endeavor", - "tutor:endure", - "tutor:explosion", - "tutor:frustration", - "tutor:harden", - "tutor:headbutt", - "tutor:hiddenpower", - "tutor:icywind", - "tutor:irondefense", - "tutor:liquidation", - "tutor:magiccoat", - "tutor:meteorbeam", - "tutor:mimic", - "tutor:mirrorcoat", - "tutor:mist", - "tutor:mudslap", - "tutor:mudsport", - "tutor:powergem", - "tutor:protect", - "tutor:psychic", - "tutor:raindance", - "tutor:recover", - "tutor:rest", - "tutor:return", - "tutor:rockslide", - "tutor:rocksmash", - "tutor:rollout", - "tutor:safeguard", - "tutor:sandstorm", - "tutor:screech", - "tutor:selfdestruct", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spikecannon", - "tutor:stealthrock", - "tutor:stompingtantrum", - "tutor:strength", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:sunnyday", - "tutor:surf", - "tutor:swagger", - "tutor:tackle", - "tutor:throatchop", - "tutor:toxic", - "tutor:waterpulse", - "tutor:whirlpool" - ], - "labels": [ - "gen2", - "johto_regional" - ], - "pokedex": [ - "cobblemon.species.corsola.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 6, - "weight": 50, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:rindo_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/delibird.json b/common/src/main/resources/data/cobblemon/species/generation2/delibird.json deleted file mode 100644 index 3f2b901ec..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/delibird.json +++ /dev/null @@ -1,221 +0,0 @@ -{ - "name": "Delibird", - "nationalPokedexNumber": 225, - "primaryType": "ice", - "secondaryType": "flying", - "abilities": [ - "vitalspirit", - "hustle", - "h:insomnia" - ], - "baseStats": { - "hp": 45, - "attack": 55, - "defence": 45, - "special_attack": 65, - "special_defence": 45, - "speed": 75 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 116, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "field" - ], - "moves": [ - "1:present", - "25:drillpeck", - "egg:aurorabeam", - "egg:auroraveil", - "egg:bestow", - "egg:counter", - "egg:destinybond", - "egg:fakeout", - "egg:freezedry", - "egg:futuresight", - "egg:iceball", - "egg:icepunch", - "egg:iceshard", - "egg:icywind", - "egg:memento", - "egg:quickattack", - "egg:rapidspin", - "egg:spikes", - "egg:splash", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:assurance", - "tm:attract", - "tm:auroraveil", - "tm:avalanche", - "tm:batonpass", - "tm:blizzard", - "tm:bodyslam", - "tm:bounce", - "tm:bravebird", - "tm:brickbreak", - "tm:brutalswing", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:defog", - "tm:doubleteam", - "tm:drillrun", - "tm:dualwingbeat", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fling", - "tm:fly", - "tm:focuspunch", - "tm:foulplay", - "tm:frostbreath", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:gunkshot", - "tm:hail", - "tm:haze", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:icespinner", - "tm:iciclespear", - "tm:icywind", - "tm:megakick", - "tm:megapunch", - "tm:naturalgift", - "tm:pluck", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:recycle", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:spikes", - "tm:steelwing", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:trailblaze", - "tm:tripleaxel", - "tm:waterpulse", - "tm:weatherball", - "tutor:attract", - "tutor:aurorabeam", - "tutor:blizzard", - "tutor:bodyslam", - "tutor:bounce", - "tutor:counter", - "tutor:curse", - "tutor:defog", - "tutor:detect", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dualwingbeat", - "tutor:endure", - "tutor:fly", - "tutor:focuspunch", - "tutor:frustration", - "tutor:futuresight", - "tutor:gunkshot", - "tutor:happyhour", - "tutor:headbutt", - "tutor:hiddenpower", - "tutor:icepunch", - "tutor:iceshard", - "tutor:icywind", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mudslap", - "tutor:present", - "tutor:protect", - "tutor:quickattack", - "tutor:raindance", - "tutor:rapidspin", - "tutor:recycle", - "tutor:rest", - "tutor:return", - "tutor:rollout", - "tutor:seedbomb", - "tutor:seismictoss", - "tutor:signalbeam", - "tutor:skyattack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:splash", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:thief", - "tutor:toxic", - "tutor:tripleaxel", - "tutor:waterpulse" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.delibird.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 9, - "weight": 160, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-2" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:charti_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json b/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json deleted file mode 100644 index b5def8573..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/dunsparce.json +++ /dev/null @@ -1,288 +0,0 @@ -{ - "name": "Dunsparce", - "nationalPokedexNumber": 206, - "primaryType": "normal", - "abilities": [ - "serenegrace", - "runaway", - "h:rattled" - ], - "baseStats": { - "hp": 100, - "attack": 70, - "defence": 70, - "special_attack": 65, - "special_defence": 65, - "speed": 45 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 145, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:defensecurl", - "1:flail", - "1:rage", - "4:mudslap", - "6:spite", - "8:pursuit", - "8:rollout", - "12:glare", - "16:screech", - "20:ancientpower", - "24:drillrun", - "28:yawn", - "31:dig", - "32:bodyslam", - "32:hyperdrill", - "36:roost", - "36:takedown", - "40:dragonrush", - "41:airslash", - "44:coil", - "46:endure", - "48:doubleedge", - "52:endeavor", - "egg:agility", - "egg:ancientpower", - "egg:aquatail", - "egg:astonish", - "egg:bide", - "egg:bite", - "egg:curse", - "egg:headbutt", - "egg:hex", - "egg:lastresort", - "egg:magiccoat", - "egg:rockslide", - "egg:secretpower", - "egg:sleeptalk", - "egg:snore", - "egg:trumpcard", - "tm:agility", - "tm:airslash", - "tm:amnesia", - "tm:attract", - "tm:batonpass", - "tm:blizzard", - "tm:bodyslam", - "tm:breakingswipe", - "tm:bulldoze", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:chillingwater", - "tm:confide", - "tm:curse", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:dreameater", - "tm:drillrun", - "tm:earthpower", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:frustration", - "tm:gigaimpact", - "tm:gyroball", - "tm:helpinghand", - "tm:hex", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icespinner", - "tm:incinerate", - "tm:irontail", - "tm:lunge", - "tm:mudshot", - "tm:mudslap", - "tm:naturalgift", - "tm:painsplit", - "tm:poisonjab", - "tm:poisontail", - "tm:pounce", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:round", - "tm:sandstorm", - "tm:scaleshot", - "tm:scaryface", - "tm:screech", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:skittersmack", - "tm:sleeptalk", - "tm:smartstrike", - "tm:snore", - "tm:solarbeam", - "tm:spite", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:uproar", - "tm:waterpulse", - "tm:wildcharge", - "tm:zenheadbutt", - "tutor:ancientpower", - "tutor:aquatail", - "tutor:attract", - "tutor:bide", - "tutor:bind", - "tutor:bite", - "tutor:bodyslam", - "tutor:counter", - "tutor:curse", - "tutor:defensecurl", - "tutor:dig", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dreameater", - "tutor:drillrun", - "tutor:dualwingbeat", - "tutor:endeavor", - "tutor:endure", - "tutor:frustration", - "tutor:glare", - "tutor:headbutt", - "tutor:hiddenpower", - "tutor:irontail", - "tutor:lastresort", - "tutor:magiccoat", - "tutor:mimic", - "tutor:mudslap", - "tutor:nightmare", - "tutor:painsplit", - "tutor:protect", - "tutor:psychup", - "tutor:pursuit", - "tutor:rage", - "tutor:raindance", - "tutor:rest", - "tutor:return", - "tutor:rockslide", - "tutor:rocksmash", - "tutor:rollout", - "tutor:roost", - "tutor:scaleshot", - "tutor:screech", - "tutor:shockwave", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:spite", - "tutor:stealthrock", - "tutor:stompingtantrum", - "tutor:strength", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", - "tutor:takedown", - "tutor:terrainpulse", - "tutor:thief", - "tutor:thunder", - "tutor:thunderwave", - "tutor:toxic", - "tutor:waterpulse", - "tutor:zapcannon", - "tutor:zenheadbutt" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.dunsparce.desc" - ], - "evolutions": [ - { - "id": "dunsparce_dudunsparce", - "variant": "level_up", - "result": "dudunsparce", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "has_move", - "move": "hyperdrill" - } - ] - }, - { - "id": "dunsparce_dudunsparce", - "variant": "level_up", - "result": "dudunsparce threesegment", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "has_move", - "move": "hyperdrill" - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 140, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:rocky_helmet", - "percentage": 2.5 - }, - { - "item": "cobblemon:cheri_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 b94edfc07..47e14585e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/entei.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/entei.json @@ -1,11 +1,26 @@ { - "name": "Entei", + "implemented": true, "nationalPokedexNumber": 244, + "name": "Entei", "primaryType": "fire", + "maleRatio": -1, + "height": 21, + "weight": 1980, + "pokedex": [ + "cobblemon.species.entei.desc" + ], + "labels": [ + "gen2", + "legendary" + ], + "aspects": [], "abilities": [ "pressure", "h:innerfocus" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 115, "attack": 115, @@ -14,29 +29,49 @@ "special_defence": 75, "speed": 100 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 1, + "attack": 2, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:charcoal_stick" + }, + { + "item": "cobblemon:sacred_ash" + } + ] + }, "moves": [ - "1:ember", - "1:extremespeed", "1:leer", + "1:ember", + "1:firespin", + "1:stomp", "1:sacredfire", + "1:extremespeed", "1:smokescreen", - "1:stomp", "6:flamewheel", "12:bite", "18:calmmind", - "22:firespin", "24:roar", "30:firefang", - "36:flamethrower", "36:scaryface", "42:crunch", "48:extrasensory", @@ -49,12 +84,10 @@ "tm:bodyslam", "tm:bulldoze", "tm:calmmind", - "tm:confide", "tm:crunch", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:endure", "tm:facade", "tm:fireblast", @@ -64,37 +97,30 @@ "tm:flamethrower", "tm:flareblitz", "tm:flash", - "tm:frustration", "tm:gigaimpact", + "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:incinerate", "tm:ironhead", "tm:irontail", - "tm:naturalgift", + "tm:laserfocus", "tm:overheat", "tm:protect", - "tm:psychup", "tm:quash", "tm:raindance", - "tm:reflect", "tm:rest", - "tm:return", "tm:reversal", "tm:roar", "tm:rockclimb", "tm:rocksmash", - "tm:round", "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", - "tm:secretpower", "tm:shadowball", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:solarbeam", "tm:stompingtantrum", "tm:stoneedge", @@ -105,101 +131,65 @@ "tm:swift", "tm:takedown", "tm:terablast", - "tm:toxic", "tm:trailblaze", "tm:weatherball", "tm:willowisp", - "tutor:bite", - "tutor:bodyslam", - "tutor:crunch", - "tutor:crushclaw", - "tutor:curse", - "tutor:cut", - "tutor:detect", - "tutor:dig", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:ember", - "tutor:endure", - "tutor:extremespeed", - "tutor:fireblast", + "tutor:bulldoze", + "tutor:calmmind", "tutor:firefang", - "tutor:firespin", - "tutor:flamecharge", "tutor:flamethrower", - "tutor:flareblitz", - "tutor:flash", - "tutor:frustration", - "tutor:headbutt", + "tutor:gigaimpact", "tutor:heatwave", - "tutor:hiddenpower", - "tutor:howl", + "tutor:helpinghand", "tutor:hyperbeam", "tutor:ironhead", "tutor:irontail", "tutor:laserfocus", - "tutor:leer", - "tutor:mimic", - "tutor:mudslap", - "tutor:protect", - "tutor:psychup", - "tutor:raindance", "tutor:rest", - "tutor:return", - "tutor:roar", "tutor:rocksmash", - "tutor:sacredfire", - "tutor:sandstorm", - "tutor:scaryface", "tutor:scorchingsands", + "tutor:shadowball", "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:stomp", + "tutor:snarl", "tutor:stompingtantrum", "tutor:stoneedge", - "tutor:strength", - "tutor:substitute", "tutor:swift", - "tutor:toxic" - ], - "labels": [ - "gen2", - "legendary" - ], - "pokedex": [ - "cobblemon.species.entei.desc" + "legacy:confide", + "legacy:curse", + "legacy:detect", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:psychup", + "legacy:reflect", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:toxic", + "special:crushclaw", + "special:howl" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 1, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 21, - "weight": 1980, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:charcoal_stick" - }, - { - "item": "cobblemon:sacred_ash" + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "fireImmune": true + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json b/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json deleted file mode 100644 index cae95563b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/girafarig.json +++ /dev/null @@ -1,270 +0,0 @@ -{ - "name": "Girafarig", - "nationalPokedexNumber": 203, - "primaryType": "normal", - "secondaryType": "psychic", - "abilities": [ - "innerfocus", - "earlybird", - "h:sapsipper" - ], - "baseStats": { - "hp": 70, - "attack": 80, - "defence": 65, - "special_attack": 90, - "special_defence": 65, - "speed": 85 - }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 159, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:astonish", - "1:growl", - "1:guardswap", - "1:powerswap", - "1:tackle", - "5:confusion", - "5:odorsleuth", - "10:assurance", - "14:stomp", - "19:psybeam", - "23:agility", - "28:doublehit", - "32:twinbeam", - "32:zenheadbutt", - "37:crunch", - "41:batonpass", - "46:nastyplot", - "50:psychic", - "egg:allyswitch", - "egg:amnesia", - "egg:beatup", - "egg:doublekick", - "egg:foresight", - "egg:futuresight", - "egg:magiccoat", - "egg:meanlook", - "egg:mirrorcoat", - "egg:psychicfangs", - "egg:psychicterrain", - "egg:psychup", - "egg:razorwind", - "egg:secretpower", - "egg:skillswap", - "egg:takedown", - "egg:uproar", - "egg:wish", - "tm:agility", - "tm:amnesia", - "tm:attract", - "tm:batonpass", - "tm:bodyslam", - "tm:bulldoze", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:confide", - "tm:confuseray", - "tm:crunch", - "tm:dazzlinggleam", - "tm:doubleedge", - "tm:doubleteam", - "tm:dreameater", - "tm:earthquake", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:helpinghand", - "tm:hiddenpower", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:imprison", - "tm:irontail", - "tm:lightscreen", - "tm:lowkick", - "tm:nastyplot", - "tm:naturalgift", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicfangs", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rocksmash", - "tm:round", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:skillswap", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:workup", - "tm:zenheadbutt", - "tutor:agility", - "tutor:allyswitch", - "tutor:amnesia", - "tutor:attract", - "tutor:batonpass", - "tutor:beatup", - "tutor:bodyslam", - "tutor:confusion", - "tutor:crunch", - "tutor:curse", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dreameater", - "tutor:earthquake", - "tutor:endure", - "tutor:foresight", - "tutor:foulplay", - "tutor:frustration", - "tutor:futuresight", - "tutor:gravity", - "tutor:growl", - "tutor:headbutt", - "tutor:hiddenpower", - "tutor:hypervoice", - "tutor:irontail", - "tutor:magiccoat", - "tutor:mimic", - "tutor:mirrorcoat", - "tutor:mudslap", - "tutor:nightmare", - "tutor:protect", - "tutor:psybeam", - "tutor:psychic", - "tutor:psychup", - "tutor:recycle", - "tutor:rest", - "tutor:return", - "tutor:rocksmash", - "tutor:shadowball", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stomp", - "tutor:stompingtantrum", - "tutor:strength", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:sunnyday", - "tutor:swagger", - "tutor:swift", - "tutor:tackle", - "tutor:takedown", - "tutor:telekinesis", - "tutor:thief", - "tutor:thunder", - "tutor:thunderwave", - "tutor:toxic", - "tutor:trick", - "tutor:uproar", - "tutor:zapcannon", - "tutor:zenheadbutt" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.girafarig.desc" - ], - "evolutions": [ - { - "id": "girafarig_farigiraf", - "variant": "level_up", - "result": "farigiraf", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "has_move", - "move": "twinbeam" - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 415, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:leather", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:razor_fang", - "percentage": 2.5 - }, - { - "item": "cobblemon:persim_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hooh.json b/common/src/main/resources/data/cobblemon/species/generation2/hooh.json deleted file mode 100644 index 718f18e75..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/hooh.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "name": "Ho-Oh", - "nationalPokedexNumber": 250, - "primaryType": "fire", - "secondaryType": "flying", - "abilities": [ - "pressure", - "h:regenerator" - ], - "baseStats": { - "hp": 106, - "attack": 130, - "defence": 90, - "special_attack": 110, - "special_defence": 154, - "speed": 90 - }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 340, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:ancientpower", - "1:gust", - "1:weatherball", - "1:whirlwind", - "9:lifedew", - "15:bravebird", - "18:safeguard", - "27:calmmind", - "36:extrasensory", - "43:swift", - "45:recover", - "50:punishment", - "54:sacredfire", - "63:sunnyday", - "72:fireblast", - "81:futuresight", - "85:naturalgift", - "90:skyattack", - "99:burnup", - "99:overheat", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:bodyslam", - "tm:bravebird", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:confide", - "tm:defog", - "tm:doubleedge", - "tm:doubleteam", - "tm:dreameater", - "tm:dualwingbeat", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firespin", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:fly", - "tm:frustration", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:imprison", - "tm:incinerate", - "tm:ironhead", - "tm:lightscreen", - "tm:mysticalfire", - "tm:naturalgift", - "tm:overheat", - "tm:pluck", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rocksmash", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scorchingsands", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:skydrop", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:steelwing", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:weatherball", - "tm:willowisp", - "tm:zenheadbutt", - "tutor:aircutter", - "tutor:ancientpower", - "tutor:bravebird", - "tutor:burnup", - "tutor:celebrate", - "tutor:curse", - "tutor:defog", - "tutor:detect", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dragonbreath", - "tutor:dreameater", - "tutor:dualwingbeat", - "tutor:earthpower", - "tutor:earthquake", - "tutor:endure", - "tutor:fireblast", - "tutor:flareblitz", - "tutor:flash", - "tutor:fly", - "tutor:frustration", - "tutor:futuresight", - "tutor:gigadrain", - "tutor:gust", - "tutor:heatwave", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:hypervoice", - "tutor:ironhead", - "tutor:laserfocus", - "tutor:mimic", - "tutor:mudslap", - "tutor:nightmare", - "tutor:ominouswind", - "tutor:protect", - "tutor:psychic", - "tutor:psychup", - "tutor:punishment", - "tutor:raindance", - "tutor:rest", - "tutor:return", - "tutor:roar", - "tutor:rocksmash", - "tutor:roost", - "tutor:safeguard", - "tutor:sandstorm", - "tutor:scorchingsands", - "tutor:shadowball", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skyattack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:steelwing", - "tutor:strength", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:tailwind", - "tutor:thunder", - "tutor:thunderwave", - "tutor:toxic", - "tutor:twister", - "tutor:weatherball", - "tutor:whirlwind", - "tutor:zapcannon", - "tutor:zenheadbutt" - ], - "labels": [ - "gen2", - "legendary" - ], - "pokedex": [ - "cobblemon.species.hooh.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 38, - "weight": 1990, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "2-4" - }, - { - "item": "cobblemon:sacred_ash" - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json b/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json deleted file mode 100644 index cb78fe660..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/hoppip.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "name": "Hoppip", - "nationalPokedexNumber": 187, - "primaryType": "grass", - "secondaryType": "flying", - "abilities": [ - "chlorophyll", - "leafguard", - "h:infiltrator" - ], - "baseStats": { - "hp": 35, - "attack": 35, - "defence": 40, - "special_attack": 35, - "special_defence": 55, - "speed": 50 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 50, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "grass" - ], - "moves": [ - "1:splash", - "1:tackle", - "4:tailwhip", - "6:absorb", - "8:fairywind", - "10:poisonpowder", - "10:sleeppowder", - "10:stunspore", - "12:bulletseed", - "15:synthesis", - "19:leechseed", - "22:megadrain", - "24:acrobatics", - "27:cottonspore", - "29:uturn", - "31:ragepowder", - "32:gigadrain", - "35:bounce", - "38:memento", - "40:worryseed", - "egg:amnesia", - "egg:aromatherapy", - "egg:confusion", - "egg:cottonguard", - "egg:doubleedge", - "egg:encore", - "egg:endure", - "egg:grassyterrain", - "egg:helpinghand", - "egg:psychup", - "egg:ragepowder", - "egg:reflect", - "egg:seedbomb", - "egg:strengthsap", - "egg:switcheroo", - "egg:worryseed", - "tm:acrobatics", - "tm:aerialace", - "tm:attract", - "tm:batonpass", - "tm:bulletseed", - "tm:captivate", - "tm:charm", - "tm:confide", - "tm:dazzlinggleam", - "tm:doubleedge", - "tm:doubleteam", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:frustration", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hiddenpower", - "tm:infestation", - "tm:leafstorm", - "tm:lightscreen", - "tm:lunge", - "tm:magicalleaf", - "tm:naturalgift", - "tm:pollenpuff", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:silverwind", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:trailblaze", - "tm:uturn", - "tutor:amnesia", - "tutor:attract", - "tutor:bounce", - "tutor:bulletseed", - "tutor:confusion", - "tutor:cottonspore", - "tutor:curse", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:encore", - "tutor:endure", - "tutor:flash", - "tutor:frustration", - "tutor:gigadrain", - "tutor:growl", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:leechseed", - "tutor:megadrain", - "tutor:mimic", - "tutor:payday", - "tutor:poisonpowder", - "tutor:protect", - "tutor:reflect", - "tutor:rest", - "tutor:return", - "tutor:seedbomb", - "tutor:sleeppowder", - "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:splash", - "tutor:stunspore", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", - "tutor:sweetscent", - "tutor:swordsdance", - "tutor:synthesis", - "tutor:tackle", - "tutor:tailwhip", - "tutor:toxic", - "tutor:worryseed" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.hoppip.desc" - ], - "evolutions": [ - { - "id": "hoppip_skiploom", - "variant": "level_up", - "result": "skiploom", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 18 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 4, - "weight": 5, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:yache_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json b/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json deleted file mode 100644 index e6440e106..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/houndoom.json +++ /dev/null @@ -1,272 +0,0 @@ -{ - "name": "Houndoom", - "nationalPokedexNumber": 229, - "primaryType": "dark", - "secondaryType": "fire", - "abilities": [ - "earlybird", - "flashfire", - "h:unnerve" - ], - "baseStats": { - "hp": 75, - "attack": 90, - "defence": 50, - "special_attack": 110, - "special_defence": 80, - "speed": 95 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "dark", - "secondaryType": "fire", - "abilities": [ - "solarpower" - ], - "baseStats": { - "hp": 75, - "attack": 90, - "defence": 90, - "special_attack": 140, - "special_defence": 90, - "speed": 115 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 175, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "labels": [ - "gen6", - "mega" - ], - "aspects": [ - "mega" - ], - "height": 19, - "weight": 495, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 175, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:ember", - "1:howl", - "1:leer", - "1:nastyplot", - "1:smog", - "1:thunderfang", - "13:roar", - "16:bite", - "20:incinerate", - "20:odorsleuth", - "26:beatup", - "30:firefang", - "35:feintattack", - "35:torment", - "41:comeuppance", - "41:embargo", - "45:foulplay", - "50:flamethrower", - "56:crunch", - "62:inferno", - "tm:attract", - "tm:bodyslam", - "tm:burningjealousy", - "tm:captivate", - "tm:confide", - "tm:crunch", - "tm:darkpulse", - "tm:doubleedge", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firespin", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:foulplay", - "tm:frustration", - "tm:gigaimpact", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:incinerate", - "tm:irontail", - "tm:lashout", - "tm:mudshot", - "tm:mudslap", - "tm:nastyplot", - "tm:naturalgift", - "tm:overheat", - "tm:painsplit", - "tm:payback", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:reversal", - "tm:roar", - "tm:rocksmash", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowball", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:snatch", - "tm:solarbeam", - "tm:spite", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:temperflare", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderfang", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:willowisp", - "tutor:attract", - "tutor:bite", - "tutor:bodyslam", - "tutor:counter", - "tutor:crunch", - "tutor:curse", - "tutor:darkpulse", - "tutor:detect", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dreameater", - "tutor:ember", - "tutor:endure", - "tutor:feintattack", - "tutor:fireblast", - "tutor:flamethrower", - "tutor:foulplay", - "tutor:frustration", - "tutor:headbutt", - "tutor:heatwave", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:hypervoice", - "tutor:irontail", - "tutor:laserfocus", - "tutor:leer", - "tutor:mimic", - "tutor:mudslap", - "tutor:nightmare", - "tutor:protect", - "tutor:rest", - "tutor:return", - "tutor:roar", - "tutor:rocksmash", - "tutor:roleplay", - "tutor:shadowball", - "tutor:sleeptalk", - "tutor:sludgebomb", - "tutor:smog", - "tutor:snatch", - "tutor:snore", - "tutor:solarbeam", - "tutor:spite", - "tutor:strength", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:sunnyday", - "tutor:superfang", - "tutor:swagger", - "tutor:swift", - "tutor:thief", - "tutor:throatchop", - "tutor:toxic", - "tutor:uproar" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.houndoom.desc" - ], - "preEvolution": "houndour", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 14, - "weight": 350, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 6, - "entries": [ - { - "item": "minecraft:bone", - "quantityRange": "0-2" - }, - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-2" - }, - { - "item": "minecraft:blaze_powder", - "percentage": 5.0 - }, - { - "item": "cobblemon:rawst_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/houndour.json b/common/src/main/resources/data/cobblemon/species/generation2/houndour.json deleted file mode 100644 index 6e991561d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/houndour.json +++ /dev/null @@ -1,252 +0,0 @@ -{ - "name": "Houndour", - "nationalPokedexNumber": 228, - "primaryType": "dark", - "secondaryType": "fire", - "abilities": [ - "earlybird", - "flashfire", - "h:unnerve" - ], - "baseStats": { - "hp": 45, - "attack": 60, - "defence": 30, - "special_attack": 80, - "special_defence": 50, - "speed": 65 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 66, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:ember", - "1:leer", - "4:howl", - "8:smog", - "13:roar", - "16:bite", - "20:incinerate", - "20:odorsleuth", - "25:beatup", - "28:firefang", - "32:feintattack", - "32:torment", - "37:comeuppance", - "37:embargo", - "40:foulplay", - "44:flamethrower", - "49:crunch", - "52:nastyplot", - "56:inferno", - "egg:beatup", - "egg:counter", - "egg:destinybond", - "egg:feint", - "egg:firefang", - "egg:firespin", - "egg:nastyplot", - "egg:punishment", - "egg:pursuit", - "egg:rage", - "egg:reversal", - "egg:spite", - "egg:suckerpunch", - "egg:thunderfang", - "egg:willowisp", - "tm:attract", - "tm:bodyslam", - "tm:burningjealousy", - "tm:captivate", - "tm:confide", - "tm:crunch", - "tm:darkpulse", - "tm:doubleedge", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firespin", - "tm:flamecharge", - "tm:flamethrower", - "tm:flareblitz", - "tm:foulplay", - "tm:frustration", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hypervoice", - "tm:incinerate", - "tm:irontail", - "tm:lashout", - "tm:mudshot", - "tm:mudslap", - "tm:nastyplot", - "tm:naturalgift", - "tm:overheat", - "tm:painsplit", - "tm:payback", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:reversal", - "tm:roar", - "tm:rocksmash", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowball", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:snatch", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:temperflare", - "tm:terablast", - "tm:thief", - "tm:thunderfang", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:willowisp", - "tutor:attract", - "tutor:beatup", - "tutor:bite", - "tutor:bodyslam", - "tutor:charm", - "tutor:counter", - "tutor:crunch", - "tutor:curse", - "tutor:darkpulse", - "tutor:detect", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dreameater", - "tutor:ember", - "tutor:endure", - "tutor:feint", - "tutor:feintattack", - "tutor:fireblast", - "tutor:firespin", - "tutor:flamethrower", - "tutor:foulplay", - "tutor:frustration", - "tutor:headbutt", - "tutor:heatwave", - "tutor:hiddenpower", - "tutor:howl", - "tutor:hypervoice", - "tutor:irontail", - "tutor:leer", - "tutor:mimic", - "tutor:mudslap", - "tutor:nightmare", - "tutor:protect", - "tutor:pursuit", - "tutor:rage", - "tutor:rest", - "tutor:return", - "tutor:reversal", - "tutor:roar", - "tutor:rocksmash", - "tutor:roleplay", - "tutor:shadowball", - "tutor:sleeptalk", - "tutor:sludgebomb", - "tutor:smog", - "tutor:snatch", - "tutor:snore", - "tutor:solarbeam", - "tutor:spite", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:sunnyday", - "tutor:superfang", - "tutor:swagger", - "tutor:swift", - "tutor:thief", - "tutor:toxic", - "tutor:uproar" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.houndour.desc" - ], - "evolutions": [ - { - "id": "houndour_houndoom", - "variant": "level_up", - "result": "houndoom", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 24 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 108, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:bone", - "quantityRange": "0-1" - }, - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-1" - }, - { - "item": "minecraft:blaze_powder", - "percentage": 2.5 - }, - { - "item": "cobblemon:rawst_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json b/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json deleted file mode 100644 index 1978460a3..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/jumpluff.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "name": "Jumpluff", - "nationalPokedexNumber": 189, - "primaryType": "grass", - "secondaryType": "flying", - "abilities": [ - "chlorophyll", - "leafguard", - "h:infiltrator" - ], - "baseStats": { - "hp": 75, - "attack": 55, - "defence": 70, - "special_attack": 55, - "special_defence": 95, - "speed": 110 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 207, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "grass" - ], - "moves": [ - "1:absorb", - "1:splash", - "1:synthesis", - "1:tailwhip", - "8:tackle", - "10:fairywind", - "12:poisonpowder", - "12:sleeppowder", - "12:stunspore", - "15:bulletseed", - "20:leechseed", - "24:megadrain", - "30:acrobatics", - "35:cottonspore", - "39:ragepowder", - "39:uturn", - "43:gigadrain", - "49:bounce", - "54:worryseed", - "55:memento", - "tm:acrobatics", - "tm:aerialace", - "tm:attract", - "tm:batonpass", - "tm:bulletseed", - "tm:captivate", - "tm:charm", - "tm:confide", - "tm:dazzlinggleam", - "tm:doubleedge", - "tm:doubleteam", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:infestation", - "tm:leafstorm", - "tm:lightscreen", - "tm:lunge", - "tm:magicalleaf", - "tm:naturalgift", - "tm:pollenpuff", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:silverwind", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:trailblaze", - "tm:uturn", - "tutor:attract", - "tutor:bounce", - "tutor:bulletseed", - "tutor:cottonspore", - "tutor:curse", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:endure", - "tutor:falseswipe", - "tutor:flash", - "tutor:frustration", - "tutor:gigadrain", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:leechseed", - "tutor:megadrain", - "tutor:mimic", - "tutor:poisonpowder", - "tutor:protect", - "tutor:rest", - "tutor:return", - "tutor:seedbomb", - "tutor:sleeppowder", - "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:splash", - "tutor:stunspore", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", - "tutor:sweetscent", - "tutor:swordsdance", - "tutor:synthesis", - "tutor:tackle", - "tutor:tailwhip", - "tutor:toxic", - "tutor:worryseed" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.jumpluff.desc" - ], - "preEvolution": "skiploom", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, - "height": 8, - "weight": 30, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:white_wool", - "quantityRange": "1-3" - }, - { - "item": "cobblemon:yache_berry", - "percentage": 10.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ledian.json b/common/src/main/resources/data/cobblemon/species/generation2/ledian.json deleted file mode 100644 index c68754e1b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/ledian.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "name": "Ledian", - "nationalPokedexNumber": 166, - "primaryType": "bug", - "secondaryType": "flying", - "abilities": [ - "swarm", - "earlybird", - "h:ironfist" - ], - "baseStats": { - "hp": 55, - "attack": 35, - "defence": 50, - "special_attack": 55, - "special_defence": 110, - "speed": 85 - }, - "catchRate": 90, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 137, - "experienceGroup": "fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:supersonic", - "1:swift", - "1:tackle", - "12:lightscreen", - "12:reflect", - "12:safeguard", - "15:machpunch", - "20:silverwind", - "24:cometpunch", - "29:batonpass", - "33:agility", - "38:bugbuzz", - "42:airslash", - "47:doubleedge", - "tm:acrobatics", - "tm:aerialace", - "tm:attract", - "tm:brickbreak", - "tm:captivate", - "tm:confide", - "tm:dig", - "tm:doubleteam", - "tm:drainpunch", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:infestation", - "tm:lightscreen", - "tm:naturalgift", - "tm:poweruppunch", - "tm:protect", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:silverwind", - "tm:sleeptalk", - "tm:solarbeam", - "tm:strength", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:thief", - "tm:toxic", - "tm:uturn", - "tutor:agility", - "tutor:aircutter", - "tutor:attract", - "tutor:batonpass", - "tutor:bugbite", - "tutor:cometpunch", - "tutor:curse", - "tutor:defog", - "tutor:dig", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:drainpunch", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:flash", - "tutor:focuspunch", - "tutor:frustration", - "tutor:gigadrain", - "tutor:headbutt", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:icepunch", - "tutor:knockoff", - "tutor:lightscreen", - "tutor:megapunch", - "tutor:mimic", - "tutor:ominouswind", - "tutor:protect", - "tutor:reflect", - "tutor:rest", - "tutor:return", - "tutor:rollout", - "tutor:roost", - "tutor:safeguard", - "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:stringshot", - "tutor:substitute", - "tutor:sunnyday", - "tutor:supersonic", - "tutor:swagger", - "tutor:sweetscent", - "tutor:swift", - "tutor:swordsdance", - "tutor:tackle", - "tutor:tailwind", - "tutor:thief", - "tutor:thunderpunch", - "tutor:toxic", - "tutor:uproar" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.ledian.desc" - ], - "preEvolution": "ledyba", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 14, - "weight": 356, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:charti_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json b/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json deleted file mode 100644 index 83702dff6..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/ledyba.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "name": "Ledyba", - "nationalPokedexNumber": 165, - "primaryType": "bug", - "secondaryType": "flying", - "abilities": [ - "swarm", - "earlybird", - "h:rattled" - ], - "baseStats": { - "hp": 40, - "attack": 20, - "defence": 30, - "special_attack": 40, - "special_defence": 80, - "speed": 55 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 53, - "experienceGroup": "fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:tackle", - "5:supersonic", - "8:swift", - "12:lightscreen", - "12:reflect", - "12:safeguard", - "15:machpunch", - "19:silverwind", - "22:cometpunch", - "26:batonpass", - "29:agility", - "33:bugbuzz", - "36:airslash", - "40:doubleedge", - "egg:bide", - "egg:bugbite", - "egg:bugbuzz", - "egg:counter", - "egg:dizzypunch", - "egg:drainpunch", - "egg:encore", - "egg:endure", - "egg:focuspunch", - "egg:knockoff", - "egg:psybeam", - "egg:screech", - "egg:silverwind", - "egg:tailwind", - "tm:acrobatics", - "tm:aerialace", - "tm:attract", - "tm:brickbreak", - "tm:captivate", - "tm:confide", - "tm:dig", - "tm:doubleteam", - "tm:drainpunch", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:gigadrain", - "tm:hiddenpower", - "tm:infestation", - "tm:lightscreen", - "tm:naturalgift", - "tm:poweruppunch", - "tm:protect", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:silverwind", - "tm:sleeptalk", - "tm:solarbeam", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:thief", - "tm:toxic", - "tm:uturn", - "tutor:aerialace", - "tutor:agility", - "tutor:aircutter", - "tutor:attract", - "tutor:batonpass", - "tutor:bide", - "tutor:bugbite", - "tutor:cometpunch", - "tutor:curse", - "tutor:dig", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:drainpunch", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:flash", - "tutor:focuspunch", - "tutor:frustration", - "tutor:gigadrain", - "tutor:headbutt", - "tutor:hiddenpower", - "tutor:icepunch", - "tutor:knockoff", - "tutor:lightscreen", - "tutor:megapunch", - "tutor:mimic", - "tutor:ominouswind", - "tutor:protect", - "tutor:psybeam", - "tutor:reflect", - "tutor:refresh", - "tutor:rest", - "tutor:return", - "tutor:rollout", - "tutor:roost", - "tutor:safeguard", - "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:stringshot", - "tutor:substitute", - "tutor:sunnyday", - "tutor:supersonic", - "tutor:swagger", - "tutor:sweetscent", - "tutor:swift", - "tutor:swordsdance", - "tutor:tackle", - "tutor:tailwind", - "tutor:thief", - "tutor:thunderpunch", - "tutor:toxic", - "tutor:uproar" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.ledyba.desc" - ], - "evolutions": [ - { - "id": "ledyba_ledian", - "variant": "level_up", - "result": "ledian", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 18 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 10, - "weight": 108, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:charti_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/lugia.json b/common/src/main/resources/data/cobblemon/species/generation2/lugia.json deleted file mode 100644 index c1a27734b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/lugia.json +++ /dev/null @@ -1,261 +0,0 @@ -{ - "name": "Lugia", - "nationalPokedexNumber": 249, - "primaryType": "psychic", - "secondaryType": "flying", - "abilities": [ - "pressure", - "h:multiscale" - ], - "baseStats": { - "hp": 106, - "attack": 90, - "defence": 130, - "special_attack": 90, - "special_defence": 154, - "speed": 110 - }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 340, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:ancientpower", - "1:dragonrush", - "1:gust", - "1:weatherball", - "1:whirlwind", - "9:mist", - "18:safeguard", - "27:calmmind", - "36:extrasensory", - "43:swift", - "45:recover", - "50:punishment", - "54:aeroblast", - "63:raindance", - "72:hydropump", - "81:futuresight", - "85:naturalgift", - "90:skyattack", - "tm:acrobatics", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:avalanche", - "tm:blizzard", - "tm:bodyslam", - "tm:bravebird", - "tm:brine", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:chillingwater", - "tm:confide", - "tm:curse", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:dualwingbeat", - "tm:earthpower", - "tm:earthquake", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:fly", - "tm:frustration", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:ironhead", - "tm:irontail", - "tm:lightscreen", - "tm:liquidation", - "tm:naturalgift", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rocksmash", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scaleshot", - "tm:scaryface", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:skillswap", - "tm:skydrop", - "tm:sleeptalk", - "tm:snore", - "tm:steelwing", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:trick", - "tm:waterfall", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:aircutter", - "tutor:ancientpower", - "tutor:aquatail", - "tutor:blizzard", - "tutor:bodyslam", - "tutor:curse", - "tutor:defog", - "tutor:detect", - "tutor:dive", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dragonbreath", - "tutor:dragonpulse", - "tutor:dragonrush", - "tutor:dreameater", - "tutor:dualwingbeat", - "tutor:earthpower", - "tutor:earthquake", - "tutor:endure", - "tutor:featherdance", - "tutor:fly", - "tutor:frustration", - "tutor:futuresight", - "tutor:gigadrain", - "tutor:gust", - "tutor:headbutt", - "tutor:hiddenpower", - "tutor:hurricane", - "tutor:hydropump", - "tutor:hyperbeam", - "tutor:hypervoice", - "tutor:icebeam", - "tutor:icywind", - "tutor:ironhead", - "tutor:irontail", - "tutor:laserfocus", - "tutor:mimic", - "tutor:mudslap", - "tutor:nightmare", - "tutor:ominouswind", - "tutor:protect", - "tutor:psychic", - "tutor:psychoboost", - "tutor:psychup", - "tutor:punishment", - "tutor:rest", - "tutor:return", - "tutor:roar", - "tutor:rocksmash", - "tutor:roost", - "tutor:safeguard", - "tutor:sandstorm", - "tutor:scaleshot", - "tutor:shadowball", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:skyattack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:steelwing", - "tutor:strength", - "tutor:substitute", - "tutor:sunnyday", - "tutor:surf", - "tutor:swagger", - "tutor:swift", - "tutor:tailwind", - "tutor:telekinesis", - "tutor:thunder", - "tutor:thunderwave", - "tutor:toxic", - "tutor:trick", - "tutor:twister", - "tutor:waterfall", - "tutor:waterpulse", - "tutor:weatherball", - "tutor:whirlpool", - "tutor:whirlwind", - "tutor:wonderroom", - "tutor:zapcannon", - "tutor:zenheadbutt" - ], - "labels": [ - "gen2", - "legendary" - ], - "pokedex": [ - "cobblemon.species.lugia.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 52, - "weight": 2160, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "2-4" - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json b/common/src/main/resources/data/cobblemon/species/generation2/mantine.json deleted file mode 100644 index 7fab5fbdb..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json +++ /dev/null @@ -1,216 +0,0 @@ -{ - "name": "Mantine", - "nationalPokedexNumber": 226, - "primaryType": "water", - "secondaryType": "flying", - "abilities": [ - "swiftswim", - "waterabsorb", - "h:waterveil" - ], - "baseStats": { - "hp": 85, - "attack": 40, - "defence": 70, - "special_attack": 80, - "special_defence": 140, - "speed": 70 - }, - "catchRate": 25, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 170, - "experienceGroup": "slow", - "eggCycles": 25, - "eggGroups": [ - "water_1" - ], - "moves": [ - "1:bubble", - "1:bulletseed", - "1:psybeam", - "1:roost", - "1:signalbeam", - "1:supersonic", - "1:tackle", - "1:watergun", - "1:wingattack", - "11:confuseray", - "12:waterpulse", - "16:wideguard", - "20:agility", - "24:bubblebeam", - "28:headbutt", - "32:airslash", - "36:aquaring", - "40:bounce", - "44:takedown", - "48:hydropump", - "egg:amnesia", - "egg:confuseray", - "egg:haze", - "egg:hydropump", - "egg:mirrorcoat", - "egg:mudsport", - "egg:rockslide", - "egg:slam", - "egg:splash", - "egg:tailwind", - "egg:twister", - "egg:watersport", - "egg:wideguard", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:airslash", - "tm:amnesia", - "tm:assurance", - "tm:attract", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:bounce", - "tm:brine", - "tm:bulldoze", - "tm:bulletseed", - "tm:captivate", - "tm:confide", - "tm:defog", - "tm:dive", - "tm:doubleteam", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:frustration", - "tm:gigaimpact", - "tm:gunkshot", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:ironhead", - "tm:liquidation", - "tm:naturalgift", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:rockslide", - "tm:rocktomb", - "tm:roost", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:agility", - "tutor:aircutter", - "tutor:aquatail", - "tutor:attract", - "tutor:blizzard", - "tutor:bodyslam", - "tutor:bounce", - "tutor:bubble", - "tutor:bubblebeam", - "tutor:confuseray", - "tutor:curse", - "tutor:defog", - "tutor:dive", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dualwingbeat", - "tutor:endure", - "tutor:frustration", - "tutor:gunkshot", - "tutor:haze", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:hydropump", - "tutor:icywind", - "tutor:ironhead", - "tutor:liquidation", - "tutor:mimic", - "tutor:mirrorcoat", - "tutor:mudslap", - "tutor:protect", - "tutor:raindance", - "tutor:rest", - "tutor:return", - "tutor:seedbomb", - "tutor:signalbeam", - "tutor:slam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stringshot", - "tutor:substitute", - "tutor:supersonic", - "tutor:surf", - "tutor:swagger", - "tutor:swift", - "tutor:tackle", - "tutor:tailwind", - "tutor:takedown", - "tutor:toxic", - "tutor:twister", - "tutor:waterfall", - "tutor:waterpulse", - "tutor:whirlpool", - "tutor:wingattack" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.mantine.desc" - ], - "preEvolution": "mantyke", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 21, - "weight": 2200, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:cod", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:wacan_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/marill.json b/common/src/main/resources/data/cobblemon/species/generation2/marill.json deleted file mode 100644 index e391e96e2..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/marill.json +++ /dev/null @@ -1,257 +0,0 @@ -{ - "name": "Marill", - "nationalPokedexNumber": 183, - "primaryType": "water", - "secondaryType": "fairy", - "abilities": [ - "thickfat", - "hugepower", - "h:sapsipper" - ], - "baseStats": { - "hp": 70, - "attack": 20, - "defence": 50, - "special_attack": 20, - "special_defence": 50, - "speed": 40 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 88, - "experienceGroup": "fast", - "eggCycles": 10, - "eggGroups": [ - "water_1", - "fairy" - ], - "moves": [ - "1:defensecurl", - "1:helpinghand", - "1:rollout", - "1:tackle", - "1:tailwhip", - "1:watergun", - "5:watersport", - "6:bubblebeam", - "7:bubble", - "9:charm", - "12:slam", - "15:bounce", - "19:aquatail", - "21:playrough", - "24:aquaring", - "27:raindance", - "30:hydropump", - "33:doubleedge", - "36:superpower", - "egg:amnesia", - "egg:aquajet", - "egg:bellydrum", - "egg:bodyslam", - "egg:camouflage", - "egg:copycat", - "egg:futuresight", - "egg:lightscreen", - "egg:muddywater", - "egg:perishsong", - "egg:present", - "egg:refresh", - "egg:sing", - "egg:soak", - "egg:substitute", - "egg:superpower", - "egg:supersonic", - "egg:tickle", - "egg:watersport", - "tm:alluringvoice", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:bounce", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:confide", - "tm:dig", - "tm:disarmingvoice", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:drainingkiss", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:futuresight", - "tm:grassknot", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:hypervoice", - "tm:icebeam", - "tm:icepunch", - "tm:icespinner", - "tm:icywind", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:liquidation", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:naturalgift", - "tm:playrough", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:strength", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:uproar", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tm:workup", - "tutor:amnesia", - "tutor:aquajet", - "tutor:aquatail", - "tutor:attract", - "tutor:bellydrum", - "tutor:blizzard", - "tutor:bodyslam", - "tutor:bounce", - "tutor:bubblebeam", - "tutor:covet", - "tutor:curse", - "tutor:defensecurl", - "tutor:dive", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:focuspunch", - "tutor:foresight", - "tutor:frustration", - "tutor:futuresight", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:hypervoice", - "tutor:icepunch", - "tutor:icywind", - "tutor:irontail", - "tutor:knockoff", - "tutor:lightscreen", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mistyexplosion", - "tutor:mudslap", - "tutor:perishsong", - "tutor:present", - "tutor:protect", - "tutor:raindance", - "tutor:rest", - "tutor:return", - "tutor:rollout", - "tutor:seismictoss", - "tutor:sleeptalk", - "tutor:snore", - "tutor:steelroller", - "tutor:substitute", - "tutor:superpower", - "tutor:supersonic", - "tutor:surf", - "tutor:swagger", - "tutor:swift", - "tutor:tackle", - "tutor:tailwhip", - "tutor:toxic", - "tutor:waterfall", - "tutor:watergun", - "tutor:waterpulse", - "tutor:whirlpool" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.marill.desc" - ], - "preEvolution": "azurill", - "evolutions": [ - { - "id": "marill_azumarill", - "variant": "level_up", - "result": "azumarill", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 18 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 85, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:kebia_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/octillery.json b/common/src/main/resources/data/cobblemon/species/generation2/octillery.json deleted file mode 100644 index 290319a51..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/octillery.json +++ /dev/null @@ -1,194 +0,0 @@ -{ - "name": "Octillery", - "nationalPokedexNumber": 224, - "primaryType": "water", - "abilities": [ - "suctioncups", - "sniper", - "h:moody" - ], - "baseStats": { - "hp": 75, - "attack": 105, - "defence": 75, - "special_attack": 105, - "special_defence": 75, - "speed": 45 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 168, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "water_2" - ], - "moves": [ - "1:constrict", - "1:focusenergy", - "1:gunkshot", - "1:helpinghand", - "1:octazooka", - "1:rockblast", - "1:watergun", - "1:waterpulse", - "1:wrap", - "12:psybeam", - "16:aurorabeam", - "20:bubblebeam", - "24:lockon", - "28:wringout", - "30:bulletseed", - "34:signalbeam", - "36:icebeam", - "42:hydropump", - "48:soak", - "54:hyperbeam", - "tm:assurance", - "tm:attract", - "tm:blizzard", - "tm:bounce", - "tm:brine", - "tm:bulletseed", - "tm:captivate", - "tm:chargebeam", - "tm:confide", - "tm:dive", - "tm:doubleteam", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flashcannon", - "tm:focusenergy", - "tm:frustration", - "tm:gigaimpact", - "tm:gunkshot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:incinerate", - "tm:liquidation", - "tm:mudshot", - "tm:naturalgift", - "tm:payback", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:round", - "tm:scald", - "tm:screech", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:snore", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:thief", - "tm:thunderwave", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:attract", - "tutor:aurorabeam", - "tutor:bind", - "tutor:bounce", - "tutor:bubblebeam", - "tutor:constrict", - "tutor:curse", - "tutor:defensecurl", - "tutor:dive", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:endure", - "tutor:focusenergy", - "tutor:frustration", - "tutor:gunkshot", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:icebeam", - "tutor:icywind", - "tutor:mimic", - "tutor:mudslap", - "tutor:octazooka", - "tutor:protect", - "tutor:psybeam", - "tutor:raindance", - "tutor:rest", - "tutor:return", - "tutor:seedbomb", - "tutor:seismictoss", - "tutor:signalbeam", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stringshot", - "tutor:substitute", - "tutor:surf", - "tutor:swagger", - "tutor:swift", - "tutor:thief", - "tutor:thunderwave", - "tutor:toxic", - "tutor:watergun", - "tutor:waterpulse", - "tutor:whirlpool" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.octillery.desc" - ], - "preEvolution": "remoraid", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 9, - "weight": 285, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:ink_sac", - "quantityRange": "1-3" - }, - { - "item": "cobblemon:aspear_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 91bd731df..6cec68caf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/raikou.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/raikou.json @@ -1,11 +1,26 @@ { - "name": "Raikou", + "implemented": true, "nationalPokedexNumber": 243, + "name": "Raikou", "primaryType": "electric", + "maleRatio": -1, + "height": 19, + "weight": 1780, + "pokedex": [ + "cobblemon.species.raikou.desc" + ], + "labels": [ + "gen2", + "legendary" + ], + "aspects": [], "abilities": [ "pressure", "h:innerfocus" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 90, "attack": 85, @@ -14,21 +29,39 @@ "special_defence": 100, "speed": 115 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 2 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:magnet" + } + ] + }, "moves": [ - "1:charge", - "1:extremespeed", "1:leer", - "1:quickattack", "1:thundershock", + "1:quickattack", + "1:extremespeed", + "1:charge", "6:spark", "12:bite", "18:calmmind", @@ -45,16 +78,12 @@ "tm:agility", "tm:aurasphere", "tm:bodyslam", - "tm:bulldoze", "tm:calmmind", "tm:charge", "tm:chargebeam", - "tm:confide", "tm:crunch", "tm:cut", - "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -62,41 +91,37 @@ "tm:endure", "tm:facade", "tm:flash", - "tm:frustration", "tm:gigaimpact", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:ironhead", "tm:irontail", + "tm:laserfocus", "tm:lightscreen", + "tm:magnetrise", "tm:mudslap", - "tm:naturalgift", "tm:protect", - "tm:psychup", "tm:quash", "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", + "tm:risingvoltage", "tm:roar", "tm:rockclimb", "tm:rocksmash", - "tm:round", "tm:sandstorm", "tm:scald", "tm:scaryface", - "tm:secretpower", "tm:shadowball", "tm:shockwave", + "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:supercellslam", - "tm:swagger", "tm:swift", "tm:takedown", "tm:terablast", @@ -105,101 +130,67 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderwave", - "tm:toxic", "tm:trailblaze", "tm:voltswitch", "tm:weatherball", "tm:wildcharge", - "tutor:aurasphere", - "tutor:bite", - "tutor:bodyslam", "tutor:calmmind", - "tutor:crunch", - "tutor:curse", - "tutor:cut", - "tutor:detect", - "tutor:dig", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:endure", - "tutor:extremespeed", - "tutor:flash", - "tutor:frustration", - "tutor:headbutt", - "tutor:hiddenpower", - "tutor:howl", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:gigaimpact", + "tutor:helpinghand", "tutor:hyperbeam", "tutor:ironhead", "tutor:irontail", "tutor:laserfocus", - "tutor:leer", "tutor:magnetrise", - "tutor:mimic", "tutor:mudslap", - "tutor:protect", - "tutor:psychup", - "tutor:quickattack", "tutor:rest", - "tutor:return", "tutor:risingvoltage", - "tutor:roar", "tutor:rocksmash", - "tutor:sandstorm", + "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", "tutor:sleeptalk", - "tutor:snore", - "tutor:spark", - "tutor:strength", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", + "tutor:snarl", "tutor:swift", "tutor:throatchop", - "tutor:thunder", "tutor:thunderbolt", "tutor:thunderfang", - "tutor:thundershock", - "tutor:thunderwave", - "tutor:toxic", - "tutor:voltswitch", - "tutor:weatherball", - "tutor:zapcannon" - ], - "labels": [ - "gen2", - "legendary" - ], - "pokedex": [ - "cobblemon.species.raikou.desc" + "tutor:wildcharge", + "legacy:bulldoze", + "legacy:confide", + "legacy:curse", + "legacy:detect", + "legacy:dig", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:psychup", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 2 - }, - "height": 19, - "weight": 1780, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:magnet" + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 deleted file mode 100644 index 2d8cec0dd..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/remoraid.json +++ /dev/null @@ -1,228 +0,0 @@ -{ - "name": "Remoraid", - "nationalPokedexNumber": 223, - "primaryType": "water", - "abilities": [ - "hustle", - "sniper", - "h:moody" - ], - "baseStats": { - "hp": 35, - "attack": 65, - "defence": 35, - "special_attack": 65, - "special_defence": 35, - "speed": 65 - }, - "behaviour": { - "moving": { - "walk": { - "avoidsLand": true - }, - "swim": { - "swimSpeed": 0.15, - "canSwimInWater": true, - "canBreatheUnderwater": true - } - } - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 60, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "water_2" - ], - "moves": [ - "1:helpinghand", - "1:watergun", - "4:waterpulse", - "8:focusenergy", - "12:psybeam", - "16:aurorabeam", - "20:bubblebeam", - "24:lockon", - "28:bulletseed", - "30:signalbeam", - "32:icebeam", - "36:hydropump", - "40:soak", - "44:hyperbeam", - "egg:acidspray", - "egg:aurorabeam", - "egg:entrainment", - "egg:flail", - "egg:haze", - "egg:mudshot", - "egg:octazooka", - "egg:rockblast", - "egg:screech", - "egg:snore", - "egg:supersonic", - "egg:swift", - "egg:thunderwave", - "egg:waterpulse", - "egg:waterspout", - "tm:assurance", - "tm:attract", - "tm:blizzard", - "tm:bounce", - "tm:brine", - "tm:bulletseed", - "tm:captivate", - "tm:chargebeam", - "tm:confide", - "tm:dive", - "tm:doubleteam", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:focusenergy", - "tm:frustration", - "tm:gunkshot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:incinerate", - "tm:mudshot", - "tm:naturalgift", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:round", - "tm:scald", - "tm:screech", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:smackdown", - "tm:snore", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:thief", - "tm:thunderwave", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:attract", - "tutor:aurorabeam", - "tutor:bounce", - "tutor:brine", - "tutor:bubblebeam", - "tutor:curse", - "tutor:defensecurl", - "tutor:dive", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:endure", - "tutor:focusenergy", - "tutor:frustration", - "tutor:gunkshot", - "tutor:haze", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:icebeam", - "tutor:icywind", - "tutor:lockon", - "tutor:mimic", - "tutor:mudslap", - "tutor:octazooka", - "tutor:protect", - "tutor:psybeam", - "tutor:raindance", - "tutor:rest", - "tutor:return", - "tutor:rockblast", - "tutor:screech", - "tutor:seedbomb", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stringshot", - "tutor:substitute", - "tutor:supersonic", - "tutor:surf", - "tutor:swagger", - "tutor:swift", - "tutor:thief", - "tutor:thunderwave", - "tutor:toxic", - "tutor:watergun", - "tutor:waterpulse", - "tutor:whirlpool" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.remoraid.desc" - ], - "evolutions": [ - { - "id": "remoraid_octillery", - "variant": "level_up", - "result": "octillery", - "consumeHeldItem": false, - "learnableMoves": [ - "octazooka" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 25 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 120, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:cod" - }, - { - "item": "minecraft:bone_meal", - "percentage": 5.0 - }, - { - "item": "cobblemon:aspear_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ 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 deleted file mode 100644 index 9c25e4b18..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/skiploom.json +++ /dev/null @@ -1,197 +0,0 @@ -{ - "name": "Skiploom", - "nationalPokedexNumber": 188, - "primaryType": "grass", - "secondaryType": "flying", - "abilities": [ - "chlorophyll", - "leafguard", - "h:infiltrator" - ], - "baseStats": { - "hp": 55, - "attack": 45, - "defence": 50, - "special_attack": 45, - "special_defence": 65, - "speed": 80 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 119, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "grass" - ], - "moves": [ - "1:absorb", - "1:splash", - "1:synthesis", - "1:tailwhip", - "8:tackle", - "10:fairywind", - "12:poisonpowder", - "12:sleeppowder", - "12:stunspore", - "15:bulletseed", - "20:leechseed", - "24:megadrain", - "28:acrobatics", - "31:cottonspore", - "34:uturn", - "36:ragepowder", - "37:gigadrain", - "41:bounce", - "44:memento", - "48:worryseed", - "tm:acrobatics", - "tm:aerialace", - "tm:attract", - "tm:batonpass", - "tm:bulletseed", - "tm:captivate", - "tm:charm", - "tm:confide", - "tm:dazzlinggleam", - "tm:doubleedge", - "tm:doubleteam", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:frustration", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hiddenpower", - "tm:infestation", - "tm:leafstorm", - "tm:lightscreen", - "tm:lunge", - "tm:magicalleaf", - "tm:naturalgift", - "tm:pollenpuff", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:silverwind", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:trailblaze", - "tm:uturn", - "tutor:attract", - "tutor:bounce", - "tutor:cottonspore", - "tutor:curse", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:endure", - "tutor:flash", - "tutor:frustration", - "tutor:gigadrain", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:leechseed", - "tutor:megadrain", - "tutor:mimic", - "tutor:poisonpowder", - "tutor:protect", - "tutor:rest", - "tutor:return", - "tutor:seedbomb", - "tutor:sleeppowder", - "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:splash", - "tutor:stunspore", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", - "tutor:sweetscent", - "tutor:swordsdance", - "tutor:synthesis", - "tutor:tackle", - "tutor:tailwhip", - "tutor:toxic", - "tutor:worryseed" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.skiploom.desc" - ], - "preEvolution": "hoppip", - "evolutions": [ - { - "id": "skiploom_jumpluff", - "variant": "level_up", - "result": "jumpluff", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 27 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 6, - "weight": 10, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:sunflower" - }, - { - "item": "cobblemon:yache_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 45758dfd6..577a29b54 100644 --- a/common/src/main/resources/data/cobblemon/species/generation2/suicune.json +++ b/common/src/main/resources/data/cobblemon/species/generation2/suicune.json @@ -1,11 +1,26 @@ { - "name": "Suicune", + "implemented": true, "nationalPokedexNumber": 245, + "name": "Suicune", "primaryType": "water", + "maleRatio": -1, + "height": 20, + "weight": 1870, + "pokedex": [ + "cobblemon.species.suicune.desc" + ], + "labels": [ + "gen2", + "legendary" + ], + "aspects": [], "abilities": [ "pressure", "h:innerfocus" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 100, "attack": 75, @@ -14,28 +29,46 @@ "special_defence": 115, "speed": 85 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 2, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:mystic_water" + } + ] + }, "moves": [ + "1:leer", "1:bubblebeam", - "1:extremespeed", "1:gust", - "1:leer", + "1:aurorabeam", "1:mist", "1:sheercold", + "1:extremespeed", "1:watergun", "6:waterpulse", "12:bite", "18:calmmind", "24:roar", - "29:aurorabeam", "30:icefang", "36:tailwind", "42:crunch", @@ -51,23 +84,18 @@ "tm:blizzard", "tm:bodyslam", "tm:brine", - "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:confide", "tm:crunch", "tm:cut", - "tm:dig", "tm:dive", "tm:doubleedge", - "tm:doubleteam", "tm:endure", "tm:facade", - "tm:frustration", "tm:gigaimpact", "tm:hail", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", @@ -75,131 +103,93 @@ "tm:icywind", "tm:ironhead", "tm:irontail", + "tm:laserfocus", "tm:liquidation", - "tm:naturalgift", + "tm:ominouswind", "tm:protect", - "tm:psychup", "tm:quash", "tm:raindance", - "tm:reflect", "tm:rest", - "tm:return", "tm:roar", "tm:rockclimb", "tm:rocksmash", - "tm:round", "tm:sandstorm", "tm:scald", - "tm:secretpower", "tm:shadowball", + "tm:signalbeam", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:snowscape", "tm:substitute", - "tm:sunnyday", "tm:surf", - "tm:swagger", "tm:swift", "tm:tailwind", "tm:takedown", "tm:terablast", - "tm:toxic", "tm:trailblaze", "tm:waterfall", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", - "tutor:airslash", - "tutor:aquaring", - "tutor:aurorabeam", - "tutor:bite", - "tutor:blizzard", - "tutor:bodyslam", - "tutor:bubblebeam", "tutor:calmmind", - "tutor:curse", - "tutor:cut", - "tutor:detect", - "tutor:dig", "tutor:dive", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:endure", - "tutor:extremespeed", - "tutor:frustration", - "tutor:gust", - "tutor:headbutt", - "tutor:hiddenpower", - "tutor:hydropump", + "tutor:gigaimpact", + "tutor:helpinghand", "tutor:hyperbeam", + "tutor:icebeam", "tutor:icefang", "tutor:icywind", "tutor:ironhead", "tutor:irontail", "tutor:laserfocus", - "tutor:leer", "tutor:liquidation", - "tutor:mimic", - "tutor:mist", - "tutor:mudslap", "tutor:ominouswind", - "tutor:protect", - "tutor:psychup", "tutor:rest", - "tutor:return", - "tutor:roar", "tutor:rocksmash", - "tutor:sandstorm", - "tutor:sheercold", + "tutor:shadowball", "tutor:signalbeam", "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", + "tutor:snarl", "tutor:swift", "tutor:tailwind", - "tutor:toxic", - "tutor:waterfall", - "tutor:watergun", "tutor:waterpulse", - "tutor:whirlpool" - ], - "labels": [ - "gen2", - "legendary" - ], - "pokedex": [ - "cobblemon.species.suicune.desc" + "legacy:bulldoze", + "legacy:confide", + "legacy:curse", + "legacy:detect", + "legacy:dig", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:psychup", + "legacy:reflect", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:sunnyday", + "legacy:swagger", + "legacy:toxic", + "special:aquaring" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 20, - "weight": 1870, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:mystic_water" + "behaviour": { + "moving": { + "swim": { + "canWalkOnWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 deleted file mode 100644 index 916165765..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/sunflora.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "name": "Sunflora", - "nationalPokedexNumber": 192, - "primaryType": "grass", - "abilities": [ - "chlorophyll", - "solarpower", - "h:earlybird" - ], - "baseStats": { - "hp": 75, - "attack": 75, - "defence": 55, - "special_attack": 105, - "special_defence": 85, - "speed": 30 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 149, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:flowershield", - "1:growth", - "1:pound", - "1:tackle", - "4:ingrain", - "7:absorb", - "7:grasswhistle", - "10:megadrain", - "13:leechseed", - "16:razorleaf", - "19:worryseed", - "22:gigadrain", - "25:bulletseed", - "28:petaldance", - "31:naturalgift", - "31:solarbeam", - "34:doubleedge", - "39:sunnyday", - "43:leafstorm", - "50:petalblizzard", - "tm:attract", - "tm:bulletseed", - "tm:captivate", - "tm:confide", - "tm:curse", - "tm:cut", - "tm:dazzlinggleam", - "tm:doubleedge", - "tm:doubleteam", - "tm:earthpower", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:leafstorm", - "tm:lightscreen", - "tm:magicalleaf", - "tm:naturalgift", - "tm:naturepower", - "tm:petalblizzard", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:weatherball", - "tutor:absorb", - "tutor:afteryou", - "tutor:attract", - "tutor:curse", - "tutor:cut", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:earthpower", - "tutor:endeavor", - "tutor:endure", - "tutor:flash", - "tutor:frustration", - "tutor:gigadrain", - "tutor:growth", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:mimic", - "tutor:petaldance", - "tutor:pound", - "tutor:protect", - "tutor:razorleaf", - "tutor:rest", - "tutor:return", - "tutor:seedbomb", - "tutor:sleeptalk", - "tutor:sludgebomb", - "tutor:snore", - "tutor:solarbeam", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", - "tutor:sweetscent", - "tutor:swordsdance", - "tutor:synthesis", - "tutor:toxic", - "tutor:uproar", - "tutor:worryseed" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.sunflora.desc" - ], - "preEvolution": "sunkern", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 8, - "weight": 85, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:sunflower" - }, - { - "item": "cobblemon:coba_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json b/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json deleted file mode 100644 index b565435ab..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/sunkern.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "name": "Sunkern", - "nationalPokedexNumber": 191, - "primaryType": "grass", - "abilities": [ - "chlorophyll", - "solarpower", - "h:earlybird" - ], - "baseStats": { - "hp": 30, - "attack": 30, - "defence": 30, - "special_attack": 30, - "special_defence": 30, - "speed": 30 - }, - "catchRate": 235, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 36, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:growth", - "1:tackle", - "4:ingrain", - "7:absorb", - "7:grasswhistle", - "10:megadrain", - "13:leechseed", - "16:razorleaf", - "19:worryseed", - "22:gigadrain", - "25:endeavor", - "28:synthesis", - "31:naturalgift", - "31:solarbeam", - "34:doubleedge", - "36:sunnyday", - "39:seedbomb", - "egg:bide", - "egg:curse", - "egg:encore", - "egg:endure", - "egg:grasswhistle", - "egg:grassyterrain", - "egg:helpinghand", - "egg:ingrain", - "egg:leechseed", - "egg:morningsun", - "egg:naturalgift", - "egg:naturepower", - "egg:sweetscent", - "tm:attract", - "tm:bulletseed", - "tm:captivate", - "tm:confide", - "tm:curse", - "tm:cut", - "tm:doubleedge", - "tm:doubleteam", - "tm:earthpower", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hiddenpower", - "tm:leafstorm", - "tm:lightscreen", - "tm:magicalleaf", - "tm:naturalgift", - "tm:naturepower", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:weatherball", - "tutor:absorb", - "tutor:afteryou", - "tutor:attract", - "tutor:curse", - "tutor:cut", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:earthpower", - "tutor:endeavor", - "tutor:endure", - "tutor:flash", - "tutor:frustration", - "tutor:gigadrain", - "tutor:growth", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:megadrain", - "tutor:mimic", - "tutor:protect", - "tutor:rest", - "tutor:return", - "tutor:seedbomb", - "tutor:sleeptalk", - "tutor:sludgebomb", - "tutor:snore", - "tutor:solarbeam", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", - "tutor:sweetscent", - "tutor:swordsdance", - "tutor:synthesis", - "tutor:toxic", - "tutor:uproar", - "tutor:worryseed" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.sunkern.desc" - ], - "evolutions": [ - { - "id": "sunkern_sunflora", - "variant": "item_interact", - "result": "sunflora", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "cobblemon:sun_stone" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 18, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:wheat_seeds" - }, - { - "item": "cobblemon:coba_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/togepi.json b/common/src/main/resources/data/cobblemon/species/generation2/togepi.json deleted file mode 100644 index e335a84f4..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/togepi.json +++ /dev/null @@ -1,257 +0,0 @@ -{ - "name": "Togepi", - "nationalPokedexNumber": 175, - "primaryType": "fairy", - "abilities": [ - "hustle", - "serenegrace", - "h:superluck" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:lucky_egg", - "percentage": 2.5 - }, - { - "item": "cobblemon:shiny_stone", - "percentage": 2.5 - }, - { - "item": "cobblemon:fairy_feather", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 35, - "attack": 20, - "defence": 65, - "special_attack": 40, - "special_defence": 65, - "speed": 20 - }, - "catchRate": 190, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 49, - "experienceGroup": "fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:growl", - "1:pound", - "4:sweetkiss", - "8:lifedew", - "12:charm", - "16:ancientpower", - "17:encore", - "20:yawn", - "24:metronome", - "25:bestow", - "28:afteryou", - "32:doubleedge", - "36:safeguard", - "40:followme", - "44:batonpass", - "48:lastresort", - "52:wish", - "egg:aerialace", - "egg:extrasensory", - "egg:foresight", - "egg:futuresight", - "egg:luckychant", - "egg:mirrormove", - "egg:morningsun", - "egg:nastyplot", - "egg:peck", - "egg:present", - "egg:psychoshift", - "egg:psychup", - "egg:secretpower", - "egg:storedpower", - "egg:substitute", - "tm:attract", - "tm:batonpass", - "tm:bodyslam", - "tm:captivate", - "tm:charm", - "tm:confide", - "tm:dazzlinggleam", - "tm:doubleteam", - "tm:drainingkiss", - "tm:dreameater", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:frustration", - "tm:futuresight", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hypervoice", - "tm:incinerate", - "tm:lightscreen", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mysticalfire", - "tm:nastyplot", - "tm:naturalgift", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:telekinesis", - "tm:thunderwave", - "tm:toxic", - "tm:triattack", - "tm:trick", - "tm:uproar", - "tm:waterpulse", - "tm:workup", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:ancientpower", - "tutor:attract", - "tutor:bodyslam", - "tutor:charm", - "tutor:counter", - "tutor:covet", - "tutor:curse", - "tutor:defensecurl", - "tutor:detect", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dreameater", - "tutor:encore", - "tutor:endeavor", - "tutor:endure", - "tutor:fireblast", - "tutor:flash", - "tutor:followme", - "tutor:foresight", - "tutor:frustration", - "tutor:futuresight", - "tutor:growl", - "tutor:headbutt", - "tutor:healbell", - "tutor:helpinghand", - "tutor:hiddenpower", - "tutor:hypervoice", - "tutor:lastresort", - "tutor:luckychant", - "tutor:magiccoat", - "tutor:megakick", - "tutor:megapunch", - "tutor:metronome", - "tutor:mimic", - "tutor:mirrormove", - "tutor:mudslap", - "tutor:peck", - "tutor:present", - "tutor:protect", - "tutor:psychic", - "tutor:psychup", - "tutor:raindance", - "tutor:rest", - "tutor:return", - "tutor:rocksmash", - "tutor:rollout", - "tutor:safeguard", - "tutor:seismictoss", - "tutor:shadowball", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:softboiled", - "tutor:solarbeam", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", - "tutor:sweetkiss", - "tutor:swift", - "tutor:telekinesis", - "tutor:thunderwave", - "tutor:toxic", - "tutor:triattack", - "tutor:trick", - "tutor:uproar", - "tutor:waterpulse", - "tutor:yawn", - "tutor:zapcannon", - "tutor:zenheadbutt" - ], - "labels": [ - "gen2", - "baby" - ], - "pokedex": [ - "cobblemon.species.togepi.desc" - ], - "evolutions": [ - { - "id": "togepi_togetic", - "variant": "level_up", - "result": "togetic", - "consumeHeldItem": false, - "learnableMoves": [ - "fairywind" - ], - "requirements": [ - { - "variant": "friendship", - "amount": 160 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 3, - "weight": 15, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json b/common/src/main/resources/data/cobblemon/species/generation2/togetic.json deleted file mode 100644 index c05db9f77..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/togetic.json +++ /dev/null @@ -1,259 +0,0 @@ -{ - "name": "Togetic", - "nationalPokedexNumber": 176, - "primaryType": "fairy", - "secondaryType": "flying", - "abilities": [ - "hustle", - "serenegrace", - "h:superluck" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:lucky_egg", - "percentage": 5.0 - }, - { - "item": "cobblemon:shiny_stone", - "percentage": 5.0 - }, - { - "item": "cobblemon:fairy_feather", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 55, - "attack": 40, - "defence": 85, - "special_attack": 80, - "special_defence": 105, - "speed": 40 - }, - "catchRate": 75, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 142, - "experienceGroup": "fast", - "eggCycles": 10, - "eggGroups": [ - "flying", - "fairy" - ], - "moves": [ - "1:growl", - "1:lifedew", - "1:magicalleaf", - "1:pound", - "1:sweetkiss", - "12:charm", - "14:fairywind", - "16:ancientpower", - "17:encore", - "20:yawn", - "24:metronome", - "25:bestow", - "28:afteryou", - "32:doubleedge", - "36:safeguard", - "40:followme", - "44:batonpass", - "48:lastresort", - "52:wish", - "tm:aerialace", - "tm:attract", - "tm:batonpass", - "tm:bodyslam", - "tm:brickbreak", - "tm:captivate", - "tm:charm", - "tm:confide", - "tm:dazzlinggleam", - "tm:defog", - "tm:doubleteam", - "tm:drainingkiss", - "tm:drainpunch", - "tm:dreameater", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:fly", - "tm:focuspunch", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:imprison", - "tm:incinerate", - "tm:lightscreen", - "tm:magicalleaf", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mysticalfire", - "tm:nastyplot", - "tm:naturalgift", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rocksmash", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:silverwind", - "tm:sleeptalk", - "tm:smartstrike", - "tm:snore", - "tm:solarbeam", - "tm:steelwing", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:telekinesis", - "tm:thunderwave", - "tm:toxic", - "tm:triattack", - "tm:trick", - "tm:uproar", - "tm:waterpulse", - "tm:workup", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:aircutter", - "tutor:ancientpower", - "tutor:attract", - "tutor:bodyslam", - "tutor:charm", - "tutor:counter", - "tutor:covet", - "tutor:curse", - "tutor:defensecurl", - "tutor:defog", - "tutor:detect", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:drainpunch", - "tutor:dreameater", - "tutor:dualwingbeat", - "tutor:encore", - "tutor:endeavor", - "tutor:endure", - "tutor:fireblast", - "tutor:flash", - "tutor:fly", - "tutor:focuspunch", - "tutor:frustration", - "tutor:growl", - "tutor:headbutt", - "tutor:healbell", - "tutor:heatwave", - "tutor:hiddenpower", - "tutor:hyperbeam", - "tutor:hypervoice", - "tutor:lastresort", - "tutor:magiccoat", - "tutor:megakick", - "tutor:megapunch", - "tutor:metronome", - "tutor:mimic", - "tutor:mudslap", - "tutor:ominouswind", - "tutor:protect", - "tutor:psychic", - "tutor:psychup", - "tutor:raindance", - "tutor:rest", - "tutor:return", - "tutor:rocksmash", - "tutor:rollout", - "tutor:roost", - "tutor:safeguard", - "tutor:seismictoss", - "tutor:shadowball", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skyattack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:softboiled", - "tutor:solarbeam", - "tutor:steelwing", - "tutor:substitute", - "tutor:sunnyday", - "tutor:swagger", - "tutor:sweetkiss", - "tutor:swift", - "tutor:tailwind", - "tutor:telekinesis", - "tutor:thunderwave", - "tutor:toxic", - "tutor:trick", - "tutor:twister", - "tutor:waterpulse", - "tutor:zapcannon", - "tutor:zenheadbutt" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.togetic.desc" - ], - "preEvolution": "togepi", - "evolutions": [ - { - "id": "togetic_togekiss", - "variant": "item_interact", - "result": "togekiss", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "cobblemon:shiny_stone" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 6, - "weight": 32, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/unown.json b/common/src/main/resources/data/cobblemon/species/generation2/unown.json deleted file mode 100644 index b593cbb79..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/unown.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name": "Unown", - "nationalPokedexNumber": 201, - "primaryType": "psychic", - "abilities": [ - "levitate" - ], - "baseStats": { - "hp": 48, - "attack": 72, - "defence": 48, - "special_attack": 72, - "special_defence": 48, - "speed": 48 - }, - "catchRate": 225, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 118, - "experienceGroup": "medium_fast", - "eggCycles": 40, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:hiddenpower", - "tm:hiddenpower", - "tutor:hiddenpower" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.unown.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 50, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:ender_pearl", - "quantityRange": "0-1" - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json b/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json deleted file mode 100644 index 0c098d769..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation2/wobbuffet.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "Wobbuffet", - "nationalPokedexNumber": 202, - "primaryType": "psychic", - "abilities": [ - "shadowtag", - "h:telepathy" - ], - "baseStats": { - "hp": 190, - "attack": 33, - "defence": 58, - "special_attack": 33, - "special_defence": 58, - "speed": 33 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 142, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:amnesia", - "1:charm", - "1:counter", - "1:destinybond", - "1:encore", - "1:mirrorcoat", - "1:safeguard", - "1:splash", - "tm:amnesia", - "tm:charm", - "tm:encore", - "tm:safeguard", - "tutor:charm", - "tutor:counter", - "tutor:destinybond", - "tutor:encore", - "tutor:mirrorcoat", - "tutor:safeguard" - ], - "labels": [ - "gen2" - ], - "pokedex": [ - "cobblemon.species.wobbuffet.desc" - ], - "preEvolution": "wynaut", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 285, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:colbur_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/absol.json b/common/src/main/resources/data/cobblemon/species/generation3/absol.json deleted file mode 100644 index bc4d247fc..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/absol.json +++ /dev/null @@ -1,282 +0,0 @@ -{ - "name": "Absol", - "nationalPokedexNumber": 359, - "primaryType": "dark", - "abilities": [ - "pressure", - "superluck", - "h:justified" - ], - "baseStats": { - "hp": 65, - "attack": 130, - "defence": 60, - "special_attack": 75, - "special_defence": 60, - "speed": 75 - }, - "catchRate": 30, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "dark", - "abilities": [ - "magicbounce" - ], - "baseStats": { - "hp": 65, - "attack": 150, - "defence": 60, - "special_attack": 115, - "special_defence": 60, - "speed": 115 - }, - "catchRate": 30, - "maleRatio": 0.5, - "baseExperienceYield": 163, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "field" - ], - "labels": [ - "gen6", - "mega" - ], - "aspects": [ - "mega" - ], - "height": 12, - "weight": 490, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 163, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "field" - ], - "moves": [ - "1:feint", - "1:leer", - "1:quickattack", - "1:scratch", - "5:doubleteam", - "10:knockoff", - "10:pursuit", - "15:detect", - "16:bite", - "20:taunt", - "25:slash", - "30:nightslash", - "35:focusenergy", - "37:psychocut", - "40:suckerpunch", - "41:mefirst", - "45:swordsdance", - "49:razorwind", - "50:futuresight", - "55:perishsong", - "egg:assurance", - "egg:batonpass", - "egg:bite", - "egg:curse", - "egg:doubleedge", - "egg:feint", - "egg:feintattack", - "egg:hex", - "egg:magiccoat", - "egg:meanlook", - "egg:mefirst", - "egg:megahorn", - "egg:perishsong", - "egg:playrough", - "egg:punishment", - "egg:substitute", - "egg:suckerpunch", - "egg:zenheadbutt", - "tm:aerialace", - "tm:airslash", - "tm:assurance", - "tm:attract", - "tm:batonpass", - "tm:blizzard", - "tm:bodyslam", - "tm:bounce", - "tm:brutalswing", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:closecombat", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:focusenergy", - "tm:foulplay", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:hail", - "tm:hex", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:incinerate", - "tm:irontail", - "tm:megahorn", - "tm:naturalgift", - "tm:payback", - "tm:playrough", - "tm:protect", - "tm:psychocut", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:snarl", - "tm:snatch", - "tm:snore", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:taunt", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:waterpulse", - "tm:willowisp", - "tm:xscissor", - "tm:zenheadbutt", - "tutor:bite", - "tutor:bodyslam", - "tutor:bounce", - "tutor:counter", - "tutor:darkpulse", - "tutor:doubleedge", - "tutor:doubleteam", - "tutor:dreameater", - "tutor:endure", - "tutor:feint", - "tutor:foulplay", - "tutor:furycutter", - "tutor:futuresight", - "tutor:headbutt", - "tutor:icywind", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:leer", - "tutor:magiccoat", - "tutor:megahorn", - "tutor:mimic", - "tutor:mudslap", - "tutor:nightmare", - "tutor:perishsong", - "tutor:psychup", - "tutor:razorwind", - "tutor:rockslide", - "tutor:roleplay", - "tutor:scratch", - "tutor:shockwave", - "tutor:slash", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:superpower", - "tutor:swagger", - "tutor:swift", - "tutor:swordsdance", - "tutor:throatchop", - "tutor:thunderwave", - "tutor:waterpulse", - "tutor:wish", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.absol.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 12, - "weight": 470, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:razor_claw", - "percentage": 5.0 - }, - { - "item": "cobblemon:roseli_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json b/common/src/main/resources/data/cobblemon/species/generation3/altaria.json deleted file mode 100644 index 4fe3a3e4d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/altaria.json +++ /dev/null @@ -1,263 +0,0 @@ -{ - "name": "Altaria", - "nationalPokedexNumber": 334, - "primaryType": "dragon", - "secondaryType": "flying", - "abilities": [ - "naturalcure", - "h:cloudnine" - ], - "baseStats": { - "hp": 75, - "attack": 70, - "defence": 90, - "special_attack": 70, - "special_defence": 105, - "speed": 80 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "dragon", - "secondaryType": "fairy", - "abilities": [ - "pixilate" - ], - "baseStats": { - "hp": 75, - "attack": 110, - "defence": 110, - "special_attack": 110, - "special_defence": 105, - "speed": 80 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 172, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "experienceGroup": "erratic", - "eggCycles": 20, - "eggGroups": [ - "flying", - "dragon" - ], - "labels": [ - "gen6", - "mega" - ], - "aspects": [ - "mega" - ], - "height": 15, - "weight": 206, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 172, - "experienceGroup": "erratic", - "eggCycles": 20, - "eggGroups": [ - "flying", - "dragon" - ], - "moves": [ - "1:astonish", - "1:disarmingvoice", - "1:growl", - "1:mist", - "1:peck", - "1:pluck", - "12:furyattack", - "16:round", - "20:dragonbreath", - "20:naturalgift", - "24:safeguard", - "26:refresh", - "28:sing", - "30:dragondance", - "32:cottonguard", - "38:takedown", - "40:dragonpulse", - "44:moonblast", - "50:perishsong", - "56:skyattack", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:bodyslam", - "tm:bravebird", - "tm:breakingswipe", - "tm:bulldoze", - "tm:captivate", - "tm:confide", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dreameater", - "tm:dualwingbeat", - "tm:earthquake", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:featherdance", - "tm:fireblast", - "tm:firespin", - "tm:flamethrower", - "tm:fly", - "tm:frustration", - "tm:gigaimpact", - "tm:haze", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:incinerate", - "tm:irontail", - "tm:naturalgift", - "tm:outrage", - "tm:playrough", - "tm:pluck", - "tm:powerswap", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rocksmash", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:solarbeam", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:trailblaze", - "tm:uproar", - "tm:willowisp", - "tm:weatherball", - "tm:willowisp", - "tm:wonderroom", - "tutor:aerialace", - "tutor:agility", - "tutor:aircutter", - "tutor:bodyslam", - "tutor:defog", - "tutor:doubleedge", - "tutor:dracometeor", - "tutor:dragonbreath", - "tutor:dragondance", - "tutor:dragonpulse", - "tutor:dreameater", - "tutor:dualwingbeat", - "tutor:endure", - "tutor:falseswipe", - "tutor:fireblast", - "tutor:healbell", - "tutor:heatwave", - "tutor:hypervoice", - "tutor:irontail", - "tutor:mimic", - "tutor:mudslap", - "tutor:naturalgift", - "tutor:ominouswind", - "tutor:outrage", - "tutor:protect", - "tutor:psychup", - "tutor:refresh", - "tutor:roost", - "tutor:skyattack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:tailwind", - "tutor:takedown", - "tutor:twister", - "tutor:uproar", - "tutor:wonderroom" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.altaria.desc" - ], - "preEvolution": "swablu", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 11, - "weight": 206, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:white_wool", - "quantityRange": "1-2" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:yache_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/azurill.json b/common/src/main/resources/data/cobblemon/species/generation3/azurill.json deleted file mode 100644 index 88fdfffa0..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/azurill.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "name": "Azurill", - "nationalPokedexNumber": 298, - "primaryType": "normal", - "secondaryType": "fairy", - "abilities": [ - "thickfat", - "hugepower", - "h:sapsipper" - ], - "baseStats": { - "hp": 50, - "attack": 20, - "defence": 40, - "special_attack": 20, - "special_defence": 40, - "speed": 20 - }, - "catchRate": 150, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 38, - "experienceGroup": "fast", - "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:splash", - "1:tailwhip", - "1:watergun", - "3:helpinghand", - "5:watersport", - "6:bubblebeam", - "7:bubble", - "9:charm", - "12:slam", - "15:bounce", - "egg:aquajet", - "egg:bellydrum", - "egg:bodyslam", - "egg:camouflage", - "egg:copycat", - "egg:encore", - "egg:faketears", - "egg:muddywater", - "egg:perishsong", - "egg:present", - "egg:refresh", - "egg:sing", - "egg:slam", - "egg:soak", - "egg:supersonic", - "egg:tickle", - "egg:watersport", - "tm:alluringvoice", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:bounce", - "tm:brutalswing", - "tm:captivate", - "tm:charm", - "tm:confide", - "tm:doubleteam", - "tm:drainingkiss", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:frustration", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:irontail", - "tm:lightscreen", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:naturalgift", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:uproar", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tm:workup", - "tutor:bodyslam", - "tutor:bounce", - "tutor:covet", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:endure", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:hypervoice", - "tutor:icywind", - "tutor:irontail", - "tutor:knockoff", - "tutor:mimic", - "tutor:mudslap", - "tutor:rollout", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen3", - "baby" - ], - "pokedex": [ - "cobblemon.species.azurill.desc" - ], - "evolutions": [ - { - "id": "azurill_marill", - "variant": "level_up", - "result": "marill", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "friendship", - "amount": 160 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 2, - "weight": 20, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:kebia_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/bagon.json b/common/src/main/resources/data/cobblemon/species/generation3/bagon.json deleted file mode 100644 index f37116bb2..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/bagon.json +++ /dev/null @@ -1,195 +0,0 @@ -{ - "name": "Bagon", - "nationalPokedexNumber": 371, - "primaryType": "dragon", - "abilities": [ - "rockhead", - "h:sheerforce" - ], - "baseStats": { - "hp": 45, - "attack": 75, - "defence": 60, - "special_attack": 40, - "special_defence": 30, - "speed": 50 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 60, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "dragon" - ], - "moves": [ - "1:ember", - "1:leer", - "1:rage", - "5:bite", - "10:dragonbreath", - "15:headbutt", - "20:scaryface", - "25:crunch", - "31:dragonclaw", - "35:zenheadbutt", - "40:focusenergy", - "45:flamethrower", - "50:outrage", - "55:doubleedge", - "egg:defensecurl", - "egg:dragondance", - "egg:dragonpulse", - "egg:dragonrage", - "egg:dragonrush", - "egg:endure", - "egg:firefang", - "egg:hydropump", - "egg:shadowclaw", - "egg:thrash", - "egg:twister", - "tm:aerialace", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:captivate", - "tm:confide", - "tm:crunch", - "tm:cut", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firespin", - "tm:flamethrower", - "tm:focusenergy", - "tm:frustration", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hydropump", - "tm:hypervoice", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:mudslap", - "tm:naturalgift", - "tm:outrage", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snore", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:thunderfang", - "tm:toxic", - "tm:zenheadbutt", - "tutor:bite", - "tutor:bodyslam", - "tutor:doubleedge", - "tutor:dracometeor", - "tutor:dragondance", - "tutor:dragonpulse", - "tutor:endure", - "tutor:furycutter", - "tutor:headbutt", - "tutor:hypervoice", - "tutor:irondefense", - "tutor:mimic", - "tutor:mudslap", - "tutor:outrage", - "tutor:rage", - "tutor:rockslide", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:thrash", - "tutor:twister", - "tutor:wish", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.bagon.desc" - ], - "evolutions": [ - { - "id": "bagon_shelgon", - "variant": "level_up", - "result": "shelgon", - "consumeHeldItem": false, - "learnableMoves": [ - "protect" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 30 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 421, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 2.5 - }, - { - "item": "cobblemon:dragon_scale", - "percentage": 2.5 - }, - { - "item": "cobblemon:yache_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/banette.json b/common/src/main/resources/data/cobblemon/species/generation3/banette.json deleted file mode 100644 index e9745dd2f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/banette.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "name": "Banette", - "nationalPokedexNumber": 354, - "primaryType": "ghost", - "abilities": [ - "insomnia", - "frisk", - "h:cursedbody" - ], - "baseStats": { - "hp": 64, - "attack": 115, - "defence": 65, - "special_attack": 83, - "special_defence": 63, - "speed": 65 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "ghost", - "abilities": [ - "prankster" - ], - "baseStats": { - "hp": 64, - "attack": 165, - "defence": 75, - "special_attack": 93, - "special_defence": 83, - "speed": 75 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 159, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "fast", - "eggCycles": 25, - "eggGroups": [ - "amorphous" - ], - "labels": [ - "gen6", - "mega" - ], - "aspects": [ - "mega" - ], - "height": 12, - "weight": 130, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 159, - "experienceGroup": "fast", - "eggCycles": 25, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:knockoff", - "1:nightshade", - "1:screech", - "1:spite", - "16:willowisp", - "19:feintattack", - "19:shadowsneak", - "22:hex", - "26:curse", - "30:shadowball", - "34:embargo", - "34:roleplay", - "40:suckerpunch", - "46:snatch", - "46:trick", - "52:grudge", - "53:phantomforce", - "tm:attract", - "tm:burningjealousy", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:confide", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:foulplay", - "tm:frustration", - "tm:gigaimpact", - "tm:gunkshot", - "tm:helpinghand", - "tm:hex", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icywind", - "tm:imprison", - "tm:infestation", - "tm:knockoff", - "tm:lashout", - "tm:metronome", - "tm:nastyplot", - "tm:naturalgift", - "tm:nightshade", - "tm:painsplit", - "tm:payback", - "tm:phantomforce", - "tm:poltergeist", - "tm:pounce", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snatch", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:willowisp", - "tutor:allyswitch", - "tutor:bodyslam", - "tutor:cottonguard", - "tutor:curse", - "tutor:darkpulse", - "tutor:doubleedge", - "tutor:dreameater", - "tutor:endure", - "tutor:feintattack", - "tutor:foulplay", - "tutor:gunkshot", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:hex", - "tutor:icywind", - "tutor:knockoff", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:metronome", - "tutor:mimic", - "tutor:mudslap", - "tutor:nightmare", - "tutor:ominouswind", - "tutor:painsplit", - "tutor:psychup", - "tutor:roleplay", - "tutor:shadowball", - "tutor:shockwave", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:swagger", - "tutor:telekinesis", - "tutor:throatchop", - "tutor:thunderwave", - "tutor:trick" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.banette.desc" - ], - "preEvolution": "shuppet", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 125, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:spell_tag", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 8c3e7df65..e60b99d5d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/beautifly.json @@ -1,12 +1,26 @@ { - "name": "Beautifly", + "implemented": true, "nationalPokedexNumber": 267, + "name": "Beautifly", "primaryType": "bug", "secondaryType": "flying", + "maleRatio": 0.5, + "height": 10, + "weight": 284, + "pokedex": [ + "cobblemon.species.beautifly.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [], "abilities": [ "swarm", "h:rivalry" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 60, "attack": 70, @@ -15,23 +29,54 @@ "special_defence": 50, "speed": 65 }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 178, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 198, "experienceGroup": "medium_fast", + "catchRate": 45, "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "cobblemon:bright_powder", + "percentage": 5.0 + }, + { + "item": "cobblemon:shed_shell", + "percentage": 5.0 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5.0 + } + ] + }, "moves": [ "1:gust", + "1:stringshot", + "1:bugbite", + "1:tackle", + "1:harden", + "1:poisonsting", "12:absorb", "15:stunspore", "17:morningsun", "20:aircutter", "22:megadrain", - "25:silverwind", "27:attract", "30:whirlwind", "32:gigadrain", @@ -40,102 +85,106 @@ "40:quiverdance", "tm:acrobatics", "tm:aerialace", + "tm:aircutter", + "tm:airslash", "tm:attract", - "tm:captivate", - "tm:confide", + "tm:bugbite", + "tm:bugbuzz", "tm:defog", - "tm:doubleteam", + "tm:dualwingbeat", + "tm:electroweb", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:frustration", "tm:gigadrain", "tm:gigaimpact", - "tm:hiddenpower", "tm:hyperbeam", "tm:infestation", - "tm:naturalgift", + "tm:irondefense", + "tm:laserfocus", + "tm:ominouswind", "tm:protect", "tm:psychic", "tm:rest", - "tm:return", "tm:roost", - "tm:round", "tm:safeguard", - "tm:secretpower", "tm:shadowball", + "tm:signalbeam", "tm:silverwind", + "tm:skittersmack", "tm:sleeptalk", "tm:solarbeam", + "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:swagger", + "tm:tailwind", + "tm:terablast", "tm:thief", - "tm:toxic", + "tm:twister", "tm:uturn", "tm:venoshock", + "tutor:aerialace", "tutor:aircutter", "tutor:bugbite", "tutor:defog", - "tutor:doubleedge", + "tutor:dualwingbeat", "tutor:electroweb", - "tutor:endure", + "tutor:energyball", "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", "tutor:laserfocus", - "tutor:mimic", "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", "tutor:roost", + "tutor:shadowball", "tutor:signalbeam", + "tutor:skittersmack", "tutor:sleeptalk", - "tutor:snore", "tutor:stringshot", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", "tutor:tailwind", - "tutor:twister" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.beautifly.desc" + "tutor:twister", + "legacy:captivate", + "legacy:confide", + "legacy:doubleedge", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:swift", + "legacy:toxic" ], "preEvolution": "silcoon", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 10, - "weight": 284, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:bright_powder", - "percentage": 5.0 + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true }, - { - "item": "cobblemon:pecha_berry", - "percentage": 5.0 + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 923e4f849..94fbff4bf 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/cascoon.json @@ -1,9 +1,26 @@ { - "name": "Cascoon", + "implemented": true, "nationalPokedexNumber": 268, + "name": "Cascoon", "primaryType": "bug", + "maleRatio": 0.5, + "height": 7, + "weight": 115, + "pokedex": [ + "cobblemon.species.cascoon.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [ + "cascoon-cocoon" + ], "abilities": [ - "shedskin" + "shedskin", + "h:shedskin" + ], + "eggGroups": [ + "bug" ], "baseStats": { "hp": 50, @@ -13,6 +30,25 @@ "special_defence": 25, "speed": 15 }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 72, + "experienceGroup": "medium_fast", + "catchRate": 120, + "eggCycles": 15, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "behaviour": { "moving": { "walk": { @@ -20,32 +56,50 @@ }, "swim": { "canSwimInWater": false, - "canSwimInLava": false + "avoidsWater": true }, "canLook": false + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "combat": { + "willFlee": false } }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 72, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "0-2" + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 + } + ] + }, "moves": [ "1:harden", + "1:tackle", + "1:poisonsting", + "tm:bugbite", + "tm:electroweb", + "tm:irondefense", + "tm:skittersmack", + "tm:stringshot", + "tm:terablast", "tutor:bugbite", "tutor:electroweb", "tutor:irondefense", - "tutor:stringshot" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.cascoon.desc" + "tutor:skittersmack", + "tutor:stringshot", + "legacy:snore" ], "preEvolution": "wurmple", "evolutions": [ @@ -54,7 +108,9 @@ "variant": "level_up", "result": "dustox", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "gust" + ], "requirements": [ { "variant": "level", @@ -62,38 +118,5 @@ } ] } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 7, - "weight": 115, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true + ] } \ No newline at end of file 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 f4d01c135..87e1a00e9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/castform.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/castform.json @@ -1,9 +1,27 @@ { - "name": "Castform", + "implemented": true, "nationalPokedexNumber": 351, + "name": "Castform", "primaryType": "normal", + "maleRatio": 0.5, + "height": 3, + "weight": 8, + "pokedex": [ + "cobblemon.species.castform.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [ + "normal-form" + ], "abilities": [ - "forecast" + "forecast", + "h:forecast" + ], + "eggGroups": [ + "fairy", + "amorphous" ], "baseStats": { "hp": 70, @@ -13,296 +31,255 @@ "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, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Sunny", - "primaryType": "fire", - "abilities": [ - "forecast" - ], - "baseStats": { - "hp": 70, - "attack": 70, - "defence": 70, - "special_attack": 70, - "special_defence": 70, - "speed": 70 + "eggCycles": 25, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 147, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 + "fly": { + "canFly": true }, - "experienceGroup": "medium_fast", - "eggCycles": 25, - "eggGroups": [ - "fairy", - "amorphous" - ], - "labels": [ - "gen3" - ], - "aspects": [ - "sunny" - ], - "height": 3, - "weight": 8, - "cannotDynamax": false, - "battleOnly": true, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:heat_rock", - "percentage": 5.0 - } - ] + "walk": { + "canWalk": false } }, - { - "name": "Rainy", - "primaryType": "water", - "abilities": [ - "forecast" - ], - "baseStats": { - "hp": 70, - "attack": 70, - "defence": 70, - "special_attack": 70, - "special_defence": 70, - "speed": 70 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 147, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 25, - "eggGroups": [ - "fairy", - "amorphous" - ], - "labels": [ - "gen3" - ], - "aspects": [ - "rainy" - ], - "height": 3, - "weight": 8, - "cannotDynamax": false, - "battleOnly": true, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:damp_rock", - "percentage": 5.0 - } - ] - } + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 }, - { - "name": "Snowy", - "primaryType": "ice", - "abilities": [ - "forecast" - ], - "baseStats": { - "hp": 70, - "attack": 70, - "defence": 70, - "special_attack": 70, - "special_defence": 70, - "speed": 70 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 147, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 25, - "eggGroups": [ - "fairy", - "amorphous" - ], - "labels": [ - "gen3" - ], - "aspects": [ - "snowy" - ], - "height": 3, - "weight": 8, - "cannotDynamax": false, - "battleOnly": true, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:icy_rock", - "percentage": 5.0 - } - ] - } + "combat": { + "willDefendOwner": true } - ], - "baseExperienceYield": 147, - "experienceGroup": "medium_fast", - "eggCycles": 25, - "eggGroups": [ - "fairy", - "amorphous" - ], + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:mystic_water", + "percentage": 5.0 + } + ] + }, "moves": [ "1:tackle", + "10:watergun", "10:ember", "10:powdersnow", - "10:watergun", "15:headbutt", - "20:hail", "20:raindance", "20:sunnyday", + "20:hail", "25:weatherball", "35:blizzard", "35:fireblast", "35:hydropump", "45:hurricane", - "egg:amnesia", "egg:clearsmog", - "egg:cosmicpower", "egg:disable", - "egg:futuresight", - "egg:guardswap", - "egg:hex", "egg:luckychant", - "egg:ominouswind", - "egg:psychup", "egg:reflecttype", - "tm:attract", + "tm:amnesia", "tm:avalanche", "tm:blizzard", - "tm:captivate", - "tm:confide", - "tm:doubleteam", + "tm:bodyslam", + "tm:cosmicpower", "tm:endure", "tm:energyball", "tm:facade", "tm:fireblast", "tm:flamethrower", "tm:flash", - "tm:frustration", + "tm:futuresight", + "tm:guardswap", "tm:hail", - "tm:hiddenpower", + "tm:headbutt", + "tm:hex", + "tm:hurricane", + "tm:hydropump", "tm:icebeam", + "tm:icywind", "tm:incinerate", - "tm:naturalgift", + "tm:lastresort", + "tm:ominouswind", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", - "tm:round", "tm:sandstorm", "tm:scald", - "tm:secretpower", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:swagger", + "tm:tailwind", + "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:waterpulse", + "tm:weatherball", "tm:workup", - "tutor:bodyslam", - "tutor:defensecurl", - "tutor:defog", - "tutor:doubleedge", - "tutor:ember", - "tutor:endure", + "tutor:energyball", + "tutor:flamethrower", + "tutor:icebeam", "tutor:icywind", "tutor:lastresort", - "tutor:mimic", "tutor:ominouswind", - "tutor:psychup", + "tutor:rest", + "tutor:shadowball", "tutor:shockwave", "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", "tutor:tailwind", - "tutor:thunderwave", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.castform.desc" + "tutor:thunderbolt", + "tutor:waterpulse", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:defensecurl", + "legacy:defog", + "legacy:doubleedge", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:swift", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 8, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:mystic_water", - "percentage": 5.0 + "forms": [ + { + "name": "Sunny", + "primaryType": "fire", + "maleRatio": 0.5, + "height": 3, + "weight": 8, + "pokedex": [ + "cobblemon.species.castform-sunny.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "sunny-form" + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:heat_rock", + "percentage": 5.0 + } + ] + }, + "evolutions": [], + "battleOnly": true, + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendOwner": true + }, + "fireImmune": true } - ] - }, - "implemented": true + }, + { + "name": "Rainy", + "primaryType": "water", + "maleRatio": 0.5, + "height": 3, + "weight": 8, + "pokedex": [ + "cobblemon.species.castform-rainy.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "rainy-form" + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:damp_rock", + "percentage": 5.0 + } + ] + }, + "evolutions": [], + "battleOnly": true + }, + { + "name": "Snowy", + "primaryType": "ice", + "maleRatio": 0.5, + "height": 3, + "weight": 8, + "pokedex": [ + "cobblemon.species.castform-snowy.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "snowy-form" + ], + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:icy_rock", + "percentage": 5.0 + } + ] + }, + "evolutions": [], + "battleOnly": true + } + ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/corphish.json b/common/src/main/resources/data/cobblemon/species/generation3/corphish.json deleted file mode 100644 index f45c3b24e..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/corphish.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "name": "Corphish", - "nationalPokedexNumber": 341, - "primaryType": "water", - "abilities": [ - "hypercutter", - "shellarmor", - "h:adaptability" - ], - "baseStats": { - "hp": 43, - "attack": 80, - "defence": 65, - "special_attack": 50, - "special_defence": 35, - "speed": 35 - }, - "catchRate": 205, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 62, - "experienceGroup": "fluctuating", - "eggCycles": 15, - "eggGroups": [ - "water_1", - "water_3" - ], - "moves": [ - "1:bubble", - "1:harden", - "1:watergun", - "4:leer", - "7:visegrip", - "8:taunt", - "12:bubblebeam", - "16:knockoff", - "20:doublehit", - "24:protect", - "28:nightslash", - "32:razorshell", - "36:swordsdance", - "40:crunch", - "44:crabhammer", - "48:endeavor", - "52:guillotine", - "egg:ancientpower", - "egg:aquajet", - "egg:bodyslam", - "egg:chipaway", - "egg:doubleedge", - "egg:dragondance", - "egg:endeavor", - "egg:knockoff", - "egg:metalclaw", - "egg:mudsport", - "egg:slash", - "egg:superpower", - "egg:switcheroo", - "egg:trumpcard", - "tm:aerialace", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:crunch", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:dragondance", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:frustration", - "tm:hail", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:irondefense", - "tm:knockoff", - "tm:liquidation", - "tm:metalclaw", - "tm:muddywater", - "tm:mudshot", - "tm:naturalgift", - "tm:payback", - "tm:protect", - "tm:raindance", - "tm:razorshell", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snore", - "tm:strength", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tm:xscissor", - "tutor:ancientpower", - "tutor:bodyslam", - "tutor:bubble", - "tutor:counter", - "tutor:doubleedge", - "tutor:endeavor", - "tutor:endure", - "tutor:furycutter", - "tutor:harden", - "tutor:icywind", - "tutor:irondefense", - "tutor:knockoff", - "tutor:metalclaw", - "tutor:mimic", - "tutor:mudslap", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spite", - "tutor:substitute", - "tutor:superpower", - "tutor:swagger", - "tutor:swordsdance", - "tutor:waterpulse", - "tutor:watersport" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.corphish.desc" - ], - "evolutions": [ - { - "id": "corphish_crawdaunt", - "variant": "level_up", - "result": "crawdaunt", - "consumeHeldItem": false, - "learnableMoves": [ - "swift" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 30 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 115, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json b/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json deleted file mode 100644 index 7a14cfea6..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/crawdaunt.json +++ /dev/null @@ -1,185 +0,0 @@ -{ - "name": "Crawdaunt", - "nationalPokedexNumber": 342, - "primaryType": "water", - "secondaryType": "dark", - "abilities": [ - "hypercutter", - "shellarmor", - "h:adaptability" - ], - "baseStats": { - "hp": 63, - "attack": 120, - "defence": 85, - "special_attack": 90, - "special_defence": 55, - "speed": 55 - }, - "catchRate": 155, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 164, - "experienceGroup": "fluctuating", - "eggCycles": 15, - "eggGroups": [ - "water_1", - "water_3" - ], - "moves": [ - "1:bubble", - "1:harden", - "1:leer", - "1:swift", - "1:taunt", - "1:visegrip", - "1:watergun", - "12:bubblebeam", - "16:knockoff", - "20:doublehit", - "24:protect", - "28:nightslash", - "34:razorshell", - "40:swordsdance", - "46:crunch", - "52:crabhammer", - "58:endeavor", - "64:guillotine", - "tm:aerialace", - "tm:attract", - "tm:avalanche", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:captivate", - "tm:chillingwater", - "tm:closecombat", - "tm:confide", - "tm:crunch", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:dragondance", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:hardpress", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:irondefense", - "tm:knockoff", - "tm:lashout", - "tm:liquidation", - "tm:metalclaw", - "tm:muddywater", - "tm:mudshot", - "tm:nastyplot", - "tm:naturalgift", - "tm:naturepower", - "tm:payback", - "tm:protect", - "tm:raindance", - "tm:razorshell", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:revenge", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scald", - "tm:scaryface", - "tm:secretpower", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snarl", - "tm:snore", - "tm:spite", - "tm:strength", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tm:xscissor", - "tutor:ancientpower", - "tutor:bodyslam", - "tutor:counter", - "tutor:crabhammer", - "tutor:darkpulse", - "tutor:dive", - "tutor:doubleedge", - "tutor:endeavor", - "tutor:endure", - "tutor:furycutter", - "tutor:guillotine", - "tutor:icywind", - "tutor:irondefense", - "tutor:knockoff", - "tutor:lashout", - "tutor:liquidation", - "tutor:mimic", - "tutor:mudslap", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spite", - "tutor:substitute", - "tutor:superpower", - "tutor:swagger", - "tutor:swift", - "tutor:swordsdance", - "tutor:taunt", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.crawdaunt.desc" - ], - "preEvolution": "corphish", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 328, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 192db3de3..cd8a0f20f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/delcatty.json @@ -1,12 +1,27 @@ { - "name": "Delcatty", + "implemented": true, "nationalPokedexNumber": 301, + "name": "Delcatty", "primaryType": "normal", + "maleRatio": 0.25, + "height": 11, + "weight": 326, + "pokedex": [ + "cobblemon.species.delcatty.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [], "abilities": [ "cutecharm", "normalize", "h:wonderskin" ], + "eggGroups": [ + "field", + "fairy" + ], "baseStats": { "hp": 70, "attack": 65, @@ -15,142 +30,199 @@ "special_defence": 55, "speed": 90 }, - "catchRate": 60, - "maleRatio": 0.25, - "shoulderMountable": false, + "evYield": { + "hp": 1, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 1 + }, "baseExperienceYield": 140, "experienceGroup": "fast", + "catchRate": 60, "eggCycles": 15, - "eggGroups": [ - "field", - "fairy" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "entityInteract": { + "avoidedByCreeper": true, + "avoidedByPhantom": true + }, + "resting": { + "times": [ + "167-11833,13702-22299" + ], + "drowsyChance": 0.0021, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + } + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:silk_scarf", + "percentage": 5.0 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5.0 + } + ] + }, "moves": [ + "1:fakeout", "1:attract", + "1:sing", "1:doubleslap", - "1:fakeout", + "1:healbell", + "1:facade", + "1:payback", + "1:covet", + "1:charm", + "1:playrough", "1:growl", - "1:sing", + "1:tailwhip", + "1:tackle", + "1:disarmingvoice", + "1:furyswipes", + "1:copycat", + "1:doubleedge", + "1:babydolleyes", + "1:captivate", + "1:foresight", + "1:assist", + "1:feintattack", + "egg:captivate", + "egg:fakeout", + "egg:mudbomb", + "egg:simplebeam", + "egg:tickle", + "egg:wakeupslap", + "egg:wish", "tm:attract", + "tm:babydolleyes", + "tm:batonpass", "tm:blizzard", + "tm:bodyslam", "tm:calmmind", "tm:captivate", "tm:chargebeam", - "tm:confide", + "tm:charm", + "tm:cosmicpower", + "tm:covet", "tm:dig", - "tm:doubleteam", + "tm:disarmingvoice", + "tm:doubleedge", + "tm:drainingkiss", "tm:dreameater", "tm:echoedvoice", "tm:endure", "tm:facade", + "tm:faketears", "tm:flash", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", - "tm:hiddenpower", + "tm:headbutt", + "tm:healbell", + "tm:helpinghand", "tm:hyperbeam", + "tm:hypervoice", "tm:icebeam", + "tm:icywind", "tm:irontail", - "tm:naturalgift", + "tm:laserfocus", + "tm:lastresort", + "tm:mudslap", + "tm:nastyplot", "tm:payback", + "tm:payday", + "tm:playrough", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:rocksmash", - "tm:round", + "tm:rollout", "tm:safeguard", - "tm:secretpower", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", "tm:solarbeam", + "tm:stompingtantrum", "tm:strength", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", + "tm:tailslap", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", + "tm:uproar", "tm:waterpulse", "tm:wildcharge", "tm:workup", - "tutor:attract", - "tutor:bodyslam", + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:chargebeam", "tutor:covet", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:dreameater", - "tutor:endure", - "tutor:headbutt", + "tutor:gigaimpact", "tutor:healbell", "tutor:helpinghand", + "tutor:hyperbeam", "tutor:hypervoice", + "tutor:icebeam", "tutor:icywind", "tutor:irontail", "tutor:laserfocus", "tutor:lastresort", - "tutor:mimic", "tutor:mudslap", - "tutor:psychup", + "tutor:playrough", + "tutor:rest", + "tutor:rocksmash", "tutor:rollout", - "tutor:secretpower", + "tutor:shadowball", "tutor:shockwave", "tutor:sleeptalk", - "tutor:snore", "tutor:stompingtantrum", - "tutor:substitute", "tutor:suckerpunch", - "tutor:swagger", - "tutor:sweetkiss", - "tutor:swift", - "tutor:thunderwave", + "tutor:thunderbolt", "tutor:uproar", "tutor:waterpulse", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.delcatty.desc" + "tutor:wildcharge", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:swift", + "legacy:toxic", + "special:sweetkiss" ], "preEvolution": "skitty", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 11, - "weight": 326, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:silk_scarf", - "percentage": 5.0 - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true + "evolutions": [] } \ No newline at end of file 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 efd6953bd..d4e76762a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/deoxys.json @@ -1,9 +1,27 @@ { - "name": "Deoxys", + "implemented": true, "nationalPokedexNumber": 386, + "name": "Deoxys", "primaryType": "psychic", + "maleRatio": -1, + "height": 17, + "weight": 608, + "pokedex": [ + "cobblemon.species.deoxys.desc" + ], + "labels": [ + "gen3", + "mythical" + ], + "aspects": [ + "normal-forme" + ], "abilities": [ - "pressure" + "pressure", + "h:pressure" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 50, @@ -13,11 +31,6 @@ "special_defence": 50, "speed": 150 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 270, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 1, @@ -26,55 +39,46 @@ "special_defence": 0, "speed": 1 }, + "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "drops": { + "amount": 5, + "entries": [ + { + "item": "minecraft:eye_of_ender", + "quantityRange": "3-5" + } + ] + }, "moves": [ "1:leer", "1:wrap", "7:nightshade", - "13:doubleteam", "13:teleport", "19:knockoff", - "19:taunt", - "25:psyshock", "25:pursuit", - "25:spikes", "31:psychic", "37:gravity", - "37:protect", - "37:snatch", - "37:superpower", - "37:swift", - "43:psychoshift", "43:skillswap", "49:zenheadbutt", - "55:agility", - "55:amnesia", "55:cosmicpower", - "55:irondefense", "61:recover", - "61:zapcannon", "67:psychoboost", - "73:counter", - "73:extremespeed", "73:hyperbeam", - "73:mirrorcoat", "tm:aerialace", "tm:agility", "tm:allyswitch", - "tm:amnesia", - "tm:avalanche", + "tm:bind", "tm:brickbreak", "tm:brutalswing", "tm:calmmind", "tm:chargebeam", - "tm:confide", + "tm:cosmicpower", "tm:cut", "tm:darkpulse", - "tm:doubleteam", "tm:drainpunch", "tm:dreameater", "tm:endure", @@ -86,26 +90,26 @@ "tm:flashcannon", "tm:fling", "tm:focusblast", - "tm:focuspunch", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:hiddenpower", + "tm:headbutt", "tm:hyperbeam", "tm:icebeam", "tm:icepunch", "tm:icywind", "tm:imprison", - "tm:irondefense", "tm:knockoff", + "tm:laserfocus", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", + "tm:magiccoat", + "tm:megakick", + "tm:megapunch", "tm:meteorbeam", "tm:nastyplot", - "tm:naturalgift", "tm:nightshade", "tm:painsplit", "tm:poisonjab", @@ -115,37 +119,36 @@ "tm:psychic", "tm:psychicnoise", "tm:psychicterrain", + "tm:psychoshift", "tm:psychup", "tm:psyshock", "tm:raindance", "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", + "tm:roleplay", "tm:safeguard", "tm:scaryface", - "tm:secretpower", "tm:shadowball", "tm:shockwave", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", "tm:snatch", "tm:solarbeam", - "tm:spikes", "tm:stealthrock", "tm:stompingtantrum", "tm:storedpower", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", + "tm:superpower", "tm:swift", + "tm:switcheroo", "tm:takedown", - "tm:taunt", "tm:telekinesis", "tm:terablast", "tm:throatchop", @@ -154,98 +157,107 @@ "tm:thunderpunch", "tm:thunderwave", "tm:torment", - "tm:toxic", "tm:trick", "tm:trickroom", "tm:waterpulse", + "tm:wonderroom", "tm:zenheadbutt", + "tutor:aerialace", "tutor:allyswitch", "tutor:bind", - "tutor:bodyslam", - "tutor:cosmicpower", - "tutor:counter", + "tutor:calmmind", + "tutor:chargebeam", "tutor:darkpulse", - "tutor:detect", - "tutor:doubleedge", - "tutor:doubleteam", "tutor:drainpunch", - "tutor:dreameater", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:extremespeed", + "tutor:energyball", + "tutor:expandingforce", "tutor:firepunch", - "tutor:focuspunch", + "tutor:flashcannon", + "tutor:gigaimpact", "tutor:gravity", - "tutor:headbutt", "tutor:hyperbeam", + "tutor:icebeam", "tutor:icepunch", "tutor:icywind", - "tutor:irondefense", "tutor:knockoff", "tutor:laserfocus", - "tutor:leer", "tutor:lowkick", "tutor:magiccoat", - "tutor:megakick", - "tutor:megapunch", - "tutor:meteormash", - "tutor:mimic", - "tutor:mirrorcoat", - "tutor:mudslap", - "tutor:nastyplot", - "tutor:nightmare", - "tutor:nightshade", + "tutor:meteorbeam", + "tutor:painsplit", + "tutor:poisonjab", "tutor:psychic", - "tutor:psychoboost", - "tutor:psychup", - "tutor:pursuit", - "tutor:recover", "tutor:recycle", + "tutor:rest", "tutor:rockslide", + "tutor:rocksmash", "tutor:roleplay", - "tutor:seismictoss", + "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", "tutor:skillswap", "tutor:sleeptalk", "tutor:snatch", - "tutor:snore", - "tutor:spikes", "tutor:stealthrock", "tutor:stompingtantrum", - "tutor:substitute", "tutor:superpower", - "tutor:swagger", "tutor:swift", - "tutor:taunt", "tutor:telekinesis", "tutor:throatchop", + "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thunderwave", "tutor:trick", "tutor:waterpulse", "tutor:wonderroom", - "tutor:wrap", - "tutor:zapcannon", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.deoxys.desc" + "tutor:zenheadbutt", + "legacy:amnesia", + "legacy:avalanche", + "legacy:bodyslam", + "legacy:confide", + "legacy:counter", + "legacy:doubleedge", + "legacy:doubleteam", + "legacy:dynamicpunch", + "legacy:extremespeed", + "legacy:focuspunch", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:irondefense", + "legacy:mimic", + "legacy:mirrorcoat", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:nightmare", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:seismictoss", + "legacy:snore", + "legacy:spikes", + "legacy:swagger", + "legacy:taunt", + "legacy:toxic", + "legacy:zapcannon", + "special:detect", + "special:meteormash" ], - "height": 17, - "weight": 608, "evolutions": [], "forms": [ { "name": "Attack", "primaryType": "psychic", - "abilities": [ - "pressure" + "maleRatio": -1, + "height": 17, + "weight": 608, + "pokedex": [ + "cobblemon.species.deoxys-attack.desc" + ], + "labels": [ + "gen4", + "mythical" + ], + "aspects": [ + "attack-forme" ], "baseStats": { "hp": 50, @@ -255,10 +267,6 @@ "special_defence": 20, "speed": 150 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 270, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 2, @@ -267,38 +275,182 @@ "special_defence": 0, "speed": 0 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen3", - "mythical", - "legendary" - ], - "aspects": [ - "attack" + "moves": [ + "1:leer", + "1:wrap", + "7:nightshade", + "13:teleport", + "19:taunt", + "25:pursuit", + "31:psychic", + "37:superpower", + "43:skillswap", + "49:zenheadbutt", + "55:cosmicpower", + "61:zapcannon", + "67:psychoboost", + "73:hyperbeam", + "tm:aerialace", + "tm:agility", + "tm:allyswitch", + "tm:bind", + "tm:brickbreak", + "tm:brutalswing", + "tm:calmmind", + "tm:chargebeam", + "tm:cosmicpower", + "tm:cut", + "tm:darkpulse", + "tm:drainpunch", + "tm:dreameater", + "tm:endure", + "tm:energyball", + "tm:expandingforce", + "tm:facade", + "tm:firepunch", + "tm:flash", + "tm:flashcannon", + "tm:fling", + "tm:focusblast", + "tm:futuresight", + "tm:gigaimpact", + "tm:grassknot", + "tm:gravity", + "tm:headbutt", + "tm:hyperbeam", + "tm:icebeam", + "tm:icepunch", + "tm:icywind", + "tm:imprison", + "tm:knockoff", + "tm:laserfocus", + "tm:lightscreen", + "tm:lowkick", + "tm:lowsweep", + "tm:magiccoat", + "tm:megakick", + "tm:megapunch", + "tm:meteorbeam", + "tm:nastyplot", + "tm:nightshade", + "tm:painsplit", + "tm:poisonjab", + "tm:poweruppunch", + "tm:protect", + "tm:psybeam", + "tm:psychic", + "tm:psychicnoise", + "tm:psychicterrain", + "tm:psychoshift", + "tm:psychup", + "tm:psyshock", + "tm:raindance", + "tm:recycle", + "tm:reflect", + "tm:rest", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:roleplay", + "tm:safeguard", + "tm:scaryface", + "tm:shadowball", + "tm:shockwave", + "tm:signalbeam", + "tm:skillswap", + "tm:sleeptalk", + "tm:snatch", + "tm:solarbeam", + "tm:stealthrock", + "tm:stompingtantrum", + "tm:storedpower", + "tm:strength", + "tm:substitute", + "tm:sunnyday", + "tm:superpower", + "tm:swift", + "tm:takedown", + "tm:taunt", + "tm:telekinesis", + "tm:terablast", + "tm:throatchop", + "tm:thunder", + "tm:thunderbolt", + "tm:thunderpunch", + "tm:thunderwave", + "tm:torment", + "tm:trick", + "tm:trickroom", + "tm:waterpulse", + "tm:wonderroom", + "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" ], - "height": 17, - "weight": 608, - "cannotDynamax": false, - "battleOnly": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - } + "evolutions": [], + "battleOnly": false }, { "name": "Defense", "primaryType": "psychic", - "abilities": [ - "pressure" + "maleRatio": -1, + "height": 17, + "weight": 608, + "pokedex": [ + "cobblemon.species.deoxys-defense.desc" + ], + "labels": [ + "gen4", + "mythical" + ], + "aspects": [ + "defense-forme" ], "baseStats": { "hp": 50, @@ -308,10 +460,6 @@ "special_defence": 160, "speed": 90 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 270, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -320,38 +468,189 @@ "special_defence": 1, "speed": 0 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen3", - "mythical", - "legendary" - ], - "aspects": [ - "defense" + "moves": [ + "1:leer", + "1:wrap", + "7:nightshade", + "13:teleport", + "19:knockoff", + "25:spikes", + "31:psychic", + "37:protect", + "43:skillswap", + "49:zenheadbutt", + "55:irondefense", + "55:amnesia", + "61:recover", + "67:psychoboost", + "73:counter", + "73:mirrorcoat", + "tm:aerialace", + "tm:agility", + "tm:allyswitch", + "tm:amnesia", + "tm:bind", + "tm:brickbreak", + "tm:brutalswing", + "tm:calmmind", + "tm:chargebeam", + "tm:cosmicpower", + "tm:cut", + "tm:darkpulse", + "tm:drainpunch", + "tm:dreameater", + "tm:endure", + "tm:energyball", + "tm:expandingforce", + "tm:facade", + "tm:firepunch", + "tm:flash", + "tm:flashcannon", + "tm:fling", + "tm:focusblast", + "tm:futuresight", + "tm:gigaimpact", + "tm:grassknot", + "tm:gravity", + "tm:headbutt", + "tm:hyperbeam", + "tm:icebeam", + "tm:icepunch", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:knockoff", + "tm:laserfocus", + "tm:lightscreen", + "tm:lowkick", + "tm:lowsweep", + "tm:magiccoat", + "tm:megakick", + "tm:megapunch", + "tm:meteorbeam", + "tm:nightshade", + "tm:painsplit", + "tm:poisonjab", + "tm:poweruppunch", + "tm:protect", + "tm:psybeam", + "tm:psychic", + "tm:psychicnoise", + "tm:psychicterrain", + "tm:psychoshift", + "tm:psychup", + "tm:psyshock", + "tm:raindance", + "tm:recycle", + "tm:reflect", + "tm:rest", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:roleplay", + "tm:safeguard", + "tm:scaryface", + "tm:shadowball", + "tm:shockwave", + "tm:signalbeam", + "tm:skillswap", + "tm:sleeptalk", + "tm:snatch", + "tm:solarbeam", + "tm:spikes", + "tm:stealthrock", + "tm:stompingtantrum", + "tm:storedpower", + "tm:strength", + "tm:substitute", + "tm:sunnyday", + "tm:superpower", + "tm:swift", + "tm:switcheroo", + "tm:takedown", + "tm:taunt", + "tm:telekinesis", + "tm:terablast", + "tm:throatchop", + "tm:thunder", + "tm:thunderbolt", + "tm:thunderpunch", + "tm:thunderwave", + "tm:torment", + "tm:trick", + "tm:trickroom", + "tm:waterpulse", + "tm:wonderroom", + "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" ], - "height": 17, - "weight": 608, - "cannotDynamax": false, - "battleOnly": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - } + "evolutions": [], + "battleOnly": false }, { "name": "Speed", "primaryType": "psychic", - "abilities": [ - "pressure" + "maleRatio": -1, + "height": 17, + "weight": 608, + "pokedex": [ + "cobblemon.species.deoxys-speed.desc" + ], + "labels": [ + "gen4", + "mythical" + ], + "aspects": [ + "speed-forme" ], "baseStats": { "hp": 50, @@ -361,10 +660,6 @@ "special_defence": 90, "speed": 180 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 270, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -373,43 +668,190 @@ "special_defence": 0, "speed": 3 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "moves": [ + "1:leer", + "1:wrap", + "7:nightshade", + "13:doubleteam", + "19:knockoff", + "25:pursuit", + "31:psychic", + "37:swift", + "43:skillswap", + "49:zenheadbutt", + "55:agility", + "61:recover", + "67:psychoboost", + "73:extremespeed", + "tm:aerialace", + "tm:agility", + "tm:allyswitch", + "tm:amnesia", + "tm:bind", + "tm:brickbreak", + "tm:brutalswing", + "tm:calmmind", + "tm:chargebeam", + "tm:cosmicpower", + "tm:cut", + "tm:darkpulse", + "tm:doubleteam", + "tm:drainpunch", + "tm:dreameater", + "tm:endure", + "tm:energyball", + "tm:expandingforce", + "tm:facade", + "tm:firepunch", + "tm:flash", + "tm:flashcannon", + "tm:fling", + "tm:focusblast", + "tm:futuresight", + "tm:gigaimpact", + "tm:grassknot", + "tm:gravity", + "tm:headbutt", + "tm:hyperbeam", + "tm:icebeam", + "tm:icepunch", + "tm:icywind", + "tm:imprison", + "tm:knockoff", + "tm:laserfocus", + "tm:lightscreen", + "tm:lowkick", + "tm:lowsweep", + "tm:magiccoat", + "tm:megakick", + "tm:megapunch", + "tm:meteorbeam", + "tm:nastyplot", + "tm:nightshade", + "tm:painsplit", + "tm:poisonjab", + "tm:poweruppunch", + "tm:protect", + "tm:psybeam", + "tm:psychic", + "tm:psychicnoise", + "tm:psychicterrain", + "tm:psychoshift", + "tm:psychup", + "tm:psyshock", + "tm:raindance", + "tm:recycle", + "tm:reflect", + "tm:rest", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:roleplay", + "tm:safeguard", + "tm:scaryface", + "tm:shadowball", + "tm:shockwave", + "tm:signalbeam", + "tm:skillswap", + "tm:sleeptalk", + "tm:snatch", + "tm:solarbeam", + "tm:stealthrock", + "tm:stompingtantrum", + "tm:storedpower", + "tm:strength", + "tm:substitute", + "tm:sunnyday", + "tm:superpower", + "tm:swift", + "tm:takedown", + "tm:taunt", + "tm:telekinesis", + "tm:terablast", + "tm:throatchop", + "tm:thunder", + "tm:thunderbolt", + "tm:thunderpunch", + "tm:thunderwave", + "tm:torment", + "tm:trick", + "tm:trickroom", + "tm:waterpulse", + "tm:wonderroom", + "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" ], - "labels": [ - "gen3", - "mythical", - "legendary" - ], - "aspects": [ - "speed" - ], - "height": 17, - "weight": 608, - "cannotDynamax": false, - "battleOnly": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:eye_of_ender", - "quantityRange": "3-5" - } - ] - } + "evolutions": [], + "battleOnly": false } ], - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:eye_of_ender" + "behaviour": { + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file 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 cc8fccc53..852bc1aa9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/dustox.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/dustox.json @@ -1,12 +1,26 @@ { - "name": "Dustox", + "implemented": true, "nationalPokedexNumber": 269, + "name": "Dustox", "primaryType": "bug", "secondaryType": "poison", + "maleRatio": 0.5, + "height": 12, + "weight": 316, + "pokedex": [ + "cobblemon.species.dustox.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [], "abilities": [ "shielddust", "h:compoundeyes" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 60, "attack": 50, @@ -15,23 +29,54 @@ "special_defence": 90, "speed": 65 }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 173, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 3, + "speed": 0 + }, + "baseExperienceYield": 193, "experienceGroup": "medium_fast", + "catchRate": 45, "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "cobblemon:silver_powder", + "percentage": 5.0 + }, + { + "item": "cobblemon:shed_shell", + "percentage": 5.0 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5.0 + } + ] + }, "moves": [ "1:gust", + "1:stringshot", + "1:bugbite", + "1:tackle", + "1:harden", + "1:poisonsting", "12:confusion", "15:poisonpowder", "17:moonlight", "20:venoshock", "22:psybeam", - "25:silverwind", "27:lightscreen", "30:whirlwind", "32:toxic", @@ -40,103 +85,112 @@ "40:quiverdance", "tm:acrobatics", "tm:aerialace", - "tm:attract", - "tm:captivate", - "tm:confide", + "tm:aircutter", + "tm:bugbite", + "tm:bugbuzz", "tm:defog", - "tm:doubleteam", + "tm:dualwingbeat", + "tm:electroweb", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:frustration", "tm:gigadrain", "tm:gigaimpact", - "tm:hiddenpower", "tm:hyperbeam", "tm:infestation", + "tm:irondefense", + "tm:laserfocus", "tm:lightscreen", - "tm:naturalgift", + "tm:ominouswind", "tm:protect", + "tm:psybeam", "tm:psychic", "tm:rest", - "tm:return", "tm:roost", - "tm:round", - "tm:secretpower", "tm:shadowball", + "tm:signalbeam", "tm:silverwind", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgebomb", "tm:solarbeam", + "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:swagger", + "tm:tailwind", + "tm:terablast", "tm:thief", "tm:toxic", + "tm:twister", "tm:uturn", + "tm:venomdrench", "tm:venoshock", + "tutor:aerialace", "tutor:aircutter", "tutor:bugbite", "tutor:defog", - "tutor:doubleedge", + "tutor:dualwingbeat", "tutor:electroweb", - "tutor:endure", + "tutor:energyball", "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", "tutor:laserfocus", - "tutor:mimic", "tutor:ominouswind", + "tutor:psychic", + "tutor:rest", "tutor:roost", + "tutor:shadowball", "tutor:signalbeam", + "tutor:skittersmack", "tutor:sleeptalk", - "tutor:snore", + "tutor:sludgebomb", "tutor:stringshot", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", "tutor:tailwind", - "tutor:twister" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.dustox.desc" + "tutor:twister", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:doubleedge", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:swift" ], "preEvolution": "cascoon", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 12, - "weight": 316, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:silver_powder", - "percentage": 5.0 + "behaviour": { + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true }, - { - "item": "cobblemon:pecha_berry", - "percentage": 5.0 + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/electrike.json b/common/src/main/resources/data/cobblemon/species/generation3/electrike.json deleted file mode 100644 index 58e3f01d6..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/electrike.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "name": "Electrike", - "nationalPokedexNumber": 309, - "primaryType": "electric", - "abilities": [ - "static", - "lightningrod", - "h:minus" - ], - "baseStats": { - "hp": 40, - "attack": 45, - "defence": 40, - "special_attack": 65, - "special_defence": 40, - "speed": 65 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 59, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:tackle", - "1:thunderwave", - "4:leer", - "8:howl", - "12:quickattack", - "13:spark", - "16:odorsleuth", - "16:shockwave", - "20:bite", - "24:thunderfang", - "28:roar", - "32:discharge", - "36:charge", - "40:wildcharge", - "44:thunder", - "egg:crunch", - "egg:curse", - "egg:discharge", - "egg:eerieimpulse", - "egg:electroball", - "egg:firefang", - "egg:flameburst", - "egg:headbutt", - "egg:icefang", - "egg:shockwave", - "egg:spark", - "egg:swift", - "egg:switcheroo", - "egg:thunderfang", - "egg:uproar", - "tm:agility", - "tm:attract", - "tm:bodyslam", - "tm:captivate", - "tm:chargebeam", - "tm:confide", - "tm:crunch", - "tm:doubleteam", - "tm:eerieimpulse", - "tm:electroball", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:flamethrower", - "tm:flash", - "tm:frustration", - "tm:hiddenpower", - "tm:icefang", - "tm:irontail", - "tm:lightscreen", - "tm:naturalgift", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:round", - "tm:secretpower", - "tm:shockwave", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:strength", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderwave", - "tm:toxic", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:bodyslam", - "tutor:doubleedge", - "tutor:endure", - "tutor:headbutt", - "tutor:icefang", - "tutor:irontail", - "tutor:magnetrise", - "tutor:mimic", - "tutor:mudslap", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:thunderwave", - "tutor:uproar" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.electrike.desc" - ], - "evolutions": [ - { - "id": "electrike_manectric", - "variant": "level_up", - "result": "manectric", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 26 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 6, - "weight": 152, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:bone", - "quantityRange": "0-1" - }, - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:cheri_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/feebas.json b/common/src/main/resources/data/cobblemon/species/generation3/feebas.json deleted file mode 100644 index 0f62dc16e..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/feebas.json +++ /dev/null @@ -1,165 +0,0 @@ -{ - "name": "Feebas", - "nationalPokedexNumber": 349, - "primaryType": "water", - "abilities": [ - "swiftswim", - "oblivious", - "h:adaptability" - ], - "baseStats": { - "hp": 20, - "attack": 15, - "defence": 20, - "special_attack": 10, - "special_defence": 55, - "speed": 80 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 40, - "experienceGroup": "erratic", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "dragon" - ], - "moves": [ - "1:splash", - "15:tackle", - "25:flail", - "egg:brine", - "egg:captivate", - "egg:confuseray", - "egg:dragonbreath", - "egg:dragonpulse", - "egg:haze", - "egg:hypnosis", - "egg:irontail", - "egg:lightscreen", - "egg:mirrorcoat", - "egg:mist", - "egg:mudsport", - "egg:tickle", - "tm:attract", - "tm:blizzard", - "tm:brine", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:confuseray", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:dragonpulse", - "tm:endure", - "tm:facade", - "tm:frustration", - "tm:hail", - "tm:haze", - "tm:hiddenpower", - "tm:icebeam", - "tm:icywind", - "tm:irontail", - "tm:lightscreen", - "tm:muddywater", - "tm:mudshot", - "tm:naturalgift", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:scald", - "tm:scaleshot", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:terablast", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:captivate", - "tutor:dive", - "tutor:doubleedge", - "tutor:dragonpulse", - "tutor:endure", - "tutor:icywind", - "tutor:irontail", - "tutor:mimic", - "tutor:mirrorcoat", - "tutor:scaleshot", - "tutor:sleeptalk", - "tutor:snore", - "tutor:splash", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.feebas.desc" - ], - "evolutions": [ - { - "id": "feebas_milotic", - "variant": "trade", - "result": "milotic", - "consumeHeldItem": true, - "learnableMoves": [ - "waterpulse" - ], - "requirements": [ - { - "variant": "held_item", - "itemCondition": "cobblemon:prism_scale" - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 6, - "weight": 74, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:salmon" - }, - { - "item": "minecraft:bone_meal", - "percentage": 5.0 - }, - { - "item": "cobblemon:prism_scale", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json b/common/src/main/resources/data/cobblemon/species/generation3/glalie.json deleted file mode 100644 index a135c7f5b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/glalie.json +++ /dev/null @@ -1,228 +0,0 @@ -{ - "name": "Glalie", - "nationalPokedexNumber": 362, - "primaryType": "ice", - "abilities": [ - "innerfocus", - "icebody", - "h:moody" - ], - "baseStats": { - "hp": 80, - "attack": 80, - "defence": 80, - "special_attack": 80, - "special_defence": 80, - "speed": 80 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "ice", - "abilities": [ - "refrigerate" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 80, - "special_attack": 120, - "special_defence": 80, - "speed": 100 - }, - "catchRate": 75, - "maleRatio": 0.5, - "baseExperienceYield": 168, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "mineral" - ], - "labels": [ - "gen6", - "mega" - ], - "aspects": [ - "mega" - ], - "height": 21, - "weight": 3502, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 168, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "mineral" - ], - "moves": [ - "1:astonish", - "1:doubleteam", - "1:freezedry", - "1:headbutt", - "1:leer", - "1:powdersnow", - "1:sheercold", - "15:iceshard", - "20:protect", - "25:icywind", - "30:frostbreath", - "35:bite", - "37:icebeam", - "40:icefang", - "47:hail", - "47:snowscape", - "54:weatherball", - "61:crunch", - "68:blizzard", - "tm:attract", - "tm:avalanche", - "tm:blizzard", - "tm:bodyslam", - "tm:bulldoze", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:crunch", - "tm:darkpulse", - "tm:doubleteam", - "tm:earthquake", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:foulplay", - "tm:frostbreath", - "tm:frustration", - "tm:gigaimpact", - "tm:gyroball", - "tm:hail", - "tm:helpinghand", - "tm:hex", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icespinner", - "tm:iciclespear", - "tm:icywind", - "tm:ironhead", - "tm:lightscreen", - "tm:naturalgift", - "tm:payback", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scaryface", - "tm:secretpower", - "tm:selfdestruct", - "tm:shadowball", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:spikes", - "tm:spite", - "tm:substitute", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:waterpulse", - "tm:weatherball", - "tutor:block", - "tutor:bodyslam", - "tutor:darkpulse", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:endure", - "tutor:explosion", - "tutor:headbutt", - "tutor:icywind", - "tutor:ironhead", - "tutor:laserfocus", - "tutor:mimic", - "tutor:rollout", - "tutor:selfdestruct", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spite", - "tutor:steelroller", - "tutor:substitute", - "tutor:superfang", - "tutor:swagger", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.glalie.desc" - ], - "preEvolution": "snorunt", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 2565, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:snowball", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:dawn_stone", - "percentage": 5.0 - }, - { - "item": "cobblemon:never_melt_ice", - "percentage": 5.0 - }, - { - "item": "cobblemon:babiri_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 796341506..ddc9475c7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/groudon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/groudon.json @@ -1,9 +1,28 @@ { - "name": "Groudon", + "implemented": true, "nationalPokedexNumber": 383, + "name": "Groudon", "primaryType": "ground", + "maleRatio": -1, + "height": 35, + "weight": 9500, + "pokedex": [ + "cobblemon.species.groudon.desc" + ], + "labels": [ + "gen3", + "legendary", + "restricted" + ], + "aspects": [ + "standard" + ], "abilities": [ - "drought" + "drought", + "h:drought" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -13,71 +32,60 @@ "special_defence": 90, "speed": 90 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Primal", - "primaryType": "ground", - "secondaryType": "fire", - "abilities": [ - "desolateland" - ], - "baseStats": { - "hp": 100, - "attack": 180, - "defence": 160, - "special_attack": 150, - "special_defence": 90, - "speed": 90 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 335, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen6", - "primal", - "legendary" - ], - "aspects": [ - "primal" - ], - "height": 50, - "weight": 9997, - "cannotDynamax": false, - "battleOnly": true - } - ], + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 335, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canBreatheInLava": true, + "canSwimInLava": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "fireImmune": true + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:nether_star" + } + ] + }, "moves": [ - "1:ancientpower", - "1:lavaplume", "1:mudshot", - "1:precipiceblades", "1:scaryface", + "1:lavaplume", + "1:ancientpower", + "1:precipiceblades", "9:earthpower", "18:bulkup", - "20:slash", "27:earthquake", "36:hammerarm", "45:fissure", @@ -86,21 +94,20 @@ "81:solarbeam", "90:eruption", "tm:aerialace", + "tm:ancientpower", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", "tm:bulldoze", - "tm:confide", "tm:crunch", "tm:cut", "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:dragonclaw", "tm:dragonpulse", - "tm:dragontail", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -112,13 +119,13 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:frustration", + "tm:furycutter", "tm:gigaimpact", + "tm:headbutt", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", "tm:helpinghand", - "tm:hiddenpower", "tm:highhorsepower", "tm:honeclaws", "tm:hyperbeam", @@ -130,13 +137,10 @@ "tm:metalclaw", "tm:mudshot", "tm:mudslap", - "tm:naturalgift", "tm:overheat", "tm:poweruppunch", "tm:protect", - "tm:psychup", "tm:rest", - "tm:return", "tm:roar", "tm:rockblast", "tm:rockclimb", @@ -144,18 +148,16 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", + "tm:rollout", "tm:safeguard", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", "tm:scorchingsands", - "tm:secretpower", "tm:shadowclaw", "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:solarbeam", "tm:spikes", "tm:stealthrock", @@ -164,7 +166,6 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swordsdance", "tm:takedown", "tm:terablast", @@ -172,89 +173,102 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", - "tm:uproar", "tm:willowisp", "tm:zenheadbutt", + "tutor:aerialace", "tutor:ancientpower", "tutor:block", - "tutor:bodyslam", "tutor:bulkup", - "tutor:counter", - "tutor:defensecurl", - "tutor:doubleedge", + "tutor:bulldoze", "tutor:dragonpulse", - "tutor:dynamicpunch", "tutor:earthpower", - "tutor:endure", - "tutor:eruption", - "tutor:fireblast", + "tutor:firefang", "tutor:firepunch", + "tutor:flamethrower", + "tutor:focuspunch", "tutor:furycutter", - "tutor:headbutt", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", "tutor:ironhead", "tutor:irontail", - "tutor:lavaplume", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", "tutor:mudslap", - "tutor:precipiceblades", - "tutor:psychup", + "tutor:rest", "tutor:rockslide", + "tutor:rocksmash", "tutor:rollout", - "tutor:scaryface", "tutor:scorchingsands", - "tutor:seismictoss", + "tutor:shadowclaw", "tutor:shockwave", - "tutor:slash", "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", + "tutor:spikes", "tutor:stealthrock", "tutor:stompingtantrum", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:swordsdance", + "tutor:stoneedge", + "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thunderwave", - "tutor:uproar" - ], - "labels": [ - "gen3", - "legendary" - ], - "pokedex": [ - "cobblemon.species.groudon.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:counter", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:dragontail", + "legacy:dynamicpunch", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:psychup", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:seismictoss", + "legacy:slash", + "legacy:snore", + "legacy:swagger", + "legacy:swift", + "legacy:toxic", + "legacy:uproar" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 35, - "weight": 9500, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:nether_star" - } - ] - }, - "implemented": true + "forms": [ + { + "name": "Primal", + "primaryType": "ground", + "secondaryType": "fire", + "maleRatio": -1, + "height": 50, + "weight": 9997, + "pokedex": [ + "cobblemon.species.groudon-primal.desc" + ], + "labels": [ + "gen6", + "legendary", + "restricted", + "primal" + ], + "aspects": [ + "primal" + ], + "abilities": [ + "desolateland", + "h:desolateland" + ], + "baseStats": { + "hp": 100, + "attack": 180, + "defence": 160, + "special_attack": 150, + "special_defence": 90, + "speed": 90 + }, + "baseExperienceYield": 385, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + } + ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json b/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json deleted file mode 100644 index 436377fc5..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/grumpig.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "name": "Grumpig", - "nationalPokedexNumber": 326, - "primaryType": "psychic", - "abilities": [ - "thickfat", - "owntempo", - "h:gluttony" - ], - "baseStats": { - "hp": 80, - "attack": 45, - "defence": 65, - "special_attack": 90, - "special_defence": 110, - "speed": 80 - }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 165, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:belch", - "1:confusion", - "1:odorsleuth", - "1:psybeam", - "1:psywave", - "1:splash", - "1:teeterdance", - "18:psychup", - "21:magiccoat", - "22:confuseray", - "26:zenheadbutt", - "29:powergem", - "35:rest", - "35:snore", - "42:psyshock", - "46:payback", - "52:psychic", - "60:bounce", - "tm:amnesia", - "tm:attract", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulldoze", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:chillingwater", - "tm:confide", - "tm:confuseray", - "tm:dazzlinggleam", - "tm:dig", - "tm:doubleteam", - "tm:drainpunch", - "tm:dreameater", - "tm:earthpower", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:firepunch", - "tm:flash", - "tm:flashcannon", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icepunch", - "tm:icywind", - "tm:imprison", - "tm:irontail", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:lunge", - "tm:metronome", - "tm:mudshot", - "tm:mudslap", - "tm:nastyplot", - "tm:naturalgift", - "tm:nightshade", - "tm:payback", - "tm:powergem", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:shadowball", - "tm:shockwave", - "tm:skillswap", - "tm:sleeptalk", - "tm:snarl", - "tm:snatch", - "tm:snowscape", - "tm:stompingtantrum", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunderpunch", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:bodyslam", - "tutor:bounce", - "tutor:counter", - "tutor:covet", - "tutor:doubleedge", - "tutor:drainpunch", - "tutor:dreameater", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:headbutt", - "tutor:healbell", - "tutor:icepunch", - "tutor:icywind", - "tutor:irontail", - "tutor:laserfocus", - "tutor:magiccoat", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mudslap", - "tutor:psychup", - "tutor:recycle", - "tutor:roleplay", - "tutor:seismictoss", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:telekinesis", - "tutor:thunderpunch", - "tutor:trick", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.grumpig.desc" - ], - "preEvolution": "spoink", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 9, - "weight": 715, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 6, - "entries": [ - { - "item": "minecraft:porkchop", - "quantityRange": "1-3" - }, - { - "item": "minecraft:ender_pearl", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:tanga_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 8ed78e928..e1faf6441 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/gulpin.json @@ -1,12 +1,26 @@ { - "name": "Gulpin", + "implemented": true, "nationalPokedexNumber": 316, + "name": "Gulpin", "primaryType": "poison", + "maleRatio": 0.5, + "height": 4, + "weight": 103, + "pokedex": [ + "cobblemon.species.gulpin.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [], "abilities": [ "liquidooze", "stickyhold", "h:gluttony" ], + "eggGroups": [ + "amorphous" + ], "baseStats": { "hp": 70, "attack": 43, @@ -15,15 +29,53 @@ "special_defence": 53, "speed": 40 }, - "catchRate": 225, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 1, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 60, "experienceGroup": "fluctuating", + "catchRate": 225, "eggCycles": 20, - "eggGroups": [ - "amorphous" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "combat": { + "willDefendOwner": true + } + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:black_sludge", + "percentage": 2.5 + }, + { + "item": "cobblemon:oran_berry", + "percentage": 2.5 + } + ] + }, "moves": [ "1:pound", "5:yawn", @@ -33,35 +85,27 @@ "17:acidspray", "20:encore", "25:toxic", - "28:spitup", "28:stockpile", + "28:spitup", "28:swallow", "33:sludgebomb", "36:gastroacid", "41:belch", - "44:painsplit", "44:wringout", "49:gunkshot", "egg:acidarmor", "egg:clearsmog", "egg:curse", "egg:destinybond", - "egg:dreameater", - "egg:gunkshot", "egg:mudslap", - "egg:painsplit", "egg:smog", "egg:stuffcheeks", - "egg:venomdrench", "tm:acidspray", "tm:amnesia", - "tm:attract", "tm:bodyslam", "tm:bulletseed", - "tm:captivate", - "tm:confide", + "tm:corrosivegas", "tm:curse", - "tm:doubleteam", "tm:dreameater", "tm:encore", "tm:endure", @@ -69,28 +113,26 @@ "tm:facade", "tm:firepunch", "tm:fling", - "tm:frustration", + "tm:gastroacid", "tm:gigadrain", "tm:gunkshot", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:icebeam", "tm:icepunch", "tm:infestation", "tm:mudshot", "tm:mudslap", - "tm:naturalgift", "tm:painsplit", "tm:poisonjab", "tm:poweruppunch", "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:rocksmash", - "tm:round", - "tm:secretpower", + "tm:rollout", "tm:seedbomb", + "tm:selfdestruct", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", @@ -101,7 +143,6 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swordsdance", "tm:takedown", "tm:terablast", @@ -110,48 +151,50 @@ "tm:thunderwave", "tm:toxic", "tm:toxicspikes", + "tm:venomdrench", "tm:venoshock", "tm:waterpulse", - "tutor:acidarmor", - "tutor:bodyslam", - "tutor:counter", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:dreameater", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:explosion", + "tutor:corrosivegas", "tutor:firepunch", "tutor:gastroacid", "tutor:gigadrain", "tutor:gunkshot", - "tutor:headbutt", + "tutor:helpinghand", + "tutor:icebeam", "tutor:icepunch", - "tutor:mimic", "tutor:mudslap", - "tutor:nightmare", "tutor:painsplit", - "tutor:poisongas", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", "tutor:rollout", "tutor:seedbomb", - "tutor:selfdestruct", + "tutor:shadowball", "tutor:shockwave", - "tutor:sing", "tutor:sleeptalk", - "tutor:sludge", + "tutor:sludgebomb", "tutor:snatch", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", "tutor:thunderpunch", - "tutor:toxic", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.gulpin.desc" + "tutor:waterpulse", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:counter", + "legacy:defensecurl", + "legacy:doubleedge", + "legacy:doubleteam", + "legacy:dynamicpunch", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:nightmare", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "special:sing" ], "evolutions": [ { @@ -169,38 +212,5 @@ } ] } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 103, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:black_sludge", - "percentage": 2.5 - }, - { - "item": "cobblemon:oran_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true + ] } \ 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 4175921bf..e7616a372 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/jirachi.json @@ -1,10 +1,26 @@ { - "name": "Jirachi", + "implemented": true, "nationalPokedexNumber": 385, + "name": "Jirachi", "primaryType": "steel", "secondaryType": "psychic", + "maleRatio": -1, + "height": 3, + "weight": 11, + "pokedex": [ + "cobblemon.species.jirachi.desc" + ], + "labels": [ + "gen3", + "mythical" + ], + "aspects": [], "abilities": [ - "serenegrace" + "serenegrace", + "h:serenegrace" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,24 +30,33 @@ "special_defence": 100, "speed": 100 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 100, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:confusion", "1:wish", + "1:confusion", + "1:refresh", + "1:luckychant", "7:swift", - "14:helpinghand", "21:lifedew", - "25:refresh", "28:zenheadbutt", - "30:luckychant", "35:gravity", "42:psychic", "49:meteormash", @@ -42,21 +67,19 @@ "84:cosmicpower", "91:lastresort", "98:doomdesire", - "tm:aerialace", "tm:allyswitch", "tm:amnesia", + "tm:ancientpower", "tm:aurasphere", "tm:batonpass", "tm:bodyslam", "tm:calmmind", "tm:chargebeam", "tm:charm", - "tm:confide", "tm:confuseray", "tm:cosmicpower", "tm:dazzlinggleam", "tm:doubleedge", - "tm:doubleteam", "tm:drainpunch", "tm:dreameater", "tm:encore", @@ -69,20 +92,21 @@ "tm:flash", "tm:flashcannon", "tm:fling", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:icepunch", "tm:icywind", "tm:imprison", "tm:irondefense", "tm:ironhead", + "tm:lastresort", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:megakick", "tm:megapunch", @@ -90,7 +114,6 @@ "tm:meteorbeam", "tm:metronome", "tm:mudslap", - "tm:naturalgift", "tm:playrough", "tm:poweruppunch", "tm:protect", @@ -103,22 +126,18 @@ "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", "tm:sandstorm", - "tm:secretpower", "tm:shadowball", "tm:shockwave", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:stealthrock", "tm:steelbeam", "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:telekinesis", "tm:terablast", @@ -126,33 +145,26 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:trick", "tm:trickroom", - "tm:uproar", "tm:uturn", "tm:waterpulse", "tm:zenheadbutt", + "tutor:allyswitch", "tutor:ancientpower", - "tutor:bodyslam", - "tutor:confusion", - "tutor:cosmicpower", - "tutor:defensecurl", - "tutor:doubleedge", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", "tutor:dracometeor", "tutor:drainpunch", - "tutor:dreameater", - "tutor:dynamicpunch", - "tutor:endure", + "tutor:energyball", "tutor:expandingforce", "tutor:firepunch", - "tutor:followme", + "tutor:flashcannon", + "tutor:gigaimpact", "tutor:gravity", - "tutor:happyhour", - "tutor:headbutt", - "tutor:healingwish", - "tutor:heartstamp", "tutor:helpinghand", + "tutor:hyperbeam", "tutor:icepunch", "tutor:icywind", "tutor:irondefense", @@ -161,65 +173,71 @@ "tutor:magiccoat", "tutor:magicroom", "tutor:meteorbeam", - "tutor:meteormash", - "tutor:metronome", - "tutor:mimic", - "tutor:moonblast", "tutor:mudslap", - "tutor:nightmare", "tutor:playrough", "tutor:psychic", - "tutor:psychup", "tutor:recycle", - "tutor:refresh", "tutor:rest", - "tutor:return", + "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", "tutor:skillswap", "tutor:sleeptalk", - "tutor:snore", "tutor:stealthrock", "tutor:steelbeam", - "tutor:substitute", - "tutor:swagger", "tutor:swift", "tutor:telekinesis", + "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thunderwave", "tutor:trick", - "tutor:uproar", "tutor:waterpulse", - "tutor:wish", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.jirachi.desc" + "tutor:zenheadbutt", + "legacy:aerialace", + "legacy:confide", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:dynamicpunch", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:nightmare", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "legacy:uproar", + "special:dracometeor", + "special:followme", + "special:happyhour", + "special:heartstamp", + "special:moonblast" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 100, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 11, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendOwner": true + } + } } \ 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 deleted file mode 100644 index 78ec38b65..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/kecleon.json +++ /dev/null @@ -1,205 +0,0 @@ -{ - "name": "Kecleon", - "nationalPokedexNumber": 352, - "primaryType": "normal", - "abilities": [ - "colorchange", - "h:protean" - ], - "baseStats": { - "hp": 60, - "attack": 90, - "defence": 70, - "special_attack": 60, - "special_defence": 120, - "speed": 40 - }, - "catchRate": 200, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 154, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:astonish", - "1:lick", - "1:scratch", - "1:tailwhip", - "1:thief", - "4:bind", - "7:shadowsneak", - "10:feint", - "13:furyswipes", - "16:feintattack", - "18:psybeam", - "21:ancientpower", - "25:slash", - "30:camouflage", - "33:shadowclaw", - "38:screech", - "42:substitute", - "46:suckerpunch", - "50:synchronoise", - "egg:camouflage", - "egg:disable", - "egg:dizzypunch", - "egg:fakeout", - "egg:foulplay", - "egg:magiccoat", - "egg:nastyplot", - "egg:poweruppunch", - "egg:recover", - "egg:skillswap", - "egg:snatch", - "egg:trick", - "tm:aerialace", - "tm:attract", - "tm:blizzard", - "tm:brickbreak", - "tm:captivate", - "tm:chargebeam", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:doubleteam", - "tm:drainpunch", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:hiddenpower", - "tm:honeclaws", - "tm:icebeam", - "tm:incinerate", - "tm:irontail", - "tm:naturalgift", - "tm:poweruppunch", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:recycle", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:skillswap", - "tm:sleeptalk", - "tm:snatch", - "tm:solarbeam", - "tm:stealthrock", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:trickroom", - "tm:waterpulse", - "tm:workup", - "tutor:afteryou", - "tutor:ancientpower", - "tutor:aquatail", - "tutor:bind", - "tutor:bodyslam", - "tutor:counter", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:drainpunch", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:feintattack", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:foulplay", - "tutor:furycutter", - "tutor:headbutt", - "tutor:icepunch", - "tutor:icywind", - "tutor:irontail", - "tutor:knockoff", - "tutor:lastresort", - "tutor:lowkick", - "tutor:magiccoat", - "tutor:megakick", - "tutor:megapunch", - "tutor:metronome", - "tutor:mimic", - "tutor:mudslap", - "tutor:psychup", - "tutor:recycle", - "tutor:reflecttype", - "tutor:rockslide", - "tutor:roleplay", - "tutor:rollout", - "tutor:seismictoss", - "tutor:shockwave", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:stealthrock", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:swagger", - "tutor:swift", - "tutor:thunderpunch", - "tutor:thunderwave", - "tutor:trick", - "tutor:waterpulse", - "tutor:wonderroom" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.kecleon.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 10, - "weight": 220, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:persim_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 8b2bbf204..98068c86f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/kyogre.json @@ -1,9 +1,28 @@ { - "name": "Kyogre", + "implemented": true, "nationalPokedexNumber": 382, + "name": "Kyogre", "primaryType": "water", + "maleRatio": -1, + "height": 45, + "weight": 3520, + "pokedex": [ + "cobblemon.species.kyogre.desc" + ], + "labels": [ + "gen3", + "legendary", + "restricted" + ], + "aspects": [ + "standard" + ], "abilities": [ - "drizzle" + "drizzle", + "h:drizzle" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -13,98 +32,69 @@ "special_defence": 140, "speed": 90 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Primal", - "primaryType": "water", - "abilities": [ - "primordialsea" - ], - "baseStats": { - "hp": 100, - "attack": 150, - "defence": 90, - "special_attack": 180, - "special_defence": 160, - "speed": 90 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 335, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen6", - "primal", - "legendary" - ], - "aspects": [ - "primal" - ], - "height": 98, - "weight": 4300, - "cannotDynamax": false, - "battleOnly": true - } - ], + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 335, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:heart_of_the_sea" + } + ] + }, "moves": [ - "1:ancientpower", + "1:waterpulse", + "1:scaryface", "1:bodyslam", + "1:ancientpower", "1:originpulse", - "1:scaryface", - "1:waterpulse", "9:aquatail", "18:calmmind", "27:muddywater", "36:icebeam", "45:sheercold", - "50:rest", "54:aquaring", "72:hydropump", "81:doubleedge", "90:waterspout", + "tm:ancientpower", + "tm:aquatail", "tm:avalanche", "tm:blizzard", + "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:brine", "tm:bulldoze", "tm:calmmind", "tm:chillingwater", - "tm:confide", "tm:dive", "tm:doubleedge", - "tm:doubleteam", "tm:earthquake", "tm:endure", "tm:facade", - "tm:frustration", "tm:gigaimpact", "tm:hail", + "tm:headbutt", "tm:heavyslam", "tm:helpinghand", - "tm:hiddenpower", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", @@ -112,106 +102,156 @@ "tm:ironhead", "tm:liquidation", "tm:muddywater", - "tm:naturalgift", "tm:protect", - "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:safeguard", - "tm:scald", "tm:scaryface", - "tm:secretpower", "tm:shockwave", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:strength", "tm:substitute", "tm:surf", - "tm:swagger", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", - "tm:uproar", "tm:waterfall", "tm:waterpulse", "tm:whirlpool", "tutor:ancientpower", "tutor:aquatail", "tutor:block", - "tutor:bodyslam", + "tutor:bulldoze", "tutor:calmmind", - "tutor:defensecurl", "tutor:dive", - "tutor:doubleedge", - "tutor:endure", - "tutor:headbutt", - "tutor:hydropump", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", "tutor:icywind", "tutor:ironhead", "tutor:liquidation", - "tutor:mimic", - "tutor:mudslap", - "tutor:originpulse", - "tutor:psychup", "tutor:rest", "tutor:rockslide", + "tutor:rocksmash", "tutor:shockwave", "tutor:signalbeam", "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:surf", - "tutor:swagger", - "tutor:swift", - "tutor:thunder", - "tutor:thunderwave", - "tutor:uproar", + "tutor:thunderbolt", "tutor:waterpulse", - "tutor:waterspout" - ], - "labels": [ - "gen3", - "legendary" - ], - "pokedex": [ - "cobblemon.species.kyogre.desc" + "legacy:confide", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:psychup", + "legacy:return", + "legacy:round", + "legacy:scald", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:swift", + "legacy:toxic", + "legacy:uproar" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 45, - "weight": 3520, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:heart_of_the_sea" + "forms": [ + { + "name": "Primal", + "primaryType": "water", + "maleRatio": -1, + "height": 98, + "weight": 4300, + "pokedex": [ + "cobblemon.species.kyogre-primal.desc" + ], + "labels": [ + "gen6", + "legendary", + "restricted", + "primal" + ], + "aspects": [ + "primal" + ], + "abilities": [ + "primordialsea", + "h:primordialsea" + ], + "baseStats": { + "hp": 100, + "attack": 150, + "defence": 90, + "special_attack": 180, + "special_defence": 160, + "speed": 90 + }, + "baseExperienceYield": 385, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true, + "behaviour": { + "moving": { + "walk": { + "avoidsLand": true + }, + "swim": { + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } } - ] - }, - "implemented": true + } + ], + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "kyogre", + "tier": 1 + }, + { + "pokemon": "manaphy", + "tier": 2 + } + ] + }, + "moving": { + "walk": { + "avoidsLand": true + }, + "swim": { + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/latias.json b/common/src/main/resources/data/cobblemon/species/generation3/latias.json deleted file mode 100644 index addbcd2cc..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/latias.json +++ /dev/null @@ -1,282 +0,0 @@ -{ - "name": "Latias", - "nationalPokedexNumber": 380, - "primaryType": "dragon", - "secondaryType": "psychic", - "abilities": [ - "levitate" - ], - "baseStats": { - "hp": 80, - "attack": 80, - "defence": 90, - "special_attack": 110, - "special_defence": 130, - "speed": 110 - }, - "catchRate": 3, - "maleRatio": 0, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "dragon", - "secondaryType": "psychic", - "abilities": [ - "levitate" - ], - "baseStats": { - "hp": 80, - "attack": 100, - "defence": 120, - "special_attack": 140, - "special_defence": 150, - "speed": 110 - }, - "catchRate": 3, - "maleRatio": 0, - "baseExperienceYield": 300, - "baseFriendship": 90, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen6", - "mega", - "legendary" - ], - "aspects": [ - "mega" - ], - "height": 18, - "weight": 520, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 300, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:charm", - "1:psywave", - "1:safeguard", - "1:storedpower", - "4:watersport", - "5:helpinghand", - "10:recover", - "13:refresh", - "15:confusion", - "20:tailwind", - "25:dragonbreath", - "30:wish", - "35:mistball", - "40:zenheadbutt", - "45:dragonpulse", - "50:healpulse", - "55:reflecttype", - "60:psychic", - "65:guardsplit", - "70:healingwish", - "75:psychoshift", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:alluringvoice", - "tm:allyswitch", - "tm:attract", - "tm:aurasphere", - "tm:batonpass", - "tm:bodyslam", - "tm:breakingswipe", - "tm:bulldoze", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:charm", - "tm:chillingwater", - "tm:confide", - "tm:cut", - "tm:defog", - "tm:disarmingvoice", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "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:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:lightscreen", - "tm:liquidation", - "tm:magicroom", - "tm:mysticalfire", - "tm:naturalgift", - "tm:outrage", - "tm:protect", - "tm:psychic", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:roar", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scaleshot", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:steelwing", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:triattack", - "tm:trick", - "tm:waterfall", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:bodyslam", - "tutor:charm", - "tutor:covet", - "tutor:defog", - "tutor:dive", - "tutor:doubleedge", - "tutor:dracometeor", - "tutor:dragonbreath", - "tutor:dragonpulse", - "tutor:dreameater", - "tutor:dualwingbeat", - "tutor:endure", - "tutor:furycutter", - "tutor:healpulse", - "tutor:helpinghand", - "tutor:icywind", - "tutor:laserfocus", - "tutor:lastresort", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:mimic", - "tutor:mistball", - "tutor:mudslap", - "tutor:outrage", - "tutor:psychoshift", - "tutor:psychup", - "tutor:recover", - "tutor:refresh", - "tutor:roleplay", - "tutor:roost", - "tutor:scaleshot", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:surf", - "tutor:swagger", - "tutor:sweetkiss", - "tutor:swift", - "tutor:tailwind", - "tutor:telekinesis", - "tutor:thunderwave", - "tutor:trick", - "tutor:twister", - "tutor:waterpulse", - "tutor:watersport", - "tutor:wish", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3", - "legendary" - ], - "pokedex": [ - "cobblemon.species.latias.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 90, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 14, - "weight": 400, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "2-4" - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/latios.json b/common/src/main/resources/data/cobblemon/species/generation3/latios.json deleted file mode 100644 index 0d3b4aeb3..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/latios.json +++ /dev/null @@ -1,274 +0,0 @@ -{ - "name": "Latios", - "nationalPokedexNumber": 381, - "primaryType": "dragon", - "secondaryType": "psychic", - "abilities": [ - "levitate" - ], - "baseStats": { - "hp": 80, - "attack": 90, - "defence": 80, - "special_attack": 130, - "special_defence": 110, - "speed": 110 - }, - "catchRate": 3, - "maleRatio": 1, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "dragon", - "secondaryType": "psychic", - "abilities": [ - "levitate" - ], - "baseStats": { - "hp": 80, - "attack": 130, - "defence": 100, - "special_attack": 160, - "special_defence": 120, - "speed": 110 - }, - "catchRate": 3, - "maleRatio": 1, - "baseExperienceYield": 300, - "baseFriendship": 90, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen6", - "mega", - "legendary" - ], - "aspects": [ - "mega" - ], - "height": 23, - "weight": 700, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 300, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:dragondance", - "1:healblock", - "1:psywave", - "1:safeguard", - "1:storedpower", - "4:protect", - "5:helpinghand", - "10:recover", - "13:refresh", - "15:confusion", - "20:tailwind", - "25:dragonbreath", - "30:allyswitch", - "35:lusterpurge", - "36:telekinesis", - "40:zenheadbutt", - "45:dragonpulse", - "50:healpulse", - "55:simplebeam", - "60:psychic", - "65:powersplit", - "70:memento", - "75:psychoshift", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:allyswitch", - "tm:attract", - "tm:aurasphere", - "tm:batonpass", - "tm:bodyslam", - "tm:breakingswipe", - "tm:bulldoze", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:chillingwater", - "tm:confide", - "tm:cut", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "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:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:lightscreen", - "tm:liquidation", - "tm:mysticalfire", - "tm:naturalgift", - "tm:outrage", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:roar", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scaleshot", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:steelwing", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:triattack", - "tm:trick", - "tm:waterfall", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:aurasphere", - "tutor:bodyslam", - "tutor:defog", - "tutor:dive", - "tutor:doubleedge", - "tutor:dracometeor", - "tutor:dragondance", - "tutor:dreameater", - "tutor:dualwingbeat", - "tutor:endure", - "tutor:furycutter", - "tutor:healpulse", - "tutor:helpinghand", - "tutor:icywind", - "tutor:laserfocus", - "tutor:lastresort", - "tutor:magiccoat", - "tutor:mimic", - "tutor:mudslap", - "tutor:outrage", - "tutor:protect", - "tutor:psychic", - "tutor:psychoshift", - "tutor:psychup", - "tutor:recover", - "tutor:refresh", - "tutor:roost", - "tutor:scaleshot", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:tailwind", - "tutor:telekinesis", - "tutor:thunderwave", - "tutor:trick", - "tutor:twister", - "tutor:waterpulse", - "tutor:wonderroom" - ], - "labels": [ - "gen3", - "legendary" - ], - "pokedex": [ - "cobblemon.species.latios.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 90, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 20, - "weight": 600, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "2-4" - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json b/common/src/main/resources/data/cobblemon/species/generation3/manectric.json deleted file mode 100644 index e64d3f512..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/manectric.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "name": "Manectric", - "nationalPokedexNumber": 310, - "primaryType": "electric", - "abilities": [ - "static", - "lightningrod", - "h:minus" - ], - "baseStats": { - "hp": 70, - "attack": 75, - "defence": 60, - "special_attack": 105, - "special_defence": 60, - "speed": 105 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "electric", - "abilities": [ - "intimidate" - ], - "baseStats": { - "hp": 70, - "attack": 75, - "defence": 80, - "special_attack": 135, - "special_defence": 80, - "speed": 135 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 166, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "labels": [ - "gen6", - "mega" - ], - "aspects": [ - "mega" - ], - "height": 18, - "weight": 440, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 166, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:firefang", - "1:howl", - "1:leer", - "1:tackle", - "1:thunderwave", - "12:quickattack", - "13:spark", - "16:odorsleuth", - "16:shockwave", - "20:bite", - "24:thunderfang", - "30:roar", - "36:discharge", - "42:charge", - "48:wildcharge", - "54:thunder", - "60:electricterrain", - "tm:agility", - "tm:attract", - "tm:bodyslam", - "tm:captivate", - "tm:chargebeam", - "tm:confide", - "tm:crunch", - "tm:doubleteam", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:flamethrower", - "tm:flash", - "tm:frustration", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icefang", - "tm:irontail", - "tm:lightscreen", - "tm:naturalgift", - "tm:overheat", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shockwave", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:strength", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderwave", - "tm:toxic", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:bite", - "tutor:bodyslam", - "tutor:doubleedge", - "tutor:endure", - "tutor:headbutt", - "tutor:irontail", - "tutor:laserfocus", - "tutor:magnetrise", - "tutor:mimic", - "tutor:mudslap", - "tutor:overheat", - "tutor:protect", - "tutor:raindance", - "tutor:refresh", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:thunder", - "tutor:thunderbolt", - "tutor:thunderwave", - "tutor:uproar", - "tutor:voltswitch" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.manectric.desc" - ], - "preEvolution": "electrike", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 15, - "weight": 402, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:bone", - "quantityRange": "0-2" - }, - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:cheri_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json b/common/src/main/resources/data/cobblemon/species/generation3/medicham.json deleted file mode 100644 index fe5227f92..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/medicham.json +++ /dev/null @@ -1,265 +0,0 @@ -{ - "name": "Medicham", - "nationalPokedexNumber": 308, - "primaryType": "fighting", - "secondaryType": "psychic", - "abilities": [ - "purepower", - "h:telepathy" - ], - "baseStats": { - "hp": 60, - "attack": 60, - "defence": 75, - "special_attack": 60, - "special_defence": 75, - "speed": 80 - }, - "catchRate": 90, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "fighting", - "secondaryType": "psychic", - "abilities": [ - "purepower" - ], - "baseStats": { - "hp": 60, - "attack": 100, - "defence": 85, - "special_attack": 80, - "special_defence": 85, - "speed": 100 - }, - "catchRate": 90, - "maleRatio": 0.5, - "baseExperienceYield": 144, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], - "labels": [ - "gen6", - "mega" - ], - "aspects": [ - "mega" - ], - "height": 13, - "weight": 315, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 144, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:bide", - "1:confusion", - "1:detect", - "1:firepunch", - "1:icepunch", - "1:meditate", - "1:thunderpunch", - "1:workup", - "12:endure", - "15:feint", - "17:forcepalm", - "20:hiddenpower", - "20:psybeam", - "20:swagger", - "23:calmmind", - "25:mindreader", - "25:zenheadbutt", - "28:highjumpkick", - "31:psychup", - "33:acupressure", - "36:powertrick", - "42:reversal", - "47:recover", - "53:axekick", - "53:counter", - "tm:aerialace", - "tm:attract", - "tm:aurasphere", - "tm:batonpass", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:calmmind", - "tm:captivate", - "tm:closecombat", - "tm:confide", - "tm:doubleteam", - "tm:drainpunch", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:firepunch", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icepunch", - "tm:imprison", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:metronome", - "tm:naturalgift", - "tm:nightshade", - "tm:painsplit", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:reversal", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunderpunch", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:upperhand", - "tm:vacuumwave", - "tm:workup", - "tm:zenheadbutt", - "tutor:bodyslam", - "tutor:counter", - "tutor:doubleedge", - "tutor:drainpunch", - "tutor:dreameater", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:gravity", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:icepunch", - "tutor:laserfocus", - "tutor:lowkick", - "tutor:magiccoat", - "tutor:megakick", - "tutor:megapunch", - "tutor:metronome", - "tutor:mimic", - "tutor:mudslap", - "tutor:painsplit", - "tutor:psychup", - "tutor:recycle", - "tutor:rockslide", - "tutor:roleplay", - "tutor:seismictoss", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:telekinesis", - "tutor:thunderpunch", - "tutor:trick", - "tutor:vacuumwave", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.medicham.desc" - ], - "preEvolution": "meditite", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 13, - "weight": 315, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:wise_glasses", - "percentage": 5.0 - }, - { - "item": "cobblemon:black_belt", - "percentage": 5.0 - }, - { - "item": "cobblemon:nanab_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/meditite.json b/common/src/main/resources/data/cobblemon/species/generation3/meditite.json deleted file mode 100644 index 9749c1465..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/meditite.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "name": "Meditite", - "nationalPokedexNumber": 307, - "primaryType": "fighting", - "secondaryType": "psychic", - "abilities": [ - "purepower", - "h:telepathy" - ], - "baseStats": { - "hp": 30, - "attack": 40, - "defence": 55, - "special_attack": 40, - "special_defence": 55, - "speed": 60 - }, - "catchRate": 180, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 56, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:bide", - "1:confusion", - "1:workup", - "4:meditate", - "9:detect", - "12:endure", - "15:feint", - "17:forcepalm", - "20:hiddenpower", - "20:psybeam", - "20:swagger", - "23:calmmind", - "25:mindreader", - "25:zenheadbutt", - "28:highjumpkick", - "31:psychup", - "33:acupressure", - "36:powertrick", - "39:reversal", - "41:recover", - "44:counter", - "egg:batonpass", - "egg:bulletpunch", - "egg:drainpunch", - "egg:dynamicpunch", - "egg:fakeout", - "egg:firepunch", - "egg:foresight", - "egg:guardswap", - "egg:icepunch", - "egg:powerswap", - "egg:psychocut", - "egg:quickguard", - "egg:secretpower", - "egg:thunderpunch", - "tm:aerialace", - "tm:attract", - "tm:batonpass", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:calmmind", - "tm:captivate", - "tm:closecombat", - "tm:confide", - "tm:doubleteam", - "tm:drainpunch", - "tm:dreameater", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:firepunch", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:icepunch", - "tm:imprison", - "tm:lightscreen", - "tm:lowkick", - "tm:lowsweep", - "tm:metronome", - "tm:naturalgift", - "tm:nightshade", - "tm:painsplit", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:reversal", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunderpunch", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:upperhand", - "tm:workup", - "tm:zenheadbutt", - "tutor:bide", - "tutor:bodyslam", - "tutor:confusion", - "tutor:counter", - "tutor:detect", - "tutor:doubleedge", - "tutor:drainpunch", - "tutor:dreameater", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:gravity", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:icepunch", - "tutor:lowkick", - "tutor:magiccoat", - "tutor:meditate", - "tutor:megakick", - "tutor:megapunch", - "tutor:metronome", - "tutor:mimic", - "tutor:mudslap", - "tutor:painsplit", - "tutor:psychup", - "tutor:recycle", - "tutor:roleplay", - "tutor:seismictoss", - "tutor:shadowball", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:telekinesis", - "tutor:thunderpunch", - "tutor:trick", - "tutor:vacuumwave", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.meditite.desc" - ], - "evolutions": [ - { - "id": "meditite_medicham", - "variant": "level_up", - "result": "medicham", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 37 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 6, - "weight": 112, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:wise_glasses", - "percentage": 2.5 - }, - { - "item": "cobblemon:black_belt", - "percentage": 2.5 - }, - { - "item": "cobblemon:nanab_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json b/common/src/main/resources/data/cobblemon/species/generation3/milotic.json deleted file mode 100644 index 3caa285a8..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json +++ /dev/null @@ -1,193 +0,0 @@ -{ - "name": "Milotic", - "nationalPokedexNumber": 350, - "primaryType": "water", - "abilities": [ - "marvelscale", - "competitive", - "h:cutecharm" - ], - "baseStats": { - "hp": 95, - "attack": 60, - "defence": 79, - "special_attack": 100, - "special_defence": 125, - "speed": 81 - }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 189, - "experienceGroup": "erratic", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "dragon" - ], - "moves": [ - "1:flail", - "1:refresh", - "1:splash", - "1:tackle", - "1:watergun", - "1:waterpulse", - "1:watersport", - "1:wrap", - "4:disarmingvoice", - "8:twister", - "12:aquaring", - "16:attract", - "20:lifedew", - "21:captivate", - "24:dragontail", - "28:recover", - "32:aquatail", - "36:safeguard", - "40:surf", - "44:raindance", - "48:coil", - "52:hydropump", - "tm:alluringvoice", - "tm:attract", - "tm:avalanche", - "tm:blizzard", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brine", - "tm:brutalswing", - "tm:bulldoze", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:confuseray", - "tm:disarmingvoice", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:dragoncheer", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:drainingkiss", - "tm:endure", - "tm:facade", - "tm:flipturn", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:haze", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:imprison", - "tm:ironhead", - "tm:irontail", - "tm:lightscreen", - "tm:muddywater", - "tm:mudshot", - "tm:naturalgift", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scald", - "tm:scaleshot", - "tm:secretpower", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:tripleaxel", - "tm:waterfall", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tutor:aquatail", - "tutor:bind", - "tutor:bodyslam", - "tutor:dive", - "tutor:doubleedge", - "tutor:dragonpulse", - "tutor:endure", - "tutor:flipturn", - "tutor:hydropump", - "tutor:icebeam", - "tutor:icywind", - "tutor:ironhead", - "tutor:irontail", - "tutor:laserfocus", - "tutor:magiccoat", - "tutor:mimic", - "tutor:mirrorcoat", - "tutor:mudslap", - "tutor:psychup", - "tutor:raindance", - "tutor:recover", - "tutor:scaleshot", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:surf", - "tutor:swagger", - "tutor:swift", - "tutor:toxic", - "tutor:tripleaxel", - "tutor:twister", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.milotic.desc" - ], - "preEvolution": "feebas", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 62, - "weight": 1620, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:bone_meal", - "percentage": 10.0 - }, - { - "item": "cobblemon:prism_scale", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 170530e7c..abd423e05 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/regice.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/regice.json @@ -1,11 +1,26 @@ { - "name": "Regice", + "implemented": true, "nationalPokedexNumber": 378, + "name": "Regice", "primaryType": "ice", + "maleRatio": -1, + "height": 18, + "weight": 1750, + "pokedex": [ + "cobblemon.species.regice.desc" + ], + "labels": [ + "gen3", + "legendary" + ], + "aspects": [], "abilities": [ "clearbody", "h:icebody" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 80, "attack": 50, @@ -14,18 +29,36 @@ "special_defence": 200, "speed": 50 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 3, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1.65, + "height": 2.75, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:never_melt_ice" + } + ] + }, "moves": [ - "1:chargebeam", "1:icywind", + "1:chargebeam", "6:bulldoze", "12:ancientpower", "18:stomp", @@ -40,17 +73,17 @@ "72:hyperbeam", "78:explosion", "tm:amnesia", + "tm:ancientpower", "tm:auroraveil", "tm:avalanche", "tm:blizzard", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:chargebeam", - "tm:confide", "tm:curse", - "tm:doubleteam", "tm:earthquake", "tm:endure", "tm:explosion", @@ -60,12 +93,11 @@ "tm:focusblast", "tm:focuspunch", "tm:frostbreath", - "tm:frustration", "tm:gigaimpact", "tm:gravity", "tm:hail", + "tm:headbutt", "tm:heavyslam", - "tm:hiddenpower", "tm:hyperbeam", "tm:icebeam", "tm:icepunch", @@ -75,118 +107,102 @@ "tm:ironhead", "tm:megakick", "tm:megapunch", - "tm:naturalgift", "tm:poweruppunch", "tm:protect", - "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", "tm:rockclimb", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", + "tm:rollout", "tm:safeguard", - "tm:secretpower", "tm:selfdestruct", "tm:shockwave", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:snowscape", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:superpower", - "tm:swagger", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", - "tutor:amnesia", "tutor:ancientpower", "tutor:block", - "tutor:bodyslam", "tutor:bulldoze", "tutor:chargebeam", - "tutor:counter", - "tutor:curse", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:explosion", + "tutor:flashcannon", "tutor:focuspunch", + "tutor:gigaimpact", "tutor:gravity", - "tutor:hail", - "tutor:hammerarm", - "tutor:headbutt", "tutor:hyperbeam", "tutor:icebeam", "tutor:icepunch", "tutor:icywind", "tutor:ironhead", - "tutor:lockon", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mudslap", - "tutor:psychup", + "tutor:rest", "tutor:rockslide", + "tutor:rocksmash", "tutor:rollout", - "tutor:seismictoss", - "tutor:selfdestruct", "tutor:shockwave", "tutor:signalbeam", "tutor:sleeptalk", - "tutor:snore", - "tutor:stomp", "tutor:stompingtantrum", - "tutor:substitute", "tutor:superpower", - "tutor:swagger", "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thunderwave", - "tutor:zapcannon" - ], - "labels": [ - "gen3", - "legendary" - ], - "pokedex": [ - "cobblemon.species.regice.desc" + "legacy:confide", + "legacy:counter", + "legacy:defensecurl", + "legacy:doubleedge", + "legacy:doubleteam", + "legacy:dynamicpunch", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:psychup", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:seismictoss", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 18, - "weight": 1750, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:never_melt_ice" + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "regigigas", + "tier": 1 + } + ] + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ 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 36b85a192..c6ea97cd8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/regirock.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/regirock.json @@ -1,11 +1,26 @@ { - "name": "Regirock", + "implemented": true, "nationalPokedexNumber": 377, + "name": "Regirock", "primaryType": "rock", + "maleRatio": -1, + "height": 17, + "weight": 2300, + "pokedex": [ + "cobblemon.species.regirock.desc" + ], + "labels": [ + "gen3", + "legendary" + ], + "aspects": [], "abilities": [ "clearbody", "h:sturdy" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 80, "attack": 100, @@ -14,18 +29,36 @@ "special_defence": 100, "speed": 50 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 3, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1.85, + "height": 2.85, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:hard_stone" + } + ] + }, "moves": [ - "1:chargebeam", "1:rockthrow", + "1:chargebeam", "6:bulldoze", "12:ancientpower", "18:stomp", @@ -39,16 +72,16 @@ "66:zapcannon", "72:hyperbeam", "78:explosion", + "tm:ancientpower", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:chargebeam", - "tm:confide", "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:drainpunch", "tm:earthpower", "tm:earthquake", @@ -60,12 +93,11 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:frustration", "tm:gigaimpact", "tm:gravity", "tm:hardpress", + "tm:headbutt", "tm:heavyslam", - "tm:hiddenpower", "tm:hyperbeam", "tm:icepunch", "tm:irondefense", @@ -73,29 +105,24 @@ "tm:megakick", "tm:megapunch", "tm:meteorbeam", - "tm:naturalgift", "tm:powergem", "tm:poweruppunch", "tm:protect", - "tm:psychup", "tm:rest", - "tm:return", "tm:rockblast", "tm:rockclimb", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", + "tm:rollout", "tm:safeguard", "tm:sandstorm", "tm:sandtomb", - "tm:secretpower", "tm:selfdestruct", "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -103,97 +130,89 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tutor:ancientpower", "tutor:block", - "tutor:bodyslam", "tutor:bulldoze", "tutor:chargebeam", - "tutor:counter", - "tutor:curse", - "tutor:defensecurl", - "tutor:doubleedge", "tutor:drainpunch", - "tutor:dynamicpunch", "tutor:earthpower", - "tutor:endure", - "tutor:explosion", "tutor:firepunch", + "tutor:flashcannon", "tutor:focuspunch", + "tutor:gigaimpact", "tutor:gravity", - "tutor:hammerarm", - "tutor:headbutt", "tutor:hyperbeam", "tutor:icepunch", "tutor:irondefense", "tutor:ironhead", - "tutor:lockon", - "tutor:megakick", - "tutor:megapunch", "tutor:meteorbeam", - "tutor:mimic", - "tutor:mudslap", - "tutor:psychup", + "tutor:rest", "tutor:rockslide", - "tutor:rockthrow", + "tutor:rocksmash", "tutor:rollout", - "tutor:seismictoss", - "tutor:selfdestruct", "tutor:shockwave", "tutor:sleeptalk", - "tutor:snore", "tutor:stealthrock", - "tutor:stomp", "tutor:stompingtantrum", "tutor:stoneedge", - "tutor:substitute", "tutor:superpower", - "tutor:swagger", + "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thunderwave", - "tutor:zapcannon" - ], - "labels": [ - "gen3", - "legendary" - ], - "pokedex": [ - "cobblemon.species.regirock.desc" + "legacy:confide", + "legacy:counter", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:dynamicpunch", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:psychup", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:seismictoss", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 17, - "weight": 2300, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:hard_stone" + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "regigigas", + "tier": 1 + } + ] + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canSwimInLava": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "fireImmune": true + } } \ 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 45fbcd190..a011286b8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/registeel.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/registeel.json @@ -1,11 +1,26 @@ { - "name": "Registeel", + "implemented": true, "nationalPokedexNumber": 379, + "name": "Registeel", "primaryType": "steel", + "maleRatio": -1, + "height": 19, + "weight": 2050, + "pokedex": [ + "cobblemon.species.registeel.desc" + ], + "labels": [ + "gen3", + "legendary" + ], + "aspects": [], "abilities": [ "clearbody", "h:lightmetal" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 80, "attack": 75, @@ -14,26 +29,44 @@ "special_defence": 150, "speed": 50 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 1, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1.65, + "height": 2.7, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:metal_coat" + } + ] + }, "moves": [ - "1:chargebeam", "1:metalclaw", + "1:chargebeam", "6:bulldoze", "12:ancientpower", "18:stomp", - "24:flashcannon", "24:ironhead", + "24:flashcannon", "30:curse", - "36:amnesia", "36:irondefense", + "36:amnesia", "42:hammerarm", "48:heavyslam", "54:superpower", @@ -41,17 +74,16 @@ "66:zapcannon", "72:hyperbeam", "78:explosion", - "tm:aerialace", "tm:amnesia", + "tm:ancientpower", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:chargebeam", - "tm:confide", "tm:curse", "tm:doubleedge", - "tm:doubleteam", "tm:earthquake", "tm:endure", "tm:explosion", @@ -60,144 +92,129 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:frustration", "tm:gigaimpact", "tm:gravity", "tm:hardpress", + "tm:headbutt", "tm:heavyslam", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:icepunch", "tm:icespinner", "tm:irondefense", "tm:ironhead", + "tm:magnetrise", "tm:megakick", "tm:megapunch", "tm:metalclaw", "tm:metalsound", "tm:meteorbeam", - "tm:naturalgift", "tm:poweruppunch", "tm:protect", - "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", "tm:rockclimb", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", + "tm:rollout", "tm:safeguard", "tm:sandstorm", "tm:sandtomb", - "tm:secretpower", "tm:selfdestruct", "tm:shadowclaw", "tm:shockwave", "tm:sleeptalk", - "tm:snore", "tm:stealthrock", "tm:steelbeam", + "tm:steelroller", "tm:stompingtantrum", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", - "tutor:amnesia", "tutor:ancientpower", "tutor:block", - "tutor:bodyslam", + "tutor:bulldoze", "tutor:chargebeam", - "tutor:counter", - "tutor:curse", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:explosion", "tutor:flashcannon", "tutor:focuspunch", + "tutor:gigaimpact", "tutor:gravity", - "tutor:hammerarm", - "tutor:headbutt", - "tutor:heavyslam", "tutor:hyperbeam", "tutor:icepunch", "tutor:irondefense", "tutor:ironhead", - "tutor:lockon", "tutor:magnetrise", - "tutor:megakick", - "tutor:megapunch", - "tutor:metalclaw", "tutor:meteorbeam", - "tutor:mimic", - "tutor:mudslap", - "tutor:psychup", + "tutor:rest", "tutor:rockslide", + "tutor:rocksmash", "tutor:rollout", - "tutor:seismictoss", - "tutor:selfdestruct", + "tutor:shadowclaw", "tutor:shockwave", "tutor:sleeptalk", - "tutor:snore", "tutor:stealthrock", "tutor:steelbeam", "tutor:steelroller", - "tutor:stomp", "tutor:stompingtantrum", - "tutor:substitute", "tutor:superpower", - "tutor:swagger", + "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thunderwave", - "tutor:zapcannon" - ], - "labels": [ - "gen3", - "legendary" - ], - "pokedex": [ - "cobblemon.species.registeel.desc" + "legacy:aerialace", + "legacy:confide", + "legacy:counter", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:dynamicpunch", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:psychup", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:seismictoss", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 19, - "weight": 2050, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:metal_coat" + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "regigigas", + "tier": 1 + } + ] + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json b/common/src/main/resources/data/cobblemon/species/generation3/salamence.json deleted file mode 100644 index 6bd199331..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/salamence.json +++ /dev/null @@ -1,263 +0,0 @@ -{ - "name": "Salamence", - "nationalPokedexNumber": 373, - "primaryType": "dragon", - "secondaryType": "flying", - "abilities": [ - "intimidate", - "h:moxie" - ], - "baseStats": { - "hp": 95, - "attack": 135, - "defence": 80, - "special_attack": 110, - "special_defence": 80, - "speed": 100 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "dragon", - "secondaryType": "flying", - "abilities": [ - "aerilate" - ], - "baseStats": { - "hp": 95, - "attack": 145, - "defence": 130, - "special_attack": 120, - "special_defence": 90, - "speed": 120 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 300, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "dragon" - ], - "labels": [ - "gen6", - "mega", - "pseudo_legendary" - ], - "aspects": [ - "mega" - ], - "height": 18, - "weight": 1126, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 300, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "dragon" - ], - "moves": [ - "1:bite", - "1:dragonbreath", - "1:dragontail", - "1:dualwingbeat", - "1:ember", - "1:firefang", - "1:fly", - "1:leer", - "1:protect", - "1:rage", - "1:roost", - "1:thunderfang", - "15:headbutt", - "20:scaryface", - "25:crunch", - "33:dragonclaw", - "39:zenheadbutt", - "46:focusenergy", - "55:flamethrower", - "64:outrage", - "73:doubleedge", - "tm:aerialace", - "tm:airslash", - "tm:attract", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:captivate", - "tm:confide", - "tm:crunch", - "tm:cut", - "tm:defog", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dualwingbeat", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firespin", - "tm:flamethrower", - "tm:fly", - "tm:focusenergy", - "tm:frustration", - "tm:gigaimpact", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:mudslap", - "tm:naturalgift", - "tm:outrage", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snore", - "tm:steelwing", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thunderfang", - "tm:toxic", - "tm:zenheadbutt", - "tutor:aerialace", - "tutor:aircutter", - "tutor:aquatail", - "tutor:bodyslam", - "tutor:defensecurl", - "tutor:defog", - "tutor:doubleedge", - "tutor:dracometeor", - "tutor:dragonbreath", - "tutor:dragonclaw", - "tutor:dragondance", - "tutor:dragonpulse", - "tutor:dualwingbeat", - "tutor:endure", - "tutor:fireblast", - "tutor:fly", - "tutor:furycutter", - "tutor:headbutt", - "tutor:heatwave", - "tutor:hydropump", - "tutor:hypervoice", - "tutor:irontail", - "tutor:laserfocus", - "tutor:mimic", - "tutor:mudslap", - "tutor:ominouswind", - "tutor:outrage", - "tutor:protect", - "tutor:refresh", - "tutor:rockslide", - "tutor:rollout", - "tutor:roost", - "tutor:scaryface", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stoneedge", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:tailwind", - "tutor:twister", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3", - "pseudo_legendary" - ], - "pokedex": [ - "cobblemon.species.salamence.desc" - ], - "preEvolution": "shelgon", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 1026, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 10.0 - }, - { - "item": "cobblemon:dragon_scale", - "percentage": 10.0 - }, - { - "item": "cobblemon:yache_berry", - "percentage": 10.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json b/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json deleted file mode 100644 index b51547bb9..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/sealeo.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "name": "Sealeo", - "nationalPokedexNumber": 364, - "primaryType": "ice", - "secondaryType": "water", - "abilities": [ - "thickfat", - "icebody", - "h:oblivious" - ], - "baseStats": { - "hp": 90, - "attack": 60, - "defence": 70, - "special_attack": 75, - "special_defence": 70, - "speed": 45 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 144, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "field" - ], - "moves": [ - "1:defensecurl", - "1:growl", - "1:rollout", - "1:swagger", - "1:watergun", - "12:powdersnow", - "13:iceball", - "16:rest", - "20:snore", - "24:brine", - "28:aurorabeam", - "35:encore", - "40:bodyslam", - "46:surf", - "52:blizzard", - "58:hail", - "64:sheercold", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:captivate", - "tm:confide", - "tm:dive", - "tm:doubleteam", - "tm:earthquake", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:frostbreath", - "tm:frustration", - "tm:hail", - "tm:hiddenpower", - "tm:icebeam", - "tm:iciclespear", - "tm:icywind", - "tm:irontail", - "tm:naturalgift", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:aquatail", - "tutor:bodyslam", - "tutor:defensecurl", - "tutor:dive", - "tutor:doubleedge", - "tutor:endure", - "tutor:headbutt", - "tutor:icywind", - "tutor:irontail", - "tutor:mimic", - "tutor:mudslap", - "tutor:rockslide", - "tutor:rollout", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:steelroller", - "tutor:substitute", - "tutor:superfang", - "tutor:swagger", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.sealeo.desc" - ], - "preEvolution": "spheal", - "evolutions": [ - { - "id": "sealeo_walrein", - "variant": "level_up", - "result": "walrein", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 44 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 876, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:cod", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:chesto_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 07655e5d7..011ca02f7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/seviper.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/seviper.json @@ -1,11 +1,26 @@ { - "name": "Seviper", + "implemented": true, "nationalPokedexNumber": 336, + "name": "Seviper", "primaryType": "poison", + "maleRatio": 0.5, + "height": 27, + "weight": 525, + "pokedex": [ + "cobblemon.species.seviper.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [], "abilities": [ "shedskin", "h:infiltrator" ], + "eggGroups": [ + "field", + "dragon" + ], "baseStats": { "hp": 73, "attack": 100, @@ -14,19 +29,84 @@ "special_defence": 60, "speed": 65 }, - "catchRate": 90, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 160, "experienceGroup": "fluctuating", + "catchRate": 90, "eggCycles": 20, - "eggGroups": [ - "field", - "dragon" + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "combat": { + "fightsMelee": true, + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + } + }, + "ai": [ + { + "type": "cobblemon:add_tasks_to_activity", + "activity": "idle", + "tasksByPriority": { + "7": [ + { + "type": "cobblemon:hate_entity", + "entityCondition": "q.entity.is_pokemon && q.entity.species.identifier == 'cobblemon:zangoose'" + } + ] + } + } ], + "drops": { + "amount": 4, + "entries": [ + { + "item": "cobblemon:razor_fang", + "percentage": 5.0 + }, + { + "item": "cobblemon:poison_barb", + "percentage": 5.0 + }, + { + "item": "cobblemon:shed_shell", + "percentage": 5.0 + }, + { + "item": "cobblemon:persim_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:swagger", "1:wrap", + "1:wringout", + "1:swagger", "4:bite", "6:lick", "9:poisontail", @@ -34,22 +114,17 @@ "14:screech", "19:glare", "21:poisonfang", - "24:venomdrench", "24:venoshock", - "26:nightslash", "29:gastroacid", "31:poisonjab", "34:haze", - "36:swordsdance", "39:crunch", "41:belch", "44:coil", "46:sludgebomb", - "46:wringout", "egg:assurance", "egg:bodyslam", "egg:finalgambit", - "egg:irontail", "egg:nightslash", "egg:punishment", "egg:scaryface", @@ -59,34 +134,33 @@ "egg:switcheroo", "egg:wringout", "tm:acidspray", - "tm:attract", + "tm:aquatail", + "tm:assurance", + "tm:bind", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", - "tm:captivate", - "tm:confide", "tm:crunch", "tm:curse", "tm:darkpulse", "tm:dig", "tm:doubleedge", - "tm:doubleteam", - "tm:dragontail", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:facade", "tm:firefang", "tm:flamethrower", - "tm:frustration", + "tm:furycutter", + "tm:gastroacid", "tm:gigadrain", "tm:gigaimpact", "tm:gunkshot", "tm:haze", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:icefang", "tm:infestation", @@ -94,22 +168,20 @@ "tm:irontail", "tm:knockoff", "tm:lashout", - "tm:naturalgift", "tm:payback", "tm:poisonjab", "tm:poisontail", "tm:pounce", + "tm:powerwhip", "tm:protect", "tm:psychicfangs", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:reversal", "tm:rocksmash", - "tm:round", "tm:scaryface", - "tm:secretpower", + "tm:screech", "tm:seedbomb", "tm:skittersmack", "tm:sleeptalk", @@ -119,6 +191,7 @@ "tm:snatch", "tm:strength", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", "tm:swagger", "tm:swordsdance", @@ -130,81 +203,58 @@ "tm:thunderfang", "tm:toxic", "tm:trailblaze", + "tm:venomdrench", "tm:venoshock", "tm:xscissor", "tm:zenheadbutt", "tutor:aquatail", "tutor:bind", - "tutor:bite", - "tutor:bodyslam", - "tutor:crunch", + "tutor:bulldoze", "tutor:darkpulse", - "tutor:doubleedge", - "tutor:endure", + "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", "tutor:furycutter", "tutor:gastroacid", "tutor:gigadrain", - "tutor:glare", - "tutor:headbutt", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:ironhead", "tutor:irontail", "tutor:knockoff", - "tutor:lick", - "tutor:mimic", - "tutor:mudslap", - "tutor:poisontail", - "tutor:screech", + "tutor:lashout", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:seedbomb", + "tutor:skittersmack", "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", "tutor:snatch", - "tutor:snore", - "tutor:substitute", "tutor:suckerpunch", - "tutor:swagger", - "tutor:swift", "tutor:throatchop", - "tutor:wrap" - ], - "labels": [ - "gen3" + "tutor:thunderfang", + "tutor:xscissor", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:doubleteam", + "legacy:dragontail", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swift" ], - "pokedex": [ - "cobblemon.species.seviper.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 27, - "weight": 525, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:razor_fang", - "percentage": 5.0 - }, - { - "item": "cobblemon:poison_barb", - "percentage": 5.0 - }, - { - "item": "cobblemon:persim_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true + "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json b/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json deleted file mode 100644 index 5a0ccde4b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/shelgon.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "name": "Shelgon", - "nationalPokedexNumber": 372, - "primaryType": "dragon", - "abilities": [ - "rockhead", - "h:overcoat" - ], - "baseStats": { - "hp": 65, - "attack": 95, - "defence": 100, - "special_attack": 60, - "special_defence": 50, - "speed": 50 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 147, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "dragon" - ], - "moves": [ - "1:bite", - "1:dragonbreath", - "1:ember", - "1:leer", - "1:protect", - "1:rage", - "15:headbutt", - "20:scaryface", - "25:crunch", - "33:dragonclaw", - "39:zenheadbutt", - "46:focusenergy", - "53:flamethrower", - "60:outrage", - "67:doubleedge", - "tm:aerialace", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:captivate", - "tm:confide", - "tm:crunch", - "tm:cut", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:firespin", - "tm:flamethrower", - "tm:focusenergy", - "tm:frustration", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hydropump", - "tm:hypervoice", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:mudslap", - "tm:naturalgift", - "tm:outrage", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snore", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thunderfang", - "tm:toxic", - "tm:zenheadbutt", - "tutor:bodyslam", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:dracometeor", - "tutor:dragonpulse", - "tutor:endure", - "tutor:furycutter", - "tutor:headbutt", - "tutor:hypervoice", - "tutor:irondefense", - "tutor:mimic", - "tutor:mudslap", - "tutor:outrage", - "tutor:rockslide", - "tutor:rollout", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:twister", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.shelgon.desc" - ], - "preEvolution": "bagon", - "evolutions": [ - { - "id": "shelgon_salamence", - "variant": "level_up", - "result": "salamence", - "consumeHeldItem": false, - "learnableMoves": [ - "fly" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 50 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 1105, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 5.0 - }, - { - "item": "cobblemon:dragon_scale", - "percentage": 5.0 - }, - { - "item": "cobblemon:yache_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json b/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json deleted file mode 100644 index 6a9cbb843..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/shuppet.json +++ /dev/null @@ -1,217 +0,0 @@ -{ - "name": "Shuppet", - "nationalPokedexNumber": 353, - "primaryType": "ghost", - "abilities": [ - "insomnia", - "frisk", - "h:cursedbody" - ], - "baseStats": { - "hp": 44, - "attack": 75, - "defence": 35, - "special_attack": 63, - "special_defence": 33, - "speed": 45 - }, - "catchRate": 225, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 59, - "experienceGroup": "fast", - "eggCycles": 25, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:astonish", - "1:knockoff", - "4:screech", - "7:nightshade", - "10:spite", - "16:willowisp", - "19:feintattack", - "19:shadowsneak", - "22:hex", - "26:curse", - "30:shadowball", - "34:embargo", - "34:roleplay", - "38:suckerpunch", - "42:snatch", - "42:trick", - "46:grudge", - "48:phantomforce", - "egg:astonish", - "egg:confuseray", - "egg:destinybond", - "egg:disable", - "egg:foresight", - "egg:gunkshot", - "egg:imprison", - "egg:ominouswind", - "egg:payback", - "egg:phantomforce", - "egg:pursuit", - "egg:shadowsneak", - "tm:attract", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:confide", - "tm:confuseray", - "tm:curse", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:frustration", - "tm:gunkshot", - "tm:helpinghand", - "tm:hex", - "tm:hiddenpower", - "tm:icywind", - "tm:imprison", - "tm:lashout", - "tm:metronome", - "tm:nastyplot", - "tm:naturalgift", - "tm:nightshade", - "tm:painsplit", - "tm:payback", - "tm:phantomforce", - "tm:poltergeist", - "tm:pounce", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snatch", - "tm:spite", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:willowisp", - "tutor:allyswitch", - "tutor:bodyslam", - "tutor:darkpulse", - "tutor:destinybond", - "tutor:doubleedge", - "tutor:dreameater", - "tutor:endure", - "tutor:feintattack", - "tutor:foulplay", - "tutor:gunkshot", - "tutor:headbutt", - "tutor:icywind", - "tutor:knockoff", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:mimic", - "tutor:nightmare", - "tutor:nightshade", - "tutor:ominouswind", - "tutor:painsplit", - "tutor:psychup", - "tutor:roleplay", - "tutor:shadowball", - "tutor:shockwave", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:swagger", - "tutor:telekinesis", - "tutor:thunderwave", - "tutor:trick", - "tutor:willowisp" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.shuppet.desc" - ], - "evolutions": [ - { - "id": "shuppet_banette", - "variant": "level_up", - "result": "banette", - "consumeHeldItem": false, - "learnableMoves": [ - "knockoff" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 37 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 23, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:phantom_membrane", - "percentage": 2.5 - }, - { - "item": "cobblemon:spell_tag", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 1439f22f6..fe0cf0f01 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/silcoon.json @@ -1,9 +1,26 @@ { - "name": "Silcoon", + "implemented": true, "nationalPokedexNumber": 266, + "name": "Silcoon", "primaryType": "bug", + "maleRatio": 0.5, + "height": 6, + "weight": 100, + "pokedex": [ + "cobblemon.species.silcoon.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [ + "silcoon-cocoon" + ], "abilities": [ - "shedskin" + "shedskin", + "h:shedskin" + ], + "eggGroups": [ + "bug" ], "baseStats": { "hp": 50, @@ -13,6 +30,25 @@ "special_defence": 25, "speed": 15 }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 72, + "experienceGroup": "medium_fast", + "catchRate": 120, + "eggCycles": 15, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "behaviour": { "moving": { "walk": { @@ -20,32 +56,47 @@ }, "swim": { "canSwimInWater": false, - "canSwimInLava": false + "avoidsWater": true }, "canLook": false + }, + "combat": { + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 } }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 72, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "0-2" + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 + } + ] + }, "moves": [ "1:harden", + "1:tackle", + "1:poisonsting", + "tm:bugbite", + "tm:electroweb", + "tm:irondefense", + "tm:skittersmack", + "tm:stringshot", + "tm:terablast", "tutor:bugbite", "tutor:electroweb", "tutor:irondefense", - "tutor:stringshot" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.silcoon.desc" + "tutor:skittersmack", + "tutor:stringshot", + "legacy:snore" ], "preEvolution": "wurmple", "evolutions": [ @@ -54,7 +105,9 @@ "variant": "level_up", "result": "beautifly", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "gust" + ], "requirements": [ { "variant": "level", @@ -62,38 +115,5 @@ } ] } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 100, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true + ] } \ No newline at end of file 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 31351af93..672cd164c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/skitty.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/skitty.json @@ -1,12 +1,27 @@ { - "name": "Skitty", + "implemented": true, "nationalPokedexNumber": 300, + "name": "Skitty", "primaryType": "normal", + "maleRatio": 0.25, + "height": 6, + "weight": 110, + "pokedex": [ + "cobblemon.species.skitty.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [], "abilities": [ "cutecharm", "normalize", "h:wonderskin" ], + "eggGroups": [ + "field", + "fairy" + ], "baseStats": { "hp": 50, "attack": 45, @@ -15,21 +30,65 @@ "special_defence": 35, "speed": 50 }, - "catchRate": 255, - "maleRatio": 0.25, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 1 + }, "baseExperienceYield": 52, "experienceGroup": "fast", + "catchRate": 255, "eggCycles": 15, - "eggGroups": [ - "field", - "fairy" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "entityInteract": { + "avoidedByCreeper": true, + "avoidedByPhantom": true + }, + "resting": { + "willSleepOnBed": true, + "times": [ + "167-11833,13702-22299" + ], + "drowsyChance": 0.0021, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + } + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:silk_scarf", + "percentage": 2.5 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 + } + ] + }, "moves": [ "1:fakeout", "1:growl", - "1:tackle", "1:tailwhip", + "1:tackle", "4:foresight", "7:sing", "10:attract", @@ -38,114 +97,117 @@ "19:copycat", "22:feintattack", "25:charm", - "28:wakeupslap", "31:assist", "34:covet", "37:healbell", "40:doubleedge", "43:captivate", "46:playrough", - "egg:batonpass", "egg:captivate", - "egg:cosmicpower", "egg:fakeout", - "egg:faketears", - "egg:helpinghand", - "egg:lastresort", "egg:mudbomb", - "egg:psychup", "egg:simplebeam", - "egg:substitute", - "egg:suckerpunch", "egg:tickle", - "egg:uproar", + "egg:wakeupslap", "egg:wish", - "egg:zenheadbutt", "tm:attract", + "tm:babydolleyes", + "tm:batonpass", "tm:blizzard", + "tm:bodyslam", "tm:calmmind", "tm:captivate", "tm:chargebeam", - "tm:confide", + "tm:charm", + "tm:cosmicpower", + "tm:covet", "tm:dig", - "tm:doubleteam", + "tm:disarmingvoice", + "tm:doubleedge", + "tm:drainingkiss", "tm:dreameater", "tm:echoedvoice", "tm:endure", "tm:facade", + "tm:faketears", "tm:flash", - "tm:frustration", + "tm:furyswipes", "tm:grassknot", - "tm:hiddenpower", + "tm:headbutt", + "tm:healbell", + "tm:helpinghand", + "tm:hypervoice", "tm:icebeam", + "tm:icywind", "tm:irontail", - "tm:naturalgift", + "tm:lastresort", + "tm:mudslap", + "tm:nastyplot", "tm:payback", + "tm:payday", + "tm:playrough", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", - "tm:round", + "tm:rollout", "tm:safeguard", - "tm:secretpower", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", + "tm:tailslap", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", + "tm:uproar", "tm:waterpulse", "tm:wildcharge", "tm:workup", - "tutor:attract", - "tutor:bodyslam", - "tutor:captivate", + "tm:zenheadbutt", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:chargebeam", "tutor:covet", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:dreameater", - "tutor:endure", - "tutor:foresight", - "tutor:growl", - "tutor:headbutt", "tutor:healbell", "tutor:helpinghand", "tutor:hypervoice", + "tutor:icebeam", "tutor:icywind", "tutor:irontail", "tutor:lastresort", - "tutor:mimic", "tutor:mudslap", - "tutor:payday", - "tutor:psychup", + "tutor:playrough", + "tutor:rest", "tutor:rollout", + "tutor:shadowball", "tutor:shockwave", "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", "tutor:suckerpunch", - "tutor:swagger", - "tutor:swift", - "tutor:tackle", - "tutor:tailwhip", - "tutor:thunderwave", - "tutor:tickle", + "tutor:thunderbolt", "tutor:uproar", "tutor:waterpulse", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.skitty.desc" + "tutor:wildcharge", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:swift", + "legacy:toxic" ], "evolutions": [ { @@ -157,38 +219,5 @@ "requirements": [], "requiredContext": "cobblemon:moon_stone" } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 6, - "weight": 110, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:silk_scarf", - "percentage": 2.5 - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true + ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/slaking.json b/common/src/main/resources/data/cobblemon/species/generation3/slaking.json deleted file mode 100644 index 4f6fd29c5..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/slaking.json +++ /dev/null @@ -1,219 +0,0 @@ -{ - "name": "Slaking", - "nationalPokedexNumber": 289, - "primaryType": "normal", - "abilities": [ - "truant" - ], - "baseStats": { - "hp": 150, - "attack": 160, - "defence": 100, - "special_attack": 95, - "special_defence": 65, - "speed": 100 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 252, - "experienceGroup": "slow", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:encore", - "1:punishment", - "1:scratch", - "1:slackoff", - "1:suckerpunch", - "1:swagger", - "1:yawn", - "14:feintattack", - "17:amnesia", - "23:covet", - "27:chipaway", - "27:throatchop", - "33:counter", - "39:flail", - "45:fling", - "52:megakick", - "63:hammerarm", - "tm:aerialace", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:curse", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:drainpunch", - "tm:earthquake", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frustration", - "tm:gigaimpact", - "tm:gunkshot", - "tm:hardpress", - "tm:heavyslam", - "tm:helpinghand", - "tm:hiddenpower", - "tm:highhorsepower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:incinerate", - "tm:knockoff", - "tm:lashout", - "tm:lowkick", - "tm:lowsweep", - "tm:metalclaw", - "tm:metronome", - "tm:mudshot", - "tm:mudslap", - "tm:naturalgift", - "tm:outrage", - "tm:playrough", - "tm:poisonjab", - "tm:pounce", - "tm:poweruppunch", - "tm:protect", - "tm:quash", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:reversal", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:smackdown", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:uproar", - "tm:waterpulse", - "tm:wildcharge", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt", - "tutor:aerialace", - "tutor:afteryou", - "tutor:block", - "tutor:bodyslam", - "tutor:counter", - "tutor:covet", - "tutor:doubleedge", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:furycutter", - "tutor:gigaimpact", - "tutor:gunkshot", - "tutor:headbutt", - "tutor:icepunch", - "tutor:icywind", - "tutor:lowkick", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mudslap", - "tutor:return", - "tutor:rockslide", - "tutor:seismictoss", - "tutor:shadowclaw", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:swagger", - "tutor:thunderpunch", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.slaking.desc" - ], - "preEvolution": "vigoroth", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 20, - "weight": 1305, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:chesto_berry", - "percentage": 10.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json b/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json deleted file mode 100644 index 99d65063a..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/slakoth.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "name": "Slakoth", - "nationalPokedexNumber": 287, - "primaryType": "normal", - "abilities": [ - "truant" - ], - "baseStats": { - "hp": 60, - "attack": 60, - "defence": 60, - "special_attack": 35, - "special_defence": 35, - "speed": 30 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 56, - "experienceGroup": "slow", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:scratch", - "1:yawn", - "6:encore", - "9:slackoff", - "14:feintattack", - "14:headbutt", - "17:amnesia", - "22:covet", - "25:chipaway", - "25:throatchop", - "30:counter", - "33:flail", - "38:playrough", - "egg:afteryou", - "egg:bodyslam", - "egg:crushclaw", - "egg:curse", - "egg:hammerarm", - "egg:nightslash", - "egg:pursuit", - "egg:slash", - "egg:sleeptalk", - "egg:snore", - "egg:tickle", - "tm:aerialace", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:curse", - "tm:cut", - "tm:doubleteam", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:gunkshot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:incinerate", - "tm:metalclaw", - "tm:metronome", - "tm:mudshot", - "tm:mudslap", - "tm:naturalgift", - "tm:playrough", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:solarbeam", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:toxic", - "tm:waterpulse", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:bodyslam", - "tutor:counter", - "tutor:covet", - "tutor:doubleedge", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:furycutter", - "tutor:gunkshot", - "tutor:headbutt", - "tutor:icepunch", - "tutor:icywind", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mudslap", - "tutor:nightslash", - "tutor:rockslide", - "tutor:seismictoss", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:swagger", - "tutor:thunderpunch", - "tutor:waterpulse", - "tutor:yawn" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.slakoth.desc" - ], - "evolutions": [ - { - "id": "slakoth_vigoroth", - "variant": "level_up", - "result": "vigoroth", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 18 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 8, - "weight": 240, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:chesto_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json b/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json deleted file mode 100644 index be9d7e647..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/snorunt.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "name": "Snorunt", - "nationalPokedexNumber": 361, - "primaryType": "ice", - "abilities": [ - "innerfocus", - "icebody", - "h:moody" - ], - "baseStats": { - "hp": 50, - "attack": 50, - "defence": 50, - "special_attack": 50, - "special_defence": 50, - "speed": 50 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 60, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "mineral" - ], - "moves": [ - "1:astonish", - "1:headbutt", - "1:powdersnow", - "5:leer", - "10:doubleteam", - "15:iceshard", - "20:protect", - "25:icywind", - "30:frostbreath", - "34:icebeam", - "35:bite", - "40:icefang", - "45:hail", - "45:snowscape", - "50:weatherball", - "55:crunch", - "60:blizzard", - "egg:avalanche", - "egg:bide", - "egg:block", - "egg:disable", - "egg:faketears", - "egg:hex", - "egg:iciclecrash", - "egg:rollout", - "egg:spikes", - "egg:switcheroo", - "egg:weatherball", - "tm:attract", - "tm:avalanche", - "tm:blizzard", - "tm:bodyslam", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:crunch", - "tm:doubleteam", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:frostbreath", - "tm:frustration", - "tm:hail", - "tm:helpinghand", - "tm:hex", - "tm:hiddenpower", - "tm:icebeam", - "tm:icefang", - "tm:icespinner", - "tm:iciclespear", - "tm:icywind", - "tm:lightscreen", - "tm:naturalgift", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:spikes", - "tm:spite", - "tm:substitute", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:waterpulse", - "tm:weatherball", - "tutor:bite", - "tutor:block", - "tutor:bodyslam", - "tutor:doubleedge", - "tutor:endure", - "tutor:headbutt", - "tutor:icywind", - "tutor:mimic", - "tutor:powdersnow", - "tutor:rollout", - "tutor:sing", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spite", - "tutor:substitute", - "tutor:swagger", - "tutor:waterpulse", - "tutor:weatherball" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.snorunt.desc" - ], - "evolutions": [ - { - "id": "snorunt_glalie", - "variant": "level_up", - "result": "glalie", - "consumeHeldItem": false, - "learnableMoves": [ - "freezedry" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 42 - } - ] - }, - { - "id": "snorunt_froslass", - "variant": "item_interact", - "result": "froslass", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "properties", - "target": "gender=female" - } - ], - "requiredContext": "cobblemon:dawn_stone" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 7, - "weight": 168, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:snowball", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:dawn_stone", - "percentage": 2.5 - }, - { - "item": "cobblemon:never_melt_ice", - "percentage": 2.5 - }, - { - "item": "cobblemon:babiri_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ 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 deleted file mode 100644 index f9c7b98c6..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/spheal.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "name": "Spheal", - "nationalPokedexNumber": 363, - "primaryType": "ice", - "secondaryType": "water", - "abilities": [ - "thickfat", - "icebody", - "h:oblivious" - ], - "baseStats": { - "hp": 70, - "attack": 40, - "defence": 50, - "special_attack": 55, - "special_defence": 50, - "speed": 25 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 58, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "field" - ], - "moves": [ - "1:defensecurl", - "1:rollout", - "4:growl", - "8:watergun", - "12:powdersnow", - "13:iceball", - "16:rest", - "20:snore", - "24:brine", - "28:aurorabeam", - "33:encore", - "36:bodyslam", - "40:surf", - "44:blizzard", - "48:hail", - "52:sheercold", - "egg:aquaring", - "egg:bellydrum", - "egg:curse", - "egg:fissure", - "egg:rockslide", - "egg:rollout", - "egg:signalbeam", - "egg:sleeptalk", - "egg:spitup", - "egg:stockpile", - "egg:swallow", - "egg:waterpulse", - "egg:watersport", - "egg:yawn", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:captivate", - "tm:confide", - "tm:dive", - "tm:doubleteam", - "tm:earthquake", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:frostbreath", - "tm:frustration", - "tm:hail", - "tm:hiddenpower", - "tm:icebeam", - "tm:icywind", - "tm:irontail", - "tm:naturalgift", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:aquatail", - "tutor:aurorabeam", - "tutor:bodyslam", - "tutor:charm", - "tutor:defensecurl", - "tutor:dive", - "tutor:doubleedge", - "tutor:endure", - "tutor:fissure", - "tutor:headbutt", - "tutor:icywind", - "tutor:irontail", - "tutor:mimic", - "tutor:mudslap", - "tutor:powdersnow", - "tutor:rockslide", - "tutor:rollout", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:steelroller", - "tutor:substitute", - "tutor:superfang", - "tutor:swagger", - "tutor:watergun", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.spheal.desc" - ], - "evolutions": [ - { - "id": "spheal_sealeo", - "variant": "level_up", - "result": "sealeo", - "consumeHeldItem": false, - "learnableMoves": [ - "swagger" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 32 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 8, - "weight": 395, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:cod", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:chesto_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ 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 deleted file mode 100644 index 9276da9ce..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/spoink.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "name": "Spoink", - "nationalPokedexNumber": 325, - "primaryType": "psychic", - "abilities": [ - "thickfat", - "owntempo", - "h:gluttony" - ], - "baseStats": { - "hp": 60, - "attack": 25, - "defence": 35, - "special_attack": 70, - "special_defence": 80, - "speed": 60 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 66, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:splash", - "7:confusion", - "7:psywave", - "10:growl", - "10:odorsleuth", - "14:psybeam", - "18:psychup", - "21:magiccoat", - "22:confuseray", - "26:zenheadbutt", - "29:powergem", - "29:rest", - "33:snore", - "38:psyshock", - "40:payback", - "44:psychic", - "50:bounce", - "egg:amnesia", - "egg:endure", - "egg:extrasensory", - "egg:futuresight", - "egg:luckychant", - "egg:mirrorcoat", - "egg:simplebeam", - "egg:skillswap", - "egg:substitute", - "egg:trick", - "egg:whirlwind", - "egg:zenheadbutt", - "tm:amnesia", - "tm:attract", - "tm:bodyslam", - "tm:calmmind", - "tm:captivate", - "tm:chargebeam", - "tm:chillingwater", - "tm:confide", - "tm:confuseray", - "tm:dazzlinggleam", - "tm:doubleteam", - "tm:dreameater", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:flash", - "tm:flashcannon", - "tm:frustration", - "tm:futuresight", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:icywind", - "tm:imprison", - "tm:irontail", - "tm:lightscreen", - "tm:lunge", - "tm:naturalgift", - "tm:nightshade", - "tm:payback", - "tm:powergem", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:skillswap", - "tm:sleeptalk", - "tm:snarl", - "tm:snatch", - "tm:snowscape", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:bodyslam", - "tutor:bounce", - "tutor:covet", - "tutor:doubleedge", - "tutor:dreameater", - "tutor:endure", - "tutor:headbutt", - "tutor:healbell", - "tutor:icywind", - "tutor:irontail", - "tutor:magiccoat", - "tutor:mimic", - "tutor:psychup", - "tutor:psywave", - "tutor:recycle", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:splash", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:telekinesis", - "tutor:trick", - "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.spoink.desc" - ], - "evolutions": [ - { - "id": "spoink_grumpig", - "variant": "level_up", - "result": "grumpig", - "consumeHeldItem": false, - "learnableMoves": [ - "teeterdance" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 32 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 7, - "weight": 306, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:porkchop", - "quantityRange": "1-2" - }, - { - "item": "minecraft:ender_pearl", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:tanga_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/swablu.json b/common/src/main/resources/data/cobblemon/species/generation3/swablu.json deleted file mode 100644 index c66bd1f07..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/swablu.json +++ /dev/null @@ -1,210 +0,0 @@ -{ - "name": "Swablu", - "nationalPokedexNumber": 333, - "primaryType": "normal", - "secondaryType": "flying", - "abilities": [ - "naturalcure", - "h:cloudnine" - ], - "baseStats": { - "hp": 45, - "attack": 40, - "defence": 60, - "special_attack": 40, - "special_defence": 75, - "speed": 50 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 62, - "experienceGroup": "erratic", - "eggCycles": 20, - "eggGroups": [ - "flying", - "dragon" - ], - "moves": [ - "1:growl", - "1:peck", - "3:astonish", - "4:disarmingvoice", - "8:mist", - "12:furyattack", - "16:round", - "20:dragonbreath", - "20:naturalgift", - "24:safeguard", - "26:refresh", - "28:sing", - "30:mirrormove", - "32:cottonguard", - "36:takedown", - "38:dragonpulse", - "40:moonblast", - "44:perishsong", - "egg:agility", - "egg:astonish", - "egg:defog", - "egg:dragonrush", - "egg:featherdance", - "egg:haze", - "egg:hypervoice", - "egg:playrough", - "egg:powerswap", - "egg:pursuit", - "egg:rage", - "egg:roost", - "egg:steelwing", - "egg:tailwind", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:attract", - "tm:bodyslam", - "tm:bravebird", - "tm:captivate", - "tm:confide", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:dragoncheer", - "tm:dragonpulse", - "tm:dreameater", - "tm:dualwingbeat", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:featherdance", - "tm:fly", - "tm:frustration", - "tm:haze", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hurricane", - "tm:hypervoice", - "tm:icebeam", - "tm:naturalgift", - "tm:outrage", - "tm:playrough", - "tm:pluck", - "tm:powerswap", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:trailblaze", - "tm:uproar", - "tutor:aircutter", - "tutor:bodyslam", - "tutor:defog", - "tutor:doubleedge", - "tutor:dragonpulse", - "tutor:dreameater", - "tutor:dualwingbeat", - "tutor:endure", - "tutor:falseswipe", - "tutor:featherdance", - "tutor:growl", - "tutor:healbell", - "tutor:heatwave", - "tutor:hypervoice", - "tutor:mimic", - "tutor:mudslap", - "tutor:ominouswind", - "tutor:outrage", - "tutor:peck", - "tutor:psychup", - "tutor:roost", - "tutor:skyattack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", - "tutor:swift", - "tutor:tailwind", - "tutor:twister", - "tutor:uproar" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.swablu.desc" - ], - "evolutions": [ - { - "id": "swablu_altaria", - "variant": "level_up", - "result": "altaria", - "consumeHeldItem": false, - "learnableMoves": [ - "dragonpulse" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 35 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 4, - "weight": 12, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:white_wool", - "quantityRange": "0-1" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:yache_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 364cc1f89..bd1dd1b14 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/swalot.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/swalot.json @@ -1,12 +1,26 @@ { - "name": "Swalot", + "implemented": true, "nationalPokedexNumber": 317, + "name": "Swalot", "primaryType": "poison", + "maleRatio": 0.5, + "height": 17, + "weight": 800, + "pokedex": [ + "cobblemon.species.swalot.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [], "abilities": [ "liquidooze", "stickyhold", "h:gluttony" ], + "eggGroups": [ + "amorphous" + ], "baseStats": { "hp": 100, "attack": 73, @@ -15,47 +29,75 @@ "special_defence": 83, "speed": 55 }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 2, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 163, "experienceGroup": "fluctuating", + "catchRate": 75, "eggCycles": 20, - "eggGroups": [ - "amorphous" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:black_sludge", + "percentage": 5.0 + }, + { + "item": "cobblemon:oran_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:bodyslam", - "1:gunkshot", - "1:poisongas", "1:pound", + "1:yawn", + "1:poisongas", "1:sludge", - "1:venomdrench", + "1:bodyslam", "1:wringout", - "1:yawn", + "1:gunkshot", + "1:venomdrench", "12:amnesia", "17:acidspray", "20:encore", "25:toxic", - "30:spitup", "30:stockpile", + "30:spitup", "30:swallow", "37:sludgebomb", "42:gastroacid", "49:belch", + "egg:acidarmor", + "egg:clearsmog", + "egg:curse", + "egg:destinybond", + "egg:mudslap", + "egg:smog", + "egg:stuffcheeks", "tm:acidspray", "tm:amnesia", - "tm:attract", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:bulletseed", - "tm:captivate", - "tm:confide", + "tm:corrosivegas", "tm:curse", "tm:doubleedge", - "tm:doubleteam", "tm:dreameater", "tm:earthquake", "tm:encore", @@ -64,12 +106,12 @@ "tm:facade", "tm:firepunch", "tm:fling", - "tm:frustration", + "tm:gastroacid", "tm:gigadrain", "tm:gigaimpact", "tm:gunkshot", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:icebeam", "tm:icepunch", @@ -78,18 +120,16 @@ "tm:metronome", "tm:mudshot", "tm:mudslap", - "tm:naturalgift", "tm:painsplit", "tm:poisonjab", "tm:poweruppunch", "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:rocksmash", - "tm:round", - "tm:secretpower", + "tm:rollout", "tm:seedbomb", + "tm:selfdestruct", "tm:shadowball", "tm:shockwave", "tm:sleeptalk", @@ -100,7 +140,6 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swordsdance", "tm:takedown", "tm:terablast", @@ -109,79 +148,73 @@ "tm:thunderwave", "tm:toxic", "tm:toxicspikes", + "tm:venomdrench", "tm:venoshock", "tm:waterpulse", "tm:zenheadbutt", "tutor:block", - "tutor:bodyslam", - "tutor:counter", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:dreameater", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:explosion", + "tutor:bulldoze", + "tutor:corrosivegas", "tutor:firepunch", "tutor:gastroacid", "tutor:gigadrain", + "tutor:gigaimpact", "tutor:gunkshot", - "tutor:headbutt", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", "tutor:icepunch", - "tutor:mimic", + "tutor:knockoff", "tutor:mudslap", - "tutor:nightmare", "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", "tutor:rollout", "tutor:seedbomb", - "tutor:selfdestruct", + "tutor:shadowball", "tutor:shockwave", "tutor:sleeptalk", + "tutor:sludgebomb", "tutor:snatch", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", "tutor:thunderpunch", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.swalot.desc" + "tutor:waterpulse", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:counter", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:dynamicpunch", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:naturalgift", + "legacy:nightmare", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "special:sing" ], "preEvolution": "gulpin", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 17, - "weight": 800, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:black_sludge", - "percentage": 5.0 - }, - { - "item": "cobblemon:oran_berry", - "percentage": 5.0 + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json b/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json deleted file mode 100644 index 0ae403d9a..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/vigoroth.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "name": "Vigoroth", - "nationalPokedexNumber": 288, - "primaryType": "normal", - "abilities": [ - "vitalspirit" - ], - "baseStats": { - "hp": 80, - "attack": 80, - "defence": 80, - "special_attack": 55, - "special_defence": 55, - "speed": 90 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 154, - "experienceGroup": "slow", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:encore", - "1:focusenergy", - "1:scratch", - "1:uproar", - "14:furyswipes", - "17:endure", - "23:slash", - "27:chipaway", - "27:throatchop", - "33:counter", - "37:focuspunch", - "43:reversal", - "tm:aerialace", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:curse", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:drainpunch", - "tm:earthquake", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fireblast", - "tm:firepunch", - "tm:flamethrower", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frustration", - "tm:gunkshot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hypervoice", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:incinerate", - "tm:knockoff", - "tm:lashout", - "tm:lowkick", - "tm:lowsweep", - "tm:metalclaw", - "tm:metronome", - "tm:mudshot", - "tm:mudslap", - "tm:naturalgift", - "tm:outrage", - "tm:playrough", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:reversal", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:uproar", - "tm:waterpulse", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:bodyslam", - "tutor:counter", - "tutor:covet", - "tutor:doubleedge", - "tutor:dynamicpunch", - "tutor:endure", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:furycutter", - "tutor:gunkshot", - "tutor:headbutt", - "tutor:icepunch", - "tutor:icywind", - "tutor:lowkick", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mudslap", - "tutor:rockslide", - "tutor:seismictoss", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:suckerpunch", - "tutor:swagger", - "tutor:thunderpunch", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.vigoroth.desc" - ], - "preEvolution": "slakoth", - "evolutions": [ - { - "id": "vigoroth_slaking", - "variant": "level_up", - "result": "slaking", - "consumeHeldItem": false, - "learnableMoves": [ - "swagger" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 36 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 14, - "weight": 465, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:chesto_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/walrein.json b/common/src/main/resources/data/cobblemon/species/generation3/walrein.json deleted file mode 100644 index e06c0e024..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/walrein.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "name": "Walrein", - "nationalPokedexNumber": 365, - "primaryType": "ice", - "secondaryType": "water", - "abilities": [ - "thickfat", - "icebody", - "h:oblivious" - ], - "baseStats": { - "hp": 110, - "attack": 80, - "defence": 90, - "special_attack": 95, - "special_defence": 90, - "speed": 65 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 265, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "field" - ], - "moves": [ - "1:crunch", - "1:defensecurl", - "1:growl", - "1:icefang", - "1:rollout", - "1:swagger", - "1:watergun", - "12:powdersnow", - "13:iceball", - "16:rest", - "20:snore", - "24:brine", - "28:aurorabeam", - "35:encore", - "40:bodyslam", - "48:surf", - "56:blizzard", - "64:hail", - "72:sheercold", - "tm:attract", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:captivate", - "tm:confide", - "tm:crunch", - "tm:dive", - "tm:doubleteam", - "tm:earthquake", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:frostbreath", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:heavyslam", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:iciclespear", - "tm:icywind", - "tm:ironhead", - "tm:irontail", - "tm:liquidation", - "tm:naturalgift", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swordsdance", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:aquatail", - "tutor:block", - "tutor:bodyslam", - "tutor:brine", - "tutor:defensecurl", - "tutor:dive", - "tutor:doubleedge", - "tutor:endure", - "tutor:furycutter", - "tutor:hail", - "tutor:headbutt", - "tutor:icebeam", - "tutor:icywind", - "tutor:ironhead", - "tutor:irontail", - "tutor:mimic", - "tutor:mudslap", - "tutor:rockslide", - "tutor:rollout", - "tutor:sheercold", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:steelroller", - "tutor:stompingtantrum", - "tutor:substitute", - "tutor:superfang", - "tutor:swagger", - "tutor:waterpulse" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.walrein.desc" - ], - "preEvolution": "sealeo", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 14, - "weight": 1506, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:cod", - "quantityRange": "0-3" - }, - { - "item": "cobblemon:chesto_berry", - "percentage": 10.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 5770a5871..1071c091f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/wurmple.json @@ -1,11 +1,25 @@ { - "name": "Wurmple", + "implemented": true, "nationalPokedexNumber": 265, + "name": "Wurmple", "primaryType": "bug", + "maleRatio": 0.5, + "height": 3, + "weight": 36, + "pokedex": [ + "cobblemon.species.wurmple.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [], "abilities": [ "shielddust", "h:runaway" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 45, "attack": 45, @@ -14,31 +28,53 @@ "special_defence": 30, "speed": 20 }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 1, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 56, "experienceGroup": "medium_fast", + "catchRate": 255, "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "0-1" + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:stringshot", "1:tackle", + "1:stringshot", "5:poisonsting", "15:bugbite", + "tm:bugbite", + "tm:electroweb", + "tm:skittersmack", + "tm:stringshot", + "tm:terablast", "tutor:bugbite", "tutor:electroweb", - "tutor:poisonsting", - "tutor:snore", - "tutor:stringshot" - ], - "labels": [ - "gen3" - ], - "pokedex": [ - "cobblemon.species.wurmple.desc" + "tutor:skittersmack", + "tutor:stringshot", + "legacy:snore" ], "evolutions": [ { @@ -46,11 +82,17 @@ "variant": "level_up", "result": "silcoon", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "harden" + ], "requirements": [ { "variant": "level", "minLevel": 7 + }, + { + "variant": "properties", + "target": "wurmple cocoon_species=silcoon" } ] }, @@ -59,46 +101,36 @@ "variant": "level_up", "result": "cascoon", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "harden" + ], "requirements": [ { "variant": "level", "minLevel": 7 + }, + { + "variant": "properties", + "target": "wurmple cocoon_species=cascoon" } ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 36, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 2.5 + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json b/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json deleted file mode 100644 index 76c73252e..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation3/wynaut.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "name": "Wynaut", - "nationalPokedexNumber": 360, - "primaryType": "psychic", - "abilities": [ - "shadowtag", - "h:telepathy" - ], - "baseStats": { - "hp": 95, - "attack": 23, - "defence": 48, - "special_attack": 23, - "special_defence": 48, - "speed": 23 - }, - "catchRate": 125, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 52, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:amnesia", - "1:charm", - "1:counter", - "1:destinybond", - "1:encore", - "1:mirrorcoat", - "1:safeguard", - "1:splash", - "tm:amnesia", - "tm:charm", - "tm:encore", - "tm:safeguard", - "tutor:charm", - "tutor:encore", - "tutor:splash", - "tutor:tickle" - ], - "labels": [ - "gen3", - "baby" - ], - "pokedex": [ - "cobblemon.species.wynaut.desc" - ], - "evolutions": [ - { - "id": "wynaut_wobbuffet", - "variant": "level_up", - "result": "wobbuffet", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 15 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 140, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:colbur_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 23f4efc60..34f354461 100644 --- a/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json +++ b/common/src/main/resources/data/cobblemon/species/generation3/zangoose.json @@ -1,11 +1,25 @@ { - "name": "Zangoose", + "implemented": true, "nationalPokedexNumber": 335, + "name": "Zangoose", "primaryType": "normal", + "maleRatio": 0.5, + "height": 13, + "weight": 403, + "pokedex": [ + "cobblemon.species.zangoose.desc" + ], + "labels": [ + "gen3" + ], + "aspects": [], "abilities": [ "immunity", "h:toxicboost" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 73, "attack": 115, @@ -14,41 +28,92 @@ "special_defence": 60, "speed": 90 }, - "catchRate": 90, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 2, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 160, "experienceGroup": "erratic", + "catchRate": 90, "eggCycles": 20, - "eggGroups": [ - "field" + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "entityInteract": { + "avoidedByCreeper": true, + "avoidedByPhantom": true + }, + "combat": { + "fightsMelee": true, + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, + "ai": [ + { + "type": "cobblemon:add_tasks_to_activity", + "activity": "idle", + "tasksByPriority": { + "7": [ + { + "type": "cobblemon:hate_entity", + "entityCondition": "q.entity.is_pokemon && q.entity.species.identifier == 'cobblemon:seviper'" + } + ] + } + } ], + "drops": { + "amount": 3, + "entries": [ + { + "item": "cobblemon:razor_claw", + "percentage": 5.0 + }, + { + "item": "cobblemon:quick_claw", + "percentage": 5.0 + }, + { + "item": "cobblemon:pecha_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:bellydrum", - "1:counter", - "1:curse", - "1:disable", - "1:doublehit", - "1:doublekick", - "1:feint", - "1:finalgambit", - "1:flail", - "1:furyswipes", - "1:leer", - "1:nightslash", - "1:quickguard", "1:scratch", + "1:leer", + "1:pursuit", + "1:embargo", + "1:curse", + "1:revenge", "5:quickattack", "8:furycutter", "12:metalclaw", - "12:pursuit", "15:honeclaws", "19:slash", "22:powertrip", - "22:revenge", "26:crushclaw", "29:falseswipe", - "33:embargo", "33:switcheroo", "36:detect", "40:xscissor", @@ -57,7 +122,6 @@ "50:closecombat", "egg:bellydrum", "egg:counter", - "egg:curse", "egg:disable", "egg:doublehit", "egg:doublekick", @@ -65,27 +129,20 @@ "egg:finalgambit", "egg:flail", "egg:furyswipes", - "egg:irontail", - "egg:metalclaw", "egg:nightslash", "egg:quickguard", "egg:razorwind", - "egg:roar", "tm:aerialace", "tm:agility", - "tm:attract", "tm:aurasphere", "tm:batonpass", "tm:blizzard", "tm:bodyslam", "tm:brickbreak", - "tm:captivate", "tm:closecombat", - "tm:confide", "tm:curse", "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:embargo", "tm:endeavor", "tm:endure", @@ -97,13 +154,12 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:frustration", - "tm:gigadrain", + "tm:furycutter", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:icebeam", @@ -112,10 +168,12 @@ "tm:incinerate", "tm:irontail", "tm:knockoff", + "tm:lastresort", "tm:lowkick", "tm:lowsweep", + "tm:megakick", + "tm:megapunch", "tm:metalclaw", - "tm:naturalgift", "tm:payback", "tm:poisonjab", "tm:poweruppunch", @@ -123,15 +181,14 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", + "tm:revenge", "tm:reversal", "tm:roar", "tm:rockclimb", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", - "tm:secretpower", + "tm:rollout", "tm:seedbomb", "tm:shadowball", "tm:shadowclaw", @@ -142,7 +199,6 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:swagger", "tm:swift", "tm:swordsdance", "tm:takedown", @@ -154,98 +210,65 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:upperhand", - "tm:waterpulse", "tm:workup", "tm:xscissor", "tm:zenheadbutt", - "tutor:bodyslam", - "tutor:brickbreak", - "tutor:counter", - "tutor:crushclaw", - "tutor:defensecurl", - "tutor:doubleedge", - "tutor:doublehit", - "tutor:dynamicpunch", + "tutor:aerialace", "tutor:endeavor", - "tutor:endure", + "tutor:falseswipe", "tutor:firepunch", + "tutor:flamethrower", "tutor:focuspunch", "tutor:furycutter", - "tutor:gigadrain", - "tutor:headbutt", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", "tutor:icepunch", "tutor:icywind", "tutor:irontail", "tutor:knockoff", "tutor:lastresort", - "tutor:leer", "tutor:lowkick", - "tutor:megakick", - "tutor:megapunch", - "tutor:mimic", - "tutor:mudslap", - "tutor:quickattack", - "tutor:refresh", + "tutor:poisonjab", + "tutor:rest", "tutor:rockslide", + "tutor:rocksmash", "tutor:rollout", - "tutor:scratch", - "tutor:seismictoss", + "tutor:seedbomb", + "tutor:shadowball", + "tutor:shadowclaw", "tutor:shockwave", "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:swagger", "tutor:swift", - "tutor:swordsdance", "tutor:throatchop", + "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thunderwave", - "tutor:waterpulse" - ], - "labels": [ - "gen3" + "tutor:xscissor", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:dynamicpunch", + "legacy:frustration", + "legacy:gigadrain", + "legacy:hiddenpower", + "legacy:mimic", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:seismictoss", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "legacy:waterpulse", + "special:refresh" ], - "pokedex": [ - "cobblemon.species.zangoose.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 403, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:razor_claw", - "percentage": 5.0 - }, - { - "item": "cobblemon:quick_claw", - "percentage": 5.0 - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true + "evolutions": [] } \ No newline at end of file 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 524c43f7d..79a005e41 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/abomasnow.json @@ -1,19 +1,65 @@ { - "name": "Abomasnow", + "implemented": true, "nationalPokedexNumber": 460, + "name": "Abomasnow", "primaryType": "grass", "secondaryType": "ice", + "maleRatio": 0.5, + "height": 22, + "weight": 1355, + "pokedex": [ + "cobblemon.species.abomasnow.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [], "abilities": [ "snowwarning", "h:soundproof" ], + "eggGroups": [ + "monster", + "grass" + ], + "baseStats": { + "hp": 90, + "attack": 92, + "defence": 75, + "special_attack": 92, + "special_defence": 85, + "speed": 60 + }, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 173, + "experienceGroup": "slow", + "catchRate": 60, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { - "amount": 4, + "amount": 8, "entries": [ { "item": "minecraft:snowball", "quantityRange": "0-2" }, + { + "item": "minecraft:sweet_berries", + "quantityRange": "2-4" + }, { "item": "cobblemon:never_melt_ice", "percentage": 5.0 @@ -24,110 +70,41 @@ } ] }, - "baseStats": { - "hp": 90, - "attack": 92, - "defence": 75, - "special_attack": 92, - "special_defence": 85, - "speed": 60 - }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "grass", - "secondaryType": "ice", - "abilities": [ - "snowwarning" - ], - "baseStats": { - "hp": 90, - "attack": 132, - "defence": 105, - "special_attack": 132, - "special_defence": 105, - "speed": 30 - }, - "catchRate": 60, - "maleRatio": 0.5, - "baseExperienceYield": 173, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "monster", - "grass" - ], - "labels": [ - "gen6", - "mega" - ], - "aspects": [ - "mega" - ], - "height": 27, - "weight": 1850, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 173, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "monster", - "grass" - ], "moves": [ - "1:auroraveil", "1:icepunch", - "1:icywind", - "1:leafage", + "1:powdersnow", "1:leer", + "1:grasswhistle", "1:mist", - "1:powdersnow", - "1:razorleaf", - "13:grasswhistle", + "1:auroraveil", + "1:leafage", "15:iceshard", - "17:swagger", "20:razorleaf", - "21:mist", "25:icywind", - "26:iceshard", "30:swagger", - "31:ingrain", "35:ingrain", - "36:woodhammer", "43:woodhammer", - "47:blizzard", "49:blizzard", "56:sheercold", - "58:sheercold", - "tm:attract", + "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:captivate", "tm:chillingwater", - "tm:confide", "tm:curse", "tm:doubleedge", - "tm:doubleteam", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -138,15 +115,14 @@ "tm:focusblast", "tm:focuspunch", "tm:frostbreath", - "tm:frustration", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:hail", "tm:hardpress", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:icebeam", "tm:icepunch", @@ -155,7 +131,6 @@ "tm:icywind", "tm:irontail", "tm:leafstorm", - "tm:lightscreen", "tm:lowkick", "tm:magicalleaf", "tm:megakick", @@ -166,19 +141,15 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:rockclimb", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", + "tm:roleplay", "tm:safeguard", "tm:scaryface", - "tm:secretpower", "tm:seedbomb", - "tm:shadowball", "tm:sleeptalk", - "tm:snore", "tm:snowscape", "tm:solarbeam", "tm:stompingtantrum", @@ -186,57 +157,129 @@ "tm:substitute", "tm:swagger", "tm:swordsdance", + "tm:synthesis", "tm:takedown", "tm:terablast", - "tm:toxic", "tm:trailblaze", "tm:waterpulse", "tm:weatherball", + "tm:worryseed", "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:energyball", "tutor:focuspunch", "tutor:gigadrain", + "tutor:gigaimpact", "tutor:grassyglide", - "tutor:headbutt", + "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:snore", "tutor:stompingtantrum", "tutor:synthesis", "tutor:waterpulse", - "tutor:worryseed" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.abomasnow.desc" + "tutor:worryseed", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:lightscreen", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:shadowball", + "legacy:snore", + "legacy:toxic" ], "preEvolution": "snover", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 22, - "weight": 1355, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Mega", + "primaryType": "grass", + "secondaryType": "ice", + "maleRatio": 0.5, + "height": 27, + "weight": 1850, + "pokedex": [ + "cobblemon.species.abomasnow-mega.desc" + ], + "labels": [ + "gen6", + "mega" + ], + "aspects": [ + "mega" + ], + "abilities": [ + "snowwarning", + "h:snowwarning" + ], + "baseStats": { + "hp": 90, + "attack": 132, + "defence": 105, + "special_attack": 132, + "special_defence": 105, + "speed": 30 + }, + "baseExperienceYield": 208, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true, + "behaviour": { + "herd": { + "maxSize": "7" + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } + } + ], + "behaviour": { + "herd": { + "maxSize": "6" + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 5825b3de6..312e34acb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/arceus.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/arceus.json @@ -1,9 +1,25 @@ { - "name": "Arceus", + "implemented": true, "nationalPokedexNumber": 493, + "name": "Arceus", "primaryType": "normal", + "maleRatio": -1, + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus.desc" + ], + "labels": [ + "gen4", + "mythical" + ], + "aspects": [], "abilities": [ - "multitype" + "multitype", + "h:multitype" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 120, @@ -13,1006 +29,1081 @@ "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, - "maleRatio": -1, - "shoulderMountable": false, + "eggCycles": 120, + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "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: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: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: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:phantomforce", + "tm:poisonjab", + "tm:powergem", + "tm:protect", + "tm:psychic", + "tm:psychicterrain", + "tm:psychup", + "tm:psyshock", + "tm:quash", + "tm:raindance", + "tm:recycle", + "tm:reflect", + "tm:rest", + "tm:retaliate", + "tm:roar", + "tm:rockclimb", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:safeguard", + "tm:sandstorm", + "tm:scaryface", + "tm:scorchingsands", + "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", + "tutor:ancientpower", + "tutor:aquatail", + "tutor:blastburn", + "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:hydrocannon", + "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", + "legacy:aerialace", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "legacy:whirlpool", + "special:blastburn", + "special:hydrocannon", + "special:roaroftime", + "special:shadowforce", + "special:spacialrend" + ], + "evolutions": [], "forms": [ { - "name": "Bug", - "primaryType": "bug", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Fighting", + "primaryType": "fighting", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-fighting.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "bug" + "fighting-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Dark", - "primaryType": "dark", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Flying", + "primaryType": "flying", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-flying.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "dark" + "flying-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Dragon", - "primaryType": "dragon", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Poison", + "primaryType": "poison", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-poison.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "dragon" - ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "poison-plate" + ], + "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:facade", + "tm:fireblast", + "tm:flamethrower", + "tm:flareblitz", + "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: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: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:phantomforce", + "tm:poisonjab", + "tm:powergem", + "tm:protect", + "tm:psychic", + "tm:psychicterrain", + "tm:psychup", + "tm:psyshock", + "tm:quash", + "tm:raindance", + "tm:recycle", + "tm:reflect", + "tm:rest", + "tm:retaliate", + "tm:roar", + "tm:rockclimb", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:safeguard", + "tm:sandstorm", + "tm:scaryface", + "tm:scorchingsands", + "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", + "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 }, { - "name": "Electric", - "primaryType": "electric", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Ground", + "primaryType": "ground", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-ground.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "electric" + "ground-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Fairy", - "primaryType": "fairy", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Rock", + "primaryType": "rock", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-rock.desc" ], "labels": [ - "gen6", - "mythical", - "legendary" + "gen4", + "mythical" ], "aspects": [ - "fairy" + "rock-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Fighting", - "primaryType": "fighting", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Bug", + "primaryType": "bug", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-bug.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "fighting" + "bug-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Fire", - "primaryType": "fire", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Ghost", + "primaryType": "ghost", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-ghost.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "fire" + "ghost-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Flying", - "primaryType": "flying", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Steel", + "primaryType": "steel", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-steel.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "flying" + "steel-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Ghost", - "primaryType": "ghost", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Fire", + "primaryType": "fire", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-fire.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "ghost" - ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "fire-plate" + ], + "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: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:facade", + "tm:fireblast", + "tm:flamethrower", + "tm:flareblitz", + "tm:flash", + "tm:flashcannon", + "tm:fly", + "tm:focusblast", + "tm:foulplay", + "tm:futuresight", + "tm:gigadrain", + "tm:gigaimpact", + "tm:grassknot", + "tm:grassyterrain", + "tm:gravity", + "tm:gunkshot", + "tm:hail", + "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: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:phantomforce", + "tm:poisonjab", + "tm:powergem", + "tm:protect", + "tm:psychic", + "tm:psychicterrain", + "tm:psychup", + "tm:psyshock", + "tm:quash", + "tm:raindance", + "tm:recycle", + "tm:reflect", + "tm:rest", + "tm:retaliate", + "tm:roar", + "tm:rockclimb", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:safeguard", + "tm:sandstorm", + "tm:scaryface", + "tm:scorchingsands", + "tm:shadowball", + "tm:shadowclaw", + "tm:shockwave", + "tm:signalbeam", + "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:waterfall", + "tm:waterpulse", + "tm:wildcharge", + "tm:willowisp", + "tm:workup", + "tm:xscissor", + "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 }, { - "name": "Grass", - "primaryType": "grass", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Water", + "primaryType": "water", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-water.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "grass" + "water-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Ground", - "primaryType": "ground", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Grass", + "primaryType": "grass", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-grass.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "ground" + "grass-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Ice", - "primaryType": "ice", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Electric", + "primaryType": "electric", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-electric.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "ice" + "electric-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Poison", - "primaryType": "poison", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Psychic", + "primaryType": "psychic", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-psychic.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "poison" + "psychic-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Psychic", - "primaryType": "psychic", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Ice", + "primaryType": "ice", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-ice.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "psychic" + "ice-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Rock", - "primaryType": "rock", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Dragon", + "primaryType": "dragon", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-dragon.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "rock" + "dragon-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Steel", - "primaryType": "steel", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Dark", + "primaryType": "dark", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-dark.desc" ], "labels": [ "gen4", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "steel" + "dark-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { - "name": "Water", - "primaryType": "water", - "abilities": [ - "multitype" - ], - "baseStats": { - "hp": 120, - "attack": 120, - "defence": 120, - "special_attack": 120, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, + "name": "Fairy", + "primaryType": "fairy", "maleRatio": -1, - "baseExperienceYield": 324, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 32, + "weight": 3200, + "pokedex": [ + "cobblemon.species.arceus-fairy.desc" ], "labels": [ - "gen4", - "mythical", - "legendary" + "gen6", + "mythical" ], "aspects": [ - "water" + "fairy-plate" ], - "height": 32, - "weight": 3200, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false } ], - "baseExperienceYield": 324, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:cosmicpower", - "1:naturalgift", - "1:punishment", - "1:seismictoss", - "10:gravity", - "20:earthpower", - "30:hypervoice", - "40:extremespeed", - "50:healingwish", - "50:refresh", - "60:futuresight", - "70:recover", - "80:hyperbeam", - "90:perishsong", - "100:judgment", - "tm:acidspray", - "tm:aerialace", - "tm:agility", - "tm:airslash", - "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:confide", - "tm:confuseray", - "tm:cut", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "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:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flareblitz", - "tm:flash", - "tm:flashcannon", - "tm:fly", - "tm:focusblast", - "tm:foulplay", - "tm:frustration", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:gunkshot", - "tm:hail", - "tm:heatwave", - "tm:heavyslam", - "tm:hex", - "tm:hiddenpower", - "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:lightscreen", - "tm:liquidation", - "tm:magicalleaf", - "tm:meteorbeam", - "tm:mistyterrain", - "tm:naturalgift", - "tm:outrage", - "tm:overheat", - "tm:payback", - "tm:phantomforce", - "tm:poisonjab", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:quash", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "tm:scorchingsands", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "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:swagger", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tm:wildcharge", - "tm:willowisp", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt", - "tutor:ancientpower", - "tutor:aquatail", - "tutor:blastburn", - "tutor:darkpulse", - "tutor:defog", - "tutor:dive", - "tutor:dracometeor", - "tutor:dragonpulse", - "tutor:earthpower", - "tutor:extremespeed", - "tutor:furycutter", - "tutor:gigadrain", - "tutor:gravity", - "tutor:headbutt", - "tutor:heatwave", - "tutor:hydrocannon", - "tutor:hyperbeam", - "tutor:hypervoice", - "tutor:icywind", - "tutor:irondefense", - "tutor:ironhead", - "tutor:irontail", - "tutor:judgment", - "tutor:laserfocus", - "tutor:lastresort", - "tutor:liquidation", - "tutor:magiccoat", - "tutor:mudslap", - "tutor:ominouswind", - "tutor:outrage", - "tutor:perishsong", - "tutor:recover", - "tutor:recycle", - "tutor:roaroftime", - "tutor:shadowforce", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spacialrend", - "tutor:stealthrock", - "tutor:swift", - "tutor:tailwind", - "tutor:telekinesis", - "tutor:trick", - "tutor:twister", - "tutor:waterpulse", - "tutor:zenheadbutt" - ], - "labels": [ - "gen4", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.arceus.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 32, - "weight": 3200, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 b97c4190a..a40bb0959 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/azelf.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/azelf.json @@ -1,9 +1,25 @@ { - "name": "Azelf", + "implemented": true, "nationalPokedexNumber": 482, + "name": "Azelf", "primaryType": "psychic", + "maleRatio": -1, + "height": 3, + "weight": 3, + "pokedex": [ + "cobblemon.species.azelf.desc" + ], + "labels": [ + "gen4", + "legendary" + ], + "aspects": [], "abilities": [ - "levitate" + "levitate", + "h:levitate" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 75, @@ -13,54 +29,52 @@ "special_defence": 70, "speed": 115 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 2, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 140, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:allyswitch", - "1:assurance", + "1:rest", "1:confusion", - "1:expandingforce", + "1:snore", + "1:safeguard", "1:irontail", - "1:lastresort", - "1:naturalgift", - "1:magicroom", "1:payback", + "1:wonderroom", + "1:magicroom", + "1:naturalgift", + "1:allyswitch", + "1:triattack", + "1:selfdestruct", "1:psychocut", - "1:rest", + "1:assurance", + "1:expandingforce", "1:round", - "1:safeguard", - "1:selfdestruct", - "1:snore", - "1:triattack", - "1:wonderroom", - "6:imprison", "7:swift", "14:detect", - "16:detect", "21:psybeam", - "21:swift", "28:imprison", - "31:uproar", "35:extrasensory", - "36:futuresight", "42:nastyplot", - "46:nastyplot", "49:psychic", - "50:extrasensory", - "51:extrasensory", "56:uproar", - "61:lastresort", "63:futuresight", - "66:naturalgift", "70:lastresort", - "76:explosion", "77:explosion", "84:mysticalpower", "tm:acrobatics", @@ -69,10 +83,8 @@ "tm:batonpass", "tm:calmmind", "tm:chargebeam", - "tm:confide", "tm:dazzlinggleam", "tm:doubleedge", - "tm:doubleteam", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -88,19 +100,21 @@ "tm:flamethrower", "tm:flash", "tm:fling", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:icepunch", "tm:imprison", "tm:incinerate", "tm:irontail", "tm:knockoff", + "tm:laserfocus", + "tm:lastresort", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:metronome", "tm:mudslap", @@ -108,6 +122,7 @@ "tm:naturalgift", "tm:payback", "tm:playrough", + "tm:powershift", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -119,14 +134,14 @@ "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", + "tm:roleplay", "tm:round", "tm:safeguard", "tm:sandstorm", - "tm:secretpower", "tm:selfdestruct", "tm:shadowball", "tm:shockwave", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", "tm:snore", @@ -134,7 +149,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:taunt", "tm:telekinesis", @@ -144,7 +158,6 @@ "tm:thunderpunch", "tm:thunderwave", "tm:torment", - "tm:toxic", "tm:triattack", "tm:trick", "tm:trickroom", @@ -154,15 +167,18 @@ "tm:wonderroom", "tm:zenheadbutt", "tutor:allyswitch", - "tutor:confusion", + "tutor:calmmind", + "tutor:chargebeam", "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:endeavor", + "tutor:energyball", "tutor:expandingforce", - "tutor:extrasensory", - "tutor:facade", "tutor:firepunch", - "tutor:futuresight", - "tutor:headbutt", + "tutor:flamethrower", + "tutor:gigaimpact", "tutor:helpinghand", + "tutor:hyperbeam", "tutor:icepunch", "tutor:irontail", "tutor:knockoff", @@ -171,10 +187,14 @@ "tutor:magiccoat", "tutor:magicroom", "tutor:mudslap", - "tutor:nastyplot", + "tutor:playrough", + "tutor:powershift", "tutor:psychic", + "tutor:psychocut", "tutor:recycle", + "tutor:rest", "tutor:roleplay", + "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", "tutor:skillswap", @@ -183,39 +203,59 @@ "tutor:stealthrock", "tutor:swift", "tutor:telekinesis", + "tutor:thunderbolt", "tutor:thunderpunch", "tutor:trick", "tutor:uproar", "tutor:waterpulse", "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen4", - "legendary" - ], - "pokedex": [ - "cobblemon.species.azelf.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:secretpower", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 140, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 3, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "uxie", + "tier": 1 + }, + { + "pokemon": "mesprit", + "tier": 1 + }, + { + "pokemon": "azelf", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json b/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json deleted file mode 100644 index cc9fff6cb..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/bronzong.json +++ /dev/null @@ -1,227 +0,0 @@ -{ - "name": "Bronzong", - "nationalPokedexNumber": 437, - "primaryType": "steel", - "secondaryType": "psychic", - "abilities": [ - "levitate", - "heatproof", - "h:heavymetal" - ], - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:raw_iron", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:mental_herb", - "percentage": 5.0 - }, - { - "item": "cobblemon:light_clay", - "percentage": 5.0 - }, - { - "item": "cobblemon:occa_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 67, - "attack": 89, - "defence": 116, - "special_attack": 79, - "special_defence": 116, - "speed": 33 - }, - "catchRate": 90, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 175, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "mineral" - ], - "moves": [ - "1:block", - "1:confuseray", - "1:confusion", - "1:hypnosis", - "1:imprison", - "1:payback", - "1:raindance", - "1:sunnyday", - "1:tackle", - "1:weatherball", - "11:confuseray", - "12:imprison", - "14:confuseray", - "15:psywave", - "16:gyroball", - "19:extrasensory", - "19:irondefense", - "20:hypnosis", - "21:feintattack", - "24:safeguard", - "25:safeguard", - "26:irondefense", - "28:extrasensory", - "29:futuresight", - "30:safeguard", - "31:metalsound", - "32:heavyslam", - "33:block", - "36:gyroball", - "38:gyroball", - "38:irondefense", - "42:extrasensory", - "43:futuresight", - "44:metalsound", - "46:payback", - "50:feintattack", - "50:futuresight", - "52:healblock", - "56:raindance", - "58:heavyslam", - "61:payback", - "67:healblock", - "tm:allyswitch", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:confide", - "tm:confuseray", - "tm:doubleteam", - "tm:dreameater", - "tm:earthquake", - "tm:endure", - "tm:expandingforce", - "tm:explosion", - "tm:facade", - "tm:flash", - "tm:flashcannon", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:gyroball", - "tm:hardpress", - "tm:heavyslam", - "tm:helpinghand", - "tm:hex", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icespinner", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:lightscreen", - "tm:metalsound", - "tm:meteorbeam", - "tm:naturalgift", - "tm:nightshade", - "tm:payback", - "tm:powergem", - "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:return", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:speedswap", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:weatherball", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:ancientpower", - "tutor:block", - "tutor:expandingforce", - "tutor:gravity", - "tutor:ironhead", - "tutor:meteorbeam", - "tutor:recycle", - "tutor:rollout", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stealthrock", - "tutor:steelbeam", - "tutor:steelroller", - "tutor:telekinesis", - "tutor:trick", - "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.bronzong.desc" - ], - "preEvolution": "bronzor", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 13, - "weight": 1870, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json b/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json deleted file mode 100644 index 79f5100b8..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/bronzor.json +++ /dev/null @@ -1,224 +0,0 @@ -{ - "name": "Bronzor", - "nationalPokedexNumber": 436, - "primaryType": "steel", - "secondaryType": "psychic", - "abilities": [ - "levitate", - "heatproof", - "h:heavymetal" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:raw_iron", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:mental_herb", - "percentage": 2.5 - }, - { - "item": "cobblemon:light_clay", - "percentage": 2.5 - }, - { - "item": "cobblemon:occa_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 57, - "attack": 24, - "defence": 86, - "special_attack": 24, - "special_defence": 86, - "speed": 23 - }, - "catchRate": 255, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 60, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "mineral" - ], - "moves": [ - "1:confusion", - "1:tackle", - "4:confuseray", - "5:hypnosis", - "7:hypnosis", - "8:payback", - "9:imprison", - "11:confuseray", - "12:imprison", - "14:confuseray", - "15:psywave", - "16:gyroball", - "19:extrasensory", - "19:irondefense", - "20:hypnosis", - "21:feintattack", - "24:safeguard", - "25:safeguard", - "26:irondefense", - "28:extrasensory", - "29:futuresight", - "30:safeguard", - "31:metalsound", - "32:heavyslam", - "35:gyroball", - "36:irondefense", - "37:futuresight", - "39:extrasensory", - "40:metalsound", - "41:feintattack", - "41:payback", - "44:futuresight", - "45:healblock", - "49:heavyslam", - "49:payback", - "52:healblock", - "egg:gravity", - "egg:recycle", - "tm:allyswitch", - "tm:bodyslam", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:confide", - "tm:confuseray", - "tm:doubleteam", - "tm:dreameater", - "tm:earthquake", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:flash", - "tm:flashcannon", - "tm:frustration", - "tm:futuresight", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:gyroball", - "tm:heavyslam", - "tm:helpinghand", - "tm:hex", - "tm:hiddenpower", - "tm:icespinner", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:lightscreen", - "tm:metalsound", - "tm:naturalgift", - "tm:payback", - "tm:powergem", - "tm:powerswap", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:recycle", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:speedswap", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:telekinesis", - "tm:terablast", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:ancientpower", - "tutor:expandingforce", - "tutor:gravity", - "tutor:hypnosis", - "tutor:irondefense", - "tutor:recycle", - "tutor:rollout", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stealthrock", - "tutor:steelbeam", - "tutor:steelroller", - "tutor:telekinesis", - "tutor:trick", - "tutor:wonderroom" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.bronzor.desc" - ], - "evolutions": [ - { - "id": "bronzor_bronzong", - "variant": "level_up", - "result": "bronzong", - "consumeHeldItem": false, - "learnableMoves": [ - "block" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 33 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 605, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 2df3e115d..ad690411e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/burmy.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/burmy.json @@ -1,11 +1,54 @@ { - "name": "Burmy", + "implemented": true, "nationalPokedexNumber": 412, + "name": "Burmy", "primaryType": "bug", + "maleRatio": 0.5, + "height": 2, + "weight": 34, + "pokedex": [ + "cobblemon.species.burmy.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "plant-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, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 2, "entries": [ @@ -19,41 +62,20 @@ } ] }, - "baseStats": { - "hp": 40, - "attack": 29, - "defence": 45, - "special_attack": 29, - "special_defence": 45, - "speed": 36 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 45, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], "moves": [ - "1:protect", "10:tackle", "15:bugbite", - "20:hiddenpower", - "tm:hiddenpower", - "tm:protect", + "20:stringshot", + "tm:bugbite", + "tm:electroweb", + "tm:stringshot", + "tm:terablast", "tutor:bugbite", "tutor:electroweb", - "tutor:protect", - "tutor:snore", - "tutor:stringshot" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.burmy.desc" + "tutor:stringshot", + "legacy:hiddenpower", + "legacy:protect", + "legacy:snore" ], "evolutions": [ { @@ -61,7 +83,9 @@ "variant": "level_up", "result": "wormadam", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "quiverdance" + ], "requirements": [ { "variant": "level", @@ -74,11 +98,13 @@ ] }, { - "id": "burmy_wormadam", + "id": "burmy_mothim", "variant": "level_up", - "result": "wormadam sandy", + "result": "mothim", "consumeHeldItem": false, - "learnableMoves": [], + "learnableMoves": [ + "quiverdance" + ], "requirements": [ { "variant": "level", @@ -86,63 +112,143 @@ }, { "variant": "properties", - "target": "gender=female" + "target": "gender=male" } ] - }, + } + ], + "forms": [ { - "id": "burmy_wormadam", - "variant": "level_up", - "result": "wormadam trash", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ + "name": "Sandy", + "primaryType": "bug", + "maleRatio": 0.5, + "height": 2, + "weight": 34, + "pokedex": [ + "cobblemon.species.burmy-sandy.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "sandy-cloak" + ], + "evolutions": [ { - "variant": "level", - "minLevel": 20 + "id": "burmy_wormadam", + "variant": "level_up", + "result": "wormadam", + "consumeHeldItem": false, + "learnableMoves": [ + "quiverdance" + ], + "requirements": [ + { + "variant": "level", + "minLevel": 20 + }, + { + "variant": "properties", + "target": "gender=female" + } + ] }, { - "variant": "properties", - "target": "gender=female" + "id": "burmy_mothim", + "variant": "level_up", + "result": "mothim", + "consumeHeldItem": false, + "learnableMoves": [ + "quiverdance" + ], + "requirements": [ + { + "variant": "level", + "minLevel": 20 + }, + { + "variant": "properties", + "target": "gender=male" + } + ] } - ] + ], + "battleOnly": false }, { - "id": "burmy_mothim", - "variant": "level_up", - "result": "mothim", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ + "name": "Trash", + "primaryType": "bug", + "maleRatio": 0.5, + "height": 2, + "weight": 34, + "pokedex": [ + "cobblemon.species.burmy-trash.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "trash-cloak" + ], + "evolutions": [ { - "variant": "level", - "minLevel": 20 + "id": "burmy_wormadam", + "variant": "level_up", + "result": "wormadam", + "consumeHeldItem": false, + "learnableMoves": [ + "quiverdance" + ], + "requirements": [ + { + "variant": "level", + "minLevel": 20 + }, + { + "variant": "properties", + "target": "gender=female" + } + ] }, { - "variant": "properties", - "target": "gender=male" + "id": "burmy_mothim", + "variant": "level_up", + "result": "mothim", + "consumeHeldItem": false, + "learnableMoves": [ + "quiverdance" + ], + "requirements": [ + { + "variant": "level", + "minLevel": 20 + }, + { + "variant": "properties", + "target": "gender=male" + } + ] } - ] + ], + "battleOnly": false } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 2, - "weight": 34, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "walk": { + "canWalk": false + }, + "swim": { + "avoidsWater": true + } + } + } } \ 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 7331bbb66..5639df65b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherrim.json @@ -1,13 +1,62 @@ { - "name": "Cherrim", + "implemented": true, "nationalPokedexNumber": 421, + "name": "Cherrim", "primaryType": "grass", + "maleRatio": 0.5, + "height": 5, + "weight": 93, + "pokedex": [ + "cobblemon.species.cherrim.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "overcast-form" + ], "abilities": [ - "flowergift" + "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, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { - "amount": 2, + "amount": 6, "entries": [ + { + "item": "minecraft:sweet_berries", + "quantityRange": "2-4" + }, { "item": "cobblemon:miracle_seed", "percentage": 5.0 @@ -18,173 +67,214 @@ } ] }, - "baseStats": { - "hp": 70, - "attack": 60, - "defence": 70, - "special_attack": 87, - "special_defence": 78, - "speed": 85 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Sunshine", - "primaryType": "grass", - "abilities": [ - "flowergift" - ], - "baseStats": { - "hp": 70, - "attack": 60, - "defence": 70, - "special_attack": 87, - "special_defence": 78, - "speed": 85 - }, - "catchRate": 75, - "maleRatio": 0.5, - "baseExperienceYield": 158, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "grass" - ], - "labels": [ - "gen4" - ], - "aspects": [ - "sunshine" - ], - "height": 5, - "weight": 93, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 158, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "grass" - ], "moves": [ - "1:flowershield", + "1:tackle", "1:growth", - "1:leafage", - "1:leechseed", + "1:sunnyday", + "1:luckychant", "1:morningsun", - "1:petaldance", - "1:tackle", - "10:leechseed", - "13:helpinghand", + "1:flowershield", + "1:leafage", "15:helpinghand", - "19:magicalleaf", "20:magicalleaf", - "22:sunnyday", - "25:petaldance", "28:leechseed", - "30:worryseed", "34:takedown", - "35:takedown", "41:petalblizzard", - "43:solarbeam", - "48:luckychant", "48:worryseed", - "50:petalblizzard", "55:solarbeam", "62:petaldance", - "tm:attract", + "egg:aromatherapy", + "egg:defensecurl", + "egg:flowershield", + "egg:grasswhistle", + "egg:healingwish", + "egg:healpulse", + "egg:naturalgift", + "egg:naturepower", + "egg:razorleaf", + "egg:rollout", + "egg:sweetscent", + "egg:tickle", "tm:bulletseed", - "tm:captivate", - "tm:confide", "tm:dazzlinggleam", - "tm:doubleteam", "tm:drainingkiss", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:frustration", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", + "tm:laserfocus", "tm:magicalleaf", "tm:naturalgift", "tm:naturepower", + "tm:petalblizzard", "tm:playrough", "tm:pollenpuff", "tm:protect", "tm:rest", - "tm:return", - "tm:round", + "tm:rollout", "tm:safeguard", - "tm:secretpower", "tm:seedbomb", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:solarblade", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swordsdance", - "tm:toxic", + "tm:synthesis", + "tm:takedown", + "tm:terablast", "tm:weatherball", + "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:snore", "tutor:synthesis", - "tutor:worryseed" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.cherrim.desc" + "tutor:worryseed", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "preEvolution": "cherubi", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 93, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Sunshine", + "primaryType": "grass", + "maleRatio": 0.5, + "height": 5, + "weight": 93, + "pokedex": [ + "cobblemon.species.cherrim-sunshine.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [ + "sunshine-form" + ], + "moves": [ + "1:tackle", + "1:growth", + "1:sunnyday", + "1:luckychant", + "1:morningsun", + "1:flowershield", + "1:leafage", + "15:helpinghand", + "20:magicalleaf", + "28:leechseed", + "34:takedown", + "41:petalblizzard", + "48:worryseed", + "55:solarbeam", + "62:petaldance", + "tm:aromatherapy", + "tm:bulletseed", + "tm:dazzlinggleam", + "tm:defensecurl", + "tm:drainingkiss", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:flash", + "tm:gigadrain", + "tm:gigaimpact", + "tm:grassknot", + "tm:grassyglide", + "tm:grassyterrain", + "tm:healingwish", + "tm:healpulse", + "tm:helpinghand", + "tm:hyperbeam", + "tm:laserfocus", + "tm:magicalleaf", + "tm:naturepower", + "tm:petalblizzard", + "tm:playrough", + "tm:pollenpuff", + "tm:protect", + "tm:razorleaf", + "tm:rest", + "tm:rollout", + "tm:safeguard", + "tm:seedbomb", + "tm:sleeptalk", + "tm:solarbeam", + "tm:solarblade", + "tm:substitute", + "tm:sunnyday", + "tm:sweetscent", + "tm:swordsdance", + "tm:synthesis", + "tm:takedown", + "tm:terablast", + "tm:tickle", + "tm:weatherball", + "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 + } + ], + "behaviour": { + "herd": { + "maxSize": "5" + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 779899d2a..f1a24d0a5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cherubi.json @@ -1,13 +1,60 @@ { - "name": "Cherubi", + "implemented": true, "nationalPokedexNumber": 420, + "name": "Cherubi", "primaryType": "grass", + "maleRatio": 0.5, + "height": 4, + "weight": 33, + "pokedex": [ + "cobblemon.species.cherubi.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [], "abilities": [ - "chlorophyll" + "chlorophyll", + "h:chlorophyll" ], + "eggGroups": [ + "fairy", + "grass" + ], + "baseStats": { + "hp": 45, + "attack": 35, + "defence": 45, + "special_attack": 62, + "special_defence": 53, + "speed": 35 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 55, + "experienceGroup": "medium_fast", + "catchRate": 190, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { - "amount": 2, + "amount": 5, "entries": [ + { + "item": "minecraft:sweet_berries", + "quantityRange": "1-3" + }, { "item": "cobblemon:miracle_seed", "percentage": 2.5 @@ -18,124 +65,95 @@ } ] }, - "baseStats": { - "hp": 45, - "attack": 35, - "defence": 45, - "special_attack": 62, - "special_defence": 53, - "speed": 35 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 55, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "grass" - ], "moves": [ - "1:morningsun", "1:tackle", + "1:morningsun", "5:leafage", - "7:growth", "10:growth", - "10:leechseed", - "13:helpinghand", "15:helpinghand", - "19:magicalleaf", "20:magicalleaf", - "22:sunnyday", "26:leechseed", - "28:worryseed", "30:takedown", - "31:takedown", "35:petalblizzard", - "37:solarbeam", "40:luckychant", - "40:worryseed", "45:solarbeam", - "47:petalblizzard", "egg:aromatherapy", "egg:defensecurl", "egg:flowershield", "egg:grasswhistle", - "egg:grassyterrain", "egg:healingwish", "egg:healpulse", "egg:naturalgift", "egg:naturepower", "egg:razorleaf", "egg:rollout", - "egg:seedbomb", "egg:sweetscent", "egg:tickle", - "egg:weatherball", - "tm:attract", "tm:bulletseed", - "tm:captivate", - "tm:confide", "tm:dazzlinggleam", - "tm:doubleteam", "tm:drainingkiss", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:frustration", "tm:gigadrain", "tm:grassknot", + "tm:grassyglide", "tm:grassyterrain", "tm:helpinghand", - "tm:hiddenpower", "tm:magicalleaf", "tm:naturalgift", "tm:naturepower", + "tm:petalblizzard", "tm:pollenpuff", "tm:protect", "tm:rest", - "tm:return", - "tm:round", + "tm:rollout", "tm:safeguard", - "tm:secretpower", "tm:seedbomb", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swordsdance", - "tm:toxic", + "tm:synthesis", + "tm:takedown", + "tm:terablast", "tm:weatherball", - "tutor:bulletseed", + "tm:worryseed", + "tutor:dazzlinggleam", + "tutor:energyball", "tutor:gigadrain", "tutor:grassyglide", - "tutor:healpulse", "tutor:helpinghand", - "tutor:leechseed", + "tutor:magicalleaf", + "tutor:rest", "tutor:rollout", "tutor:seedbomb", "tutor:sleeptalk", - "tutor:snore", "tutor:synthesis", - "tutor:worryseed" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.cherubi.desc" + "tutor:worryseed", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { "id": "cherubi_cherrim", "variant": "level_up", - "result": "cherrim", + "result": "cherrim blossom_form=overcast", "consumeHeldItem": false, "learnableMoves": [ + "petaldance", "sunnyday" ], "requirements": [ @@ -146,24 +164,28 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 33, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "cherubi", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 8f3473942..498b3a8a3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/cresselia.json @@ -1,9 +1,25 @@ { - "name": "Cresselia", + "implemented": true, "nationalPokedexNumber": 488, + "name": "Cresselia", "primaryType": "psychic", + "maleRatio": 0, + "height": 15, + "weight": 856, + "pokedex": [ + "cobblemon.species.cresselia.desc" + ], + "labels": [ + "gen4", + "legendary" + ], + "aspects": [], "abilities": [ - "levitate" + "levitate", + "h:levitate" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 120, @@ -13,54 +29,82 @@ "special_defence": 120, "speed": 85 }, - "catchRate": 3, - "maleRatio": 0, - "shoulderMountable": false, - "baseExperienceYield": 300, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 3, + "speed": 0 + }, + "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 100, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "entityInteract": { + "avoidedByPhantom": true + }, + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "cresselia", + "tier": 1 + } + ] + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, "moves": [ "1:confusion", "1:doubleteam", - "1:lunardance", - "1:moonlight", - "1:psychocut", - "1:psychoshift", "6:mist", - "11:safeguard", "12:aurorabeam", "18:psybeam", - "20:mist", - "24:allyswitch", "24:psychoshift", - "29:aurorabeam", "30:slash", "36:psychocut", - "38:futuresight", "42:moonlight", - "47:slash", "48:safeguard", "54:psychic", - "57:moonlight", "60:moonblast", "66:futuresight", - "66:psychocut", - "72:lunarblessing", "72:lunardance", - "75:psychoshift", - "84:lunardance", - "93:psychic", - "99:moonblast", + "72:lunarblessing", "tm:allyswitch", - "tm:attract", "tm:bodyslam", "tm:calmmind", - "tm:captivate", "tm:chargebeam", - "tm:confide", "tm:confuseray", "tm:dazzlinggleam", "tm:doubleteam", @@ -70,22 +114,22 @@ "tm:expandingforce", "tm:facade", "tm:flash", - "tm:frustration", + "tm:furycutter", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", "tm:guardswap", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:icebeam", "tm:icywind", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:mudslap", - "tm:naturalgift", "tm:powergem", + "tm:powershift", "tm:powerswap", "tm:protect", "tm:psybeam", @@ -98,86 +142,71 @@ "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", "tm:scaryface", - "tm:secretpower", "tm:shadowball", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:telekinesis", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:trick", "tm:trickroom", "tm:zenheadbutt", "tutor:allyswitch", - "tutor:aurorabeam", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", "tutor:energyball", "tutor:expandingforce", "tutor:furycutter", - "tutor:futuresight", + "tutor:gigaimpact", "tutor:gravity", "tutor:helpinghand", - "tutor:hiddenpower", + "tutor:hyperbeam", "tutor:icebeam", "tutor:icywind", "tutor:magiccoat", "tutor:magicroom", - "tutor:mist", - "tutor:moonblast", - "tutor:moonlight", "tutor:mudslap", + "tutor:powershift", + "tutor:psychic", "tutor:psychocut", - "tutor:psyshock", "tutor:recycle", + "tutor:rest", + "tutor:shadowball", "tutor:signalbeam", "tutor:skillswap", - "tutor:slash", "tutor:sleeptalk", - "tutor:snore", "tutor:swift", "tutor:telekinesis", + "tutor:thunderbolt", "tutor:trick", - "tutor:zenheadbutt" - ], - "labels": [ - "gen4", - "legendary" - ], - "pokedex": [ - "cobblemon.species.cresselia.desc" + "tutor:zenheadbutt", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 100, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 15, - "weight": 856, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "lightingData": { + "lightLevel": 10, + "liquidGlowMode": "BOTH" + } } \ 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 deleted file mode 100644 index 85dacbff8..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/croagunk.json +++ /dev/null @@ -1,250 +0,0 @@ -{ - "name": "Croagunk", - "nationalPokedexNumber": 453, - "primaryType": "poison", - "secondaryType": "fighting", - "abilities": [ - "anticipation", - "dryskin", - "h:poisontouch" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:black_sludge", - "percentage": 2.5 - }, - { - "item": "cobblemon:payapa_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 48, - "attack": 61, - "defence": 40, - "special_attack": 61, - "special_defence": 40, - "speed": 50 - }, - "catchRate": 140, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 60, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:astonish", - "1:mudslap", - "1:poisonsting", - "3:mudslap", - "4:astonish", - "8:poisonsting", - "8:taunt", - "10:taunt", - "12:flatter", - "15:pursuit", - "16:lowkick", - "16:revenge", - "17:feintattack", - "20:venoshock", - "22:revenge", - "24:suckerpunch", - "24:swagger", - "28:swagger", - "29:mudbomb", - "31:suckerpunch", - "32:poisonjab", - "36:nastyplot", - "36:toxic", - "36:venoshock", - "38:nastyplot", - "38:poisonjab", - "40:nastyplot", - "43:poisonjab", - "43:sludgebomb", - "44:sludgebomb", - "45:flatter", - "45:sludgebomb", - "47:belch", - "48:belch", - "50:flatter", - "egg:acupressure", - "egg:bulletpunch", - "egg:counter", - "egg:crosschop", - "egg:drainpunch", - "egg:dynamicpunch", - "egg:fakeout", - "egg:feint", - "egg:headbutt", - "egg:meditate", - "egg:mefirst", - "egg:quickguard", - "egg:smellingsalts", - "egg:vacuumwave", - "egg:wakeupslap", - "tm:acidspray", - "tm:aerialace", - "tm:assurance", - "tm:attract", - "tm:batonpass", - "tm:bounce", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:captivate", - "tm:chillingwater", - "tm:coaching", - "tm:confide", - "tm:darkpulse", - "tm:dig", - "tm:doubleteam", - "tm:drainpunch", - "tm:earthquake", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:frustration", - "tm:gunkshot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:icepunch", - "tm:icywind", - "tm:knockoff", - "tm:lashout", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:megapunch", - "tm:mudshot", - "tm:mudslap", - "tm:nastyplot", - "tm:naturalgift", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:revenge", - "tm:reversal", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:screech", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snatch", - "tm:snore", - "tm:spite", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thunderpunch", - "tm:torment", - "tm:toxic", - "tm:upperhand", - "tm:vacuumwave", - "tm:venomdrench", - "tm:venoshock", - "tm:workup", - "tm:xscissor", - "tutor:astonish", - "tutor:bounce", - "tutor:coaching", - "tutor:darkpulse", - "tutor:drainpunch", - "tutor:dualchop", - "tutor:focuspunch", - "tutor:foulplay", - "tutor:furycutter", - "tutor:gunkshot", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:icepunch", - "tutor:icywind", - "tutor:knockoff", - "tutor:lashout", - "tutor:lowkick", - "tutor:mudslap", - "tutor:poisonjab", - "tutor:poisonsting", - "tutor:roleplay", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:suckerpunch", - "tutor:superfang", - "tutor:taunt", - "tutor:thunderpunch", - "tutor:vacuumwave" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.croagunk.desc" - ], - "evolutions": [ - { - "id": "croagunk_toxicroak", - "variant": "level_up", - "result": "toxicroak", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 37 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 100, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 7, - "weight": 230, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 474770a65..fe91c3830 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/darkrai.json @@ -1,10 +1,53 @@ { - "name": "Darkrai", + "implemented": true, "nationalPokedexNumber": 491, + "name": "Darkrai", "primaryType": "dark", + "maleRatio": -1, + "height": 15, + "weight": 505, + "pokedex": [ + "cobblemon.species.darkrai.desc" + ], + "labels": [ + "gen4", + "mythical" + ], + "aspects": [], "abilities": [ - "baddreams" + "baddreams", + "h:baddreams" + ], + "eggGroups": [ + "undiscovered" ], + "baseStats": { + "hp": 70, + "attack": 90, + "defence": 90, + "special_attack": 135, + "special_defence": 90, + "speed": 125 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 2, + "special_defence": 0, + "speed": 1 + }, + "baseExperienceYield": 300, + "experienceGroup": "slow", + "catchRate": 3, + "eggCycles": 120, + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 5, "entries": [ @@ -17,47 +60,23 @@ } ] }, - "baseStats": { - "hp": 70, - "attack": 90, - "defence": 90, - "special_attack": 135, - "special_defence": 90, - "speed": 125 - }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 270, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], "moves": [ - "1:disable", - "1:nightshade", "1:ominouswind", + "1:disable", "11:quickattack", "20:hypnosis", "29:feintattack", - "29:pursuit", - "29:suckerpunch", "38:nightmare", - "38:nightshade", "47:doubleteam", "57:haze", "66:darkvoid", - "75:embargo", "75:nastyplot", "84:dreameater", "93:darkpulse", - "tm:aerialace", "tm:blizzard", "tm:brickbreak", "tm:calmmind", "tm:chargebeam", - "tm:confide", "tm:confuseray", "tm:curse", "tm:cut", @@ -73,20 +92,20 @@ "tm:focusblast", "tm:focuspunch", "tm:foulplay", - "tm:frustration", "tm:gigaimpact", "tm:haze", + "tm:headbutt", "tm:hex", - "tm:hiddenpower", "tm:hyperbeam", "tm:icebeam", "tm:icywind", "tm:incinerate", "tm:knockoff", "tm:lashout", + "tm:lastresort", "tm:nastyplot", - "tm:naturalgift", "tm:nightshade", + "tm:ominouswind", "tm:payback", "tm:poisonjab", "tm:poweruppunch", @@ -97,14 +116,11 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:rockclimb", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:scaryface", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", @@ -115,8 +131,8 @@ "tm:spite", "tm:strength", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:swordsdance", "tm:taunt", @@ -124,69 +140,87 @@ "tm:thief", "tm:throatchop", "tm:thunder", - "tm:thunderbolt", "tm:thunderwave", "tm:torment", - "tm:toxic", "tm:trick", "tm:willowisp", + "tm:wonderroom", "tm:xscissor", - "tutor:darkvoid", - "tutor:doubleteam", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:darkpulse", "tutor:drainpunch", - "tutor:feintattack", "tutor:focuspunch", "tutor:foulplay", - "tutor:headbutt", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", "tutor:icywind", "tutor:knockoff", + "tutor:lashout", "tutor:lastresort", - "tutor:mudslap", - "tutor:nightmare", "tutor:ominouswind", - "tutor:phantomforce", - "tutor:pursuit", - "tutor:quickattack", - "tutor:roaroftime", + "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:snore", - "tutor:spacialrend", "tutor:spite", "tutor:suckerpunch", "tutor:swift", "tutor:throatchop", "tutor:trick", - "tutor:wonderroom" - ], - "labels": [ - "gen4", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.darkrai.desc" + "tutor:wonderroom", + "tutor:xscissor", + "legacy:aerialace", + "legacy:confide", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:pursuit", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:thunderbolt", + "legacy:toxic", + "special:phantomforce", + "special:roaroftime", + "special:spacialrend" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 1 - }, - "height": 15, - "weight": 505, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ 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 35c9866ed..6f4060312 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/dialga.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/dialga.json @@ -1,12 +1,30 @@ { - "name": "Dialga", + "implemented": true, "nationalPokedexNumber": 483, + "name": "Dialga", "primaryType": "steel", "secondaryType": "dragon", + "maleRatio": -1, + "height": 54, + "weight": 6830, + "pokedex": [ + "cobblemon.species.dialga.desc" + ], + "labels": [ + "gen4", + "legendary", + "restricted" + ], + "aspects": [ + "altered-forme" + ], "abilities": [ "pressure", "h:telepathy" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 100, "attack": 120, @@ -15,92 +33,40 @@ "special_defence": 100, "speed": 90 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Origin", - "primaryType": "steel", - "secondaryType": "dragon", - "abilities": [ - "pressure", - "h:telepathy" - ], - "baseStats": { - "hp": 100, - "attack": 100, - "defence": 120, - "special_attack": 150, - "special_defence": 120, - "speed": 90 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 340, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen8", - "legendary" - ], - "aspects": [ - "origin" - ], - "height": 70, - "weight": 8500, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 340, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:dragonbreath", - "1:metalclaw", "1:scaryface", - "6:metalclaw", + "1:metalclaw", "8:dragonbreath", - "10:ancientpower", - "15:slash", "16:ancientpower", - "19:powergem", - "24:metalburst", "24:slash", - "28:dragonclaw", "32:flashcannon", - "33:earthpower", - "37:aurasphere", "40:dragonclaw", - "40:roaroftime", - "42:flashcannon", - "42:irontail", - "46:roaroftime", "48:aurasphere", - "50:flashcannon", - "50:healblock", "56:powergem", "64:metalburst", "72:earthpower", "80:irontail", "88:roaroftime", - "tm:aerialace", + "tm:ancientpower", "tm:aurasphere", "tm:blizzard", "tm:bodypress", @@ -109,9 +75,7 @@ "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:confide", "tm:cut", - "tm:doubleteam", "tm:dracometeor", "tm:dragonclaw", "tm:dragonpulse", @@ -126,11 +90,11 @@ "tm:flash", "tm:flashcannon", "tm:focusblast", - "tm:frustration", + "tm:furycutter", "tm:gigaimpact", "tm:gravity", + "tm:headbutt", "tm:heavyslam", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:hypervoice", @@ -139,9 +103,9 @@ "tm:irondefense", "tm:ironhead", "tm:irontail", + "tm:magnetrise", "tm:metalclaw", "tm:metalsound", - "tm:naturalgift", "tm:outrage", "tm:overheat", "tm:powergem", @@ -149,21 +113,17 @@ "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:safeguard", "tm:sandstorm", "tm:scaleshot", "tm:scaryface", - "tm:secretpower", "tm:shadowclaw", "tm:shockwave", "tm:sleeptalk", - "tm:snore", "tm:stealthrock", "tm:steelbeam", "tm:stompingtantrum", @@ -171,74 +131,242 @@ "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:trick", "tm:trickroom", + "tm:twister", "tutor:ancientpower", - "tutor:aurasphere", - "tutor:dragonbreath", - "tutor:dragonclaw", + "tutor:bulkup", + "tutor:bulldoze", + "tutor:dracometeor", "tutor:dragonpulse", + "tutor:earthpower", + "tutor:flamethrower", "tutor:flashcannon", "tutor:furycutter", + "tutor:gigaimpact", "tutor:gravity", - "tutor:headbutt", - "tutor:healblock", + "tutor:hyperbeam", "tutor:hypervoice", + "tutor:icebeam", "tutor:irondefense", "tutor:ironhead", "tutor:irontail", "tutor:magnetrise", - "tutor:metalburst", - "tutor:metalclaw", - "tutor:mudslap", "tutor:outrage", - "tutor:overheat", - "tutor:roaroftime", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", "tutor:scaleshot", - "tutor:scaryface", + "tutor:shadowclaw", "tutor:shockwave", - "tutor:slash", "tutor:sleeptalk", - "tutor:snore", "tutor:stealthrock", + "tutor:steelbeam", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:swift", - "tutor:twister" - ], - "labels": [ - "gen4", - "legendary" - ], - "pokedex": [ - "cobblemon.species.dialga.desc" + "tutor:thunderbolt", + "tutor:trick", + "tutor:twister", + "legacy:aerialace", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:healblock", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 54, - "weight": 6830, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Origin", + "primaryType": "steel", + "secondaryType": "dragon", + "maleRatio": -1, + "height": 70, + "weight": 8500, + "pokedex": [ + "cobblemon.species.dialga-origin.desc" + ], + "labels": [ + "gen8a", + "legendary", + "restricted" + ], + "aspects": [ + "origin-forme" + ], + "baseStats": { + "hp": 100, + "attack": 100, + "defence": 120, + "special_attack": 150, + "special_defence": 120, + "speed": 90 + }, + "moves": [ + "1:scaryface", + "1:metalclaw", + "8:dragonbreath", + "16:ancientpower", + "24:slash", + "32:flashcannon", + "40:dragonclaw", + "48:aurasphere", + "56:powergem", + "64:metalburst", + "72:earthpower", + "80:irontail", + "88:roaroftime", + "tm:ancientpower", + "tm:aurasphere", + "tm:blizzard", + "tm:bodypress", + "tm:bodyslam", + "tm:breakingswipe", + "tm:brickbreak", + "tm:bulkup", + "tm:bulldoze", + "tm:dracometeor", + "tm:dragonclaw", + "tm:dragonpulse", + "tm:dragontail", + "tm:earthpower", + "tm:earthquake", + "tm:endure", + "tm:facade", + "tm:fireblast", + "tm:flamethrower", + "tm:flashcannon", + "tm:focusblast", + "tm:gigaimpact", + "tm:gravity", + "tm:heavyslam", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:irondefense", + "tm:ironhead", + "tm:irontail", + "tm:metalclaw", + "tm:metalsound", + "tm:outrage", + "tm:overheat", + "tm:powergem", + "tm:protect", + "tm:psychup", + "tm:raindance", + "tm:rest", + "tm:roar", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:sandstorm", + "tm:scaleshot", + "tm:scaryface", + "tm:shadowclaw", + "tm:sleeptalk", + "tm:stealthrock", + "tm:steelbeam", + "tm:stompingtantrum", + "tm:stoneedge", + "tm:substitute", + "tm:sunnyday", + "tm:swift", + "tm:takedown", + "tm:terablast", + "tm:thunder", + "tm:thunderbolt", + "tm:thunderwave", + "tm:trick", + "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, + "behaviour": { + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "walk": { + "canWalk": false + }, + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } + } + ], + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json deleted file mode 100644 index 9209e3e8a..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "name": "Drapion", - "nationalPokedexNumber": 452, - "primaryType": "poison", - "secondaryType": "dark", - "abilities": [ - "battlearmor", - "sniper", - "h:keeneye" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:poison_barb", - "percentage": 5.0 - }, - { - "item": "cobblemon:bluk_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 70, - "attack": 90, - "defence": 110, - "special_attack": 60, - "special_defence": 75, - "speed": 95 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 175, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "bug", - "water_3" - ], - "moves": [ - "1:bite", - "1:fellstinger", - "1:firefang", - "1:honeclaws", - "1:icefang", - "1:knockoff", - "1:leer", - "1:pinmissile", - "1:poisonsting", - "1:thunderfang", - "9:pinmissile", - "9:poisonfang", - "12:bite", - "12:pinmissile", - "13:acupressure", - "15:toxicspikes", - "16:pursuit", - "17:acupressure", - "18:bugbite", - "20:bugbite", - "21:venoshock", - "23:poisonfang", - "23:scaryface", - "24:knockoff", - "27:scaryface", - "27:venoshock", - "28:toxicspikes", - "30:honeclaws", - "30:pinmissile", - "33:toxic", - "34:bugbite", - "34:toxicspikes", - "36:nightslash", - "38:nightslash", - "39:crosspoison", - "39:poisonfang", - "43:scaryface", - "44:xscissor", - "48:honeclaws", - "49:acupressure", - "49:crunch", - "53:fellstinger", - "54:crunch", - "56:venoshock", - "57:crosspoison", - "58:crosspoison", - "65:crunch", - "73:crosspoison", - "tm:aerialace", - "tm:agility", - "tm:assurance", - "tm:attract", - "tm:brickbreak", - "tm:brutalswing", - "tm:bugbuzz", - "tm:bulldoze", - "tm:captivate", - "tm:confide", - "tm:crosspoison", - "tm:crunch", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:doubleteam", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:firefang", - "tm:flash", - "tm:fling", - "tm:frustration", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icefang", - "tm:infestation", - "tm:irondefense", - "tm:irontail", - "tm:leechlife", - "tm:naturalgift", - "tm:payback", - "tm:pinmissile", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:roar", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:sandtomb", - "tm:scaryface", - "tm:screech", - "tm:secretpower", - "tm:shadowball", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snarl", - "tm:snore", - "tm:stompingtantrum", - "tm:strength", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:taunt", - "tm:thief", - "tm:throatchop", - "tm:thunderfang", - "tm:torment", - "tm:toxic", - "tm:toxicspikes", - "tm:venomdrench", - "tm:venoshock", - "tm:xscissor", - "tutor:aquatail", - "tutor:bugbite", - "tutor:darkpulse", - "tutor:furycutter", - "tutor:headbutt", - "tutor:irontail", - "tutor:knockoff", - "tutor:lashout", - "tutor:mudslap", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:throatchop" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.drapion.desc" - ], - "preEvolution": "skorupi", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 615, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json b/common/src/main/resources/data/cobblemon/species/generation4/finneon.json deleted file mode 100644 index ada47a304..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/finneon.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "name": "Finneon", - "nationalPokedexNumber": 456, - "primaryType": "water", - "abilities": [ - "swiftswim", - "stormdrain", - "h:waterveil" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:cod" - }, - { - "item": "minecraft:bone_meal", - "percentage": 5.0 - }, - { - "item": "cobblemon:rindo_berry", - "percentage": 2.5 - }, - { - "item": "cobblemon:prism_scale", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 49, - "attack": 49, - "defence": 56, - "special_attack": 49, - "special_defence": 61, - "speed": 66 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 66, - "experienceGroup": "erratic", - "eggCycles": 20, - "eggGroups": [ - "water_2" - ], - "moves": [ - "1:pound", - "6:watergun", - "10:attract", - "13:raindance", - "17:gust", - "22:waterpulse", - "26:attract", - "26:captivate", - "29:safeguard", - "33:aquaring", - "38:whirlpool", - "42:uturn", - "45:bounce", - "49:silverwind", - "49:tailwind", - "54:soak", - "egg:agility", - "egg:aquatail", - "egg:aurorabeam", - "egg:brine", - "egg:charm", - "egg:confuseray", - "egg:flail", - "egg:psybeam", - "egg:signalbeam", - "egg:splash", - "egg:sweetkiss", - "egg:tickle", - "tm:acrobatics", - "tm:agility", - "tm:alluringvoice", - "tm:attract", - "tm:blizzard", - "tm:brine", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:confide", - "tm:confuseray", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleteam", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:flipturn", - "tm:frustration", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:naturalgift", - "tm:naturepower", - "tm:payback", - "tm:protect", - "tm:psybeam", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scald", - "tm:secretpower", - "tm:silverwind", - "tm:sleeptalk", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:uturn", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:aircutter", - "tutor:aquatail", - "tutor:attract", - "tutor:bounce", - "tutor:defog", - "tutor:dive", - "tutor:icywind", - "tutor:ominouswind", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:sweetkiss", - "tutor:swift", - "tutor:tailwind", - "tutor:twister", - "tutor:waterpulse" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.finneon.desc" - ], - "evolutions": [ - { - "id": "finneon_lumineon", - "variant": "level_up", - "result": "lumineon", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 31 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 4, - "weight": 70, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json b/common/src/main/resources/data/cobblemon/species/generation4/froslass.json deleted file mode 100644 index e325c293d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/froslass.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "name": "Froslass", - "nationalPokedexNumber": 478, - "primaryType": "ice", - "secondaryType": "ghost", - "abilities": [ - "snowcloak", - "h:cursedbody" - ], - "baseStats": { - "hp": 70, - "attack": 80, - "defence": 70, - "special_attack": 80, - "special_defence": 70, - "speed": 110 - }, - "catchRate": 75, - "maleRatio": 0, - "shoulderMountable": false, - "baseExperienceYield": 168, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "fairy", - "mineral" - ], - "moves": [ - "1:astonish", - "1:bite", - "1:crunch", - "1:destinybond", - "1:doubleteam", - "1:headbutt", - "1:icefang", - "1:iceshard", - "1:leer", - "1:ominouswind", - "1:powdersnow", - "1:protect", - "13:icywind", - "14:icywind", - "15:iceshard", - "19:astonish", - "19:confuseray", - "20:drainingkiss", - "22:ominouswind", - "23:drainingkiss", - "25:icywind", - "28:wakeupslap", - "28:willowisp", - "30:frostbreath", - "31:captivate", - "32:confuseray", - "35:confuseray", - "37:iceshard", - "37:wakeupslap", - "40:hail", - "40:snowscape", - "41:captivate", - "42:shadowball", - "47:willowisp", - "48:blizzard", - "51:blizzard", - "54:auroraveil", - "54:hail", - "59:destinybond", - "61:shadowball", - "68:blizzard", - "tm:allyswitch", - "tm:attract", - "tm:auroraveil", - "tm:avalanche", - "tm:blizzard", - "tm:bodyslam", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:confide", - "tm:confuseray", - "tm:crunch", - "tm:curse", - "tm:doubleteam", - "tm:drainingkiss", - "tm:dreameater", - "tm:embargo", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:fling", - "tm:frostbreath", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:haze", - "tm:helpinghand", - "tm:hex", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icepunch", - "tm:icespinner", - "tm:iciclespear", - "tm:icywind", - "tm:imprison", - "tm:lightscreen", - "tm:naturalgift", - "tm:nightshade", - "tm:painsplit", - "tm:payback", - "tm:poltergeist", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scaryface", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:sleeptalk", - "tm:snatch", - "tm:snore", - "tm:snowscape", - "tm:spikes", - "tm:spite", - "tm:substitute", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:tripleaxel", - "tm:waterpulse", - "tm:weatherball", - "tm:willowisp", - "tutor:allyswitch", - "tutor:block", - "tutor:headbutt", - "tutor:icepunch", - "tutor:icywind", - "tutor:laserfocus", - "tutor:mudslap", - "tutor:ominouswind", - "tutor:painsplit", - "tutor:poltergeist", - "tutor:rollout", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:suckerpunch", - "tutor:telekinesis", - "tutor:trick", - "tutor:tripleaxel", - "tutor:waterpulse" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.froslass.desc" - ], - "preEvolution": "snorunt", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 13, - "weight": 266, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:snowball", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:dawn_stone", - "percentage": 5.0 - }, - { - "item": "cobblemon:never_melt_ice", - "percentage": 5.0 - }, - { - "item": "cobblemon:babiri_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json b/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json deleted file mode 100644 index a0293d940..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/gastrodon.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "name": "Gastrodon", - "nationalPokedexNumber": 423, - "primaryType": "water", - "secondaryType": "ground", - "abilities": [ - "stickyhold", - "stormdrain", - "h:sandforce" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:clay_ball", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:rindo_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 111, - "attack": 83, - "defence": 68, - "special_attack": 92, - "special_defence": 82, - "speed": 39 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "amorphous" - ], - "moves": [ - "1:harden", - "1:mudslap", - "1:mudsport", - "1:recover", - "1:watergun", - "1:waterpulse", - "11:mudbomb", - "15:waterpulse", - "16:hiddenpower", - "20:ancientpower", - "22:raindance", - "25:bodyslam", - "29:bodyslam", - "33:muddywater", - "39:earthpower", - "41:muddywater", - "46:raindance", - "53:memento", - "54:recover", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:curse", - "tm:dig", - "tm:dive", - "tm:doubleteam", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:infestation", - "tm:liquidation", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:naturalgift", - "tm:painsplit", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:sandtomb", - "tm:scald", - "tm:secretpower", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snore", - "tm:snowscape", - "tm:spikes", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tutor:ancientpower", - "tutor:block", - "tutor:dive", - "tutor:earthpower", - "tutor:headbutt", - "tutor:icebeam", - "tutor:icywind", - "tutor:mudslap", - "tutor:painsplit", - "tutor:protect", - "tutor:recover", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:stringshot", - "tutor:waterpulse" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.gastrodon.desc" - ], - "preEvolution": "shellos", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 9, - "weight": 299, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 cc6d1ff03..7840cafc2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/giratina.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/giratina.json @@ -1,12 +1,30 @@ { - "name": "Giratina", + "implemented": true, "nationalPokedexNumber": 487, + "name": "Giratina", "primaryType": "ghost", "secondaryType": "dragon", + "maleRatio": -1, + "height": 45, + "weight": 7500, + "pokedex": [ + "cobblemon.species.giratina.desc" + ], + "labels": [ + "gen4", + "legendary", + "restricted" + ], + "aspects": [ + "altered-forme" + ], "abilities": [ "pressure", "h:telepathy" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 150, "attack": 100, @@ -15,11 +33,6 @@ "special_defence": 120, "speed": 90 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 340, - "baseFriendship": 0, "evYield": { "hp": 3, "attack": 0, @@ -28,46 +41,39 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 340, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:defog", - "1:dragonbreath", - "1:scaryface", "1:shadowsneak", - "6:ominouswind", + "1:defog", "7:dragonbreath", "14:ancientpower", - "19:shadowsneak", "21:hex", "28:slash", "35:scaryface", "42:shadowclaw", "49:painsplit", - "50:healblock", "56:aurasphere", "63:dragonclaw", "70:earthpower", "77:shadowforce", "84:destinybond", - "tm:aerialace", + "tm:ancientpower", + "tm:aquatail", "tm:aurasphere", "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", "tm:bulldoze", "tm:calmmind", - "tm:chargebeam", - "tm:confide", "tm:confuseray", "tm:curse", "tm:cut", "tm:darkpulse", "tm:defog", - "tm:doubleteam", "tm:dracometeor", "tm:dragonclaw", "tm:dragonpulse", @@ -81,18 +87,18 @@ "tm:energyball", "tm:facade", "tm:fly", - "tm:frustration", + "tm:furycutter", "tm:gigaimpact", "tm:gravity", + "tm:headbutt", "tm:hex", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:hypervoice", "tm:icywind", "tm:ironhead", "tm:irontail", - "tm:naturalgift", + "tm:ominouswind", "tm:outrage", "tm:painsplit", "tm:payback", @@ -100,31 +106,25 @@ "tm:poltergeist", "tm:protect", "tm:psychic", - "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", "tm:roar", "tm:rockclimb", "tm:rocksmash", - "tm:round", "tm:safeguard", "tm:scaryface", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", "tm:shockwave", "tm:silverwind", "tm:skittersmack", "tm:sleeptalk", - "tm:snore", "tm:spite", "tm:steelwing", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", "tm:telekinesis", @@ -132,66 +132,88 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", + "tm:twister", "tm:willowisp", - "tutor:aircutter", "tutor:ancientpower", "tutor:aquatail", - "tutor:aurasphere", + "tutor:bulldoze", + "tutor:calmmind", "tutor:darkpulse", "tutor:defog", "tutor:dracometeor", - "tutor:dragonbreath", - "tutor:dragonclaw", "tutor:dragonpulse", "tutor:dualwingbeat", "tutor:earthpower", + "tutor:energyball", "tutor:furycutter", + "tutor:gigaimpact", "tutor:gravity", - "tutor:headbutt", - "tutor:healblock", - "tutor:hex", + "tutor:hyperbeam", "tutor:hypervoice", "tutor:icywind", "tutor:ironhead", "tutor:irontail", - "tutor:magiccoat", - "tutor:mudslap", "tutor:ominouswind", "tutor:outrage", "tutor:painsplit", "tutor:poltergeist", - "tutor:scaryface", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", "tutor:shadowball", "tutor:shadowclaw", - "tutor:shadowforce", "tutor:shockwave", - "tutor:slash", + "tutor:skittersmack", "tutor:sleeptalk", - "tutor:snore", "tutor:spite", + "tutor:stoneedge", "tutor:swift", - "tutor:tailwind", "tutor:telekinesis", - "tutor:twister" + "tutor:thunderbolt", + "tutor:twister", + "legacy:aerialace", + "legacy:aircutter", + "legacy:chargebeam", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:healblock", + "legacy:hiddenpower", + "legacy:magiccoat", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:psychup", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:tailwind", + "legacy:toxic" ], - "labels": [ - "gen4", - "legendary" - ], - "pokedex": [ - "cobblemon.species.giratina.desc" - ], - "height": 45, - "weight": 7500, "evolutions": [], "forms": [ { "name": "Origin", "primaryType": "ghost", "secondaryType": "dragon", + "maleRatio": -1, + "height": 69, + "weight": 6500, + "pokedex": [ + "cobblemon.species.giratina-origin.desc" + ], + "labels": [ + "gen4", + "legendary", + "restricted" + ], + "aspects": [ + "origin-forme" + ], "abilities": [ - "levitate" + "levitate", + "h:levitate" ], "baseStats": { "hp": 150, @@ -201,37 +223,192 @@ "special_defence": 100, "speed": 90 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 340, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen4", - "legendary" - ], - "aspects": [ - "origin" + "moves": [ + "1:shadowsneak", + "1:defog", + "7:dragonbreath", + "14:ancientpower", + "21:hex", + "28:slash", + "35:scaryface", + "42:shadowclaw", + "49:painsplit", + "56:aurasphere", + "63:dragonclaw", + "70:earthpower", + "77:shadowforce", + "84:destinybond", + "tm:ancientpower", + "tm:aquatail", + "tm:aurasphere", + "tm:bodyslam", + "tm:breakingswipe", + "tm:brutalswing", + "tm:bulldoze", + "tm:calmmind", + "tm:confuseray", + "tm:curse", + "tm:cut", + "tm:darkpulse", + "tm:defog", + "tm:dracometeor", + "tm:dragonclaw", + "tm:dragonpulse", + "tm:dragontail", + "tm:dreameater", + "tm:dualwingbeat", + "tm:earthpower", + "tm:earthquake", + "tm:echoedvoice", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:fly", + "tm:furycutter", + "tm:gigaimpact", + "tm:gravity", + "tm:headbutt", + "tm:hex", + "tm:honeclaws", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icywind", + "tm:ironhead", + "tm:irontail", + "tm:magiccoat", + "tm:ominouswind", + "tm:outrage", + "tm:painsplit", + "tm:payback", + "tm:phantomforce", + "tm:poltergeist", + "tm:protect", + "tm:psychic", + "tm:raindance", + "tm:rest", + "tm:roar", + "tm:rockclimb", + "tm:rocksmash", + "tm:safeguard", + "tm:scaryface", + "tm:shadowball", + "tm:shadowclaw", + "tm:shockwave", + "tm:silverwind", + "tm:skittersmack", + "tm:sleeptalk", + "tm:spite", + "tm:steelwing", + "tm:stoneedge", + "tm:strength", + "tm:substitute", + "tm:sunnyday", + "tm:swift", + "tm:takedown", + "tm:telekinesis", + "tm:terablast", + "tm:thunder", + "tm:thunderbolt", + "tm:thunderwave", + "tm:twister", + "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" ], - "height": 69, - "weight": 6500, - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "drops": { + "amount": 5, + "entries": [ + { + "item": "minecraft:phantom_membrane", + "quantityRange": "3-5" + } + ] + }, + "behaviour": { + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "walk": { + "canWalk": false + }, + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json b/common/src/main/resources/data/cobblemon/species/generation4/glameow.json deleted file mode 100644 index 1541cc190..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/glameow.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "name": "Glameow", - "nationalPokedexNumber": 431, - "primaryType": "normal", - "abilities": [ - "limber", - "owntempo", - "h:keeneye" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:cheri_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 49, - "attack": 55, - "defence": 42, - "special_attack": 42, - "special_defence": 37, - "speed": 85 - }, - "catchRate": 190, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 62, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:fakeout", - "5:scratch", - "8:growl", - "13:hypnosis", - "17:feintattack", - "20:furyswipes", - "25:charm", - "29:assist", - "32:captivate", - "37:slash", - "41:suckerpunch", - "44:attract", - "45:attract", - "48:honeclaws", - "50:playrough", - "egg:assurance", - "egg:bite", - "egg:faketears", - "egg:flail", - "egg:lastresort", - "egg:quickattack", - "egg:sandattack", - "egg:snatch", - "egg:tailwhip", - "egg:wakeupslap", - "tm:aerialace", - "tm:attract", - "tm:captivate", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:doubleteam", - "tm:dreameater", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:hiddenpower", - "tm:honeclaws", - "tm:irontail", - "tm:naturalgift", - "tm:payback", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:snatch", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:taunt", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:torment", - "tm:toxic", - "tm:uturn", - "tm:waterpulse", - "tm:workup", - "tutor:assurance", - "tutor:covet", - "tutor:fakeout", - "tutor:foulplay", - "tutor:furycutter", - "tutor:headbutt", - "tutor:hypervoice", - "tutor:irontail", - "tutor:knockoff", - "tutor:lastresort", - "tutor:mudslap", - "tutor:secretpower", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:suckerpunch", - "tutor:superfang", - "tutor:swift", - "tutor:waterpulse" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.glameow.desc" - ], - "evolutions": [ - { - "id": "glameow_purugly", - "variant": "level_up", - "result": "purugly", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 38 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 5, - "weight": 39, - "aspects": [], - "cannotDynamax": false, - "implemented": 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 41b985f37..7baade4ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/heatran.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/heatran.json @@ -1,12 +1,27 @@ { - "name": "Heatran", + "implemented": true, "nationalPokedexNumber": 485, + "name": "Heatran", "primaryType": "fire", "secondaryType": "steel", + "maleRatio": 0.5, + "height": 17, + "weight": 4300, + "pokedex": [ + "cobblemon.species.heatran.desc" + ], + "labels": [ + "gen4", + "legendary" + ], + "aspects": [], "abilities": [ "flashfire", "h:flamebody" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 91, "attack": 90, @@ -15,58 +30,48 @@ "special_defence": 106, "speed": 77 }, - "catchRate": 3, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 10, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 100, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:ancientpower", - "1:earthpower", - "1:firespin", - "1:heatwave", - "1:ironhead", "1:leer", - "1:magmastorm", + "1:firespin", "6:metalclaw", - "9:leer", "12:ancientpower", - "17:firefang", "18:firefang", "24:scaryface", - "25:metalsound", "30:ironhead", - "33:crunch", "36:crunch", - "41:scaryface", "42:lavaplume", "48:metalsound", - "49:lavaplume", "54:earthpower", - "57:firespin", "60:heatwave", - "65:ironhead", "66:stoneedge", "72:magmastorm", - "73:earthpower", - "81:heatwave", - "88:stoneedge", - "96:magmastorm", - "tm:attract", + "tm:ancientpower", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", "tm:burningjealousy", - "tm:captivate", - "tm:confide", "tm:crunch", "tm:darkpulse", "tm:dig", - "tm:doubleteam", "tm:dragonpulse", "tm:earthpower", "tm:earthquake", @@ -80,13 +85,12 @@ "tm:flamethrower", "tm:flareblitz", "tm:flashcannon", - "tm:frustration", "tm:gigaimpact", "tm:hardpress", + "tm:headbutt", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", - "tm:hiddenpower", "tm:hyperbeam", "tm:incinerate", "tm:irondefense", @@ -94,7 +98,6 @@ "tm:lunge", "tm:metalclaw", "tm:metalsound", - "tm:naturalgift", "tm:naturepower", "tm:overheat", "tm:payback", @@ -102,91 +105,107 @@ "tm:powergem", "tm:protect", "tm:rest", - "tm:return", - "tm:roar", "tm:rockblast", "tm:rockclimb", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:scaryface", "tm:scorchingsands", - "tm:secretpower", "tm:selfdestruct", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:stealthrock", "tm:steelbeam", + "tm:steelroller", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:takedown", "tm:taunt", "tm:terablast", "tm:torment", - "tm:toxic", - "tm:uproar", "tm:willowisp", "tutor:ancientpower", - "tutor:bugbite", + "tutor:bulldoze", "tutor:burningjealousy", - "tutor:crunch", "tutor:darkpulse", "tutor:dragonpulse", "tutor:earthpower", - "tutor:eruption", - "tutor:firespin", + "tutor:firefang", + "tutor:flamethrower", "tutor:flashcannon", - "tutor:headbutt", + "tutor:gigaimpact", "tutor:heatwave", + "tutor:hyperbeam", "tutor:irondefense", "tutor:ironhead", - "tutor:lavaplume", - "tutor:magmastorm", - "tutor:metalsound", - "tutor:mudslap", - "tutor:scaryface", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", "tutor:scorchingsands", "tutor:sleeptalk", - "tutor:snore", "tutor:stealthrock", "tutor:steelbeam", "tutor:steelroller", "tutor:stompingtantrum", - "tutor:uproar" - ], - "labels": [ - "gen4", - "legendary" - ], - "pokedex": [ - "cobblemon.species.heatran.desc" + "tutor:stoneedge", + "legacy:attract", + "legacy:bugbite", + "legacy:captivate", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:return", + "legacy:roar", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "legacy:uproar", + "special:eruption" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "fireImmune": true }, - "baseFriendship": 100, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 + "lightingData": { + "lightLevel": 12, + "liquidGlowMode": "LAND" }, - "height": 17, - "weight": 4300, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "drops": { + "amount": 8, + "entries": [ + { + "item": "minecraft:magma_cream", + "quantityRange": "2-4" + }, + { + "item": "minecraft:blaze_powder", + "quantityRange": "2-4" + } + ] + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json b/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json deleted file mode 100644 index ccf090e83..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/lumineon.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "name": "Lumineon", - "nationalPokedexNumber": 457, - "primaryType": "water", - "abilities": [ - "swiftswim", - "stormdrain", - "h:waterveil" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:cod" - }, - { - "item": "minecraft:bone_meal", - "percentage": 10.0 - }, - { - "item": "cobblemon:rindo_berry", - "percentage": 5.0 - }, - { - "item": "cobblemon:prism_scale", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 69, - "attack": 69, - "defence": 76, - "special_attack": 69, - "special_defence": 86, - "speed": 91 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 161, - "experienceGroup": "erratic", - "eggCycles": 20, - "eggGroups": [ - "water_2" - ], - "moves": [ - "1:attract", - "1:gust", - "1:pound", - "1:soak", - "1:watergun", - "13:raindance", - "17:gust", - "22:waterpulse", - "26:attract", - "26:captivate", - "29:safeguard", - "35:aquaring", - "42:whirlpool", - "48:uturn", - "53:bounce", - "59:silverwind", - "59:tailwind", - "66:soak", - "tm:acrobatics", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:alluringvoice", - "tm:attract", - "tm:blizzard", - "tm:brine", - "tm:captivate", - "tm:charm", - "tm:chillingwater", - "tm:confide", - "tm:confuseray", - "tm:dazzlinggleam", - "tm:defog", - "tm:dive", - "tm:doubleteam", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:flipturn", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:naturalgift", - "tm:payback", - "tm:protect", - "tm:psybeam", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scald", - "tm:secretpower", - "tm:silverwind", - "tm:sleeptalk", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:uturn", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:aircutter", - "tutor:aquatail", - "tutor:bounce", - "tutor:defog", - "tutor:dive", - "tutor:icywind", - "tutor:ominouswind", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:swift", - "tutor:tailwind", - "tutor:twister", - "tutor:waterpulse" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.lumineon.desc" - ], - "preEvolution": "finneon", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 12, - "weight": 240, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 87b23f5de..655013c49 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/manaphy.json @@ -1,9 +1,26 @@ { - "name": "Manaphy", + "implemented": true, "nationalPokedexNumber": 490, + "name": "Manaphy", "primaryType": "water", + "maleRatio": -1, + "height": 3, + "weight": 14, + "pokedex": [ + "cobblemon.species.manaphy.desc" + ], + "labels": [ + "gen4", + "mythical" + ], + "aspects": [], "abilities": [ - "hydration" + "hydration", + "h:hydration" + ], + "eggGroups": [ + "water_1", + "fairy" ], "baseStats": { "hp": 100, @@ -13,22 +30,67 @@ "special_defence": 100, "speed": 100 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 270, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 10, - "eggGroups": [ - "water_1", - "fairy" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "canBreatheUnderwater": true, + "swimSpeed": "0.2" + }, + "walk": { + "avoidsLand": true + } + }, + "herd": { + "maxSize": "5", + "toleratedLeaders": [ + { + "pokemon": "manaphy", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "combat": { + "willDefendOwner": true + } + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:heart_of_the_sea" + } + ] + }, "moves": [ + "1:tailglow", "1:bubble", + "1:watersport", "1:heartswap", - "1:tailglow", "1:watergun", - "1:watersport", "9:charm", "16:supersonic", "24:bubblebeam", @@ -38,20 +100,20 @@ "54:aquaring", "61:dive", "69:raindance", - "76:heartswap", "76:takeheart", "tm:alluringvoice", + "tm:ancientpower", "tm:batonpass", "tm:blizzard", + "tm:bounce", "tm:brine", "tm:calmmind", "tm:charm", "tm:chillingwater", - "tm:confide", + "tm:covet", "tm:dazzlinggleam", "tm:disarmingvoice", "tm:dive", - "tm:doubleteam", "tm:endure", "tm:energyball", "tm:facade", @@ -59,22 +121,21 @@ "tm:flash", "tm:fling", "tm:flipturn", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", "tm:hail", "tm:haze", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", "tm:icywind", "tm:knockoff", + "tm:lastresort", "tm:lightscreen", "tm:liquidation", "tm:mudslap", - "tm:naturalgift", "tm:protect", "tm:psybeam", "tm:psychic", @@ -82,88 +143,62 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", "tm:scald", - "tm:secretpower", "tm:shadowball", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", "tm:storedpower", "tm:substitute", "tm:surf", - "tm:swagger", "tm:swift", "tm:terablast", - "tm:toxic", "tm:uturn", "tm:waterfall", "tm:waterpulse", "tm:weatherball", "tm:whirlpool", "tm:zenheadbutt", - "tutor:acidarmor", "tutor:ancientpower", - "tutor:aquaring", "tutor:bounce", - "tutor:bubble", + "tutor:calmmind", "tutor:covet", + "tutor:dazzlinggleam", "tutor:dive", + "tutor:energyball", + "tutor:flipturn", + "tutor:gigaimpact", "tutor:healbell", - "tutor:heartswap", "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:snore", "tutor:swift", - "tutor:tailglow", - "tutor:uproar", "tutor:waterpulse", - "tutor:watersport", - "tutor:whirlpool" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "legacy:uproar" ], - "labels": [ - "gen4", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.manaphy.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 14, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:heart_of_the_sea" - } - ] - }, - "implemented": true + "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 deleted file mode 100644 index 5448482e5..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/mantyke.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "name": "Mantyke", - "nationalPokedexNumber": 458, - "primaryType": "water", - "secondaryType": "flying", - "abilities": [ - "swiftswim", - "waterabsorb", - "h:waterveil" - ], - "baseStats": { - "hp": 45, - "attack": 20, - "defence": 50, - "special_attack": 60, - "special_defence": 120, - "speed": 50 - }, - "catchRate": 25, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 69, - "experienceGroup": "slow", - "eggCycles": 25, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:bubble", - "1:tackle", - "1:watergun", - "3:supersonic", - "4:supersonic", - "7:bubblebeam", - "8:wingattack", - "10:bubblebeam", - "11:confuseray", - "12:waterpulse", - "13:headbutt", - "14:wingattack", - "16:headbutt", - "16:wideguard", - "19:agility", - "19:waterpulse", - "20:agility", - "22:wingattack", - "23:wideguard", - "24:bubblebeam", - "27:takedown", - "28:headbutt", - "28:waterpulse", - "31:takedown", - "32:agility", - "32:airslash", - "36:airslash", - "36:aquaring", - "37:confuseray", - "39:aquaring", - "40:bounce", - "44:takedown", - "46:aquaring", - "46:bounce", - "48:hydropump", - "49:hydropump", - "egg:amnesia", - "egg:confuseray", - "egg:haze", - "egg:hydropump", - "egg:mirrorcoat", - "egg:mudsport", - "egg:rockslide", - "egg:signalbeam", - "egg:slam", - "egg:splash", - "egg:tailwind", - "egg:twister", - "egg:watersport", - "egg:wideguard", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:airslash", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bounce", - "tm:bulldoze", - "tm:captivate", - "tm:confide", - "tm:dive", - "tm:doubleteam", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:frustration", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:naturalgift", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:aircutter", - "tutor:bounce", - "tutor:dive", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:icywind", - "tutor:mudslap", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:swift", - "tutor:tailwind", - "tutor:waterpulse" - ], - "labels": [ - "gen4", - "baby" - ], - "pokedex": [ - "cobblemon.species.mantyke.desc" - ], - "evolutions": [ - { - "id": "mantyke_mantine", - "variant": "level_up", - "result": "mantine", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "party_member", - "target": "remoraid", - "contains": true - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 10, - "weight": 650, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:cod", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:wacan_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 88479fef1..700efccb6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mesprit.json @@ -1,9 +1,25 @@ { - "name": "Mesprit", + "implemented": true, "nationalPokedexNumber": 481, + "name": "Mesprit", "primaryType": "psychic", + "maleRatio": -1, + "height": 3, + "weight": 3, + "pokedex": [ + "cobblemon.species.mesprit.desc" + ], + "labels": [ + "gen4", + "legendary" + ], + "aspects": [], "abilities": [ - "levitate" + "levitate", + "h:levitate" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 80, @@ -13,52 +29,50 @@ "special_defence": 105, "speed": 80 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 1, + "special_defence": 1, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 140, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:allyswitch", + "1:rest", "1:confusion", - "1:copycat", - "1:expandingforce", - "1:healingwish", + "1:luckychant", + "1:snore", + "1:safeguard", "1:irontail", + "1:wonderroom", "1:magicroom", "1:naturalgift", + "1:allyswitch", + "1:triattack", "1:psychocut", - "1:rest", + "1:expandingforce", "1:round", - "1:safeguard", - "1:snore", - "1:triattack", - "1:wonderroom", - "6:imprison", "7:swift", "14:protect", - "16:protect", "21:psybeam", - "21:swift", "28:imprison", - "31:luckychant", "35:extrasensory", - "36:futuresight", "42:charm", - "46:charm", "49:psychic", - "50:extrasensory", - "51:extrasensory", "56:flatter", - "61:copycat", "63:futuresight", - "66:naturalgift", "70:copycat", - "76:healingwish", "77:healingwish", "84:mysticalpower", "tm:acrobatics", @@ -68,11 +82,9 @@ "tm:calmmind", "tm:chargebeam", "tm:charm", - "tm:confide", "tm:confuseray", "tm:dazzlinggleam", "tm:doubleedge", - "tm:doubleteam", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -84,19 +96,20 @@ "tm:firepunch", "tm:flash", "tm:fling", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:icebeam", "tm:icepunch", "tm:imprison", "tm:irontail", "tm:knockoff", + "tm:laserfocus", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:metronome", "tm:nastyplot", @@ -115,13 +128,13 @@ "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", + "tm:roleplay", "tm:round", "tm:safeguard", "tm:sandstorm", - "tm:secretpower", "tm:shadowball", "tm:shockwave", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", "tm:snore", @@ -129,7 +142,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:telekinesis", "tm:terablast", @@ -137,7 +149,6 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:triattack", "tm:trick", "tm:trickroom", @@ -146,27 +157,31 @@ "tm:wonderroom", "tm:zenheadbutt", "tutor:allyswitch", - "tutor:charm", - "tutor:confusion", - "tutor:copycat", - "tutor:drainingkiss", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", "tutor:expandingforce", - "tutor:extrasensory", "tutor:firepunch", - "tutor:futuresight", - "tutor:headbutt", + "tutor:gigaimpact", "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", "tutor:icepunch", "tutor:irontail", "tutor:knockoff", "tutor:laserfocus", - "tutor:luckychant", "tutor:magiccoat", "tutor:magicroom", - "tutor:mudslap", + "tutor:painsplit", + "tutor:playrough", "tutor:psychic", + "tutor:psychocut", "tutor:recycle", + "tutor:rest", "tutor:roleplay", + "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", "tutor:skillswap", @@ -175,39 +190,59 @@ "tutor:stealthrock", "tutor:swift", "tutor:telekinesis", + "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:triattack", "tutor:trick", "tutor:waterpulse", "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen4", - "legendary" - ], - "pokedex": [ - "cobblemon.species.mesprit.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:return", + "legacy:secretpower", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 140, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 1, - "speed": 0 - }, - "height": 3, - "weight": 3, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "uxie", + "tier": 1 + }, + { + "pokemon": "mesprit", + "tier": 1 + }, + { + "pokemon": "azelf", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 75e073580..db44843a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/mothim.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/mothim.json @@ -1,12 +1,53 @@ { - "name": "Mothim", + "implemented": true, "nationalPokedexNumber": 414, + "name": "Mothim", "primaryType": "bug", "secondaryType": "flying", + "maleRatio": 1, + "height": 9, + "weight": 233, + "pokedex": [ + "cobblemon.species.mothim.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [], "abilities": [ "swarm", "h:tintedlens" ], + "eggGroups": [ + "bug" + ], + "baseStats": { + "hp": 70, + "attack": 94, + "defence": 50, + "special_attack": 94, + "special_defence": 50, + "speed": 66 + }, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 148, + "experienceGroup": "medium_fast", + "catchRate": 45, + "eggCycles": 15, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 2, "entries": [ @@ -20,128 +61,128 @@ } ] }, - "baseStats": { - "hp": 70, - "attack": 94, - "defence": 50, - "special_attack": 94, - "special_defence": 50, - "speed": 66 - }, - "catchRate": 45, - "maleRatio": 1, - "shoulderMountable": false, - "baseExperienceYield": 148, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], "moves": [ - "1:bugbite", + "1:tackle", "1:protect", + "1:bugbite", "1:quiverdance", - "1:tackle", - "10:protect", - "15:bugbite", - "20:hiddenpower", + "20:stringshot", "23:confusion", "26:gust", "29:poisonpowder", "32:psybeam", "35:camouflage", - "38:silverwind", + "38:strugglebug", "41:airslash", "44:psychic", - "47:bugbuzz", "47:lunge", "50:bugbuzz", - "50:quiverdance", "tm:acrobatics", "tm:aerialace", - "tm:attract", - "tm:captivate", - "tm:confide", + "tm:aircutter", + "tm:airslash", + "tm:bugbite", + "tm:bugbuzz", "tm:defog", - "tm:doubleteam", "tm:dreameater", + "tm:dualwingbeat", + "tm:electroweb", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:frustration", "tm:gigadrain", "tm:gigaimpact", - "tm:hiddenpower", "tm:hyperbeam", "tm:infestation", - "tm:naturalgift", + "tm:lunge", + "tm:mudslap", + "tm:ominouswind", "tm:protect", + "tm:psybeam", "tm:psychic", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", "tm:roost", - "tm:round", "tm:safeguard", - "tm:secretpower", "tm:shadowball", + "tm:signalbeam", "tm:silverwind", "tm:skillswap", "tm:sleeptalk", "tm:solarbeam", + "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:sunnyday", - "tm:swagger", + "tm:tailwind", + "tm:terablast", "tm:thief", - "tm:toxic", + "tm:twister", "tm:uturn", "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:snore", "tutor:stringshot", - "tutor:swift", "tutor:tailwind", - "tutor:twister" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.mothim.desc" + "tutor:twister", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:swift", + "legacy:toxic" ], "preEvolution": "burmy", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 9, - "weight": 233, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendOwner": true + } + } } \ 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 aeb10eeb3..4ff9a327a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/palkia.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/palkia.json @@ -1,12 +1,30 @@ { - "name": "Palkia", + "implemented": true, "nationalPokedexNumber": 484, + "name": "Palkia", "primaryType": "water", "secondaryType": "dragon", + "maleRatio": -1, + "height": 42, + "weight": 3360, + "pokedex": [ + "cobblemon.species.palkia.desc" + ], + "labels": [ + "gen4", + "legendary", + "restricted" + ], + "aspects": [ + "altered-forme" + ], "abilities": [ "pressure", "h:telepathy" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 90, "attack": 120, @@ -15,92 +33,41 @@ "special_defence": 120, "speed": 100 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Origin", - "primaryType": "water", - "secondaryType": "dragon", - "abilities": [ - "pressure", - "h:telepathy" - ], - "baseStats": { - "hp": 90, - "attack": 100, - "defence": 100, - "special_attack": 150, - "special_defence": 120, - "speed": 120 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 340, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen8", - "legendary" - ], - "aspects": [ - "origin" - ], - "height": 63, - "weight": 6600, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 340, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:dragonbreath", "1:scaryface", "1:waterpulse", - "6:waterpulse", "8:dragonbreath", - "10:ancientpower", - "15:slash", "16:ancientpower", - "19:powergem", - "24:aquaring", - "24:aquatail", "24:slash", - "28:dragonclaw", "32:aquaring", - "33:earthpower", - "37:aurasphere", - "40:dragonclaw", - "40:spacialrend", - "42:hydropump", - "46:spacialrend", "48:aurasphere", - "50:healblock", - "50:hydropump", "56:powergem", "64:aquatail", "72:earthpower", "80:spacialrend", "88:hydropump", "tm:aerialace", + "tm:ancientpower", + "tm:aquatail", "tm:aurasphere", "tm:avalanche", "tm:blizzard", @@ -112,10 +79,8 @@ "tm:bulkup", "tm:bulldoze", "tm:chillingwater", - "tm:confide", "tm:cut", "tm:dive", - "tm:doubleteam", "tm:dracometeor", "tm:dragonclaw", "tm:dragonpulse", @@ -130,13 +95,12 @@ "tm:flamethrower", "tm:fling", "tm:focusblast", - "tm:focuspunch", - "tm:frustration", + "tm:furycutter", "tm:gigaimpact", "tm:gravity", "tm:hail", + "tm:headbutt", "tm:heavyslam", - "tm:hiddenpower", "tm:honeclaws", "tm:hydropump", "tm:hyperbeam", @@ -145,28 +109,23 @@ "tm:icywind", "tm:incinerate", "tm:liquidation", - "tm:naturalgift", "tm:outrage", "tm:powergem", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:safeguard", "tm:sandstorm", "tm:scaleshot", "tm:scaryface", - "tm:secretpower", "tm:shadowclaw", "tm:shockwave", "tm:sleeptalk", - "tm:snore", "tm:snowscape", "tm:stompingtantrum", "tm:stoneedge", @@ -174,76 +133,227 @@ "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:swagger", "tm:swift", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:trick", "tm:trickroom", + "tm:twister", "tm:waterfall", "tm:waterpulse", "tm:whirlpool", + "tutor:aerialace", "tutor:ancientpower", "tutor:aquatail", - "tutor:aurasphere", + "tutor:bulkup", + "tutor:bulldoze", "tutor:dive", - "tutor:dragonbreath", - "tutor:dragonclaw", + "tutor:dracometeor", "tutor:dragonpulse", "tutor:dualwingbeat", "tutor:earthpower", - "tutor:focuspunch", + "tutor:flamethrower", "tutor:furycutter", + "tutor:gigaimpact", "tutor:gravity", - "tutor:headbutt", - "tutor:healblock", + "tutor:hyperbeam", "tutor:hypervoice", + "tutor:icebeam", + "tutor:icywind", "tutor:liquidation", - "tutor:mudslap", "tutor:outrage", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", "tutor:scaleshot", - "tutor:scaryface", + "tutor:shadowclaw", "tutor:shockwave", - "tutor:slash", "tutor:sleeptalk", - "tutor:snore", - "tutor:spacialrend", "tutor:stompingtantrum", - "tutor:surf", + "tutor:stoneedge", "tutor:swift", + "tutor:thunderbolt", + "tutor:trick", "tutor:twister", - "tutor:waterpulse" - ], - "labels": [ - "gen4", - "legendary" - ], - "pokedex": [ - "cobblemon.species.palkia.desc" + "tutor:waterpulse", + "legacy:confide", + "legacy:doubleteam", + "legacy:focuspunch", + "legacy:frustration", + "legacy:healblock", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 42, - "weight": 3360, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Origin", + "primaryType": "water", + "secondaryType": "dragon", + "maleRatio": -1, + "height": 63, + "weight": 6600, + "pokedex": [ + "cobblemon.species.palkia-origin.desc" + ], + "labels": [ + "gen8a", + "legendary", + "restricted" + ], + "aspects": [ + "origin-forme" + ], + "baseStats": { + "hp": 90, + "attack": 100, + "defence": 100, + "special_attack": 150, + "special_defence": 120, + "speed": 120 + }, + "moves": [ + "1:waterpulse", + "1:scaryface", + "8:dragonbreath", + "16:ancientpower", + "24:slash", + "32:aquaring", + "48:aurasphere", + "56:powergem", + "64:aquatail", + "72:earthpower", + "80:spacialrend", + "88:hydropump", + "tm:aerialace", + "tm:ancientpower", + "tm:aquatail", + "tm:aurasphere", + "tm:avalanche", + "tm:blizzard", + "tm:bodypress", + "tm:bodyslam", + "tm:breakingswipe", + "tm:brickbreak", + "tm:bulkup", + "tm:bulldoze", + "tm:chillingwater", + "tm:dracometeor", + "tm:dragonclaw", + "tm:dragonpulse", + "tm:dragontail", + "tm:dualwingbeat", + "tm:earthpower", + "tm:earthquake", + "tm:endure", + "tm:facade", + "tm:fireblast", + "tm:flamethrower", + "tm:fling", + "tm:focusblast", + "tm:gigaimpact", + "tm:gravity", + "tm:heavyslam", + "tm:hydropump", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icywind", + "tm:liquidation", + "tm:outrage", + "tm:powergem", + "tm:protect", + "tm:psychup", + "tm:raindance", + "tm:rest", + "tm:roar", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:sandstorm", + "tm:scaleshot", + "tm:scaryface", + "tm:shadowclaw", + "tm:sleeptalk", + "tm:snowscape", + "tm:stompingtantrum", + "tm:stoneedge", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:takedown", + "tm:terablast", + "tm:thunder", + "tm:thunderbolt", + "tm:thunderwave", + "tm:trick", + "tm:trickroom", + "tm:waterfall", + "tm:waterpulse", + "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 + } + ], + "behaviour": { + "moving": { + "swim": { + "canBreatheUnderwater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 989515434..762c59402 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/phione.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/phione.json @@ -1,9 +1,26 @@ { - "name": "Phione", + "implemented": true, "nationalPokedexNumber": 489, + "name": "Phione", "primaryType": "water", + "maleRatio": -1, + "height": 4, + "weight": 31, + "pokedex": [ + "cobblemon.species.phione.desc" + ], + "labels": [ + "gen4", + "mythical" + ], + "aspects": [], "abilities": [ - "hydration" + "hydration", + "h:hydration" + ], + "eggGroups": [ + "water_1", + "fairy" ], "baseStats": { "hp": 80, @@ -13,20 +30,69 @@ "special_defence": 80, "speed": 80 }, - "catchRate": 30, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 216, + "evYield": { + "hp": 1, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 240, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 40, - "eggGroups": [ - "water_1", - "fairy" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "canBreatheUnderwater": true, + "swimSpeed": "0.2" + }, + "walk": { + "avoidsLand": true + } + }, + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "phione", + "tier": 1 + }, + { + "pokemon": "manaphy", + "tier": 2 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "combat": { + "willDefendOwner": true + } + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:mystic_water" + } + ] + }, "moves": [ "1:bubble", - "1:watergun", "1:watersport", + "1:watergun", "9:charm", "16:supersonic", "24:bubblebeam", @@ -38,48 +104,44 @@ "69:raindance", "75:takeheart", "tm:alluringvoice", + "tm:ancientpower", "tm:batonpass", "tm:blizzard", + "tm:bounce", "tm:brine", "tm:charm", "tm:chillingwater", - "tm:confide", + "tm:covet", "tm:dazzlinggleam", "tm:disarmingvoice", "tm:dive", - "tm:doubleteam", "tm:endure", "tm:facade", "tm:fling", "tm:flipturn", - "tm:frustration", "tm:grassknot", "tm:hail", "tm:haze", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:hydropump", "tm:icebeam", "tm:icywind", "tm:knockoff", + "tm:lastresort", "tm:liquidation", - "tm:naturalgift", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", "tm:scald", - "tm:secretpower", + "tm:signalbeam", "tm:sleeptalk", "tm:substitute", "tm:surf", - "tm:swagger", "tm:swift", "tm:terablast", - "tm:toxic", "tm:uturn", "tm:waterfall", "tm:waterpulse", @@ -89,60 +151,35 @@ "tutor:ancientpower", "tutor:bounce", "tutor:covet", + "tutor:dazzlinggleam", "tutor:dive", - "tutor:grassknot", + "tutor:flipturn", "tutor:healbell", "tutor:helpinghand", + "tutor:icebeam", "tutor:icywind", "tutor:knockoff", "tutor:lastresort", "tutor:liquidation", - "tutor:mudslap", - "tutor:raindance", "tutor:rest", "tutor:signalbeam", "tutor:sleeptalk", - "tutor:snore", - "tutor:surf", "tutor:swift", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen4", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.phione.desc" + "tutor:waterpulse", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "legacy:uproar" ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 31, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:mystic_water" - } - ] - }, - "implemented": true + "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json b/common/src/main/resources/data/cobblemon/species/generation4/purugly.json deleted file mode 100644 index 0f35b6b4b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/purugly.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "name": "Purugly", - "nationalPokedexNumber": 432, - "primaryType": "normal", - "abilities": [ - "thickfat", - "owntempo", - "h:defiant" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:cheri_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 71, - "attack": 82, - "defence": 64, - "special_attack": 64, - "special_defence": 59, - "speed": 112 - }, - "catchRate": 75, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 158, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:fakeout", - "1:growl", - "1:scratch", - "1:swagger", - "13:hypnosis", - "17:feintattack", - "20:furyswipes", - "25:charm", - "29:assist", - "32:captivate", - "37:slash", - "38:swagger", - "45:bodyslam", - "52:attract", - "53:attract", - "60:honeclaws", - "tm:aerialace", - "tm:attract", - "tm:bulldoze", - "tm:captivate", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:doubleteam", - "tm:dreameater", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:irontail", - "tm:naturalgift", - "tm:payback", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:roar", - "tm:round", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:shockwave", - "tm:sleeptalk", - "tm:snatch", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:taunt", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:torment", - "tm:toxic", - "tm:uturn", - "tm:waterpulse", - "tm:workup", - "tutor:covet", - "tutor:foulplay", - "tutor:furycutter", - "tutor:headbutt", - "tutor:hypervoice", - "tutor:irontail", - "tutor:knockoff", - "tutor:lastresort", - "tutor:mudslap", - "tutor:rollout", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:suckerpunch", - "tutor:superfang", - "tutor:swift", - "tutor:throatchop", - "tutor:waterpulse" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.purugly.desc" - ], - "preEvolution": "glameow", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 10, - "weight": 438, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 6732a8407..f70743b22 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/regigigas.json @@ -1,9 +1,25 @@ { - "name": "Regigigas", + "implemented": true, "nationalPokedexNumber": 486, + "name": "Regigigas", "primaryType": "normal", + "maleRatio": -1, + "height": 37, + "weight": 4200, + "pokedex": [ + "cobblemon.species.regigigas.desc" + ], + "labels": [ + "gen4", + "legendary" + ], + "aspects": [], "abilities": [ - "slowstart" + "slowstart", + "h:slowstart" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 110, @@ -13,60 +29,52 @@ "special_defence": 110, "speed": 100 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 335, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 4, + "height": 6.5, + "fixed": false + }, "moves": [ - "1:confuseray", - "1:crushgrip", "1:dizzypunch", - "1:firepunch", + "1:confuseray", "1:foresight", - "1:heavyslam", - "1:icepunch", - "1:knockoff", - "1:megapunch", "1:pound", - "1:stomp", - "1:thunderpunch", "6:payback", "12:facade", - "12:revenge", "18:stomp", "24:protect", - "25:revenge", - "25:superpower", "30:knockoff", "36:megapunch", - "40:wideguard", "42:bodypress", "48:wideguard", - "50:zenheadbutt", "54:zenheadbutt", "60:heavyslam", - "65:payback", "66:hammerarm", "72:gigaimpact", - "75:crushgrip", "78:crushgrip", - "90:heavyslam", - "100:gigaimpact", - "tm:aerialace", + "tm:ancientpower", "tm:avalanche", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:confide", "tm:confuseray", "tm:darkestlariat", - "tm:doubleteam", "tm:doubleedge", "tm:drainpunch", "tm:earthpower", @@ -77,13 +85,12 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:frustration", "tm:gigaimpact", "tm:gravity", "tm:hardpress", + "tm:headbutt", "tm:heatcrash", "tm:heavyslam", - "tm:hiddenpower", "tm:highhorsepower", "tm:hyperbeam", "tm:icepunch", @@ -92,103 +99,101 @@ "tm:knockoff", "tm:megakick", "tm:megapunch", - "tm:naturalgift", "tm:naturepower", "tm:payback", + "tm:powershift", "tm:poweruppunch", "tm:protect", - "tm:psychup", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:rockclimb", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:safeguard", - "tm:secretpower", "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:terablast", + "tm:terrainpulse", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:zenheadbutt", "tutor:ancientpower", "tutor:block", - "tutor:confuseray", - "tutor:crushgrip", - "tutor:dizzypunch", + "tutor:bulldoze", "tutor:drainpunch", "tutor:earthpower", "tutor:firepunch", "tutor:focuspunch", - "tutor:foresight", "tutor:gigaimpact", "tutor:gravity", - "tutor:hammerarm", - "tutor:headbutt", - "tutor:heavyslam", + "tutor:highhorsepower", + "tutor:hyperbeam", "tutor:icepunch", "tutor:icywind", "tutor:ironhead", "tutor:knockoff", - "tutor:mudslap", - "tutor:payback", - "tutor:revenge", + "tutor:powershift", + "tutor:rest", "tutor:rockslide", + "tutor:rocksmash", "tutor:shockwave", "tutor:sleeptalk", - "tutor:snore", - "tutor:stomp", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", "tutor:terrainpulse", + "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:wideguard", - "tutor:zenheadbutt" - ], - "labels": [ - "gen4", - "legendary" - ], - "pokedex": [ - "cobblemon.species.regigigas.desc" + "tutor:zenheadbutt", + "legacy:aerialace", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:psychup", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 37, - "weight": 4200, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "5" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/rotom.json b/common/src/main/resources/data/cobblemon/species/generation4/rotom.json deleted file mode 100644 index f2ffc0f09..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/rotom.json +++ /dev/null @@ -1,737 +0,0 @@ -{ - "nationalPokedexNumber": 479, - "name": "Rotom", - "primaryType": "electric", - "secondaryType": "ghost", - "maleRatio": -1, - "height": 3, - "weight": 3, - "pokedex": [ - "cobblemon.species.rotom.desc" - ], - "labels": [ - "gen4" - ], - "aspects": [], - "abilities": [ - "levitate", - "h:levitate" - ], - "eggGroups": [ - "amorphous" - ], - "baseStats": { - "hp": 50, - "attack": 50, - "defence": 77, - "special_attack": 95, - "special_defence": 77, - "speed": 91 - }, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "baseExperienceYield": 154, - "experienceGroup": "medium_fast", - "catchRate": 45, - "eggCycles": 20, - "baseFriendship": 50, - "baseScale": 0.75, - "hitbox": { - "width": 0.55, - "height": 1.3, - "fixed": false - }, - "moves": [ - "1:astonish", - "1:doubleteam", - "5:thundershock", - "10:confuseray", - "15:charge", - "20:electroball", - "25:thunderwave", - "30:shockwave", - "35:hex", - "40:substitute", - "45:trick", - "50:discharge", - "55:uproar", - "tm:allyswitch", - "tm:charge", - "tm:chargebeam", - "tm:confuseray", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:helpinghand", - "tm:hex", - "tm:hypervoice", - "tm:lightscreen", - "tm:nastyplot", - "tm:nightshade", - "tm:ominouswind", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:risingvoltage", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:snatch", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:swift", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trick", - "tm:uproar", - "tm:voltswitch", - "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": [ - { - "name": "Heat", - "primaryType": "electric", - "secondaryType": "fire", - "maleRatio": -1, - "height": 3, - "weight": 3, - "pokedex": [ - "cobblemon.species.rotom-heat.desc" - ], - "labels": [ - "gen4" - ], - "aspects": [ - "heat-appliance" - ], - "baseStats": { - "hp": 50, - "attack": 65, - "defence": 107, - "special_attack": 105, - "special_defence": 107, - "speed": 86 - }, - "baseExperienceYield": 182, - "moves": [ - "1:astonish", - "1:doubleteam", - "5:thundershock", - "10:confuseray", - "15:charge", - "20:electroball", - "25:thunderwave", - "30:shockwave", - "35:hex", - "40:substitute", - "45:trick", - "50:discharge", - "55:uproar", - "form_change:overheat", - "tm:allyswitch", - "tm:charge", - "tm:chargebeam", - "tm:confuseray", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:helpinghand", - "tm:hex", - "tm:hypervoice", - "tm:lightscreen", - "tm:nastyplot", - "tm:nightshade", - "tm:ominouswind", - "tm:overheat", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:risingvoltage", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:snatch", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:swift", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trick", - "tm:uproar", - "tm:voltswitch", - "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 - }, - { - "name": "Wash", - "primaryType": "electric", - "secondaryType": "water", - "maleRatio": -1, - "height": 3, - "weight": 3, - "pokedex": [ - "cobblemon.species.rotom-wash.desc" - ], - "labels": [ - "gen4" - ], - "aspects": [ - "wash-appliance" - ], - "baseStats": { - "hp": 50, - "attack": 65, - "defence": 107, - "special_attack": 105, - "special_defence": 107, - "speed": 86 - }, - "baseExperienceYield": 182, - "moves": [ - "1:astonish", - "1:doubleteam", - "5:thundershock", - "10:confuseray", - "15:charge", - "20:electroball", - "25:thunderwave", - "30:shockwave", - "35:hex", - "40:substitute", - "45:trick", - "50:discharge", - "55:uproar", - "form_change:hydropump", - "tm:allyswitch", - "tm:charge", - "tm:chargebeam", - "tm:confuseray", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:helpinghand", - "tm:hex", - "tm:hydropump", - "tm:hypervoice", - "tm:lightscreen", - "tm:nastyplot", - "tm:nightshade", - "tm:ominouswind", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:risingvoltage", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:snatch", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:swift", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trick", - "tm:uproar", - "tm:voltswitch", - "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 - }, - { - "name": "Frost", - "primaryType": "electric", - "secondaryType": "ice", - "maleRatio": -1, - "height": 3, - "weight": 3, - "pokedex": [ - "cobblemon.species.rotom-frost.desc" - ], - "labels": [ - "gen4" - ], - "aspects": [ - "frost-appliance" - ], - "baseStats": { - "hp": 50, - "attack": 65, - "defence": 107, - "special_attack": 105, - "special_defence": 107, - "speed": 86 - }, - "baseExperienceYield": 182, - "moves": [ - "1:astonish", - "1:doubleteam", - "5:thundershock", - "10:confuseray", - "15:charge", - "20:electroball", - "25:thunderwave", - "30:shockwave", - "35:hex", - "40:substitute", - "45:trick", - "50:discharge", - "55:uproar", - "form_change:blizzard", - "tm:allyswitch", - "tm:blizzard", - "tm:charge", - "tm:chargebeam", - "tm:confuseray", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:helpinghand", - "tm:hex", - "tm:hypervoice", - "tm:lightscreen", - "tm:nastyplot", - "tm:nightshade", - "tm:ominouswind", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:risingvoltage", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:snatch", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:swift", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trick", - "tm:uproar", - "tm:voltswitch", - "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 - }, - { - "name": "Fan", - "primaryType": "electric", - "secondaryType": "flying", - "maleRatio": -1, - "height": 3, - "weight": 3, - "pokedex": [ - "cobblemon.species.rotom-fan.desc" - ], - "labels": [ - "gen4" - ], - "aspects": [ - "fan-appliance" - ], - "baseStats": { - "hp": 50, - "attack": 65, - "defence": 107, - "special_attack": 105, - "special_defence": 107, - "speed": 86 - }, - "baseExperienceYield": 182, - "moves": [ - "1:astonish", - "1:doubleteam", - "5:thundershock", - "10:confuseray", - "15:charge", - "20:electroball", - "25:thunderwave", - "30:shockwave", - "35:hex", - "40:substitute", - "45:trick", - "50:discharge", - "55:uproar", - "form_change:airslash", - "tm:airslash", - "tm:allyswitch", - "tm:charge", - "tm:chargebeam", - "tm:confuseray", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:helpinghand", - "tm:hex", - "tm:hypervoice", - "tm:lightscreen", - "tm:nastyplot", - "tm:nightshade", - "tm:ominouswind", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:risingvoltage", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:snatch", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:swift", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trick", - "tm:uproar", - "tm:voltswitch", - "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 - }, - { - "name": "Mow", - "primaryType": "electric", - "secondaryType": "grass", - "maleRatio": -1, - "height": 3, - "weight": 3, - "pokedex": [ - "cobblemon.species.rotom-mow.desc" - ], - "labels": [ - "gen4" - ], - "aspects": [ - "mow-appliance" - ], - "baseStats": { - "hp": 50, - "attack": 65, - "defence": 107, - "special_attack": 105, - "special_defence": 107, - "speed": 86 - }, - "baseExperienceYield": 182, - "moves": [ - "1:astonish", - "1:doubleteam", - "5:thundershock", - "10:confuseray", - "15:charge", - "20:electroball", - "25:thunderwave", - "30:shockwave", - "35:hex", - "40:substitute", - "45:trick", - "50:discharge", - "55:uproar", - "form_change:leafstorm", - "tm:allyswitch", - "tm:charge", - "tm:chargebeam", - "tm:confuseray", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:helpinghand", - "tm:hex", - "tm:hypervoice", - "tm:leafstorm", - "tm:lightscreen", - "tm:nastyplot", - "tm:nightshade", - "tm:ominouswind", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:risingvoltage", - "tm:shadowball", - "tm:shockwave", - "tm:signalbeam", - "tm:sleeptalk", - "tm:snatch", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:suckerpunch", - "tm:sunnyday", - "tm:swift", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trick", - "tm:uproar", - "tm:voltswitch", - "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 - } - ] -} \ No newline at end of file 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 716e32495..34b073da1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/shaymin.json @@ -1,9 +1,27 @@ { - "name": "Shaymin", + "implemented": true, "nationalPokedexNumber": 492, + "name": "Shaymin", "primaryType": "grass", + "maleRatio": -1, + "height": 2, + "weight": 21, + "pokedex": [ + "cobblemon.species.shaymin.desc" + ], + "labels": [ + "gen4", + "mythical" + ], + "aspects": [ + "land-forme" + ], "abilities": [ - "naturalcure" + "naturalcure", + "h:naturalcure" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -13,11 +31,6 @@ "special_defence": 100, "speed": 100 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 270, - "baseFriendship": 100, "evYield": { "hp": 3, "attack": 0, @@ -26,131 +39,139 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 300, "experienceGroup": "medium_slow", + "catchRate": 45, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 100, "moves": [ - "1:defensecurl", "1:growth", "10:magicalleaf", "19:leechseed", - "28:quickattack", "28:synthesis", "37:sweetscent", "46:naturalgift", - "46:playrough", "55:worryseed", - "64:airslash", - "64:aromatherapy", "64:grassyterrain", "73:energyball", - "82:grasswhistle", "82:sweetkiss", "91:healingwish", - "91:leafstorm", - "91:luckychant", "100:seedflare", "tm:aircutter", "tm:airslash", + "tm:aromatherapy", + "tm:babydolleyes", "tm:batonpass", "tm:bulletseed", - "tm:confide", + "tm:covet", "tm:dazzlinggleam", "tm:disarmingvoice", "tm:doubleedge", - "tm:doubleteam", "tm:earthpower", "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:frustration", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:grassyterrain", - "tm:hiddenpower", + "tm:headbutt", "tm:hyperbeam", + "tm:laserfocus", + "tm:lastresort", "tm:leafstorm", "tm:magicalleaf", "tm:naturalgift", "tm:naturepower", + "tm:ominouswind", "tm:petalblizzard", "tm:playrough", "tm:protect", "tm:psychic", "tm:psychup", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", - "tm:secretpower", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:swordsdance", + "tm:synthesis", "tm:tailwind", "tm:takedown", "tm:terablast", - "tm:toxic", "tm:trailblaze", + "tm:worryseed", "tm:zenheadbutt", "tutor:aircutter", - "tutor:airslash", - "tutor:aromatherapy", - "tutor:celebrate", + "tutor:babydolleyes", "tutor:covet", + "tutor:dazzlinggleam", "tutor:earthpower", "tutor:endeavor", "tutor:energyball", "tutor:gigadrain", - "tutor:growth", - "tutor:headbutt", + "tutor:gigaimpact", + "tutor:grassyglide", + "tutor:hyperbeam", "tutor:laserfocus", "tutor:lastresort", - "tutor:leechseed", "tutor:magicalleaf", - "tutor:mudslap", "tutor:ominouswind", - "tutor:return", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", "tutor:seedbomb", - "tutor:seedflare", "tutor:sleeptalk", - "tutor:snore", - "tutor:substitute", - "tutor:sweetscent", "tutor:swift", "tutor:synthesis", "tutor:tailwind", "tutor:worryseed", - "tutor:zenheadbutt" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:defensecurl", + "legacy:doubleteam", + "legacy:frustration", + "legacy:grasswhistle", + "legacy:hiddenpower", + "legacy:luckychant", + "legacy:mudslap", + "legacy:quickattack", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "special:celebrate" ], - "labels": [ - "gen4", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.shaymin.desc" - ], - "height": 2, - "weight": 21, "evolutions": [], "forms": [ { "name": "Sky", "primaryType": "grass", "secondaryType": "flying", + "maleRatio": -1, + "height": 4, + "weight": 52, + "pokedex": [ + "cobblemon.species.shaymin-sky.desc" + ], + "labels": [ + "gen4", + "mythical" + ], + "aspects": [ + "sky-forme" + ], "abilities": [ - "serenegrace" + "serenegrace", + "h:serenegrace" ], "baseStats": { "hp": 100, @@ -160,10 +181,6 @@ "special_defence": 75, "speed": 127 }, - "catchRate": 45, - "maleRatio": -1, - "baseExperienceYield": 270, - "baseFriendship": 100, "evYield": { "hp": 0, "attack": 0, @@ -172,26 +189,159 @@ "special_defence": 0, "speed": 3 }, - "experienceGroup": "medium_slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen4", - "mythical", - "legendary" - ], - "aspects": [ - "sky" + "moves": [ + "1:growth", + "10:magicalleaf", + "19:leechseed", + "28:quickattack", + "37:sweetscent", + "46:naturalgift", + "55:worryseed", + "64:airslash", + "73:energyball", + "82:sweetkiss", + "91:leafstorm", + "100:seedflare", + "tm:aircutter", + "tm:airslash", + "tm:babydolleyes", + "tm:batonpass", + "tm:bulletseed", + "tm:covet", + "tm:dazzlinggleam", + "tm:disarmingvoice", + "tm:doubleedge", + "tm:earthpower", + "tm:endeavor", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:flash", + "tm:gigadrain", + "tm:gigaimpact", + "tm:grassknot", + "tm:grassyglide", + "tm:grassyterrain", + "tm:headbutt", + "tm:healingwish", + "tm:hyperbeam", + "tm:laserfocus", + "tm:lastresort", + "tm:leafstorm", + "tm:magicalleaf", + "tm:naturalgift", + "tm:naturepower", + "tm:ominouswind", + "tm:petalblizzard", + "tm:playrough", + "tm:protect", + "tm:psychic", + "tm:psychup", + "tm:rest", + "tm:safeguard", + "tm:seedbomb", + "tm:sleeptalk", + "tm:solarbeam", + "tm:substitute", + "tm:sunnyday", + "tm:swift", + "tm:swordsdance", + "tm:synthesis", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:trailblaze", + "tm:worryseed", + "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" ], - "height": 4, - "weight": 52, - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "behaviour": { + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "shaymin sky=false", + "tier": 1 + }, + { + "pokemon": "shaymin sky", + "tier": 2 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "shaymin sky", + "tier": 1 + }, + { + "pokemon": "shaymin sky=false", + "tier": 2 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json b/common/src/main/resources/data/cobblemon/species/generation4/shellos.json deleted file mode 100644 index eb3aa2d4b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/shellos.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "name": "Shellos", - "nationalPokedexNumber": 422, - "primaryType": "water", - "abilities": [ - "stickyhold", - "stormdrain", - "h:sandforce" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:clay_ball", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:rindo_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 76, - "attack": 48, - "defence": 48, - "special_attack": 57, - "special_defence": 62, - "speed": 34 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 65, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "amorphous" - ], - "moves": [ - "1:mudslap", - "1:watergun", - "2:mudsport", - "4:harden", - "5:harden", - "7:waterpulse", - "10:recover", - "11:mudbomb", - "15:waterpulse", - "16:hiddenpower", - "20:ancientpower", - "22:raindance", - "25:bodyslam", - "29:bodyslam", - "31:muddywater", - "35:earthpower", - "37:muddywater", - "40:raindance", - "45:memento", - "46:recover", - "egg:acidarmor", - "egg:amnesia", - "egg:brine", - "egg:clearsmog", - "egg:counter", - "egg:curse", - "egg:fissure", - "egg:memento", - "egg:mirrorcoat", - "egg:mist", - "egg:sludge", - "egg:spitup", - "egg:stockpile", - "egg:swallow", - "egg:trumpcard", - "egg:yawn", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:captivate", - "tm:chillingwater", - "tm:confide", - "tm:curse", - "tm:dive", - "tm:doubleteam", - "tm:earthpower", - "tm:endure", - "tm:facade", - "tm:frustration", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:infestation", - "tm:liquidation", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:naturalgift", - "tm:painsplit", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:scald", - "tm:secretpower", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:stealthrock", - "tm:stoneedge", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:ancientpower", - "tutor:dive", - "tutor:earthpower", - "tutor:headbutt", - "tutor:icywind", - "tutor:mudslap", - "tutor:painsplit", - "tutor:secretpower", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stringshot", - "tutor:waterpulse", - "tutor:yawn" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.shellos.desc" - ], - "evolutions": [ - { - "id": "shellos_gastrodon", - "variant": "level_up", - "result": "gastrodon", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 30 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 63, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json deleted file mode 100644 index 8d7d9f992..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json +++ /dev/null @@ -1,210 +0,0 @@ -{ - "name": "Skorupi", - "nationalPokedexNumber": 451, - "primaryType": "poison", - "secondaryType": "bug", - "abilities": [ - "battlearmor", - "sniper", - "h:keeneye" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:poison_barb", - "percentage": 2.5 - }, - { - "item": "cobblemon:bluk_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 40, - "attack": 50, - "defence": 90, - "special_attack": 30, - "special_defence": 55, - "speed": 65 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 66, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "bug", - "water_3" - ], - "moves": [ - "1:bite", - "1:leer", - "1:poisonsting", - "3:honeclaws", - "5:knockoff", - "6:fellstinger", - "6:knockoff", - "9:pinmissile", - "9:poisonfang", - "12:bite", - "12:pinmissile", - "13:acupressure", - "15:toxicspikes", - "16:pursuit", - "17:acupressure", - "18:bugbite", - "20:bugbite", - "21:venoshock", - "23:poisonfang", - "23:scaryface", - "24:knockoff", - "27:scaryface", - "27:venoshock", - "28:toxicspikes", - "30:honeclaws", - "30:pinmissile", - "33:toxic", - "34:bugbite", - "34:toxicspikes", - "36:nightslash", - "38:nightslash", - "39:crosspoison", - "39:poisonfang", - "41:scaryface", - "42:xscissor", - "45:acupressure", - "45:crunch", - "45:honeclaws", - "47:fellstinger", - "48:crunch", - "49:crosspoison", - "50:crosspoison", - "50:venoshock", - "56:crunch", - "61:crosspoison", - "egg:agility", - "egg:confuseray", - "egg:feintattack", - "egg:irontail", - "egg:nightslash", - "egg:poisontail", - "egg:pursuit", - "egg:sandattack", - "egg:screech", - "egg:slash", - "egg:twineedle", - "egg:whirlwind", - "tm:aerialace", - "tm:agility", - "tm:assurance", - "tm:attract", - "tm:brickbreak", - "tm:bugbuzz", - "tm:captivate", - "tm:confide", - "tm:crosspoison", - "tm:crunch", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:doubleteam", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:flash", - "tm:fling", - "tm:frustration", - "tm:hiddenpower", - "tm:honeclaws", - "tm:infestation", - "tm:irontail", - "tm:naturalgift", - "tm:payback", - "tm:pinmissile", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:screech", - "tm:secretpower", - "tm:shadowball", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snore", - "tm:strength", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:toxicspikes", - "tm:venoshock", - "tm:xscissor", - "tutor:agility", - "tutor:aquatail", - "tutor:bite", - "tutor:bugbite", - "tutor:darkpulse", - "tutor:furycutter", - "tutor:headbutt", - "tutor:irontail", - "tutor:knockoff", - "tutor:mudslap", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snore" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.skorupi.desc" - ], - "evolutions": [ - { - "id": "skorupi_drapion", - "variant": "level_up", - "result": "drapion", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 40 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 8, - "weight": 120, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 5dd1e9a0e..36656930a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skuntank.json @@ -1,22 +1,27 @@ { - "name": "Skuntank", + "implemented": true, "nationalPokedexNumber": 435, + "name": "Skuntank", "primaryType": "poison", "secondaryType": "dark", + "maleRatio": 0.5, + "height": 10, + "weight": 380, + "pokedex": [ + "cobblemon.species.skuntank.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [], "abilities": [ "stench", "aftermath", "h:keeneye" ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:pecha_berry", - "percentage": 5.0 - } - ] - }, + "eggGroups": [ + "field" + ], "baseStats": { "hp": 103, "attack": 93, @@ -25,75 +30,72 @@ "special_defence": 61, "speed": 84 }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 2, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 168, "experienceGroup": "medium_fast", + "catchRate": 60, "eggCycles": 20, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:pecha_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:feint", - "1:flamethrower", - "1:focusenergy", - "1:poisongas", "1:scratch", - "1:screech", + "1:poisongas", "1:smokescreen", - "7:screech", - "9:acidspray", - "9:furyswipes", - "10:furyswipes", + "1:feint", + "1:slash", + "1:flamethrower", "12:furyswipes", - "13:smokescreen", - "14:smokescreen", - "15:feint", "15:focusenergy", "18:bite", - "18:feint", - "19:acidspray", - "20:toxic", - "21:bite", "21:venoshock", - "22:slash", "24:screech", - "25:slash", "27:toxic", "30:suckerpunch", - "31:nightslash", - "32:acidspray", "33:memento", - "34:flamethrower", - "37:venomdrench", "38:nightslash", - "39:suckerpunch", - "41:memento", - "41:nightslash", "43:belch", - "45:explosion", "48:explosion", - "48:venomdrench", - "51:memento", - "52:explosion", - "53:explosion", - "56:belch", - "61:explosion", + "egg:astonish", + "egg:doubleedge", + "egg:flameburst", + "egg:haze", + "egg:leer", + "egg:punishment", + "egg:pursuit", + "egg:slash", + "egg:smog", "tm:acidspray", "tm:assurance", - "tm:attract", "tm:bodyslam", "tm:burningjealousy", - "tm:captivate", - "tm:confide", + "tm:corrosivegas", "tm:crunch", "tm:cut", "tm:darkpulse", "tm:defog", "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:endeavor", "tm:endure", "tm:explosion", @@ -103,13 +105,13 @@ "tm:flamethrower", "tm:focusenergy", "tm:foulplay", - "tm:frustration", + "tm:furycutter", "tm:gigaimpact", "tm:gunkshot", "tm:haze", + "tm:headbutt", "tm:helpinghand", "tm:hex", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:incinerate", @@ -117,7 +119,6 @@ "tm:knockoff", "tm:lashout", "tm:nastyplot", - "tm:naturalgift", "tm:payback", "tm:playrough", "tm:poisonjab", @@ -125,13 +126,10 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:roar", "tm:rocksmash", - "tm:round", "tm:scaryface", "tm:screech", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", @@ -139,12 +137,11 @@ "tm:sludgewave", "tm:snarl", "tm:snatch", - "tm:snore", "tm:strength", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", "tm:superfang", - "tm:swagger", "tm:swift", "tm:tailslap", "tm:takedown", @@ -163,45 +160,65 @@ "tutor:corrosivegas", "tutor:darkpulse", "tutor:defog", + "tutor:endeavor", + "tutor:flamethrower", + "tutor:focusenergy", "tutor:foulplay", "tutor:furycutter", - "tutor:headbutt", + "tutor:gigaimpact", + "tutor:gunkshot", + "tutor:helpinghand", + "tutor:hyperbeam", "tutor:irontail", + "tutor:knockoff", "tutor:lashout", - "tutor:mudslap", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", "tutor:snatch", - "tutor:snore", "tutor:suckerpunch", + "tutor:superfang", "tutor:swift", - "tutor:throatchop" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.skuntank.desc" + "tutor:throatchop", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger" ], "preEvolution": "stunky", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 10, - "weight": 380, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "3" + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 51cdc3333..3195890e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/snover.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/snover.json @@ -1,19 +1,65 @@ { - "name": "Snover", + "implemented": true, "nationalPokedexNumber": 459, + "name": "Snover", "primaryType": "grass", "secondaryType": "ice", + "maleRatio": 0.5, + "height": 10, + "weight": 505, + "pokedex": [ + "cobblemon.species.snover.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [], "abilities": [ "snowwarning", "h:soundproof" ], + "eggGroups": [ + "monster", + "grass" + ], + "baseStats": { + "hp": 60, + "attack": 62, + "defence": 50, + "special_attack": 62, + "special_defence": 60, + "speed": 40 + }, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 67, + "experienceGroup": "slow", + "catchRate": 120, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { - "amount": 3, + "amount": 6, "entries": [ { "item": "minecraft:snowball", "quantityRange": "0-1" }, + { + "item": "minecraft:sweet_berries", + "quantityRange": "1-3" + }, { "item": "cobblemon:never_melt_ice", "percentage": 2.5 @@ -24,82 +70,45 @@ } ] }, - "baseStats": { - "hp": 60, - "attack": 62, - "defence": 50, - "special_attack": 62, - "special_defence": 60, - "speed": 40 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 67, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "monster", - "grass" - ], "moves": [ - "1:leer", "1:powdersnow", + "1:leer", + "1:grasswhistle", "5:leafage", - "5:razorleaf", - "9:icywind", "10:mist", - "13:grasswhistle", "15:iceshard", - "17:swagger", "20:razorleaf", - "21:mist", "25:icywind", - "26:iceshard", "30:swagger", - "31:ingrain", "35:ingrain", - "36:woodhammer", - "41:blizzard", "41:woodhammer", "45:blizzard", - "46:sheercold", "50:sheercold", - "egg:avalanche", - "egg:bulletseed", "egg:doubleedge", "egg:growth", "egg:leechseed", - "egg:magicalleaf", - "egg:mist", "egg:naturalgift", - "egg:seedbomb", "egg:skullbash", "egg:stomp", "egg:weatherball", - "tm:attract", "tm:avalanche", "tm:blizzard", "tm:bodyslam", "tm:bulletseed", - "tm:captivate", "tm:chillingwater", - "tm:confide", "tm:curse", "tm:doubleedge", - "tm:doubleteam", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", "tm:frostbreath", - "tm:frustration", "tm:gigadrain", "tm:grassknot", "tm:grassyglide", "tm:hail", + "tm:headbutt", "tm:helpinghand", - "tm:hiddenpower", "tm:icebeam", "tm:icepunch", "tm:icespinner", @@ -107,7 +116,6 @@ "tm:icywind", "tm:irontail", "tm:leafstorm", - "tm:lightscreen", "tm:magicalleaf", "tm:megapunch", "tm:mudslap", @@ -115,47 +123,52 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:return", - "tm:round", + "tm:roleplay", "tm:safeguard", - "tm:secretpower", "tm:seedbomb", - "tm:shadowball", "tm:sleeptalk", - "tm:snore", "tm:snowscape", "tm:solarbeam", "tm:substitute", "tm:swagger", "tm:swordsdance", + "tm:synthesis", "tm:takedown", "tm:terablast", - "tm:toxic", "tm:trailblaze", "tm:waterpulse", "tm:weatherball", - "tutor:avalanche", + "tm:worryseed", + "tutor:energyball", "tutor:gigadrain", "tutor:grassyglide", - "tutor:headbutt", + "tutor:helpinghand", + "tutor:icebeam", "tutor:icepunch", "tutor:icywind", "tutor:irontail", + "tutor:magicalleaf", "tutor:mudslap", - "tutor:razorleaf", + "tutor:rest", "tutor:roleplay", "tutor:seedbomb", "tutor:sleeptalk", - "tutor:snore", "tutor:synthesis", "tutor:waterpulse", - "tutor:worryseed" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.snover.desc" + "tutor:worryseed", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:lightscreen", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:shadowball", + "legacy:snore", + "legacy:toxic" ], "evolutions": [ { @@ -174,24 +187,35 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 10, - "weight": 505, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "snover", + "tier": 1 + }, + { + "pokemon": "abomasnow mega=false", + "tier": 2 + }, + { + "pokemon": "abomasnow mega", + "tier": 3 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 57307daca..90813e0f4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/stunky.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/stunky.json @@ -1,22 +1,27 @@ { - "name": "Stunky", + "implemented": true, "nationalPokedexNumber": 434, + "name": "Stunky", "primaryType": "poison", "secondaryType": "dark", + "maleRatio": 0.5, + "height": 4, + "weight": 192, + "pokedex": [ + "cobblemon.species.stunky.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [], "abilities": [ "stench", "aftermath", "h:keeneye" ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:pecha_berry", - "percentage": 2.5 - } - ] - }, + "eggGroups": [ + "field" + ], "baseStats": { "hp": 63, "attack": 63, @@ -25,87 +30,70 @@ "special_defence": 41, "speed": 74 }, - "catchRate": 225, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 1 + }, "baseExperienceYield": 66, "experienceGroup": "medium_fast", + "catchRate": 225, "eggCycles": 20, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:pecha_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:focusenergy", - "1:poisongas", "1:scratch", + "1:poisongas", "3:feint", - "3:poisongas", - "4:poisongas", "6:smokescreen", - "7:screech", "9:acidspray", - "9:furyswipes", - "10:furyswipes", "12:furyswipes", - "13:smokescreen", - "14:smokescreen", - "15:feint", "15:focusenergy", "18:bite", - "18:feint", - "19:acidspray", - "20:toxic", - "21:bite", "21:venoshock", - "22:slash", "24:screech", - "25:slash", "27:toxic", "30:suckerpunch", - "31:nightslash", - "32:acidspray", "33:memento", "36:nightslash", - "37:memento", - "37:nightslash", - "37:venomdrench", "39:belch", - "39:suckerpunch", "42:explosion", - "42:venomdrench", - "43:belch", - "43:memento", - "44:explosion", - "45:explosion", - "46:belch", - "49:explosion", "egg:astonish", - "egg:crunch", "egg:doubleedge", "egg:flameburst", - "egg:foulplay", "egg:haze", - "egg:irontail", "egg:leer", - "egg:playrough", "egg:punishment", "egg:pursuit", - "egg:scaryface", "egg:slash", "egg:smog", "tm:acidspray", "tm:assurance", - "tm:attract", "tm:bodyslam", - "tm:captivate", - "tm:confide", + "tm:corrosivegas", "tm:crunch", "tm:cut", "tm:darkpulse", "tm:defog", "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:endure", "tm:explosion", "tm:facade", @@ -113,19 +101,18 @@ "tm:flamethrower", "tm:focusenergy", "tm:foulplay", - "tm:frustration", + "tm:furycutter", "tm:gunkshot", "tm:haze", + "tm:headbutt", "tm:helpinghand", "tm:hex", - "tm:hiddenpower", "tm:honeclaws", "tm:incinerate", "tm:irontail", "tm:knockoff", "tm:lashout", "tm:nastyplot", - "tm:naturalgift", "tm:payback", "tm:playrough", "tm:poisonjab", @@ -133,13 +120,10 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:roar", "tm:rocksmash", - "tm:round", "tm:scaryface", "tm:screech", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", @@ -147,10 +131,9 @@ "tm:sludgewave", "tm:snarl", "tm:snatch", - "tm:snore", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:tailslap", "tm:takedown", @@ -168,25 +151,41 @@ "tutor:corrosivegas", "tutor:darkpulse", "tutor:defog", + "tutor:flamethrower", + "tutor:focusenergy", "tutor:foulplay", "tutor:furycutter", - "tutor:headbutt", + "tutor:gunkshot", + "tutor:helpinghand", "tutor:irontail", + "tutor:knockoff", "tutor:lashout", - "tutor:mudslap", - "tutor:screech", + "tutor:playrough", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", + "tutor:shadowball", + "tutor:shadowclaw", "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", "tutor:snatch", - "tutor:snore", "tutor:suckerpunch", "tutor:swift", - "tutor:throatchop" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.stunky.desc" + "tutor:throatchop", + "legacy:attract", + "legacy:captivate", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:mudslap", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger" ], "evolutions": [ { @@ -205,24 +204,27 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 4, - "weight": 192, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "skuntank", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json b/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json deleted file mode 100644 index 5530b0058..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/togekiss.json +++ /dev/null @@ -1,218 +0,0 @@ -{ - "name": "Togekiss", - "nationalPokedexNumber": 468, - "primaryType": "fairy", - "secondaryType": "flying", - "abilities": [ - "hustle", - "serenegrace", - "h:superluck" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:lucky_egg", - "percentage": 10.0 - }, - { - "item": "cobblemon:shiny_stone", - "percentage": 10.0 - }, - { - "item": "cobblemon:fairy_feather", - "percentage": 10.0 - } - ] - }, - "baseStats": { - "hp": 85, - "attack": 50, - "defence": 95, - "special_attack": 120, - "special_defence": 115, - "speed": 80 - }, - "catchRate": 30, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 273, - "experienceGroup": "fast", - "eggCycles": 10, - "eggGroups": [ - "flying", - "fairy" - ], - "moves": [ - "1:afteryou", - "1:airslash", - "1:ancientpower", - "1:aurasphere", - "1:batonpass", - "1:charm", - "1:doubleedge", - "1:extremespeed", - "1:fairywind", - "1:followme", - "1:growl", - "1:lastresort", - "1:lifedew", - "1:metronome", - "1:pound", - "1:safeguard", - "1:skyattack", - "1:sweetkiss", - "1:triattack", - "1:wish", - "1:yawn", - "tm:aerialace", - "tm:airslash", - "tm:allyswitch", - "tm:amnesia", - "tm:attract", - "tm:aurasphere", - "tm:batonpass", - "tm:bodyslam", - "tm:brickbreak", - "tm:captivate", - "tm:charm", - "tm:confide", - "tm:dazzlinggleam", - "tm:defog", - "tm:doubleteam", - "tm:drainingkiss", - "tm:drainpunch", - "tm:dreameater", - "tm:echoedvoice", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:fly", - "tm:focuspunch", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:imprison", - "tm:incinerate", - "tm:lightscreen", - "tm:magicalleaf", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mysticalfire", - "tm:nastyplot", - "tm:naturalgift", - "tm:playrough", - "tm:pluck", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rocksmash", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:shockwave", - "tm:silverwind", - "tm:sleeptalk", - "tm:smartstrike", - "tm:snore", - "tm:solarbeam", - "tm:steelwing", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:telekinesis", - "tm:thunderwave", - "tm:toxic", - "tm:triattack", - "tm:trick", - "tm:uproar", - "tm:waterpulse", - "tm:workup", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:aircutter", - "tutor:airslash", - "tutor:ancientpower", - "tutor:aurasphere", - "tutor:covet", - "tutor:defog", - "tutor:drainpunch", - "tutor:dualwingbeat", - "tutor:endeavor", - "tutor:extremespeed", - "tutor:focuspunch", - "tutor:headbutt", - "tutor:healbell", - "tutor:heatwave", - "tutor:hypervoice", - "tutor:laserfocus", - "tutor:lastresort", - "tutor:magiccoat", - "tutor:mudslap", - "tutor:ominouswind", - "tutor:present", - "tutor:rollout", - "tutor:roost", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skyattack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:swift", - "tutor:tailwind", - "tutor:telekinesis", - "tutor:trick", - "tutor:twister", - "tutor:waterpulse", - "tutor:zenheadbutt" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.togekiss.desc" - ], - "preEvolution": "togetic", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 1, - "speed": 0 - }, - "height": 15, - "weight": 380, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json b/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json deleted file mode 100644 index 5671e5f3d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation4/toxicroak.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "name": "Toxicroak", - "nationalPokedexNumber": 454, - "primaryType": "poison", - "secondaryType": "fighting", - "abilities": [ - "anticipation", - "dryskin", - "h:poisontouch" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:black_sludge", - "percentage": 5.0 - }, - { - "item": "cobblemon:payapa_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 83, - "attack": 106, - "defence": 65, - "special_attack": 86, - "special_defence": 65, - "speed": 85 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 172, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:astonish", - "1:mudslap", - "1:poisonsting", - "1:taunt", - "10:taunt", - "12:flatter", - "15:pursuit", - "16:lowkick", - "16:revenge", - "17:feintattack", - "20:venoshock", - "22:revenge", - "24:suckerpunch", - "24:swagger", - "28:swagger", - "29:mudbomb", - "31:suckerpunch", - "32:poisonjab", - "36:nastyplot", - "36:toxic", - "36:venoshock", - "41:nastyplot", - "41:poisonjab", - "42:nastyplot", - "48:sludgebomb", - "49:poisonjab", - "49:sludgebomb", - "54:belch", - "54:flatter", - "54:sludgebomb", - "58:belch", - "62:flatter", - "tm:acidspray", - "tm:aerialace", - "tm:assurance", - "tm:attract", - "tm:batonpass", - "tm:bounce", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:captivate", - "tm:chillingwater", - "tm:closecombat", - "tm:coaching", - "tm:confide", - "tm:crosspoison", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:doubleteam", - "tm:drainpunch", - "tm:earthquake", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:frustration", - "tm:gigaimpact", - "tm:gunkshot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icepunch", - "tm:icywind", - "tm:knockoff", - "tm:lashout", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:megapunch", - "tm:mudshot", - "tm:mudslap", - "tm:nastyplot", - "tm:naturalgift", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:revenge", - "tm:reversal", - "tm:rockclimb", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:screech", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snatch", - "tm:snore", - "tm:spite", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderpunch", - "tm:torment", - "tm:toxic", - "tm:upperhand", - "tm:vacuumwave", - "tm:venomdrench", - "tm:venoshock", - "tm:workup", - "tm:xscissor", - "tutor:bounce", - "tutor:coaching", - "tutor:corrosivegas", - "tutor:darkpulse", - "tutor:drainpunch", - "tutor:dualchop", - "tutor:focuspunch", - "tutor:foulplay", - "tutor:furycutter", - "tutor:gunkshot", - "tutor:headbutt", - "tutor:helpinghand", - "tutor:icepunch", - "tutor:icywind", - "tutor:knockoff", - "tutor:lashout", - "tutor:lowkick", - "tutor:mudslap", - "tutor:roleplay", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:suckerpunch", - "tutor:superfang", - "tutor:throatchop", - "tutor:thunderpunch", - "tutor:vacuumwave" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.toxicroak.desc" - ], - "preEvolution": "croagunk", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 444, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 8b011a415..47eefb5e2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/uxie.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/uxie.json @@ -1,9 +1,25 @@ { - "name": "Uxie", + "implemented": true, "nationalPokedexNumber": 480, + "name": "Uxie", "primaryType": "psychic", + "maleRatio": -1, + "height": 3, + "weight": 3, + "pokedex": [ + "cobblemon.species.uxie.desc" + ], + "labels": [ + "gen4", + "legendary" + ], + "aspects": [], "abilities": [ - "levitate" + "levitate", + "h:levitate" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 75, @@ -13,52 +29,49 @@ "special_defence": 130, "speed": 95 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 1, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 140, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:allyswitch", + "1:rest", "1:confusion", - "1:expandingforce", - "1:flail", + "1:snore", + "1:safeguard", "1:irontail", + "1:wonderroom", "1:magicroom", - "1:memento", "1:naturalgift", + "1:allyswitch", + "1:triattack", "1:psychocut", - "1:rest", + "1:expandingforce", "1:round", - "1:safeguard", - "1:snore", - "1:triattack", - "1:wonderroom", - "6:imprison", "7:swift", "14:endure", - "16:endure", "21:psybeam", - "21:swift", "28:imprison", - "31:yawn", "35:extrasensory", - "36:futuresight", "42:amnesia", - "46:amnesia", "49:psychic", - "50:extrasensory", - "51:extrasensory", "56:yawn", - "61:flail", "63:futuresight", - "66:naturalgift", "70:flail", - "76:memento", "77:memento", "84:mysticalpower", "tm:acrobatics", @@ -67,10 +80,8 @@ "tm:batonpass", "tm:calmmind", "tm:chargebeam", - "tm:confide", "tm:confuseray", "tm:dazzlinggleam", - "tm:doubleteam", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -83,19 +94,21 @@ "tm:flash", "tm:fling", "tm:foulplay", - "tm:frustration", "tm:futuresight", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:headbutt", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:icepunch", "tm:imprison", "tm:irontail", "tm:knockoff", + "tm:laserfocus", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:metronome", "tm:mudslap", @@ -103,6 +116,7 @@ "tm:naturalgift", "tm:painsplit", "tm:playrough", + "tm:powershift", "tm:poweruppunch", "tm:protect", "tm:psybeam", @@ -115,13 +129,13 @@ "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", + "tm:roleplay", "tm:round", "tm:safeguard", "tm:sandstorm", - "tm:secretpower", "tm:shadowball", "tm:shockwave", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", "tm:snore", @@ -130,7 +144,6 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:telekinesis", "tm:terablast", @@ -138,7 +151,6 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:triattack", "tm:trick", "tm:trickroom", @@ -147,18 +159,19 @@ "tm:wonderroom", "tm:zenheadbutt", "tutor:allyswitch", - "tutor:amnesia", - "tutor:confusion", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:drainpunch", + "tutor:energyball", "tutor:expandingforce", - "tutor:extrasensory", "tutor:firepunch", - "tutor:flail", "tutor:foulplay", - "tutor:futuresight", "tutor:gigadrain", - "tutor:headbutt", + "tutor:gigaimpact", "tutor:healbell", "tutor:helpinghand", + "tutor:hyperbeam", "tutor:icepunch", "tutor:irontail", "tutor:knockoff", @@ -166,8 +179,13 @@ "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", @@ -178,39 +196,58 @@ "tutor:stealthrock", "tutor:swift", "tutor:telekinesis", + "tutor:thunderbolt", "tutor:thunderpunch", "tutor:trick", "tutor:waterpulse", "tutor:wonderroom", - "tutor:yawn", - "tutor:zenheadbutt" - ], - "labels": [ - "gen4", - "legendary" - ], - "pokedex": [ - "cobblemon.species.uxie.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:secretpower", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 140, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 3, - "weight": 3, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "uxie", + "tier": 1 + }, + { + "pokemon": "mesprit", + "tier": 1 + }, + { + "pokemon": "azelf", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 c1ec3560d..b3a152ba3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/wormadam.json @@ -1,25 +1,28 @@ { - "name": "Wormadam", + "implemented": true, "nationalPokedexNumber": 413, + "name": "Wormadam", "primaryType": "bug", "secondaryType": "grass", + "maleRatio": 0, + "height": 5, + "weight": 65, + "pokedex": [ + "cobblemon.species.wormadam.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "plant-cloak" + ], "abilities": [ "anticipation", "h:overcoat" ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:occa_berry", - "percentage": 5.0 - } - ] - }, + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 60, "attack": 59, @@ -28,11 +31,6 @@ "special_defence": 105, "speed": 36 }, - "catchRate": 45, - "maleRatio": 0, - "shoulderMountable": false, - "baseExperienceYield": 148, - "baseFriendship": 70, "evYield": { "hp": 0, "attack": 0, @@ -41,20 +39,31 @@ "special_defence": 2, "speed": 0 }, + "baseExperienceYield": 148, "experienceGroup": "medium_fast", + "catchRate": 45, "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "0-2" + }, + { + "item": "cobblemon:occa_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:bugbite", + "1:tackle", "1:protect", - "1:quiverdance", + "1:bugbite", "1:suckerpunch", - "1:tackle", - "10:protect", - "15:bugbite", - "20:hiddenpower", + "1:quiverdance", + "20:stringshot", "23:confusion", "26:razorleaf", "29:growth", @@ -66,68 +75,87 @@ "47:leafstorm", "50:bugbuzz", "tm:attract", + "tm:bugbite", + "tm:bugbuzz", "tm:bulletseed", "tm:captivate", - "tm:confide", - "tm:doubleteam", + "tm:dig", "tm:dreameater", + "tm:dualwingbeat", + "tm:electroweb", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:flash", - "tm:frustration", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", - "tm:hiddenpower", + "tm:grassyglide", "tm:hyperbeam", "tm:infestation", - "tm:naturalgift", + "tm:leafstorm", "tm:protect", + "tm:psybeam", "tm:psychic", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", - "tm:secretpower", + "tm:seedbomb", "tm:shadowball", + "tm:signalbeam", + "tm:silverwind", "tm:skillswap", "tm:sleeptalk", "tm:solarbeam", + "tm:stringshot", "tm:strugglebug", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", + "tm:synthesis", + "tm:telekinesis", + "tm:terablast", "tm:thief", - "tm:toxic", + "tm:uproar", "tm:venoshock", - "tutor:allyswitch", + "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:snore", "tutor:stringshot", "tutor:suckerpunch", "tutor:synthesis", "tutor:telekinesis", "tutor:uproar", - "tutor:worryseed" - ], - "labels": [ - "gen4" - ], - "pokedex": [ - "cobblemon.species.wormadam.desc" + "tutor:worryseed", + "legacy:allyswitch", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "height": 5, - "weight": 65, "preEvolution": "burmy", "evolutions": [], "forms": [ @@ -135,9 +163,17 @@ "name": "Sandy", "primaryType": "bug", "secondaryType": "ground", - "abilities": [ - "anticipation", - "h:overcoat" + "maleRatio": 0, + "height": 5, + "weight": 65, + "pokedex": [ + "cobblemon.species.wormadam-sandy.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "sandy-cloak" ], "baseStats": { "hp": 60, @@ -147,10 +183,6 @@ "special_defence": 85, "speed": 36 }, - "catchRate": 45, - "maleRatio": 0, - "baseExperienceYield": 148, - "baseFriendship": 70, "evYield": { "hp": 0, "attack": 0, @@ -159,20 +191,13 @@ "special_defence": 0, "speed": 0 }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], "moves": [ - "1:bugbite", + "1:tackle", "1:protect", - "1:quiverdance", + "1:bugbite", "1:suckerpunch", - "1:tackle", - "10:protect", - "15:bugbite", - "20:hiddenpower", + "1:quiverdance", + "20:stringshot", "23:confusion", "26:rockblast", "29:harden", @@ -184,79 +209,107 @@ "47:fissure", "50:bugbuzz", "tm:attract", + "tm:bugbite", + "tm:bugbuzz", "tm:bulldoze", "tm:captivate", - "tm:confide", "tm:dig", - "tm:doubleteam", "tm:dreameater", + "tm:dualwingbeat", + "tm:earthpower", "tm:earthquake", + "tm:electroweb", + "tm:endeavor", "tm:endure", "tm:facade", "tm:flash", - "tm:frustration", + "tm:gigadrain", "tm:gigaimpact", - "tm:hiddenpower", "tm:hyperbeam", "tm:infestation", - "tm:naturalgift", + "tm:mudslap", "tm:protect", + "tm:psybeam", "tm:psychic", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", + "tm:rockblast", "tm:rocktomb", - "tm:round", + "tm:rollout", "tm:safeguard", "tm:sandstorm", - "tm:secretpower", "tm:shadowball", + "tm:signalbeam", + "tm:silverwind", "tm:skillswap", "tm:sleeptalk", + "tm:solarbeam", + "tm:stealthrock", + "tm:stringshot", "tm:strugglebug", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", + "tm:telekinesis", + "tm:terablast", "tm:thief", - "tm:toxic", + "tm:uproar", "tm:venoshock", - "tutor:allyswitch", "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:snore", "tutor:stealthrock", "tutor:stringshot", "tutor:suckerpunch", "tutor:telekinesis", - "tutor:uproar" + "tutor:uproar", + "legacy:allyswitch", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "labels": [ - "gen4" - ], - "aspects": [ - "sandy" - ], - "height": 5, - "weight": 65, "preEvolution": "burmy", - "cannotDynamax": false, + "evolutions": [], "battleOnly": false }, { "name": "Trash", "primaryType": "bug", "secondaryType": "steel", - "abilities": [ - "anticipation", - "h:overcoat" + "maleRatio": 0, + "height": 5, + "weight": 65, + "pokedex": [ + "cobblemon.species.wormadam-trash.desc" + ], + "labels": [ + "gen4" + ], + "aspects": [ + "trash-cloak" ], "baseStats": { "hp": 60, @@ -266,10 +319,6 @@ "special_defence": 95, "speed": 36 }, - "catchRate": 45, - "maleRatio": 0, - "baseExperienceYield": 148, - "baseFriendship": 70, "evYield": { "hp": 0, "attack": 0, @@ -278,23 +327,16 @@ "special_defence": 1, "speed": 0 }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], "moves": [ - "1:bugbite", - "1:metalburst", + "1:tackle", "1:protect", - "1:quiverdance", + "1:bugbite", + "1:mirrorshot", "1:suckerpunch", - "1:tackle", - "10:protect", - "15:bugbite", - "20:hiddenpower", + "1:quiverdance", + "1:metalburst", + "20:stringshot", "23:confusion", - "26:mirrorshot", "29:metalsound", "32:psybeam", "35:captivate", @@ -304,73 +346,108 @@ "47:ironhead", "50:bugbuzz", "tm:attract", + "tm:bugbite", + "tm:bugbuzz", "tm:captivate", - "tm:confide", - "tm:doubleteam", + "tm:dig", "tm:dreameater", + "tm:dualwingbeat", + "tm:electroweb", + "tm:endeavor", "tm:endure", "tm:facade", "tm:flash", "tm:flashcannon", - "tm:frustration", + "tm:gigadrain", "tm:gigaimpact", + "tm:gunkshot", "tm:gyroball", - "tm:hiddenpower", "tm:hyperbeam", "tm:infestation", - "tm:naturalgift", + "tm:irondefense", + "tm:ironhead", + "tm:magnetrise", + "tm:metalsound", "tm:protect", + "tm:psybeam", "tm:psychic", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", - "tm:secretpower", "tm:shadowball", + "tm:signalbeam", + "tm:silverwind", "tm:skillswap", "tm:sleeptalk", + "tm:solarbeam", "tm:stealthrock", + "tm:stringshot", "tm:strugglebug", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", + "tm:telekinesis", + "tm:terablast", "tm:thief", - "tm:toxic", + "tm:uproar", "tm:venoshock", - "tutor:allyswitch", "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:snore", "tutor:stealthrock", "tutor:stringshot", "tutor:suckerpunch", "tutor:telekinesis", - "tutor:uproar" - ], - "labels": [ - "gen4" - ], - "aspects": [ - "trash" + "tutor:uproar", + "legacy:allyswitch", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:naturalgift", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "height": 5, - "weight": 65, "preEvolution": "burmy", - "cannotDynamax": false, + "evolutions": [], "battleOnly": false } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "walk": { + "canWalk": false + }, + "swim": { + "avoidsWater": true + } + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json b/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json deleted file mode 100644 index 95be3a83a..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/accelgor.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "name": "Accelgor", - "nationalPokedexNumber": 617, - "primaryType": "bug", - "abilities": [ - "hydration", - "stickyhold", - "h:unburden" - ], - "baseStats": { - "hp": 80, - "attack": 70, - "defence": 40, - "special_attack": 100, - "special_defence": 60, - "speed": 145 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:absorb", - "1:acid", - "1:acidarmor", - "1:acidspray", - "1:bodyslam", - "1:curse", - "1:doubleteam", - "1:guardswap", - "1:leechlife", - "1:quickattack", - "1:watershuriken", - "1:yawn", - "12:megadrain", - "16:strugglebug", - "20:swift", - "24:agility", - "28:gigadrain", - "28:mefirst", - "32:powerswap", - "36:uturn", - "40:recover", - "44:bugbuzz", - "48:finalgambit", - "52:toxic", - "tm:agility", - "tm:attract", - "tm:batonpass", - "tm:bodyslam", - "tm:bugbuzz", - "tm:confide", - "tm:doubleteam", - "tm:drainpunch", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:focusblast", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:guardswap", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:infestation", - "tm:leechlife", - "tm:mudshot", - "tm:powerswap", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:sandstorm", - "tm:secretpower", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snore", - "tm:spikes", - "tm:strugglebug", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:toxic", - "tm:toxicspikes", - "tm:uturn", - "tm:venomdrench", - "tm:venoshock", - "tutor:bugbite", - "tutor:gastroacid", - "tutor:gigadrain", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:signalbeam", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snore" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.accelgor.desc" - ], - "preEvolution": "shelmet", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 8, - "weight": 253, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ 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 deleted file mode 100644 index d6b38a2c7..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/amoonguss.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "name": "Amoonguss", - "nationalPokedexNumber": 591, - "primaryType": "grass", - "secondaryType": "poison", - "abilities": [ - "effectspore", - "h:regenerator" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:red_mushroom", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:cheri_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 114, - "attack": 85, - "defence": 70, - "special_attack": 85, - "special_defence": 80, - "speed": 30 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 162, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:absorb", - "1:astonish", - "1:bide", - "1:growth", - "1:stunspore", - "12:megadrain", - "16:synthesis", - "20:clearsmog", - "20:feintattack", - "24:sweetscent", - "28:gigadrain", - "32:ingrain", - "36:toxic", - "42:ragepowder", - "48:solarbeam", - "54:spore", - "tm:attract", - "tm:bodyslam", - "tm:bulletseed", - "tm:confide", - "tm:doubleteam", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:hex", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:leafstorm", - "tm:magicalleaf", - "tm:naturepower", - "tm:payback", - "tm:pollenpuff", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snore", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:terablast", - "tm:toxic", - "tm:venoshock", - "tutor:afteryou", - "tutor:clearsmog", - "tutor:foulplay", - "tutor:gastroacid", - "tutor:gigadrain", - "tutor:protect", - "tutor:ragepowder", - "tutor:seedbomb", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spore", - "tutor:stompingtantrum", - "tutor:synthesis", - "tutor:worryseed" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.amoonguss.desc" - ], - "preEvolution": "foongus", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 105, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 ee4630b56..73bff1945 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/audino.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/audino.json @@ -1,25 +1,26 @@ { - "name": "Audino", + "implemented": true, "nationalPokedexNumber": 531, + "name": "Audino", "primaryType": "normal", + "maleRatio": 0.5, + "height": 11, + "weight": 310, + "pokedex": [ + "cobblemon.species.audino.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "healer", "regenerator", "h:klutz" ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:oran_berry", - "percentage": 10.0 - }, - { - "item": "cobblemon:fairy_feather", - "percentage": 10.0 - } - ] - }, + "eggGroups": [ + "fairy" + ], "baseStats": { "hp": 103, "attack": 60, @@ -28,74 +29,51 @@ "special_defence": 86, "speed": 50 }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "normal", - "secondaryType": "fairy", - "abilities": [ - "healer" - ], - "baseStats": { - "hp": 103, - "attack": 60, - "defence": 126, - "special_attack": 80, - "special_defence": 126, - "speed": 50 - }, - "catchRate": 255, - "maleRatio": 0.5, - "baseExperienceYield": 390, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "fairy" - ], - "labels": [ - "gen6", - "mega" - ], - "aspects": [ - "mega" - ], - "height": 15, - "weight": 320, - "cannotDynamax": false, - "battleOnly": true - } - ], + "evYield": { + "hp": 2, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 390, "experienceGroup": "fast", + "catchRate": 255, "eggCycles": 20, - "eggGroups": [ - "fairy" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:oran_berry", + "percentage": 5.0 + }, + { + "item": "cobblemon:fairy_feather", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:playnice", "1:pound", + "1:refresh", + "1:doubleslap", + "1:playnice", + "1:attract", + "1:secretpower", "4:disarmingvoice", "9:babydolleyes", - "9:refresh", "12:helpinghand", "16:growl", - "17:doubleslap", "20:zenheadbutt", - "21:attract", "24:lifedew", - "25:secretpower", "28:afteryou", "32:takedown", "36:simplebeam", @@ -105,28 +83,26 @@ "52:entrainment", "56:mistyterrain", "60:lastresort", - "egg:amnesia", "egg:bestow", - "egg:drainingkiss", - "egg:encore", - "egg:healbell", "egg:healingwish", "egg:luckychant", - "egg:sleeptalk", "egg:sweetkiss", "egg:wish", "egg:yawn", + "tm:afteryou", "tm:allyswitch", "tm:amnesia", "tm:attract", + "tm:babydolleyes", "tm:blizzard", "tm:bodyslam", "tm:calmmind", "tm:chargebeam", - "tm:confide", + "tm:covet", "tm:dazzlinggleam", "tm:dig", - "tm:doubleteam", + "tm:disarmingvoice", + "tm:doubleedge", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", @@ -139,11 +115,12 @@ "tm:flamethrower", "tm:flash", "tm:fling", - "tm:frustration", + "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", + "tm:gravity", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:hypervoice", "tm:icebeam", @@ -151,11 +128,16 @@ "tm:icywind", "tm:incinerate", "tm:irontail", + "tm:knockoff", + "tm:laserfocus", + "tm:lastresort", "tm:lightscreen", "tm:lowkick", + "tm:magiccoat", "tm:megakick", "tm:megapunch", "tm:mistyterrain", + "tm:painsplit", "tm:poweruppunch", "tm:protect", "tm:psychic", @@ -165,27 +147,27 @@ "tm:reflect", "tm:rest", "tm:retaliate", - "tm:return", - "tm:round", + "tm:roleplay", "tm:safeguard", "tm:secretpower", "tm:shadowball", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:snore", + "tm:snatch", "tm:solarbeam", "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:swagger", + "tm:takedown", "tm:telekinesis", + "tm:terablast", "tm:throatchop", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:trickroom", "tm:uproar", "tm:wildcharge", @@ -193,17 +175,22 @@ "tm:zenheadbutt", "tutor:afteryou", "tutor:allyswitch", + "tutor:babydolleyes", + "tutor:calmmind", + "tutor:chargebeam", "tutor:covet", - "tutor:doubleslap", + "tutor:dazzlinggleam", "tutor:drainpunch", - "tutor:encore", "tutor:firepunch", + "tutor:flamethrower", "tutor:focuspunch", + "tutor:gigaimpact", "tutor:gravity", "tutor:healbell", - "tutor:healpulse", "tutor:helpinghand", + "tutor:hyperbeam", "tutor:hypervoice", + "tutor:icebeam", "tutor:icepunch", "tutor:icywind", "tutor:irontail", @@ -213,50 +200,120 @@ "tutor:lowkick", "tutor:magiccoat", "tutor:painsplit", - "tutor:present", - "tutor:refresh", + "tutor:psychic", + "tutor:rest", "tutor:roleplay", + "tutor:shadowball", "tutor:signalbeam", - "tutor:simplebeam", "tutor:skillswap", "tutor:sleeptalk", "tutor:snatch", - "tutor:snore", "tutor:stompingtantrum", "tutor:telekinesis", "tutor:throatchop", "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:trickroom", "tutor:uproar", - "tutor:yawn", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.audino.desc" + "tutor:wildcharge", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "special:present" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 310, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Mega", + "primaryType": "normal", + "secondaryType": "fairy", + "maleRatio": 0.5, + "height": 15, + "weight": 320, + "pokedex": [ + "cobblemon.species.audino-mega.desc" + ], + "labels": [ + "gen6", + "mega" + ], + "aspects": [ + "mega" + ], + "abilities": [ + "healer", + "h:healer" + ], + "baseStats": { + "hp": 103, + "attack": 60, + "defence": 126, + "special_attack": 80, + "special_defence": 126, + "speed": 50 + }, + "baseExperienceYield": 425, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true, + "behaviour": { + "herd": { + "maxSize": "3", + "toleratedLeaders": [ + { + "pokemon": "audino mega", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } + } + ], + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "audino mega=false", + "tier": 1 + }, + { + "pokemon": "audino mega", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/axew.json b/common/src/main/resources/data/cobblemon/species/generation5/axew.json deleted file mode 100644 index 33e84a47b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/axew.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "name": "Axew", - "nationalPokedexNumber": 610, - "primaryType": "dragon", - "abilities": [ - "rivalry", - "moldbreaker", - "h:unnerve" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 2.5 - }, - { - "item": "cobblemon:haban_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 46, - "attack": 87, - "defence": 60, - "special_attack": 30, - "special_defence": 40, - "speed": 57 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 64, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "monster", - "dragon" - ], - "moves": [ - "1:leer", - "1:scratch", - "3:bite", - "6:falseswipe", - "9:assurance", - "10:dragonrage", - "12:taunt", - "15:slash", - "18:dragonclaw", - "21:scaryface", - "24:crunch", - "27:dragondance", - "30:breakingswipe", - "30:dualchop", - "33:focusenergy", - "33:laserfocus", - "36:dragonpulse", - "39:swordsdance", - "42:outrage", - "45:guillotine", - "48:gigaimpact", - "egg:aquatail", - "egg:counter", - "egg:dragonpulse", - "egg:endeavor", - "egg:endure", - "egg:firstimpression", - "egg:focusenergy", - "egg:harden", - "egg:irontail", - "egg:nightslash", - "egg:razorwind", - "egg:reversal", - "tm:aerialace", - "tm:assurance", - "tm:attract", - "tm:breakingswipe", - "tm:brickbreak", - "tm:bulldoze", - "tm:confide", - "tm:crunch", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusenergy", - "tm:frustration", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:honeclaws", - "tm:incinerate", - "tm:ironhead", - "tm:irontail", - "tm:outrage", - "tm:payback", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:roar", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaleshot", - "tm:scaryface", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:xscissor", - "tutor:aquatail", - "tutor:counter", - "tutor:dracometeor", - "tutor:dragonclaw", - "tutor:dragonpulse", - "tutor:dragonrage", - "tutor:dualchop", - "tutor:endeavor", - "tutor:endure", - "tutor:gigaimpact", - "tutor:irontail", - "tutor:nightslash", - "tutor:outrage", - "tutor:return", - "tutor:scaleshot", - "tutor:scratch", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:superpower" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.axew.desc" - ], - "evolutions": [ - { - "id": "axew_fraxure", - "variant": "level_up", - "result": "fraxure", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 38 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 180, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 77ace5a5f..09083b44c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/bisharp.json @@ -1,13 +1,54 @@ { - "name": "Bisharp", + "implemented": true, "nationalPokedexNumber": 625, + "name": "Bisharp", "primaryType": "dark", "secondaryType": "steel", + "maleRatio": 0.5, + "height": 16, + "weight": 700, + "pokedex": [ + "cobblemon.species.bisharp.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "defiant", "innerfocus", "h:pressure" ], + "eggGroups": [ + "human_like" + ], + "baseStats": { + "hp": 65, + "attack": 125, + "defence": 100, + "special_attack": 60, + "special_defence": 70, + "speed": 70 + }, + "evYield": { + "hp": 0, + "attack": 2, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 172, + "experienceGroup": "medium_fast", + "catchRate": 45, + "eggCycles": 20, + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 2, "entries": [ @@ -21,54 +62,39 @@ } ] }, - "baseStats": { - "hp": 65, - "attack": 125, - "defence": 100, - "special_attack": 60, - "special_defence": 70, - "speed": 70 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 172, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], "moves": [ - "1:furycutter", - "1:leer", "1:metalburst", - "1:metalclaw", "1:scratch", + "1:leer", + "1:furycutter", + "1:feintattack", + "1:metalclaw", "15:torment", - "17:feintattack", "20:scaryface", "25:assurance", "30:metalsound", "35:slash", "40:nightslash", - "41:embargo", "45:irondefense", - "50:laserfocus", "50:retaliate", "57:ironhead", "64:swordsdance", "71:guillotine", + "egg:feintattack", + "egg:headbutt", + "egg:meanlook", + "egg:pursuit", + "egg:quickguard", + "egg:suckerpunch", "tm:aerialace", "tm:airslash", "tm:assurance", - "tm:attract", "tm:beatup", "tm:brickbreak", - "tm:confide", "tm:cut", "tm:darkpulse", "tm:dig", - "tm:doubleteam", + "tm:dualchop", "tm:embargo", "tm:endure", "tm:facade", @@ -77,17 +103,19 @@ "tm:fling", "tm:focusblast", "tm:foulplay", - "tm:frustration", + "tm:furycutter", "tm:gigaimpact", "tm:grassknot", - "tm:hiddenpower", + "tm:headbutt", "tm:honeclaws", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", + "tm:laserfocus", "tm:lashout", "tm:lowkick", "tm:lowsweep", + "tm:magnetrise", "tm:metalclaw", "tm:metalsound", "tm:payback", @@ -98,27 +126,25 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:reversal", "tm:rockpolish", "tm:rocksmash", "tm:rocktomb", - "tm:round", + "tm:roleplay", "tm:sandstorm", "tm:scaryface", "tm:screech", - "tm:secretpower", "tm:shadowclaw", "tm:sleeptalk", "tm:snarl", - "tm:snore", + "tm:snatch", "tm:spite", "tm:stealthrock", "tm:steelbeam", "tm:stoneedge", "tm:substitute", - "tm:swagger", + "tm:suckerpunch", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -127,32 +153,50 @@ "tm:throatchop", "tm:thunderwave", "tm:torment", - "tm:toxic", "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:knockoff", "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:snore", "tutor:spite", "tutor:stealthrock", "tutor:steelbeam", - "tutor:throatchop" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.bisharp.desc" + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:xscissor", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:knockoff", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "preEvolution": "pawniard", "evolutions": [ @@ -167,30 +211,39 @@ "requirements": [ { "variant": "defeat", - "target": "bisharp held_item=cobblemon:leaders_crest", + "target": "bisharp held_item=cobblemon:kings_rock", "amount": 3 } ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 16, - "weight": 700, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "7", + "toleratedLeaders": [ + { + "pokemon": "bisharp", + "tier": 1 + }, + { + "pokemon": "kingambit", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json b/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json deleted file mode 100644 index 79d1ec3c0..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/blitzle.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "name": "Blitzle", - "nationalPokedexNumber": 522, - "primaryType": "electric", - "abilities": [ - "lightningrod", - "motordrive", - "h:sapsipper" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:leather", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:cheri_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 45, - "attack": 60, - "defence": 32, - "special_attack": 50, - "special_defence": 32, - "speed": 76 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 59, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:quickattack", - "4:tailwhip", - "8:charge", - "11:shockwave", - "15:thunderwave", - "18:flamecharge", - "22:pursuit", - "22:spark", - "25:stomp", - "29:discharge", - "33:agility", - "35:wildcharge", - "40:thrash", - "egg:doubleedge", - "egg:doublekick", - "egg:endure", - "egg:feint", - "egg:mefirst", - "egg:rage", - "egg:sandattack", - "egg:screech", - "egg:shockwave", - "egg:snatch", - "egg:takedown", - "tm:attract", - "tm:agility", - "tm:batonpass", - "tm:bodyslam", - "tm:charge", - "tm:chargebeam", - "tm:confide", - "tm:doubleedge", - "tm:doubleteam", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flamecharge", - "tm:flash", - "tm:frustration", - "tm:hiddenpower", - "tm:helpinghand", - "tm:lightscreen", - "tm:lowkick", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:smartstrike", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:bounce", - "tutor:lowkick", - "tutor:magnetrise", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.blitzle.desc" - ], - "evolutions": [ - { - "id": "blitzle_zebstrika", - "variant": "level_up", - "result": "zebstrika", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 27 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 8, - "weight": 298, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ 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 deleted file mode 100644 index 09f50fa78..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/braviary.json +++ /dev/null @@ -1,320 +0,0 @@ -{ - "name": "Braviary", - "nationalPokedexNumber": 628, - "primaryType": "normal", - "secondaryType": "flying", - "abilities": [ - "keeneye", - "sheerforce", - "h:defiant" - ], - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-2" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:sharp_beak", - "percentage": 2.5 - }, - { - "item": "cobblemon:razz_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 100, - "attack": 123, - "defence": 75, - "special_attack": 57, - "special_defence": 75, - "speed": 80 - }, - "features": [ - "hisuian" - ], - "catchRate": 60, - "maleRatio": 1, - "shoulderMountable": false, - "forms": [ - { - "name": "Hisui", - "primaryType": "psychic", - "secondaryType": "flying", - "abilities": [ - "keeneye", - "sheerforce", - "h:tintedlens" - ], - "baseStats": { - "hp": 110, - "attack": 83, - "defence": 70, - "special_attack": 112, - "special_defence": 70, - "speed": 65 - }, - "catchRate": 60, - "maleRatio": 1, - "baseExperienceYield": 179, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "flying" - ], - "moves": [ - "1:honeclaws", - "1:leer", - "1:peck", - "1:skyattack", - "1:superpower", - "1:wingattack", - "18:tailwind", - "24:scaryface", - "30:aerialace", - "36:slash", - "42:whirlwind", - "48:crushclaw", - "57:airslash", - "64:defog", - "72:thrash", - "80:hurricane", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:bodyslam", - "tm:bravebird", - "tm:bulkup", - "tm:calmmind", - "tm:closecombat", - "tm:confuseray", - "tm:dazzlinggleam", - "tm:doubleedge", - "tm:dualwingbeat", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:futuresight", - "tm:gigaimpact", - "tm:heatwave", - "tm:helpinghand", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icywind", - "tm:metalclaw", - "tm:nightshade", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:rest", - "tm:reversal", - "tm:rockslide", - "tm:rocktomb", - "tm:scaryface", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snarl", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:uturn", - "tm:vacuumwave", - "tm:zenheadbutt" - ], - "labels": [ - "gen8", - "hisui_regional" - ], - "aspects": [ - "hisuian" - ], - "height": 17, - "weight": 434, - "preEvolution": "rufflet", - "cannotDynamax": false, - "battleOnly": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-2" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:sharp_beak", - "percentage": 2.5 - }, - { - "item": "cobblemon:wepear_berry", - "percentage": 5.0 - } - ] - } - } - ], - "baseExperienceYield": 179, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "flying" - ], - "moves": [ - "1:furyattack", - "1:honeclaws", - "1:leer", - "1:peck", - "1:skyattack", - "1:superpower", - "1:wingattack", - "18:tailwind", - "24:scaryface", - "30:aerialace", - "36:slash", - "42:whirlwind", - "48:crushclaw", - "50:skydrop", - "57:airslash", - "64:defog", - "72:thrash", - "80:bravebird", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:assurance", - "tm:attract", - "tm:bodyslam", - "tm:bravebird", - "tm:bulkup", - "tm:closecombat", - "tm:confide", - "tm:cut", - "tm:doubleedge", - "tm:doubleteam", - "tm:dualwingbeat", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:frustration", - "tm:gigaimpact", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hurricane", - "tm:hyperbeam", - "tm:ironhead", - "tm:metalclaw", - "tm:pluck", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:reversal", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowclaw", - "tm:skydrop", - "tm:sleeptalk", - "tm:snore", - "tm:steelwing", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:uturn", - "tm:workup", - "tm:zenheadbutt", - "tutor:aerialace", - "tutor:defog", - "tutor:dualwingbeat", - "tutor:heatwave", - "tutor:honeclaws", - "tutor:laserfocus", - "tutor:roost", - "tutor:scaryface", - "tutor:skyattack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:superpower", - "tutor:tailwind", - "tutor:wingattack", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "unova_regional" - ], - "pokedex": [ - "cobblemon.species.braviary.desc" - ], - "preEvolution": "rufflet", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 410, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json b/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json deleted file mode 100644 index dc395ace5..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/cinccino.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "name": "Cinccino", - "nationalPokedexNumber": 573, - "primaryType": "normal", - "abilities": [ - "cutecharm", - "technician", - "h:skilllink" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:silk_scarf", - "percentage": 5.0 - }, - { - "item": "cobblemon:chesto_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 75, - "attack": 95, - "defence": 60, - "special_attack": 65, - "special_defence": 60, - "speed": 115 - }, - "catchRate": 60, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 165, - "experienceGroup": "fast", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:afteryou", - "1:babydolleyes", - "1:bulletseed", - "1:charm", - "1:echoedvoice", - "1:encore", - "1:helpinghand", - "1:hypervoice", - "1:lastresort", - "1:pound", - "1:rockblast", - "1:sing", - "1:slam", - "1:swift", - "1:tailslap", - "1:tickle", - "tm:alluringvoice", - "tm:attract", - "tm:batonpass", - "tm:bulletseed", - "tm:calmmind", - "tm:charm", - "tm:chillingwater", - "tm:confide", - "tm:dazzlinggleam", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:echoedvoice", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:gunkshot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icespinner", - "tm:irontail", - "tm:knockoff", - "tm:lightscreen", - "tm:mudslap", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rockblast", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:tailslap", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:tripleaxel", - "tm:uproar", - "tm:uturn", - "tm:workup", - "tutor:afteryou", - "tutor:aquatail", - "tutor:covet", - "tutor:gunkshot", - "tutor:helpinghand", - "tutor:hypervoice", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:lastresort", - "tutor:seedbomb", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:tripleaxel", - "tutor:uproar" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.cinccino.desc" - ], - "preEvolution": "minccino", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 5, - "weight": 75, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 0ea16925d..7d76ae6e4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/cobalion.json @@ -1,19 +1,27 @@ { - "name": "Cobalion", + "implemented": true, "nationalPokedexNumber": 638, + "name": "Cobalion", "primaryType": "steel", "secondaryType": "fighting", + "maleRatio": -1, + "height": 21, + "weight": 2500, + "pokedex": [ + "cobblemon.species.cobalion.desc" + ], + "labels": [ + "gen5", + "legendary" + ], + "aspects": [], "abilities": [ - "justified" + "justified", + "h:justified" + ], + "eggGroups": [ + "undiscovered" ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:metal_coat" - } - ] - }, "baseStats": { "hp": 91, "attack": 90, @@ -22,19 +30,37 @@ "special_defence": 72, "speed": 108 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 3, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:metal_coat" + } + ] + }, "moves": [ - "1:helpinghand", - "1:leer", "1:quickattack", + "1:leer", + "1:helpinghand", "1:workup", "7:metalclaw", "14:quickguard", @@ -49,6 +75,7 @@ "tm:aerialace", "tm:airslash", "tm:aurasphere", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:bounce", @@ -56,24 +83,22 @@ "tm:calmmind", "tm:closecombat", "tm:coaching", - "tm:confide", "tm:cut", "tm:doubleedge", - "tm:doubleteam", "tm:endure", "tm:facade", "tm:falseswipe", "tm:flashcannon", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:heavyslam", "tm:helpinghand", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", + "tm:laserfocus", + "tm:magnetrise", "tm:megahorn", "tm:metalclaw", "tm:metalsound", @@ -84,20 +109,16 @@ "tm:reflect", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:reversal", "tm:roar", "tm:rockpolish", "tm:rocksmash", - "tm:round", "tm:safeguard", "tm:sandstorm", "tm:scaryface", - "tm:secretpower", "tm:sleeptalk", "tm:smartstrike", - "tm:snore", "tm:stealthrock", "tm:steelbeam", "tm:stoneedge", @@ -105,64 +126,92 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:swift", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thunderwave", - "tm:toxic", "tm:upperhand", "tm:vacuumwave", "tm:voltswitch", "tm:workup", "tm:xscissor", "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:quickattack", - "tutor:quickguard", - "tutor:retaliate", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", "tutor:sleeptalk", - "tutor:snore", "tutor:stealthrock", "tutor:steelbeam", + "tutor:stoneedge", "tutor:superpower", - "tutor:workup", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "legendary" - ], - "pokedex": [ - "cobblemon.species.cobalion.desc" + "tutor:swift", + "tutor:vacuumwave", + "tutor:xscissor", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 21, - "weight": 2500, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "cobalion", + "tier": 1 + }, + { + "pokemon": "terrakion", + "tier": 1 + }, + { + "pokemon": "virizion", + "tier": 1 + }, + { + "pokemon": "keldeo resolute", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json b/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json deleted file mode 100644 index 07eb57238..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/drilbur.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "name": "Drilbur", - "nationalPokedexNumber": 529, - "primaryType": "ground", - "abilities": [ - "sandrush", - "sandforce", - "h:moldbreaker" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:soft_sand", - "percentage": 2.5 - }, - { - "item": "cobblemon:pinap_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 60, - "attack": 85, - "defence": 40, - "special_attack": 30, - "special_defence": 45, - "speed": 68 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 66, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:mudslap", - "1:mudsport", - "1:rapidspin", - "4:scratch", - "8:honeclaws", - "12:furyswipes", - "16:metalclaw", - "20:sandstorm", - "24:crushclaw", - "26:slash", - "28:rockslide", - "32:dig", - "36:swordsdance", - "40:drillrun", - "44:earthquake", - "48:fissure", - "egg:crushclaw", - "egg:earthpower", - "egg:irondefense", - "egg:metalsound", - "egg:rapidspin", - "egg:rockclimb", - "egg:skullbash", - "egg:slash", - "egg:submission", - "tm:aerialace", - "tm:attract", - "tm:brickbreak", - "tm:bulldoze", - "tm:confide", - "tm:curse", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:drillrun", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:frustration", - "tm:helpinghand", - "tm:hiddenpower", - "tm:highhorsepower", - "tm:honeclaws", - "tm:irondefense", - "tm:metalclaw", - "tm:metalsound", - "tm:mudshot", - "tm:mudslap", - "tm:poisonjab", - "tm:protect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:sandtomb", - "tm:scorchingsands", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snore", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:xscissor", - "tutor:drillrun", - "tutor:earthpower", - "tutor:irondefense", - "tutor:metalsound", - "tutor:rapidspin", - "tutor:rockclimb", - "tutor:scorchingsands", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stealthrock" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.drilbur.desc" - ], - "evolutions": [ - { - "id": "drilbur_excadrill", - "variant": "level_up", - "result": "excadrill", - "consumeHeldItem": false, - "learnableMoves": [ - "horndrill" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 31 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 85, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json b/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json deleted file mode 100644 index 24186af19..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/druddigon.json +++ /dev/null @@ -1,195 +0,0 @@ -{ - "name": "Druddigon", - "nationalPokedexNumber": 621, - "primaryType": "dragon", - "abilities": [ - "roughskin", - "sheerforce", - "h:moldbreaker" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 5.0 - }, - { - "item": "cobblemon:haban_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 77, - "attack": 120, - "defence": 90, - "special_attack": 60, - "special_defence": 90, - "speed": 48 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 170, - "experienceGroup": "medium_fast", - "eggCycles": 30, - "eggGroups": [ - "monster", - "dragon" - ], - "moves": [ - "1:leer", - "1:scratch", - "5:bite", - "10:dragontail", - "15:metalclaw", - "18:dragonrage", - "20:scaryface", - "25:slash", - "30:dragonclaw", - "31:chipaway", - "35:honeclaws", - "35:revenge", - "40:crunch", - "40:nightslash", - "45:ironhead", - "49:rockclimb", - "50:outrage", - "55:superpower", - "egg:crushclaw", - "egg:feintattack", - "egg:firefang", - "egg:glare", - "egg:irontail", - "egg:metalclaw", - "egg:nightslash", - "egg:poisontail", - "egg:pursuit", - "egg:snatch", - "egg:suckerpunch", - "egg:thunderfang", - "tm:aerialace", - "tm:attract", - "tm:bodyslam", - "tm:bulldoze", - "tm:chargebeam", - "tm:confide", - "tm:crunch", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:doubleteam", - "tm:dragonclaw", - "tm:dragonpulse", - "tm:dragontail", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:firepunch", - "tm:flamethrower", - "tm:flashcannon", - "tm:fling", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:gunkshot", - "tm:heatwave", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:incinerate", - "tm:ironhead", - "tm:irontail", - "tm:megapunch", - "tm:outrage", - "tm:payback", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:revenge", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:smackdown", - "tm:snarl", - "tm:snore", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:surf", - "tm:swagger", - "tm:taunt", - "tm:thunderfang", - "tm:thunderpunch", - "tm:torment", - "tm:toxic", - "tutor:aquatail", - "tutor:bite", - "tutor:darkpulse", - "tutor:dracometeor", - "tutor:dragonpulse", - "tutor:dualwingbeat", - "tutor:firefang", - "tutor:firepunch", - "tutor:gunkshot", - "tutor:heatwave", - "tutor:ironhead", - "tutor:irontail", - "tutor:lashout", - "tutor:leer", - "tutor:outrage", - "tutor:scaleshot", - "tutor:scratch", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:stealthrock", - "tutor:stompingtantrum", - "tutor:suckerpunch", - "tutor:superpower", - "tutor:thunderpunch" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.druddigon.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 16, - "weight": 1390, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ 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 deleted file mode 100644 index f1d8903a3..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/ducklett.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "name": "Ducklett", - "nationalPokedexNumber": 580, - "primaryType": "water", - "secondaryType": "flying", - "abilities": [ - "keeneye", - "bigpecks", - "h:hydration" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-1" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:wacan_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 62, - "attack": 44, - "defence": 50, - "special_attack": 44, - "special_defence": 50, - "speed": 55 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "flying" - ], - "moves": [ - "1:watergun", - "3:watersport", - "6:defog", - "9:wingattack", - "13:waterpulse", - "15:aerialace", - "19:bubblebeam", - "21:featherdance", - "24:aquaring", - "27:airslash", - "30:roost", - "34:raindance", - "37:tailwind", - "41:bravebird", - "46:hurricane", - "egg:aircutter", - "egg:aquajet", - "egg:brine", - "egg:dive", - "egg:endeavor", - "egg:gust", - "egg:luckychant", - "egg:mefirst", - "egg:mirrormove", - "egg:mudsport", - "egg:steelwing", - "tm:aerialace", - "tm:attract", - "tm:aircutter", - "tm:airslash", - "tm:bravebird", - "tm:chillingwater", - "tm:confide", - "tm:disarmingvoice", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:frustration", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hurricane", - "tm:icebeam", - "tm:icywind", - "tm:liquidation", - "tm:pluck", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roost", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:sleeptalk", - "tm:steelwing", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:waterpulse", - "tm:whirlpool", - "tutor:brine", - "tutor:defog", - "tutor:endeavor", - "tutor:icywind", - "tutor:liquidation", - "tutor:mefirst", - "tutor:roost", - "tutor:sleeptalk", - "tutor:snore", - "tutor:tailwind", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.ducklett.desc" - ], - "evolutions": [ - { - "id": "ducklett_swanna", - "variant": "level_up", - "result": "swanna", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 35 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 55, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json b/common/src/main/resources/data/cobblemon/species/generation5/duosion.json deleted file mode 100644 index 4f38206c5..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/duosion.json +++ /dev/null @@ -1,194 +0,0 @@ -{ - "name": "Duosion", - "nationalPokedexNumber": 578, - "primaryType": "psychic", - "abilities": [ - "overcoat", - "magicguard", - "h:regenerator" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:persim_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 65, - "attack": 40, - "defence": 50, - "special_attack": 125, - "special_defence": 60, - "speed": 30 - }, - "catchRate": 100, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 130, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:confusion", - "1:endeavor", - "1:protect", - "1:psywave", - "1:recover", - "1:rollout", - "1:snatch", - "12:psybeam", - "14:hiddenpower", - "16:charm", - "20:psyshock", - "24:lightscreen", - "24:reflect", - "28:allyswitch", - "35:painsplit", - "40:psychic", - "46:skillswap", - "50:healblock", - "52:futuresight", - "58:wonderroom", - "tm:allyswitch", - "tm:attract", - "tm:calmmind", - "tm:charm", - "tm:confide", - "tm:confuseray", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:explosion", - "tm:facade", - "tm:flash", - "tm:flashcannon", - "tm:frustration", - "tm:futuresight", - "tm:gravity", - "tm:guardswap", - "tm:gyroball", - "tm:helpinghand", - "tm:hiddenpower", - "tm:imprison", - "tm:infestation", - "tm:irondefense", - "tm:lightscreen", - "tm:nightshade", - "tm:painsplit", - "tm:powerswap", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderwave", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:allyswitch", - "tutor:endeavor", - "tutor:expandingforce", - "tutor:gravity", - "tutor:helpinghand", - "tutor:imprison", - "tutor:irondefense", - "tutor:magiccoat", - "tutor:painsplit", - "tutor:recover", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:steelroller", - "tutor:telekinesis", - "tutor:trick", - "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.duosion.desc" - ], - "preEvolution": "solosis", - "evolutions": [ - { - "id": "duosion_reuniclus", - "variant": "level_up", - "result": "reuniclus", - "consumeHeldItem": false, - "learnableMoves": [ - "hammerarm" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 41 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 80, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json deleted file mode 100644 index 7af102cfc..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "name": "Eelektrik", - "nationalPokedexNumber": 603, - "primaryType": "electric", - "abilities": [ - "levitate" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-2" - } - ] - }, - "baseStats": { - "hp": 65, - "attack": 85, - "defence": 70, - "special_attack": 75, - "special_defence": 70, - "speed": 40 - }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 142, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:chargebeam", - "1:crunch", - "1:headbutt", - "1:spark", - "1:thunderwave", - "9:bind", - "19:acid", - "29:discharge", - "44:thunderbolt", - "49:acidspray", - "54:coil", - "59:wildcharge", - "64:gastroacid", - "69:zapcannon", - "74:thrash", - "tm:acidspray", - "tm:acrobatics", - "tm:attract", - "tm:bodyslam", - "tm:charge", - "tm:chargebeam", - "tm:confide", - "tm:crunch", - "tm:doubleteam", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:flashcannon", - "tm:frustration", - "tm:gigadrain", - "tm:hiddenpower", - "tm:knockoff", - "tm:lightscreen", - "tm:lunge", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:sleeptalk", - "tm:substitute", - "tm:superfang", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderwave", - "tm:toxic", - "tm:uturn", - "tm:voltswitch", - "tm:wildcharge", - "tutor:aquatail", - "tutor:bind", - "tutor:bounce", - "tutor:gastroacid", - "tutor:gigadrain", - "tutor:irontail", - "tutor:knockoff", - "tutor:magnetrise", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:superfang", - "tutor:throatchop" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.eelektrik.desc" - ], - "preEvolution": "tynamo", - "evolutions": [ - { - "id": "eelektrik_eelektross", - "variant": "item_interact", - "result": "eelektross", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "cobblemon:thunder_stone" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 12, - "weight": 220, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json deleted file mode 100644 index c4000df14..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "name": "Eelektross", - "nationalPokedexNumber": 604, - "primaryType": "electric", - "abilities": [ - "levitate" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-3" - } - ] - }, - "baseStats": { - "hp": 85, - "attack": 115, - "defence": 80, - "special_attack": 105, - "special_defence": 80, - "speed": 50 - }, - "catchRate": 30, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 232, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:acid", - "1:coil", - "1:crunch", - "1:crushclaw", - "1:discharge", - "1:gastroacid", - "1:headbutt", - "1:iondeluge", - "1:thrash", - "1:zapcannon", - "5:wildcharge", - "tm:acidspray", - "tm:acrobatics", - "tm:attract", - "tm:bodypress", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:charge", - "tm:chargebeam", - "tm:closecombat", - "tm:confide", - "tm:confuseray", - "tm:crunch", - "tm:cut", - "tm:doubleteam", - "tm:dragonclaw", - "tm:dragonpulse", - "tm:dragontail", - "tm:drainpunch", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:firepunch", - "tm:flamethrower", - "tm:flash", - "tm:flashcannon", - "tm:focuspunch", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:heavyslam", - "tm:hex", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:knockoff", - "tm:lightscreen", - "tm:liquidation", - "tm:lunge", - "tm:outrage", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:superfang", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:uturn", - "tm:voltswitch", - "tm:wildcharge", - "tm:zenheadbutt", - "tutor:aquatail", - "tutor:bind", - "tutor:bounce", - "tutor:dragonpulse", - "tutor:drainpunch", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:gastroacid", - "tutor:gigadrain", - "tutor:irontail", - "tutor:knockoff", - "tutor:magnetrise", - "tutor:outrage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:superfang", - "tutor:superpower", - "tutor:throatchop", - "tutor:thunderpunch" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.eelektross.desc" - ], - "preEvolution": "eelektrik", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 21, - "weight": 805, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ 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 deleted file mode 100644 index dcb2cdfe7..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/escavalier.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "name": "Escavalier", - "nationalPokedexNumber": 589, - "primaryType": "bug", - "secondaryType": "steel", - "abilities": [ - "swarm", - "shellarmor", - "h:overcoat" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:iron_helmet", - "percentage": 5.0 - }, - { - "item": "cobblemon:occa_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 70, - "attack": 135, - "defence": 105, - "special_attack": 60, - "special_defence": 105, - "speed": 20 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:doubleedge", - "1:endure", - "1:fellstinger", - "1:flail", - "1:furycutter", - "1:leer", - "1:peck", - "1:quickguard", - "1:scaryface", - "1:takedown", - "1:twineedle", - "12:falseswipe", - "16:acidspray", - "16:furyattack", - "20:headbutt", - "24:reversal", - "28:irondefense", - "32:slash", - "32:xscissor", - "36:swordsdance", - "40:ironhead", - "44:bugbuzz", - "48:gigaimpact", - "52:metalburst", - "tm:aerialace", - "tm:agility", - "tm:attract", - "tm:brutalswing", - "tm:bugbuzz", - "tm:closecombat", - "tm:confide", - "tm:cut", - "tm:doubleteam", - "tm:drillrun", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:focusblast", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:infestation", - "tm:irondefense", - "tm:ironhead", - "tm:megahorn", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:razorshell", - "tm:rest", - "tm:return", - "tm:revenge", - "tm:reversal", - "tm:rocksmash", - "tm:round", - "tm:scaryface", - "tm:screech", - "tm:secretpower", - "tm:sleeptalk", - "tm:smartstrike", - "tm:snore", - "tm:strugglebug", - "tm:substitute", - "tm:swagger", - "tm:swordsdance", - "tm:taunt", - "tm:toxic", - "tm:xscissor", - "tutor:bugbite", - "tutor:drillrun", - "tutor:gigadrain", - "tutor:irondefense", - "tutor:ironhead", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:steelbeam" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.escavalier.desc" - ], - "preEvolution": "karrablast", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 10, - "weight": 330, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json b/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json deleted file mode 100644 index 1d52dce8c..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/excadrill.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "name": "Excadrill", - "nationalPokedexNumber": 530, - "primaryType": "ground", - "secondaryType": "steel", - "abilities": [ - "sandrush", - "sandforce", - "h:moldbreaker" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:soft_sand", - "percentage": 5.0 - }, - { - "item": "cobblemon:pinap_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 110, - "attack": 135, - "defence": 60, - "special_attack": 50, - "special_defence": 65, - "speed": 88 - }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 178, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:honeclaws", - "1:horndrill", - "1:mudslap", - "1:mudsport", - "1:rapidspin", - "1:rototiller", - "1:scratch", - "12:furyswipes", - "16:metalclaw", - "20:sandstorm", - "24:crushclaw", - "26:slash", - "28:rockslide", - "34:dig", - "40:swordsdance", - "46:drillrun", - "52:earthquake", - "58:fissure", - "tm:aerialace", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:confide", - "tm:curse", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:drillrun", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hiddenpower", - "tm:highhorsepower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:irondefense", - "tm:ironhead", - "tm:metalclaw", - "tm:metalsound", - "tm:mudshot", - "tm:mudslap", - "tm:poisonjab", - "tm:protect", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaryface", - "tm:scorchingsands", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:smartstrike", - "tm:snore", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:toxic", - "tm:xscissor", - "tutor:drillrun", - "tutor:earthpower", - "tutor:irondefense", - "tutor:ironhead", - "tutor:magnetrise", - "tutor:scorchingsands", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stealthrock", - "tutor:steelbeam", - "tutor:stompingtantrum" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.excadrill.desc" - ], - "preEvolution": "drilbur", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 7, - "weight": 404, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json b/common/src/main/resources/data/cobblemon/species/generation5/foongus.json deleted file mode 100644 index 53d754839..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/foongus.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "name": "Foongus", - "nationalPokedexNumber": 590, - "primaryType": "grass", - "secondaryType": "poison", - "abilities": [ - "effectspore", - "h:regenerator" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:red_mushroom", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:cheri_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 69, - "attack": 55, - "defence": 45, - "special_attack": 55, - "special_defence": 55, - "speed": 15 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 59, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:absorb", - "1:astonish", - "4:growth", - "8:stunspore", - "12:bide", - "12:megadrain", - "16:synthesis", - "20:clearsmog", - "20:feintattack", - "24:sweetscent", - "28:gigadrain", - "32:ingrain", - "36:toxic", - "40:ragepowder", - "44:solarbeam", - "48:spore", - "egg:bodyslam", - "egg:defensecurl", - "egg:endure", - "egg:gastroacid", - "egg:growth", - "egg:poisonpowder", - "egg:rollout", - "egg:stunspore", - "egg:worryseed", - "tm:attract", - "tm:bodyslam", - "tm:bulletseed", - "tm:confide", - "tm:doubleteam", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:frustration", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:hiddenpower", - "tm:leafstorm", - "tm:magicalleaf", - "tm:naturepower", - "tm:payback", - "tm:pollenpuff", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snore", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:terablast", - "tm:toxic", - "tm:venoshock", - "tutor:afteryou", - "tutor:foulplay", - "tutor:gastroacid", - "tutor:gigadrain", - "tutor:seedbomb", - "tutor:sleeptalk", - "tutor:snore", - "tutor:synthesis", - "tutor:worryseed" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.foongus.desc" - ], - "evolutions": [ - { - "id": "foongus_amoonguss", - "variant": "level_up", - "result": "amoonguss", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 39 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 2, - "weight": 10, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json b/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json deleted file mode 100644 index cafee2f54..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/fraxure.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "name": "Fraxure", - "nationalPokedexNumber": 611, - "primaryType": "dragon", - "abilities": [ - "rivalry", - "moldbreaker", - "h:unnerve" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 5.0 - }, - { - "item": "cobblemon:haban_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 66, - "attack": 117, - "defence": 70, - "special_attack": 40, - "special_defence": 50, - "speed": 67 - }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 144, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "monster", - "dragon" - ], - "moves": [ - "1:bite", - "1:dragonrage", - "1:falseswipe", - "1:leer", - "1:scratch", - "9:assurance", - "12:taunt", - "15:slash", - "18:dragonclaw", - "21:scaryface", - "24:crunch", - "27:dragondance", - "30:breakingswipe", - "30:dualchop", - "33:focusenergy", - "33:laserfocus", - "36:dragonpulse", - "41:swordsdance", - "46:outrage", - "51:guillotine", - "56:gigaimpact", - "tm:aerialace", - "tm:assurance", - "tm:attract", - "tm:breakingswipe", - "tm:brickbreak", - "tm:bulldoze", - "tm:confide", - "tm:crunch", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusenergy", - "tm:frustration", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:honeclaws", - "tm:incinerate", - "tm:ironhead", - "tm:irontail", - "tm:lowkick", - "tm:outrage", - "tm:payback", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:roar", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaleshot", - "tm:scaryface", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:xscissor", - "tutor:aquatail", - "tutor:dracometeor", - "tutor:dragonpulse", - "tutor:dualchop", - "tutor:endeavor", - "tutor:irontail", - "tutor:lowkick", - "tutor:outrage", - "tutor:scaleshot", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:superpower" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.fraxure.desc" - ], - "preEvolution": "axew", - "evolutions": [ - { - "id": "fraxure_haxorus", - "variant": "level_up", - "result": "haxorus", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 48 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 10, - "weight": 360, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json b/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json deleted file mode 100644 index d6d842945..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/garbodor.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "name": "Garbodor", - "nationalPokedexNumber": 569, - "primaryType": "poison", - "abilities": [ - "stench", - "weakarmor", - "h:aftermath" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "cobblemon:black_sludge", - "percentage": 5.0 - }, - { - "item": "cobblemon:leftovers", - "percentage": 5.0 - }, - { - "item": "cobblemon:silk_scarf", - "percentage": 5.0 - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 80, - "attack": 95, - "defence": 82, - "special_attack": 60, - "special_defence": 82, - "speed": 75 - }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "poison", - "abilities": [ - "stench", - "weakarmor", - "h:aftermath" - ], - "baseStats": { - "hp": 80, - "attack": 95, - "defence": 82, - "special_attack": 60, - "special_defence": 82, - "speed": 75 - }, - "catchRate": 60, - "maleRatio": 0.5, - "baseExperienceYield": 166, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "mineral" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 210, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "mineral" - ], - "moves": [ - "1:acidspray", - "1:metalclaw", - "1:poisongas", - "1:pound", - "1:recycle", - "1:takedown", - "9:amnesia", - "12:clearsmog", - "14:doubleslap", - "15:toxicspikes", - "18:sludge", - "21:stockpile", - "21:swallow", - "24:bodyslam", - "27:sludgebomb", - "30:toxic", - "33:belch", - "39:painsplit", - "43:gunkshot", - "48:explosion", - "tm:amnesia", - "tm:attract", - "tm:bodypress", - "tm:bodyslam", - "tm:confide", - "tm:crosspoison", - "tm:darkpulse", - "tm:doubleteam", - "tm:drainpunch", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:fling", - "tm:focusblast", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gunkshot", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:infestation", - "tm:payback", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:rockpolish", - "tm:round", - "tm:screech", - "tm:secretpower", - "tm:seedbomb", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:snore", - "tm:solarbeam", - "tm:spikes", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:thief", - "tm:thunderbolt", - "tm:toxic", - "tm:toxicspikes", - "tm:venomdrench", - "tm:venoshock", - "tutor:corrosivegas", - "tutor:darkpulse", - "tutor:drainpunch", - "tutor:gigadrain", - "tutor:gunkshot", - "tutor:painsplit", - "tutor:recycle", - "tutor:seedbomb", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spite", - "tutor:stompingtantrum" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.garbodor.desc" - ], - "preEvolution": "trubbish", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 19, - "weight": 1073, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 cf4e8507c..ca3fe5c2a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/genesect.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/genesect.json @@ -1,10 +1,26 @@ { - "name": "Genesect", + "implemented": true, "nationalPokedexNumber": 649, + "name": "Genesect", "primaryType": "bug", "secondaryType": "steel", + "maleRatio": -1, + "height": 15, + "weight": 825, + "pokedex": [ + "cobblemon.species.genesect.desc" + ], + "labels": [ + "gen5", + "mythical" + ], + "aspects": [], "abilities": [ - "download" + "download", + "h:download" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 71, @@ -14,215 +30,40 @@ "special_defence": 95, "speed": 99 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Douse", - "primaryType": "bug", - "secondaryType": "steel", - "abilities": [ - "download" - ], - "baseStats": { - "hp": 71, - "attack": 120, - "defence": 95, - "special_attack": 120, - "special_defence": 95, - "speed": 99 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen5", - "mythical", - "legendary" - ], - "aspects": [ - "douse" - ], - "height": 15, - "weight": 825, - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Shock", - "primaryType": "bug", - "secondaryType": "steel", - "abilities": [ - "download" - ], - "baseStats": { - "hp": 71, - "attack": 120, - "defence": 95, - "special_attack": 120, - "special_defence": 95, - "speed": 99 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen5", - "mythical", - "legendary" - ], - "aspects": [ - "shock" - ], - "height": 15, - "weight": 825, - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Burn", - "primaryType": "bug", - "secondaryType": "steel", - "abilities": [ - "download" - ], - "baseStats": { - "hp": 71, - "attack": 120, - "defence": 95, - "special_attack": 120, - "special_defence": 95, - "speed": 99 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen5", - "mythical", - "legendary" - ], - "aspects": [ - "burn" - ], - "height": 15, - "weight": 825, - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Chill", - "primaryType": "bug", - "secondaryType": "steel", - "abilities": [ - "download" - ], - "baseStats": { - "hp": 71, - "attack": 120, - "defence": 95, - "special_attack": 120, - "special_defence": 95, - "speed": 99 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen5", - "mythical", - "legendary" - ], - "aspects": [ - "chill" - ], - "height": 15, - "weight": 825, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 1 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:furycutter", "1:quickattack", + "1:furycutter", + "1:magnetbomb", + "1:slash", "7:screech", "14:metalclaw", "21:fellstinger", - "22:magnetbomb", "28:flamecharge", - "29:slash", "35:metalsound", - "40:signalbeam", "42:xscissor", - "44:triattack", "49:magnetrise", "56:bugbuzz", "63:simplebeam", "70:zapcannon", - "73:hyperbeam", "77:lockon", "84:technoblast", "91:selfdestruct", @@ -231,11 +72,10 @@ "tm:assurance", "tm:blazekick", "tm:blizzard", + "tm:bugbite", "tm:bugbuzz", "tm:chargebeam", - "tm:confide", "tm:darkpulse", - "tm:doubleteam", "tm:electroweb", "tm:endure", "tm:energyball", @@ -246,102 +86,215 @@ "tm:flash", "tm:flashcannon", "tm:fly", - "tm:frustration", + "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", + "tm:gravity", "tm:gunkshot", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:icebeam", "tm:infestation", "tm:irondefense", "tm:ironhead", + "tm:lastresort", "tm:leechlife", "tm:lightscreen", + "tm:magiccoat", + "tm:magnetrise", + "tm:metalclaw", + "tm:metalsound", "tm:protect", "tm:psychic", + "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", "tm:rockpolish", - "tm:round", "tm:screech", - "tm:secretpower", "tm:selfdestruct", "tm:shadowclaw", + "tm:shockwave", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", + "tm:steelbeam", "tm:strugglebug", "tm:substitute", - "tm:swagger", "tm:swift", + "tm:telekinesis", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:triattack", "tm:uturn", "tm:xscissor", "tm:zenheadbutt", + "tutor:aerialace", "tutor:allyswitch", - "tutor:blazekick", "tutor:bugbite", + "tutor:chargebeam", "tutor:darkpulse", "tutor:electroweb", - "tutor:extremespeed", - "tutor:fellstinger", + "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:magnetbomb", "tutor:magnetrise", - "tutor:metalclaw", + "tutor:psychic", "tutor:recycle", - "tutor:shiftgear", + "tutor:rest", + "tutor:shadowclaw", "tutor:shockwave", "tutor:signalbeam", "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", "tutor:steelbeam", - "tutor:technoblast", + "tutor:swift", "tutor:telekinesis", + "tutor:thunderbolt", "tutor:xscissor", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.genesect.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "special:extremespeed", + "special:shiftgear" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 + "forms": [ + { + "name": "Douse", + "primaryType": "bug", + "secondaryType": "steel", + "maleRatio": -1, + "height": 15, + "weight": 825, + "pokedex": [ + "cobblemon.species.genesect-douse.desc" + ], + "labels": [ + "gen5", + "mythical" + ], + "aspects": [ + "douse-drive" + ], + "evolutions": [], + "battleOnly": false + }, + { + "name": "Shock", + "primaryType": "bug", + "secondaryType": "steel", + "maleRatio": -1, + "height": 15, + "weight": 825, + "pokedex": [ + "cobblemon.species.genesect-shock.desc" + ], + "labels": [ + "gen5", + "mythical" + ], + "aspects": [ + "shock-drive" + ], + "evolutions": [], + "battleOnly": false + }, + { + "name": "Burn", + "primaryType": "bug", + "secondaryType": "steel", + "maleRatio": -1, + "height": 15, + "weight": 825, + "pokedex": [ + "cobblemon.species.genesect-burn.desc" + ], + "labels": [ + "gen5", + "mythical" + ], + "aspects": [ + "burn-drive" + ], + "evolutions": [], + "battleOnly": false + }, + { + "name": "Chill", + "primaryType": "bug", + "secondaryType": "steel", + "maleRatio": -1, + "height": 15, + "weight": 825, + "pokedex": [ + "cobblemon.species.genesect-chill.desc" + ], + "labels": [ + "gen5", + "mythical" + ], + "aspects": [ + "chill-drive" + ], + "evolutions": [], + "battleOnly": false + } + ], + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "genesect", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } }, - "height": 15, - "weight": 825, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:metal_coat" + } + ] + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothita.json deleted file mode 100644 index e9a75a9ce..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothita.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "name": "Gothita", - "nationalPokedexNumber": 574, - "primaryType": "psychic", - "abilities": [ - "frisk", - "competitive", - "h:shadowtag" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:ender_pearl", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:twisted_spoon", - "percentage": 2.5 - }, - { - "item": "cobblemon:persim_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 45, - "attack": 30, - "defence": 50, - "special_attack": 55, - "special_defence": 65, - "speed": 45 - }, - "catchRate": 200, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 58, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:confusion", - "1:pound", - "4:playnice", - "8:tickle", - "12:psybeam", - "14:doubleslap", - "16:charm", - "19:embargo", - "20:psyshock", - "24:feintattack", - "24:hypnosis", - "28:faketears", - "33:healblock", - "33:psychup", - "36:psychic", - "40:flatter", - "40:telekinesis", - "44:futuresight", - "48:magicroom", - "egg:captivate", - "egg:darkpulse", - "egg:fakeout", - "egg:healpulse", - "egg:meanlook", - "egg:miracleeye", - "egg:mirrorcoat", - "egg:torment", - "egg:uproar", - "tm:allyswitch", - "tm:attract", - "tm:calmmind", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:fling", - "tm:foulplay", - "tm:frustration", - "tm:futuresight", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:helpinghand", - "tm:hiddenpower", - "tm:imprison", - "tm:lightscreen", - "tm:magicroom", - "tm:nastyplot", - "tm:payback", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:covet", - "tutor:expandingforce", - "tutor:foulplay", - "tutor:gravity", - "tutor:healbell", - "tutor:helpinghand", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:recycle", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:telekinesis", - "tutor:trick", - "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.gothita.desc" - ], - "evolutions": [ - { - "id": "gothita_gothorita", - "variant": "level_up", - "result": "gothorita", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 32 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 4, - "weight": 58, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json b/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json deleted file mode 100644 index c44f48a98..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothitelle.json +++ /dev/null @@ -1,190 +0,0 @@ -{ - "name": "Gothitelle", - "nationalPokedexNumber": 576, - "primaryType": "psychic", - "abilities": [ - "frisk", - "competitive", - "h:shadowtag" - ], - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:ender_pearl", - "quantityRange": "0-3" - }, - { - "item": "cobblemon:twisted_spoon", - "percentage": 10.0 - }, - { - "item": "cobblemon:persim_berry", - "percentage": 10.0 - } - ] - }, - "baseStats": { - "hp": 70, - "attack": 55, - "defence": 95, - "special_attack": 95, - "special_defence": 110, - "speed": 65 - }, - "catchRate": 50, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 245, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:confusion", - "1:playnice", - "1:pound", - "1:tickle", - "12:psybeam", - "14:doubleslap", - "16:charm", - "19:embargo", - "20:psyshock", - "24:feintattack", - "24:hypnosis", - "28:faketears", - "34:healblock", - "35:psychup", - "40:psychic", - "45:telekinesis", - "48:flatter", - "56:futuresight", - "64:magicroom", - "tm:allyswitch", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:calmmind", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:cosmicpower", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:foulplay", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:imprison", - "tm:lightscreen", - "tm:lowsweep", - "tm:magicroom", - "tm:metronome", - "tm:nastyplot", - "tm:payback", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:covet", - "tutor:expandingforce", - "tutor:foulplay", - "tutor:gravity", - "tutor:healbell", - "tutor:helpinghand", - "tutor:laserfocus", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:recycle", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:telekinesis", - "tutor:trick", - "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.gothitelle.desc" - ], - "preEvolution": "gothorita", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 15, - "weight": 440, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json b/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json deleted file mode 100644 index 2272dfdf1..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/gothorita.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "name": "Gothorita", - "nationalPokedexNumber": 575, - "primaryType": "psychic", - "abilities": [ - "frisk", - "competitive", - "h:shadowtag" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:ender_pearl", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:twisted_spoon", - "percentage": 5.0 - }, - { - "item": "cobblemon:persim_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 60, - "attack": 45, - "defence": 70, - "special_attack": 75, - "special_defence": 85, - "speed": 55 - }, - "catchRate": 100, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 137, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:confusion", - "1:playnice", - "1:pound", - "1:tickle", - "12:psybeam", - "14:doubleslap", - "16:charm", - "19:embargo", - "20:psyshock", - "24:feintattack", - "24:hypnosis", - "28:faketears", - "34:healblock", - "35:psychup", - "40:psychic", - "43:telekinesis", - "46:flatter", - "52:futuresight", - "58:magicroom", - "tm:allyswitch", - "tm:attract", - "tm:calmmind", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:fling", - "tm:foulplay", - "tm:frustration", - "tm:futuresight", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:helpinghand", - "tm:hiddenpower", - "tm:imprison", - "tm:lightscreen", - "tm:magicroom", - "tm:metronome", - "tm:nastyplot", - "tm:payback", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:taunt", - "tm:telekinesis", - "tm:terablast", - "tm:thief", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:covet", - "tutor:expandingforce", - "tutor:flatter", - "tutor:foulplay", - "tutor:futuresight", - "tutor:gravity", - "tutor:healbell", - "tutor:helpinghand", - "tutor:imprison", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:mirrorcoat", - "tutor:psyshock", - "tutor:recycle", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:telekinesis", - "tutor:trick", - "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.gothorita.desc" - ], - "preEvolution": "gothita", - "evolutions": [ - { - "id": "gothorita_gothitelle", - "variant": "level_up", - "result": "gothitelle", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 41 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 7, - "weight": 180, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json b/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json deleted file mode 100644 index 0661fc935..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/haxorus.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "name": "Haxorus", - "nationalPokedexNumber": 612, - "primaryType": "dragon", - "abilities": [ - "rivalry", - "moldbreaker", - "h:unnerve" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:dragon_fang", - "percentage": 10.0 - }, - { - "item": "cobblemon:haban_berry", - "percentage": 10.0 - } - ] - }, - "baseStats": { - "hp": 76, - "attack": 147, - "defence": 90, - "special_attack": 60, - "special_defence": 70, - "speed": 97 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 270, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "monster", - "dragon" - ], - "moves": [ - "1:bite", - "1:dragonrage", - "1:falseswipe", - "1:leer", - "1:scratch", - "9:assurance", - "12:taunt", - "15:slash", - "18:dragonclaw", - "21:scaryface", - "24:crunch", - "27:dragondance", - "30:breakingswipe", - "30:dualchop", - "33:focusenergy", - "33:laserfocus", - "36:dragonpulse", - "41:swordsdance", - "46:outrage", - "53:guillotine", - "60:gigaimpact", - "tm:aerialace", - "tm:assurance", - "tm:attract", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulldoze", - "tm:closecombat", - "tm:confide", - "tm:crunch", - "tm:cut", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:incinerate", - "tm:ironhead", - "tm:irontail", - "tm:lowkick", - "tm:lowsweep", - "tm:outrage", - "tm:payback", - "tm:poisonjab", - "tm:protect", - "tm:psychocut", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaleshot", - "tm:scaryface", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:xscissor", - "tutor:aquatail", - "tutor:dracometeor", - "tutor:dragondance", - "tutor:dragonpulse", - "tutor:dualchop", - "tutor:earthquake", - "tutor:endeavor", - "tutor:irontail", - "tutor:laserfocus", - "tutor:lowkick", - "tutor:outrage", - "tutor:scaleshot", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:superpower", - "tutor:xscissor" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.haxorus.desc" - ], - "preEvolution": "fraxure", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 18, - "weight": 1055, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json b/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json deleted file mode 100644 index 9f8113a4a..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/karrablast.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "name": "Karrablast", - "nationalPokedexNumber": 588, - "primaryType": "bug", - "abilities": [ - "swarm", - "shedskin", - "h:noguard" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:occa_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 50, - "attack": 75, - "defence": 45, - "special_attack": 40, - "special_defence": 45, - "speed": 60 - }, - "catchRate": 200, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 63, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:leer", - "1:peck", - "4:furycutter", - "8:endure", - "12:falseswipe", - "16:acidspray", - "16:furyattack", - "20:headbutt", - "24:flail", - "28:scaryface", - "32:slash", - "32:xscissor", - "36:swordsdance", - "40:takedown", - "44:bugbuzz", - "48:doubleedge", - "egg:bugbite", - "egg:counter", - "egg:drillrun", - "egg:feintattack", - "egg:hornattack", - "egg:knockoff", - "egg:megahorn", - "egg:nightslash", - "egg:pursuit", - "egg:screech", - "egg:slash", - "tm:aerialace", - "tm:attract", - "tm:bugbuzz", - "tm:confide", - "tm:cut", - "tm:doubleteam", - "tm:drillrun", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:frustration", - "tm:gigadrain", - "tm:hiddenpower", - "tm:infestation", - "tm:irondefense", - "tm:megahorn", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:scaryface", - "tm:screech", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:strugglebug", - "tm:substitute", - "tm:swagger", - "tm:swordsdance", - "tm:toxic", - "tm:xscissor", - "tutor:bugbite", - "tutor:bugbuzz", - "tutor:drillrun", - "tutor:endure", - "tutor:falseswipe", - "tutor:flail", - "tutor:furyattack", - "tutor:gigadrain", - "tutor:headbutt", - "tutor:irondefense", - "tutor:knockoff", - "tutor:megahorn", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:takedown", - "tutor:xscissor" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.karrablast.desc" - ], - "evolutions": [ - { - "id": "karrablast_escavalier", - "variant": "trade", - "result": "escavalier", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "shelmet" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 59, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 e5c388b9f..76c3556b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/keldeo.json @@ -1,10 +1,28 @@ { - "name": "Keldeo", + "implemented": true, "nationalPokedexNumber": 647, + "name": "Keldeo", "primaryType": "water", "secondaryType": "fighting", + "maleRatio": -1, + "height": 14, + "weight": 485, + "pokedex": [ + "cobblemon.species.keldeo.desc" + ], + "labels": [ + "gen5", + "mythical" + ], + "aspects": [ + "ordinary-form" + ], "abilities": [ - "justified" + "justified", + "h:justified" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 91, @@ -14,11 +32,6 @@ "special_defence": 90, "speed": 108 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 290, - "baseFriendship": 35, "evYield": { "hp": 0, "attack": 0, @@ -27,17 +40,17 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, "moves": [ "1:aquajet", - "1:helpinghand", "1:leer", - "1:secretsword", + "1:helpinghand", "1:workup", + "1:secretsword", "7:bubblebeam", "14:quickguard", "21:doublekick", @@ -48,8 +61,10 @@ "56:swordsdance", "63:hydropump", "70:closecombat", + "form_change:secretsword", "tm:aerialace", "tm:airslash", + "tm:aquatail", "tm:aurasphere", "tm:batonpass", "tm:bounce", @@ -57,24 +72,22 @@ "tm:calmmind", "tm:chillingwater", "tm:closecombat", - "tm:confide", - "tm:cut", "tm:coaching", + "tm:covet", + "tm:cut", "tm:doubleedge", - "tm:doubleteam", "tm:endure", "tm:facade", "tm:falseswipe", "tm:flipturn", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:hail", "tm:helpinghand", - "tm:hiddenpower", "tm:hydropump", "tm:hyperbeam", "tm:icywind", + "tm:lastresort", "tm:liquidation", "tm:lowkick", "tm:megahorn", @@ -87,120 +100,190 @@ "tm:reflect", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:reversal", "tm:roar", "tm:rocksmash", - "tm:round", "tm:safeguard", - "tm:scald", - "tm:secretpower", "tm:sleeptalk", "tm:smartstrike", - "tm:snore", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:swagger", "tm:swift", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:toxic", "tm:trailblaze", "tm:upperhand", "tm:vacuumwave", "tm:waterpulse", "tm:workup", "tm:xscissor", - "tutor:aquajet", + "tutor:aerialace", "tutor:aquatail", "tutor:bounce", - "tutor:bubblebeam", + "tutor:calmmind", "tutor:coaching", "tutor:covet", - "tutor:doublekick", - "tutor:endeavor", + "tutor:falseswipe", "tutor:flipturn", + "tutor:gigaimpact", "tutor:helpinghand", - "tutor:hydropump", + "tutor:hyperbeam", "tutor:icywind", "tutor:lastresort", - "tutor:leer", "tutor:liquidation", "tutor:lowkick", - "tutor:sacredsword", + "tutor:megahorn", + "tutor:painsplit", + "tutor:poisonjab", + "tutor:rest", + "tutor:rocksmash", "tutor:secretsword", "tutor:sleeptalk", - "tutor:snore", + "tutor:stoneedge", "tutor:superpower", - "tutor:swordsdance", - "tutor:waterpulse" - ], - "labels": [ - "gen5", - "mythical", - "legendary" + "tutor:swift", + "tutor:vacuumwave", + "tutor:waterpulse", + "tutor:xscissor", + "legacy:confide", + "legacy:doubleteam", + "legacy:endeavor", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:scald", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "pokedex": [ - "cobblemon.species.keldeo.desc" - ], - "height": 14, - "weight": 485, "evolutions": [], "forms": [ { "name": "Resolute", "primaryType": "water", "secondaryType": "fighting", - "abilities": [ - "justified" - ], - "baseStats": { - "hp": 91, - "attack": 72, - "defence": 90, - "special_attack": 129, - "special_defence": 90, - "speed": 108 - }, - "catchRate": 3, "maleRatio": -1, - "baseExperienceYield": 290, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 80, - "eggGroups": [ - "undiscovered" + "height": 14, + "weight": 485, + "pokedex": [ + "cobblemon.species.keldeo-resolute.desc" ], "labels": [ "gen5", - "mythical", - "legendary" + "mythical" ], "aspects": [ - "resolute" + "resolute-form" ], - "height": 14, - "weight": 485, - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "cobalion", + "tier": 1 + }, + { + "pokemon": "terrakion", + "tier": 1 + }, + { + "pokemon": "virizion", + "tier": 1 + }, + { + "pokemon": "keldeo resolute", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "canWalkOnWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "rapidash", + "tier": 1 + }, + { + "pokemon": "zebstrika", + "tier": 1 + }, + { + "pokemon": "mudsdale", + "tier": 1 + }, + { + "pokemon": "keldeo ordinary", + "tier": 2 + }, + { + "pokemon": "glastrier", + "tier": 3 + }, + { + "pokemon": "spectrier", + "tier": 3 + }, + { + "pokemon": "cobalion", + "tier": 4 + }, + { + "pokemon": "terrakion", + "tier": 4 + }, + { + "pokemon": "virizion", + "tier": 4 + }, + { + "pokemon": "keldeo resolute", + "tier": 5 + } + ] + }, + "moving": { + "swim": { + "canWalkOnWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 fbf09e16e..7a5d8bced 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/kyurem.json @@ -1,10 +1,27 @@ { - "name": "Kyurem", + "implemented": true, "nationalPokedexNumber": 646, + "name": "Kyurem", "primaryType": "dragon", "secondaryType": "ice", + "maleRatio": -1, + "height": 30, + "weight": 3250, + "pokedex": [ + "cobblemon.species.kyurem.desc" + ], + "labels": [ + "gen5", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "pressure" + "pressure", + "h:pressure" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 125, @@ -14,70 +31,220 @@ "special_defence": 90, "speed": 95 }, + "evYield": { + "hp": 1, + "attack": 1, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 330, + "experienceGroup": "slow", "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "eggCycles": 120, + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "moves": [ + "1:dragonrage", + "1:ancientpower", + "1:dragonbreath", + "1:nobleroar", + "1:freezedry", + "8:slash", + "16:endeavor", + "24:dragonpulse", + "32:icebeam", + "40:hypervoice", + "48:scaryface", + "56:blizzard", + "64:imprison", + "72:outrage", + "80:glaciate", + "88:sheercold", + "tm:aerialace", + "tm:ancientpower", + "tm:avalanche", + "tm:blizzard", + "tm:bodypress", + "tm:bodyslam", + "tm:breakingswipe", + "tm:brutalswing", + "tm:cut", + "tm:dracometeor", + "tm:dragoncheer", + "tm:dragonclaw", + "tm:dragondance", + "tm:dragonpulse", + "tm:dragontail", + "tm:dualwingbeat", + "tm:earthpower", + "tm:echoedvoice", + "tm:endeavor", + "tm:endure", + "tm:facade", + "tm:flashcannon", + "tm:fling", + "tm:fly", + "tm:focusblast", + "tm:gigaimpact", + "tm:hail", + "tm:helpinghand", + "tm:honeclaws", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:iciclespear", + "tm:icywind", + "tm:imprison", + "tm:ironhead", + "tm:laserfocus", + "tm:lightscreen", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychic", + "tm:raindance", + "tm:reflect", + "tm:rest", + "tm:roar", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:roost", + "tm:safeguard", + "tm:scaleshot", + "tm:scaryface", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snowscape", + "tm:steelwing", + "tm:stoneedge", + "tm:strength", + "tm:substitute", + "tm:sunnyday", + "tm:swift", + "tm:takedown", + "tm:terablast", + "tm:weatherball", + "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", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" + ], + "evolutions": [], "forms": [ { - "name": "Black", + "name": "White", "primaryType": "dragon", "secondaryType": "ice", + "maleRatio": -1, + "height": 36, + "weight": 3250, + "pokedex": [ + "cobblemon.species.kyurem-white.desc" + ], + "labels": [ + "gen5", + "legendary", + "restricted" + ], + "aspects": [ + "white-fusion" + ], "abilities": [ - "teravolt" + "turboblaze", + "h:turboblaze" ], "baseStats": { "hp": 125, - "attack": 170, - "defence": 100, - "special_attack": 120, - "special_defence": 90, + "attack": 120, + "defence": 90, + "special_attack": 170, + "special_defence": 100, "speed": 95 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 330, - "baseFriendship": 0, "evYield": { "hp": 0, - "attack": 3, + "attack": 0, "defence": 0, - "special_attack": 0, + "special_attack": 3, "special_defence": 0, "speed": 0 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseExperienceYield": 350, "moves": [ + "1:dragonrage", "1:ancientpower", "1:dragonbreath", - "1:dragonrage", - "1:freezedry", - "1:icywind", "1:nobleroar", + "1:freezedry", "8:slash", "16:endeavor", "24:dragonpulse", "32:icebeam", "40:hypervoice", - "48:fusionbolt", + "48:fusionflare", "56:blizzard", "64:imprison", "72:outrage", - "80:freezeshock", + "80:iceburn", "88:sheercold", "tm:aerialace", + "tm:ancientpower", "tm:avalanche", "tm:blizzard", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", - "tm:confide", "tm:cut", - "tm:doubleteam", "tm:dracometeor", "tm:dragoncheer", "tm:dragonclaw", @@ -94,11 +261,9 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:hail", "tm:helpinghand", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:hypervoice", @@ -108,6 +273,7 @@ "tm:icywind", "tm:imprison", "tm:ironhead", + "tm:laserfocus", "tm:lightscreen", "tm:outrage", "tm:payback", @@ -116,127 +282,139 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:round", "tm:safeguard", "tm:scaleshot", "tm:scaryface", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:snowscape", "tm:steelwing", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", "tm:terablast", - "tm:toxic", "tm:weatherball", "tm:zenheadbutt", + "tutor:aerialace", + "tutor:ancientpower", "tutor:dracometeor", - "tutor:dragonbreath", "tutor:dragonpulse", "tutor:dualwingbeat", "tutor:earthpower", "tutor:endeavor", - "tutor:freezeshock", + "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:slash", "tutor:sleeptalk", - "tutor:snore", - "tutor:zenheadbutt" + "tutor:stoneedge", + "tutor:swift", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" + ], + "evolutions": [], + "battleOnly": false + }, + { + "name": "Black", + "primaryType": "dragon", + "secondaryType": "ice", + "maleRatio": -1, + "height": 33, + "weight": 3250, + "pokedex": [ + "cobblemon.species.kyurem-black.desc" ], "labels": [ "gen5", - "legendary" + "legendary", + "restricted" ], "aspects": [ "black-fusion" ], - "height": 33, - "weight": 3250, - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "White", - "primaryType": "dragon", - "secondaryType": "ice", "abilities": [ - "turboblaze" + "teravolt", + "h:teravolt" ], "baseStats": { "hp": 125, - "attack": 120, - "defence": 90, - "special_attack": 170, - "special_defence": 100, + "attack": 170, + "defence": 100, + "special_attack": 120, + "special_defence": 90, "speed": 95 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 330, - "baseFriendship": 0, "evYield": { "hp": 0, - "attack": 0, + "attack": 3, "defence": 0, - "special_attack": 3, + "special_attack": 0, "special_defence": 0, "speed": 0 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseExperienceYield": 350, "moves": [ + "1:dragonrage", "1:ancientpower", "1:dragonbreath", - "1:dragonrage", - "1:freezedry", - "1:icywind", "1:nobleroar", + "1:freezedry", "8:slash", "16:endeavor", "24:dragonpulse", "32:icebeam", "40:hypervoice", - "48:fusionflare", + "48:fusionbolt", "56:blizzard", "64:imprison", "72:outrage", - "80:iceburn", + "80:freezeshock", "88:sheercold", "tm:aerialace", + "tm:ancientpower", "tm:avalanche", "tm:blizzard", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", - "tm:confide", "tm:cut", - "tm:doubleteam", "tm:dracometeor", "tm:dragoncheer", "tm:dragonclaw", @@ -253,11 +431,9 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:hail", "tm:helpinghand", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:hypervoice", @@ -267,6 +443,7 @@ "tm:icywind", "tm:imprison", "tm:ironhead", + "tm:laserfocus", "tm:lightscreen", "tm:outrage", "tm:payback", @@ -275,218 +452,101 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:round", "tm:safeguard", "tm:scaleshot", "tm:scaryface", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:snowscape", "tm:steelwing", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", "tm:terablast", - "tm:toxic", "tm:weatherball", "tm:zenheadbutt", + "tutor:aerialace", + "tutor:ancientpower", "tutor:dracometeor", - "tutor:dragonbreath", "tutor:dragonpulse", "tutor:dualwingbeat", "tutor:earthpower", "tutor:endeavor", - "tutor:fusionflare", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", "tutor:hypervoice", "tutor:icebeam", - "tutor:iceburn", + "tutor:icefang", "tutor:icywind", - "tutor:imprison", "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:slash", "tutor:sleeptalk", - "tutor:snore", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "legendary" + "tutor:stoneedge", + "tutor:swift", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "aspects": [ - "white-fusion" - ], - "height": 36, - "weight": 3250, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false } ], - "baseExperienceYield": 330, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:ancientpower", - "1:dragonbreath", - "1:dragonrage", - "1:freezedry", - "1:icywind", - "1:nobleroar", - "8:slash", - "16:endeavor", - "24:dragonpulse", - "32:icebeam", - "40:hypervoice", - "48:scaryface", - "56:blizzard", - "64:imprison", - "72:outrage", - "80:glaciate", - "88:sheercold", - "tm:aerialace", - "tm:avalanche", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brutalswing", - "tm:confide", - "tm:cut", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dualwingbeat", - "tm:earthpower", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flashcannon", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icefang", - "tm:iciclespear", - "tm:icywind", - "tm:imprison", - "tm:ironhead", - "tm:lightscreen", - "tm:outrage", - "tm:payback", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:scaleshot", - "tm:scaryface", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:steelwing", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:weatherball", - "tm:zenheadbutt", - "tutor:dracometeor", - "tutor:dragonbreath", - "tutor:dragonpulse", - "tutor:dualwingbeat", - "tutor:earthpower", - "tutor:endeavor", - "tutor:glaciate", - "tutor:icebeam", - "tutor:icywind", - "tutor:ironhead", - "tutor:laserfocus", - "tutor:outrage", - "tutor:roost", - "tutor:scaleshot", - "tutor:shadowball", - "tutor:signalbeam", - "tutor:slash", - "tutor:sleeptalk", - "tutor:snore", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "legendary" - ], - "pokedex": [ - "cobblemon.species.kyurem.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 1, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } }, - "height": 30, - "weight": 3250, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:dragon_breath", + "quantityRange": "2-3" + } + ] + } } \ No newline at end of file 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 0fe5d6577..2bcd52a15 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/landorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/landorus.json @@ -1,12 +1,29 @@ { - "name": "Landorus", + "implemented": true, "nationalPokedexNumber": 645, + "name": "Landorus", "primaryType": "ground", "secondaryType": "flying", + "maleRatio": 1, + "height": 15, + "weight": 680, + "pokedex": [ + "cobblemon.species.landorus.desc" + ], + "labels": [ + "gen5", + "legendary" + ], + "aspects": [ + "incarnate-forme" + ], "abilities": [ "sandforce", "h:sheerforce" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 89, "attack": 125, @@ -15,11 +32,6 @@ "special_defence": 80, "speed": 101 }, - "catchRate": 3, - "maleRatio": 1, - "shoulderMountable": false, - "baseExperienceYield": 300, - "baseFriendship": 90, "evYield": { "hp": 0, "attack": 0, @@ -28,22 +40,20 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 90, "moves": [ - "1:mudshot", + "1:punishment", "1:rockthrow", - "1:sandtomb", "1:smackdown", + "1:sandtomb", "5:leer", - "7:punishment", "10:block", "15:bulldoze", "20:rocktomb", - "25:swordsdance", "30:imprison", "35:rockslide", "40:earthpower", @@ -55,17 +65,16 @@ "70:outrage", "75:fissure", "80:sandsearstorm", - "tm:attract", + "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", "tm:bulldoze", "tm:calmmind", - "tm:confide", "tm:crunch", + "tm:defog", "tm:dig", - "tm:doubleteam", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -74,11 +83,9 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", "tm:gravity", - "tm:hiddenpower", "tm:hyperbeam", "tm:imprison", "tm:irontail", @@ -91,23 +98,20 @@ "tm:psychic", "tm:raindance", "tm:rest", - "tm:return", "tm:rockpolish", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", + "tm:roleplay", "tm:sandstorm", "tm:sandtomb", "tm:scaryface", "tm:scorchingsands", - "tm:secretpower", "tm:selfdestruct", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:smackdown", - "tm:snore", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", @@ -115,56 +119,71 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:toxic", "tm:uturn", "tm:weatherball", "tutor:block", + "tutor:bulkup", "tutor:bulldoze", + "tutor:calmmind", "tutor:defog", "tutor:earthpower", - "tutor:earthquake", - "tutor:extrasensory", - "tutor:fissure", - "tutor:focusblast", + "tutor:gigaimpact", "tutor:gravity", + "tutor:hyperbeam", "tutor:irontail", - "tutor:knockoff", - "tutor:mudshot", + "tutor:mudslap", "tutor:outrage", + "tutor:psychic", + "tutor:rest", "tutor:rockslide", - "tutor:rocktomb", + "tutor:rocksmash", "tutor:roleplay", - "tutor:sandstorm", - "tutor:sandtomb", + "tutor:scorchingsands", "tutor:sleeptalk", - "tutor:snore", + "tutor:sludgebomb", "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", - "tutor:swordsdance", - "tutor:uturn" - ], - "labels": [ - "gen5", - "legendary" - ], - "pokedex": [ - "cobblemon.species.landorus.desc" + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:knockoff", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "height": 15, - "weight": 680, "evolutions": [], "forms": [ { "name": "Therian", "primaryType": "ground", "secondaryType": "flying", + "maleRatio": 1, + "height": 13, + "weight": 680, + "pokedex": [ + "cobblemon.species.landorus-therian.desc" + ], + "labels": [ + "gen5", + "legendary" + ], + "aspects": [ + "therian-forme" + ], "abilities": [ - "intimidate" + "intimidate", + "h:intimidate" ], "baseStats": { "hp": 89, @@ -174,10 +193,6 @@ "special_defence": 80, "speed": 91 }, - "catchRate": 3, - "maleRatio": 1, - "baseExperienceYield": 300, - "baseFriendship": 90, "evYield": { "hp": 0, "attack": 3, @@ -186,25 +201,30 @@ "special_defence": 0, "speed": 0 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen5", - "legendary" - ], - "aspects": [ - "therian" - ], - "height": 13, - "weight": 680, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json b/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json deleted file mode 100644 index b46b882f5..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/leavanny.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "name": "Leavanny", - "nationalPokedexNumber": 542, - "primaryType": "bug", - "secondaryType": "grass", - "abilities": [ - "swarm", - "chlorophyll", - "h:overcoat" - ], - "drops": { - "amount": 6, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-3" - }, - { - "item": "cobblemon:mental_herb", - "percentage": 10.0 - }, - { - "item": "cobblemon:revival_herb", - "percentage": 10.0 - }, - { - "item": "cobblemon:coba_berry", - "percentage": 10.0 - } - ] - }, - "baseStats": { - "hp": 75, - "attack": 103, - "defence": 80, - "special_attack": 70, - "special_defence": 80, - "speed": 92 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 225, - "experienceGroup": "medium_slow", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:bugbite", - "1:falseswipe", - "1:razorleaf", - "1:slash", - "1:stringshot", - "1:tackle", - "22:strugglebug", - "29:fellstinger", - "32:helpinghand", - "36:leafblade", - "39:xscissor", - "43:entrainment", - "46:swordsdance", - "50:leafstorm", - "tm:aerialace", - "tm:agility", - "tm:airslash", - "tm:attract", - "tm:batonpass", - "tm:bugbite", - "tm:bugbuzz", - "tm:bulletseed", - "tm:calmmind", - "tm:charm", - "tm:confide", - "tm:cut", - "tm:doubleteam", - "tm:dreameater", - "tm:electroweb", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:flash", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:irondefense", - "tm:knockoff", - "tm:leafstorm", - "tm:lightscreen", - "tm:lowkick", - "tm:lunge", - "tm:magicalleaf", - "tm:naturepower", - "tm:payback", - "tm:poisonjab", - "tm:pollenpuff", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:seedbomb", - "tm:shadowclaw", - "tm:skittersmack", - "tm:sleeptalk", - "tm:solarbeam", - "tm:steelwing", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:toxic", - "tm:trailblaze", - "tm:tripleaxel", - "tm:xscissor", - "tutor:bugbite", - "tutor:electroweb", - "tutor:gigadrain", - "tutor:healbell", - "tutor:helpinghand", - "tutor:irondefense", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:magiccoat", - "tutor:seedbomb", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:synthesis", - "tutor:throatchop", - "tutor:worryseed" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.leavanny.desc" - ], - "preEvolution": "swadloon", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 12, - "weight": 205, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json b/common/src/main/resources/data/cobblemon/species/generation5/liepard.json deleted file mode 100644 index def5ae767..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/liepard.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "name": "Liepard", - "nationalPokedexNumber": 510, - "primaryType": "dark", - "abilities": [ - "limber", - "unburden", - "h:prankster" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:bluk_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 64, - "attack": 88, - "defence": 50, - "special_attack": 88, - "special_defence": 50, - "speed": 106 - }, - "catchRate": 90, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 156, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:assist", - "1:fakeout", - "1:growl", - "1:sandattack", - "1:scratch", - "12:furyswipes", - "15:pursuit", - "16:torment", - "23:assurance", - "28:honeclaws", - "34:slash", - "34:suckerpunch", - "38:taunt", - "40:nastyplot", - "46:nightslash", - "47:snatch", - "52:playrough", - "tm:aerialace", - "tm:assurance", - "tm:attract", - "tm:batonpass", - "tm:charm", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:echoedvoice", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:foulplay", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:gunkshot", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:hypervoice", - "tm:irontail", - "tm:nastyplot", - "tm:payback", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:psychocut", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:round", - "tm:screech", - "tm:secretpower", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:taunt", - "tm:thief", - "tm:throatchop", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:uturn", - "tutor:burningjealousy", - "tutor:covet", - "tutor:darkpulse", - "tutor:encore", - "tutor:fakeout", - "tutor:foulplay", - "tutor:gunkshot", - "tutor:hypervoice", - "tutor:irontail", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:lashout", - "tutor:roleplay", - "tutor:seedbomb", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:swagger", - "tutor:throatchop", - "tutor:trick" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.liepard.desc" - ], - "preEvolution": "purrloin", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 11, - "weight": 375, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 05000302b..bc276ff61 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/mandibuzz.json @@ -1,13 +1,54 @@ { - "name": "Mandibuzz", + "implemented": true, "nationalPokedexNumber": 630, + "name": "Mandibuzz", "primaryType": "dark", "secondaryType": "flying", + "maleRatio": 0, + "height": 12, + "weight": 395, + "pokedex": [ + "cobblemon.species.mandibuzz.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "bigpecks", "overcoat", "h:weakarmor" ], + "eggGroups": [ + "flying" + ], + "baseStats": { + "hp": 110, + "attack": 65, + "defence": 105, + "special_attack": 55, + "special_defence": 95, + "speed": 80 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 2, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 179, + "experienceGroup": "slow", + "catchRate": 60, + "eggCycles": 20, + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 7, "entries": [ @@ -32,58 +73,46 @@ } ] }, - "baseStats": { - "hp": 110, - "attack": 65, - "defence": 105, - "special_attack": 55, - "special_defence": 95, - "speed": 80 - }, - "catchRate": 60, - "maleRatio": 0, - "shoulderMountable": false, - "baseExperienceYield": 179, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "flying" - ], "moves": [ - "1:bonerush", - "1:flatter", - "1:furyattack", "1:gust", "1:leer", - "1:mirrormove", + "1:furyattack", "1:pluck", + "1:flatter", + "1:feintattack", + "1:punishment", + "1:bonerush", + "1:mirrormove", "1:skyattack", "1:toxic", "18:tailwind", - "23:feintattack", "24:knockoff", - "28:punishment", "30:irondefense", "36:whirlwind", "42:airslash", "48:darkpulse", - "50:embargo", "57:nastyplot", "64:defog", "72:attract", "80:bravebird", + "egg:feintattack", + "egg:meanlook", + "egg:mirrormove", + "egg:punishment", + "egg:roost", + "egg:toxic", "tm:acrobatics", "tm:aerialace", "tm:aircutter", "tm:airslash", "tm:assurance", "tm:attract", + "tm:block", "tm:bravebird", - "tm:confide", "tm:cut", "tm:darkpulse", + "tm:defog", "tm:doubleedge", - "tm:doubleteam", "tm:dualwingbeat", "tm:embargo", "tm:endure", @@ -92,10 +121,8 @@ "tm:featherdance", "tm:fly", "tm:foulplay", - "tm:frustration", "tm:gigaimpact", "tm:heatwave", - "tm:hiddenpower", "tm:hurricane", "tm:hyperbeam", "tm:incinerate", @@ -110,23 +137,20 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:round", "tm:sandstorm", "tm:scaryface", - "tm:secretpower", "tm:shadowball", + "tm:skyattack", "tm:sleeptalk", "tm:snarl", - "tm:snore", + "tm:snatch", "tm:spite", "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:tailwind", "tm:takedown", @@ -138,52 +162,69 @@ "tm:toxic", "tm:uproar", "tm:uturn", + "tutor:aircutter", "tutor:block", "tutor:darkpulse", "tutor:defog", "tutor:dualwingbeat", - "tutor:feintattack", - "tutor:flatter", "tutor:foulplay", + "tutor:gigaimpact", "tutor:heatwave", + "tutor:hyperbeam", "tutor:irondefense", "tutor:knockoff", "tutor:lashout", - "tutor:nastyplot", - "tutor:pluck", + "tutor:rest", + "tutor:rocksmash", "tutor:roost", + "tutor:shadowball", "tutor:skyattack", "tutor:sleeptalk", + "tutor:snarl", "tutor:snatch", - "tutor:snore", - "tutor:tailwind" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.mandibuzz.desc" + "tutor:spite", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:uproar", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger" ], "preEvolution": "vullaby", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 12, - "weight": 395, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "mandibuzz", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 ce8f4c732..799379815 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/meloetta.json @@ -1,10 +1,28 @@ { - "name": "Meloetta", + "implemented": true, "nationalPokedexNumber": 648, + "name": "Meloetta", "primaryType": "normal", "secondaryType": "psychic", + "maleRatio": -1, + "height": 6, + "weight": 65, + "pokedex": [ + "cobblemon.species.meloetta.desc" + ], + "labels": [ + "gen5", + "mythical" + ], + "aspects": [ + "aria-forme" + ], "abilities": [ - "serenegrace" + "serenegrace", + "h:serenegrace" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,11 +32,6 @@ "special_defence": 128, "speed": 90 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 270, - "baseFriendship": 100, "evYield": { "hp": 0, "attack": 0, @@ -27,43 +40,44 @@ "special_defence": 1, "speed": 1 }, + "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 100, "moves": [ - "1:confusion", - "1:quickattack", "1:round", + "1:quickattack", + "1:confusion", "1:sing", + "1:wakeupslap", "21:teeterdance", "26:acrobatics", "31:psybeam", "36:echoedvoice", "43:uturn", "50:relicsong", - "50:wakeupslap", "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:chargebeam", "tm:charm", "tm:closecombat", "tm:coaching", - "tm:confide", + "tm:covet", "tm:dazzlinggleam", "tm:disarmingvoice", - "tm:doubleteam", "tm:drainpunch", "tm:dreameater", + "tm:dualchop", "tm:echoedvoice", "tm:embargo", "tm:endure", @@ -75,20 +89,23 @@ "tm:fling", "tm:focusblast", "tm:focuspunch", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", "tm:gravity", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "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:playrough", @@ -99,23 +116,25 @@ "tm:psychup", "tm:psyshock", "tm:raindance", + "tm:recycle", "tm:rest", "tm:retaliate", - "tm:return", "tm:reversal", "tm:rocksmash", + "tm:roleplay", "tm:round", "tm:safeguard", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", + "tm:shockwave", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", + "tm:snatch", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:swordsdance", "tm:telekinesis", @@ -124,25 +143,29 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:trick", "tm:trickroom", "tm:tripleaxel", "tm:uturn", + "tm:wonderroom", "tm:workup", "tm:zenheadbutt", "tutor:allyswitch", - "tutor:celebrate", - "tutor:closecombat", - "tutor:confusion", + "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", @@ -150,42 +173,60 @@ "tutor:lowkick", "tutor:magiccoat", "tutor:magicroom", - "tutor:quickattack", + "tutor:playrough", + "tutor:psychic", "tutor:recycle", + "tutor:relicsong", + "tutor:rest", + "tutor:rocksmash", "tutor:roleplay", - "tutor:round", + "tutor:shadowball", + "tutor:shadowclaw", "tutor:shockwave", "tutor:signalbeam", "tutor:skillswap", "tutor:sleeptalk", "tutor:snatch", - "tutor:snore", - "tutor:teeterdance", + "tutor:stoneedge", + "tutor:swift", "tutor:telekinesis", + "tutor:thunderbolt", "tutor:thunderpunch", "tutor:trick", - "tutor:uproar", + "tutor:tripleaxel", "tutor:wonderroom", - "tutor:zenheadbutt" + "tutor:zenheadbutt", + "legacy:chargebeam", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "legacy:uproar", + "special:celebrate" ], - "labels": [ - "gen5", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.meloetta.desc" - ], - "height": 6, - "weight": 65, "evolutions": [], "forms": [ { "name": "Pirouette", "primaryType": "normal", "secondaryType": "fighting", - "abilities": [ - "serenegrace" + "maleRatio": -1, + "height": 6, + "weight": 65, + "pokedex": [ + "cobblemon.species.meloetta-pirouette.desc" + ], + "labels": [ + "gen5", + "mythical" + ], + "aspects": [ + "pirouette-forme" ], "baseStats": { "hp": 100, @@ -195,10 +236,6 @@ "special_defence": 77, "speed": 128 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 270, - "baseFriendship": 100, "evYield": { "hp": 0, "attack": 1, @@ -207,26 +244,46 @@ "special_defence": 0, "speed": 1 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen5", - "mythical", - "legendary" - ], - "aspects": [ - "pirouette" - ], - "height": 6, - "weight": 65, - "cannotDynamax": false, - "battleOnly": true + "evolutions": [], + "battleOnly": false, + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json b/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json deleted file mode 100644 index 60682cc45..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienfoo.json +++ /dev/null @@ -1,190 +0,0 @@ -{ - "name": "Mienfoo", - "nationalPokedexNumber": 619, - "primaryType": "fighting", - "abilities": [ - "innerfocus", - "regenerator", - "h:reckless" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:payapa_berry", - "percentage": 2.5 - }, - { - "item": "cobblemon:expert_belt", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 45, - "attack": 85, - "defence": 50, - "special_attack": 55, - "special_defence": 50, - "speed": 65 - }, - "catchRate": 180, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 70, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "field", - "human_like" - ], - "moves": [ - "1:detect", - "1:pound", - "5:fakeout", - "5:meditate", - "10:reversal", - "15:furyswipes", - "17:doubleslap", - "20:quickguard", - "21:swift", - "25:forcepalm", - "30:uturn", - "35:drainpunch", - "37:jumpkick", - "40:honeclaws", - "45:aurasphere", - "51:bounce", - "55:calmmind", - "60:highjumpkick", - "egg:allyswitch", - "egg:batonpass", - "egg:endure", - "egg:feint", - "egg:focuspunch", - "egg:knockoff", - "egg:lowkick", - "egg:mefirst", - "egg:smellingsalts", - "egg:vitalthrow", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:allyswitch", - "tm:attract", - "tm:aurasphere", - "tm:batonpass", - "tm:bounce", - "tm:brickbreak", - "tm:bulkup", - "tm:calmmind", - "tm:closecombat", - "tm:coaching", - "tm:confide", - "tm:dig", - "tm:doubleteam", - "tm:drainpunch", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:knockoff", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:megapunch", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:revenge", - "tm:reversal", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uturn", - "tm:workup", - "tutor:allyswitch", - "tutor:bounce", - "tutor:coaching", - "tutor:drainpunch", - "tutor:dualchop", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:knockoff", - "tutor:lowkick", - "tutor:roleplay", - "tutor:sleeptalk", - "tutor:snore" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.mienfoo.desc" - ], - "evolutions": [ - { - "id": "mienfoo_mienshao", - "variant": "level_up", - "result": "mienshao", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 50 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 9, - "weight": 200, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json b/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json deleted file mode 100644 index e15d2192e..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/mienshao.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "name": "Mienshao", - "nationalPokedexNumber": 620, - "primaryType": "fighting", - "abilities": [ - "innerfocus", - "regenerator", - "h:reckless" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:payapa_berry", - "percentage": 5.0 - }, - { - "item": "cobblemon:expert_belt", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 65, - "attack": 125, - "defence": 60, - "special_attack": 95, - "special_defence": 60, - "speed": 105 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 179, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "field", - "human_like" - ], - "moves": [ - "1:detect", - "1:fakeout", - "1:meditate", - "1:pound", - "1:quickguard", - "1:reversal", - "15:furyswipes", - "17:doubleslap", - "20:wideguard", - "21:swift", - "25:forcepalm", - "30:uturn", - "35:drainpunch", - "37:jumpkick", - "40:honeclaws", - "45:aurasphere", - "53:bounce", - "59:calmmind", - "66:highjumpkick", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:allyswitch", - "tm:assurance", - "tm:attract", - "tm:aurasphere", - "tm:batonpass", - "tm:blazekick", - "tm:bounce", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:calmmind", - "tm:closecombat", - "tm:coaching", - "tm:confide", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:drainpunch", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:focusblast", - "tm:focusenergy", - "tm:focuspunch", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icespinner", - "tm:knockoff", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:megapunch", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:revenge", - "tm:reversal", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:snore", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:tripleaxel", - "tm:upperhand", - "tm:uturn", - "tm:vacuumwave", - "tm:workup", - "tutor:allyswitch", - "tutor:bounce", - "tutor:coaching", - "tutor:drainpunch", - "tutor:dualchop", - "tutor:fakeout", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:highjumpkick", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:lowkick", - "tutor:roleplay", - "tutor:sleeptalk", - "tutor:snore", - "tutor:uturn" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.mienshao.desc" - ], - "preEvolution": "mienfoo", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 14, - "weight": 355, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json b/common/src/main/resources/data/cobblemon/species/generation5/minccino.json deleted file mode 100644 index bed2f0c6d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/minccino.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "name": "Minccino", - "nationalPokedexNumber": 572, - "primaryType": "normal", - "abilities": [ - "cutecharm", - "technician", - "h:skilllink" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:silk_scarf", - "percentage": 2.5 - }, - { - "item": "cobblemon:chesto_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 55, - "attack": 50, - "defence": 40, - "special_attack": 40, - "special_defence": 40, - "speed": 75 - }, - "catchRate": 255, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 60, - "experienceGroup": "fast", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:babydolleyes", - "1:pound", - "3:growl", - "4:helpinghand", - "8:echoedvoice", - "12:sing", - "13:doubleslap", - "16:charm", - "20:swift", - "24:encore", - "28:afteryou", - "31:wakeupslap", - "32:tailslap", - "36:tickle", - "39:captivate", - "40:slam", - "44:hypervoice", - "48:lastresort", - "egg:aquatail", - "egg:endure", - "egg:faketears", - "egg:flail", - "egg:irontail", - "egg:knockoff", - "egg:mudslap", - "egg:sleeptalk", - "egg:tailwhip", - "egg:tidyup", - "tm:alluringvoice", - "tm:attract", - "tm:batonpass", - "tm:bulletseed", - "tm:calmmind", - "tm:charm", - "tm:chillingwater", - "tm:confide", - "tm:dazzlinggleam", - "tm:dig", - "tm:doubleteam", - "tm:echoedvoice", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:frustration", - "tm:grassknot", - "tm:gunkshot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hypervoice", - "tm:irontail", - "tm:knockoff", - "tm:mudslap", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:swift", - "tm:tailslap", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:tripleaxel", - "tm:uproar", - "tm:uturn", - "tm:workup", - "tutor:afteryou", - "tutor:aquatail", - "tutor:covet", - "tutor:gunkshot", - "tutor:helpinghand", - "tutor:hypervoice", - "tutor:irontail", - "tutor:knockoff", - "tutor:lastresort", - "tutor:seedbomb", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:tripleaxel", - "tutor:uproar" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.minccino.desc" - ], - "evolutions": [ - { - "id": "minccino_cinccino", - "variant": "item_interact", - "result": "cinccino", - "consumeHeldItem": false, - "learnableMoves": [ - "tailslap" - ], - "requirements": [], - "requiredContext": "cobblemon:shiny_stone" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 4, - "weight": 58, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/munna.json b/common/src/main/resources/data/cobblemon/species/generation5/munna.json deleted file mode 100644 index 8c918cf74..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/munna.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "name": "Munna", - "nationalPokedexNumber": 517, - "primaryType": "psychic", - "abilities": [ - "forewarn", - "synchronize", - "h:telepathy" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:chesto_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 76, - "attack": 25, - "defence": 45, - "special_attack": 67, - "special_defence": 55, - "speed": 24 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 58, - "experienceGroup": "fast", - "eggCycles": 10, - "eggGroups": [ - "field" - ], - "moves": [ - "1:defensecurl", - "1:psywave", - "1:storedpower", - "4:hypnosis", - "5:luckychant", - "8:psybeam", - "12:imprison", - "16:moonlight", - "20:magiccoat", - "24:zenheadbutt", - "25:synchronoise", - "28:calmmind", - "29:nightmare", - "32:yawn", - "36:psychic", - "40:moonblast", - "43:telekinesis", - "44:dreameater", - "48:futuresight", - "52:wonderroom", - "egg:barrier", - "egg:batonpass", - "egg:curse", - "egg:healingwish", - "egg:helpinghand", - "egg:magiccoat", - "egg:secretpower", - "egg:sleeptalk", - "egg:sonicboom", - "egg:swift", - "tm:allyswitch", - "tm:amnesia", - "tm:attract", - "tm:calmmind", - "tm:chargebeam", - "tm:confide", - "tm:dazzlinggleam", - "tm:doubleteam", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:futuresight", - "tm:guardswap", - "tm:gyroball", - "tm:helpinghand", - "tm:hiddenpower", - "tm:imprison", - "tm:lightscreen", - "tm:powerswap", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:telekinesis", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:allyswitch", - "tutor:dreameater", - "tutor:expandingforce", - "tutor:gravity", - "tutor:healbell", - "tutor:helpinghand", - "tutor:hypnosis", - "tutor:magiccoat", - "tutor:painsplit", - "tutor:rest", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snore", - "tutor:telekinesis", - "tutor:trick", - "tutor:wonderroom", - "tutor:worryseed", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.munna.desc" - ], - "evolutions": [ - { - "id": "munna_musharna", - "variant": "item_interact", - "result": "musharna", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "cobblemon:moon_stone" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 233, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json b/common/src/main/resources/data/cobblemon/species/generation5/musharna.json deleted file mode 100644 index 96a9a7d8d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/musharna.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "name": "Musharna", - "nationalPokedexNumber": 518, - "primaryType": "psychic", - "abilities": [ - "forewarn", - "synchronize", - "h:telepathy" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:chesto_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 116, - "attack": 55, - "defence": 85, - "special_attack": 107, - "special_defence": 95, - "speed": 29 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 170, - "experienceGroup": "fast", - "eggCycles": 10, - "eggGroups": [ - "field" - ], - "moves": [ - "1:calmmind", - "1:defensecurl", - "1:dreameater", - "1:futuresight", - "1:hypnosis", - "1:imprison", - "1:luckychant", - "1:magiccoat", - "1:moonblast", - "1:moonlight", - "1:psybeam", - "1:psychic", - "1:psychicterrain", - "1:storedpower", - "1:wonderroom", - "1:yawn", - "1:zenheadbutt", - "tm:allyswitch", - "tm:amnesia", - "tm:attract", - "tm:calmmind", - "tm:chargebeam", - "tm:confide", - "tm:dazzlinggleam", - "tm:doubleteam", - "tm:dreameater", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:guardswap", - "tm:gyroball", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:imprison", - "tm:lightscreen", - "tm:powerswap", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:telekinesis", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:allyswitch", - "tutor:defensecurl", - "tutor:expandingforce", - "tutor:gravity", - "tutor:healbell", - "tutor:helpinghand", - "tutor:hypnosis", - "tutor:luckychant", - "tutor:magiccoat", - "tutor:mistyexplosion", - "tutor:painsplit", - "tutor:psybeam", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snore", - "tutor:telekinesis", - "tutor:trick", - "tutor:wonderroom", - "tutor:worryseed", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.musharna.desc" - ], - "preEvolution": "munna", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 605, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 432fdb3c3..dc52b35bc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/palpitoad.json @@ -1,13 +1,89 @@ { - "name": "Palpitoad", + "implemented": true, "nationalPokedexNumber": 536, + "name": "Palpitoad", "primaryType": "water", "secondaryType": "ground", + "maleRatio": 0.5, + "height": 8, + "weight": 170, + "pokedex": [ + "cobblemon.species.palpitoad.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "swiftswim", "hydration", "h:waterabsorb" ], + "eggGroups": [ + "water_1" + ], + "baseStats": { + "hp": 75, + "attack": 65, + "defence": 55, + "special_attack": 65, + "special_defence": 55, + "speed": 69 + }, + "evYield": { + "hp": 2, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 134, + "experienceGroup": "medium_slow", + "catchRate": 120, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "canBreatheUnderwater": true, + "swimSpeed": "0.2" + } + }, + "herd": { + "maxSize": "7", + "toleratedLeaders": [ + { + "pokemon": "poliwrath", + "tier": 1 + }, + { + "pokemon": "politoed", + "tier": 2 + }, + { + "pokemon": "seismitoad", + "tier": 3 + } + ] + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "combat": { + "willDefendOwner": true + } + }, "drops": { "amount": 3, "entries": [ @@ -21,29 +97,12 @@ } ] }, - "baseStats": { - "hp": 75, - "attack": 65, - "defence": 55, - "special_attack": 65, - "special_defence": 55, - "speed": 69 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 134, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "water_1" - ], "moves": [ - "1:acid", "1:bubble", - "1:echoedvoice", "1:growl", "1:supersonic", + "1:echoedvoice", + "1:acid", "12:mudshot", "16:round", "20:bubblebeam", @@ -54,34 +113,40 @@ "48:muddywater", "54:raindance", "60:hydropump", - "tm:attract", + "egg:mist", + "egg:mudbomb", + "egg:mudslap", + "egg:mudsport", + "egg:refresh", + "egg:snore", + "egg:toxic", + "egg:waterpulse", + "tm:afteryou", "tm:bounce", "tm:bulldoze", - "tm:confide", - "tm:doubleteam", "tm:earthpower", "tm:echoedvoice", + "tm:endeavor", "tm:endure", "tm:facade", - "tm:frustration", + "tm:focuspunch", + "tm:gastroacid", "tm:hail", - "tm:hiddenpower", "tm:hydropump", "tm:hypervoice", "tm:icywind", "tm:infestation", "tm:muddywater", "tm:mudshot", + "tm:mudslap", "tm:powerwhip", "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:rocksmash", "tm:round", "tm:scald", "tm:screech", - "tm:secretpower", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -89,30 +154,38 @@ "tm:stealthrock", "tm:substitute", "tm:surf", - "tm:swagger", + "tm:terablast", "tm:toxic", "tm:uproar", "tm:venomdrench", + "tm:waterpulse", "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" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.palpitoad.desc" + "tutor:waterpulse", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:secretpower", + "legacy:swagger" ], "preEvolution": "tympole", "evolutions": [ @@ -122,6 +195,7 @@ "result": "seismitoad", "consumeHeldItem": false, "learnableMoves": [ + "acid", "drainpunch" ], "requirements": [ @@ -131,25 +205,5 @@ } ] } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 8, - "weight": 170, - "aspects": [], - "cannotDynamax": false, - "implemented": true + ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json b/common/src/main/resources/data/cobblemon/species/generation5/panpour.json deleted file mode 100644 index 29fe5fae4..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/panpour.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "name": "Panpour", - "nationalPokedexNumber": 515, - "primaryType": "water", - "abilities": [ - "gluttony", - "h:torrent" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:water_stone", - "percentage": 2.5 - }, - { - "item": "cobblemon:mystic_water", - "percentage": 2.5 - }, - { - "item": "cobblemon:rindo_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 50, - "attack": 53, - "defence": 48, - "special_attack": 53, - "special_defence": 48, - "speed": 64 - }, - "catchRate": 190, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 63, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:playnice", - "1:scratch", - "4:leer", - "7:lick", - "10:watergun", - "13:furyswipes", - "16:watersport", - "19:bite", - "22:scald", - "25:taunt", - "28:fling", - "31:acrobatics", - "34:brine", - "37:recycle", - "40:naturalgift", - "43:crunch", - "egg:aquaring", - "egg:aquatail", - "egg:astonish", - "egg:covet", - "egg:disarmingvoice", - "egg:hydropump", - "egg:lowkick", - "egg:mudsport", - "egg:nastyplot", - "egg:roleplay", - "egg:tickle", - "tm:acrobatics", - "tm:attract", - "tm:blizzard", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:dive", - "tm:doubleteam", - "tm:facade", - "tm:fling", - "tm:frustration", - "tm:grassknot", - "tm:hail", - "tm:hiddenpower", - "tm:honeclaws", - "tm:icebeam", - "tm:lowsweep", - "tm:payback", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:waterfall", - "tm:workup", - "tutor:aquatail", - "tutor:covet", - "tutor:endeavor", - "tutor:focuspunch", - "tutor:gastroacid", - "tutor:gunkshot", - "tutor:helpinghand", - "tutor:hydropump", - "tutor:icepunch", - "tutor:icywind", - "tutor:irontail", - "tutor:knockoff", - "tutor:leer", - "tutor:lick", - "tutor:lowkick", - "tutor:recycle", - "tutor:roleplay", - "tutor:sleeptalk", - "tutor:snore", - "tutor:uproar", - "tutor:watergun", - "tutor:waterpledge", - "tutor:waterpulse" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.panpour.desc" - ], - "evolutions": [ - { - "id": "panpour_simipour", - "variant": "item_interact", - "result": "simipour", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "cobblemon:water_stone" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 6, - "weight": 135, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json b/common/src/main/resources/data/cobblemon/species/generation5/pansage.json deleted file mode 100644 index b063fd28e..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansage.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "name": "Pansage", - "nationalPokedexNumber": 511, - "primaryType": "grass", - "abilities": [ - "gluttony", - "h:overgrow" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:leaf_stone", - "percentage": 2.5 - }, - { - "item": "cobblemon:miracle_seed", - "percentage": 2.5 - }, - { - "item": "cobblemon:occa_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 50, - "attack": 53, - "defence": 48, - "special_attack": 53, - "special_defence": 48, - "speed": 64 - }, - "catchRate": 190, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 63, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:playnice", - "1:scratch", - "4:leer", - "7:lick", - "10:vinewhip", - "13:furyswipes", - "16:leechseed", - "19:bite", - "22:seedbomb", - "25:torment", - "28:fling", - "31:acrobatics", - "34:grassknot", - "37:recycle", - "40:naturalgift", - "43:crunch", - "egg:astonish", - "egg:bulletseed", - "egg:covet", - "egg:disarmingvoice", - "egg:grasswhistle", - "egg:leafstorm", - "egg:lowkick", - "egg:magicalleaf", - "egg:nastyplot", - "egg:roleplay", - "egg:spikyshield", - "egg:tickle", - "tm:acrobatics", - "tm:attract", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:doubleteam", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:frustration", - "tm:grassknot", - "tm:hiddenpower", - "tm:honeclaws", - "tm:lowsweep", - "tm:naturepower", - "tm:payback", - "tm:protect", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:workup", - "tutor:bite", - "tutor:bulletseed", - "tutor:covet", - "tutor:dig", - "tutor:endeavor", - "tutor:focuspunch", - "tutor:gastroacid", - "tutor:gigadrain", - "tutor:grasspledge", - "tutor:gunkshot", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:leafstorm", - "tutor:leer", - "tutor:lick", - "tutor:lowkick", - "tutor:recycle", - "tutor:rocktomb", - "tutor:roleplay", - "tutor:seedbomb", - "tutor:sleeptalk", - "tutor:snore", - "tutor:solarbeam", - "tutor:synthesis", - "tutor:uproar", - "tutor:vinewhip", - "tutor:worryseed" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.pansage.desc" - ], - "evolutions": [ - { - "id": "pansage_simisage", - "variant": "item_interact", - "result": "simisage", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "cobblemon:leaf_stone" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 6, - "weight": 105, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json b/common/src/main/resources/data/cobblemon/species/generation5/pansear.json deleted file mode 100644 index ac65d93b7..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/pansear.json +++ /dev/null @@ -1,169 +0,0 @@ -{ - "name": "Pansear", - "nationalPokedexNumber": 513, - "primaryType": "fire", - "abilities": [ - "gluttony", - "h:blaze" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:fire_stone", - "percentage": 2.5 - }, - { - "item": "cobblemon:charcoal_stick", - "percentage": 2.5 - }, - { - "item": "cobblemon:passho_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 50, - "attack": 53, - "defence": 48, - "special_attack": 53, - "special_defence": 48, - "speed": 64 - }, - "catchRate": 190, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 63, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:playnice", - "1:scratch", - "4:leer", - "7:lick", - "10:incinerate", - "13:furyswipes", - "16:yawn", - "19:bite", - "22:flameburst", - "25:amnesia", - "28:fling", - "31:acrobatics", - "34:fireblast", - "37:recycle", - "40:naturalgift", - "43:crunch", - "egg:astonish", - "egg:belch", - "egg:covet", - "egg:disarmingvoice", - "egg:firepunch", - "egg:firespin", - "egg:flareblitz", - "egg:heatwave", - "egg:lowkick", - "egg:nastyplot", - "egg:roleplay", - "egg:sleeptalk", - "egg:tickle", - "tm:acrobatics", - "tm:attract", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:doubleteam", - "tm:facade", - "tm:fireblast", - "tm:flamecharge", - "tm:flamethrower", - "tm:fling", - "tm:frustration", - "tm:grassknot", - "tm:hiddenpower", - "tm:honeclaws", - "tm:incinerate", - "tm:lowsweep", - "tm:overheat", - "tm:payback", - "tm:protect", - "tm:rest", - "tm:return", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:willowisp", - "tm:workup", - "tutor:covet", - "tutor:endeavor", - "tutor:firepledge", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:gastroacid", - "tutor:gunkshot", - "tutor:heatwave", - "tutor:helpinghand", - "tutor:incinerate", - "tutor:irontail", - "tutor:knockoff", - "tutor:leer", - "tutor:lick", - "tutor:lowkick", - "tutor:recycle", - "tutor:roleplay", - "tutor:sleeptalk", - "tutor:snore", - "tutor:uproar" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.pansear.desc" - ], - "evolutions": [ - { - "id": "pansear_simisear", - "variant": "item_interact", - "result": "simisear", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "cobblemon:fire_stone" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 6, - "weight": 110, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 03d64019d..3e52d829c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/pawniard.json @@ -1,13 +1,54 @@ { - "name": "Pawniard", + "implemented": true, "nationalPokedexNumber": 624, + "name": "Pawniard", "primaryType": "dark", "secondaryType": "steel", + "maleRatio": 0.5, + "height": 5, + "weight": 102, + "pokedex": [ + "cobblemon.species.pawniard.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "defiant", "innerfocus", "h:pressure" ], + "eggGroups": [ + "human_like" + ], + "baseStats": { + "hp": 45, + "attack": 85, + "defence": 70, + "special_attack": 40, + "special_defence": 40, + "speed": 60 + }, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 68, + "experienceGroup": "medium_fast", + "catchRate": 120, + "eggCycles": 20, + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 2, "entries": [ @@ -21,61 +62,37 @@ } ] }, - "baseStats": { - "hp": 45, - "attack": 85, - "defence": 70, - "special_attack": 40, - "special_defence": 40, - "speed": 60 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 68, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], "moves": [ - "1:leer", "1:scratch", + "1:leer", "5:furycutter", "10:metalclaw", "15:torment", - "17:feintattack", "20:scaryface", "25:assurance", "30:metalsound", "35:slash", "40:nightslash", - "41:embargo", "45:irondefense", - "50:laserfocus", "50:retaliate", "55:ironhead", "60:swordsdance", "65:guillotine", + "egg:feintattack", "egg:headbutt", "egg:meanlook", - "egg:psychocut", "egg:pursuit", "egg:quickguard", - "egg:revenge", - "egg:stealthrock", "egg:suckerpunch", "tm:aerialace", "tm:airslash", "tm:assurance", - "tm:attract", "tm:beatup", "tm:brickbreak", - "tm:confide", "tm:cut", "tm:darkpulse", "tm:dig", - "tm:doubleteam", + "tm:dualchop", "tm:embargo", "tm:endure", "tm:facade", @@ -83,15 +100,17 @@ "tm:flashcannon", "tm:fling", "tm:foulplay", - "tm:frustration", + "tm:furycutter", "tm:grassknot", - "tm:hiddenpower", + "tm:headbutt", "tm:honeclaws", "tm:irondefense", "tm:ironhead", + "tm:laserfocus", "tm:lashout", "tm:lowkick", "tm:lowsweep", + "tm:magnetrise", "tm:metalclaw", "tm:metalsound", "tm:payback", @@ -102,26 +121,24 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:rockpolish", "tm:rocksmash", "tm:rocktomb", - "tm:round", + "tm:roleplay", "tm:sandstorm", "tm:scaryface", "tm:screech", - "tm:secretpower", "tm:shadowclaw", "tm:sleeptalk", "tm:snarl", - "tm:snore", + "tm:snatch", "tm:spite", "tm:stealthrock", "tm:steelbeam", "tm:stoneedge", "tm:substitute", - "tm:swagger", + "tm:suckerpunch", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -129,33 +146,47 @@ "tm:thief", "tm:thunderwave", "tm:torment", - "tm:toxic", "tm:xscissor", + "tutor:aerialace", "tutor:darkpulse", "tutor:dualchop", + "tutor:falseswipe", + "tutor:flashcannon", "tutor:foulplay", "tutor:furycutter", "tutor:irondefense", "tutor:ironhead", - "tutor:knockoff", + "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:snore", "tutor:spite", "tutor:stealthrock", "tutor:steelbeam", - "tutor:suckerpunch" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.pawniard.desc" + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:xscissor", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:knockoff", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { @@ -172,24 +203,38 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 102, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "pawniard", + "tier": 1 + }, + { + "pokemon": "bisharp", + "tier": 2 + }, + { + "pokemon": "kingambit", + "tier": 3 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json b/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json deleted file mode 100644 index f9cfdba0e..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/purrloin.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "name": "Purrloin", - "nationalPokedexNumber": 509, - "primaryType": "dark", - "abilities": [ - "limber", - "unburden", - "h:prankster" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:bluk_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 41, - "attack": 50, - "defence": 37, - "special_attack": 50, - "special_defence": 37, - "speed": 66 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 56, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:growl", - "1:scratch", - "4:sandattack", - "5:fakeout", - "6:assist", - "12:furyswipes", - "15:pursuit", - "16:torment", - "21:assurance", - "24:honeclaws", - "28:suckerpunch", - "30:slash", - "32:nastyplot", - "33:captivate", - "36:nightslash", - "39:snatch", - "40:playrough", - "egg:charm", - "egg:copycat", - "egg:covet", - "egg:doubleteam", - "egg:encore", - "egg:faketears", - "egg:feintattack", - "egg:foulplay", - "egg:payday", - "egg:quickattack", - "egg:slash", - "egg:yawn", - "tm:aerialace", - "tm:assurance", - "tm:attract", - "tm:batonpass", - "tm:charm", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:doubleteam", - "tm:dreameater", - "tm:echoedvoice", - "tm:embargo", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:foulplay", - "tm:frustration", - "tm:grassknot", - "tm:gunkshot", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hypervoice", - "tm:irontail", - "tm:nastyplot", - "tm:payback", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:screech", - "tm:secretpower", - "tm:seedbomb", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:taunt", - "tm:thief", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:uturn", - "tutor:covet", - "tutor:darkpulse", - "tutor:foulplay", - "tutor:gunkshot", - "tutor:hypervoice", - "tutor:irontail", - "tutor:knockoff", - "tutor:lashout", - "tutor:roleplay", - "tutor:seedbomb", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:trick" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.purrloin.desc" - ], - "evolutions": [ - { - "id": "purrloin_liepard", - "variant": "level_up", - "result": "liepard", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 20 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 4, - "weight": 101, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 28a43c5e7..1cca6e80a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/reshiram.json @@ -1,10 +1,27 @@ { - "name": "Reshiram", + "implemented": true, "nationalPokedexNumber": 643, + "name": "Reshiram", "primaryType": "dragon", "secondaryType": "fire", + "maleRatio": -1, + "height": 32, + "weight": 3300, + "pokedex": [ + "cobblemon.species.reshiram.desc" + ], + "labels": [ + "gen5", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "turboblaze" + "turboblaze", + "h:turboblaze" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,20 +31,30 @@ "special_defence": 120, "speed": 90 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 340, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ + "1:firefang", + "1:dragonrage", "1:ancientpower", "1:dragonbreath", - "1:dragonrage", - "1:firefang", "1:nobleroar", "8:slash", "16:crunch", @@ -40,15 +67,15 @@ "72:imprison", "80:outrage", "88:blueflare", + "tm:ancientpower", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", "tm:brutalswing", - "tm:confide", "tm:crunch", "tm:cut", + "tm:defog", "tm:doubleedge", - "tm:doubleteam", "tm:dracometeor", "tm:dragoncheer", "tm:dragonclaw", @@ -69,17 +96,16 @@ "tm:fling", "tm:fly", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:heatcrash", "tm:heatwave", "tm:helpinghand", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:hypervoice", "tm:imprison", "tm:incinerate", + "tm:laserfocus", "tm:lightscreen", "tm:mysticalfire", "tm:outrage", @@ -90,87 +116,102 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:round", "tm:safeguard", "tm:scaleshot", "tm:scaryface", "tm:scorchingsands", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:steelwing", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:tailwind", "tm:takedown", "tm:terablast", - "tm:toxic", "tm:weatherball", "tm:willowisp", "tm:zenheadbutt", - "tutor:blueflare", + "tutor:ancientpower", "tutor:defog", "tutor:dracometeor", - "tutor:dragonbreath", - "tutor:dragonclaw", "tutor:dragonpulse", "tutor:dualwingbeat", "tutor:earthpower", - "tutor:extrasensory", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", "tutor:heatwave", - "tutor:imprison", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", "tutor:laserfocus", - "tutor:mist", - "tutor:nobleroar", + "tutor:mysticalfire", "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", "tutor:roost", "tutor:scaleshot", "tutor:scorchingsands", - "tutor:slash", + "tutor:shadowball", + "tutor:shadowclaw", "tutor:sleeptalk", - "tutor:snore", + "tutor:stoneedge", + "tutor:swift", "tutor:tailwind", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "legendary" - ], - "pokedex": [ - "cobblemon.species.reshiram.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "special:mist" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "fireImmune": true }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 32, - "weight": 3300, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:dragon_breath", + "quantityRange": "2-3" + } + ] + } } \ 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 deleted file mode 100644 index dd67b59d9..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/reuniclus.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "name": "Reuniclus", - "nationalPokedexNumber": 579, - "primaryType": "psychic", - "abilities": [ - "overcoat", - "magicguard", - "h:regenerator" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-3" - }, - { - "item": "cobblemon:persim_berry", - "percentage": 10.0 - } - ] - }, - "baseStats": { - "hp": 110, - "attack": 65, - "defence": 75, - "special_attack": 125, - "special_defence": 85, - "speed": 30 - }, - "catchRate": 50, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 245, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:confusion", - "1:dizzypunch", - "1:endeavor", - "1:protect", - "1:psywave", - "1:recover", - "1:rollout", - "1:snatch", - "12:psybeam", - "14:hiddenpower", - "16:charm", - "20:psyshock", - "24:lightscreen", - "24:reflect", - "28:allyswitch", - "35:painsplit", - "40:psychic", - "48:skillswap", - "54:healblock", - "56:futuresight", - "64:wonderroom", - "tm:allyswitch", - "tm:attract", - "tm:bodyslam", - "tm:calmmind", - "tm:charm", - "tm:confide", - "tm:confuseray", - "tm:doubleteam", - "tm:drainpunch", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:explosion", - "tm:facade", - "tm:firepunch", - "tm:flash", - "tm:flashcannon", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:gyroball", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icepunch", - "tm:imprison", - "tm:infestation", - "tm:irondefense", - "tm:knockoff", - "tm:lightscreen", - "tm:megapunch", - "tm:nightshade", - "tm:painsplit", - "tm:powerswap", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:swift", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:allyswitch", - "tutor:drainpunch", - "tutor:endeavor", - "tutor:expandingforce", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:gravity", - "tutor:helpinghand", - "tutor:icepunch", - "tutor:irondefense", - "tutor:knockoff", - "tutor:laserfocus", - "tutor:magiccoat", - "tutor:painsplit", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:steelroller", - "tutor:superpower", - "tutor:telekinesis", - "tutor:thunderpunch", - "tutor:trick", - "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.reuniclus.desc" - ], - "preEvolution": "duosion", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 10, - "weight": 201, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json b/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json deleted file mode 100644 index dcc354f44..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/rufflet.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "name": "Rufflet", - "nationalPokedexNumber": 627, - "primaryType": "normal", - "secondaryType": "flying", - "abilities": [ - "keeneye", - "sheerforce", - "h:hustle" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-1" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:razz_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 70, - "attack": 83, - "defence": 50, - "special_attack": 37, - "special_defence": 50, - "speed": 60 - }, - "catchRate": 190, - "maleRatio": 1, - "shoulderMountable": false, - "baseExperienceYield": 70, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "flying" - ], - "moves": [ - "1:leer", - "1:peck", - "5:furyattack", - "6:honeclaws", - "12:wingattack", - "18:tailwind", - "24:scaryface", - "30:aerialace", - "36:slash", - "42:whirlwind", - "48:crushclaw", - "50:skydrop", - "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:attract", - "tm:bodyslam", - "tm:bravebird", - "tm:bulkup", - "tm:closecombat", - "tm:confide", - "tm:cut", - "tm:doubleedge", - "tm:doubleteam", - "tm:dualwingbeat", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:frustration", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hurricane", - "tm:pluck", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:shadowclaw", - "tm:skydrop", - "tm:sleeptalk", - "tm:snore", - "tm:steelwing", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:uturn", - "tm:workup", - "tm:zenheadbutt", - "tutor:defog", - "tutor:dualwingbeat", - "tutor:heatwave", - "tutor:roost", - "tutor:sleeptalk", - "tutor:snore", - "tutor:superpower", - "tutor:tailwind" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.rufflet.desc" - ], - "evolutions": [ - { - "id": "rufflet_braviary", - "variant": "level_up", - "result": "braviary", - "consumeHeldItem": false, - "learnableMoves": [ - "superpower" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 54 - } - ] - }, - { - "id": "rufflet_braviary", - "variant": "level_up", - "result": "braviary hisuian", - "consumeHeldItem": false, - "learnableMoves": [ - "esperwing" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 54 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 105, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 b3c4d1aa1..a3eec0287 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/sawk.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/sawk.json @@ -1,12 +1,53 @@ { - "name": "Sawk", + "implemented": true, "nationalPokedexNumber": 539, + "name": "Sawk", "primaryType": "fighting", + "maleRatio": 1, + "height": 14, + "weight": 510, + "pokedex": [ + "cobblemon.species.sawk.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "sturdy", "innerfocus", "h:moldbreaker" ], + "eggGroups": [ + "human_like" + ], + "baseStats": { + "hp": 75, + "attack": 125, + "defence": 75, + "special_attack": 30, + "special_defence": 75, + "speed": 85 + }, + "evYield": { + "hp": 0, + "attack": 2, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 163, + "experienceGroup": "medium_fast", + "catchRate": 45, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 3, "entries": [ @@ -24,31 +65,14 @@ } ] }, - "baseStats": { - "hp": 75, - "attack": 125, - "defence": 75, - "special_attack": 30, - "special_defence": 75, - "speed": 85 - }, - "catchRate": 45, - "maleRatio": 1, - "shoulderMountable": false, - "baseExperienceYield": 163, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], "moves": [ - "1:bide", - "1:leer", "1:rocksmash", + "1:leer", + "1:bide", + "1:karatechop", "5:focusenergy", "10:doublekick", "15:quickguard", - "17:karatechop", "20:lowsweep", "25:bulkup", "30:retaliate", @@ -57,14 +81,14 @@ "45:endure", "50:reversal", "55:closecombat", - "tm:attract", + "tm:block", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:confide", + "tm:coaching", "tm:dig", - "tm:doubleteam", + "tm:dualchop", "tm:earthquake", "tm:endure", "tm:facade", @@ -72,16 +96,18 @@ "tm:fling", "tm:focusblast", "tm:focusenergy", - "tm:frustration", + "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", - "tm:hiddenpower", "tm:icepunch", + "tm:knockoff", + "tm:laserfocus", "tm:lowkick", "tm:lowsweep", "tm:megakick", "tm:megapunch", + "tm:painsplit", "tm:payback", "tm:poisonjab", "tm:poweruppunch", @@ -89,73 +115,76 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:reversal", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:scaryface", - "tm:secretpower", "tm:sleeptalk", - "tm:snore", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:taunt", + "tm:terablast", "tm:throatchop", "tm:thunderpunch", - "tm:toxic", "tm:workup", "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:snore", + "tutor:stoneedge", "tutor:superpower", "tutor:throatchop", "tutor:thunderpunch", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.sawk.desc" + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 14, - "weight": 510, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json b/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json deleted file mode 100644 index 1aa79f424..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/scrafty.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "name": "Scrafty", - "nationalPokedexNumber": 560, - "primaryType": "dark", - "secondaryType": "fighting", - "abilities": [ - "shedskin", - "moxie", - "h:intimidate" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:black_belt", - "percentage": 5.0 - }, - { - "item": "cobblemon:roseli_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 65, - "attack": 90, - "defence": 115, - "special_attack": 45, - "special_defence": 115, - "speed": 58 - }, - "catchRate": 90, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 171, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "field", - "dragon" - ], - "moves": [ - "1:feintattack", - "1:headbutt", - "1:leer", - "1:lowkick", - "1:payback", - "12:sandattack", - "16:facade", - "20:protect", - "20:torment", - "24:beatup", - "27:chipaway", - "28:scaryface", - "32:brickbreak", - "36:swagger", - "42:crunch", - "48:highjumpkick", - "51:rockclimb", - "54:focuspunch", - "60:headsmash", - "tm:acidspray", - "tm:amnesia", - "tm:assurance", - "tm:attract", - "tm:beatup", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:closecombat", - "tm:coaching", - "tm:confide", - "tm:crunch", - "tm:curse", - "tm:darkpulse", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:firepunch", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icepunch", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:knockoff", - "tm:lashout", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:outrage", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:revenge", - "tm:reversal", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:smackdown", - "tm:snarl", - "tm:snore", - "tm:spite", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderpunch", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:workup", - "tm:zenheadbutt", - "tutor:coaching", - "tutor:darkpulse", - "tutor:dragonpulse", - "tutor:drainpunch", - "tutor:dualchop", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:foulplay", - "tutor:icepunch", - "tutor:irondefense", - "tutor:ironhead", - "tutor:irontail", - "tutor:knockoff", - "tutor:lashout", - "tutor:lowkick", - "tutor:outrage", - "tutor:payback", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:substitute", - "tutor:superfang", - "tutor:throatchop", - "tutor:thunderpunch", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.scrafty.desc" - ], - "preEvolution": "scraggy", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 11, - "weight": 300, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json b/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json deleted file mode 100644 index eddc65080..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/scraggy.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "name": "Scraggy", - "nationalPokedexNumber": 559, - "primaryType": "dark", - "secondaryType": "fighting", - "abilities": [ - "shedskin", - "moxie", - "h:intimidate" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:black_belt", - "percentage": 2.5 - }, - { - "item": "cobblemon:roseli_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 50, - "attack": 75, - "defence": 70, - "special_attack": 35, - "special_defence": 70, - "speed": 48 - }, - "catchRate": 180, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 70, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "field", - "dragon" - ], - "moves": [ - "1:leer", - "1:lowkick", - "4:payback", - "8:headbutt", - "9:feintattack", - "12:sandattack", - "16:facade", - "20:protect", - "20:torment", - "24:beatup", - "27:chipaway", - "28:scaryface", - "32:brickbreak", - "36:swagger", - "40:crunch", - "44:highjumpkick", - "45:rockclimb", - "48:focuspunch", - "52:headsmash", - "egg:acidspray", - "egg:amnesia", - "egg:counter", - "egg:detect", - "egg:dragondance", - "egg:drainpunch", - "egg:fakeout", - "egg:feintattack", - "egg:firepunch", - "egg:icepunch", - "egg:poweruppunch", - "egg:quickguard", - "egg:thunderpunch", - "egg:zenheadbutt", - "tm:acidspray", - "tm:amnesia", - "tm:assurance", - "tm:attract", - "tm:beatup", - "tm:brickbreak", - "tm:bulkup", - "tm:closecombat", - "tm:coaching", - "tm:confide", - "tm:crunch", - "tm:curse", - "tm:darkpulse", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:faketears", - "tm:firepunch", - "tm:fling", - "tm:focusblast", - "tm:focuspunch", - "tm:foulplay", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:icepunch", - "tm:incinerate", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:knockoff", - "tm:lashout", - "tm:lowkick", - "tm:lowsweep", - "tm:megakick", - "tm:megapunch", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:revenge", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:smackdown", - "tm:snarl", - "tm:snore", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderpunch", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:workup", - "tm:zenheadbutt", - "tutor:coaching", - "tutor:darkpulse", - "tutor:dragonpulse", - "tutor:drainpunch", - "tutor:dualchop", - "tutor:fakeout", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:foulplay", - "tutor:headbutt", - "tutor:highjumpkick", - "tutor:icepunch", - "tutor:irondefense", - "tutor:ironhead", - "tutor:irontail", - "tutor:knockoff", - "tutor:lashout", - "tutor:leer", - "tutor:lowkick", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:superfang", - "tutor:thunderpunch", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.scraggy.desc" - ], - "evolutions": [ - { - "id": "scraggy_scrafty", - "variant": "level_up", - "result": "scrafty", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 39 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 118, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 ad21f6bfa..404eb6486 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/seismitoad.json @@ -1,13 +1,77 @@ { - "name": "Seismitoad", + "implemented": true, "nationalPokedexNumber": 537, + "name": "Seismitoad", "primaryType": "water", "secondaryType": "ground", + "maleRatio": 0.5, + "height": 15, + "weight": 620, + "pokedex": [ + "cobblemon.species.seismitoad.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "swiftswim", "poisontouch", "h:waterabsorb" ], + "eggGroups": [ + "water_1" + ], + "baseStats": { + "hp": 105, + "attack": 95, + "defence": 75, + "special_attack": 85, + "special_defence": 75, + "speed": 74 + }, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 255, + "experienceGroup": "medium_slow", + "catchRate": 45, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "canBreatheUnderwater": true, + "swimSpeed": "0.2" + } + }, + "herd": { + "maxSize": "8" + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, "drops": { "amount": 4, "entries": [ @@ -21,74 +85,66 @@ } ] }, - "baseStats": { - "hp": 105, - "attack": 95, - "defence": 75, - "special_attack": 85, - "special_defence": 75, - "speed": 74 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 255, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "water_1" - ], "moves": [ - "1:acid", "1:bubble", - "1:echoedvoice", - "1:gastroacid", "1:growl", "1:supersonic", + "1:acid", + "1:drainpunch", + "1:echoedvoice", + "1:gastroacid", "12:mudshot", "16:round", "20:bubblebeam", "24:flail", "30:uproar", "39:aquaring", - "44:drainpunch", "46:hypervoice", "54:muddywater", "62:raindance", "70:hydropump", - "tm:attract", + "egg:mist", + "egg:mudbomb", + "egg:mudslap", + "egg:mudsport", + "egg:refresh", + "egg:snore", + "egg:toxic", + "egg:waterpulse", + "tm:afteryou", "tm:bounce", "tm:brickbreak", "tm:bulldoze", - "tm:confide", "tm:dig", "tm:dive", - "tm:doubleteam", "tm:drainpunch", "tm:earthpower", "tm:earthquake", "tm:echoedvoice", + "tm:endeavor", "tm:endure", "tm:facade", "tm:fling", "tm:focusblast", - "tm:frustration", + "tm:focuspunch", + "tm:gastroacid", "tm:gigaimpact", "tm:grassknot", "tm:hail", - "tm:hiddenpower", "tm:hydropump", "tm:hyperbeam", "tm:hypervoice", "tm:icepunch", "tm:icywind", "tm:infestation", + "tm:knockoff", "tm:liquidation", "tm:lowkick", "tm:megakick", "tm:megapunch", "tm:muddywater", "tm:mudshot", + "tm:mudslap", "tm:payback", "tm:poisonjab", "tm:poweruppunch", @@ -96,14 +152,12 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:round", "tm:scald", "tm:screech", - "tm:secretpower", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", @@ -113,57 +167,51 @@ "tm:strength", "tm:substitute", "tm:surf", - "tm:swagger", + "tm:terablast", "tm:toxic", "tm:uproar", "tm:venomdrench", "tm:venoshock", + "tm:waterpulse", "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" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.seismitoad.desc" + "tutor:waterpulse", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:secretpower", + "legacy:swagger" ], "preEvolution": "palpitoad", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 620, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json b/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json deleted file mode 100644 index 33abf8be7..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/sewaddle.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "name": "Sewaddle", - "nationalPokedexNumber": 540, - "primaryType": "bug", - "secondaryType": "grass", - "abilities": [ - "swarm", - "chlorophyll", - "h:overcoat" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:mental_herb", - "percentage": 2.5 - }, - { - "item": "cobblemon:revival_herb", - "percentage": 2.5 - }, - { - "item": "cobblemon:coba_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 45, - "attack": 53, - "defence": 70, - "special_attack": 40, - "special_defence": 60, - "speed": 42 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 62, - "experienceGroup": "medium_slow", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:stringshot", - "1:tackle", - "8:bugbite", - "15:razorleaf", - "22:strugglebug", - "29:endure", - "31:stickyweb", - "36:bugbuzz", - "43:flail", - "egg:agility", - "egg:airslash", - "egg:batonpass", - "egg:camouflage", - "egg:grassyterrain", - "egg:mefirst", - "egg:mindreader", - "egg:razorwind", - "egg:screech", - "egg:silverwind", - "egg:snore", - "egg:switcheroo", - "egg:synthesis", - "egg:worryseed", - "tm:attract", - "tm:batonpass", - "tm:bugbite", - "tm:bugbuzz", - "tm:calmmind", - "tm:charm", - "tm:confide", - "tm:cut", - "tm:doubleteam", - "tm:dreameater", - "tm:electroweb", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:hiddenpower", - "tm:irondefense", - "tm:lightscreen", - "tm:lunge", - "tm:magicalleaf", - "tm:naturepower", - "tm:payback", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:seedbomb", - "tm:skittersmack", - "tm:sleeptalk", - "tm:solarbeam", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tutor:bugbite", - "tutor:electroweb", - "tutor:gigadrain", - "tutor:irondefense", - "tutor:magiccoat", - "tutor:seedbomb", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:synthesis", - "tutor:worryseed" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.sewaddle.desc" - ], - "evolutions": [ - { - "id": "sewaddle_swadloon", - "variant": "level_up", - "result": "swadloon", - "consumeHeldItem": false, - "learnableMoves": [ - "protect" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 20 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 25, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json b/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json deleted file mode 100644 index 3ef48edad..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/shelmet.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "name": "Shelmet", - "nationalPokedexNumber": 616, - "primaryType": "bug", - "abilities": [ - "hydration", - "shellarmor", - "h:overcoat" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:iron_helmet", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 50, - "attack": 40, - "defence": 85, - "special_attack": 40, - "special_defence": 65, - "speed": 25 - }, - "catchRate": 200, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:absorb", - "1:leechlife", - "1:protect", - "4:acid", - "8:bide", - "8:curse", - "12:megadrain", - "16:strugglebug", - "20:yawn", - "24:acidarmor", - "28:gigadrain", - "32:guardswap", - "36:bodyslam", - "40:recover", - "44:bugbuzz", - "48:finalgambit", - "egg:batonpass", - "egg:doubleedge", - "egg:encore", - "egg:endure", - "egg:feint", - "egg:guardsplit", - "egg:mindreader", - "egg:mudslap", - "egg:pursuit", - "egg:spikes", - "egg:toxicspikes", - "tm:attract", - "tm:batonpass", - "tm:bodyslam", - "tm:bugbuzz", - "tm:confide", - "tm:doubleteam", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:frustration", - "tm:gigadrain", - "tm:guardswap", - "tm:hiddenpower", - "tm:infestation", - "tm:leechlife", - "tm:mudshot", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snore", - "tm:spikes", - "tm:strugglebug", - "tm:substitute", - "tm:swagger", - "tm:toxic", - "tm:toxicspikes", - "tm:venoshock", - "tutor:acid", - "tutor:batonpass", - "tutor:bodyslam", - "tutor:bugbite", - "tutor:bugbuzz", - "tutor:encore", - "tutor:gastroacid", - "tutor:gigadrain", - "tutor:megadrain", - "tutor:protect", - "tutor:signalbeam", - "tutor:skittersmack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:strugglebug", - "tutor:yawn" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.shelmet.desc" - ], - "evolutions": [ - { - "id": "shelmet_accelgor", - "variant": "trade", - "result": "accelgor", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "karrablast" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 77, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ 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 deleted file mode 100644 index 1bb6f8407..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/simipour.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "name": "Simipour", - "nationalPokedexNumber": 516, - "primaryType": "water", - "abilities": [ - "gluttony", - "h:torrent" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:water_stone", - "percentage": 5.0 - }, - { - "item": "cobblemon:mystic_water", - "percentage": 5.0 - }, - { - "item": "cobblemon:rindo_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 63, - "special_attack": 98, - "special_defence": 63, - "speed": 101 - }, - "catchRate": 75, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 174, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:furyswipes", - "1:leer", - "1:lick", - "1:scald", - "tm:acrobatics", - "tm:attract", - "tm:blizzard", - "tm:brickbreak", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:dive", - "tm:doubleteam", - "tm:facade", - "tm:fling", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:hail", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:lowsweep", - "tm:payback", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:waterfall", - "tm:workup", - "tutor:aquatail", - "tutor:covet", - "tutor:endeavor", - "tutor:focuspunch", - "tutor:gastroacid", - "tutor:gunkshot", - "tutor:helpinghand", - "tutor:icepunch", - "tutor:icywind", - "tutor:irontail", - "tutor:knockoff", - "tutor:lowkick", - "tutor:recycle", - "tutor:roleplay", - "tutor:sleeptalk", - "tutor:snore", - "tutor:superpower", - "tutor:throatchop", - "tutor:uproar", - "tutor:waterpledge", - "tutor:waterpulse" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.simipour.desc" - ], - "preEvolution": "panpour", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 10, - "weight": 290, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json b/common/src/main/resources/data/cobblemon/species/generation5/simisage.json deleted file mode 100644 index ee8251ce1..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisage.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "name": "Simisage", - "nationalPokedexNumber": 512, - "primaryType": "grass", - "abilities": [ - "gluttony", - "h:overgrow" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:leaf_stone", - "percentage": 5.0 - }, - { - "item": "cobblemon:miracle_seed", - "percentage": 5.0 - }, - { - "item": "cobblemon:occa_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 63, - "special_attack": 98, - "special_defence": 63, - "speed": 101 - }, - "catchRate": 75, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 174, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:furyswipes", - "1:leer", - "1:lick", - "1:seedbomb", - "tm:acrobatics", - "tm:attract", - "tm:brickbreak", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:doubleteam", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:lowsweep", - "tm:naturepower", - "tm:payback", - "tm:poweruppunch", - "tm:protect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:workup", - "tutor:covet", - "tutor:endeavor", - "tutor:focuspunch", - "tutor:gastroacid", - "tutor:gigadrain", - "tutor:grasspledge", - "tutor:gunkshot", - "tutor:helpinghand", - "tutor:irontail", - "tutor:knockoff", - "tutor:lowkick", - "tutor:recycle", - "tutor:roleplay", - "tutor:seedbomb", - "tutor:sleeptalk", - "tutor:snore", - "tutor:superpower", - "tutor:synthesis", - "tutor:throatchop", - "tutor:uproar", - "tutor:worryseed" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.simisage.desc" - ], - "preEvolution": "pansage", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 11, - "weight": 305, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json b/common/src/main/resources/data/cobblemon/species/generation5/simisear.json deleted file mode 100644 index 738f3faae..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/simisear.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "name": "Simisear", - "nationalPokedexNumber": 514, - "primaryType": "fire", - "abilities": [ - "gluttony", - "h:blaze" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:fire_stone", - "percentage": 5.0 - }, - { - "item": "cobblemon:charcoal_stick", - "percentage": 5.0 - }, - { - "item": "cobblemon:passho_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 63, - "special_attack": 98, - "special_defence": 63, - "speed": 101 - }, - "catchRate": 75, - "maleRatio": 0.875, - "shoulderMountable": false, - "baseExperienceYield": 174, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:flameburst", - "1:furyswipes", - "1:leer", - "1:lick", - "tm:acrobatics", - "tm:attract", - "tm:brickbreak", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:doubleteam", - "tm:facade", - "tm:fireblast", - "tm:flamecharge", - "tm:flamethrower", - "tm:fling", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:incinerate", - "tm:lowsweep", - "tm:overheat", - "tm:payback", - "tm:poweruppunch", - "tm:protect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:willowisp", - "tm:workup", - "tutor:covet", - "tutor:endeavor", - "tutor:firepledge", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:gastroacid", - "tutor:gigaimpact", - "tutor:gunkshot", - "tutor:heatwave", - "tutor:helpinghand", - "tutor:honeclaws", - "tutor:irontail", - "tutor:knockoff", - "tutor:lowkick", - "tutor:poweruppunch", - "tutor:recycle", - "tutor:roleplay", - "tutor:sleeptalk", - "tutor:snore", - "tutor:superpower", - "tutor:throatchop", - "tutor:uproar", - "tutor:workup" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.simisear.desc" - ], - "preEvolution": "pansear", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 10, - "weight": 280, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json b/common/src/main/resources/data/cobblemon/species/generation5/solosis.json deleted file mode 100644 index 0a90f103d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/solosis.json +++ /dev/null @@ -1,197 +0,0 @@ -{ - "name": "Solosis", - "nationalPokedexNumber": 577, - "primaryType": "psychic", - "abilities": [ - "overcoat", - "magicguard", - "h:regenerator" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:persim_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 45, - "attack": 30, - "defence": 40, - "special_attack": 105, - "special_defence": 50, - "speed": 20 - }, - "catchRate": 200, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 58, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:confusion", - "1:protect", - "1:psywave", - "4:recover", - "7:rollout", - "8:endeavor", - "10:snatch", - "12:psybeam", - "14:hiddenpower", - "16:charm", - "20:psyshock", - "24:lightscreen", - "24:reflect", - "28:allyswitch", - "33:painsplit", - "36:psychic", - "40:skillswap", - "44:futuresight", - "46:healblock", - "48:wonderroom", - "egg:acidarmor", - "egg:astonish", - "egg:confuseray", - "egg:helpinghand", - "egg:imprison", - "egg:nightshade", - "egg:secretpower", - "egg:trick", - "tm:allyswitch", - "tm:attract", - "tm:calmmind", - "tm:charm", - "tm:confide", - "tm:confuseray", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:explosion", - "tm:facade", - "tm:flash", - "tm:flashcannon", - "tm:frustration", - "tm:futuresight", - "tm:gravity", - "tm:guardswap", - "tm:gyroball", - "tm:helpinghand", - "tm:hiddenpower", - "tm:imprison", - "tm:infestation", - "tm:irondefense", - "tm:lightscreen", - "tm:nightshade", - "tm:painsplit", - "tm:powerswap", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:telekinesis", - "tm:terablast", - "tm:thunder", - "tm:thunderwave", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:allyswitch", - "tutor:endeavor", - "tutor:expandingforce", - "tutor:gravity", - "tutor:helpinghand", - "tutor:irondefense", - "tutor:magiccoat", - "tutor:painsplit", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore", - "tutor:steelroller", - "tutor:telekinesis", - "tutor:trick", - "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.solosis.desc" - ], - "evolutions": [ - { - "id": "solosis_duosion", - "variant": "level_up", - "result": "duosion", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 32 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 10, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json b/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json deleted file mode 100644 index de27af90f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/stunfisk.json +++ /dev/null @@ -1,286 +0,0 @@ -{ - "name": "Stunfisk", - "nationalPokedexNumber": 618, - "primaryType": "ground", - "secondaryType": "electric", - "abilities": [ - "static", - "limber", - "h:sandveil" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:mud", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:passho_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 109, - "attack": 66, - "defence": 84, - "special_attack": 81, - "special_defence": 99, - "speed": 32 - }, - "features": [ - "galarian" - ], - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Galar", - "primaryType": "ground", - "secondaryType": "steel", - "abilities": [ - "mimicry" - ], - "baseStats": { - "hp": 109, - "attack": 81, - "defence": 99, - "special_attack": 66, - "special_defence": 84, - "speed": 32 - }, - "catchRate": 75, - "maleRatio": 0.5, - "baseExperienceYield": 165, - "baseFriendship": 70, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "amorphous" - ], - "moves": [ - "1:metalclaw", - "1:mudslap", - "1:tackle", - "1:watergun", - "5:endure", - "10:mudshot", - "15:revenge", - "20:metalsound", - "25:suckerpunch", - "30:irondefense", - "35:bounce", - "40:muddywater", - "45:snaptrap", - "50:flail", - "55:fissure", - "egg:astonish", - "egg:bind", - "egg:counter", - "egg:curse", - "egg:painsplit", - "egg:reflecttype", - "egg:spite", - "egg:yawn", - "tm:attract", - "tm:bounce", - "tm:bulldoze", - "tm:crunch", - "tm:dig", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:flashcannon", - "tm:foulplay", - "tm:icefang", - "tm:irondefense", - "tm:muddywater", - "tm:mudshot", - "tm:payback", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:revenge", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:scald", - "tm:screech", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snore", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:substitute", - "tm:surf", - "tm:thunderwave", - "tm:uproar", - "tutor:lashout", - "tutor:steelbeam", - "tutor:terrainpulse" - ], - "labels": [ - "gen8", - "galar_regional" - ], - "aspects": [ - "galarian" - ], - "height": 7, - "weight": 205, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "amorphous" - ], - "moves": [ - "1:mudslap", - "1:mudsport", - "1:tackle", - "1:thundershock", - "1:watergun", - "5:bide", - "5:endure", - "10:mudshot", - "15:revenge", - "17:camouflage", - "20:charge", - "21:mudbomb", - "25:suckerpunch", - "30:electricterrain", - "35:bounce", - "40:muddywater", - "45:discharge", - "45:thunderbolt", - "50:flail", - "55:fissure", - "egg:astonish", - "egg:curse", - "egg:earthpower", - "egg:eerieimpulse", - "egg:mefirst", - "egg:painsplit", - "egg:reflecttype", - "egg:shockwave", - "egg:sleeptalk", - "egg:spark", - "egg:spite", - "egg:yawn", - "tm:attract", - "tm:bounce", - "tm:bulldoze", - "tm:confide", - "tm:dig", - "tm:doubleteam", - "tm:earthpower", - "tm:earthquake", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:foulplay", - "tm:frustration", - "tm:hiddenpower", - "tm:infestation", - "tm:muddywater", - "tm:mudshot", - "tm:payback", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:revenge", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:scald", - "tm:secretpower", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snore", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:uproar", - "tutor:aquatail", - "tutor:bounce", - "tutor:curse", - "tutor:earthpower", - "tutor:electroweb", - "tutor:endeavor", - "tutor:foulplay", - "tutor:lashout", - "tutor:magnetrise", - "tutor:mudslap", - "tutor:painsplit", - "tutor:shockwave", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spite", - "tutor:stealthrock", - "tutor:stompingtantrum", - "tutor:uproar", - "tutor:waterpulse", - "tutor:yawn" - ], - "labels": [ - "gen5", - "unova_regional" - ], - "pokedex": [ - "cobblemon.species.stunfisk.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 7, - "weight": 110, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json b/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json deleted file mode 100644 index dd22a7fa3..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/swadloon.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "name": "Swadloon", - "nationalPokedexNumber": 541, - "primaryType": "bug", - "secondaryType": "grass", - "abilities": [ - "leafguard", - "chlorophyll", - "h:overcoat" - ], - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:mental_herb", - "percentage": 5.0 - }, - { - "item": "cobblemon:revival_herb", - "percentage": 5.0 - }, - { - "item": "cobblemon:coba_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 55, - "attack": 63, - "defence": 90, - "special_attack": 50, - "special_defence": 80, - "speed": 42 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 133, - "experienceGroup": "medium_slow", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:bugbite", - "1:grasswhistle", - "1:protect", - "1:razorleaf", - "1:stringshot", - "1:tackle", - "22:strugglebug", - "29:endure", - "31:stickyweb", - "36:bugbuzz", - "43:flail", - "tm:attract", - "tm:batonpass", - "tm:bugbite", - "tm:bugbuzz", - "tm:calmmind", - "tm:charm", - "tm:confide", - "tm:cut", - "tm:doubleteam", - "tm:dreameater", - "tm:electroweb", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:hiddenpower", - "tm:irondefense", - "tm:lightscreen", - "tm:lunge", - "tm:magicalleaf", - "tm:naturepower", - "tm:payback", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:seedbomb", - "tm:skittersmack", - "tm:sleeptalk", - "tm:solarbeam", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tutor:bugbite", - "tutor:electroweb", - "tutor:gigadrain", - "tutor:irondefense", - "tutor:magiccoat", - "tutor:seedbomb", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:synthesis", - "tutor:worryseed" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.swadloon.desc" - ], - "preEvolution": "sewaddle", - "evolutions": [ - { - "id": "swadloon_leavanny", - "variant": "level_up", - "result": "leavanny", - "consumeHeldItem": false, - "learnableMoves": [ - "slash" - ], - "requirements": [ - { - "variant": "friendship", - "amount": 160 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 73, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json b/common/src/main/resources/data/cobblemon/species/generation5/swanna.json deleted file mode 100644 index 04e18e3ca..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/swanna.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "name": "Swanna", - "nationalPokedexNumber": 581, - "primaryType": "water", - "secondaryType": "flying", - "abilities": [ - "keeneye", - "bigpecks", - "h:hydration" - ], - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-2" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:sharp_beak", - "percentage": 2.5 - }, - { - "item": "cobblemon:wacan_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 75, - "attack": 87, - "defence": 63, - "special_attack": 87, - "special_defence": 63, - "speed": 98 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "flying" - ], - "moves": [ - "1:defog", - "1:watergun", - "1:watersport", - "1:wingattack", - "13:waterpulse", - "15:aerialace", - "19:bubblebeam", - "21:featherdance", - "24:aquaring", - "27:airslash", - "30:roost", - "34:raindance", - "40:tailwind", - "47:bravebird", - "55:hurricane", - "tm:acrobatics", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:alluringvoice", - "tm:attract", - "tm:bravebird", - "tm:chillingwater", - "tm:confide", - "tm:disarmingvoice", - "tm:dive", - "tm:doubleedge", - "tm:doubleteam", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:flipturn", - "tm:fly", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:knockoff", - "tm:liquidation", - "tm:pluck", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roost", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:sleeptalk", - "tm:steelwing", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tutor:defog", - "tutor:endeavor", - "tutor:icywind", - "tutor:liquidation", - "tutor:roost", - "tutor:skyattack", - "tutor:sleeptalk", - "tutor:snore", - "tutor:tailwind", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.swanna.desc" - ], - "preEvolution": "ducklett", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 13, - "weight": 242, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 07148193d..42841e52b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/terrakion.json @@ -1,19 +1,27 @@ { - "name": "Terrakion", + "implemented": true, "nationalPokedexNumber": 639, + "name": "Terrakion", "primaryType": "rock", "secondaryType": "fighting", + "maleRatio": -1, + "height": 19, + "weight": 2600, + "pokedex": [ + "cobblemon.species.terrakion.desc" + ], + "labels": [ + "gen5", + "legendary" + ], + "aspects": [], "abilities": [ - "justified" + "justified", + "h:justified" + ], + "eggGroups": [ + "undiscovered" ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:hard_stone" - } - ] - }, "baseStats": { "hp": 91, "attack": 129, @@ -22,19 +30,37 @@ "special_defence": 90, "speed": 108 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:hard_stone" + } + ] + }, "moves": [ - "1:helpinghand", - "1:leer", "1:quickattack", + "1:leer", + "1:helpinghand", "1:workup", "7:smackdown", "14:quickguard", @@ -49,29 +75,27 @@ "tm:aerialace", "tm:airslash", "tm:aurasphere", + "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", "tm:calmmind", "tm:closecombat", "tm:coaching", - "tm:confide", "tm:cut", "tm:doubleedge", - "tm:doubleteam", "tm:earthpower", "tm:earthquake", "tm:endure", "tm:facade", "tm:falseswipe", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:helpinghand", - "tm:hiddenpower", "tm:highhorsepower", "tm:hyperbeam", "tm:ironhead", + "tm:laserfocus", "tm:megahorn", "tm:poisonjab", "tm:protect", @@ -79,7 +103,6 @@ "tm:reflect", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:reversal", "tm:roar", @@ -88,75 +111,102 @@ "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:safeguard", "tm:sandstorm", "tm:scaryface", - "tm:secretpower", "tm:sleeptalk", "tm:smackdown", "tm:smartstrike", - "tm:snore", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:superpower", - "tm:swagger", "tm:swift", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:toxic", "tm:upperhand", "tm:workup", "tm:xscissor", "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:quickguard", - "tutor:retaliate", + "tutor:megahorn", + "tutor:poisonjab", + "tutor:rest", "tutor:rockslide", + "tutor:rocksmash", "tutor:sleeptalk", - "tutor:snore", "tutor:stealthrock", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", - "tutor:workup", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "legendary" - ], - "pokedex": [ - "cobblemon.species.terrakion.desc" + "tutor:swift", + "tutor:xscissor", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 19, - "weight": 2600, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "cobalion", + "tier": 1 + }, + { + "pokemon": "terrakion", + "tier": 1 + }, + { + "pokemon": "virizion", + "tier": 1 + }, + { + "pokemon": "keldeo resolute", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "fireImmune": true + } } \ 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 9bd5e1ee0..cc2893b92 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/throh.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/throh.json @@ -1,12 +1,53 @@ { - "name": "Throh", + "implemented": true, "nationalPokedexNumber": 538, + "name": "Throh", "primaryType": "fighting", + "maleRatio": 1, + "height": 13, + "weight": 555, + "pokedex": [ + "cobblemon.species.throh.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "guts", "innerfocus", "h:moldbreaker" ], + "eggGroups": [ + "human_like" + ], + "baseStats": { + "hp": 120, + "attack": 100, + "defence": 85, + "special_attack": 30, + "special_defence": 85, + "speed": 45 + }, + "evYield": { + "hp": 2, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 163, + "experienceGroup": "medium_fast", + "catchRate": 45, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 3, "entries": [ @@ -24,33 +65,15 @@ } ] }, - "baseStats": { - "hp": 120, - "attack": 100, - "defence": 85, - "special_attack": 30, - "special_defence": 85, - "speed": 45 - }, - "catchRate": 45, - "maleRatio": 1, - "shoulderMountable": false, - "baseExperienceYield": 163, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "human_like" - ], "moves": [ - "1:bide", "1:bind", "1:leer", + "1:bide", "1:matblock", "5:focusenergy", "10:circlethrow", "15:wideguard", "20:revenge", - "21:bodyslam", "25:bulkup", "30:stormthrow", "35:vitalthrow", @@ -58,14 +81,14 @@ "45:endure", "50:reversal", "55:superpower", - "tm:attract", + "tm:bind", + "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:confide", + "tm:coaching", "tm:dig", - "tm:doubleteam", "tm:earthquake", "tm:endure", "tm:facade", @@ -73,16 +96,18 @@ "tm:fling", "tm:focusblast", "tm:focusenergy", - "tm:frustration", + "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", - "tm:hiddenpower", "tm:icepunch", + "tm:knockoff", + "tm:laserfocus", "tm:lowkick", "tm:lowsweep", "tm:megakick", "tm:megapunch", + "tm:painsplit", "tm:payback", "tm:poisonjab", "tm:poweruppunch", @@ -90,72 +115,76 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:reversal", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:scaryface", - "tm:secretpower", "tm:sleeptalk", - "tm:snore", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:taunt", + "tm:terablast", "tm:thunderpunch", - "tm:toxic", "tm:workup", "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:snore", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", "tutor:thunderpunch", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.throh.desc" + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 555, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 8c21083ad..62683381d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/thundurus.json @@ -1,12 +1,29 @@ { - "name": "Thundurus", + "implemented": true, "nationalPokedexNumber": 642, + "name": "Thundurus", "primaryType": "electric", "secondaryType": "flying", + "maleRatio": 1, + "height": 15, + "weight": 610, + "pokedex": [ + "cobblemon.species.thundurus.desc" + ], + "labels": [ + "gen5", + "legendary" + ], + "aspects": [ + "incarnate-forme" + ], "abilities": [ "prankster", "h:defiant" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 79, "attack": 115, @@ -15,11 +32,6 @@ "special_defence": 80, "speed": 111 }, - "catchRate": 3, - "maleRatio": 1, - "shoulderMountable": false, - "baseExperienceYield": 290, - "baseFriendship": 90, "evYield": { "hp": 0, "attack": 3, @@ -28,21 +40,18 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 90, "moves": [ "1:astonish", - "1:nastyplot", "1:thundershock", "5:leer", "10:swagger", - "13:revenge", "15:bite", "20:shockwave", - "25:agility", "25:healblock", "30:charge", "35:voltswitch", @@ -52,23 +61,20 @@ "55:hammerarm", "60:raindance", "65:thunder", - "67:darkpulse", "70:thrash", "75:wildboltstorm", "tm:acrobatics", "tm:agility", "tm:assurance", - "tm:attract", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", "tm:charge", "tm:chargebeam", - "tm:confide", "tm:crunch", "tm:darkpulse", - "tm:doubleteam", + "tm:defog", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -81,10 +87,8 @@ "tm:fly", "tm:focusblast", "tm:foulplay", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", - "tm:hiddenpower", "tm:hyperbeam", "tm:incinerate", "tm:irontail", @@ -92,16 +96,17 @@ "tm:lashout", "tm:nastyplot", "tm:payback", + "tm:powershift", "tm:protect", "tm:psychic", "tm:raindance", "tm:rest", - "tm:return", "tm:revenge", + "tm:risingvoltage", "tm:rocksmash", - "tm:round", + "tm:roleplay", "tm:scaryface", - "tm:secretpower", + "tm:shockwave", "tm:skydrop", "tm:sleeptalk", "tm:sludgebomb", @@ -109,7 +114,6 @@ "tm:smackdown", "tm:smartstrike", "tm:snarl", - "tm:snore", "tm:strength", "tm:substitute", "tm:sunnyday", @@ -125,64 +129,73 @@ "tm:thunderpunch", "tm:thunderwave", "tm:torment", - "tm:toxic", "tm:uproar", "tm:uturn", "tm:voltswitch", "tm:weatherball", "tm:wildcharge", "tm:zenheadbutt", - "tutor:agility", - "tutor:astonish", - "tutor:charge", - "tutor:crunch", + "tutor:bulkup", + "tutor:chargebeam", "tutor:darkpulse", "tutor:defog", - "tutor:discharge", "tutor:electroweb", - "tutor:focusblast", + "tutor:flashcannon", "tutor:foulplay", - "tutor:grassknot", - "tutor:hammerarm", - "tutor:healblock", + "tutor:gigaimpact", + "tutor:hyperbeam", "tutor:irontail", "tutor:knockoff", "tutor:lashout", - "tutor:nastyplot", - "tutor:raindance", - "tutor:revenge", + "tutor:powershift", + "tutor:psychic", + "tutor:rest", "tutor:risingvoltage", + "tutor:rocksmash", "tutor:roleplay", "tutor:shockwave", "tutor:sleeptalk", - "tutor:sludgewave", - "tutor:snore", + "tutor:sludgebomb", + "tutor:snarl", "tutor:superpower", - "tutor:thunder", "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thundershock", "tutor:uproar", - "tutor:weatherball", - "tutor:wildcharge" - ], - "labels": [ - "gen5", - "legendary" - ], - "pokedex": [ - "cobblemon.species.thundurus.desc" + "tutor:wildcharge", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:toxic" ], - "height": 15, - "weight": 610, "evolutions": [], "forms": [ { "name": "Therian", "primaryType": "electric", "secondaryType": "flying", + "maleRatio": 1, + "height": 30, + "weight": 610, + "pokedex": [ + "cobblemon.species.thundurus-therian.desc" + ], + "labels": [ + "gen5", + "legendary" + ], + "aspects": [ + "therian-forme" + ], "abilities": [ - "voltabsorb" + "voltabsorb", + "h:voltabsorb" ], "baseStats": { "hp": 79, @@ -192,10 +205,6 @@ "special_defence": 80, "speed": 101 }, - "catchRate": 3, - "maleRatio": 1, - "baseExperienceYield": 290, - "baseFriendship": 90, "evYield": { "hp": 0, "attack": 0, @@ -204,25 +213,30 @@ "special_defence": 0, "speed": 0 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen5", - "legendary" - ], - "aspects": [ - "therian" - ], - "height": 30, - "weight": 610, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 11bed56d1..616e432ba 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tornadus.json @@ -1,11 +1,28 @@ { - "name": "Tornadus", + "implemented": true, "nationalPokedexNumber": 641, + "name": "Tornadus", "primaryType": "flying", + "maleRatio": 1, + "height": 15, + "weight": 630, + "pokedex": [ + "cobblemon.species.tornadus.desc" + ], + "labels": [ + "gen5", + "legendary" + ], + "aspects": [ + "incarnate-forme" + ], "abilities": [ "prankster", "h:defiant" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 79, "attack": 115, @@ -14,11 +31,6 @@ "special_defence": 80, "speed": 111 }, - "catchRate": 3, - "maleRatio": 1, - "shoulderMountable": false, - "baseExperienceYield": 290, - "baseFriendship": 90, "evYield": { "hp": 0, "attack": 3, @@ -27,17 +39,16 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 90, "moves": [ "1:astonish", "1:gust", "5:leer", "10:swagger", - "13:revenge", "15:bite", "20:aircutter", "25:agility", @@ -49,25 +60,21 @@ "55:hammerarm", "60:raindance", "65:hurricane", - "67:darkpulse", "70:thrash", "77:bleakwindstorm", "tm:acrobatics", - "tm:aerialace", "tm:agility", "tm:aircutter", "tm:airslash", "tm:assurance", - "tm:attract", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", "tm:bulkup", "tm:chillingwater", - "tm:confide", "tm:crunch", "tm:darkpulse", - "tm:doubleteam", + "tm:defog", "tm:embargo", "tm:endure", "tm:facade", @@ -75,11 +82,9 @@ "tm:fly", "tm:focusblast", "tm:foulplay", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", "tm:heatwave", - "tm:hiddenpower", "tm:hurricane", "tm:hyperbeam", "tm:icywind", @@ -94,20 +99,17 @@ "tm:psychic", "tm:raindance", "tm:rest", - "tm:return", "tm:revenge", "tm:reversal", "tm:rocksmash", - "tm:round", + "tm:roleplay", "tm:sandstorm", "tm:scaryface", - "tm:secretpower", "tm:skydrop", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:smackdown", - "tm:snore", "tm:snowscape", "tm:strength", "tm:substitute", @@ -120,54 +122,63 @@ "tm:terablast", "tm:thief", "tm:torment", - "tm:toxic", "tm:uproar", "tm:uturn", "tm:weatherball", - "tutor:agility", "tutor:aircutter", - "tutor:airslash", - "tutor:astonish", - "tutor:crunch", + "tutor:bulkup", "tutor:darkpulse", "tutor:defog", - "tutor:extrasensory", "tutor:foulplay", - "tutor:grassknot", - "tutor:gust", - "tutor:hammerarm", + "tutor:gigaimpact", "tutor:heatwave", - "tutor:hiddenpower", - "tutor:hurricane", + "tutor:hyperbeam", "tutor:icywind", "tutor:irontail", "tutor:knockoff", "tutor:lashout", - "tutor:raindance", - "tutor:revenge", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", "tutor:roleplay", "tutor:sleeptalk", - "tutor:snore", + "tutor:sludgebomb", "tutor:superpower", "tutor:tailwind", - "tutor:uproar" - ], - "labels": [ - "gen5", - "legendary" - ], - "pokedex": [ - "cobblemon.species.tornadus.desc" + "tutor:uproar", + "legacy:aerialace", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:toxic" ], - "height": 15, - "weight": 630, "evolutions": [], "forms": [ { "name": "Therian", "primaryType": "flying", + "maleRatio": 1, + "height": 14, + "weight": 630, + "pokedex": [ + "cobblemon.species.tornadus-therian.desc" + ], + "labels": [ + "gen5", + "legendary" + ], + "aspects": [ + "therian-forme" + ], "abilities": [ - "regenerator" + "regenerator", + "h:regenerator" ], "baseStats": { "hp": 79, @@ -177,10 +188,6 @@ "special_defence": 90, "speed": 121 }, - "catchRate": 3, - "maleRatio": 1, - "baseExperienceYield": 290, - "baseFriendship": 90, "evYield": { "hp": 0, "attack": 0, @@ -189,25 +196,49 @@ "special_defence": 0, "speed": 3 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen5", - "legendary" - ], - "aspects": [ - "therian" - ], - "height": 14, - "weight": 630, - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "behaviour": { + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json b/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json deleted file mode 100644 index 666a029a5..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/trubbish.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "name": "Trubbish", - "nationalPokedexNumber": 568, - "primaryType": "poison", - "abilities": [ - "stench", - "stickyhold", - "h:aftermath" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "cobblemon:black_sludge", - "percentage": 2.5 - }, - { - "item": "cobblemon:leftovers", - "percentage": 2.5 - }, - { - "item": "cobblemon:silk_scarf", - "percentage": 2.5 - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 50, - "attack": 50, - "defence": 62, - "special_attack": 40, - "special_defence": 62, - "speed": 65 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 66, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "mineral" - ], - "moves": [ - "1:poisongas", - "1:pound", - "3:recycle", - "6:acidspray", - "9:amnesia", - "12:clearsmog", - "14:doubleslap", - "15:toxicspikes", - "18:sludge", - "21:stockpile", - "21:swallow", - "24:takedown", - "27:sludgebomb", - "30:toxic", - "33:belch", - "37:painsplit", - "39:gunkshot", - "42:explosion", - "egg:autotomize", - "egg:curse", - "egg:haze", - "egg:mudsport", - "egg:rockblast", - "egg:rollout", - "egg:sandattack", - "egg:selfdestruct", - "egg:spikes", - "tm:amnesia", - "tm:attract", - "tm:confide", - "tm:darkpulse", - "tm:doubleteam", - "tm:drainpunch", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:frustration", - "tm:gigadrain", - "tm:gunkshot", - "tm:hiddenpower", - "tm:infestation", - "tm:payback", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snore", - "tm:spikes", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:thief", - "tm:toxic", - "tm:toxicspikes", - "tm:venomdrench", - "tm:venoshock", - "tutor:corrosivegas", - "tutor:darkpulse", - "tutor:drainpunch", - "tutor:gigadrain", - "tutor:gunkshot", - "tutor:painsplit", - "tutor:recycle", - "tutor:seedbomb", - "tutor:sleeptalk", - "tutor:snore", - "tutor:spite" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.trubbish.desc" - ], - "evolutions": [ - { - "id": "trubbish_garbodor", - "variant": "level_up", - "result": "garbodor", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 36 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 6, - "weight": 310, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 c47d04faa..ac4cebcab 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tympole.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tympole.json @@ -1,12 +1,108 @@ { - "name": "Tympole", + "implemented": true, "nationalPokedexNumber": 535, + "name": "Tympole", "primaryType": "water", + "maleRatio": 0.5, + "height": 5, + "weight": 45, + "pokedex": [ + "cobblemon.species.tympole.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "swiftswim", "hydration", "h:waterabsorb" ], + "eggGroups": [ + "water_1" + ], + "baseStats": { + "hp": 50, + "attack": 50, + "defence": 40, + "special_attack": 50, + "special_defence": 40, + "speed": 64 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 1 + }, + "baseExperienceYield": 59, + "experienceGroup": "medium_slow", + "catchRate": 255, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "canBreatheUnderwater": true, + "swimSpeed": "0.2" + }, + "walk": { + "avoidsLand": true + } + }, + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "poliwag", + "tier": 1 + }, + { + "pokemon": "tympole", + "tier": 2 + }, + { + "pokemon": "poliwhirl", + "tier": 3 + }, + { + "pokemon": "palpitoad", + "tier": 4 + }, + { + "pokemon": "poliwrath", + "tier": 5 + }, + { + "pokemon": "politoed", + "tier": 6 + }, + { + "pokemon": "seismitoad", + "tier": 7 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "combat": { + "willDefendOwner": true + } + }, "drops": { "amount": 2, "entries": [ @@ -20,27 +116,10 @@ } ] }, - "baseStats": { - "hp": 50, - "attack": 50, - "defence": 40, - "special_attack": 50, - "special_defence": 40, - "speed": 64 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 59, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "water_1" - ], "moves": [ "1:bubble", - "1:echoedvoice", "1:growl", + "1:echoedvoice", "4:acid", "8:supersonic", "12:mudshot", @@ -53,53 +132,46 @@ "40:muddywater", "44:raindance", "48:hydropump", - "egg:afteryou", - "egg:earthpower", "egg:mist", "egg:mudbomb", "egg:mudslap", "egg:mudsport", "egg:refresh", - "egg:sleeptalk", "egg:snore", "egg:toxic", - "egg:venomdrench", "egg:waterpulse", - "tm:attract", + "tm:afteryou", "tm:bounce", - "tm:confide", - "tm:doubleteam", "tm:earthpower", "tm:echoedvoice", + "tm:endeavor", "tm:endure", "tm:facade", - "tm:frustration", "tm:hail", - "tm:hiddenpower", "tm:hydropump", "tm:hypervoice", "tm:icywind", "tm:infestation", "tm:muddywater", "tm:mudshot", + "tm:mudslap", "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:round", "tm:scald", "tm:screech", - "tm:secretpower", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:snore", "tm:substitute", "tm:surf", - "tm:swagger", + "tm:terablast", "tm:toxic", "tm:uproar", "tm:venomdrench", + "tm:waterpulse", "tm:weatherball", "tutor:afteryou", "tutor:bounce", @@ -107,17 +179,21 @@ "tutor:endeavor", "tutor:hypervoice", "tutor:icywind", - "tutor:round", + "tutor:mudslap", + "tutor:rest", "tutor:sleeptalk", + "tutor:sludgebomb", "tutor:snore", "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.tympole.desc" + "tutor:waterpulse", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:secretpower", + "legacy:swagger" ], "evolutions": [ { @@ -133,25 +209,5 @@ } ] } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 5, - "weight": 45, - "aspects": [], - "cannotDynamax": false, - "implemented": true + ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json b/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json deleted file mode 100644 index acf4b94f6..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "name": "Tynamo", - "nationalPokedexNumber": 602, - "primaryType": "electric", - "abilities": [ - "levitate" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-1" - } - ] - }, - "baseStats": { - "hp": 35, - "attack": 55, - "defence": 40, - "special_attack": 45, - "special_defence": 40, - "speed": 60 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 55, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:chargebeam", - "1:spark", - "1:tackle", - "1:thunderwave", - "tm:charge", - "tm:chargebeam", - "tm:knockoff", - "tm:terablast", - "tm:thunderwave", - "tutor:magnetrise" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.tynamo.desc" - ], - "evolutions": [ - { - "id": "tynamo_eelektrik", - "variant": "level_up", - "result": "eelektrik", - "consumeHeldItem": false, - "learnableMoves": [ - "crunch" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 39 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 2, - "weight": 3, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json b/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json deleted file mode 100644 index 1960f41d8..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanillish.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "name": "Vanillish", - "nationalPokedexNumber": 583, - "primaryType": "ice", - "abilities": [ - "icebody", - "snowcloak", - "h:weakarmor" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:snowball", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:never_melt_ice", - "percentage": 5.0 - }, - { - "item": "cobblemon:aspear_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 51, - "attack": 65, - "defence": 65, - "special_attack": 80, - "special_defence": 75, - "speed": 59 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 138, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "mineral" - ], - "moves": [ - "1:astonish", - "1:harden", - "1:mist", - "1:taunt", - "12:icywind", - "16:avalanche", - "20:hail", - "24:iciclespear", - "26:mirrorshot", - "28:uproar", - "32:acidarmor", - "38:mirrorcoat", - "44:icebeam", - "50:blizzard", - "56:sheercold", - "tm:allyswitch", - "tm:attract", - "tm:avalanche", - "tm:blizzard", - "tm:confide", - "tm:doubleteam", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:flashcannon", - "tm:frostbreath", - "tm:frustration", - "tm:hail", - "tm:hiddenpower", - "tm:hypervoice", - "tm:icebeam", - "tm:iciclespear", - "tm:icywind", - "tm:imprison", - "tm:irondefense", - "tm:lightscreen", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:swagger", - "tm:taunt", - "tm:toxic", - "tm:uproar", - "tutor:allyswitch", - "tutor:iceshard", - "tutor:icywind", - "tutor:imprison", - "tutor:irondefense", - "tutor:magiccoat", - "tutor:magnetrise", - "tutor:mirrorshot", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.vanillish.desc" - ], - "preEvolution": "vanillite", - "evolutions": [ - { - "id": "vanillish_vanilluxe", - "variant": "level_up", - "result": "vanilluxe", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 47 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 410, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json b/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json deleted file mode 100644 index f0a98bb25..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanillite.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "name": "Vanillite", - "nationalPokedexNumber": 582, - "primaryType": "ice", - "abilities": [ - "icebody", - "snowcloak", - "h:weakarmor" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:snowball", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:never_melt_ice", - "percentage": 2.5 - }, - { - "item": "cobblemon:aspear_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 36, - "attack": 50, - "defence": 50, - "special_attack": 65, - "special_defence": 60, - "speed": 44 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 61, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "mineral" - ], - "moves": [ - "1:astonish", - "1:harden", - "4:taunt", - "8:mist", - "12:icywind", - "16:avalanche", - "20:hail", - "24:iciclespear", - "26:mirrorshot", - "28:uproar", - "32:acidarmor", - "36:mirrorcoat", - "40:icebeam", - "44:blizzard", - "48:sheercold", - "egg:auroraveil", - "egg:autotomize", - "egg:explosion", - "egg:iceshard", - "egg:iciclecrash", - "egg:imprison", - "egg:irondefense", - "egg:magnetrise", - "egg:naturalgift", - "egg:powdersnow", - "egg:waterpulse", - "tm:allyswitch", - "tm:attract", - "tm:avalanche", - "tm:blizzard", - "tm:confide", - "tm:doubleteam", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:flashcannon", - "tm:frostbreath", - "tm:frustration", - "tm:hail", - "tm:hiddenpower", - "tm:hypervoice", - "tm:icebeam", - "tm:iciclespear", - "tm:icywind", - "tm:imprison", - "tm:irondefense", - "tm:lightscreen", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:swagger", - "tm:taunt", - "tm:toxic", - "tm:uproar", - "tutor:allyswitch", - "tutor:icywind", - "tutor:irondefense", - "tutor:magiccoat", - "tutor:magnetrise", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.vanillite.desc" - ], - "evolutions": [ - { - "id": "vanillite_vanillish", - "variant": "level_up", - "result": "vanillish", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 35 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 57, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json b/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json deleted file mode 100644 index 4e6feaea7..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/vanilluxe.json +++ /dev/null @@ -1,141 +0,0 @@ -{ - "name": "Vanilluxe", - "nationalPokedexNumber": 584, - "primaryType": "ice", - "abilities": [ - "icebody", - "snowwarning", - "h:weakarmor" - ], - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:snowball", - "quantityRange": "0-3" - }, - { - "item": "cobblemon:never_melt_ice", - "percentage": 10.0 - }, - { - "item": "cobblemon:aspear_berry", - "percentage": 10.0 - } - ] - }, - "baseStats": { - "hp": 71, - "attack": 95, - "defence": 85, - "special_attack": 110, - "special_defence": 95, - "speed": 79 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 268, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "mineral" - ], - "moves": [ - "1:astonish", - "1:freezedry", - "1:harden", - "1:iciclecrash", - "1:mist", - "1:taunt", - "1:weatherball", - "12:icywind", - "16:avalanche", - "20:hail", - "24:iciclespear", - "26:mirrorshot", - "28:uproar", - "32:acidarmor", - "38:mirrorcoat", - "44:icebeam", - "52:blizzard", - "60:sheercold", - "tm:allyswitch", - "tm:attract", - "tm:avalanche", - "tm:beatup", - "tm:blizzard", - "tm:confide", - "tm:doubleteam", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:flashcannon", - "tm:frostbreath", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:iciclespear", - "tm:icywind", - "tm:imprison", - "tm:irondefense", - "tm:lightscreen", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:swagger", - "tm:taunt", - "tm:toxic", - "tm:uproar", - "tm:weatherball", - "tutor:allyswitch", - "tutor:icywind", - "tutor:irondefense", - "tutor:magiccoat", - "tutor:magnetrise", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snore", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.vanilluxe.desc" - ], - "preEvolution": "vanillish", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 575, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 8488ea6f1..7873b1e25 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/victini.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/victini.json @@ -1,10 +1,26 @@ { - "name": "Victini", + "implemented": true, "nationalPokedexNumber": 494, + "name": "Victini", "primaryType": "psychic", "secondaryType": "fire", + "maleRatio": -1, + "height": 4, + "weight": 40, + "pokedex": [ + "cobblemon.species.victini.desc" + ], + "labels": [ + "gen5", + "mythical" + ], + "aspects": [], "abilities": [ - "victorystar" + "victorystar", + "h:victorystar" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,27 +30,37 @@ "special_defence": 100, "speed": 100 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 100, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:confusion", - "1:flamecharge", "1:focusenergy", + "1:confusion", "1:quickattack", + "1:flamecharge", + "1:flameburst", "1:vcreate", "7:workup", "14:incinerate", "21:storedpower", "28:headbutt", "35:endure", - "41:flameburst", "42:zenheadbutt", "49:inferno", "56:reversal", @@ -48,13 +74,13 @@ "tm:bounce", "tm:brickbreak", "tm:chargebeam", - "tm:confide", "tm:dazzlinggleam", - "tm:doubleteam", + "tm:doubleedge", "tm:embargo", "tm:encore", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", "tm:fireblast", "tm:firepunch", @@ -66,17 +92,19 @@ "tm:fling", "tm:focusblast", "tm:focusenergy", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:guardswap", + "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:incinerate", + "tm:laserfocus", + "tm:lastresort", "tm:lightscreen", + "tm:magiccoat", "tm:megakick", "tm:megapunch", "tm:mysticalfire", @@ -88,30 +116,29 @@ "tm:psychup", "tm:psyshock", "tm:rest", - "tm:return", "tm:reversal", "tm:rocksmash", - "tm:round", + "tm:roleplay", "tm:safeguard", - "tm:secretpower", + "tm:scorchingsands", "tm:shadowball", + "tm:shockwave", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:speedswap", "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:taunt", "tm:telekinesis", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:trick", "tm:trickroom", "tm:uproar", @@ -120,71 +147,76 @@ "tm:willowisp", "tm:workup", "tm:zenheadbutt", - "tutor:blueflare", - "tutor:boltstrike", "tutor:bounce", - "tutor:celebrate", - "tutor:confusion", - "tutor:endure", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", "tutor:expandingforce", "tutor:firepunch", - "tutor:flamecharge", - "tutor:fusionbolt", - "tutor:fusionflare", - "tutor:glaciate", + "tutor:flamethrower", + "tutor:focusenergy", + "tutor:gigaimpact", "tutor:heatwave", "tutor:helpinghand", - "tutor:incinerate", + "tutor:hyperbeam", "tutor:laserfocus", "tutor:lastresort", "tutor:magiccoat", - "tutor:quickattack", - "tutor:reversal", + "tutor:mysticalfire", + "tutor:psychic", + "tutor:rest", + "tutor:rocksmash", "tutor:roleplay", "tutor:scorchingsands", - "tutor:searingshot", + "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", "tutor:skillswap", "tutor:sleeptalk", - "tutor:snore", - "tutor:storedpower", - "tutor:swagger", + "tutor:swift", "tutor:telekinesis", + "tutor:thunderbolt", "tutor:thunderpunch", "tutor:trick", "tutor:uproar", - "tutor:vcreate", - "tutor:workup", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.victini.desc" + "tutor:wildcharge", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "special:blueflare", + "special:boltstrike", + "special:celebrate", + "special:fusionbolt", + "special:fusionflare", + "special:glaciate" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 100, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 40, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendOwner": true + }, + "fireImmune": true + } } \ 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 884b506f4..691aadf31 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/virizion.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/virizion.json @@ -1,19 +1,27 @@ { - "name": "Virizion", + "implemented": true, "nationalPokedexNumber": 640, + "name": "Virizion", "primaryType": "grass", "secondaryType": "fighting", + "maleRatio": -1, + "height": 20, + "weight": 2000, + "pokedex": [ + "cobblemon.species.virizion.desc" + ], + "labels": [ + "gen5", + "legendary" + ], + "aspects": [], "abilities": [ - "justified" + "justified", + "h:justified" + ], + "eggGroups": [ + "undiscovered" ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:miracle_seed" - } - ] - }, "baseStats": { "hp": 91, "attack": 90, @@ -22,20 +30,38 @@ "special_defence": 129, "speed": 108 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 3, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 80, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:miracle_seed" + } + ] + }, "moves": [ - "1:helpinghand", - "1:leer", "1:quickattack", + "1:leer", "1:takedown", + "1:helpinghand", "1:workup", "7:magicalleaf", "14:quickguard", @@ -43,7 +69,6 @@ "28:retaliate", "35:gigadrain", "42:synthesis", - "42:takedown", "49:sacredsword", "56:swordsdance", "63:leafblade", @@ -51,6 +76,7 @@ "tm:aerialace", "tm:airslash", "tm:aurasphere", + "tm:block", "tm:bodyslam", "tm:bounce", "tm:brickbreak", @@ -58,24 +84,21 @@ "tm:calmmind", "tm:closecombat", "tm:coaching", - "tm:confide", "tm:cut", "tm:doubleedge", - "tm:doubleteam", "tm:endure", "tm:energyball", "tm:facade", "tm:falseswipe", "tm:flash", "tm:focusblast", - "tm:frustration", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyglide", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", + "tm:laserfocus", "tm:leafblade", "tm:leafstorm", "tm:lightscreen", @@ -87,19 +110,15 @@ "tm:reflect", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:reversal", "tm:roar", "tm:rocksmash", - "tm:round", "tm:safeguard", "tm:scaryface", - "tm:secretpower", "tm:seedbomb", "tm:sleeptalk", "tm:smartstrike", - "tm:snore", "tm:solarbeam", "tm:solarblade", "tm:stoneedge", @@ -107,63 +126,93 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:swift", "tm:swordsdance", + "tm:synthesis", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:toxic", "tm:trailblaze", "tm:upperhand", "tm:vacuumwave", "tm:workup", + "tm:worryseed", "tm:xscissor", "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:quickguard", - "tutor:retaliate", + "tutor:magicalleaf", + "tutor:megahorn", + "tutor:rest", + "tutor:rocksmash", "tutor:seedbomb", "tutor:sleeptalk", - "tutor:snore", + "tutor:stoneedge", "tutor:superpower", + "tutor:swift", "tutor:synthesis", - "tutor:workup", + "tutor:vacuumwave", "tutor:worryseed", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "legendary" - ], - "pokedex": [ - "cobblemon.species.virizion.desc" + "tutor:xscissor", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 20, - "weight": 2000, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "cobalion", + "tier": 1 + }, + { + "pokemon": "terrakion", + "tier": 1 + }, + { + "pokemon": "virizion", + "tier": 1 + }, + { + "pokemon": "keldeo resolute", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 f1a217863..86e2ec1f5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/vullaby.json @@ -1,13 +1,54 @@ { - "name": "Vullaby", + "implemented": true, "nationalPokedexNumber": 629, + "name": "Vullaby", "primaryType": "dark", "secondaryType": "flying", + "maleRatio": 0, + "height": 5, + "weight": 90, + "pokedex": [ + "cobblemon.species.vullaby.desc" + ], + "labels": [ + "gen5" + ], + "aspects": [], "abilities": [ "bigpecks", "overcoat", "h:weakarmor" ], + "eggGroups": [ + "flying" + ], + "baseStats": { + "hp": 70, + "attack": 55, + "defence": 75, + "special_attack": 45, + "special_defence": 65, + "speed": 60 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 74, + "experienceGroup": "slow", + "catchRate": 190, + "eggCycles": 20, + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 4, "entries": [ @@ -28,62 +69,38 @@ } ] }, - "baseStats": { - "hp": 70, - "attack": 55, - "defence": 75, - "special_attack": 45, - "special_defence": 65, - "speed": 60 - }, - "catchRate": 190, - "maleRatio": 0, - "shoulderMountable": false, - "baseExperienceYield": 74, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "flying" - ], "moves": [ "1:gust", "1:leer", - "5:furyattack", + "1:furyattack", "6:flatter", "12:pluck", "18:tailwind", - "23:feintattack", "24:knockoff", - "28:punishment", "30:irondefense", "36:whirlwind", "42:airslash", "48:darkpulse", - "50:embargo", "54:nastyplot", "60:defog", - "64:mirrormove", "66:attract", "72:bravebird", - "egg:faketears", - "egg:foulplay", - "egg:knockoff", + "egg:feintattack", "egg:meanlook", + "egg:mirrormove", + "egg:punishment", "egg:roost", - "egg:scaryface", - "egg:steelwing", "egg:toxic", - "tm:aerialace", "tm:aircutter", "tm:airslash", "tm:assurance", "tm:attract", + "tm:block", "tm:bravebird", - "tm:confide", "tm:cut", "tm:darkpulse", + "tm:defog", "tm:doubleedge", - "tm:doubleteam", "tm:dualwingbeat", "tm:embargo", "tm:endure", @@ -92,9 +109,7 @@ "tm:featherdance", "tm:fly", "tm:foulplay", - "tm:frustration", "tm:heatwave", - "tm:hiddenpower", "tm:incinerate", "tm:irondefense", "tm:knockoff", @@ -107,22 +122,18 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:round", "tm:scaryface", - "tm:secretpower", "tm:shadowball", "tm:sleeptalk", "tm:snarl", - "tm:snore", + "tm:snatch", "tm:spite", "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:tailwind", "tm:takedown", @@ -134,6 +145,7 @@ "tm:toxic", "tm:uproar", "tm:uturn", + "tutor:aircutter", "tutor:block", "tutor:darkpulse", "tutor:defog", @@ -143,17 +155,28 @@ "tutor:irondefense", "tutor:knockoff", "tutor:lashout", + "tutor:rest", + "tutor:rocksmash", "tutor:roost", + "tutor:shadowball", "tutor:sleeptalk", + "tutor:snarl", "tutor:snatch", - "tutor:snore", - "tutor:tailwind" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.vullaby.desc" + "tutor:spite", + "tutor:swift", + "tutor:tailwind", + "tutor:throatchop", + "tutor:uproar", + "legacy:aerialace", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger" ], "evolutions": [ { @@ -172,24 +195,32 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 90, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "vullaby", + "tier": 1 + }, + { + "pokemon": "mandibuzz", + "tier": 2 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json b/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json deleted file mode 100644 index b1900f581..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation5/zebstrika.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "name": "Zebstrika", - "nationalPokedexNumber": 523, - "primaryType": "electric", - "abilities": [ - "lightningrod", - "motordrive", - "h:sapsipper" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:leather", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:cheri_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 75, - "attack": 100, - "defence": 63, - "special_attack": 80, - "special_defence": 63, - "speed": 116 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 174, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:charge", - "1:iondeluge", - "1:quickattack", - "1:tailwhip", - "1:thunderwave", - "11:shockwave", - "18:flamecharge", - "22:pursuit", - "25:spark", - "31:stomp", - "36:discharge", - "42:agility", - "47:wildcharge", - "53:thrash", - "tm:agility", - "tm:attract", - "tm:batonpass", - "tm:bodyslam", - "tm:bulldoze", - "tm:charge", - "tm:chargebeam", - "tm:confide", - "tm:doubleedge", - "tm:doubleteam", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flamecharge", - "tm:flash", - "tm:frustration", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hiddenpower", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:lightscreen", - "tm:lowkick", - "tm:overheat", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rocksmash", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:smartstrike", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:allyswitch", - "tutor:bounce", - "tutor:laserfocus", - "tutor:lowkick", - "tutor:magnetrise", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:sleeptalk", - "tutor:snatch", - "tutor:snore" - ], - "labels": [ - "gen5" - ], - "pokedex": [ - "cobblemon.species.zebstrika.desc" - ], - "preEvolution": "blitzle", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 16, - "weight": 795, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 9002e7a95..d708d84c4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/zekrom.json @@ -1,10 +1,27 @@ { - "name": "Zekrom", + "implemented": true, "nationalPokedexNumber": 644, + "name": "Zekrom", "primaryType": "dragon", "secondaryType": "electric", + "maleRatio": -1, + "height": 29, + "weight": 3450, + "pokedex": [ + "cobblemon.species.zekrom.desc" + ], + "labels": [ + "gen5", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "teravolt" + "teravolt", + "h:teravolt" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,21 +31,50 @@ "special_defence": 100, "speed": 90 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 340, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, "moves": [ + "1:thunderfang", + "1:dragonrage", "1:ancientpower", "1:dragonbreath", - "1:dragonrage", "1:nobleroar", - "1:thunderfang", "8:slash", "16:crunch", "24:zenheadbutt", @@ -40,6 +86,7 @@ "72:imprison", "80:outrage", "88:boltstrike", + "tm:ancientpower", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", @@ -47,11 +94,10 @@ "tm:brutalswing", "tm:charge", "tm:chargebeam", - "tm:confide", "tm:crunch", "tm:cut", + "tm:defog", "tm:doubleedge", - "tm:doubleteam", "tm:dracometeor", "tm:dragoncheer", "tm:dragonclaw", @@ -71,16 +117,16 @@ "tm:fly", "tm:focusblast", "tm:focuspunch", - "tm:frustration", "tm:gigaimpact", "tm:haze", "tm:helpinghand", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:hypervoice", "tm:imprison", + "tm:laserfocus", "tm:lightscreen", + "tm:magnetrise", "tm:outrage", "tm:payback", "tm:protect", @@ -88,21 +134,20 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", + "tm:risingvoltage", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", "tm:roost", - "tm:round", "tm:safeguard", "tm:scaleshot", "tm:scaryface", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", + "tm:shockwave", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:stealthrock", "tm:steelwing", "tm:stoneedge", @@ -110,7 +155,6 @@ "tm:substitute", "tm:sunnyday", "tm:supercellslam", - "tm:swagger", "tm:swift", "tm:tailwind", "tm:takedown", @@ -120,64 +164,66 @@ "tm:thunderfang", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:voltswitch", "tm:weatherball", "tm:wildcharge", "tm:zenheadbutt", - "tutor:boltstrike", + "tutor:ancientpower", + "tutor:chargebeam", "tutor:defog", "tutor:dracometeor", - "tutor:dragonbreath", - "tutor:dragonclaw", "tutor:dragonpulse", "tutor:dualwingbeat", "tutor:earthpower", - "tutor:haze", - "tutor:imprison", + "tutor:flashcannon", + "tutor:focuspunch", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:hypervoice", "tutor:laserfocus", "tutor:magnetrise", - "tutor:nobleroar", "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:slash", "tutor:sleeptalk", - "tutor:snore", + "tutor:stealthrock", "tutor:stoneedge", + "tutor:swift", "tutor:tailwind", + "tutor:thunderbolt", + "tutor:thunderfang", "tutor:thunderpunch", - "tutor:zenheadbutt" - ], - "labels": [ - "gen5", - "legendary" - ], - "pokedex": [ - "cobblemon.species.zekrom.desc" + "tutor:wildcharge", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 29, - "weight": 3450, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:dragon_breath", + "quantityRange": "2-3" + } + ] + } } \ No newline at end of file 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 7486e05f5..99204a94e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json @@ -1,11 +1,51 @@ { - "name": "Aromatisse", "nationalPokedexNumber": 683, + "name": "Aromatisse", "primaryType": "fairy", + "maleRatio": 0.5, + "height": 8, + "weight": 155, + "pokedex": [ + "cobblemon.species.aromatisse.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "healer", "h:aromaveil" ], + "eggGroups": [ + "fairy" + ], + "baseStats": { + "hp": 101, + "attack": 72, + "defence": 72, + "special_attack": 99, + "special_defence": 89, + "speed": 29 + }, + "evYield": { + "hp": 2, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 162, + "experienceGroup": "medium_fast", + "catchRate": 140, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 2, "entries": [ @@ -19,31 +59,14 @@ } ] }, - "baseStats": { - "hp": 101, - "attack": 72, - "defence": 72, - "special_attack": 99, - "special_defence": 89, - "speed": 29 - }, - "catchRate": 140, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 162, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "fairy" - ], "moves": [ "1:aromaticmist", - "1:echoedvoice", - "1:fairywind", "1:healpulse", - "1:odorsleuth", - "1:sweetkiss", "1:sweetscent", + "1:fairywind", + "1:sweetkiss", + "1:odorsleuth", + "1:echoedvoice", "9:disarmingvoice", "12:aromatherapy", "15:drainingkiss", @@ -56,34 +79,42 @@ "36:moonblast", "39:skillswap", "42:psychup", - "57:reflect", + "egg:afteryou", + "egg:captivate", + "egg:disable", + "egg:refresh", + "egg:wish", + "tm:afteryou", "tm:allyswitch", "tm:attract", "tm:calmmind", + "tm:captivate", "tm:chargebeam", "tm:charm", - "tm:confide", + "tm:covet", "tm:dazzlinggleam", - "tm:doubleteam", + "tm:disarmingvoice", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", "tm:echoedvoice", "tm:encore", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:faketears", "tm:flash", "tm:flashcannon", - "tm:frustration", "tm:gigaimpact", "tm:gyroball", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:lightscreen", + "tm:magiccoat", "tm:metronome", + "tm:mistyexplosion", "tm:mistyterrain", "tm:nastyplot", "tm:protect", @@ -93,63 +124,72 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:substitute", "tm:sunnyday", - "tm:swagger", + "tm:telekinesis", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:torment", - "tm:toxic", "tm:trickroom", "tutor:afteryou", "tutor:allyswitch", + "tutor:calmmind", + "tutor:chargebeam", "tutor:covet", - "tutor:disable", + "tutor:dazzlinggleam", "tutor:drainpunch", "tutor:endeavor", + "tutor:energyball", + "tutor:flashcannon", + "tutor:gigaimpact", "tutor:healbell", - "tutor:healpulse", "tutor:helpinghand", + "tutor:hyperbeam", "tutor:magiccoat", "tutor:mistyexplosion", - "tutor:moonblast", + "tutor:psychic", + "tutor:rest", "tutor:skillswap", - "tutor:snore", + "tutor:sleeptalk", "tutor:telekinesis", - "tutor:trickroom" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.aromatisse.desc" + "tutor:thunderbolt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "preEvolution": "spritzee", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 8, - "weight": 155, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "5", + "toleratedLeaders": [ + { + "pokemon": "aromatisse", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json b/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json deleted file mode 100644 index 74289a9b3..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/barbaracle.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "name": "Barbaracle", - "nationalPokedexNumber": 689, - "primaryType": "rock", - "secondaryType": "water", - "abilities": [ - "toughclaws", - "sniper", - "h:pickpocket" - ], - "baseStats": { - "hp": 72, - "attack": 105, - "defence": 115, - "special_attack": 54, - "special_defence": 86, - "speed": 68 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 175, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_3" - ], - "moves": [ - "1:mudslap", - "1:sandattack", - "1:scratch", - "1:skullbash", - "1:watergun", - "1:withdraw", - "12:furycutter", - "16:furyswipes", - "20:ancientpower", - "20:clamp", - "24:rockpolish", - "28:slash", - "32:honeclaws", - "36:razorshell", - "42:shellsmash", - "44:nightslash", - "48:crosschop", - "54:stoneedge", - "tm:aerialace", - "tm:assurance", - "tm:attract", - "tm:beatup", - "tm:blizzard", - "tm:brickbreak", - "tm:brutalswing", - "tm:bulkup", - "tm:bulldoze", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:dive", - "tm:doubleteam", - "tm:dragonclaw", - "tm:earthpower", - "tm:earthquake", - "tm:embargo", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:infestation", - "tm:irondefense", - "tm:liquidation", - "tm:lowkick", - "tm:muddywater", - "tm:mudshot", - "tm:naturepower", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:razorshell", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scald", - "tm:screech", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:snore", - "tm:stealthrock", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:swagger", - "tm:swordsdance", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:uproar", - "tm:whirlpool", - "tm:xscissor", - "tutor:dualchop", - "tutor:earthpower", - "tutor:endeavor", - "tutor:helpinghand", - "tutor:icywind", - "tutor:irondefense", - "tutor:laserfocus", - "tutor:liquidation", - "tutor:lowkick", - "tutor:meteorbeam", - "tutor:snore", - "tutor:stealthrock", - "tutor:superpower", - "tutor:waterpulse" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.barbaracle.desc" - ], - "preEvolution": "binacle", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 960, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:rindo_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/binacle.json b/common/src/main/resources/data/cobblemon/species/generation6/binacle.json deleted file mode 100644 index 95cb84ac0..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/binacle.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "name": "Binacle", - "nationalPokedexNumber": 688, - "primaryType": "rock", - "secondaryType": "water", - "abilities": [ - "toughclaws", - "sniper", - "h:pickpocket" - ], - "baseStats": { - "hp": 42, - "attack": 52, - "defence": 67, - "special_attack": 39, - "special_defence": 56, - "speed": 50 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_3" - ], - "moves": [ - "1:mudslap", - "1:sandattack", - "1:scratch", - "4:withdraw", - "8:watergun", - "12:furycutter", - "16:furyswipes", - "20:ancientpower", - "20:clamp", - "24:rockpolish", - "28:slash", - "32:honeclaws", - "36:razorshell", - "40:shellsmash", - "41:nightslash", - "44:crosschop", - "egg:helpinghand", - "egg:nightslash", - "egg:sandattack", - "egg:switcheroo", - "egg:tickle", - "egg:watersport", - "tm:aerialace", - "tm:assurance", - "tm:attract", - "tm:beatup", - "tm:blizzard", - "tm:brickbreak", - "tm:bulldoze", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:doubleteam", - "tm:earthquake", - "tm:embargo", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:frustration", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:icebeam", - "tm:icywind", - "tm:infestation", - "tm:irondefense", - "tm:liquidation", - "tm:mudshot", - "tm:naturepower", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:razorshell", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:rockpolish", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scald", - "tm:screech", - "tm:secretpower", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:snore", - "tm:stealthrock", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swordsdance", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:uproar", - "tm:xscissor", - "tutor:dualchop", - "tutor:endeavor", - "tutor:helpinghand", - "tutor:icywind", - "tutor:irondefense", - "tutor:liquidation", - "tutor:snore", - "tutor:stealthrock", - "tutor:waterpulse" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.binacle.desc" - ], - "evolutions": [ - { - "id": "binacle_barbaracle", - "variant": "level_up", - "result": "barbaracle", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 39 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 310, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:rindo_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json b/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json deleted file mode 100644 index 281ebd62b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/clauncher.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "name": "Clauncher", - "nationalPokedexNumber": 692, - "primaryType": "water", - "abilities": [ - "megalauncher" - ], - "baseStats": { - "hp": 50, - "attack": 53, - "defence": 62, - "special_attack": 58, - "special_defence": 63, - "speed": 44 - }, - "catchRate": 225, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 66, - "experienceGroup": "slow", - "eggCycles": 15, - "eggGroups": [ - "water_1", - "water_3" - ], - "moves": [ - "1:splash", - "1:watergun", - "5:visegrip", - "7:watersport", - "10:flail", - "12:bubble", - "15:aquajet", - "20:bubblebeam", - "20:smackdown", - "25:honeclaws", - "30:waterpulse", - "35:swordsdance", - "40:aurasphere", - "45:bounce", - "50:muddywater", - "55:crabhammer", - "egg:aquajet", - "egg:aquatail", - "egg:bubblebeam", - "egg:crabhammer", - "egg:endure", - "egg:entrainment", - "egg:helpinghand", - "tm:attract", - "tm:aurasphere", - "tm:blizzard", - "tm:bounce", - "tm:chillingwater", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:dive", - "tm:doubleteam", - "tm:dragonpulse", - "tm:endure", - "tm:facade", - "tm:flashcannon", - "tm:flipturn", - "tm:frustration", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:irontail", - "tm:liquidation", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:round", - "tm:scald", - "tm:secretpower", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:uturn", - "tm:venoshock", - "tm:waterfall", - "tm:waterpulse", - "tm:weatherball", - "tutor:aquatail", - "tutor:bounce", - "tutor:dragonpulse", - "tutor:flipturn", - "tutor:helpinghand", - "tutor:icywind", - "tutor:irontail", - "tutor:snore", - "tutor:terrainpulse", - "tutor:waterpulse" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.clauncher.desc" - ], - "evolutions": [ - { - "id": "clauncher_clawitzer", - "variant": "level_up", - "result": "clawitzer", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 37 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 83, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json b/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json deleted file mode 100644 index f90e473dd..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/clawitzer.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "name": "Clawitzer", - "nationalPokedexNumber": 693, - "primaryType": "water", - "abilities": [ - "megalauncher" - ], - "baseStats": { - "hp": 71, - "attack": 73, - "defence": 88, - "special_attack": 120, - "special_defence": 89, - "speed": 59 - }, - "catchRate": 55, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 100, - "experienceGroup": "slow", - "eggCycles": 15, - "eggGroups": [ - "water_1", - "water_3" - ], - "moves": [ - "1:darkpulse", - "1:dragonpulse", - "1:flail", - "1:healpulse", - "1:splash", - "1:visegrip", - "1:watergun", - "1:watersport", - "12:bubble", - "15:aquajet", - "20:bubblebeam", - "20:smackdown", - "25:honeclaws", - "30:waterpulse", - "35:swordsdance", - "42:aurasphere", - "49:bounce", - "56:muddywater", - "63:crabhammer", - "tm:attract", - "tm:aurasphere", - "tm:blizzard", - "tm:bodyslam", - "tm:bounce", - "tm:chillingwater", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:dive", - "tm:doubleteam", - "tm:dragonpulse", - "tm:endure", - "tm:facade", - "tm:flashcannon", - "tm:flipturn", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:irontail", - "tm:liquidation", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockslide", - "tm:round", - "tm:scald", - "tm:scaryface", - "tm:secretpower", - "tm:shadowball", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:uturn", - "tm:venoshock", - "tm:waterfall", - "tm:waterpulse", - "tm:weatherball", - "tutor:aquatail", - "tutor:bounce", - "tutor:dragonpulse", - "tutor:flipturn", - "tutor:helpinghand", - "tutor:icywind", - "tutor:irontail", - "tutor:laserfocus", - "tutor:liquidation", - "tutor:snore", - "tutor:terrainpulse", - "tutor:waterpulse" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.clawitzer.desc" - ], - "preEvolution": "clauncher", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 353, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json b/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json deleted file mode 100644 index 536049f50..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/dedenne.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "name": "Dedenne", - "nationalPokedexNumber": 702, - "primaryType": "electric", - "secondaryType": "fairy", - "abilities": [ - "cheekpouch", - "pickup", - "h:plus" - ], - "baseStats": { - "hp": 67, - "attack": 58, - "defence": 57, - "special_attack": 81, - "special_defence": 67, - "speed": 101 - }, - "catchRate": 180, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 151, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field", - "fairy" - ], - "moves": [ - "1:nuzzle", - "1:tailwhip", - "5:tackle", - "10:charge", - "15:thundershock", - "20:charm", - "23:thunderwave", - "25:paraboliccharge", - "30:voltswitch", - "34:chargebeam", - "35:rest", - "35:snore", - "40:discharge", - "45:playrough", - "50:superfang", - "55:entrainment", - "60:thunder", - "egg:covet", - "egg:eerieimpulse", - "egg:helpinghand", - "egg:magnetrise", - "egg:naturalgift", - "egg:tearfullook", - "tm:aerialace", - "tm:agility", - "tm:allyswitch", - "tm:attract", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:cut", - "tm:dazzlinggleam", - "tm:dig", - "tm:doubleteam", - "tm:drainingkiss", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:flash", - "tm:fling", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:irontail", - "tm:lightscreen", - "tm:mistyterrain", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:trailblaze", - "tm:uturn", - "tm:voltswitch", - "tm:wildcharge", - "tutor:allyswitch", - "tutor:covet", - "tutor:electroweb", - "tutor:helpinghand", - "tutor:irontail", - "tutor:lastresort", - "tutor:magnetrise", - "tutor:recycle", - "tutor:risingvoltage", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:superfang", - "tutor:thunderpunch" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.dedenne.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 2, - "weight": 22, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:cheri_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 0d97e02d9..ca6279e1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json @@ -1,10 +1,25 @@ { - "name": "Diancie", "nationalPokedexNumber": 719, + "name": "Diancie", "primaryType": "rock", "secondaryType": "fairy", + "maleRatio": -1, + "height": 7, + "weight": 88, + "pokedex": [ + "cobblemon.species.diancie.desc" + ], + "labels": [ + "gen6", + "mythical" + ], + "aspects": [], "abilities": [ - "clearbody" + "clearbody", + "h:clearbody" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 50, @@ -14,95 +29,55 @@ "special_defence": 150, "speed": 50 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Mega", - "primaryType": "rock", - "secondaryType": "fairy", - "abilities": [ - "magicbounce" - ], - "baseStats": { - "hp": 50, - "attack": 160, - "defence": 110, - "special_attack": 160, - "special_defence": 110, - "speed": 110 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 25, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen6", - "mega", - "mythical", - "legendary" - ], - "aspects": [ - "mega" - ], - "height": 11, - "weight": 278, - "cannotDynamax": false, - "battleOnly": true - } - ], + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 2, + "speed": 0 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 25, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:diamondstorm", + "1:tackle", "1:harden", "1:rockthrow", - "1:tackle", - "5:sharpen", + "1:sharpen", + "1:diamondstorm", "7:guardsplit", - "12:reflect", "14:smackdown", "21:flail", "28:ancientpower", "35:rockpolish", "42:lightscreen", - "46:trickroom", "49:rockslide", "56:skillswap", "63:powergem", - "70:safeguard", "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:confide", + "tm:covet", "tm:dazzlinggleam", - "tm:doubleteam", "tm:drainingkiss", "tm:earthpower", "tm:encore", @@ -113,17 +88,18 @@ "tm:faketears", "tm:flash", "tm:flashcannon", - "tm:frustration", "tm:gigaimpact", "tm:gravity", "tm:guardswap", "tm:gyroball", "tm:hail", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:irondefense", + "tm:lastresort", "tm:lightscreen", + "tm:magnetrise", "tm:meteorbeam", "tm:metronome", "tm:mistyexplosion", @@ -138,20 +114,16 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:safeguard", "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", - "tm:secretpower", "tm:skillswap", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:snowscape", "tm:spikes", "tm:stealthrock", @@ -159,63 +131,171 @@ "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", + "tm:telekinesis", "tm:terablast", - "tm:toxic", + "tm:terrainpulse", "tm:trickroom", "tm:wonderroom", "tutor:afteryou", + "tutor:allyswitch", + "tutor:ancientpower", + "tutor:bulldoze", + "tutor:calmmind", "tutor:covet", - "tutor:diamondstorm", + "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:moonblast", - "tutor:reflect", - "tutor:return", + "tutor:mysticalfire", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", "tutor:skillswap", - "tutor:snore", + "tutor:sleeptalk", + "tutor:spikes", "tutor:stealthrock", + "tutor:stoneedge", + "tutor:swift", "tutor:telekinesis", "tutor:terrainpulse", - "tutor:wonderroom" - ], - "labels": [ - "gen6", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.diancie.desc" + "tutor:wonderroom", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 7, - "weight": 88, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Mega", + "primaryType": "rock", + "secondaryType": "fairy", + "maleRatio": -1, + "height": 11, + "weight": 278, + "pokedex": [ + "cobblemon.species.diancie-mega.desc" + ], + "labels": [ + "gen6", + "mythical", + "mega" + ], + "aspects": [ + "mega" + ], + "abilities": [ + "magicbounce", + "h:magicbounce" + ], + "baseStats": { + "hp": 50, + "attack": 160, + "defence": 110, + "special_attack": 160, + "special_defence": 110, + "speed": 110 + }, + "baseExperienceYield": 350, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true, + "behaviour": { + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "diancie mega", + "tier": 1 + } + ] + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "fireImmune": true + } + } + ], + "behaviour": { + "herd": { + "maxSize": "5", + "toleratedLeaders": [ + { + "pokemon": "diancie mega=false", + "tier": 1 + }, + { + "pokemon": "diancie mega", + "tier": 2 + } + ] + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "fireImmune": true + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/espurr.json b/common/src/main/resources/data/cobblemon/species/generation6/espurr.json deleted file mode 100644 index 7ac8533b0..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/espurr.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "name": "Espurr", - "nationalPokedexNumber": 677, - "primaryType": "psychic", - "abilities": [ - "keeneye", - "infiltrator", - "h:owntempo" - ], - "baseStats": { - "hp": 62, - "attack": 48, - "defence": 54, - "special_attack": 63, - "special_defence": 60, - "speed": 68 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 71, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:leer", - "1:scratch", - "3:fakeout", - "6:disarmingvoice", - "9:confusion", - "18:covet", - "21:psybeam", - "30:lightscreen", - "30:reflect", - "33:psyshock", - "egg:assist", - "egg:barrier", - "egg:tickle", - "egg:trick", - "egg:yawn", - "tm:allyswitch", - "tm:attract", - "tm:calmmind", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:dreameater", - "tm:echoedvoice", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:frustration", - "tm:gravity", - "tm:helpinghand", - "tm:hiddenpower", - "tm:irontail", - "tm:lightscreen", - "tm:magicroom", - "tm:nastyplot", - "tm:payback", - "tm:payday", - "tm:playrough", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:terablast", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:workup", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:covet", - "tutor:expandingforce", - "tutor:gravity", - "tutor:healbell", - "tutor:helpinghand", - "tutor:irontail", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:recycle", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:snatch", - "tutor:snore", - "tutor:telekinesis", - "tutor:trick", - "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.espurr.desc" - ], - "evolutions": [ - { - "id": "espurr_meowstic", - "variant": "level_up", - "result": "meowstic", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 25 - } - ] - }, - { - "id": "espurr_meowstic", - "variant": "level_up", - "result": "meowstic f", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 25 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 3, - "weight": 35, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:colbur_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json b/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json deleted file mode 100644 index aecfb7b1f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/furfrou.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "name": "Furfrou", - "nationalPokedexNumber": 676, - "primaryType": "normal", - "abilities": [ - "furcoat" - ], - "baseStats": { - "hp": 75, - "attack": 80, - "defence": 60, - "special_attack": 65, - "special_defence": 90, - "speed": 102 - }, - "catchRate": 160, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 165, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:growl", - "1:tackle", - "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:attract", - "tm:chargebeam", - "tm:confide", - "tm:darkpulse", - "tm:dig", - "tm:doubleteam", - "tm:echoedvoice", - "tm:facade", - "tm:flash", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:hiddenpower", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:roar", - "tm:rocksmash", - "tm:round", - "tm:secretpower", - "tm:sleeptalk", - "tm:snarl", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:thunderwave", - "tm:toxic", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tutor:endeavor", - "tutor:helpinghand", - "tutor:hypervoice", - "tutor:irontail", - "tutor:lastresort", - "tutor:roleplay", - "tutor:snore", - "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.furfrou.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 12, - "weight": 280, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:bone", - "quantityRange": "0-2" - }, - { - "item": "minecraft:white_wool", - "quantityRange": "1-2" - }, - { - "item": "cobblemon:silk_scarf", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json b/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json deleted file mode 100644 index 367ae74e3..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/gogoat.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "name": "Gogoat", - "nationalPokedexNumber": 673, - "primaryType": "grass", - "abilities": [ - "sapsipper", - "h:grasspelt" - ], - "baseStats": { - "hp": 123, - "attack": 100, - "defence": 62, - "special_attack": 97, - "special_defence": 81, - "speed": 68 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 186, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:aerialace", - "1:earthquake", - "1:growth", - "1:tackle", - "1:tailwhip", - "1:vinewhip", - "12:leechseed", - "13:razorleaf", - "16:worryseed", - "20:synthesis", - "22:takedown", - "26:bulldoze", - "30:seedbomb", - "34:bulkup", - "40:doubleedge", - "47:hornleech", - "55:leafblade", - "58:milkdrink", - "tm:aerialace", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:confide", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hiddenpower", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:leafstorm", - "tm:magicalleaf", - "tm:mudshot", - "tm:mudslap", - "tm:naturepower", - "tm:payback", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:toxic", - "tm:trailblaze", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt", - "tutor:bounce", - "tutor:gigadrain", - "tutor:irontail", - "tutor:seedbomb", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:superpower", - "tutor:synthesis", - "tutor:worryseed", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.gogoat.desc" - ], - "preEvolution": "skiddo", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 17, - "weight": 910, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:mutton", - "quantityRange": "1-3" - }, - { - "item": "cobblemon:oran_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json b/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json deleted file mode 100644 index 5bccf9d12..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/hawlucha.json +++ /dev/null @@ -1,216 +0,0 @@ -{ - "name": "Hawlucha", - "nationalPokedexNumber": 701, - "primaryType": "fighting", - "secondaryType": "flying", - "abilities": [ - "limber", - "unburden", - "h:moldbreaker" - ], - "baseStats": { - "hp": 78, - "attack": 92, - "defence": 75, - "special_attack": 74, - "special_defence": 63, - "speed": 118 - }, - "catchRate": 100, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 175, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "flying", - "human_like" - ], - "moves": [ - "1:honeclaws", - "1:tackle", - "4:karatechop", - "4:wingattack", - "8:detect", - "12:aerialace", - "16:encore", - "20:featherdance", - "24:brickbreak", - "24:fling", - "24:submission", - "28:bounce", - "32:taunt", - "36:roost", - "40:swordsdance", - "44:flyingpress", - "48:highjumpkick", - "52:endeavor", - "55:skydrop", - "56:skyattack", - "egg:agility", - "egg:allyswitch", - "egg:batonpass", - "egg:crosschop", - "egg:defog", - "egg:entrainment", - "egg:feint", - "egg:meanlook", - "egg:mefirst", - "egg:mudsport", - "egg:quickguard", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:allyswitch", - "tm:assurance", - "tm:attract", - "tm:batonpass", - "tm:bodypress", - "tm:bodyslam", - "tm:bounce", - "tm:bravebird", - "tm:brickbreak", - "tm:bulkup", - "tm:closecombat", - "tm:coaching", - "tm:confide", - "tm:cut", - "tm:dig", - "tm:doubleteam", - "tm:drainpunch", - "tm:dualwingbeat", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:featherdance", - "tm:firepunch", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:focuspunch", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:helpinghand", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hyperbeam", - "tm:ironhead", - "tm:lowkick", - "tm:lowsweep", - "tm:lunge", - "tm:megakick", - "tm:megapunch", - "tm:payback", - "tm:poisonjab", - "tm:poweruppunch", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:revenge", - "tm:reversal", - "tm:rockslide", - "tm:rocksmash", - "tm:rocktomb", - "tm:roost", - "tm:round", - "tm:secretpower", - "tm:skydrop", - "tm:sleeptalk", - "tm:snore", - "tm:steelwing", - "tm:stoneedge", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderpunch", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:upperhand", - "tm:uproar", - "tm:uturn", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:bounce", - "tutor:coaching", - "tutor:defog", - "tutor:drainpunch", - "tutor:dualchop", - "tutor:dualwingbeat", - "tutor:endeavor", - "tutor:firepunch", - "tutor:focuspunch", - "tutor:helpinghand", - "tutor:ironhead", - "tutor:laserfocus", - "tutor:lastresort", - "tutor:lowkick", - "tutor:skyattack", - "tutor:snore", - "tutor:superpower", - "tutor:tailwind", - "tutor:throatchop", - "tutor:thunderpunch", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.hawlucha.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 8, - "weight": 215, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:kings_rock", - "percentage": 5.0 - }, - { - "item": "cobblemon:coba_berry", - "percentage": 5.0 - }, - { - "item": "cobblemon:expert_belt", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ 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 408c3847f..ee0f94a5f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json @@ -1,13 +1,27 @@ { - "name": "Heliolisk", "nationalPokedexNumber": 695, + "name": "Heliolisk", "primaryType": "electric", "secondaryType": "normal", + "maleRatio": 0.5, + "height": 10, + "weight": 210, + "pokedex": [ + "cobblemon.species.heliolisk.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "dryskin", "sandveil", "h:solarpower" ], + "eggGroups": [ + "monster", + "dragon" + ], "baseStats": { "hp": 62, "attack": 55, @@ -16,45 +30,57 @@ "special_defence": 94, "speed": 109 }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 1 + }, "baseExperienceYield": 168, "experienceGroup": "medium_fast", + "catchRate": 75, "eggCycles": 20, - "eggGroups": [ - "monster", - "dragon" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:bulldoze", - "1:charge", - "1:discharge", "1:eerieimpulse", "1:electrify", - "1:mudslap", - "1:paraboliccharge", - "1:pound", - "1:quickattack", "1:razorwind", - "1:tailwhip", + "1:quickattack", "1:thunder", + "1:charge", + "1:paraboliccharge", "1:thunderbolt", - "1:thundershock", "1:thunderwave", "1:voltswitch", + "1:bulldoze", + "1:discharge", + "1:mudslap", + "1:tailwhip", + "1:pound", + "1:thundershock", + "egg:camouflage", + "egg:dragonrush", + "egg:dragontail", + "egg:glare", + "egg:razorwind", "tm:agility", "tm:allyswitch", - "tm:attract", "tm:breakingswipe", "tm:brutalswing", "tm:bulldoze", + "tm:charge", "tm:chargebeam", - "tm:confide", "tm:cut", "tm:darkpulse", "tm:dig", - "tm:doubleteam", "tm:dragonpulse", "tm:dragontail", "tm:eerieimpulse", @@ -66,86 +92,95 @@ "tm:firepunch", "tm:flash", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", - "tm:hiddenpower", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", "tm:lightscreen", "tm:lowkick", "tm:lowsweep", + "tm:magnetrise", "tm:megakick", "tm:megapunch", + "tm:mudslap", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", + "tm:risingvoltage", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", - "tm:secretpower", + "tm:scaleshot", + "tm:shockwave", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:swagger", "tm:swift", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:uturn", "tm:voltswitch", "tm:weatherball", "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:snore", - "tutor:thunderpunch" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.heliolisk.desc" + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "preEvolution": "helioptile", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "height": 10, - "weight": 210, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 7872500b1..ebec08b50 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json @@ -1,13 +1,27 @@ { - "name": "Helioptile", "nationalPokedexNumber": 694, + "name": "Helioptile", "primaryType": "electric", "secondaryType": "normal", + "maleRatio": 0.5, + "height": 5, + "weight": 60, + "pokedex": [ + "cobblemon.species.helioptile.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "dryskin", "sandveil", "h:solarpower" ], + "eggGroups": [ + "monster", + "dragon" + ], "baseStats": { "hp": 44, "attack": 38, @@ -16,47 +30,52 @@ "special_defence": 43, "speed": 70 }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 1 + }, "baseExperienceYield": 58, "experienceGroup": "medium_fast", + "catchRate": 190, "eggCycles": 20, - "eggGroups": [ - "monster", - "dragon" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:mudslap", "1:tailwhip", + "1:mudslap", "4:pound", "8:thundershock", "12:quickattack", "16:charge", "20:bulldoze", - "22:razorwind", "24:voltswitch", "28:paraboliccharge", "32:thunderwave", "36:thunderbolt", "40:electrify", "44:thunder", - "egg:agility", "egg:camouflage", "egg:dragonrush", "egg:dragontail", - "egg:electricterrain", "egg:glare", + "egg:razorwind", "tm:agility", "tm:allyswitch", - "tm:attract", "tm:bulldoze", + "tm:charge", "tm:chargebeam", - "tm:confide", "tm:cut", "tm:darkpulse", "tm:dig", - "tm:doubleteam", "tm:dragontail", "tm:electricterrain", "tm:electroball", @@ -64,50 +83,63 @@ "tm:endure", "tm:facade", "tm:flash", - "tm:frustration", "tm:grassknot", - "tm:hiddenpower", "tm:irontail", "tm:lightscreen", "tm:lowsweep", + "tm:magnetrise", + "tm:mudslap", "tm:protect", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", + "tm:risingvoltage", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", - "tm:secretpower", + "tm:scaleshot", + "tm:shockwave", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:substitute", "tm:surf", - "tm:swagger", "tm:swift", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:uturn", "tm:voltswitch", "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:snore" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.helioptile.desc" + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { @@ -120,24 +152,19 @@ "requiredContext": "cobblemon:sun_stone" } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 5, - "weight": 60, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 986a24390..648b56108 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json @@ -1,10 +1,27 @@ { - "name": "Hoopa", "nationalPokedexNumber": 720, + "name": "Hoopa", "primaryType": "psychic", "secondaryType": "ghost", + "maleRatio": -1, + "height": 5, + "weight": 90, + "pokedex": [ + "cobblemon.species.hoopa.desc" + ], + "labels": [ + "gen6", + "mythical" + ], + "aspects": [ + "confined" + ], "abilities": [ - "magician" + "magician", + "h:magician" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 80, @@ -14,93 +31,53 @@ "special_defence": 130, "speed": 70 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Unbound", - "primaryType": "psychic", - "secondaryType": "dark", - "abilities": [ - "magician" - ], - "baseStats": { - "hp": 80, - "attack": 160, - "defence": 60, - "special_attack": 170, - "special_defence": 130, - "speed": 80 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 270, - "baseFriendship": 100, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen6", - "mythical", - "legendary" - ], - "aspects": [ - "unbound" - ], - "height": 65, - "weight": 4900, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 270, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 100, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ + "1:destinybond", "1:allyswitch", "1:confusion", - "1:destinybond", "6:astonish", - "10:magiccoat", "10:trick", "15:lightscreen", "19:psybeam", "25:skillswap", - "29:guardsplit", "29:powersplit", + "29:guardsplit", "35:phantomforce", - "46:knockoff", "46:zenheadbutt", - "50:trickroom", "50:wonderroom", - "55:darkpulse", + "50:trickroom", "55:shadowball", "68:nastyplot", "75:psychic", - "85:hyperspacefury", "85:hyperspacehole", + "tm:allyswitch", + "tm:block", "tm:brickbreak", "tm:calmmind", - "tm:chargebeam", - "tm:confide", + "tm:covet", "tm:darkpulse", - "tm:doubleteam", "tm:drainpunch", "tm:dreameater", + "tm:dualchop", "tm:embargo", "tm:endure", "tm:energyball", @@ -112,18 +89,20 @@ "tm:focusblast", "tm:focuspunch", "tm:foulplay", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", "tm:gravity", "tm:gunkshot", - "tm:hiddenpower", "tm:hyperbeam", "tm:icepunch", "tm:knockoff", + "tm:laserfocus", "tm:lashout", + "tm:lastresort", "tm:lightscreen", + "tm:magiccoat", + "tm:magicroom", "tm:nastyplot", "tm:phantomforce", "tm:poweruppunch", @@ -136,25 +115,27 @@ "tm:psyshock", "tm:quash", "tm:raindance", + "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", "tm:rocktomb", - "tm:round", + "tm:roleplay", "tm:safeguard", "tm:sandstorm", "tm:scaryface", - "tm:secretpower", "tm:shadowball", + "tm:shockwave", + "tm:signalbeam", "tm:skillswap", "tm:skittersmack", "tm:sleeptalk", + "tm:snatch", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", "tm:taunt", + "tm:telekinesis", "tm:terablast", "tm:thief", "tm:throatchop", @@ -162,73 +143,287 @@ "tm:thunderpunch", "tm:thunderwave", "tm:torment", - "tm:toxic", "tm:trick", "tm:trickroom", + "tm:wonderroom", "tm:zenheadbutt", "tutor:allyswitch", - "tutor:astonish", "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:hyperspacehole", + "tutor:hyperbeam", "tutor:icepunch", "tutor:knockoff", "tutor:laserfocus", + "tutor:lashout", "tutor:lastresort", "tutor:magiccoat", "tutor:magicroom", - "tutor:nastyplot", "tutor:psychic", "tutor:recycle", + "tutor:rest", "tutor:roleplay", "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", "tutor:skillswap", + "tutor:skittersmack", + "tutor:sleeptalk", "tutor:snatch", - "tutor:snore", + "tutor:swift", "tutor:telekinesis", "tutor:throatchop", + "tutor:thunderbolt", "tutor:thunderpunch", "tutor:trick", - "tutor:uproar", "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.hoopa.desc" + "tutor:zenheadbutt", + "legacy:chargebeam", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:hyperspacefury", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "legacy:uproar" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 100, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 90, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Unbound", + "primaryType": "psychic", + "secondaryType": "dark", + "maleRatio": -1, + "height": 65, + "weight": 4900, + "pokedex": [ + "cobblemon.species.hoopa-unbound.desc" + ], + "labels": [ + "gen6", + "mythical" + ], + "aspects": [ + "unbound" + ], + "baseStats": { + "hp": 80, + "attack": 160, + "defence": 60, + "special_attack": 170, + "special_defence": 130, + "speed": 80 + }, + "baseExperienceYield": 340, + "baseFriendship": 50, + "moves": [ + "1:destinybond", + "1:allyswitch", + "1:confusion", + "6:astonish", + "10:trick", + "15:lightscreen", + "19:psybeam", + "25:skillswap", + "29:powersplit", + "29:guardsplit", + "46:knockoff", + "50:wonderroom", + "50:trickroom", + "55:darkpulse", + "75:psychic", + "85:hyperspacefury", + "tm:allyswitch", + "tm:block", + "tm:brickbreak", + "tm:calmmind", + "tm:covet", + "tm:darkpulse", + "tm:drainpunch", + "tm:dreameater", + "tm:dualchop", + "tm:embargo", + "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:gunkshot", + "tm:hyperbeam", + "tm:icepunch", + "tm:knockoff", + "tm:laserfocus", + "tm:lashout", + "tm:lastresort", + "tm:lightscreen", + "tm:magiccoat", + "tm:magicroom", + "tm:nastyplot", + "tm:phantomforce", + "tm:poweruppunch", + "tm:protect", + "tm:psybeam", + "tm:psychic", + "tm:psychicnoise", + "tm:psychicterrain", + "tm:psychup", + "tm:psyshock", + "tm:quash", + "tm:raindance", + "tm:recycle", + "tm:reflect", + "tm:rest", + "tm:rocktomb", + "tm:roleplay", + "tm:safeguard", + "tm:sandstorm", + "tm:scaryface", + "tm:shadowball", + "tm:shockwave", + "tm:signalbeam", + "tm:skillswap", + "tm:skittersmack", + "tm:sleeptalk", + "tm:snatch", + "tm:substitute", + "tm:sunnyday", + "tm:swift", + "tm:takedown", + "tm:taunt", + "tm:telekinesis", + "tm:terablast", + "tm:thief", + "tm:throatchop", + "tm:thunderbolt", + "tm:thunderpunch", + "tm:thunderwave", + "tm:torment", + "tm:trick", + "tm:trickroom", + "tm:wonderroom", + "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, + "behaviour": { + "herd": { + "maxSize": "3" + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } + } + ], + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "hoopa unbound", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/inkay.json b/common/src/main/resources/data/cobblemon/species/generation6/inkay.json deleted file mode 100644 index b01e45af3..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/inkay.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "name": "Inkay", - "nationalPokedexNumber": 686, - "primaryType": "dark", - "secondaryType": "psychic", - "abilities": [ - "contrary", - "suctioncups", - "h:infiltrator" - ], - "baseStats": { - "hp": 53, - "attack": 54, - "defence": 53, - "special_attack": 37, - "special_defence": 46, - "speed": 45 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 58, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "water_2" - ], - "moves": [ - "1:constrict", - "1:peck", - "1:tackle", - "3:hypnosis", - "4:reflect", - "6:wrap", - "9:payback", - "12:pluck", - "13:psywave", - "15:psybeam", - "18:swagger", - "21:slash", - "24:nightslash", - "27:psychocut", - "31:lightscreen", - "31:switcheroo", - "33:foulplay", - "36:topsyturvy", - "39:superpower", - "egg:acupressure", - "egg:camouflage", - "egg:destinybond", - "egg:disable", - "egg:flatter", - "egg:guardswap", - "egg:powersplit", - "egg:simplebeam", - "tm:aerialace", - "tm:allyswitch", - "tm:attract", - "tm:batonpass", - "tm:calmmind", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:doubleteam", - "tm:embargo", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:faketears", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:foulplay", - "tm:frustration", - "tm:futuresight", - "tm:gravity", - "tm:guardswap", - "tm:helpinghand", - "tm:hiddenpower", - "tm:knockoff", - "tm:lashout", - "tm:lightscreen", - "tm:liquidation", - "tm:lunge", - "tm:nastyplot", - "tm:payback", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:rockslide", - "tm:round", - "tm:secretpower", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:swift", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thunderbolt", - "tm:torment", - "tm:toxic", - "tm:trick", - "tm:trickroom", - "tutor:allyswitch", - "tutor:bind", - "tutor:expandingforce", - "tutor:foulplay", - "tutor:happyhour", - "tutor:hypnosis", - "tutor:knockoff", - "tutor:lashout", - "tutor:roleplay", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:superpower", - "tutor:telekinesis", - "tutor:topsyturvy" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.inkay.desc" - ], - "evolutions": [ - { - "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" - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 35, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:ink_sac", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:tanga_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ 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 c80d9f490..179dc9778 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json @@ -1,13 +1,26 @@ { - "name": "Litleo", "nationalPokedexNumber": 667, + "name": "Litleo", "primaryType": "fire", "secondaryType": "normal", + "maleRatio": 0.125, + "height": 6, + "weight": 135, + "pokedex": [ + "cobblemon.species.litleo.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "rivalry", "unnerve", "h:moxie" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 62, "attack": 50, @@ -16,18 +29,99 @@ "special_defence": 54, "speed": 72 }, - "catchRate": 220, - "maleRatio": 0.125, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 74, "experienceGroup": "medium_slow", + "catchRate": 220, "eggCycles": 20, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "entityInteract": { + "avoidedByCreeper": true, + "avoidedByPhantom": true + }, + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "shinx", + "tier": 1 + }, + { + "pokemon": "litleo", + "tier": 1 + }, + { + "pokemon": "luxio", + "tier": 2 + }, + { + "pokemon": "luxray female", + "tier": 3 + }, + { + "pokemon": "luxray male", + "tier": 4 + }, + { + "pokemon": "pyroar female", + "tier": 5 + }, + { + "pokemon": "pyroar male", + "tier": 6 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + } + }, + "combat": { + "willDefendOwner": true + }, + "fireImmune": true + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:rotten_flesh", + "quantityRange": "0-1" + }, + { + "item": "minecraft:blaze_powder", + "percentage": 2.5 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:leer", "1:tackle", + "1:leer", "5:ember", "8:workup", "11:headbutt", @@ -44,18 +138,13 @@ "egg:entrainment", "egg:firespin", "egg:flareblitz", - "egg:snatch", "egg:yawn", "tm:acrobatics", - "tm:attract", "tm:bodyslam", "tm:bulldoze", - "tm:confide", "tm:crunch", - "tm:darkpulse", "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:echoedvoice", "tm:endeavor", "tm:endure", @@ -66,12 +155,12 @@ "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", - "tm:frustration", + "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:hiddenpower", "tm:hypervoice", "tm:incinerate", + "tm:irontail", "tm:mudslap", "tm:overheat", "tm:payback", @@ -80,42 +169,54 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:roar", "tm:rocksmash", - "tm:round", - "tm:secretpower", "tm:sleeptalk", "tm:snarl", + "tm:snatch", "tm:solarbeam", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", "tm:thunderfang", - "tm:toxic", "tm:trailblaze", "tm:wildcharge", "tm:willowisp", "tm:workup", + "tutor:bulldoze", "tutor:endeavor", + "tutor:firefang", + "tutor:flamethrower", "tutor:heatwave", "tutor:helpinghand", "tutor:hypervoice", "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", "tutor:snatch", - "tutor:snore" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.litleo.desc" + "tutor:swift", + "tutor:thunderfang", + "tutor:wildcharge", + "legacy:attract", + "legacy:confide", + "legacy:darkpulse", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { @@ -131,42 +232,5 @@ } ] } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 135, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-1" - }, - { - "item": "minecraft:blaze_powder", - "percentage": 2.5 - }, - { - "item": "cobblemon:rawst_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true + ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/malamar.json b/common/src/main/resources/data/cobblemon/species/generation6/malamar.json deleted file mode 100644 index 9bb0d696e..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/malamar.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "name": "Malamar", - "nationalPokedexNumber": 687, - "primaryType": "dark", - "secondaryType": "psychic", - "abilities": [ - "contrary", - "suctioncups", - "h:infiltrator" - ], - "baseStats": { - "hp": 86, - "attack": 92, - "defence": 88, - "special_attack": 68, - "special_defence": 75, - "speed": 73 - }, - "catchRate": 80, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 169, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "water_2" - ], - "moves": [ - "1:constrict", - "1:hypnosis", - "1:peck", - "1:reflect", - "1:reversal", - "1:tackle", - "1:wrap", - "9:payback", - "12:pluck", - "13:psywave", - "15:psybeam", - "18:swagger", - "21:slash", - "24:nightslash", - "27:psychocut", - "31:lightscreen", - "33:switcheroo", - "37:foulplay", - "42:topsyturvy", - "47:superpower", - "tm:aerialace", - "tm:allyswitch", - "tm:attract", - "tm:batonpass", - "tm:brutalswing", - "tm:calmmind", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:doubleteam", - "tm:embargo", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:faketears", - "tm:flamethrower", - "tm:flash", - "tm:fling", - "tm:foulplay", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:gravity", - "tm:guardswap", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:knockoff", - "tm:lashout", - "tm:lightscreen", - "tm:liquidation", - "tm:lunge", - "tm:nastyplot", - "tm:payback", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:reversal", - "tm:rockslide", - "tm:round", - "tm:scaryface", - "tm:secretpower", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swagger", - "tm:swift", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunderbolt", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tutor:allyswitch", - "tutor:bind", - "tutor:block", - "tutor:expandingforce", - "tutor:facade", - "tutor:foulplay", - "tutor:knockoff", - "tutor:lashout", - "tutor:rockslide", - "tutor:roleplay", - "tutor:signalbeam", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:superpower", - "tutor:telekinesis", - "tutor:throatchop" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.malamar.desc" - ], - "preEvolution": "inkay", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 470, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:ink_sac", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:tanga_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json b/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json deleted file mode 100644 index 88a5c3d4f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/meowstic.json +++ /dev/null @@ -1,342 +0,0 @@ -{ - "implemented": true, - "name": "Meowstic", - "nationalPokedexNumber": 678, - "primaryType": "psychic", - "abilities": [ - "keeneye", - "infiltrator", - "h:prankster" - ], - "baseStats": { - "hp": 74, - "attack": 48, - "defence": 76, - "special_attack": 83, - "special_defence": 81, - "speed": 104 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 163, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:disarmingvoice", - "1:fakeout", - "1:leer", - "1:magicalleaf", - "1:meanlook", - "1:scratch", - "9:confusion", - "12:helpinghand", - "12:storedpower", - "15:chargebeam", - "15:charm", - "18:covet", - "21:psybeam", - "24:suckerpunch", - "29:roleplay", - "31:miracleeye", - "34:lightscreen", - "34:reflect", - "39:psyshock", - "44:extrasensory", - "44:imprison", - "49:quickguard", - "49:shadowball", - "54:psychic", - "59:futuresight", - "59:mistyterrain", - "tm:alluringvoice", - "tm:allyswitch", - "tm:attract", - "tm:batonpass", - "tm:calmmind", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:dreameater", - "tm:echoedvoice", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:gravity", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:imprison", - "tm:irontail", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:mistyterrain", - "tm:nastyplot", - "tm:payback", - "tm:payday", - "tm:playrough", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:tailslap", - "tm:terablast", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:workup", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:covet", - "tutor:expandingforce", - "tutor:gravity", - "tutor:healbell", - "tutor:helpinghand", - "tutor:irontail", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:recycle", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:snatch", - "tutor:snore", - "tutor:telekinesis", - "tutor:trick", - "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.meowstic.desc" - ], - "height": 6, - "weight": 85, - "preEvolution": "espurr", - "evolutions": [], - "forms": [ - { - "name": "female", - "primaryType": "psychic", - "abilities": [ - "keeneye", - "infiltrator", - "h:competitive" - ], - "baseStats": { - "hp": 74, - "attack": 48, - "defence": 76, - "special_attack": 83, - "special_defence": 81, - "speed": 104 - }, - "catchRate": 75, - "maleRatio": 0, - "baseExperienceYield": 163, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:disarmingvoice", - "1:fakeout", - "1:leer", - "1:magicalleaf", - "1:mefirst", - "1:scratch", - "9:confusion", - "12:storedpower", - "15:chargebeam", - "18:covet", - "21:psybeam", - "24:suckerpunch", - "29:roleplay", - "34:lightscreen", - "34:reflect", - "39:psyshock", - "44:extrasensory", - "45:signalbeam", - "49:shadowball", - "54:psychic", - "59:futuresight", - "tm:alluringvoice", - "tm:allyswitch", - "tm:attract", - "tm:batonpass", - "tm:calmmind", - "tm:chargebeam", - "tm:charm", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleteam", - "tm:dreameater", - "tm:echoedvoice", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:faketears", - "tm:flash", - "tm:frustration", - "tm:futuresight", - "tm:gigaimpact", - "tm:gravity", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:irontail", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:nastyplot", - "tm:payback", - "tm:payday", - "tm:playrough", - "tm:poweruppunch", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:secretpower", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:tailslap", - "tm:terablast", - "tm:thunderbolt", - "tm:thunderwave", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:workup", - "tm:zenheadbutt", - "tutor:allyswitch", - "tutor:covet", - "tutor:expandingforce", - "tutor:gravity", - "tutor:healbell", - "tutor:helpinghand", - "tutor:irontail", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:recycle", - "tutor:roleplay", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:skillswap", - "tutor:snatch", - "tutor:snore", - "tutor:telekinesis", - "tutor:trick", - "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6" - ], - "aspects": [ - "female" - ], - "height": 6, - "weight": 85, - "preEvolution": "espurr", - "cannotDynamax": false, - "battleOnly": false - } - ], - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:colbur_berry", - "percentage": 5.0 - } - ] - } -} diff --git a/common/src/main/resources/data/cobblemon/species/generation6/noibat.json b/common/src/main/resources/data/cobblemon/species/generation6/noibat.json deleted file mode 100644 index a866e8e23..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/noibat.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "name": "Noibat", - "nationalPokedexNumber": 714, - "primaryType": "flying", - "secondaryType": "dragon", - "abilities": [ - "frisk", - "infiltrator", - "h:telepathy" - ], - "baseStats": { - "hp": 40, - "attack": 30, - "defence": 35, - "special_attack": 45, - "special_defence": 40, - "speed": 55 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 49, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "flying", - "dragon" - ], - "moves": [ - "1:absorb", - "1:tackle", - "4:gust", - "5:leechlife", - "8:supersonic", - "12:doubleteam", - "16:wingattack", - "18:agility", - "20:bite", - "24:aircutter", - "28:whirlwind", - "31:razorwind", - "32:superfang", - "36:airslash", - "40:screech", - "44:roost", - "49:tailwind", - "52:hurricane", - "egg:defog", - "egg:dragonrush", - "egg:outrage", - "egg:snatch", - "egg:switcheroo", - "egg:tailwind", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:attract", - "tm:brickbreak", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragonclaw", - "tm:dragonpulse", - "tm:dreameater", - "tm:dualwingbeat", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:fly", - "tm:frustration", - "tm:heatwave", - "tm:hiddenpower", - "tm:hurricane", - "tm:hypervoice", - "tm:irontail", - "tm:leechlife", - "tm:outrage", - "tm:protect", - "tm:psychic", - "tm:rest", - "tm:return", - "tm:roost", - "tm:round", - "tm:screech", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:uproar", - "tm:uturn", - "tm:wildcharge", - "tm:xscissor", - "tutor:defog", - "tutor:dracometeor", - "tutor:dragonpulse", - "tutor:dualwingbeat", - "tutor:heatwave", - "tutor:hypervoice", - "tutor:irontail", - "tutor:outrage", - "tutor:skyattack", - "tutor:snatch", - "tutor:snore", - "tutor:superfang", - "tutor:tailwind", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.noibat.desc" - ], - "evolutions": [ - { - "id": "noibat_noivern", - "variant": "level_up", - "result": "noivern", - "consumeHeldItem": false, - "learnableMoves": [ - "dragonpulse" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 48 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 5, - "weight": 80, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:phantom_membrane", - "percentage": 2.5 - }, - { - "item": "cobblemon:yache_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/noivern.json b/common/src/main/resources/data/cobblemon/species/generation6/noivern.json deleted file mode 100644 index 66ecc8fc2..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/noivern.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "name": "Noivern", - "nationalPokedexNumber": 715, - "primaryType": "flying", - "secondaryType": "dragon", - "abilities": [ - "frisk", - "infiltrator", - "h:telepathy" - ], - "baseStats": { - "hp": 85, - "attack": 70, - "defence": 80, - "special_attack": 97, - "special_defence": 80, - "speed": 123 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 187, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "flying", - "dragon" - ], - "moves": [ - "1:absorb", - "1:dragonpulse", - "1:gust", - "1:moonlight", - "1:supersonic", - "1:tackle", - "5:leechlife", - "12:doubleteam", - "16:wingattack", - "18:agility", - "20:bite", - "24:aircutter", - "28:whirlwind", - "31:razorwind", - "32:superfang", - "36:airslash", - "40:screech", - "44:roost", - "51:tailwind", - "56:hurricane", - "62:boomburst", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:attract", - "tm:bodyslam", - "tm:breakingswipe", - "tm:brickbreak", - "tm:confide", - "tm:cut", - "tm:darkpulse", - "tm:doubleedge", - "tm:doubleteam", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:dreameater", - "tm:dualwingbeat", - "tm:echoedvoice", - "tm:endure", - "tm:facade", - "tm:flamethrower", - "tm:fly", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:heatwave", - "tm:hiddenpower", - "tm:honeclaws", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:irontail", - "tm:leechlife", - "tm:outrage", - "tm:protect", - "tm:psychic", - "tm:psychicnoise", - "tm:rest", - "tm:return", - "tm:roost", - "tm:round", - "tm:scaryface", - "tm:screech", - "tm:secretpower", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:uproar", - "tm:uturn", - "tm:waterpulse", - "tm:wildcharge", - "tm:xscissor", - "tutor:defog", - "tutor:dracometeor", - "tutor:dragonpulse", - "tutor:dualwingbeat", - "tutor:heatwave", - "tutor:hypervoice", - "tutor:irontail", - "tutor:laserfocus", - "tutor:outrage", - "tutor:skyattack", - "tutor:snatch", - "tutor:snore", - "tutor:superfang", - "tutor:tailwind", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.noivern.desc" - ], - "preEvolution": "noibat", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 15, - "weight": 850, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:phantom_membrane", - "percentage": 5.0 - }, - { - "item": "cobblemon:yache_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 75551da8a..4bc51c2d1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json @@ -1,12 +1,26 @@ { - "name": "Pancham", "nationalPokedexNumber": 674, + "name": "Pancham", "primaryType": "fighting", + "maleRatio": 0.5, + "height": 6, + "weight": 80, + "pokedex": [ + "cobblemon.species.pancham.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "ironfist", "moldbreaker", "h:scrappy" ], + "eggGroups": [ + "field", + "human_like" + ], "baseStats": { "hp": 67, "attack": 82, @@ -15,24 +29,49 @@ "special_defence": 48, "speed": 43 }, - "catchRate": 220, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 70, "experienceGroup": "medium_fast", + "catchRate": 220, "eggCycles": 25, - "eggGroups": [ - "field", - "human_like" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:bamboo", + "quantityRange": "0-1" + }, + { + "item": "cobblemon:mental_herb", + "percentage": 2.5 + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:leer", "1:tackle", + "1:leer", + "1:karatechop", "4:armthrust", "8:taunt", "12:circlethrow", - "12:karatechop", - "15:cometpunch", "16:lowsweep", "20:workup", "24:slash", @@ -41,42 +80,45 @@ "36:bodyslam", "40:partingshot", "44:entrainment", - "48:skyuppercut", - "egg:foulplay", + "egg:cometpunch", "egg:mefirst", "egg:powertrip", "egg:quash", "egg:quickguard", "egg:seismictoss", + "egg:skyuppercut", "egg:stormthrow", "tm:aerialace", - "tm:attract", + "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", - "tm:confide", + "tm:coaching", + "tm:covet", "tm:crunch", "tm:cut", "tm:darkpulse", "tm:dig", - "tm:doubleteam", "tm:drainpunch", + "tm:dualchop", "tm:echoedvoice", + "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", "tm:firepunch", "tm:fling", + "tm:focuspunch", "tm:foulplay", - "tm:frustration", "tm:grassknot", "tm:gunkshot", "tm:helpinghand", - "tm:hiddenpower", "tm:hypervoice", "tm:icepunch", "tm:ironhead", + "tm:knockoff", + "tm:lashout", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -84,43 +126,44 @@ "tm:payback", "tm:poweruppunch", "tm:protect", + "tm:quash", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", - "tm:secretpower", "tm:shadowclaw", "tm:sleeptalk", "tm:sludgebomb", - "tm:snore", + "tm:snatch", + "tm:spite", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:swagger", "tm:swordsdance", "tm:taunt", + "tm:terablast", "tm:thunderpunch", "tm:torment", - "tm:toxic", "tm:uproar", "tm:workup", "tm:zenheadbutt", - "tutor:armthrust", + "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", @@ -132,20 +175,30 @@ "tutor:knockoff", "tutor:lashout", "tutor:lowkick", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", "tutor:snatch", - "tutor:snore", "tutor:spite", "tutor:stoneedge", "tutor:superpower", "tutor:thunderpunch", "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.pancham.desc" + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { @@ -154,51 +207,50 @@ "result": "pangoro", "consumeHeldItem": false, "learnableMoves": [ + "bulletpunch", "nightslash" ], "requirements": [ { "variant": "level", "minLevel": 32 + }, + { + "variant": "party_member", + "target": "type=dark", + "contains": true } ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 80, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:bamboo", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:mental_herb", - "percentage": 2.5 - }, - { - "item": "cobblemon:roseli_berry", - "percentage": 2.5 + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "pancham", + "tier": 1 + }, + { + "pokemon": "pangoro", + "tier": 2 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file 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 1915fd20a..1039d22a2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json @@ -1,13 +1,27 @@ { - "name": "Pangoro", "nationalPokedexNumber": 675, + "name": "Pangoro", "primaryType": "fighting", "secondaryType": "dark", + "maleRatio": 0.5, + "height": 21, + "weight": 1360, + "pokedex": [ + "cobblemon.species.pangoro.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "ironfist", "moldbreaker", "h:scrappy" ], + "eggGroups": [ + "field", + "human_like" + ], "baseStats": { "hp": 95, "attack": 124, @@ -16,25 +30,53 @@ "special_defence": 71, "speed": 58 }, - "catchRate": 65, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 2, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 173, "experienceGroup": "medium_fast", + "catchRate": 65, "eggCycles": 25, - "eggGroups": [ - "field", - "human_like" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:bamboo", + "quantityRange": "0-2" + }, + { + "item": "cobblemon:mental_herb", + "percentage": 5.0 + }, + { + "item": "cobblemon:roseli_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:armthrust", - "1:bulletpunch", - "1:leer", "1:tackle", + "1:leer", + "1:armthrust", + "1:karatechop", + "1:cometpunch", + "1:skyuppercut", "1:taunt", + "1:bulletpunch", + "1:nightslash", "12:circlethrow", - "12:karatechop", - "15:cometpunch", "16:lowsweep", "20:workup", "24:slash", @@ -43,28 +85,37 @@ "40:bodyslam", "46:partingshot", "52:entrainment", - "52:skyuppercut", "58:hammerarm", + "egg:cometpunch", + "egg:mefirst", + "egg:powertrip", + "egg:quash", + "egg:quickguard", + "egg:seismictoss", + "egg:skyuppercut", + "egg:stormthrow", "tm:aerialace", - "tm:attract", "tm:beatup", + "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:confide", + "tm:coaching", + "tm:covet", "tm:crunch", "tm:cut", "tm:darkestlariat", "tm:darkpulse", "tm:dig", - "tm:doubleteam", "tm:dragonclaw", "tm:drainpunch", + "tm:dualchop", "tm:earthquake", "tm:echoedvoice", "tm:embargo", + "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", @@ -72,19 +123,21 @@ "tm:fling", "tm:focusblast", "tm:focusenergy", + "tm:focuspunch", "tm:foulplay", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", "tm:helpinghand", - "tm:hiddenpower", "tm:honeclaws", "tm:hyperbeam", "tm:hypervoice", "tm:icepunch", "tm:infestation", "tm:ironhead", + "tm:knockoff", + "tm:laserfocus", + "tm:lashout", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -98,21 +151,19 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:reversal", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:scaryface", - "tm:secretpower", "tm:shadowclaw", "tm:sleeptalk", "tm:sludgebomb", "tm:snarl", - "tm:snore", + "tm:snatch", + "tm:spite", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", @@ -120,29 +171,36 @@ "tm:sunnyday", "tm:superpower", "tm:surf", - "tm:swagger", "tm:swordsdance", "tm:taunt", + "tm:terablast", "tm:thief", "tm:throatchop", "tm:thunderpunch", "tm:torment", - "tm:toxic", "tm:uproar", "tm:workup", "tm:xscissor", "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", @@ -151,59 +209,55 @@ "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:snore", "tutor:spite", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", "tutor:throatchop", "tutor:thunderpunch", "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.pangoro.desc" + "tutor:xscissor", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "preEvolution": "pancham", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 21, - "weight": 1360, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:bamboo", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:mental_herb", - "percentage": 5.0 - }, - { - "item": "cobblemon:roseli_berry", - "percentage": 5.0 + "behaviour": { + "herd": { + "maxSize": "3" + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 8f5ba2c02..c36120a4c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json @@ -1,13 +1,26 @@ { - "name": "Pyroar", "nationalPokedexNumber": 668, + "name": "Pyroar", "primaryType": "fire", "secondaryType": "normal", + "maleRatio": 0.125, + "height": 15, + "weight": 815, + "pokedex": [ + "cobblemon.species.pyroar.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "rivalry", "unnerve", "h:moxie" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 86, "attack": 68, @@ -16,20 +29,82 @@ "special_defence": 66, "speed": 106 }, - "catchRate": 65, - "maleRatio": 0.125, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 2, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 177, "experienceGroup": "medium_slow", + "catchRate": 65, "eggCycles": 20, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "entityInteract": { + "avoidedByCreeper": true, + "avoidedByPhantom": true + }, + "herd": { + "maxSize": "7", + "toleratedLeaders": [ + { + "pokemon": "pyroar female", + "tier": 1 + }, + { + "pokemon": "pyroar male", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "fireImmune": true + }, + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:rotten_flesh", + "quantityRange": "0-2" + }, + { + "item": "minecraft:blaze_powder", + "percentage": 5.0 + }, + { + "item": "cobblemon:rawst_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:ember", "1:hyperbeam", - "1:leer", "1:tackle", + "1:leer", + "1:ember", "1:workup", "11:headbutt", "15:nobleroar", @@ -42,17 +117,19 @@ "48:hypervoice", "51:incinerate", "57:overheat", + "egg:entrainment", + "egg:firespin", + "egg:flareblitz", + "egg:yawn", "tm:acrobatics", - "tm:attract", "tm:bodyslam", + "tm:bounce", "tm:bulldoze", "tm:burningjealousy", - "tm:confide", "tm:crunch", "tm:darkpulse", "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:echoedvoice", "tm:endeavor", "tm:endure", @@ -63,14 +140,14 @@ "tm:flamecharge", "tm:flamethrower", "tm:flareblitz", - "tm:frustration", "tm:gigaimpact", + "tm:headbutt", "tm:heatwave", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:hypervoice", "tm:incinerate", + "tm:irontail", "tm:mudslap", "tm:overheat", "tm:payback", @@ -79,18 +156,15 @@ "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:roar", "tm:rocksmash", - "tm:round", - "tm:secretpower", "tm:sleeptalk", "tm:snarl", + "tm:snatch", "tm:solarbeam", "tm:strength", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", "tm:taunt", @@ -98,65 +172,43 @@ "tm:terablast", "tm:thief", "tm:thunderfang", - "tm:toxic", "tm:trailblaze", "tm:wildcharge", "tm:willowisp", "tm:workup", "tutor:bounce", - "tutor:darkpulse", + "tutor:bulldoze", + "tutor:burningjealousy", "tutor:endeavor", - "tutor:fireblast", + "tutor:firefang", + "tutor:flamethrower", + "tutor:gigaimpact", "tutor:heatwave", "tutor:helpinghand", + "tutor:hyperbeam", "tutor:hypervoice", "tutor:irontail", + "tutor:mudslap", + "tutor:rest", + "tutor:rocksmash", + "tutor:sleeptalk", + "tutor:snarl", "tutor:snatch", - "tutor:snore" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.pyroar.desc" + "tutor:swift", + "tutor:thunderfang", + "tutor:wildcharge", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "preEvolution": "litleo", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 815, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-2" - }, - { - "item": "minecraft:blaze_powder", - "percentage": 5.0 - }, - { - "item": "cobblemon:rawst_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true + "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json b/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json deleted file mode 100644 index f702f1dbd..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation6/skiddo.json +++ /dev/null @@ -1,165 +0,0 @@ -{ - "name": "Skiddo", - "nationalPokedexNumber": 672, - "primaryType": "grass", - "abilities": [ - "sapsipper", - "h:grasspelt" - ], - "baseStats": { - "hp": 66, - "attack": 65, - "defence": 48, - "special_attack": 62, - "special_defence": 57, - "speed": 52 - }, - "catchRate": 200, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 70, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:growth", - "1:tackle", - "7:vinewhip", - "9:tailwhip", - "12:leechseed", - "13:razorleaf", - "16:worryseed", - "20:synthesis", - "22:takedown", - "26:bulldoze", - "30:seedbomb", - "34:bulkup", - "38:doubleedge", - "42:hornleech", - "45:leafblade", - "50:milkdrink", - "egg:defensecurl", - "egg:grassyterrain", - "egg:milkdrink", - "egg:rollout", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulkup", - "tm:bulldoze", - "tm:bulletseed", - "tm:confide", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:frustration", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hiddenpower", - "tm:leafstorm", - "tm:magicalleaf", - "tm:mudshot", - "tm:mudslap", - "tm:naturepower", - "tm:payback", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:retaliate", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:rocksmash", - "tm:round", - "tm:secretpower", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:strength", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:takedown", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt", - "tutor:gigadrain", - "tutor:irontail", - "tutor:seedbomb", - "tutor:snore", - "tutor:synthesis", - "tutor:worryseed", - "tutor:zenheadbutt" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.skiddo.desc" - ], - "evolutions": [ - { - "id": "skiddo_gogoat", - "variant": "level_up", - "result": "gogoat", - "consumeHeldItem": false, - "learnableMoves": [ - "aerialace" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 32 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 9, - "weight": 310, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:mutton", - "quantityRange": "1-2" - }, - { - "item": "cobblemon:oran_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 085306b0f..b0ab72be4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json @@ -1,11 +1,24 @@ { - "name": "Slurpuff", "nationalPokedexNumber": 685, + "name": "Slurpuff", "primaryType": "fairy", + "maleRatio": 0.5, + "height": 8, + "weight": 50, + "pokedex": [ + "cobblemon.species.slurpuff.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "sweetveil", "h:unburden" ], + "eggGroups": [ + "fairy" + ], "baseStats": { "hp": 82, "attack": 80, @@ -14,20 +27,47 @@ "special_defence": 75, "speed": 72 }, - "catchRate": 140, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 168, "experienceGroup": "medium_fast", + "catchRate": 140, "eggCycles": 20, - "eggGroups": [ - "fairy" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:sugar", + "quantityRange": "0-2" + }, + { + "item": "minecraft:cake", + "percentage": 5.0 + }, + { + "item": "cobblemon:babiri_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:fairywind", - "1:playnice", "1:sweetscent", "1:tackle", + "1:fairywind", + "1:playnice", "9:aromatherapy", "12:drainingkiss", "15:faketears", @@ -40,105 +80,102 @@ "36:cottonguard", "39:endeavor", "42:stickyweb", - "58:lightscreen", - "67:safeguard", + "egg:afteryou", + "egg:bellydrum", + "egg:copycat", + "egg:stickyweb", + "egg:yawn", + "tm:afteryou", "tm:amnesia", - "tm:attract", "tm:calmmind", "tm:charm", - "tm:confide", + "tm:covet", "tm:dazzlinggleam", - "tm:doubleteam", "tm:drainingkiss", "tm:drainpunch", "tm:dreameater", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:faketears", "tm:flamethrower", "tm:flash", - "tm:frustration", + "tm:gastroacid", "tm:gigaimpact", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:lightscreen", + "tm:magiccoat", "tm:metronome", + "tm:mistyexplosion", "tm:playrough", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", "tm:round", "tm:safeguard", - "tm:secretpower", "tm:sleeptalk", - "tm:snore", + "tm:stringshot", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:swagger", + "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", - "tm:toxic", "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:snore" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.slurpuff.desc" + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:thunderbolt", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "preEvolution": "swirlix", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 8, - "weight": 50, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:sugar", - "quantityRange": "0-2" - }, - { - "item": "minecraft:cake", - "percentage": 5.0 - }, - { - "item": "cobblemon:babiri_berry", - "percentage": 5.0 + "behaviour": { + "herd": { + "maxSize": "3" + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 07d564a84..2d8e3fed7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json @@ -1,11 +1,51 @@ { - "name": "Spritzee", "nationalPokedexNumber": 682, + "name": "Spritzee", "primaryType": "fairy", + "maleRatio": 0.5, + "height": 2, + "weight": 5, + "pokedex": [ + "cobblemon.species.spritzee.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "healer", "h:aromaveil" ], + "eggGroups": [ + "fairy" + ], + "baseStats": { + "hp": 78, + "attack": 52, + "defence": 60, + "special_attack": 63, + "special_defence": 65, + "speed": 23 + }, + "evYield": { + "hp": 1, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 68, + "experienceGroup": "medium_fast", + "catchRate": 200, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 2, "entries": [ @@ -19,29 +59,12 @@ } ] }, - "baseStats": { - "hp": 78, - "attack": 52, - "defence": 60, - "special_attack": 63, - "special_defence": 65, - "speed": 23 - }, - "catchRate": 200, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 68, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "fairy" - ], "moves": [ - "1:fairywind", "1:sweetscent", + "1:fairywind", + "1:odorsleuth", "3:sweetkiss", "6:echoedvoice", - "8:odorsleuth", "9:drainingkiss", "12:aromatherapy", "18:attract", @@ -52,36 +75,38 @@ "33:calmmind", "36:moonblast", "39:skillswap", - "50:disarmingvoice", "egg:afteryou", "egg:captivate", "egg:disable", - "egg:nastyplot", "egg:refresh", "egg:wish", + "tm:afteryou", "tm:allyswitch", "tm:attract", "tm:calmmind", + "tm:captivate", "tm:chargebeam", "tm:charm", - "tm:confide", + "tm:covet", "tm:dazzlinggleam", - "tm:doubleteam", + "tm:disarmingvoice", "tm:drainingkiss", "tm:dreameater", "tm:echoedvoice", "tm:encore", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:faketears", "tm:flash", "tm:flashcannon", - "tm:frustration", "tm:gyroball", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:lightscreen", + "tm:magiccoat", + "tm:mistyexplosion", "tm:mistyterrain", "tm:nastyplot", "tm:protect", @@ -90,36 +115,44 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", - "tm:secretpower", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:substitute", "tm:sunnyday", - "tm:swagger", + "tm:telekinesis", + "tm:terablast", "tm:thunderbolt", "tm:torment", - "tm:toxic", "tm:trickroom", "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:snore", - "tutor:telekinesis" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.spritzee.desc" + "tutor:sleeptalk", + "tutor:telekinesis", + "tutor:thunderbolt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { @@ -136,24 +169,35 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 2, - "weight": 5, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "spritzee", + "tier": 1 + }, + { + "pokemon": "aromatisse", + "tier": 2 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 e214b05ab..f5605208a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json @@ -1,11 +1,24 @@ { - "name": "Swirlix", "nationalPokedexNumber": 684, + "name": "Swirlix", "primaryType": "fairy", + "maleRatio": 0.5, + "height": 4, + "weight": 35, + "pokedex": [ + "cobblemon.species.swirlix.desc" + ], + "labels": [ + "gen6" + ], + "aspects": [], "abilities": [ "sweetveil", "h:unburden" ], + "eggGroups": [ + "fairy" + ], "baseStats": { "hp": 62, "attack": 48, @@ -14,15 +27,42 @@ "special_defence": 57, "speed": 49 }, - "catchRate": 200, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 68, "experienceGroup": "medium_fast", + "catchRate": 200, "eggCycles": 20, - "eggGroups": [ - "fairy" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:sugar", + "quantityRange": "0-1" + }, + { + "item": "minecraft:cake", + "percentage": 2.5 + }, + { + "item": "cobblemon:babiri_berry", + "percentage": 2.5 + } + ] + }, "moves": [ "1:sweetscent", "1:tackle", @@ -39,66 +79,76 @@ "33:playrough", "36:cottonguard", "39:endeavor", - "58:lightscreen", - "67:safeguard", "egg:afteryou", "egg:bellydrum", "egg:copycat", "egg:stickyweb", "egg:yawn", + "tm:afteryou", "tm:amnesia", - "tm:attract", "tm:calmmind", "tm:charm", - "tm:confide", + "tm:covet", "tm:dazzlinggleam", - "tm:doubleteam", "tm:drainingkiss", "tm:dreameater", + "tm:endeavor", "tm:endure", "tm:energyball", "tm:facade", "tm:faketears", "tm:flamethrower", "tm:flash", - "tm:frustration", + "tm:gastroacid", + "tm:healbell", "tm:helpinghand", - "tm:hiddenpower", "tm:lightscreen", + "tm:magiccoat", + "tm:mistyexplosion", "tm:playrough", "tm:protect", "tm:psychic", "tm:psychup", "tm:raindance", "tm:rest", - "tm:return", "tm:round", "tm:safeguard", - "tm:secretpower", "tm:sleeptalk", - "tm:snore", + "tm:stringshot", "tm:substitute", "tm:sunnyday", "tm:surf", - "tm:swagger", + "tm:terablast", "tm:thief", "tm:thunderbolt", - "tm:toxic", "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:snore" - ], - "labels": [ - "gen6" - ], - "pokedex": [ - "cobblemon.species.swirlix.desc" + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:thunderbolt", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { @@ -115,41 +165,46 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 35, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:sugar", - "quantityRange": "0-1" + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "swirlix", + "tier": 1 + }, + { + "pokemon": "milcery", + "tier": 1 + }, + { + "pokemon": "slurpuff", + "tier": 2 + }, + { + "pokemon": "alcremie", + "tier": 2 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true }, - { - "item": "minecraft:cake", - "percentage": 2.5 + "walk": { + "canWalk": false }, - { - "item": "cobblemon:babiri_berry", - "percentage": 2.5 + "fly": { + "canFly": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 d3ffecf40..f1b1345e0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json @@ -1,10 +1,25 @@ { - "name": "Volcanion", "nationalPokedexNumber": 721, + "name": "Volcanion", "primaryType": "fire", "secondaryType": "water", + "maleRatio": -1, + "height": 17, + "weight": 1950, + "pokedex": [ + "cobblemon.species.volcanion.desc" + ], + "labels": [ + "gen6", + "mythical" + ], + "aspects": [], "abilities": [ - "waterabsorb" + "waterabsorb", + "h:waterabsorb" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 80, @@ -14,18 +29,28 @@ "special_defence": 90, "speed": 70 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 100, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:firespin", "1:steameruption", + "1:firespin", "1:watergun", "6:leer", "12:weatherball", @@ -34,11 +59,10 @@ "30:scaryface", "36:incinerate", "42:stomp", - "46:bodyslam", "48:scald", "54:takedown", - "60:haze", "60:mist", + "60:haze", "66:hydropump", "78:flareblitz", "84:overheat", @@ -47,11 +71,10 @@ "tm:bodyslam", "tm:brickbreak", "tm:bulldoze", - "tm:confide", "tm:cut", + "tm:defog", "tm:dig", "tm:doubleedge", - "tm:doubleteam", "tm:earthpower", "tm:earthquake", "tm:endure", @@ -67,14 +90,12 @@ "tm:fling", "tm:focusblast", "tm:focusenergy", - "tm:frustration", "tm:gigaimpact", "tm:gyroball", "tm:haze", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", - "tm:hiddenpower", "tm:hydropump", "tm:hyperbeam", "tm:incinerate", @@ -85,23 +106,19 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:roar", "tm:rockslide", "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:scald", "tm:scaryface", "tm:scorchingsands", - "tm:secretpower", "tm:selfdestruct", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:smackdown", - "tm:snore", "tm:solarbeam", "tm:stompingtantrum", "tm:stoneedge", @@ -109,62 +126,65 @@ "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thunderfang", - "tm:toxic", "tm:waterpulse", "tm:weatherball", "tm:wildcharge", "tm:willowisp", + "tutor:bulldoze", "tutor:defog", "tutor:earthpower", - "tutor:explosion", + "tutor:firefang", "tutor:flamethrower", - "tutor:flareblitz", - "tutor:haze", + "tutor:flashcannon", + "tutor:focusenergy", + "tutor:gigaimpact", "tutor:heatwave", - "tutor:hydropump", - "tutor:incinerate", + "tutor:hyperbeam", "tutor:liquidation", - "tutor:mist", - "tutor:overheat", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", "tutor:scorchingsands", - "tutor:snore", - "tutor:steameruption", + "tutor:sleeptalk", + "tutor:sludgebomb", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", - "tutor:waterpulse" - ], - "labels": [ - "gen6", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.volcanion.desc" + "tutor:thunderfang", + "tutor:waterpulse", + "tutor:wildcharge", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 100, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 17, - "weight": 1950, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "fireImmune": true + } } \ No newline at end of file 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 ee97026a4..8e223da2c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json @@ -1,10 +1,26 @@ { - "name": "Yveltal", "nationalPokedexNumber": 717, + "name": "Yveltal", "primaryType": "dark", "secondaryType": "flying", + "maleRatio": -1, + "height": 58, + "weight": 2030, + "pokedex": [ + "cobblemon.species.yveltal.desc" + ], + "labels": [ + "gen6", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "darkaura" + "darkaura", + "h:darkaura" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 126, @@ -14,26 +30,51 @@ "special_defence": 98, "speed": 99 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 340, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "behaviour": { "moving": { "fly": { "canFly": true + }, + "swim": { + "avoidsWater": true } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 } }, "moves": [ - "1:doubleteam", - "1:gust", "1:razorwind", + "1:gust", + "1:doubleteam", "5:taunt", "10:snarl", "15:disable", @@ -54,104 +95,91 @@ "tm:acrobatics", "tm:aerialace", "tm:airslash", + "tm:block", "tm:bodyslam", - "tm:confide", "tm:cut", "tm:darkpulse", + "tm:defog", "tm:doubleteam", "tm:dragonclaw", "tm:dreameater", + "tm:dualwingbeat", "tm:embargo", "tm:endure", "tm:facade", "tm:fly", "tm:focusblast", "tm:foulplay", - "tm:frustration", "tm:gigaimpact", "tm:heatwave", - "tm:hiddenpower", "tm:honeclaws", "tm:hurricane", "tm:hyperbeam", "tm:hypervoice", + "tm:knockoff", + "tm:laserfocus", + "tm:lashout", "tm:payback", "tm:phantomforce", "tm:protect", "tm:psychic", "tm:raindance", "tm:rest", - "tm:return", "tm:rockslide", "tm:roost", - "tm:round", - "tm:secretpower", "tm:shadowball", "tm:shadowclaw", + "tm:skyattack", "tm:skydrop", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:steelwing", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", "tm:swift", + "tm:tailwind", "tm:taunt", + "tm:terablast", "tm:thief", "tm:torment", - "tm:toxic", "tm:uturn", "tm:zenheadbutt", + "tutor:aerialace", "tutor:block", "tutor:darkpulse", "tutor:defog", - "tutor:disable", - "tutor:dragonrush", "tutor:dualwingbeat", "tutor:foulplay", + "tutor:gigaimpact", "tutor:heatwave", + "tutor:hyperbeam", "tutor:hypervoice", "tutor:knockoff", "tutor:laserfocus", "tutor:lashout", - "tutor:oblivionwing", - "tutor:phantomforce", "tutor:psychic", + "tutor:rest", + "tutor:rockslide", + "tutor:roost", + "tutor:shadowball", + "tutor:shadowclaw", "tutor:skyattack", + "tutor:sleeptalk", "tutor:snarl", - "tutor:snore", "tutor:suckerpunch", + "tutor:swift", "tutor:tailwind", - "tutor:taunt", - "tutor:zenheadbutt" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "labels": [ - "gen6", - "legendary" - ], - "pokedex": [ - "cobblemon.species.yveltal.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 58, - "weight": 2030, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "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 6e8b4a14d..cadd80c29 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json @@ -1,10 +1,30 @@ { - "name": "Zygarde", + "implemented": true, "nationalPokedexNumber": 718, + "name": "Zygarde", "primaryType": "dragon", "secondaryType": "ground", + "maleRatio": -1, + "height": 50, + "weight": 3050, + "pokedex": [ + "cobblemon.species.zygarde.desc" + ], + "labels": [ + "gen6", + "legendary", + "restricted" + ], + "aspects": [ + "50-percent" + ], "abilities": [ - "aurabreak", "powerconstruct" + "aurabreak", + "powerconstruct", + "h:aurabreak" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 108, @@ -14,11 +34,6 @@ "special_defence": 95, "speed": 95 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "baseExperienceYield": 300, - "baseFriendship": 0, "evYield": { "hp": 3, "attack": 0, @@ -27,19 +42,20 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:bind", - "1:bite", "1:bulldoze", - "1:coreenforcer", "1:dragonbreath", + "1:bite", + "1:bind", + "1:camouflage", "1:thousandarrows", "1:thousandwaves", + "1:coreenforcer", "8:haze", "16:dig", "24:safeguard", @@ -47,21 +63,24 @@ "40:dragonpulse", "48:landswrath", "56:glare", - "59:camouflage", "64:sandstorm", "72:coil", - "72:dragondance", "80:earthquake", "88:extremespeed", - "88:outrage", + "form_change:coreenforcer", + "form_change:dragondance", + "form_change:extremespeed", + "form_change:thousandarrows", + "form_change:thousandwaves", + "tm:bind", + "tm:block", "tm:bodyslam", "tm:breakingswipe", "tm:brickbreak", "tm:bulldoze", - "tm:confide", "tm:crunch", "tm:dig", - "tm:doubleteam", + "tm:dracometeor", "tm:dragondance", "tm:dragonpulse", "tm:dragontail", @@ -70,91 +89,97 @@ "tm:endure", "tm:facade", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", - "tm:hiddenpower", + "tm:haze", "tm:highhorsepower", "tm:hyperbeam", "tm:hypervoice", "tm:irontail", "tm:outrage", + "tm:painsplit", "tm:payback", "tm:protect", "tm:rest", "tm:retaliate", - "tm:return", "tm:reversal", "tm:rockslide", "tm:rocksmash", - "tm:round", "tm:safeguard", "tm:sandstorm", - "tm:secretpower", + "tm:scaleshot", + "tm:scorchingsands", + "tm:shockwave", + "tm:skittersmack", "tm:sleeptalk", "tm:sludgewave", - "tm:snore", + "tm:spite", "tm:stompingtantrum", "tm:stoneedge", "tm:strength", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:swift", - "tm:toxic", + "tm:terablast", "tm:zenheadbutt", "tutor:bind", "tutor:block", - "tutor:camouflage", - "tutor:coreenforcer", - "tutor:crunch", - "tutor:dig", + "tutor:bulldoze", "tutor:dracometeor", - "tutor:dragonbreath", - "tutor:dragondance", "tutor:dragonpulse", "tutor:earthpower", - "tutor:earthquake", - "tutor:extremespeed", - "tutor:glare", - "tutor:haze", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", "tutor:hypervoice", "tutor:irontail", - "tutor:landswrath", "tutor:outrage", "tutor:painsplit", - "tutor:safeguard", - "tutor:sandstorm", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", "tutor:scaleshot", "tutor:scorchingsands", "tutor:shockwave", "tutor:skittersmack", - "tutor:snore", + "tutor:sleeptalk", "tutor:spite", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", - "tutor:thousandarrows", - "tutor:thousandwaves", - "tutor:zenheadbutt" + "tutor:swift", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "labels": [ - "gen6", - "legendary" - ], - "pokedex": [ - "cobblemon.species.zygarde.desc" - ], - "height": 50, - "weight": 3050, "evolutions": [], "forms": [ { - "name": "Zygarde-10%", + "name": "10%", "primaryType": "dragon", "secondaryType": "ground", - "abilities": [ - "aurabreak", "powerconstruct" + "maleRatio": -1, + "height": 12, + "weight": 335, + "pokedex": [ + "cobblemon.species.zygarde-10.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted" + ], + "aspects": [ + "10-percent" ], "baseStats": { "hp": 54, @@ -164,101 +189,426 @@ "special_defence": 85, "speed": 115 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseExperienceYield": 243, "moves": [ + "1:bulldoze", + "1:dragonbreath", + "1:bite", + "1:bind", + "1:camouflage", + "1:thousandarrows", + "1:thousandwaves", + "1:coreenforcer", + "8:haze", + "16:dig", + "24:safeguard", + "32:crunch", + "40:dragonpulse", + "48:landswrath", + "56:glare", + "64:sandstorm", + "72:coil", + "80:earthquake", + "88:outrage", + "form_change:coreenforcer", + "form_change:dragondance", + "form_change:extremespeed", + "form_change:thousandarrows", + "form_change:thousandwaves", + "tm:bind", + "tm:block", + "tm:bodyslam", + "tm:breakingswipe", + "tm:brickbreak", + "tm:bulldoze", + "tm:crunch", + "tm:dig", + "tm:dracometeor", + "tm:dragondance", + "tm:dragonpulse", + "tm:dragontail", + "tm:earthpower", + "tm:earthquake", + "tm:endure", + "tm:extremespeed", + "tm:facade", + "tm:focusblast", + "tm:gigaimpact", + "tm:grassknot", + "tm:haze", + "tm:highhorsepower", + "tm:hyperbeam", + "tm:hypervoice", + "tm:irontail", + "tm:outrage", + "tm:painsplit", + "tm:payback", + "tm:protect", + "tm:rest", + "tm:retaliate", + "tm:reversal", + "tm:rockslide", + "tm:safeguard", + "tm:sandstorm", + "tm:scaleshot", + "tm:scorchingsands", + "tm:shockwave", + "tm:skittersmack", + "tm:sleeptalk", + "tm:sludgewave", + "tm:spite", + "tm:stompingtantrum", + "tm:stoneedge", + "tm:substitute", + "tm:sunnyday", + "tm:superpower", + "tm:swift", + "tm:terablast", + "tm:zenheadbutt", "tutor:bind", - "tutor:dig", - "tutor:dragonbreath", - "tutor:dragondance", + "tutor:block", + "tutor:bulldoze", + "tutor:dracometeor", "tutor:dragonpulse", - "tutor:extremespeed", - "tutor:glare", - "tutor:haze", - "tutor:landswrath", + "tutor:earthpower", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:hypervoice", + "tutor:irontail", "tutor:outrage", - "tutor:safeguard", - "tutor:sandstorm", - "tutor:thousandarrows" - ], - "labels": [ - "gen7", - "legendary" - ], - "aspects": [ - "10%" + "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", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:rocksmash", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:strength", + "legacy:swagger", + "legacy:toxic" ], - "height": 12, - "weight": 335, - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } }, { - "name": "Zygarde-Complete", + "name": "10%-C", "primaryType": "dragon", "secondaryType": "ground", + "maleRatio": -1, + "height": 12, + "weight": 335, + "pokedex": [ + "cobblemon.species.zygarde-10c.desc" + ], + "labels": [ + "cobblemon", + "legendary", + "restricted" + ], + "aspects": [ + "power-construct", + "10-percent" + ], "abilities": [ - "powerconstruct" + "powerconstruct", + "h:powerconstruct" ], "baseStats": { - "hp": 216, + "hp": 54, "attack": 100, - "defence": 121, - "special_attack": 91, - "special_defence": 95, - "speed": 85 + "defence": 71, + "special_attack": 61, + "special_defence": 85, + "speed": 115 }, - "catchRate": 3, + "baseExperienceYield": 243, + "moves": [ + "1:bulldoze", + "1:dragonbreath", + "1:bite", + "1:bind", + "1:camouflage", + "1:thousandarrows", + "1:thousandwaves", + "1:coreenforcer", + "8:haze", + "16:dig", + "24:safeguard", + "32:crunch", + "40:dragonpulse", + "48:landswrath", + "56:glare", + "64:sandstorm", + "72:coil", + "80:earthquake", + "88:outrage", + "form_change:coreenforcer", + "form_change:dragondance", + "form_change:extremespeed", + "form_change:thousandarrows", + "form_change:thousandwaves", + "tm:bind", + "tm:block", + "tm:bodyslam", + "tm:breakingswipe", + "tm:brickbreak", + "tm:bulldoze", + "tm:crunch", + "tm:dig", + "tm:dracometeor", + "tm:dragondance", + "tm:dragonpulse", + "tm:dragontail", + "tm:earthpower", + "tm:earthquake", + "tm:endure", + "tm:extremespeed", + "tm:facade", + "tm:focusblast", + "tm:gigaimpact", + "tm:grassknot", + "tm:haze", + "tm:highhorsepower", + "tm:hyperbeam", + "tm:hypervoice", + "tm:irontail", + "tm:outrage", + "tm:painsplit", + "tm:payback", + "tm:protect", + "tm:rest", + "tm:retaliate", + "tm:reversal", + "tm:rockslide", + "tm:safeguard", + "tm:sandstorm", + "tm:scaleshot", + "tm:scorchingsands", + "tm:shockwave", + "tm:skittersmack", + "tm:sleeptalk", + "tm:sludgewave", + "tm:spite", + "tm:stompingtantrum", + "tm:stoneedge", + "tm:substitute", + "tm:sunnyday", + "tm:superpower", + "tm:swift", + "tm:terablast", + "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 + }, + { + "name": "50%-C", + "primaryType": "dragon", + "secondaryType": "ground", "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 50, + "weight": 3050, + "pokedex": [ + "cobblemon.species.zygarde-50c.desc" ], "labels": [ - "gen7", - "legendary" + "cobblemon", + "legendary", + "restricted" ], "aspects": [ - "10%", - "complete" + "50-percent", + "power-construct" ], - "height": 45, - "weight": 6100, - "cannotDynamax": false, - "battleOnly": true + "abilities": [ + "powerconstruct", + "h:powerconstruct" + ], + "moves": [ + "1:bulldoze", + "1:dragonbreath", + "1:bite", + "1:bind", + "1:camouflage", + "1:thousandarrows", + "1:thousandwaves", + "1:coreenforcer", + "8:haze", + "16:dig", + "24:safeguard", + "32:crunch", + "40:dragonpulse", + "48:landswrath", + "56:glare", + "64:sandstorm", + "72:coil", + "80:earthquake", + "88:outrage", + "form_change:coreenforcer", + "form_change:dragondance", + "form_change:extremespeed", + "form_change:thousandarrows", + "form_change:thousandwaves", + "tm:bind", + "tm:block", + "tm:bodyslam", + "tm:breakingswipe", + "tm:brickbreak", + "tm:bulldoze", + "tm:crunch", + "tm:dig", + "tm:dracometeor", + "tm:dragondance", + "tm:dragonpulse", + "tm:dragontail", + "tm:earthpower", + "tm:earthquake", + "tm:endure", + "tm:extremespeed", + "tm:facade", + "tm:focusblast", + "tm:gigaimpact", + "tm:grassknot", + "tm:haze", + "tm:highhorsepower", + "tm:hyperbeam", + "tm:hypervoice", + "tm:irontail", + "tm:outrage", + "tm:painsplit", + "tm:payback", + "tm:protect", + "tm:rest", + "tm:retaliate", + "tm:reversal", + "tm:rockslide", + "tm:safeguard", + "tm:sandstorm", + "tm:scaleshot", + "tm:scorchingsands", + "tm:shockwave", + "tm:skittersmack", + "tm:sleeptalk", + "tm:sludgewave", + "tm:spite", + "tm:stompingtantrum", + "tm:stoneedge", + "tm:substitute", + "tm:sunnyday", + "tm:superpower", + "tm:swift", + "tm:terablast", + "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 }, { - "name": "Zygarde-Complete", + "name": "Complete", "primaryType": "dragon", "secondaryType": "ground", + "maleRatio": -1, + "height": 45, + "weight": 6100, + "pokedex": [ + "cobblemon.species.zygarde-complete.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted" + ], + "aspects": [ + "complete-percent" + ], "abilities": [ - "powerconstruct" + "powerconstruct", + "h:powerconstruct" ], "baseStats": { "hp": 216, @@ -268,38 +618,130 @@ "special_defence": 95, "speed": 85 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen7", - "legendary" - ], - "aspects": [ - "50%", - "complete" + "baseExperienceYield": 354, + "moves": [ + "1:bulldoze", + "1:dragonbreath", + "1:bite", + "1:bind", + "1:camouflage", + "1:thousandarrows", + "1:thousandwaves", + "1:coreenforcer", + "8:haze", + "16:dig", + "24:safeguard", + "32:crunch", + "40:dragonpulse", + "48:landswrath", + "56:glare", + "64:sandstorm", + "72:coil", + "80:earthquake", + "88:outrage", + "form_change:coreenforcer", + "form_change:dragondance", + "form_change:extremespeed", + "form_change:thousandarrows", + "form_change:thousandwaves", + "tm:bind", + "tm:block", + "tm:bodyslam", + "tm:breakingswipe", + "tm:brickbreak", + "tm:bulldoze", + "tm:crunch", + "tm:dig", + "tm:dracometeor", + "tm:dragondance", + "tm:dragonpulse", + "tm:dragontail", + "tm:earthpower", + "tm:earthquake", + "tm:endure", + "tm:extremespeed", + "tm:facade", + "tm:focusblast", + "tm:gigaimpact", + "tm:grassknot", + "tm:haze", + "tm:highhorsepower", + "tm:hyperbeam", + "tm:hypervoice", + "tm:irontail", + "tm:outrage", + "tm:painsplit", + "tm:payback", + "tm:protect", + "tm:rest", + "tm:retaliate", + "tm:reversal", + "tm:rockslide", + "tm:safeguard", + "tm:sandstorm", + "tm:scaleshot", + "tm:scorchingsands", + "tm:shockwave", + "tm:skittersmack", + "tm:sleeptalk", + "tm:sludgewave", + "tm:spite", + "tm:stompingtantrum", + "tm:stoneedge", + "tm:substitute", + "tm:sunnyday", + "tm:superpower", + "tm:swift", + "tm:terablast", + "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" ], - "height": 45, - "weight": 6100, - "cannotDynamax": false, + "evolutions": [], "battleOnly": true } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json b/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json deleted file mode 100644 index 98ca0facb..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/araquanid.json +++ /dev/null @@ -1,259 +0,0 @@ -{ - "name": "Araquanid", - "nationalPokedexNumber": 752, - "primaryType": "water", - "secondaryType": "bug", - "abilities": [ - "waterbubble", - "h:waterabsorb" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:mystic_water", - "percentage": 5.0 - }, - { - "item": "cobblemon:wepear_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 68, - "attack": 70, - "defence": 92, - "special_attack": 50, - "special_defence": 132, - "speed": 42 - }, - "catchRate": 100, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Totem", - "primaryType": "water", - "secondaryType": "bug", - "abilities": [ - "waterbubble" - ], - "baseStats": { - "hp": 68, - "attack": 70, - "defence": 92, - "special_attack": 50, - "special_defence": 132, - "speed": 42 - }, - "catchRate": 100, - "maleRatio": 0.5, - "baseExperienceYield": 159, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "water_1", - "bug" - ], - "moves": [ - "1:bubble", - "1:bugbite", - "1:infestation", - "1:soak", - "1:spiderweb", - "1:wideguard", - "16:bubblebeam", - "21:bite", - "26:aquaring", - "33:leechlife", - "38:crunch", - "45:lunge", - "50:mirrorcoat", - "57:liquidation", - "62:entrainment", - "tm:attract", - "tm:blizzard", - "tm:confide", - "tm:doubleteam", - "tm:facade", - "tm:frostbreath", - "tm:frustration", - "tm:hiddenpower", - "tm:icebeam", - "tm:infestation", - "tm:leechlife", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scald", - "tm:sleeptalk", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:toxic", - "tm:waterfall", - "tm:xscissor", - "tutor:bite", - "tutor:bubblebeam", - "tutor:bugbite", - "tutor:gigadrain", - "tutor:icywind", - "tutor:irondefense", - "tutor:laserfocus", - "tutor:liquidation", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:signalbeam", - "tutor:snore", - "tutor:spiderweb", - "tutor:waterpulse", - "tutor:wonderroom" - ], - "labels": [ - "gen7", - "totem" - ], - "aspects": [ - "totem" - ], - "height": 31, - "weight": 2175, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 159, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "water_1", - "bug" - ], - "moves": [ - "1:bite", - "1:bubble", - "1:bugbite", - "1:infestation", - "1:spiderweb", - "1:watergun", - "1:wideguard", - "12:bubblebeam", - "16:aquaring", - "20:headbutt", - "26:crunch", - "32:soak", - "38:entrainment", - "44:lunge", - "50:liquidation", - "56:leechlife", - "62:mirrorcoat", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:bugbite", - "tm:bugbuzz", - "tm:confide", - "tm:chillingwater", - "tm:crunch", - "tm:dive", - "tm:doubleteam", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:frostbreath", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:infestation", - "tm:irondefense", - "tm:leechlife", - "tm:liquidation", - "tm:lunge", - "tm:magicroom", - "tm:poisonjab", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scald", - "tm:scaryface", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:waterfall", - "tm:waterpulse", - "tm:wonderroom", - "tm:xscissor", - "tutor:bugbite", - "tutor:gigadrain", - "tutor:icywind", - "tutor:irondefense", - "tutor:laserfocus", - "tutor:liquidation", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:signalbeam", - "tutor:skittersmack", - "tutor:snore", - "tutor:waterpulse", - "tutor:wonderroom" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.araquanid.desc" - ], - "preEvolution": "dewpider", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 18, - "weight": 820, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ No newline at end of file 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 7358bd96f..52ab92204 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/blacephalon.json @@ -1,20 +1,27 @@ { - "name": "Blacephalon", + "implemented": true, "nationalPokedexNumber": 806, + "name": "Blacephalon", "primaryType": "fire", "secondaryType": "ghost", + "maleRatio": -1, + "height": 18, + "weight": 130, + "pokedex": [ + "cobblemon.species.blacephalon.desc" + ], + "labels": [ + "gen7", + "ultra_beast" + ], + "aspects": [], "abilities": [ - "beastboost" + "beastboost", + "h:beastboost" + ], + "eggGroups": [ + "undiscovered" ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:echo_shard", - "quantityRange": "1-3" - } - ] - }, "baseStats": { "hp": 53, "attack": 127, @@ -23,23 +30,41 @@ "special_defence": 79, "speed": 107 }, - "catchRate": 30, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "moves": [ "1:astonish", + "1:flameburst", "1:firespin", "5:lightscreen", "10:ember", - "13:storedpower", "15:nightshade", - "17:flameburst", "20:confuseray", "25:magiccoat", "30:incinerate", @@ -51,12 +76,13 @@ "60:trick", "65:fireblast", "70:mindblown", + "tm:afteryou", "tm:calmmind", - "tm:confide", + "tm:confuseray", "tm:darkpulse", - "tm:doubleteam", "tm:encore", "tm:endure", + "tm:expandingforce", "tm:explosion", "tm:facade", "tm:fireblast", @@ -66,86 +92,97 @@ "tm:flamethrower", "tm:fling", "tm:foulplay", - "tm:frustration", "tm:heatwave", - "tm:hiddenpower", "tm:hyperbeam", + "tm:incinerate", + "tm:knockoff", + "tm:lastresort", "tm:lightscreen", + "tm:magiccoat", "tm:mysticalfire", + "tm:nightshade", "tm:overheat", + "tm:painsplit", "tm:payback", "tm:protect", "tm:psychic", "tm:psyshock", "tm:quash", + "tm:recycle", "tm:rest", - "tm:return", "tm:rockblast", - "tm:round", "tm:selfdestruct", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:solarbeam", + "tm:spite", "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:taunt", + "tm:terablast", "tm:thief", "tm:torment", - "tm:toxic", "tm:trick", "tm:uproar", "tm:willowisp", "tm:zenheadbutt", "tutor:afteryou", + "tutor:calmmind", + "tutor:darkpulse", "tutor:expandingforce", - "tutor:fireblast", + "tutor:firepunch", + "tutor:flamethrower", "tutor:foulplay", "tutor:heatwave", + "tutor:hyperbeam", "tutor:knockoff", "tutor:lastresort", - "tutor:mindblown", + "tutor:magiccoat", + "tutor:mysticalfire", "tutor:painsplit", + "tutor:psychic", "tutor:recycle", + "tutor:rest", "tutor:shadowball", "tutor:shadowclaw", - "tutor:snore", + "tutor:sleeptalk", "tutor:spite", - "tutor:taunt", "tutor:trick", "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "ultra_beast" - ], - "pokedex": [ - "cobblemon.species.blacephalon.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 18, - "weight": 130, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "fireImmune": true + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json b/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json deleted file mode 100644 index 021bf2e74..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/bruxish.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "name": "Bruxish", - "nationalPokedexNumber": 779, - "primaryType": "water", - "secondaryType": "psychic", - "abilities": [ - "dazzling", - "strongjaw", - "h:wonderskin" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:cod" - }, - { - "item": "minecraft:bone_meal", - "percentage": 5.0 - }, - { - "item": "cobblemon:razor_fang", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 68, - "attack": 105, - "defence": 70, - "special_attack": 70, - "special_defence": 70, - "speed": 92 - }, - "catchRate": 80, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "water_2" - ], - "moves": [ - "1:watergun", - "4:astonish", - "9:confusion", - "12:bite", - "17:aquajet", - "20:disable", - "25:psyshock", - "25:psywave", - "28:crunch", - "33:aquatail", - "36:screech", - "41:psychicfangs", - "44:synchronoise", - "44:wavecrash", - "egg:icefang", - "egg:poisonfang", - "egg:rage", - "egg:superfang", - "egg:waterpulse", - "tm:aerialace", - "tm:agility", - "tm:attract", - "tm:blizzard", - "tm:bulkup", - "tm:calmmind", - "tm:chillingwater", - "tm:confide", - "tm:crunch", - "tm:doubleteam", - "tm:dreameater", - "tm:embargo", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:fling", - "tm:flipturn", - "tm:frostbreath", - "tm:frustration", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icywind", - "tm:lightscreen", - "tm:liquidation", - "tm:painsplit", - "tm:payback", - "tm:protect", - "tm:psychic", - "tm:psychicfangs", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scald", - "tm:scaryface", - "tm:sleeptalk", - "tm:substitute", - "tm:superfang", - "tm:surf", - "tm:swagger", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:torment", - "tm:toxic", - "tm:trickroom", - "tm:venoshock", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:afteryou", - "tutor:allyswitch", - "tutor:aquatail", - "tutor:irontail", - "tutor:liquidation", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:painsplit", - "tutor:signalbeam", - "tutor:snatch", - "tutor:snore", - "tutor:telekinesis", - "tutor:uproar", - "tutor:waterpulse", - "tutor:wonderroom" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.bruxish.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 9, - "weight": 190, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ 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 f234296e3..42942fa27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/buzzwole.json @@ -1,20 +1,27 @@ { - "name": "Buzzwole", + "implemented": true, "nationalPokedexNumber": 794, + "name": "Buzzwole", "primaryType": "bug", "secondaryType": "fighting", + "maleRatio": -1, + "height": 24, + "weight": 3336, + "pokedex": [ + "cobblemon.species.buzzwole.desc" + ], + "labels": [ + "gen7", + "ultra_beast" + ], + "aspects": [], "abilities": [ - "beastboost" + "beastboost", + "h:beastboost" + ], + "eggGroups": [ + "undiscovered" ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:echo_shard", - "quantityRange": "1-3" - } - ] - }, "baseStats": { "hp": 107, "attack": 139, @@ -23,27 +30,43 @@ "special_defence": 53, "speed": 79 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 2, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "moves": [ "1:harden", - "1:icepunch", "1:poweruppunch", - "1:thunderpunch", + "1:cometpunch", "5:taunt", - "7:cometpunch", "10:fellstinger", "15:vitalthrow", "20:bulkup", "25:endure", - "29:leechlife", "30:reversal", "35:megapunch", "40:lunge", @@ -56,102 +79,111 @@ "tm:bodyslam", "tm:bounce", "tm:brickbreak", + "tm:bugbite", "tm:bulkup", "tm:bulldoze", "tm:closecombat", - "tm:confide", + "tm:coaching", "tm:darkestlariat", - "tm:doubleteam", "tm:drainpunch", + "tm:dualchop", + "tm:dualwingbeat", "tm:earthquake", + "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", "tm:fling", "tm:focusenergy", - "tm:frustration", + "tm:focuspunch", "tm:gigaimpact", "tm:gyroball", - "tm:hiddenpower", "tm:highhorsepower", "tm:icepunch", "tm:ironhead", "tm:leechlife", "tm:lowsweep", + "tm:lunge", "tm:megapunch", "tm:outrage", "tm:payback", "tm:poisonjab", + "tm:poweruppunch", "tm:protect", "tm:rest", - "tm:return", "tm:revenge", "tm:reversal", "tm:rockslide", "tm:rocktomb", "tm:roost", - "tm:round", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:superpower", - "tm:swagger", "tm:taunt", + "tm:terablast", "tm:thunderpunch", - "tm:toxic", "tm:workup", "tutor:bounce", "tutor:bugbite", + "tutor:bulkup", + "tutor:bulldoze", "tutor:coaching", - "tutor:counter", "tutor:drainpunch", "tutor:dualchop", "tutor:dualwingbeat", - "tutor:dynamicpunch", "tutor:endeavor", + "tutor:falseswipe", + "tutor:focusenergy", "tutor:focuspunch", - "tutor:hammerarm", + "tutor:gigaimpact", + "tutor:highhorsepower", "tutor:icepunch", "tutor:ironhead", "tutor:leechlife", - "tutor:lunge", "tutor:outrage", - "tutor:poweruppunch", - "tutor:snore", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:roost", + "tutor:sleeptalk", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", - "tutor:taunt", - "tutor:thunderpunch" - ], - "labels": [ - "gen7", - "ultra_beast" - ], - "pokedex": [ - "cobblemon.species.buzzwole.desc" + "tutor:thunderpunch", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 24, - "weight": 3336, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ 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 5d443dce3..d49294ea9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/celesteela.json @@ -1,20 +1,27 @@ { - "name": "Celesteela", + "implemented": true, "nationalPokedexNumber": 797, + "name": "Celesteela", "primaryType": "steel", "secondaryType": "flying", + "maleRatio": -1, + "height": 92, + "weight": 9999, + "pokedex": [ + "cobblemon.species.celesteela.desc" + ], + "labels": [ + "gen7", + "ultra_beast" + ], + "aspects": [], "abilities": [ - "beastboost" + "beastboost", + "h:beastboost" + ], + "eggGroups": [ + "undiscovered" ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:echo_shard", - "quantityRange": "1-3" - } - ] - }, "baseStats": { "hp": 97, "attack": 101, @@ -23,30 +30,46 @@ "special_defence": 101, "speed": 61 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 1, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "moves": [ "1:absorb", - "1:airslash", "1:tackle", "5:harden", "10:wideguard", "15:megadrain", "20:smackdown", "25:ingrain", - "29:ironhead", "30:autotomize", "35:gigadrain", "40:flashcannon", "45:metalsound", - "47:seedbomb", "50:irondefense", "55:leechseed", "60:heavyslam", @@ -54,11 +77,11 @@ "70:skullbash", "tm:acrobatics", "tm:airslash", + "tm:block", "tm:bodyslam", "tm:brutalswing", "tm:bulldoze", - "tm:confide", - "tm:doubleteam", + "tm:doubleedge", "tm:earthquake", "tm:endure", "tm:energyball", @@ -69,84 +92,96 @@ "tm:flamethrower", "tm:flashcannon", "tm:fly", - "tm:frustration", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", + "tm:gravity", "tm:gyroball", "tm:heavyslam", - "tm:hiddenpower", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", + "tm:magnetrise", "tm:megahorn", + "tm:metalsound", + "tm:meteorbeam", "tm:protect", "tm:rest", - "tm:return", "tm:rockslide", - "tm:round", "tm:seedbomb", "tm:selfdestruct", + "tm:shockwave", "tm:sleeptalk", "tm:smackdown", "tm:smartstrike", - "tm:snore", "tm:solarbeam", + "tm:steelbeam", + "tm:steelroller", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:superpower", - "tm:swagger", - "tm:toxic", + "tm:terablast", "tm:zenheadbutt", - "tutor:autotomize", "tutor:block", - "tutor:earthquake", + "tutor:bulldoze", + "tutor:energyball", + "tutor:flamethrower", + "tutor:flashcannon", "tutor:gigadrain", + "tutor:gigaimpact", "tutor:gravity", - "tutor:gyroball", + "tutor:hyperbeam", "tutor:irondefense", "tutor:ironhead", - "tutor:leechseed", "tutor:magnetrise", + "tutor:megahorn", "tutor:meteorbeam", + "tutor:rest", + "tutor:rockslide", "tutor:seedbomb", "tutor:shockwave", - "tutor:skullbash", - "tutor:smackdown", - "tutor:snore", + "tutor:sleeptalk", "tutor:steelbeam", "tutor:steelroller", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "ultra_beast" - ], - "pokedex": [ - "cobblemon.species.celesteela.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 1, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 92, - "weight": 9999, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ 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 f4005687d..db43e1045 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/charjabug.json @@ -1,11 +1,53 @@ { - "name": "Charjabug", + "implemented": true, "nationalPokedexNumber": 737, + "name": "Charjabug", "primaryType": "bug", "secondaryType": "electric", + "maleRatio": 0.5, + "height": 5, + "weight": 105, + "pokedex": [ + "cobblemon.species.charjabug.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [], "abilities": [ - "battery" + "battery", + "h:battery" ], + "eggGroups": [ + "bug" + ], + "baseStats": { + "hp": 57, + "attack": 82, + "defence": 95, + "special_attack": 55, + "special_defence": 75, + "speed": 36 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 140, + "experienceGroup": "medium_fast", + "catchRate": 120, + "eggCycles": 15, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 4, "entries": [ @@ -23,31 +65,13 @@ } ] }, - "baseStats": { - "hp": 57, - "attack": 82, - "defence": 95, - "special_attack": 55, - "special_defence": 75, - "speed": 36 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 140, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], "moves": [ - "1:bugbite", "1:charge", - "1:mudslap", - "1:stringshot", "1:visegrip", + "1:stringshot", + "1:mudslap", + "1:bugbite", "15:bite", - "19:acrobatics", "23:spark", "29:stickyweb", "36:xscissor", @@ -55,27 +79,24 @@ "50:dig", "57:irondefense", "64:discharge", - "tm:acrobatics", - "tm:attract", + "egg:discharge", + "egg:harden", "tm:batonpass", "tm:bugbite", "tm:charge", "tm:chargebeam", - "tm:confide", "tm:crunch", "tm:dig", - "tm:doubleteam", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", "tm:electroweb", "tm:endure", "tm:facade", - "tm:frustration", - "tm:hiddenpower", "tm:irondefense", "tm:lightscreen", "tm:lunge", + "tm:magnetrise", "tm:mudshot", "tm:mudslap", "tm:poisonjab", @@ -83,38 +104,49 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:return", - "tm:round", + "tm:risingvoltage", "tm:screech", + "tm:shockwave", "tm:skittersmack", "tm:sleeptalk", - "tm:snore", + "tm:stringshot", "tm:strugglebug", "tm:substitute", - "tm:swagger", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:voltswitch", "tm:wildcharge", "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:snore" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.charjabug.desc" + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:xscissor", + "legacy:acrobatics", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "preEvolution": "grubbin", "evolutions": [ @@ -130,24 +162,21 @@ "requiredContext": "cobblemon:thunder_stone" } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 105, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ 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 8bb28dcd1..814d2ecfd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmoem.json @@ -1,9 +1,26 @@ { - "name": "Cosmoem", + "implemented": true, "nationalPokedexNumber": 790, + "name": "Cosmoem", "primaryType": "psychic", + "maleRatio": -1, + "height": 1, + "weight": 9999, + "pokedex": [ + "cobblemon.species.cosmoem.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "sturdy" + "sturdy", + "h:sturdy" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 43, @@ -13,27 +30,31 @@ "special_defence": 131, "speed": 37 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 1, + "speed": 0 + }, "baseExperienceYield": 140, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ "1:cosmicpower", "1:teleport", + "1:splash", "tm:cosmicpower" ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.cosmoem.desc" - ], "preEvolution": "cosmog", "evolutions": [ { @@ -48,6 +69,10 @@ { "variant": "level", "minLevel": 53 + }, + { + "variant": "time_range", + "range": "day" } ] }, @@ -63,28 +88,40 @@ { "variant": "level", "minLevel": 53 + }, + { + "variant": "time_range", + "range": "night" } ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 1, - "weight": 9999, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "5" + }, + "resting": { + "depth": "comatose", + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "canLook": false, + "walk": { + "canWalk": false + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willFlee": false + } + } } \ No newline at end of file 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 3f03510d2..09dc29e2b 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/cosmog.json @@ -1,9 +1,26 @@ { - "name": "Cosmog", + "implemented": true, "nationalPokedexNumber": 789, + "name": "Cosmog", "primaryType": "psychic", + "maleRatio": -1, + "height": 2, + "weight": 1, + "pokedex": [ + "cobblemon.species.cosmog.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "unaware" + "unaware", + "h:unaware" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 43, @@ -13,27 +30,28 @@ "special_defence": 31, "speed": 37 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 1, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 40, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ "1:splash", - "1:teleport", - "tutor:splash", - "tutor:teleport" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.cosmog.desc" + "1:teleport" ], "evolutions": [ { @@ -52,24 +70,46 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 2, - "weight": 1, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "cosmog", + "tier": 1 + }, + { + "pokemon": "cosmoem", + "tier": 2 + }, + { + "pokemon": "solgaleo", + "tier": 3 + }, + { + "pokemon": "lunala", + "tier": 3 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "walk": { + "canWalk": false + }, + "fly": { + "canFly": true + } + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json b/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json deleted file mode 100644 index 38b0051ae..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/dewpider.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "name": "Dewpider", - "nationalPokedexNumber": 751, - "primaryType": "water", - "secondaryType": "bug", - "abilities": [ - "waterbubble", - "h:waterabsorb" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:mystic_water", - "percentage": 2.5 - }, - { - "item": "cobblemon:wepear_berry", - "percentage": 2.5 - } - ] - }, - "baseStats": { - "hp": 38, - "attack": 40, - "defence": 52, - "special_attack": 40, - "special_defence": 72, - "speed": 27 - }, - "catchRate": 200, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 54, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "water_1", - "bug" - ], - "moves": [ - "1:bubble", - "1:infestation", - "1:watergun", - "1:watersport", - "4:bugbite", - "8:bite", - "8:spiderweb", - "12:bubblebeam", - "16:aquaring", - "20:headbutt", - "24:crunch", - "28:soak", - "32:entrainment", - "36:lunge", - "40:liquidation", - "44:leechlife", - "48:mirrorcoat", - "egg:aurorabeam", - "egg:powersplit", - "egg:spitup", - "egg:stickyweb", - "egg:stockpile", - "tm:attract", - "tm:blizzard", - "tm:bugbite", - "tm:bugbuzz", - "tm:chillingwater", - "tm:confide", - "tm:crunch", - "tm:doubleteam", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:frostbreath", - "tm:frustration", - "tm:gigadrain", - "tm:hiddenpower", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:infestation", - "tm:irondefense", - "tm:leechlife", - "tm:liquidation", - "tm:lunge", - "tm:magicroom", - "tm:poisonjab", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:scald", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:terablast", - "tm:toxic", - "tm:trailblaze", - "tm:waterfall", - "tm:waterpulse", - "tm:wonderroom", - "tm:xscissor", - "tutor:bugbite", - "tutor:gigadrain", - "tutor:icywind", - "tutor:irondefense", - "tutor:liquidation", - "tutor:magiccoat", - "tutor:magicroom", - "tutor:signalbeam", - "tutor:skittersmack", - "tutor:snore", - "tutor:waterpulse", - "tutor:wonderroom" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.dewpider.desc" - ], - "evolutions": [ - { - "id": "dewpider_araquanid", - "variant": "level_up", - "result": "araquanid", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 22 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 3, - "weight": 40, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ 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 deleted file mode 100644 index 263ca3e6a..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/drampa.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "name": "Drampa", - "nationalPokedexNumber": 780, - "primaryType": "normal", - "secondaryType": "dragon", - "abilities": [ - "berserk", - "sapsipper", - "h:cloudnine" - ], - "baseStats": { - "hp": 78, - "attack": 60, - "defence": 85, - "special_attack": 135, - "special_defence": 91, - "speed": 36 - }, - "catchRate": 70, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 170, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "monster", - "dragon" - ], - "moves": [ - "1:echoedvoice", - "1:playnice", - "5:twister", - "10:protect", - "15:glare", - "20:safeguard", - "21:dragonrage", - "25:dragonbreath", - "25:naturalgift", - "30:extrasensory", - "35:dragonpulse", - "40:lightscreen", - "45:fly", - "50:hypervoice", - "55:outrage", - "egg:dragonrush", - "egg:hurricane", - "egg:mist", - "egg:playrough", - "egg:razorwind", - "egg:tickle", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:breakingswipe", - "tm:bulldoze", - "tm:calmmind", - "tm:confide", - "tm:doubleteam", - "tm:dragonclaw", - "tm:dragondance", - "tm:dragonpulse", - "tm:dragontail", - "tm:earthquake", - "tm:echoedvoice", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:fling", - "tm:fly", - "tm:focusblast", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icywind", - "tm:lightscreen", - "tm:naturepower", - "tm:outrage", - "tm:playrough", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rockslide", - "tm:roost", - "tm:round", - "tm:safeguard", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:solarbeam", - "tm:steelwing", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:surf", - "tm:swift", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:uproar", - "tm:workup", - "tutor:block", - "tutor:defog", - "tutor:dracometeor", - "tutor:dragonpulse", - "tutor:echoedvoice", - "tutor:endeavor", - "tutor:heatwave", - "tutor:helpinghand", - "tutor:hurricane", - "tutor:hypervoice", - "tutor:icywind", - "tutor:lashout", - "tutor:outrage", - "tutor:playnice", - "tutor:scaleshot", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:superpower", - "tutor:tailwind", - "tutor:uproar", - "tutor:waterpulse" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.drampa.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 30, - "weight": 1850, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:dragon_breath", - "percentage": 5.0 - }, - { - "item": "cobblemon:persim_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 8f3aeec2d..078af009e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json @@ -1,9 +1,24 @@ { - "name": "Grubbin", + "implemented": true, "nationalPokedexNumber": 736, + "name": "Grubbin", "primaryType": "bug", + "maleRatio": 0.5, + "height": 4, + "weight": 44, + "pokedex": [ + "cobblemon.species.grubbin.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [], "abilities": [ - "swarm" + "swarm", + "h:swarm" + ], + "eggGroups": [ + "bug" ], "baseStats": { "hp": 47, @@ -13,50 +28,68 @@ "special_defence": 45, "speed": 46 }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 60, "experienceGroup": "medium_fast", + "catchRate": 255, "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:string", + "quantityRange": "0-1" + }, + { + "item": "cobblemon:wepear_berry", + "percentage": 2.5 + }, + { + "item": "cobblemon:cell_battery", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:mudslap", "1:visegrip", + "1:mudslap", "5:stringshot", "10:bugbite", "15:bite", - "19:acrobatics", "21:spark", "25:stickyweb", "30:xscissor", "35:crunch", "40:dig", "egg:discharge", - "egg:electroweb", - "egg:endure", "egg:harden", - "egg:mudshot", - "tm:acrobatics", - "tm:attract", "tm:batonpass", "tm:bugbite", "tm:charge", "tm:chargebeam", - "tm:confide", "tm:crunch", "tm:dig", - "tm:doubleteam", "tm:electricterrain", "tm:electroweb", "tm:endure", "tm:facade", - "tm:frustration", - "tm:hiddenpower", "tm:lightscreen", "tm:lunge", + "tm:magnetrise", "tm:mudshot", "tm:mudslap", "tm:poisonjab", @@ -64,36 +97,47 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:return", - "tm:round", + "tm:risingvoltage", "tm:screech", + "tm:shockwave", "tm:skittersmack", "tm:sleeptalk", - "tm:snore", + "tm:stringshot", "tm:strugglebug", "tm:substitute", - "tm:swagger", "tm:takedown", "tm:terablast", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:voltswitch", "tm:wildcharge", "tm:xscissor", "tutor:bugbite", + "tutor:chargebeam", "tutor:electroweb", "tutor:magnetrise", + "tutor:mudslap", + "tutor:poisonjab", + "tutor:rest", "tutor:risingvoltage", "tutor:shockwave", "tutor:skittersmack", - "tutor:snore" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.grubbin.desc" + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:xscissor", + "legacy:acrobatics", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { @@ -112,41 +156,22 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 44, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:wepear_berry", - "percentage": 2.5 - }, - { - "item": "cobblemon:cell_battery", - "percentage": 2.5 + "behaviour": { + "resting": { + "willSleepOnBed": true, + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json b/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json deleted file mode 100644 index 9cff45e8f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/gumshoos.json +++ /dev/null @@ -1,271 +0,0 @@ -{ - "name": "Gumshoos", - "nationalPokedexNumber": 735, - "primaryType": "normal", - "abilities": [ - "stakeout", - "strongjaw", - "h:adaptability" - ], - "baseStats": { - "hp": 88, - "attack": 110, - "defence": 60, - "special_attack": 55, - "special_defence": 60, - "speed": 45 - }, - "catchRate": 127, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Totem", - "primaryType": "normal", - "abilities": [ - "adaptability" - ], - "baseStats": { - "hp": 88, - "attack": 110, - "defence": 60, - "special_attack": 55, - "special_defence": 60, - "speed": 45 - }, - "catchRate": 127, - "maleRatio": 0.5, - "baseExperienceYield": 146, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:leer", - "1:pursuit", - "1:sandattack", - "1:tackle", - "13:odorsleuth", - "16:bide", - "19:bite", - "23:mudslap", - "27:superfang", - "31:takedown", - "35:scaryface", - "39:crunch", - "43:hyperfang", - "47:yawn", - "51:thrash", - "55:rest", - "tm:attract", - "tm:bulldoze", - "tm:confide", - "tm:doubleteam", - "tm:earthquake", - "tm:echoedvoice", - "tm:facade", - "tm:fling", - "tm:frustration", - "tm:hiddenpower", - "tm:payback", - "tm:protect", - "tm:rest", - "tm:return", - "tm:roar", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:sleeptalk", - "tm:substitute", - "tm:swagger", - "tm:taunt", - "tm:thief", - "tm:torment", - "tm:toxic", - "tm:uturn", - "tm:workup", - "tutor:bide", - "tutor:bite", - "tutor:block", - "tutor:dualchop", - "tutor:endeavor", - "tutor:firepunch", - "tutor:icepunch", - "tutor:ironhead", - "tutor:irontail", - "tutor:lastresort", - "tutor:odorsleuth", - "tutor:sandattack", - "tutor:shockwave", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:superfang", - "tutor:thunderpunch", - "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "totem" - ], - "aspects": [ - "totem" - ], - "height": 14, - "weight": 600, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 146, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:leer", - "1:payback", - "1:pursuit", - "1:sandattack", - "1:tackle", - "13:odorsleuth", - "13:workup", - "16:bide", - "19:bite", - "23:mudslap", - "27:superfang", - "31:takedown", - "35:scaryface", - "39:crunch", - "43:hyperfang", - "43:yawn", - "47:thrash", - "52:rest", - "tm:attract", - "tm:bodyslam", - "tm:bulldoze", - "tm:chillingwater", - "tm:confide", - "tm:crunch", - "tm:curse", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:earthquake", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:firepunch", - "tm:fling", - "tm:focuspunch", - "tm:frustration", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:icefang", - "tm:icepunch", - "tm:ironhead", - "tm:knockoff", - "tm:lowsweep", - "tm:mudshot", - "tm:mudslap", - "tm:payback", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:roar", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thunderfang", - "tm:thunderpunch", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt", - "tutor:block", - "tutor:dualchop", - "tutor:endeavor", - "tutor:firepunch", - "tutor:icepunch", - "tutor:ironhead", - "tutor:irontail", - "tutor:lastresort", - "tutor:shockwave", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:superfang", - "tutor:thunderpunch", - "tutor:uproar", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.gumshoos.desc" - ], - "preEvolution": "yungoos", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 7, - "weight": 142, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:pecha_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 38a9f5c34..d32ee8491 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/guzzlord.json @@ -1,10 +1,26 @@ { - "name": "Guzzlord", + "implemented": true, "nationalPokedexNumber": 799, + "name": "Guzzlord", "primaryType": "dark", "secondaryType": "dragon", + "maleRatio": -1, + "height": 55, + "weight": 8880, + "pokedex": [ + "cobblemon.species.guzzlord.desc" + ], + "labels": [ + "gen7", + "ultra_beast" + ], + "aspects": [], "abilities": [ - "beastboost" + "beastboost", + "h:beastboost" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 223, @@ -14,28 +30,46 @@ "special_defence": 53, "speed": 43 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "moves": [ - "1:bite", "1:dragonrage", + "1:bite", + "1:steamroller", "1:dragontail", - "5:stockpile", + "1:wringout", "5:swallow", + "5:stockpile", "10:knockoff", - "13:brutalswing", "15:stomp", - "19:steamroller", "20:stompingtantrum", "25:wideguard", - "29:irontail", "30:crunch", "35:bodyslam", "40:gastroacid", @@ -44,7 +78,6 @@ "55:dragonrush", "60:belch", "65:thrash", - "67:wringout", "70:gigaimpact", "tm:amnesia", "tm:bodypress", @@ -52,31 +85,36 @@ "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", + "tm:corrosivegas", "tm:crunch", "tm:darkpulse", - "tm:doubleteam", + "tm:dracometeor", "tm:dragonclaw", "tm:dragonpulse", "tm:dragontail", "tm:drainpunch", + "tm:dualchop", "tm:earthquake", "tm:endure", "tm:facade", "tm:fireblast", "tm:flamethrower", "tm:fling", - "tm:frustration", + "tm:gastroacid", "tm:gigaimpact", "tm:gyroball", "tm:heatcrash", "tm:heatwave", "tm:heavyslam", - "tm:hiddenpower", "tm:highhorsepower", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", "tm:irontail", + "tm:knockoff", + "tm:lashout", + "tm:lastresort", + "tm:magnetrise", "tm:megakick", "tm:megapunch", "tm:outrage", @@ -84,33 +122,34 @@ "tm:poisonjab", "tm:protect", "tm:rest", - "tm:return", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:shadowclaw", + "tm:shockwave", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", "tm:smackdown", "tm:snarl", - "tm:snore", + "tm:steelroller", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", + "tm:terablast", "tm:thief", - "tm:toxic", - "tutor:brutalswing", + "tutor:bulldoze", "tutor:corrosivegas", + "tutor:darkpulse", "tutor:dracometeor", "tutor:dragonpulse", - "tutor:dragonrush", "tutor:drainpunch", "tutor:dualchop", + "tutor:flamethrower", "tutor:gastroacid", - "tutor:hammerarm", + "tutor:gigaimpact", "tutor:heatwave", - "tutor:heavyslam", + "tutor:highhorsepower", + "tutor:hyperbeam", "tutor:irondefense", "tutor:ironhead", "tutor:irontail", @@ -118,50 +157,44 @@ "tutor:lashout", "tutor:lastresort", "tutor:magnetrise", - "tutor:megapunch", "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", "tutor:shockwave", - "tutor:snore", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", "tutor:steelroller", "tutor:stompingtantrum", - "tutor:thrash", - "tutor:wringout" - ], - "labels": [ - "gen7", - "ultra_beast" - ], - "pokedex": [ - "cobblemon.species.guzzlord.desc" + "tutor:stoneedge", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 55, - "weight": 8880, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:echo_shard", - "quantityRange": "1-3" + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 3c86affb4..5be432650 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/kartana.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/kartana.json @@ -1,10 +1,26 @@ { - "name": "Kartana", + "implemented": true, "nationalPokedexNumber": 798, + "name": "Kartana", "primaryType": "grass", "secondaryType": "steel", + "maleRatio": -1, + "height": 3, + "weight": 1, + "pokedex": [ + "cobblemon.species.kartana.desc" + ], + "labels": [ + "gen7", + "ultra_beast" + ], + "aspects": [], "abilities": [ - "beastboost" + "beastboost", + "h:beastboost" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 59, @@ -14,18 +30,37 @@ "special_defence": 31, "speed": 109 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "moves": [ - "1:furycutter", "1:vacuumwave", + "1:furycutter", "5:razorleaf", "10:falseswipe", "15:cut", @@ -35,96 +70,98 @@ "35:nightslash", "40:synthesis", "45:laserfocus", - "47:xscissor", "50:defog", "55:leafblade", - "59:airslash", "60:sacredsword", "65:swordsdance", - "67:psychocut", "70:guillotine", "tm:aerialace", + "tm:aircutter", "tm:airslash", "tm:brickbreak", "tm:calmmind", - "tm:confide", - "tm:doubleteam", + "tm:cut", + "tm:defog", "tm:endure", "tm:falseswipe", - "tm:frustration", + "tm:furycutter", "tm:gigadrain", "tm:gigaimpact", - "tm:hiddenpower", "tm:irondefense", + "tm:knockoff", + "tm:laserfocus", + "tm:lastresort", "tm:leafblade", "tm:protect", "tm:psychocut", "tm:rest", - "tm:return", - "tm:round", "tm:screech", "tm:sleeptalk", "tm:smartstrike", - "tm:snore", "tm:solarblade", + "tm:steelbeam", "tm:substitute", - "tm:swagger", "tm:swordsdance", - "tm:toxic", + "tm:synthesis", + "tm:tailwind", + "tm:terablast", + "tm:vacuumwave", "tm:xscissor", + "tutor:aerialace", "tutor:aircutter", - "tutor:airslash", + "tutor:calmmind", "tutor:defog", - "tutor:detect", + "tutor:falseswipe", + "tutor:furycutter", "tutor:gigadrain", + "tutor:gigaimpact", "tutor:irondefense", "tutor:knockoff", "tutor:laserfocus", "tutor:lastresort", - "tutor:leafblade", - "tutor:snore", + "tutor:psychocut", + "tutor:rest", + "tutor:sleeptalk", "tutor:steelbeam", - "tutor:swordsdance", "tutor:synthesis", "tutor:tailwind", "tutor:vacuumwave", - "tutor:xscissor" - ], - "labels": [ - "gen7", - "ultra_beast" - ], - "pokedex": [ - "cobblemon.species.kartana.desc" + "tutor:xscissor", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 1, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:echo_shard", - "quantityRange": "1-3" + "behaviour": { + "resting": { + "willSleepOnBed": true, + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file 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 70496d636..5876bae4c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lunala.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lunala.json @@ -1,10 +1,27 @@ { - "name": "Lunala", + "implemented": true, "nationalPokedexNumber": 792, + "name": "Lunala", "primaryType": "psychic", "secondaryType": "ghost", + "maleRatio": -1, + "height": 40, + "weight": 1200, + "pokedex": [ + "cobblemon.species.lunala.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "shadowshield" + "shadowshield", + "h:shadowshield" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 137, @@ -14,34 +31,52 @@ "special_defence": 107, "speed": 97 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 340, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 5, + "entries": [ + { + "item": "minecraft:phantom_membrane", + "quantityRange": "3-5" + } + ] + }, "moves": [ - "1:confusion", + "1:moongeistbeam", "1:cosmicpower", "1:hypnosis", - "1:moongeistbeam", "1:teleport", + "1:confusion", + "1:splash", "7:nightshade", "14:confuseray", "21:airslash", "28:shadowball", "35:moonlight", "42:nightdaze", - "49:magiccoat", "49:psychic", "56:moonblast", "63:phantomforce", "70:dreameater", "77:wideguard", - "84:hyperbeam", "tm:acrobatics", "tm:aerialace", "tm:agility", @@ -49,11 +84,10 @@ "tm:blizzard", "tm:calmmind", "tm:chargebeam", - "tm:confide", "tm:confuseray", "tm:cosmicpower", "tm:dazzlinggleam", - "tm:doubleteam", + "tm:defog", "tm:dreameater", "tm:dualwingbeat", "tm:endure", @@ -61,17 +95,16 @@ "tm:facade", "tm:fly", "tm:focusblast", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:heatwave", "tm:helpinghand", "tm:hex", - "tm:hiddenpower", "tm:hyperbeam", "tm:icebeam", "tm:icywind", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:meteorbeam", "tm:nightshade", @@ -85,96 +118,105 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", - "tm:roar", "tm:roost", - "tm:round", "tm:safeguard", "tm:scaryface", "tm:shadowball", "tm:shadowclaw", + "tm:shockwave", + "tm:signalbeam", + "tm:skyattack", "tm:skydrop", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:spite", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:tailwind", + "tm:telekinesis", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", "tm:trick", "tm:trickroom", "tm:willowisp", "tm:wonderroom", "tm:workup", - "tutor:cosmicpower", + "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:moongeistbeam", - "tutor:moonlight", - "tutor:nightdaze", "tutor:poltergeist", - "tutor:psyshock", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:roost", "tutor:shadowball", + "tutor:shadowclaw", "tutor:shockwave", "tutor:signalbeam", "tutor:skyattack", - "tutor:snore", + "tutor:sleeptalk", "tutor:spite", "tutor:swift", "tutor:tailwind", "tutor:telekinesis", + "tutor:thunderbolt", "tutor:trick", - "tutor:wonderroom" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.lunala.desc" + "tutor:wonderroom", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:roar", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:thunderwave", + "legacy:toxic" ], "preEvolution": "cosmoem", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 40, - "weight": 1200, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:phantom_membrane", - "quantityRange": "3-5" + "behaviour": { + "herd": { + "maxSize": "7" + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 98c555a97..10206126e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/lycanroc.json @@ -1,12 +1,28 @@ { - "name": "Lycanroc", + "implemented": true, "nationalPokedexNumber": 745, + "name": "Lycanroc", "primaryType": "rock", + "maleRatio": 0.5, + "height": 8, + "weight": 250, + "pokedex": [ + "cobblemon.species.lycanroc.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [ + "midday-form" + ], "abilities": [ "keeneye", "sandrush", "h:steadfast" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 75, "attack": 115, @@ -15,11 +31,6 @@ "special_defence": 65, "speed": 112 }, - "catchRate": 90, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 170, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 2, @@ -28,41 +39,99 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 170, "experienceGroup": "medium_fast", + "catchRate": 90, "eggCycles": 15, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "behaviour": { + "entityInteract": { + "avoidedBySkeleton": true + }, + "herd": { + "maxSize": "7", + "toleratedLeaders": [ + { + "pokemon": "lycanroc wolf_form=midday", + "tier": 1 + }, + { + "pokemon": "lycanroc dusk", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, + "drops": { + "amount": 6, + "entries": [ + { + "item": "minecraft:bone", + "quantityRange": "0-2" + }, + { + "item": "minecraft:rotten_flesh", + "quantityRange": "0-2" + }, + { + "item": "cobblemon:hard_stone", + "percentage": 5.0 + }, + { + "item": "cobblemon:babiri_berry", + "percentage": 5.0 + } + ] + }, "moves": [ "1:accelerock", - "1:doubleteam", - "1:leer", - "1:quickattack", "1:quickguard", - "1:sandattack", + "1:quickattack", "1:tackle", + "1:leer", + "1:sandattack", + "1:odorsleuth", + "1:suckerpunch", + "1:doubleteam", "12:rockthrow", "16:howl", - "18:odorsleuth", "20:bite", "24:rocktomb", "30:roar", "36:rockslide", "42:crunch", - "45:rockclimb", "48:scaryface", "54:stealthrock", "60:stoneedge", + "egg:crushclaw", + "egg:endeavor", + "egg:lastresort", + "egg:odorsleuth", + "egg:suckerpunch", + "egg:thrash", "tm:agility", "tm:assurance", - "tm:attract", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", "tm:closecombat", - "tm:confide", + "tm:covet", "tm:crunch", "tm:dig", "tm:doubleedge", @@ -74,37 +143,34 @@ "tm:endure", "tm:facade", "tm:firefang", - "tm:frustration", "tm:gigaimpact", "tm:helpinghand", - "tm:hiddenpower", "tm:hypervoice", "tm:irondefense", "tm:ironhead", "tm:irontail", + "tm:lastresort", "tm:mudslap", "tm:playrough", "tm:protect", "tm:psychicfangs", "tm:rest", - "tm:return", "tm:roar", "tm:rockblast", + "tm:rockclimb", "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:swordsdance", "tm:tailslap", @@ -112,37 +178,63 @@ "tm:taunt", "tm:terablast", "tm:thunderfang", - "tm:toxic", "tm:trailblaze", "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:snore", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", "tutor:stealthrock", "tutor:stompingtantrum", - "tutor:zenheadbutt" + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:swift", + "tutor:thunderfang", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.lycanroc.desc" - ], - "height": 8, - "weight": 250, "preEvolution": "rockruff", "evolutions": [], "forms": [ { "name": "Midnight", "primaryType": "rock", + "maleRatio": 0.5, + "height": 11, + "weight": 250, + "pokedex": [ + "cobblemon.species.lycanroc-midnight.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [ + "midnight-form" + ], "abilities": [ "keeneye", "vitalspirit", @@ -156,56 +248,44 @@ "special_defence": 75, "speed": 82 }, - "catchRate": 90, - "maleRatio": 0.5, - "baseExperienceYield": 170, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "field" - ], "moves": [ "1:counter", - "1:doubleteam", - "1:endure", - "1:leer", "1:reversal", - "1:sandattack", - "1:tackle", "1:taunt", + "1:tackle", + "1:leer", + "1:sandattack", + "1:odorsleuth", + "1:endure", + "1:doubleteam", "12:rockthrow", "16:howl", - "18:odorsleuth", "20:bite", "24:rocktomb", "30:roar", "36:rockslide", "42:crunch", - "45:rockclimb", "48:scaryface", "54:stealthrock", "60:stoneedge", - "tm:attract", + "egg:crushclaw", + "egg:endeavor", + "egg:lastresort", + "egg:odorsleuth", + "egg:suckerpunch", + "egg:thrash", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", "tm:closecombat", - "tm:confide", + "tm:covet", "tm:crunch", "tm:dig", "tm:doubleedge", "tm:doubleteam", + "tm:dualchop", "tm:earthpower", "tm:echoedvoice", "tm:endeavor", @@ -216,16 +296,16 @@ "tm:fling", "tm:focuspunch", "tm:foulplay", - "tm:frustration", "tm:gigaimpact", "tm:helpinghand", - "tm:hiddenpower", "tm:hypervoice", "tm:irondefense", "tm:ironhead", "tm:irontail", "tm:knockoff", + "tm:laserfocus", "tm:lashout", + "tm:lastresort", "tm:lowsweep", "tm:megakick", "tm:megapunch", @@ -236,27 +316,25 @@ "tm:protect", "tm:psychicfangs", "tm:rest", - "tm:return", "tm:revenge", "tm:reversal", "tm:roar", "tm:rockblast", + "tm:rockclimb", "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:scaryface", "tm:shadowclaw", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", - "tm:swagger", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -264,11 +342,11 @@ "tm:throatchop", "tm:thunderfang", "tm:thunderpunch", - "tm:toxic", "tm:trailblaze", "tm:upperhand", - "tm:uproar", "tm:zenheadbutt", + "tutor:bulkup", + "tutor:bulldoze", "tutor:covet", "tutor:dualchop", "tutor:earthpower", @@ -277,42 +355,96 @@ "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:snore", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:snarl", "tutor:stealthrock", "tutor:stompingtantrum", "tutor:stoneedge", "tutor:suckerpunch", - "tutor:swordsdance", "tutor:throatchop", + "tutor:thunderfang", "tutor:thunderpunch", - "tutor:uproar", - "tutor:zenheadbutt" + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "legacy:uproar" ], - "labels": [ - "gen7" - ], - "aspects": [ - "midnight" - ], - "height": 11, - "weight": 250, "preEvolution": "rockruff", - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "behaviour": { + "herd": { + "maxSize": "7", + "toleratedLeaders": [ + { + "pokemon": "lycanroc midnight", + "tier": 1 + } + ] + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "entityInteract": { + "avoidedBySkeleton": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } }, { "name": "Dusk", "primaryType": "rock", + "maleRatio": 0.5, + "height": 8, + "weight": 250, + "pokedex": [ + "cobblemon.species.lycanroc-dusk.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [ + "dusk-form" + ], "abilities": [ - "toughclaws" + "toughclaws", + "h:toughclaws" ], "baseStats": { "hp": 75, @@ -322,57 +454,44 @@ "special_defence": 65, "speed": 110 }, - "catchRate": 90, - "maleRatio": 0.5, - "baseExperienceYield": 170, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "field" - ], "moves": [ + "1:thrash", "1:accelerock", "1:counter", - "1:doubleteam", - "1:endure", + "1:tackle", "1:leer", - "1:quickattack", - "1:quickguard", - "1:reversal", "1:sandattack", - "1:suckerpunch", - "1:tackle", + "1:odorsleuth", "1:taunt", - "1:thrash", + "1:crushclaw", + "1:suckerpunch", + "1:quickguard", + "1:quickattack", + "1:endure", + "1:reversal", + "1:doubleteam", "12:rockthrow", "16:howl", - "18:odorsleuth", "20:bite", "24:rocktomb", "30:roar", "36:rockslide", "42:crunch", - "45:rockclimb", "48:scaryface", "54:stealthrock", "60:stoneedge", - "tm:attract", + "egg:endeavor", + "egg:lastresort", + "egg:odorsleuth", + "egg:suckerpunch", + "egg:thrash", "tm:bodyslam", "tm:brickbreak", "tm:bulkup", "tm:bulldoze", "tm:charm", "tm:closecombat", - "tm:confide", + "tm:covet", "tm:crunch", "tm:dig", "tm:doubleedge", @@ -385,38 +504,35 @@ "tm:facade", "tm:firefang", "tm:focusenergy", - "tm:frustration", "tm:gigaimpact", "tm:helpinghand", - "tm:hiddenpower", "tm:hypervoice", "tm:irondefense", "tm:ironhead", "tm:irontail", + "tm:lastresort", "tm:mudslap", "tm:outrage", "tm:playrough", "tm:protect", "tm:psychicfangs", "tm:rest", - "tm:return", "tm:reversal", "tm:roar", "tm:rockblast", + "tm:rockclimb", "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", - "tm:swagger", + "tm:suckerpunch", "tm:swordsdance", "tm:tailslap", "tm:takedown", @@ -424,60 +540,82 @@ "tm:terablast", "tm:throatchop", "tm:thunderfang", - "tm:toxic", "tm:trailblaze", "tm:workup", "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:snore", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", "tutor:stealthrock", "tutor:stompingtantrum", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7" - ], - "aspects": [ - "dusk" + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "height": 8, - "weight": 250, - "preEvolution": "rockruff", - "cannotDynamax": false, - "battleOnly": false - } - ], - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 6, - "entries": [ - { - "item": "minecraft:bone", - "quantityRange": "0-2" - }, - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:hard_stone", - "percentage": 5.0 - }, - { - "item": "cobblemon:babiri_berry", - "percentage": 5.0 + "preEvolution": "rockruff wolf_form=dusk", + "evolutions": [], + "battleOnly": false, + "behaviour": { + "herd": { + "maxSize": "8", + "toleratedLeaders": [ + { + "pokemon": "lycanroc dusk", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "entityInteract": { + "avoidedBySkeleton": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "167-11833,13702-22299" + ], + "drowsyChance": 0.0021, + "rouseChance": 0.0042 + } } - ] - }, - "implemented": true + } + ] } \ No newline at end of file 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 945649b0d..39fe8457d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/magearna.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/magearna.json @@ -1,10 +1,26 @@ { - "name": "Magearna", + "implemented": true, "nationalPokedexNumber": 801, + "name": "Magearna", "primaryType": "steel", "secondaryType": "fairy", + "maleRatio": -1, + "height": 10, + "weight": 805, + "pokedex": [ + "cobblemon.species.magearna.desc" + ], + "labels": [ + "gen7", + "mythical" + ], + "aspects": [], "abilities": [ - "soulheart" + "soulheart", + "h:soulheart" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 80, @@ -14,189 +30,52 @@ "special_defence": 115, "speed": 65 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Original", - "primaryType": "steel", - "secondaryType": "fairy", - "abilities": [ - "soulheart" - ], - "baseStats": { - "hp": 80, - "attack": 95, - "defence": 115, - "special_attack": 130, - "special_defence": 115, - "speed": 65 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:gyroball", - "1:helpinghand", - "6:defensecurl", - "12:rollout", - "18:irondefense", - "24:gearup", - "24:magneticflux", - "30:psybeam", - "36:aurorabeam", - "42:lockon", - "42:mindreader", - "48:shiftgear", - "54:craftyshield", - "54:trick", - "60:ironhead", - "66:aurasphere", - "72:flashcannon", - "78:painsplit", - "84:zapcannon", - "90:fleurcannon", - "tm:agility", - "tm:aurasphere", - "tm:batonpass", - "tm:bodyslam", - "tm:brickbreak", - "tm:calmmind", - "tm:chargebeam", - "tm:confuseray", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:eerieimpulse", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:falseswipe", - "tm:flashcannon", - "tm:focusblast", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:guardswap", - "tm:gyroball", - "tm:heavyslam", - "tm:helpinghand", - "tm:hyperbeam", - "tm:icebeam", - "tm:icespinner", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:lightscreen", - "tm:metalsound", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:painsplit", - "tm:playrough", - "tm:powerswap", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psyshock", - "tm:reflect", - "tm:rest", - "tm:round", - "tm:selfdestruct", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:snowscape", - "tm:solarbeam", - "tm:speedswap", - "tm:spikes", - "tm:steelbeam", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thunderbolt", - "tm:thunderwave", - "tm:triattack", - "tm:trick", - "tm:trickroom", - "tm:voltswitch", - "tm:zenheadbutt", - "tutor:defensecurl", - "tutor:flashcannon", - "tutor:fleurcannon", - "tutor:mistyexplosion", - "tutor:rest", - "tutor:steelbeam", - "tutor:steelroller" - ], - "labels": [ - "gen7", - "mythical", - "legendary" - ], - "aspects": [ - "original" - ], - "height": 10, - "weight": 805, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:gyroball", + "1:gearup", "1:helpinghand", "1:sonicboom", + "1:luckychant", + "1:mirrorshot", + "1:mindreader", + "1:synchronoise", + "1:heartswap", + "1:trumpcard", + "1:gyroball", "6:defensecurl", - "9:luckychant", "12:rollout", "18:irondefense", - "24:gearup", "24:magneticflux", - "25:mirrorshot", "30:psybeam", "36:aurorabeam", "42:lockon", - "42:mindreader", "48:shiftgear", "54:craftyshield", - "54:trick", "60:ironhead", "66:aurasphere", "72:flashcannon", - "73:synchronoise", "78:painsplit", "84:zapcannon", - "89:heartswap", "90:fleurcannon", - "97:trumpcard", + "tm:afteryou", "tm:agility", "tm:aurasphere", "tm:batonpass", @@ -204,11 +83,9 @@ "tm:brickbreak", "tm:calmmind", "tm:chargebeam", - "tm:confide", "tm:confuseray", "tm:dazzlinggleam", "tm:disarmingvoice", - "tm:doubleteam", "tm:drainingkiss", "tm:echoedvoice", "tm:eerieimpulse", @@ -223,22 +100,23 @@ "tm:falseswipe", "tm:flashcannon", "tm:focusblast", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", "tm:gravity", "tm:guardswap", "tm:gyroball", + "tm:healbell", "tm:heavyslam", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:icebeam", "tm:icespinner", "tm:imprison", "tm:irondefense", "tm:ironhead", + "tm:lastresort", "tm:lightscreen", + "tm:magnetrise", "tm:metalsound", "tm:mistyexplosion", "tm:mistyterrain", @@ -251,22 +129,22 @@ "tm:psyshock", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", + "tm:rollout", "tm:selfdestruct", "tm:shadowball", + "tm:shockwave", + "tm:signalbeam", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:snowscape", "tm:solarbeam", "tm:speedswap", "tm:spikes", "tm:steelbeam", + "tm:steelroller", "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", "tm:terablast", @@ -278,51 +156,90 @@ "tm:voltswitch", "tm:zenheadbutt", "tutor:afteryou", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:electroweb", + "tutor:energyball", + "tutor:falseswipe", "tutor:flashcannon", - "tutor:fleurcannon", + "tutor:gigaimpact", + "tutor:gravity", "tutor:healbell", "tutor:helpinghand", + "tutor:hyperbeam", + "tutor:icebeam", "tutor:irondefense", "tutor:ironhead", "tutor:lastresort", - "tutor:luckychant", "tutor:magnetrise", "tutor:mistyexplosion", "tutor:painsplit", + "tutor:playrough", + "tutor:psychic", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", "tutor:shockwave", "tutor:signalbeam", - "tutor:snore", + "tutor:skillswap", + "tutor:sleeptalk", + "tutor:spikes", "tutor:steelbeam", "tutor:steelroller", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.magearna.desc" + "tutor:swift", + "tutor:thunderbolt", + "tutor:trick", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 10, - "weight": 805, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Original", + "primaryType": "steel", + "secondaryType": "fairy", + "maleRatio": -1, + "height": 10, + "weight": 805, + "pokedex": [ + "cobblemon.species.magearna-original.desc" + ], + "labels": [ + "gen7", + "mythical" + ], + "aspects": [ + "original-color" + ], + "evolutions": [], + "battleOnly": false + } + ], + "behaviour": { + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json b/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json deleted file mode 100644 index a9c57b560..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/mareanie.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "name": "Mareanie", - "nationalPokedexNumber": 747, - "primaryType": "poison", - "secondaryType": "water", - "abilities": [ - "merciless", - "limber", - "h:regenerator" - ], - "baseStats": { - "hp": 50, - "attack": 53, - "defence": 62, - "special_attack": 43, - "special_defence": 52, - "speed": 45 - }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 61, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1" - ], - "moves": [ - "1:peck", - "1:poisonsting", - "5:wideguard", - "10:bite", - "15:venoshock", - "20:recover", - "25:pinmissile", - "29:spikecannon", - "30:toxicspikes", - "35:liquidation", - "40:acidspray", - "40:venomdrench", - "45:poisonjab", - "50:toxic", - "egg:haze", - "egg:infestation", - "egg:spitup", - "egg:stockpile", - "egg:swallow", - "tm:acidspray", - "tm:attract", - "tm:blizzard", - "tm:brine", - "tm:chillingwater", - "tm:confide", - "tm:doubleteam", - "tm:endure", - "tm:facade", - "tm:frostbreath", - "tm:frustration", - "tm:gunkshot", - "tm:hail", - "tm:haze", - "tm:hiddenpower", - "tm:hydropump", - "tm:icebeam", - "tm:icespinner", - "tm:icywind", - "tm:infestation", - "tm:irondefense", - "tm:liquidation", - "tm:lunge", - "tm:muddywater", - "tm:mudshot", - "tm:painsplit", - "tm:payback", - "tm:pinmissile", - "tm:poisonjab", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scald", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:terablast", - "tm:toxic", - "tm:toxicspikes", - "tm:venomdrench", - "tm:venoshock", - "tm:waterpulse", - "tutor:afteryou", - "tutor:covet", - "tutor:gastroacid", - "tutor:gunkshot", - "tutor:icywind", - "tutor:irondefense", - "tutor:knockoff", - "tutor:liquidation", - "tutor:magiccoat", - "tutor:painsplit", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:stockpile", - "tutor:swallow", - "tutor:toxic", - "tutor:waterpulse" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.mareanie.desc" - ], - "evolutions": [ - { - "id": "mareanie_toxapex", - "variant": "level_up", - "result": "toxapex", - "consumeHeldItem": false, - "learnableMoves": [ - "banefulbunker" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 38 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 80, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:poison_barb", - "percentage": 2.5 - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 2b0c3a822..fa725ed98 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/marshadow.json @@ -1,10 +1,26 @@ { - "name": "Marshadow", + "implemented": true, "nationalPokedexNumber": 802, + "name": "Marshadow", "primaryType": "fighting", "secondaryType": "ghost", + "maleRatio": -1, + "height": 7, + "weight": 222, + "pokedex": [ + "cobblemon.species.marshadow.desc" + ], + "labels": [ + "gen7", + "mythical" + ], + "aspects": [], "abilities": [ - "technician" + "technician", + "h:technician" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 90, @@ -14,32 +30,42 @@ "special_defence": 90, "speed": 125 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 2, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 1 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:copycat", - "1:counter", - "1:drainpunch", - "1:feint", "1:firepunch", + "1:thunderpunch", "1:icepunch", + "1:counter", "1:pursuit", "1:shadowsneak", - "1:thunderpunch", + "1:feint", + "1:rollingkick", + "1:copycat", + "1:jumpkick", "9:roleplay", - "15:rollingkick", "18:shadowpunch", "27:forcepalm", - "35:jumpkick", "36:assurance", "45:suckerpunch", + "54:drainpunch", "63:psychup", "72:spectralthief", "81:laserfocus", @@ -55,25 +81,27 @@ "tm:bulkup", "tm:calmmind", "tm:closecombat", - "tm:confide", - "tm:doubleteam", + "tm:coaching", "tm:drainpunch", "tm:echoedvoice", + "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", "tm:firepunch", "tm:fling", "tm:focusblast", + "tm:focuspunch", "tm:foulplay", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", "tm:hex", - "tm:hiddenpower", "tm:hyperbeam", "tm:icepunch", "tm:ironhead", + "tm:knockoff", + "tm:laserfocus", + "tm:lastresort", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -82,41 +110,45 @@ "tm:payback", "tm:phantomforce", "tm:poisonjab", + "tm:poltergeist", "tm:protect", "tm:psychup", "tm:rest", - "tm:return", "tm:revenge", "tm:reversal", "tm:rockslide", "tm:rocktomb", - "tm:round", + "tm:roleplay", "tm:shadowball", "tm:shadowclaw", + "tm:skittersmack", "tm:sleeptalk", "tm:smackdown", - "tm:snore", + "tm:snatch", "tm:stoneedge", "tm:substitute", + "tm:suckerpunch", "tm:superpower", - "tm:swagger", "tm:swift", + "tm:terablast", "tm:thief", "tm:throatchop", "tm:thunderpunch", - "tm:toxic", "tm:willowisp", "tm:workup", "tm:zenheadbutt", "tutor:bounce", - "tutor:closecombat", + "tutor:bulkup", + "tutor:calmmind", "tutor:coaching", "tutor:drainpunch", "tutor:endeavor", + "tutor:falseswipe", "tutor:firepunch", "tutor:focuspunch", - "tutor:forcepalm", "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", "tutor:icepunch", "tutor:ironhead", "tutor:knockoff", @@ -124,46 +156,52 @@ "tutor:lastresort", "tutor:lowkick", "tutor:outrage", + "tutor:poisonjab", "tutor:poltergeist", + "tutor:rest", + "tutor:rockslide", "tutor:roleplay", "tutor:shadowball", - "tutor:shadowsneak", + "tutor:shadowclaw", "tutor:skittersmack", + "tutor:sleeptalk", "tutor:snatch", - "tutor:snore", - "tutor:spectralthief", + "tutor:stoneedge", + "tutor:suckerpunch", "tutor:superpower", + "tutor:swift", "tutor:throatchop", "tutor:thunderpunch", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.marshadow.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "height": 7, - "weight": 222, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file 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 c6bcfb559..ad2c96696 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/minior.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/minior.json @@ -1,10 +1,27 @@ { - "name": "Minior", + "implemented": true, "nationalPokedexNumber": 774, + "name": "Minior", "primaryType": "rock", "secondaryType": "flying", + "maleRatio": -1, + "height": 3, + "weight": 3, + "pokedex": [ + "cobblemon.pokedex.minior.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [ + "core-form" + ], "abilities": [ - "shieldsdown" + "shieldsdown", + "h:shieldsdown" + ], + "eggGroups": [ + "mineral" ], "baseStats": { "hp": 60, @@ -14,15 +31,57 @@ "special_defence": 60, "speed": 120 }, - "catchRate": 30, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 175, "experienceGroup": "medium_slow", + "catchRate": 255, "eggCycles": 25, - "eggGroups": [ - "mineral" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "minior", + "tier": 1 + } + ] + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + }, "moves": [ "1:tackle", "3:defensecurl", @@ -34,105 +93,117 @@ "24:stealthrock", "29:takedown", "31:autotomize", - "31:rockpolish", "36:cosmicpower", "38:powergem", "43:doubleedge", "45:shellsmash", "50:explosion", "tm:acrobatics", - "tm:attract", + "tm:ancientpower", "tm:bulldoze", "tm:calmmind", "tm:chargebeam", - "tm:confide", "tm:confuseray", + "tm:cosmicpower", "tm:dazzlinggleam", "tm:doubleedge", - "tm:doubleteam", "tm:earthpower", "tm:earthquake", "tm:endeavor", "tm:endure", "tm:explosion", "tm:facade", - "tm:frustration", "tm:gigaimpact", "tm:gravity", "tm:gyroball", - "tm:hiddenpower", "tm:hyperbeam", "tm:ironhead", + "tm:lastresort", "tm:lightscreen", + "tm:magnetrise", "tm:meteorbeam", "tm:powergem", "tm:protect", "tm:psychic", - "tm:psychup", "tm:reflect", "tm:rest", - "tm:return", "tm:rockblast", "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", + "tm:rollout", "tm:safeguard", "tm:sandstorm", "tm:scorchingsands", + "tm:selfdestruct", "tm:sleeptalk", "tm:solarbeam", "tm:stealthrock", + "tm:steelroller", "tm:stoneedge", "tm:substitute", - "tm:swagger", "tm:swift", "tm:takedown", + "tm:telekinesis", "tm:terablast", - "tm:toxic", "tm:uturn", "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:snore", + "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" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.minior.desc" + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:psychup", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 3, + "battleOnly": false, "forms": [ { "name": "Meteor", "primaryType": "rock", "secondaryType": "flying", - "abilities": [ - "shieldsdown" + "maleRatio": -1, + "height": 3, + "weight": 400, + "pokedex": [ + "cobblemon.pokedex.minior-meteor.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [ + "meteor-form" ], "baseStats": { "hp": 60, @@ -142,10 +213,6 @@ "special_defence": 100, "speed": 60 }, - "catchRate": 30, - "maleRatio": -1, - "baseExperienceYield": 175, - "baseFriendship": 70, "evYield": { "hp": 0, "attack": 0, @@ -154,33 +221,22 @@ "special_defence": 1, "speed": 0 }, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "mineral" - ], - "labels": [ - "gen7" - ], - "aspects": [ - "meteor" - ], - "height": 3, - "weight": 400, - "cannotDynamax": false, - "battleOnly": true, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:float_stone", - "percentage": 5.0 - } - ] - } + "baseExperienceYield": 154, + "catchRate": 30, + "evolutions": [] } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:float_stone", + "percentage": 5.0 + } + ] + }, + "lightingData": { + "lightLevel": 8, + "liquidGlowMode": "BOTH" + } } \ No newline at end of file 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 a31ee6eea..9e5ba9a39 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/necrozma.json @@ -1,9 +1,26 @@ { - "name": "Necrozma", + "implemented": true, "nationalPokedexNumber": 800, + "name": "Necrozma", "primaryType": "psychic", + "maleRatio": -1, + "height": 24, + "weight": 2300, + "pokedex": [ + "cobblemon.species.necrozma.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "prismarmor" + "prismarmor", + "h:prismarmor" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 97, @@ -13,167 +30,34 @@ "special_defence": 89, "speed": 79 }, - "catchRate": 255, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Dusk-Mane", - "primaryType": "psychic", - "secondaryType": "steel", - "abilities": [ - "prismarmor" - ], - "baseStats": { - "hp": 97, - "attack": 157, - "defence": 127, - "special_attack": 113, - "special_defence": 109, - "speed": 77 - }, - "catchRate": 255, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "form_change:sunsteelstrike" - ], - "labels": [ - "gen7", - "legendary" - ], - "aspects": [ - "dusk-fusion" - ], - "height": 38, - "weight": 4600, - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Dawn-Wings", - "primaryType": "psychic", - "secondaryType": "ghost", - "abilities": [ - "prismarmor" - ], - "baseStats": { - "hp": 97, - "attack": 113, - "defence": 109, - "special_attack": 157, - "special_defence": 127, - "speed": 77 - }, - "catchRate": 255, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "form_change:moongeistbeam" - ], - "labels": [ - "gen7", - "legendary" - ], - "aspects": [ - "dawn-fusion" - ], - "height": 42, - "weight": 3500, - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Ultra", - "primaryType": "psychic", - "secondaryType": "dragon", - "abilities": [ - "neuroforce" - ], - "baseStats": { - "hp": 97, - "attack": 167, - "defence": 97, - "special_attack": 167, - "special_defence": 97, - "speed": 129 - }, - "catchRate": 255, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 1 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "form_change:moongeistbeam", - "form_change:sunsteelstrike" - ], - "labels": [ - "gen7", - "legendary" - ], - "aspects": [ - "ultra-fusion" - ], - "height": 75, - "weight": 2300, - "cannotDynamax": false, - "battleOnly": true - } - ], + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 2, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ + "1:moonlight", + "1:morningsun", "1:chargebeam", + "1:mirrorshot", + "1:metalclaw", "1:confusion", "1:gravity", - "1:metalclaw", - "1:mirrorshot", - "1:moonlight", - "1:morningsun", + "1:wringout", "8:stealthrock", "16:slash", "24:nightslash", @@ -182,24 +66,19 @@ "48:rockblast", "56:irondefense", "64:powergem", - "67:wringout", "72:photongeyser", "80:autotomize", - "80:gravity", "88:prismaticlaser", "tm:aerialace", "tm:allyswitch", "tm:bodyslam", - "tm:breakingswipe", "tm:brickbreak", "tm:brutalswing", "tm:bulldoze", "tm:calmmind", "tm:chargebeam", - "tm:confide", "tm:cosmicpower", "tm:darkpulse", - "tm:doubleteam", "tm:dragondance", "tm:dragonpulse", "tm:earthpower", @@ -210,13 +89,11 @@ "tm:facade", "tm:flashcannon", "tm:fling", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:gravity", "tm:gyroball", "tm:heatwave", - "tm:hiddenpower", "tm:hyperbeam", "tm:hypervoice", "tm:imprison", @@ -224,6 +101,7 @@ "tm:ironhead", "tm:knockoff", "tm:lightscreen", + "tm:magnetrise", "tm:metalclaw", "tm:meteorbeam", "tm:outrage", @@ -233,90 +111,515 @@ "tm:psychicfangs", "tm:psychocut", "tm:psyshock", + "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", "tm:rockblast", "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:scaryface", "tm:shadowclaw", + "tm:shockwave", + "tm:signalbeam", "tm:sleeptalk", "tm:smartstrike", - "tm:snore", "tm:solarbeam", "tm:stealthrock", "tm:stoneedge", "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:swordsdance", + "tm:telekinesis", "tm:terablast", "tm:thief", - "tm:thunderwave", - "tm:toxic", "tm:trickroom", "tm:xscissor", + "tutor:aerialace", "tutor:allyswitch", - "tutor:autotomize", + "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:lightscreen", "tutor:magnetrise", "tutor:meteorbeam", - "tutor:moonlight", - "tutor:nightslash", "tutor:outrage", - "tutor:photongeyser", - "tutor:prismaticlaser", + "tutor:psychic", "tutor:psychocut", "tutor:recycle", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", "tutor:shockwave", "tutor:signalbeam", - "tutor:snore", + "tutor:sleeptalk", "tutor:stealthrock", - "tutor:substitute", + "tutor:stoneedge", + "tutor:swift", "tutor:telekinesis", - "tutor:wringout" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.necrozma.desc" + "tutor:xscissor", + "legacy:breakingswipe", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:thunderwave", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 24, - "weight": 2300, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Dusk-Mane", + "primaryType": "psychic", + "secondaryType": "steel", + "maleRatio": -1, + "height": 38, + "weight": 4600, + "pokedex": [ + "cobblemon.species.necrozma-duskmane.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted" + ], + "aspects": [ + "dusk-fusion" + ], + "baseStats": { + "hp": 97, + "attack": 157, + "defence": 127, + "special_attack": 113, + "special_defence": 109, + "speed": 77 + }, + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 340, + "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", + "form_change:sunsteelstrike", + "tm:aerialace", + "tm:allyswitch", + "tm:bodyslam", + "tm:brickbreak", + "tm:brutalswing", + "tm:bulldoze", + "tm:calmmind", + "tm:chargebeam", + "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:outrage", + "tm:powergem", + "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:sleeptalk", + "tm:smartstrike", + "tm:solarbeam", + "tm:stealthrock", + "tm:stoneedge", + "tm:storedpower", + "tm:substitute", + "tm:sunnyday", + "tm:sunsteelstrike", + "tm:swift", + "tm:swordsdance", + "tm:telekinesis", + "tm:terablast", + "tm:thief", + "tm:trickroom", + "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:xscissor" + ], + "evolutions": [], + "battleOnly": false, + "lightingData": { + "lightLevel": 15, + "liquidGlowMode": "BOTH" + }, + "behaviour": { + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } + }, + { + "name": "Dawn-Wings", + "primaryType": "psychic", + "secondaryType": "ghost", + "maleRatio": -1, + "height": 42, + "weight": 3500, + "pokedex": [ + "cobblemon.species.necrozma-dawnwings.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted" + ], + "aspects": [ + "dawn-fusion" + ], + "baseStats": { + "hp": 97, + "attack": 113, + "defence": 109, + "special_attack": 157, + "special_defence": 127, + "speed": 77 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 340, + "moves": [ + "1:moonlight", + "1:morningsun", + "1:chargebeam", + "1:mirrorshot", + "1:metalclaw", + "1:confusion", + "1:autotomize", + "1:wringout", + "8:stealthrock", + "16:slash", + "24:nightslash", + "32:psychocut", + "40:storedpower", + "48:rockblast", + "56:irondefense", + "64:powergem", + "72:photongeyser", + "80:gravity", + "88:prismaticlaser", + "form_change:moongeistbeam", + "tm:aerialace", + "tm:allyswitch", + "tm:bodyslam", + "tm:brickbreak", + "tm:brutalswing", + "tm:bulldoze", + "tm:calmmind", + "tm:chargebeam", + "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:moongeistbeam", + "tm:outrage", + "tm:powergem", + "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: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: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:xscissor" + ], + "evolutions": [], + "battleOnly": false, + "lightingData": { + "lightLevel": 15, + "liquidGlowMode": "BOTH" + } + }, + { + "name": "Ultra", + "primaryType": "psychic", + "secondaryType": "dragon", + "maleRatio": -1, + "height": 75, + "weight": 2300, + "pokedex": [ + "cobblemon.species.necrozma-ultra.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted", + "ultra_burst" + ], + "aspects": [ + "ultra-fusion" + ], + "abilities": [ + "neuroforce", + "h:neuroforce" + ], + "baseStats": { + "hp": 97, + "attack": 167, + "defence": 97, + "special_attack": 167, + "special_defence": 97, + "speed": 129 + }, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 1 + }, + "baseExperienceYield": 377, + "catchRate": 255, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true, + "lightingData": { + "lightLevel": 15, + "liquidGlowMode": "BOTH" + } + } + ], + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 fe4db0112..9464003d9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/nihilego.json @@ -1,10 +1,26 @@ { - "name": "Nihilego", + "implemented": true, "nationalPokedexNumber": 793, + "name": "Nihilego", "primaryType": "rock", "secondaryType": "poison", + "maleRatio": -1, + "height": 12, + "weight": 555, + "pokedex": [ + "cobblemon.species.nihilego.desc" + ], + "labels": [ + "gen7", + "ultra_beast" + ], + "aspects": [], "abilities": [ - "beastboost" + "beastboost", + "h:beastboost" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 109, @@ -14,28 +30,46 @@ "special_defence": 131, "speed": 103 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 3, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "moves": [ "1:constrict", "1:pound", + "1:psywave", "1:wrap", "5:acid", "10:tickle", - "13:psywave", "15:acidspray", "20:clearsmog", - "25:guardsplit", "25:powersplit", + "25:guardsplit", "30:venoshock", - "31:safeguard", "35:headbutt", "40:toxicspikes", "45:venomdrench", @@ -44,115 +78,128 @@ "60:mirrorcoat", "65:wonderroom", "70:headsmash", + "tm:acidspray", "tm:allyswitch", + "tm:bind", "tm:bodyslam", "tm:brutalswing", "tm:chargebeam", - "tm:confide", + "tm:corrosivegas", "tm:crosspoison", "tm:dazzlinggleam", - "tm:doubleteam", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:foulplay", - "tm:frustration", "tm:grassknot", "tm:gunkshot", + "tm:headbutt", "tm:hex", - "tm:hiddenpower", "tm:ironhead", + "tm:knockoff", "tm:lightscreen", + "tm:magiccoat", + "tm:meteorbeam", + "tm:painsplit", "tm:poisonjab", "tm:powergem", "tm:protect", "tm:psychic", "tm:psyshock", - "tm:reflect", "tm:rest", - "tm:return", "tm:rockslide", "tm:rocktomb", - "tm:round", + "tm:roleplay", "tm:safeguard", "tm:sandstorm", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:snore", + "tm:spite", "tm:stealthrock", "tm:substitute", - "tm:swagger", + "tm:telekinesis", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:toxicspikes", "tm:trickroom", "tm:venomdrench", "tm:venoshock", "tm:wonderroom", + "tm:worryseed", "tm:zenheadbutt", - "tutor:acidspray", "tutor:allyswitch", "tutor:bind", - "tutor:brutalswing", + "tutor:chargebeam", "tutor:corrosivegas", + "tutor:dazzlinggleam", "tutor:foulplay", "tutor:gunkshot", "tutor:ironhead", "tutor:knockoff", "tutor:magiccoat", "tutor:meteorbeam", - "tutor:mirrorcoat", "tutor:painsplit", - "tutor:powergem", + "tutor:poisonjab", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", "tutor:roleplay", - "tutor:sludgewave", - "tutor:snore", + "tutor:sleeptalk", + "tutor:sludgebomb", "tutor:spite", "tutor:stealthrock", "tutor:telekinesis", - "tutor:venomdrench", + "tutor:thunderbolt", "tutor:wonderroom", "tutor:worryseed", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "ultra_beast" - ], - "pokedex": [ - "cobblemon.species.nihilego.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:reflect", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 12, - "weight": 555, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:echo_shard", - "quantityRange": "1-3" + "behaviour": { + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "nihilego", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ 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 39574cd80..fe9645d6a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oranguru.json @@ -1,13 +1,54 @@ { - "name": "Oranguru", + "implemented": true, "nationalPokedexNumber": 765, + "name": "Oranguru", "primaryType": "normal", "secondaryType": "psychic", + "maleRatio": 0.5, + "height": 15, + "weight": 760, + "pokedex": [ + "cobblemon.species.oranguru.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [], "abilities": [ "innerfocus", "telepathy", "h:symbiosis" ], + "eggGroups": [ + "field" + ], + "baseStats": { + "hp": 90, + "attack": 60, + "defence": 80, + "special_attack": 90, + "special_defence": 110, + "speed": 60 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 2, + "speed": 0 + }, + "baseExperienceYield": 172, + "experienceGroup": "slow", + "catchRate": 45, + "eggCycles": 20, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "drops": { "amount": 2, "entries": [ @@ -21,31 +62,14 @@ } ] }, - "baseStats": { - "hp": 90, - "attack": 60, - "defence": 80, - "special_attack": 90, - "special_defence": 110, - "speed": 60 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 172, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "field" - ], "moves": [ "1:confusion", "1:taunt", + "1:feintattack", "5:afteryou", "10:calmmind", "15:storedpower", "20:psychup", - "22:feintattack", "25:quash", "30:nastyplot", "35:zenheadbutt", @@ -57,11 +81,10 @@ "egg:dreameater", "egg:extrasensory", "egg:lastresort", - "egg:psychicterrain", - "egg:wonderroom", "egg:yawn", + "tm:afteryou", "tm:allyswitch", - "tm:attract", + "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -69,8 +92,7 @@ "tm:calmmind", "tm:chargebeam", "tm:chillingwater", - "tm:confide", - "tm:doubleteam", + "tm:covet", "tm:dreameater", "tm:earthquake", "tm:embargo", @@ -83,16 +105,16 @@ "tm:fling", "tm:focusblast", "tm:foulplay", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:gravity", - "tm:hiddenpower", "tm:hyperbeam", "tm:hypervoice", "tm:imprison", "tm:knockoff", + "tm:lastresort", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:megakick", "tm:megapunch", @@ -111,26 +133,24 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", "tm:rockslide", - "tm:round", "tm:safeguard", "tm:scaryface", "tm:shadowball", "tm:skillswap", "tm:sleeptalk", - "tm:snore", + "tm:snatch", "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:takedown", "tm:taunt", + "tm:telekinesis", "tm:terablast", + "tm:terrainpulse", "tm:thunder", "tm:thunderbolt", - "tm:toxic", "tm:trailblaze", "tm:trick", "tm:trickroom", @@ -140,52 +160,73 @@ "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:instruct", + "tutor:hyperbeam", + "tutor:hypervoice", "tutor:knockoff", + "tutor:lastresort", "tutor:magiccoat", "tutor:magicroom", "tutor:painsplit", "tutor:psychic", - "tutor:psychicterrain", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowball", + "tutor:skillswap", + "tutor:sleeptalk", "tutor:snatch", - "tutor:snore", - "tutor:spite", + "tutor:swift", "tutor:telekinesis", "tutor:terrainpulse", + "tutor:thunderbolt", "tutor:trick", - "tutor:trickroom", "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.oranguru.desc" + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:spite", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 15, - "weight": 760, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "oranguru", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 0e3228360..11fb60627 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/oricorio.json @@ -1,11 +1,49 @@ { - "name": "Oricorio", + "implemented": true, "nationalPokedexNumber": 741, + "name": "Oricorio", "primaryType": "fire", "secondaryType": "flying", + "maleRatio": 0.25, + "height": 6, + "weight": 34, + "pokedex": [ + "cobblemon.species.oricorio.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [ + "baile-style" + ], "abilities": [ - "dancer" + "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, "drops": { "amount": 5, "entries": [ @@ -26,34 +64,10 @@ } ] }, - "baseStats": { - "hp": 75, - "attack": 70, - "defence": 70, - "special_attack": 98, - "special_defence": 70, - "speed": 93 - }, - "catchRate": 45, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 167, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "flying" - ], "moves": [ "1:pound", + "1:doubleslap", + "1:mirrormove", "4:growl", "6:peck", "10:helpinghand", @@ -61,15 +75,12 @@ "16:batonpass", "20:featherdance", "23:acrobatics", - "23:doubleslap", "26:teeterdance", "30:roost", - "33:captivate", "33:flatter", "36:airslash", "40:revelationdance", "43:agility", - "43:mirrormove", "47:hurricane", "egg:attract", "egg:captivate", @@ -77,7 +88,6 @@ "egg:pluck", "egg:quiverdance", "egg:safeguard", - "egg:tailwind", "tm:acrobatics", "tm:aerialace", "tm:agility", @@ -87,196 +97,237 @@ "tm:attract", "tm:batonpass", "tm:calmmind", + "tm:captivate", "tm:charm", - "tm:confide", - "tm:doubleteam", + "tm:covet", + "tm:defog", "tm:dualwingbeat", "tm:embargo", "tm:endure", "tm:facade", "tm:featherdance", "tm:fly", - "tm:frustration", "tm:helpinghand", - "tm:hiddenpower", "tm:hurricane", "tm:icywind", + "tm:pluck", "tm:protect", "tm:psychup", "tm:quash", "tm:raindance", "tm:rest", - "tm:return", "tm:reversal", + "tm:roleplay", "tm:roost", - "tm:round", "tm:safeguard", "tm:sandstorm", + "tm:skyattack", "tm:sleeptalk", "tm:steelwing", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:swordsdance", "tm:tailwind", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:toxic", "tm:trailblaze", "tm:uturn", "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:snore", - "tutor:tailwind" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.oricorio.desc" + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "height": 6, - "weight": 34, "evolutions": [], "forms": [ { "name": "Pom-Pom", "primaryType": "electric", "secondaryType": "flying", - "abilities": [ - "dancer" - ], - "baseStats": { - "hp": 75, - "attack": 70, - "defence": 70, - "special_attack": 98, - "special_defence": 70, - "speed": 93 - }, - "catchRate": 45, "maleRatio": 0.25, - "baseExperienceYield": 167, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "flying" + "height": 6, + "weight": 34, + "pokedex": [ + "cobblemon.species.oricorio-pompom.desc" ], "labels": [ "gen7" ], "aspects": [ - "pom-pom" + "pom_pom-style" ], - "height": 6, - "weight": 34, - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendOwner": true + }, + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "oricorio", + "tier": 1 + } + ] + } + } }, { "name": "Pa'u", "primaryType": "psychic", "secondaryType": "flying", - "abilities": [ - "dancer" - ], - "baseStats": { - "hp": 75, - "attack": 70, - "defence": 70, - "special_attack": 98, - "special_defence": 70, - "speed": 93 - }, - "catchRate": 45, "maleRatio": 0.25, - "baseExperienceYield": 167, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "flying" + "height": 6, + "weight": 34, + "pokedex": [ + "cobblemon.species.oricorio-pau.desc" ], "labels": [ "gen7" ], "aspects": [ - "pa'u" + "pa'u-style" ], - "height": 6, - "weight": 34, - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendOwner": true + }, + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "oricorio", + "tier": 1 + } + ] + } + } }, { "name": "Sensu", "primaryType": "ghost", "secondaryType": "flying", - "abilities": [ - "dancer" - ], - "baseStats": { - "hp": 75, - "attack": 70, - "defence": 70, - "special_attack": 98, - "special_defence": 70, - "speed": 93 - }, - "catchRate": 45, "maleRatio": 0.25, - "baseExperienceYield": 167, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "flying" + "height": 6, + "weight": 34, + "pokedex": [ + "cobblemon.species.oricorio-sensu.desc" ], "labels": [ "gen7" ], "aspects": [ - "sensu" + "sensu-style" ], - "height": 6, - "weight": 34, - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendOwner": true + }, + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "oricorio", + "tier": 1 + } + ] + } + } } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "oricorio", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendOwner": true + }, + "fireImmune": true + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json b/common/src/main/resources/data/cobblemon/species/generation7/palossand.json deleted file mode 100644 index c94d2ff72..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/palossand.json +++ /dev/null @@ -1,162 +0,0 @@ -{ - "name": "Palossand", - "nationalPokedexNumber": 770, - "primaryType": "ghost", - "secondaryType": "ground", - "abilities": [ - "watercompaction", - "h:sandveil" - ], - "baseStats": { - "hp": 85, - "attack": 75, - "defence": 110, - "special_attack": 100, - "special_defence": 75, - "speed": 35 - }, - "catchRate": 60, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 168, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:absorb", - "1:astonish", - "1:harden", - "1:sandtomb", - "15:megadrain", - "20:sandattack", - "25:bulldoze", - "30:hypnosis", - "35:gigadrain", - "40:irondefense", - "47:shadowball", - "54:earthpower", - "61:shoreup", - "68:sandstorm", - "tm:amnesia", - "tm:attract", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:chillingwater", - "tm:confide", - "tm:confuseray", - "tm:curse", - "tm:doubleteam", - "tm:earthpower", - "tm:earthquake", - "tm:embargo", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flashcannon", - "tm:fling", - "tm:frustration", - "tm:gigadrain", - "tm:gigaimpact", - "tm:gravity", - "tm:hex", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:imprison", - "tm:infestation", - "tm:irondefense", - "tm:mudshot", - "tm:mudslap", - "tm:nightshade", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:psychic", - "tm:quash", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockpolish", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaryface", - "tm:scorchingsands", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snore", - "tm:spite", - "tm:stealthrock", - "tm:stoneedge", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:terablast", - "tm:toxic", - "tm:trick", - "tutor:afteryou", - "tutor:block", - "tutor:earthpower", - "tutor:gigadrain", - "tutor:gravity", - "tutor:irondefense", - "tutor:painsplit", - "tutor:poltergeist", - "tutor:recycle", - "tutor:roleplay", - "tutor:scorchingsands", - "tutor:skillswap", - "tutor:snore", - "tutor:spite", - "tutor:stealthrock", - "tutor:terrainpulse", - "tutor:trick" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.palossand.desc" - ], - "preEvolution": "sandygast", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 2500, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:soft_sand", - "percentage": 5.0 - }, - { - "item": "cobblemon:passho_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 e1cbe252e..1e1d0c4ed 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/passimian.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/passimian.json @@ -1,11 +1,25 @@ { - "name": "Passimian", + "implemented": true, "nationalPokedexNumber": 766, + "name": "Passimian", "primaryType": "fighting", + "maleRatio": 0.5, + "height": 20, + "weight": 828, + "pokedex": [ + "cobblemon.species.passimian.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [], "abilities": [ "receiver", "h:defiant" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 100, "attack": 120, @@ -14,23 +28,46 @@ "special_defence": 60, "speed": 80 }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 2, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 172, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 20, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:muscle_band", + "percentage": 5.0 + }, + { + "item": "cobblemon:payapa_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:leer", "1:tackle", + "1:leer", + "1:bestow", "5:rocksmash", "10:focusenergy", "15:beatup", "20:scaryface", - "25:bestow", "25:takedown", "30:fling", "35:bulkup", @@ -41,18 +78,16 @@ "60:gigaimpact", "egg:counter", "egg:feint", - "egg:ironhead", "egg:knockoff", "egg:quickattack", "egg:quickguard", "egg:seismictoss", "egg:vitalthrow", "tm:acrobatics", - "tm:aerialace", "tm:assurance", - "tm:attract", "tm:batonpass", "tm:beatup", + "tm:block", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -61,10 +96,8 @@ "tm:chillingwater", "tm:closecombat", "tm:coaching", - "tm:confide", "tm:curse", "tm:doubleedge", - "tm:doubleteam", "tm:drainpunch", "tm:earthquake", "tm:electroweb", @@ -75,114 +108,116 @@ "tm:focusblast", "tm:focusenergy", "tm:focuspunch", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", "tm:gunkshot", "tm:gyroball", - "tm:hiddenpower", "tm:hyperbeam", "tm:ironhead", "tm:irontail", "tm:knockoff", + "tm:laserfocus", "tm:lowkick", "tm:lowsweep", "tm:megakick", "tm:megapunch", - "tm:payback", "tm:painsplit", + "tm:payback", "tm:protect", "tm:raindance", "tm:rest", "tm:retaliate", - "tm:return", "tm:revenge", "tm:reversal", "tm:rockslide", + "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:scaryface", "tm:seedbomb", "tm:shadowball", + "tm:shockwave", "tm:sleeptalk", "tm:smackdown", - "tm:snore", + "tm:snatch", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:toxic", "tm:trailblaze", "tm:upperhand", "tm:uproar", "tm:uturn", "tm:vacuumwave", "tm:workup", - "tutor:bestow", "tutor:block", - "tutor:closecombat", + "tutor:bulkup", + "tutor:bulldoze", "tutor:coaching", "tutor:drainpunch", "tutor:electroweb", - "tutor:endeavor", - "tutor:feint", - "tutor:fling", + "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:snore", "tutor:superpower", "tutor:uproar", - "tutor:uturn" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.passimian.desc" + "tutor:vacuumwave", + "legacy:aerialace", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:endeavor", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 20, - "weight": 828, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:muscle_band", - "percentage": 5.0 - }, - { - "item": "cobblemon:payapa_berry", - "percentage": 5.0 + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "passimian", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 c8fde6b71..ad4396fc0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/pheromosa.json @@ -1,10 +1,26 @@ { - "name": "Pheromosa", + "implemented": true, "nationalPokedexNumber": 795, + "name": "Pheromosa", "primaryType": "bug", "secondaryType": "fighting", + "maleRatio": -1, + "height": 18, + "weight": 250, + "pokedex": [ + "cobblemon.species.pheromosa.desc" + ], + "labels": [ + "gen7", + "ultra_beast" + ], + "aspects": [], "abilities": [ - "beastboost" + "beastboost", + "h:beastboost" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 71, @@ -14,45 +30,63 @@ "special_defence": 37, "speed": 151 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 3 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "moves": [ - "1:feint", "1:rapidspin", + "1:feint", + "1:jumpkick", + "1:mefirst", "5:leer", - "7:swift", "10:quickguard", "15:bugbite", "20:lowkick", - "23:silverwind", "25:doublekick", "30:triplekick", - "31:jumpkick", "35:stomp", "40:agility", "45:lunge", "50:bounce", "55:speedswap", - "59:mefirst", "60:bugbuzz", "65:quiverdance", "70:highjumpkick", "tm:agility", "tm:assurance", "tm:blizzard", + "tm:block", "tm:bounce", "tm:brickbreak", + "tm:bugbite", "tm:bugbuzz", "tm:closecombat", - "tm:confide", - "tm:doubleteam", + "tm:coaching", "tm:drillrun", "tm:echoedvoice", "tm:electroweb", @@ -62,92 +96,91 @@ "tm:fling", "tm:focusblast", "tm:foulplay", - "tm:frustration", "tm:gigaimpact", - "tm:hiddenpower", "tm:hyperbeam", "tm:icebeam", "tm:icywind", + "tm:laserfocus", "tm:lowkick", "tm:lowsweep", + "tm:lunge", "tm:outrage", "tm:poisonjab", "tm:protect", "tm:rest", - "tm:return", "tm:roost", - "tm:round", + "tm:shockwave", + "tm:signalbeam", + "tm:silverwind", + "tm:skittersmack", "tm:sleeptalk", - "tm:snore", + "tm:snatch", "tm:speedswap", "tm:substitute", - "tm:swagger", "tm:swift", "tm:taunt", + "tm:terablast", "tm:throatchop", "tm:torment", - "tm:toxic", + "tm:tripleaxel", "tm:uturn", "tutor:block", "tutor:bounce", "tutor:bugbite", - "tutor:bugbuzz", "tutor:coaching", "tutor:drillrun", "tutor:electroweb", + "tutor:falseswipe", "tutor:foulplay", - "tutor:highjumpkick", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icebeam", "tutor:icywind", "tutor:laserfocus", "tutor:lowkick", - "tutor:lunge", - "tutor:mefirst", "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:roost", "tutor:shockwave", "tutor:signalbeam", "tutor:skittersmack", + "tutor:sleeptalk", "tutor:snatch", - "tutor:snore", "tutor:swift", "tutor:throatchop", "tutor:tripleaxel", - "tutor:triplekick" - ], - "labels": [ - "gen7", - "ultra_beast" - ], - "pokedex": [ - "cobblemon.species.pheromosa.desc" + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, - "height": 18, - "weight": 250, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:echo_shard", - "quantityRange": "1-3" + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ 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 deleted file mode 100644 index 589622370..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/pikipek.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "name": "Pikipek", - "nationalPokedexNumber": 731, - "primaryType": "normal", - "secondaryType": "flying", - "abilities": [ - "keeneye", - "skilllink", - "h:pickup" - ], - "baseStats": { - "hp": 35, - "attack": 75, - "defence": 30, - "special_attack": 30, - "special_defence": 30, - "speed": 65 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 53, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "flying" - ], - "moves": [ - "1:peck", - "3:growl", - "7:echoedvoice", - "9:rocksmash", - "13:supersonic", - "15:pluck", - "19:roost", - "21:furyattack", - "25:screech", - "27:drillpeck", - "31:bulletseed", - "33:featherdance", - "37:hypervoice", - "egg:boomburst", - "egg:bravebird", - "egg:gunkshot", - "egg:mirrormove", - "egg:skyattack", - "egg:tailwind", - "egg:uproar", - "tm:acrobatics", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:attract", - "tm:bravebird", - "tm:brickbreak", - "tm:bulletseed", - "tm:confide", - "tm:doubleteam", - "tm:dualwingbeat", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:flamecharge", - "tm:fly", - "tm:frustration", - "tm:gunkshot", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hypervoice", - "tm:knockoff", - "tm:protect", - "tm:rest", - "tm:return", - "tm:roost", - "tm:round", - "tm:sleeptalk", - "tm:smackdown", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:uproar", - "tm:uturn", - "tm:workup", - "tutor:defog", - "tutor:gunkshot", - "tutor:heatwave", - "tutor:hypervoice", - "tutor:knockoff", - "tutor:skyattack", - "tutor:snore", - "tutor:tailwind", - "tutor:uproar" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.pikipek.desc" - ], - "evolutions": [ - { - "id": "pikipek_trumbeak", - "variant": "level_up", - "result": "trumbeak", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 14 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 12, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-1" - }, - { - "item": "minecraft:chicken" - } - ] - }, - "implemented": true -} \ No newline at end of file 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 b4586152e..48567d4d2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/rockruff.json @@ -1,12 +1,26 @@ { - "name": "Rockruff", + "implemented": true, "nationalPokedexNumber": 744, + "name": "Rockruff", "primaryType": "rock", + "maleRatio": 0.5, + "height": 5, + "weight": 92, + "pokedex": [ + "cobblemon.species.rockruff.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [], "abilities": [ "keeneye", "vitalspirit", "h:steadfast" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 45, "attack": 65, @@ -15,23 +29,92 @@ "special_defence": 40, "speed": 60 }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 56, "experienceGroup": "medium_fast", + "catchRate": 190, "eggCycles": 15, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "entityInteract": { + "avoidedBySkeleton": true + }, + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "rockruff", + "tier": 1 + }, + { + "pokemon": "lycanroc midnight", + "tier": 2 + }, + { + "pokemon": "lycanroc wolf_form=midday", + "tier": 3 + }, + { + "pokemon": "lycanroc dusk", + "tier": 4 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + } + }, + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:bone", + "quantityRange": "0-1" + }, + { + "item": "minecraft:rotten_flesh", + "quantityRange": "0-1" + }, + { + "item": "cobblemon:hard_stone", + "percentage": 2.5 + }, + { + "item": "cobblemon:babiri_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:leer", "1:tackle", + "1:leer", "4:sandattack", "8:doubleteam", "12:rockthrow", "16:howl", - "18:odorsleuth", "20:bite", "24:rocktomb", "28:roar", @@ -39,20 +122,17 @@ "36:crunch", "40:scaryface", "44:stealthrock", - "45:rockclimb", "48:stoneedge", "egg:crushclaw", "egg:endeavor", - "egg:firefang", "egg:lastresort", + "egg:odorsleuth", "egg:suckerpunch", "egg:thrash", - "egg:thunderfang", - "tm:attract", "tm:bodyslam", "tm:bulldoze", "tm:charm", - "tm:confide", + "tm:covet", "tm:crunch", "tm:dig", "tm:doubleedge", @@ -63,68 +143,79 @@ "tm:endure", "tm:facade", "tm:firefang", - "tm:frustration", "tm:helpinghand", - "tm:hiddenpower", "tm:hypervoice", "tm:irondefense", "tm:ironhead", "tm:irontail", + "tm:lastresort", "tm:mudslap", "tm:playrough", "tm:protect", "tm:psychicfangs", "tm:rest", - "tm:return", "tm:roar", + "tm:rockclimb", "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:stealthrock", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", - "tm:swagger", + "tm:suckerpunch", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thunderfang", - "tm:toxic", "tm:trailblaze", "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:snore", + "tutor:mudslap", + "tutor:playrough", + "tutor:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", "tutor:stealthrock", "tutor:stompingtantrum", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.rockruff.desc" + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:thunderfang", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { - "id": "rockruff_lycanroc1", + "id": "rockruff_lycanroc", "variant": "level_up", - "result": "lycanroc", + "result": "lycanroc wolf_form=midday", "consumeHeldItem": false, "learnableMoves": [ + "accelerock", "suckerpunch" ], "requirements": [ @@ -139,9 +230,9 @@ ] }, { - "id": "rockruff_lycanroc2", + "id": "rockruff_lycanrocmidnight", "variant": "level_up", - "result": "lycanroc midnight", + "result": "lycanroc wolf_form=midnight", "consumeHeldItem": false, "learnableMoves": [ "counter" @@ -156,66 +247,152 @@ "range": "night" } ] - }, + } + ], + "forms": [ { - "id": "rockruff_lycanroc3", - "variant": "level_up", - "result": "lycanroc dusk", - "consumeHeldItem": false, - "learnableMoves": [ - "crushclaw" + "name": "Dusk", + "primaryType": "rock", + "maleRatio": 0.5, + "height": 5, + "weight": 92, + "pokedex": [ + "cobblemon.species.rockruff-dusk.desc" ], - "requirements": [ - { - "variant": "level", - "minLevel": 25 - }, + "labels": [ + "gen7" + ], + "aspects": [ + "dusk-form" + ], + "abilities": [ + "owntempo", + "h:owntempo" + ], + "moves": [ + "1:tackle", + "1:leer", + "4:sandattack", + "8:doubleteam", + "12:rockthrow", + "16:howl", + "20:bite", + "24:rocktomb", + "28:roar", + "32:rockslide", + "36:crunch", + "40:scaryface", + "44:stealthrock", + "48:stoneedge", + "egg:endeavor", + "egg:lastresort", + "egg:odorsleuth", + "egg:suckerpunch", + "egg:thrash", + "tm:bodyslam", + "tm:bulldoze", + "tm:charm", + "tm:covet", + "tm:crunch", + "tm:crushclaw", + "tm:dig", + "tm:doubleedge", + "tm:doubleteam", + "tm:earthpower", + "tm:echoedvoice", + "tm:endeavor", + "tm:endure", + "tm:facade", + "tm:firefang", + "tm:helpinghand", + "tm:hypervoice", + "tm:irondefense", + "tm:ironhead", + "tm:irontail", + "tm:lastresort", + "tm:mudslap", + "tm:playrough", + "tm:protect", + "tm:psychicfangs", + "tm:rest", + "tm:roar", + "tm:rockclimb", + "tm:rockpolish", + "tm:rockslide", + "tm:rocktomb", + "tm:sandstorm", + "tm:scaryface", + "tm:sleeptalk", + "tm:snarl", + "tm:stealthrock", + "tm:stompingtantrum", + "tm:stoneedge", + "tm:substitute", + "tm:suckerpunch", + "tm:swordsdance", + "tm:takedown", + "tm:taunt", + "tm:terablast", + "tm:thunderfang", + "tm:trailblaze", + "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:rest", + "tutor:rockslide", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stealthrock", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:suckerpunch", + "tutor:thunderfang", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:confide", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic", + "special:happyhour" + ], + "evolutions": [ { - "variant": "time_range", - "range": "dusk" + "id": "rockruff_lycanrocdusk", + "variant": "level_up", + "result": "lycanroc wolf_form=dusk", + "consumeHeldItem": false, + "learnableMoves": [ + "thrash", + "crushclaw" + ], + "requirements": [ + { + "variant": "level", + "minLevel": 25 + }, + { + "variant": "time_range", + "range": "dusk" + } + ] } - ] + ], + "battleOnly": false } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 92, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:bone", - "quantityRange": "0-1" - }, - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:hard_stone", - "percentage": 2.5 - }, - { - "item": "cobblemon:babiri_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true + ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json b/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json deleted file mode 100644 index 7e422ad20..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/sandygast.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "name": "Sandygast", - "nationalPokedexNumber": 769, - "primaryType": "ghost", - "secondaryType": "ground", - "abilities": [ - "watercompaction", - "h:sandveil" - ], - "baseStats": { - "hp": 55, - "attack": 55, - "defence": 80, - "special_attack": 70, - "special_defence": 45, - "speed": 15 - }, - "catchRate": 140, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 64, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "amorphous" - ], - "moves": [ - "1:absorb", - "1:harden", - "5:astonish", - "10:sandtomb", - "15:megadrain", - "20:sandattack", - "25:bulldoze", - "30:hypnosis", - "35:gigadrain", - "40:irondefense", - "45:shadowball", - "50:earthpower", - "55:shoreup", - "60:sandstorm", - "egg:amnesia", - "egg:ancientpower", - "egg:curse", - "egg:destinybond", - "egg:spitup", - "egg:stockpile", - "egg:swallow", - "tm:amnesia", - "tm:attract", - "tm:brine", - "tm:bulldoze", - "tm:chillingwater", - "tm:confide", - "tm:confuseray", - "tm:curse", - "tm:doubleteam", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:flashcannon", - "tm:fling", - "tm:frustration", - "tm:gigadrain", - "tm:gravity", - "tm:hex", - "tm:hiddenpower", - "tm:imprison", - "tm:infestation", - "tm:irondefense", - "tm:mudshot", - "tm:mudslap", - "tm:nightshade", - "tm:painsplit", - "tm:poltergeist", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:rockpolish", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaryface", - "tm:scorchingsands", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:snore", - "tm:spite", - "tm:stealthrock", - "tm:stoneedge", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:terablast", - "tm:toxic", - "tm:trick", - "tutor:afteryou", - "tutor:block", - "tutor:earthpower", - "tutor:gigadrain", - "tutor:gravity", - "tutor:irondefense", - "tutor:painsplit", - "tutor:poltergeist", - "tutor:recycle", - "tutor:roleplay", - "tutor:scorchingsands", - "tutor:skillswap", - "tutor:snore", - "tutor:spite", - "tutor:stealthrock", - "tutor:trick" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.sandygast.desc" - ], - "evolutions": [ - { - "id": "sandygast_palossand", - "variant": "level_up", - "result": "palossand", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 42 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 5, - "weight": 700, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:soft_sand", - "percentage": 2.5 - }, - { - "item": "cobblemon:passho_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 74d8f8cc2..8d4c9e77d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/silvally.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/silvally.json @@ -1,9 +1,25 @@ { - "name": "Silvally", + "implemented": true, "nationalPokedexNumber": 773, + "name": "Silvally", "primaryType": "normal", + "maleRatio": -1, + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally.desc" + ], + "labels": [ + "gen7", + "legendary" + ], + "aspects": [], "abilities": [ - "rkssystem" + "rkssystem", + "h:rkssystem" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 95, @@ -13,887 +29,2799 @@ "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, - "maleRatio": -1, - "shoulderMountable": false, + "eggCycles": 120, + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "egg:healblock", + "egg:punishment", + "egg:razorwind", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" + ], + "preEvolution": "typenull", + "evolutions": [], "forms": [ { - "name": "Bug", - "primaryType": "bug", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Fighting", + "primaryType": "fighting", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-fighting.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "bug" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "fighting-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Dark", - "primaryType": "dark", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Flying", + "primaryType": "flying", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-flying.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "dark" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "flying-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Dragon", - "primaryType": "dragon", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Poison", + "primaryType": "poison", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-poison.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "dragon" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "poison-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Electric", - "primaryType": "electric", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Ground", + "primaryType": "ground", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-ground.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "electric" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "ground-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Fairy", - "primaryType": "fairy", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Rock", + "primaryType": "rock", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-rock.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "fairy" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "rock-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Fighting", - "primaryType": "fighting", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Bug", + "primaryType": "bug", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-bug.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "fighting" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "bug-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Fire", - "primaryType": "fire", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Ghost", + "primaryType": "ghost", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-ghost.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "fire" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "ghost-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Flying", - "primaryType": "flying", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Steel", + "primaryType": "steel", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-steel.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "flying" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "steel-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Ghost", - "primaryType": "ghost", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Fire", + "primaryType": "fire", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-fire.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "ghost" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "fire-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Grass", - "primaryType": "grass", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Water", + "primaryType": "water", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-water.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "grass" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "water-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Ground", - "primaryType": "ground", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Grass", + "primaryType": "grass", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-grass.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "ground" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "grass-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Ice", - "primaryType": "ice", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Electric", + "primaryType": "electric", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-electric.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "ice" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "electric-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Poison", - "primaryType": "poison", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Psychic", + "primaryType": "psychic", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-psychic.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "poison" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "psychic-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Psychic", - "primaryType": "psychic", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Ice", + "primaryType": "ice", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-ice.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "psychic" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "ice-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Rock", - "primaryType": "rock", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Dragon", + "primaryType": "dragon", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-dragon.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "rock" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "dragon-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Steel", - "primaryType": "steel", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Dark", + "primaryType": "dark", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-dark.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "steel" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "dark-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 }, { - "name": "Water", - "primaryType": "water", - "abilities": [ - "rkssystem" - ], - "baseStats": { - "hp": 95, - "attack": 95, - "defence": 95, - "special_attack": 95, - "special_defence": 95, - "speed": 95 - }, - "catchRate": 3, + "name": "Fairy", + "primaryType": "fairy", "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" + "height": 23, + "weight": 1005, + "pokedex": [ + "cobblemon.species.silvally-fairy.desc" ], "labels": [ "gen7", "legendary" ], "aspects": [ - "water" - ], - "height": 23, - "weight": 1005, - "cannotDynamax": false, + "fairy-memory" + ], + "moves": [ + "1:multiattack", + "1:healblock", + "1:imprison", + "1:ironhead", + "1:poisonfang", + "1:firefang", + "1:icefang", + "1:thunderfang", + "1:tackle", + "1:rage", + "1:pursuit", + "1:bite", + "1:aerialace", + "1:scaryface", + "1:punishment", + "1:razorwind", + "1:explosion", + "15:doublehit", + "20:metalsound", + "25:crushclaw", + "30:airslash", + "35:triattack", + "40:xscissor", + "45:crunch", + "50:takedown", + "55:doubleedge", + "60:partingshot", + "tm:aerialace", + "tm:airslash", + "tm:crunch", + "tm:defog", + "tm:doubleedge", + "tm:dracometeor", + "tm:dragonclaw", + "tm:endure", + "tm:explosion", + "tm:facade", + "tm:firefang", + "tm:flamecharge", + "tm:flamethrower", + "tm:flashcannon", + "tm:gigaimpact", + "tm:grasspledge", + "tm:firepledge", + "tm:waterpledge", + "tm:hail", + "tm:heatwave", + "tm:hyperbeam", + "tm:hypervoice", + "tm:icebeam", + "tm:icefang", + "tm:icywind", + "tm:imprison", + "tm:irondefense", + "tm:ironhead", + "tm:laserfocus", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", + "tm:outrage", + "tm:payback", + "tm:protect", + "tm:psychicfangs", + "tm:raindance", + "tm:rest", + "tm:reversal", + "tm:roar", + "tm:rockslide", + "tm:sandstorm", + "tm:scaryface", + "tm:selfdestruct", + "tm:shadowball", + "tm:shadowclaw", + "tm:signalbeam", + "tm:sleeptalk", + "tm:snarl", + "tm:steelbeam", + "tm:steelwing", + "tm:substitute", + "tm:sunnyday", + "tm:surf", + "tm:swift", + "tm:swordsdance", + "tm:tailwind", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:thunderbolt", + "tm:thunderfang", + "tm:thunderwave", + "tm:triattack", + "tm:uturn", + "tm:workup", + "tm:xscissor", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:defog", + "tutor:dracometeor", + "tutor:firefang", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:grasspledge", + "tutor:firepledge", + "tutor:waterpledge", + "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: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 } ], - "baseExperienceYield": 285, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:aerialace", - "1:bite", - "1:explosion", - "1:firefang", - "1:healblock", - "1:icefang", - "1:imprison", - "1:ironhead", - "1:multiattack", - "1:poisonfang", - "1:scaryface", - "1:tackle", - "1:thunderfang", - "5:rage", - "10:pursuit", - "15:doublehit", - "20:metalsound", - "25:crushclaw", - "30:airslash", - "35:triattack", - "40:xscissor", - "45:crunch", - "50:takedown", - "55:doubleedge", - "60:partingshot", - "65:punishment", - "70:razorwind", - "tm:aerialace", - "tm:airslash", - "tm:confide", - "tm:crunch", - "tm:doubleteam", - "tm:dragonclaw", - "tm:endure", - "tm:explosion", - "tm:facade", - "tm:firefang", - "tm:flamecharge", - "tm:flamethrower", - "tm:flashcannon", - "tm:frustration", - "tm:gigaimpact", - "tm:hail", - "tm:heatwave", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icefang", - "tm:icywind", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:outrage", - "tm:payback", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:roar", - "tm:rockslide", - "tm:round", - "tm:sandstorm", - "tm:scaryface", - "tm:selfdestruct", - "tm:shadowball", - "tm:shadowclaw", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderwave", - "tm:toxic", - "tm:triattack", - "tm:uturn", - "tm:workup", - "tm:xscissor", - "tm:zenheadbutt", - "tutor:defog", - "tutor:dracometeor", - "tutor:grasspledge", - "tutor:heatwave", - "tutor:hypervoice", - "tutor:icywind", - "tutor:irondefense", - "tutor:ironhead", - "tutor:laserfocus", - "tutor:lastresort", - "tutor:magiccoat", - "tutor:multiattack", - "tutor:outrage", - "tutor:partingshot", - "tutor:punishment", - "tutor:scaryface", - "tutor:signalbeam", - "tutor:snore", - "tutor:steelbeam", - "tutor:tailwind", - "tutor:terrainpulse", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.silvally.desc" - ], - "preEvolution": "typenull", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 23, - "weight": 1005, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "3", + "toleratedLeaders": [ + { + "pokemon": "silvally", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 88df87e8b..f0c965a3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/solgaleo.json @@ -1,10 +1,27 @@ { - "name": "Solgaleo", + "implemented": true, "nationalPokedexNumber": 791, + "name": "Solgaleo", "primaryType": "psychic", "secondaryType": "steel", + "maleRatio": -1, + "height": 34, + "weight": 2300, + "pokedex": [ + "cobblemon.species.solgaleo.desc" + ], + "labels": [ + "gen7", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "fullmetalbody" + "fullmetalbody", + "h:fullmetalbody" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 137, @@ -14,22 +31,59 @@ "special_defence": 89, "speed": 97 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 340, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "entityInteract": { + "avoidedByCreeper": true, + "avoidedByPhantom": true + }, + "herd": { + "maxSize": "7" + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, "moves": [ + "1:sunsteelstrike", "1:cosmicpower", + "1:wakeupslap", + "1:teleport", "1:metalclaw", "1:nobleroar", - "1:sunsteelstrike", - "1:teleport", - "1:wakeupslap", + "1:splash", "7:ironhead", "14:metalsound", "21:zenheadbutt", @@ -47,11 +101,9 @@ "tm:bulldoze", "tm:calmmind", "tm:closecombat", - "tm:confide", "tm:cosmicpower", "tm:crunch", "tm:doubleedge", - "tm:doubleteam", "tm:earthquake", "tm:endeavor", "tm:endure", @@ -64,20 +116,19 @@ "tm:flareblitz", "tm:flashcannon", "tm:focusblast", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:gyroball", "tm:heatcrash", "tm:heavyslam", "tm:helpinghand", - "tm:hiddenpower", "tm:hyperbeam", "tm:hypervoice", "tm:irondefense", "tm:ironhead", "tm:irontail", "tm:knockoff", + "tm:lastresort", "tm:lightscreen", "tm:metalclaw", "tm:metalsound", @@ -91,39 +142,39 @@ "tm:psyshock", "tm:reflect", "tm:rest", - "tm:return", "tm:roar", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:safeguard", "tm:scaryface", + "tm:shockwave", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:solarbeam", "tm:steelbeam", + "tm:steelroller", "tm:stoneedge", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:swift", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", "tm:trickroom", "tm:wildcharge", "tm:workup", "tm:zenheadbutt", - "tutor:cosmicpower", - "tutor:crunch", + "tutor:bulldoze", + "tutor:calmmind", "tutor:endeavor", "tutor:expandingforce", - "tutor:firespin", + "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:helpinghand", + "tutor:hyperbeam", "tutor:hypervoice", "tutor:irondefense", "tutor:ironhead", @@ -131,44 +182,33 @@ "tutor:knockoff", "tutor:lastresort", "tutor:meteorbeam", - "tutor:morningsun", - "tutor:nobleroar", + "tutor:mysticalfire", "tutor:outrage", + "tutor:psychic", + "tutor:rest", + "tutor:rockslide", "tutor:shockwave", - "tutor:snore", + "tutor:sleeptalk", + "tutor:snarl", "tutor:steelbeam", "tutor:steelroller", - "tutor:sunsteelstrike", + "tutor:stoneedge", "tutor:superpower", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.solgaleo.desc" + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:zenheadbutt", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:thunderwave", + "legacy:toxic" ], "preEvolution": "cosmoem", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 34, - "weight": 2300, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "evolutions": [] } \ No newline at end of file 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 f71bc140d..a8da2f088 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/stakataka.json @@ -1,10 +1,26 @@ { - "name": "Stakataka", + "implemented": true, "nationalPokedexNumber": 805, + "name": "Stakataka", "primaryType": "rock", "secondaryType": "steel", + "maleRatio": -1, + "height": 55, + "weight": 8200, + "pokedex": [ + "cobblemon.species.stakataka.desc" + ], + "labels": [ + "gen7", + "ultra_beast" + ], + "aspects": [], "abilities": [ - "beastboost" + "beastboost", + "h:beastboost" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 61, @@ -14,22 +30,41 @@ "special_defence": 101, "speed": 13 }, - "catchRate": 30, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 3, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "moves": [ - "1:harden", "1:tackle", + "1:bide", + "1:harden", "5:rockthrow", "10:protect", "15:stomp", - "17:bide", "20:block", "25:rockslide", "30:wideguard", @@ -42,58 +77,67 @@ "65:stealthrock", "70:doubleedge", "tm:allyswitch", + "tm:bind", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:brutalswing", "tm:bulldoze", + "tm:doubleedge", "tm:earthquake", "tm:endure", "tm:facade", "tm:flashcannon", - "tm:frustration", "tm:gigaimpact", + "tm:gravity", "tm:gyroball", "tm:heatcrash", "tm:heavyslam", - "tm:hiddenpower", "tm:highhorsepower", "tm:infestation", "tm:irondefense", "tm:ironhead", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", + "tm:magnetrise", "tm:megakick", + "tm:meteorbeam", "tm:protect", + "tm:recycle", "tm:reflect", "tm:rest", - "tm:return", "tm:rockblast", "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", + "tm:roleplay", "tm:safeguard", "tm:sandstorm", "tm:skillswap", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:stealthrock", + "tm:steelbeam", + "tm:steelroller", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", "tm:superpower", - "tm:toxic", + "tm:takedown", + "tm:telekinesis", + "tm:terablast", "tm:trickroom", "tm:wonderroom", "tm:zenheadbutt", "tutor:allyswitch", - "tutor:autotomize", "tutor:bind", "tutor:block", - "tutor:brutalswing", - "tutor:doubleedge", + "tutor:bulldoze", + "tutor:flashcannon", + "tutor:gigaimpact", "tutor:gravity", + "tutor:highhorsepower", "tutor:irondefense", "tutor:ironhead", "tutor:magiccoat", @@ -101,56 +145,49 @@ "tutor:magnetrise", "tutor:meteorbeam", "tutor:recycle", - "tutor:rockblast", + "tutor:rest", "tutor:rockslide", "tutor:roleplay", "tutor:skillswap", - "tutor:snore", + "tutor:sleeptalk", "tutor:stealthrock", "tutor:steelbeam", "tutor:steelroller", "tutor:stompingtantrum", + "tutor:stoneedge", "tutor:superpower", "tutor:telekinesis", - "tutor:wideguard", "tutor:wonderroom", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "ultra_beast" - ], - "pokedex": [ - "cobblemon.species.stakataka.desc" + "tutor:zenheadbutt", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 55, - "weight": 8200, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:echo_shard", - "quantityRange": "1-3" + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false + }, + "fly": { + "canFly": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 2566f9686..b6f09c765 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapubulu.json @@ -1,12 +1,27 @@ { - "name": "Tapu Bulu", + "implemented": true, "nationalPokedexNumber": 787, + "name": "Tapu Bulu", "primaryType": "grass", "secondaryType": "fairy", + "maleRatio": -1, + "height": 19, + "weight": 455, + "pokedex": [ + "cobblemon.species.tapubulu.desc" + ], + "labels": [ + "gen7", + "legendary" + ], + "aspects": [], "abilities": [ "grassysurge", "h:telepathy" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 70, "attack": 130, @@ -15,28 +30,36 @@ "special_defence": 95, "speed": 75 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 15, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ "1:leafage", + "1:rototiller", "1:rocksmash", - "1:superpower", "5:withdraw", "10:disable", - "14:gigadrain", "15:leechseed", "20:megadrain", "25:whirlwind", "30:hornattack", "35:scaryface", - "38:rototiller", "40:hornleech", "45:zenheadbutt", "50:meanlook", @@ -51,9 +74,9 @@ "tm:bulletseed", "tm:calmmind", "tm:closecombat", - "tm:confide", "tm:darkestlariat", "tm:dazzlinggleam", + "tm:dualchop", "tm:echoedvoice", "tm:endure", "tm:energyball", @@ -61,13 +84,12 @@ "tm:falseswipe", "tm:fling", "tm:focusblast", - "tm:frustration", + "tm:focuspunch", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", "tm:grassyterrain", "tm:guardswap", - "tm:hiddenpower", "tm:highhorsepower", "tm:hyperbeam", "tm:irondefense", @@ -81,75 +103,87 @@ "tm:psychup", "tm:reflect", "tm:rest", - "tm:return", "tm:revenge", "tm:roar", "tm:rockslide", + "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:safeguard", "tm:scaryface", "tm:seedbomb", "tm:sleeptalk", "tm:smartstrike", "tm:snarl", - "tm:snore", "tm:solarbeam", "tm:stoneedge", "tm:storedpower", "tm:substitute", "tm:sunnyday", "tm:superpower", - "tm:swagger", "tm:swordsdance", + "tm:synthesis", "tm:taunt", + "tm:telekinesis", + "tm:terablast", "tm:torment", - "tm:toxic", "tm:workup", + "tm:worryseed", "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:naturesmadness", - "tutor:scaryface", + "tutor:rest", + "tutor:rockslide", + "tutor:rocksmash", "tutor:seedbomb", - "tutor:skullbash", - "tutor:snore", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stoneedge", "tutor:superpower", "tutor:synthesis", "tutor:telekinesis", - "tutor:woodhammer", "tutor:worryseed", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.tapubulu.desc" + "tutor:zenheadbutt", + "legacy:confide", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 19, - "weight": 455, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 3479f57c4..089ea6f68 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapufini.json @@ -1,12 +1,27 @@ { - "name": "Tapu Fini", + "implemented": true, "nationalPokedexNumber": 788, + "name": "Tapu Fini", "primaryType": "water", "secondaryType": "fairy", + "maleRatio": -1, + "height": 13, + "weight": 212, + "pokedex": [ + "cobblemon.species.tapufini.desc" + ], + "labels": [ + "gen7", + "legendary" + ], + "aspects": [], "abilities": [ "mistysurge", "h:telepathy" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 70, "attack": 75, @@ -15,26 +30,35 @@ "special_defence": 130, "speed": 85 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 3, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 15, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:disarmingvoice", "1:watergun", + "1:refresh", + "1:disarmingvoice", "5:withdraw", "10:haze", "10:mist", - "14:whirlpool", "15:aquaring", "20:waterpulse", "25:brine", - "26:refresh", "30:defog", "35:healpulse", "40:surf", @@ -48,27 +72,29 @@ "tm:blizzard", "tm:brine", "tm:calmmind", - "tm:confide", "tm:dazzlinggleam", + "tm:defog", + "tm:disarmingvoice", "tm:dive", - "tm:doubleteam", "tm:drainingkiss", "tm:echoedvoice", "tm:endure", "tm:facade", "tm:fling", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", + "tm:gravity", "tm:guardswap", - "tm:hiddenpower", + "tm:haze", "tm:hydropump", "tm:hyperbeam", "tm:icebeam", "tm:icepunch", "tm:icywind", "tm:irondefense", + "tm:knockoff", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:mistyterrain", "tm:muddywater", @@ -79,72 +105,76 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", "tm:scald", "tm:shadowball", "tm:sleeptalk", "tm:smartstrike", - "tm:snore", "tm:storedpower", "tm:substitute", "tm:surf", - "tm:swagger", "tm:taunt", + "tm:telekinesis", + "tm:terablast", "tm:torment", - "tm:toxic", "tm:trick", "tm:waterfall", + "tm:waterpulse", "tm:whirlpool", "tm:wonderroom", - "tutor:aquaring", - "tutor:brine", + "tutor:calmmind", + "tutor:dazzlinggleam", "tutor:defog", + "tutor:dive", + "tutor:gigaimpact", "tutor:gravity", - "tutor:hydropump", + "tutor:hyperbeam", + "tutor:icebeam", "tutor:icepunch", "tutor:icywind", "tutor:irondefense", "tutor:knockoff", "tutor:magiccoat", "tutor:magicroom", - "tutor:moonblast", - "tutor:muddywater", - "tutor:naturesmadness", - "tutor:snore", + "tutor:playrough", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", "tutor:telekinesis", "tutor:trick", "tutor:waterpulse", - "tutor:whirlpool", - "tutor:wonderroom" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.tapufini.desc" + "tutor:wonderroom", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 13, - "weight": 212, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "canBreatheUnderwater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 0bf396544..e22a3e1ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapukoko.json @@ -1,12 +1,27 @@ { - "name": "Tapu Koko", + "implemented": true, "nationalPokedexNumber": 785, + "name": "Tapu Koko", "primaryType": "electric", "secondaryType": "fairy", + "maleRatio": -1, + "height": 18, + "weight": 205, + "pokedex": [ + "cobblemon.species.tapukoko.desc" + ], + "labels": [ + "gen7", + "legendary" + ], + "aspects": [], "abilities": [ "electricsurge", "h:telepathy" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 70, "attack": 115, @@ -15,18 +30,29 @@ "special_defence": 75, "speed": 130 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 3 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 15, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ "1:quickattack", "1:thundershock", + "1:mirrormove", "5:withdraw", "10:fairywind", "15:falseswipe", @@ -34,12 +60,10 @@ "25:shockwave", "30:charge", "35:agility", - "38:mirrormove", "40:screech", "45:discharge", "50:meanlook", "55:naturesmadness", - "58:electroball", "60:wildcharge", "65:bravebird", "70:powerswap", @@ -50,9 +74,9 @@ "tm:assurance", "tm:bravebird", "tm:calmmind", - "tm:confide", + "tm:charge", "tm:dazzlinggleam", - "tm:doubleteam", + "tm:defog", "tm:echoedvoice", "tm:eerieimpulse", "tm:electricterrain", @@ -62,10 +86,8 @@ "tm:facade", "tm:falseswipe", "tm:fly", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", - "tm:hiddenpower", "tm:hyperbeam", "tm:hypervoice", "tm:irondefense", @@ -78,79 +100,83 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", "tm:roar", "tm:roost", - "tm:round", "tm:safeguard", "tm:screech", + "tm:shockwave", + "tm:skyattack", "tm:skydrop", "tm:sleeptalk", - "tm:snore", "tm:steelwing", "tm:storedpower", "tm:substitute", - "tm:swagger", "tm:swift", "tm:taunt", + "tm:telekinesis", + "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", "tm:torment", - "tm:toxic", "tm:uturn", "tm:voltswitch", "tm:wildcharge", "tm:workup", - "tutor:agility", - "tutor:bravebird", + "tutor:aerialace", + "tutor:calmmind", "tutor:dazzlinggleam", "tutor:defog", - "tutor:discharge", - "tutor:electroball", "tutor:electroweb", + "tutor:falseswipe", + "tutor:gigaimpact", + "tutor:hyperbeam", "tutor:hypervoice", "tutor:irondefense", "tutor:ironhead", - "tutor:naturesmadness", - "tutor:quickattack", + "tutor:rest", + "tutor:roost", "tutor:shockwave", "tutor:skyattack", - "tutor:snore", - "tutor:taunt", + "tutor:sleeptalk", + "tutor:swift", "tutor:telekinesis", "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:voltswitch" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.tapukoko.desc" + "tutor:wildcharge", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, - "height": 18, - "weight": 205, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 e8bcd7f32..cb5174189 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/tapulele.json @@ -1,12 +1,27 @@ { - "name": "Tapu Lele", + "implemented": true, "nationalPokedexNumber": 786, + "name": "Tapu Lele", "primaryType": "psychic", "secondaryType": "fairy", + "maleRatio": -1, + "height": 12, + "weight": 186, + "pokedex": [ + "cobblemon.species.tapulele.desc" + ], + "labels": [ + "gen7", + "legendary" + ], + "aspects": [], "abilities": [ "psychicsurge", "h:telepathy" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 70, "attack": 85, @@ -15,20 +30,30 @@ "special_defence": 115, "speed": 95 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 15, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ "1:astonish", "1:confusion", + "1:psywave", "5:withdraw", - "8:psywave", "10:aromatherapy", "15:drainingkiss", "20:psybeam", @@ -47,9 +72,7 @@ "tm:calmmind", "tm:chargebeam", "tm:charm", - "tm:confide", "tm:dazzlinggleam", - "tm:doubleteam", "tm:drainingkiss", "tm:echoedvoice", "tm:endure", @@ -57,20 +80,21 @@ "tm:facade", "tm:fling", "tm:focusblast", - "tm:frustration", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", + "tm:gravity", "tm:guardswap", - "tm:hiddenpower", "tm:hyperbeam", "tm:irondefense", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:naturepower", "tm:playrough", "tm:powerswap", "tm:protect", + "tm:psybeam", "tm:psychic", "tm:psychicterrain", "tm:psychocut", @@ -78,68 +102,74 @@ "tm:psyshock", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", "tm:safeguard", "tm:shadowball", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:speedswap", "tm:storedpower", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:taunt", + "tm:telekinesis", + "tm:terablast", "tm:thief", "tm:thunder", "tm:thunderbolt", "tm:torment", - "tm:toxic", "tm:wonderroom", "tutor:allyswitch", - "tutor:charm", - "tutor:extrasensory", - "tutor:flatter", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", + "tutor:energyball", + "tutor:gigaimpact", "tutor:gravity", + "tutor:hyperbeam", "tutor:irondefense", "tutor:magiccoat", "tutor:magicroom", - "tutor:moonblast", - "tutor:naturesmadness", "tutor:playrough", "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:shadowball", "tutor:skillswap", - "tutor:snore", + "tutor:sleeptalk", "tutor:telekinesis", - "tutor:wonderroom" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.tapulele.desc" + "tutor:thunderbolt", + "tutor:wonderroom", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 12, - "weight": 186, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 deleted file mode 100644 index 6d191cabe..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/togedemaru.json +++ /dev/null @@ -1,271 +0,0 @@ -{ - "name": "Togedemaru", - "nationalPokedexNumber": 777, - "primaryType": "electric", - "secondaryType": "steel", - "abilities": [ - "ironbarbs", - "lightningrod", - "h:sturdy" - ], - "baseStats": { - "hp": 65, - "attack": 98, - "defence": 63, - "special_attack": 40, - "special_defence": 73, - "speed": 96 - }, - "catchRate": 180, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Totem", - "primaryType": "electric", - "secondaryType": "steel", - "abilities": [ - "sturdy" - ], - "baseStats": { - "hp": 65, - "attack": 98, - "defence": 63, - "special_attack": 40, - "special_defence": 73, - "speed": 96 - }, - "catchRate": 180, - "maleRatio": 0.5, - "baseExperienceYield": 152, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "field", - "fairy" - ], - "moves": [ - "1:tackle", - "1:thundershock", - "5:defensecurl", - "9:rollout", - "13:charge", - "17:spark", - "21:nuzzle", - "25:magnetrise", - "29:discharge", - "33:zingzap", - "37:electricterrain", - "41:wildcharge", - "45:pinmissile", - "49:spikyshield", - "53:fellstinger", - "tm:attract", - "tm:chargebeam", - "tm:confide", - "tm:doubleteam", - "tm:facade", - "tm:fling", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:gyroball", - "tm:hiddenpower", - "tm:payback", - "tm:poisonjab", - "tm:protect", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:round", - "tm:sleeptalk", - "tm:substitute", - "tm:swagger", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:uturn", - "tm:voltswitch", - "tm:wildcharge", - "tm:workup", - "tutor:afteryou", - "tutor:bounce", - "tutor:covet", - "tutor:discharge", - "tutor:electroweb", - "tutor:endeavor", - "tutor:gravity", - "tutor:helpinghand", - "tutor:ironhead", - "tutor:irontail", - "tutor:lastresort", - "tutor:magnetrise", - "tutor:nuzzle", - "tutor:roleplay", - "tutor:shockwave", - "tutor:snore", - "tutor:superfang", - "tutor:zenheadbutt", - "tutor:zingzap" - ], - "labels": [ - "gen7", - "totem" - ], - "aspects": [ - "totem" - ], - "height": 6, - "weight": 130, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 152, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "field", - "fairy" - ], - "moves": [ - "1:nuzzle", - "1:tackle", - "5:defensecurl", - "9:rollout", - "10:charge", - "15:thundershock", - "20:fellstinger", - "25:spark", - "30:pinmissile", - "35:magnetrise", - "40:zingzap", - "45:discharge", - "50:electricterrain", - "55:wildcharge", - "60:spikyshield", - "egg:disarmingvoice", - "egg:encore", - "egg:fakeout", - "egg:flail", - "egg:present", - "egg:reversal", - "egg:tickle", - "egg:twineedle", - "egg:wish", - "tm:agility", - "tm:assurance", - "tm:attract", - "tm:bounce", - "tm:chargebeam", - "tm:confide", - "tm:doubleteam", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:frustration", - "tm:gigaimpact", - "tm:grassknot", - "tm:gyroball", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:ironhead", - "tm:irontail", - "tm:payback", - "tm:pinmissile", - "tm:poisonjab", - "tm:protect", - "tm:reflect", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:swagger", - "tm:swift", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:uturn", - "tm:voltswitch", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt", - "tutor:afteryou", - "tutor:bounce", - "tutor:covet", - "tutor:electroweb", - "tutor:endeavor", - "tutor:gravity", - "tutor:helpinghand", - "tutor:ironhead", - "tutor:irontail", - "tutor:lastresort", - "tutor:magnetrise", - "tutor:risingvoltage", - "tutor:roleplay", - "tutor:shockwave", - "tutor:snore", - "tutor:steelbeam", - "tutor:steelroller", - "tutor:superfang", - "tutor:zenheadbutt" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.togedemaru.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 33, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:shuca_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json b/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json deleted file mode 100644 index a6177febf..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/toucannon.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "name": "Toucannon", - "nationalPokedexNumber": 733, - "primaryType": "normal", - "secondaryType": "flying", - "abilities": [ - "keeneye", - "skilllink", - "h:sheerforce" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 75, - "special_attack": 75, - "special_defence": 75, - "speed": 60 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 218, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "flying" - ], - "moves": [ - "1:beakblast", - "1:echoedvoice", - "1:growl", - "1:peck", - "1:rockblast", - "1:rocksmash", - "13:supersonic", - "16:pluck", - "21:roost", - "24:furyattack", - "30:screech", - "34:drillpeck", - "40:bulletseed", - "44:featherdance", - "50:hypervoice", - "tm:acrobatics", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:attract", - "tm:bravebird", - "tm:brickbreak", - "tm:bulletseed", - "tm:confide", - "tm:doubleteam", - "tm:dualwingbeat", - "tm:echoedvoice", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:flamecharge", - "tm:flashcannon", - "tm:fly", - "tm:frustration", - "tm:gigaimpact", - "tm:gunkshot", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:knockoff", - "tm:overheat", - "tm:protect", - "tm:psychup", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:roost", - "tm:round", - "tm:scaryface", - "tm:seedbomb", - "tm:sleeptalk", - "tm:smackdown", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:toxic", - "tm:uproar", - "tm:uturn", - "tm:workup", - "tutor:defog", - "tutor:gunkshot", - "tutor:heatwave", - "tutor:hypervoice", - "tutor:knockoff", - "tutor:seedbomb", - "tutor:skyattack", - "tutor:snore", - "tutor:tailwind", - "tutor:uproar" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.toucannon.desc" - ], - "preEvolution": "trumbeak", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 260, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-3" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:sharp_beak", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json b/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json deleted file mode 100644 index 6e52e4aee..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/toxapex.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "name": "Toxapex", - "nationalPokedexNumber": 748, - "primaryType": "poison", - "secondaryType": "water", - "abilities": [ - "merciless", - "limber", - "h:regenerator" - ], - "baseStats": { - "hp": 50, - "attack": 63, - "defence": 152, - "special_attack": 53, - "special_defence": 142, - "speed": 35 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 173, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1" - ], - "moves": [ - "1:banefulbunker", - "1:bite", - "1:peck", - "1:poisonsting", - "1:wideguard", - "15:venoshock", - "20:recover", - "25:pinmissile", - "29:spikecannon", - "30:toxicspikes", - "35:liquidation", - "42:acidspray", - "42:venomdrench", - "49:poisonjab", - "56:toxic", - "tm:acidspray", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:chillingwater", - "tm:confide", - "tm:crosspoison", - "tm:doubleteam", - "tm:endure", - "tm:facade", - "tm:frostbreath", - "tm:frustration", - "tm:gigaimpact", - "tm:gunkshot", - "tm:hail", - "tm:haze", - "tm:hex", - "tm:hiddenpower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icespinner", - "tm:icywind", - "tm:infestation", - "tm:irondefense", - "tm:lightscreen", - "tm:liquidation", - "tm:lunge", - "tm:muddywater", - "tm:mudshot", - "tm:painsplit", - "tm:payback", - "tm:pinmissile", - "tm:poisonjab", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:round", - "tm:safeguard", - "tm:scald", - "tm:scaryface", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:smackdown", - "tm:snore", - "tm:substitute", - "tm:surf", - "tm:swagger", - "tm:terablast", - "tm:toxic", - "tm:toxicspikes", - "tm:venomdrench", - "tm:venoshock", - "tm:waterpulse", - "tutor:afteryou", - "tutor:block", - "tutor:covet", - "tutor:gastroacid", - "tutor:gunkshot", - "tutor:icywind", - "tutor:irondefense", - "tutor:knockoff", - "tutor:liquidation", - "tutor:magiccoat", - "tutor:painsplit", - "tutor:snatch", - "tutor:snore", - "tutor:spite", - "tutor:waterpulse" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.toxapex.desc" - ], - "preEvolution": "mareanie", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 7, - "weight": 145, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:slime_ball", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:poison_barb", - "percentage": 5.0 - }, - { - "item": "cobblemon:pecha_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json b/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json deleted file mode 100644 index ec0af974f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/trumbeak.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "name": "Trumbeak", - "nationalPokedexNumber": 732, - "primaryType": "normal", - "secondaryType": "flying", - "abilities": [ - "keeneye", - "skilllink", - "h:pickup" - ], - "baseStats": { - "hp": 55, - "attack": 85, - "defence": 50, - "special_attack": 40, - "special_defence": 50, - "speed": 75 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 124, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "flying" - ], - "moves": [ - "1:echoedvoice", - "1:growl", - "1:peck", - "1:rockblast", - "1:rocksmash", - "13:supersonic", - "16:pluck", - "21:roost", - "24:furyattack", - "29:screech", - "32:drillpeck", - "37:bulletseed", - "40:featherdance", - "45:hypervoice", - "tm:acrobatics", - "tm:aerialace", - "tm:aircutter", - "tm:airslash", - "tm:attract", - "tm:bravebird", - "tm:brickbreak", - "tm:bulletseed", - "tm:confide", - "tm:doubleteam", - "tm:dualwingbeat", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:flamecharge", - "tm:fly", - "tm:frustration", - "tm:gunkshot", - "tm:heatwave", - "tm:helpinghand", - "tm:hiddenpower", - "tm:hypervoice", - "tm:knockoff", - "tm:protect", - "tm:rest", - "tm:return", - "tm:rockblast", - "tm:roost", - "tm:round", - "tm:sleeptalk", - "tm:smackdown", - "tm:steelwing", - "tm:substitute", - "tm:sunnyday", - "tm:swagger", - "tm:swift", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:toxic", - "tm:uproar", - "tm:uturn", - "tm:workup", - "tutor:defog", - "tutor:gunkshot", - "tutor:heatwave", - "tutor:hypervoice", - "tutor:knockoff", - "tutor:skyattack", - "tutor:snore", - "tutor:tailwind", - "tutor:uproar" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.trumbeak.desc" - ], - "preEvolution": "pikipek", - "evolutions": [ - { - "id": "trumbeak_toucannon", - "variant": "level_up", - "result": "toucannon", - "consumeHeldItem": false, - "learnableMoves": [ - "beakblast" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 28 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 148, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-2" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:sharp_beak", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ 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 45064c538..9d9d2fc58 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/typenull.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/typenull.json @@ -1,9 +1,25 @@ { - "name": "Type: Null", + "implemented": true, "nationalPokedexNumber": 772, + "name": "Type: Null", "primaryType": "normal", + "maleRatio": -1, + "height": 19, + "weight": 1205, + "pokedex": [ + "cobblemon.species.typenull.desc" + ], + "labels": [ + "gen7", + "legendary" + ], + "aspects": [], "abilities": [ - "battlearmor" + "battlearmor", + "h:battlearmor" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 95, @@ -13,21 +29,31 @@ "special_defence": 95, "speed": 59 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 2, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 107, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:imprison", "1:tackle", + "1:rage", + "1:pursuit", + "1:imprison", "5:aerialace", - "5:rage", - "10:pursuit", "10:scaryface", "15:doublehit", "20:metalsound", @@ -38,73 +64,74 @@ "45:ironhead", "50:takedown", "55:doubleedge", - "65:punishment", - "70:razorwind", - "85:healblock", + "egg:healblock", + "egg:punishment", + "egg:razorwind", "tm:aerialace", "tm:airslash", - "tm:confide", - "tm:doubleteam", + "tm:doubleedge", "tm:dragonclaw", "tm:endure", "tm:facade", "tm:flamecharge", - "tm:frustration", "tm:gigaimpact", "tm:hail", - "tm:hiddenpower", "tm:hyperbeam", "tm:icywind", "tm:imprison", "tm:irondefense", "tm:ironhead", + "tm:lastresort", + "tm:magiccoat", + "tm:metalsound", "tm:payback", "tm:protect", "tm:raindance", "tm:rest", - "tm:return", "tm:roar", "tm:rockslide", - "tm:round", "tm:sandstorm", "tm:scaryface", "tm:shadowclaw", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:substitute", "tm:sunnyday", - "tm:swagger", "tm:swift", "tm:swordsdance", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", "tm:thunderwave", - "tm:toxic", "tm:triattack", "tm:uturn", "tm:workup", "tm:xscissor", - "tutor:airslash", - "tutor:crushclaw", - "tutor:doublehit", + "tutor:aerialace", + "tutor:gigaimpact", + "tutor:hyperbeam", "tutor:icywind", "tutor:irondefense", "tutor:ironhead", "tutor:lastresort", "tutor:magiccoat", - "tutor:metalsound", - "tutor:scaryface", + "tutor:rest", + "tutor:rockslide", + "tutor:shadowclaw", "tutor:signalbeam", - "tutor:snore", - "tutor:takedown", + "tutor:sleeptalk", + "tutor:swift", "tutor:terrainpulse", - "tutor:triattack", - "tutor:xscissor" - ], - "labels": [ - "gen7", - "legendary" - ], - "pokedex": [ - "cobblemon.species.typenull.desc" + "tutor:xscissor", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [ { @@ -123,24 +150,33 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 19, - "weight": 1205, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "typenull", + "tier": 1 + }, + { + "pokemon": "silvally", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 064c78151..9cf384076 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/vikavolt.json @@ -1,10 +1,25 @@ { - "name": "Vikavolt", + "implemented": true, "nationalPokedexNumber": 738, + "name": "Vikavolt", "primaryType": "bug", "secondaryType": "electric", + "maleRatio": 0.5, + "height": 15, + "weight": 450, + "pokedex": [ + "cobblemon.species.vikavolt.desc" + ], + "labels": [ + "gen7" + ], + "aspects": [], "abilities": [ - "levitate" + "levitate", + "h:levitate" + ], + "eggGroups": [ + "bug" ], "baseStats": { "hp": 77, @@ -14,137 +29,53 @@ "special_defence": 75, "speed": 43 }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Totem", - "primaryType": "bug", - "secondaryType": "electric", - "abilities": [ - "levitate" - ], - "baseStats": { - "hp": 77, - "attack": 70, - "defence": 90, - "special_attack": 145, - "special_defence": 75, - "speed": 43 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 250, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:airslash", - "1:bite", - "1:charge", - "1:mudslap", - "1:stringshot", - "1:thunderbolt", - "1:visegrip", - "13:bugbite", - "16:spark", - "19:acrobatics", - "25:guillotine", - "31:bugbuzz", - "37:dig", - "41:zapcannon", - "49:agility", - "tm:acrobatics", - "tm:attract", - "tm:chargebeam", - "tm:confide", - "tm:doubleteam", - "tm:energyball", - "tm:facade", - "tm:flashcannon", - "tm:frustration", - "tm:gigaimpact", - "tm:hiddenpower", - "tm:hyperbeam", - "tm:lightscreen", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:roost", - "tm:round", - "tm:skydrop", - "tm:sleeptalk", - "tm:solarbeam", - "tm:substitute", - "tm:swagger", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:voltswitch", - "tm:wildcharge", - "tm:xscissor", - "tutor:acrobatics", - "tutor:bugbite", - "tutor:bugbuzz", - "tutor:electroweb", - "tutor:guillotine", - "tutor:irondefense", - "tutor:laserfocus", - "tutor:magnetrise", - "tutor:shockwave", - "tutor:signalbeam", - "tutor:snore", - "tutor:spark" - ], - "labels": [ - "gen7", - "totem" - ], - "aspects": [ - "totem" - ], - "height": 26, - "weight": 1475, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 250, "experienceGroup": "medium_fast", + "catchRate": 45, "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:wepear_berry", + "percentage": 10.0 + }, + { + "item": "cobblemon:cell_battery", + "percentage": 10.0 + } + ] + }, "moves": [ + "1:thunderbolt", "1:airslash", - "1:bugbite", "1:charge", - "1:crunch", + "1:visegrip", + "1:stringshot", + "1:mudslap", + "1:bugbite", + "1:acrobatics", "1:dig", - "1:discharge", "1:irondefense", - "1:mudslap", - "1:stringshot", - "1:thunderbolt", - "1:visegrip", "1:xscissor", + "1:crunch", + "1:discharge", "15:bite", - "19:acrobatics", "23:spark", "29:stickyweb", "36:bugbuzz", @@ -152,20 +83,19 @@ "50:fly", "57:agility", "64:zapcannon", + "egg:discharge", + "egg:harden", "tm:acrobatics", "tm:agility", "tm:airslash", - "tm:attract", "tm:batonpass", "tm:bugbite", "tm:bugbuzz", "tm:bulldoze", "tm:charge", "tm:chargebeam", - "tm:confide", "tm:crunch", "tm:dig", - "tm:doubleteam", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -175,13 +105,13 @@ "tm:facade", "tm:flashcannon", "tm:fly", - "tm:frustration", "tm:gigaimpact", - "tm:hiddenpower", "tm:hyperbeam", "tm:irondefense", + "tm:laserfocus", "tm:lightscreen", "tm:lunge", + "tm:magnetrise", "tm:mudshot", "tm:mudslap", "tm:poisonjab", @@ -189,76 +119,87 @@ "tm:protect", "tm:raindance", "tm:rest", - "tm:return", + "tm:risingvoltage", "tm:roost", - "tm:round", "tm:screech", + "tm:shockwave", + "tm:signalbeam", "tm:skittersmack", "tm:skydrop", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", + "tm:stringshot", "tm:strugglebug", "tm:substitute", "tm:supercellslam", - "tm:swagger", "tm:swift", "tm:takedown", "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", "tm:voltswitch", "tm:wildcharge", "tm:xscissor", "tutor:bugbite", - "tutor:dualwingbeat", + "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:snore" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.vikavolt.desc" + "tutor:sleeptalk", + "tutor:stringshot", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge", + "tutor:xscissor", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:dualwingbeat", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "preEvolution": "charjabug", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 450, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:wepear_berry", - "percentage": 10.0 + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 02ad03737..64f76d323 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/xurkitree.json @@ -1,9 +1,25 @@ { - "name": "Xurkitree", + "implemented": true, "nationalPokedexNumber": 796, + "name": "Xurkitree", "primaryType": "electric", + "maleRatio": -1, + "height": 38, + "weight": 1000, + "pokedex": [ + "cobblemon.species.xurkitree.desc" + ], + "labels": [ + "gen7", + "ultra_beast" + ], + "aspects": [], "abilities": [ - "beastboost" + "beastboost", + "h:beastboost" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 83, @@ -13,26 +29,45 @@ "special_defence": 71, "speed": 83 }, - "catchRate": 45, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:echo_shard", + "quantityRange": "1-3" + } + ] + }, "moves": [ "1:tailglow", - "1:thundershock", "1:wrap", + "1:thundershock", + "1:iondeluge", "5:charge", "10:thunderwave", "15:ingrain", "20:spark", "25:shockwave", "30:hypnosis", - "31:signalbeam", "35:eerieimpulse", "40:thunderpunch", "45:discharge", @@ -40,14 +75,13 @@ "55:thunderbolt", "60:electricterrain", "65:powerwhip", - "67:iondeluge", "70:zapcannon", + "tm:bind", "tm:brutalswing", "tm:calmmind", + "tm:charge", "tm:chargebeam", - "tm:confide", "tm:dazzlinggleam", - "tm:doubleteam", "tm:eerieimpulse", "tm:electricterrain", "tm:electroball", @@ -56,85 +90,84 @@ "tm:energyball", "tm:facade", "tm:fling", - "tm:frustration", "tm:gigaimpact", "tm:grassknot", - "tm:hiddenpower", + "tm:gravity", "tm:hyperbeam", "tm:lightscreen", + "tm:magiccoat", + "tm:magnetrise", "tm:naturepower", "tm:powerwhip", "tm:protect", "tm:raindance", "tm:reflect", "tm:rest", - "tm:return", - "tm:round", + "tm:risingvoltage", + "tm:shockwave", + "tm:signalbeam", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:substitute", "tm:sunnyday", - "tm:swagger", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:voltswitch", "tm:wildcharge", "tutor:bind", - "tutor:brutalswing", - "tutor:discharge", - "tutor:eerieimpulse", - "tutor:electricterrain", + "tutor:calmmind", + "tutor:chargebeam", + "tutor:dazzlinggleam", "tutor:electroweb", + "tutor:energyball", + "tutor:gigaimpact", "tutor:gravity", - "tutor:hypnosis", + "tutor:hyperbeam", "tutor:magiccoat", "tutor:magnetrise", - "tutor:powerwhip", + "tutor:rest", "tutor:risingvoltage", "tutor:shockwave", "tutor:signalbeam", - "tutor:snore", - "tutor:thunderpunch" - ], - "labels": [ - "gen7", - "ultra_beast" - ], - "pokedex": [ - "cobblemon.species.xurkitree.desc" + "tutor:sleeptalk", + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 38, - "weight": 1000, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:echo_shard", - "quantityRange": "1-3" + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true } - ] + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } }, - "implemented": true + "lightingData": { + "lightLevel": 15, + "liquidGlowMode": "BOTH" + } } \ 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 deleted file mode 100644 index c87fee5f7..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation7/yungoos.json +++ /dev/null @@ -1,165 +0,0 @@ -{ - "name": "Yungoos", - "nationalPokedexNumber": 734, - "primaryType": "normal", - "abilities": [ - "stakeout", - "strongjaw", - "h:adaptability" - ], - "baseStats": { - "hp": 48, - "attack": 70, - "defence": 30, - "special_attack": 30, - "special_defence": 30, - "speed": 45 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 51, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:tackle", - "3:leer", - "7:payback", - "7:pursuit", - "10:sandattack", - "13:odorsleuth", - "13:workup", - "16:bide", - "19:bite", - "22:mudslap", - "25:superfang", - "28:takedown", - "31:scaryface", - "34:crunch", - "37:hyperfang", - "37:yawn", - "40:thrash", - "43:rest", - "egg:endeavor", - "egg:firefang", - "egg:icefang", - "egg:lastresort", - "egg:revenge", - "egg:thunderfang", - "tm:attract", - "tm:bulldoze", - "tm:chillingwater", - "tm:confide", - "tm:crunch", - "tm:dig", - "tm:doubleedge", - "tm:doubleteam", - "tm:earthquake", - "tm:echoedvoice", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:frustration", - "tm:helpinghand", - "tm:hiddenpower", - "tm:icefang", - "tm:mudshot", - "tm:mudslap", - "tm:payback", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:return", - "tm:reversal", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:swagger", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thunderfang", - "tm:torment", - "tm:toxic", - "tm:trailblaze", - "tm:uturn", - "tm:wildcharge", - "tm:workup", - "tm:zenheadbutt", - "tutor:endeavor", - "tutor:irontail", - "tutor:lastresort", - "tutor:shockwave", - "tutor:snore", - "tutor:stompingtantrum", - "tutor:superfang", - "tutor:uproar" - ], - "labels": [ - "gen7" - ], - "pokedex": [ - "cobblemon.species.yungoos.desc" - ], - "evolutions": [ - { - "id": "yungoos_gumshoos", - "variant": "level_up", - "result": "gumshoos", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 20 - }, - { - "variant": "time_range", - "range": "day" - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 70, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 60, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:pecha_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 297a4472f..4439908c8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/zeraora.json @@ -1,9 +1,25 @@ { - "name": "Zeraora", + "implemented": true, "nationalPokedexNumber": 807, + "name": "Zeraora", "primaryType": "electric", + "maleRatio": -1, + "height": 15, + "weight": 445, + "pokedex": [ + "cobblemon.species.zeraora.desc" + ], + "labels": [ + "gen7", + "mythical" + ], + "aspects": [], "abilities": [ - "voltabsorb" + "voltabsorb", + "h:voltabsorb" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 88, @@ -13,22 +29,52 @@ "special_defence": 80, "speed": 143 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 3 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "entityInteract": { + "avoidedByCreeper": true, + "avoidedByPhantom": true + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, "moves": [ - "1:fakeout", - "1:poweruppunch", - "1:quickattack", "1:scratch", - "1:snarl", "1:spark", + "1:quickattack", + "1:snarl", + "1:fakeout", + "1:poweruppunch", "8:furyswipes", "16:quickguard", "24:slash", @@ -52,27 +98,31 @@ "tm:brutalswing", "tm:bulkup", "tm:calmmind", + "tm:charge", "tm:closecombat", - "tm:confide", - "tm:doubleteam", + "tm:coaching", "tm:drainpunch", + "tm:dualchop", "tm:echoedvoice", "tm:electricterrain", "tm:electroball", "tm:electroweb", + "tm:endeavor", "tm:endure", "tm:facade", "tm:falseswipe", "tm:firepunch", "tm:fling", "tm:focusblast", - "tm:frustration", + "tm:focuspunch", "tm:gigaimpact", "tm:grassknot", "tm:helpinghand", - "tm:hiddenpower", + "tm:honeclaws", "tm:hyperbeam", "tm:irontail", + "tm:knockoff", + "tm:laserfocus", "tm:lowkick", "tm:lowsweep", "tm:megakick", @@ -80,81 +130,71 @@ "tm:outrage", "tm:payday", "tm:playrough", + "tm:poweruppunch", "tm:protect", "tm:rest", - "tm:return", "tm:revenge", "tm:reversal", - "tm:round", + "tm:risingvoltage", "tm:scaryface", + "tm:shockwave", "tm:sleeptalk", "tm:snarl", - "tm:snore", + "tm:snatch", "tm:substitute", "tm:superpower", "tm:swift", "tm:taunt", + "tm:terablast", "tm:throatchop", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", "tm:voltswitch", "tm:wildcharge", "tm:workup", - "tutor:blazekick", + "tutor:aerialace", "tutor:bounce", - "tutor:closecombat", + "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:plasmafists", + "tutor:playrough", + "tutor:rest", "tutor:risingvoltage", "tutor:shockwave", + "tutor:sleeptalk", + "tutor:snarl", "tutor:snatch", - "tutor:snore", "tutor:superpower", + "tutor:swift", "tutor:throatchop", - "tutor:thunder", - "tutor:thunderpunch" - ], - "labels": [ - "gen7", - "mythical", - "legendary" + "tutor:thunderbolt", + "tutor:thunderpunch", + "tutor:wildcharge", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:return", + "legacy:round", + "legacy:snore", + "legacy:toxic" ], - "pokedex": [ - "cobblemon.species.zeraora.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 - }, - "height": 15, - "weight": 445, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "evolutions": [] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/melmetal.json b/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json similarity index 64% rename from common/src/main/resources/data/cobblemon/species/generation7/melmetal.json rename to common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json index 66bdbc8bb..63238e268 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/melmetal.json +++ b/common/src/main/resources/data/cobblemon/species/generation7b/melmetal.json @@ -1,9 +1,25 @@ { - "name": "Melmetal", + "implemented": true, "nationalPokedexNumber": 809, + "name": "Melmetal", "primaryType": "steel", + "maleRatio": -1, + "height": 25, + "weight": 8000, + "pokedex": [ + "cobblemon.species.melmetal.desc" + ], + "labels": [ + "gen7b", + "mythical" + ], + "aspects": [], "abilities": [ - "ironfist" + "ironfist", + "h:ironfist" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 135, @@ -13,67 +29,31 @@ "special_defence": 65, "speed": 34 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "steel", - "abilities": [ - "ironfist" - ], - "baseStats": { - "hp": 135, - "attack": 143, - "defence": 143, - "special_attack": 80, - "special_defence": 65, - "speed": 34 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen8", - "mythical", - "legendary", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 250, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ + "1:thunderpunch", + "1:thundershock", "1:harden", - "1:headbutt", "1:tailwhip", - "1:thundershock", + "1:headbutt", "24:thunderwave", "32:acidarmor", "40:flashcannon", @@ -110,75 +90,82 @@ "tm:rest", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:selfdestruct", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", + "tm:steelbeam", + "tm:steelroller", "tm:substitute", "tm:superpower", + "tm:terablast", "tm:thunder", "tm:thunderbolt", "tm:thunderpunch", "tm:thunderwave", - "tm:toxic", - "tutor:acidarmor", - "tutor:brickbreak", - "tutor:doubleironbash", - "tutor:dynamicpunch", - "tutor:earthquake", - "tutor:facade", "tutor:flashcannon", - "tutor:harden", - "tutor:headbutt", + "tutor:gigaimpact", + "tutor:highhorsepower", "tutor:hyperbeam", "tutor:icebeam", "tutor:icepunch", - "tutor:megapunch", - "tutor:protect", + "tutor:irondefense", + "tutor:ironhead", "tutor:rest", "tutor:rockslide", - "tutor:selfdestruct", - "tutor:solarbeam", + "tutor:sleeptalk", "tutor:steelbeam", "tutor:steelroller", - "tutor:substitute", "tutor:superpower", - "tutor:tailwhip", - "tutor:thunder", "tutor:thunderbolt", "tutor:thunderpunch", - "tutor:thundershock", - "tutor:thunderwave", - "tutor:toxic" - ], - "labels": [ - "gen7", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.melmetal.desc" + "legacy:round", + "legacy:snore", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 25, - "weight": 8000, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Gmax", + "primaryType": "steel", + "maleRatio": -1, + "height": 250, + "weight": 0, + "pokedex": [ + "cobblemon.species.melmetal-gmax.desc" + ], + "labels": [ + "gen8", + "gmax" + ], + "aspects": [ + "gmax" + ], + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + } + ], + "behaviour": { + "herd": { + "maxSize": "9" + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation7/meltan.json b/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json similarity index 61% rename from common/src/main/resources/data/cobblemon/species/generation7/meltan.json rename to common/src/main/resources/data/cobblemon/species/generation7b/meltan.json index b1cf179b8..72eee6564 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/meltan.json +++ b/common/src/main/resources/data/cobblemon/species/generation7b/meltan.json @@ -1,9 +1,25 @@ { - "name": "Meltan", + "implemented": true, "nationalPokedexNumber": 808, + "name": "Meltan", "primaryType": "steel", + "maleRatio": -1, + "height": 2, + "weight": 80, + "pokedex": [ + "cobblemon.species.meltan.desc" + ], + "labels": [ + "gen7b", + "mythical" + ], + "aspects": [], "abilities": [ - "magnetpull" + "magnetpull", + "h:magnetpull" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 46, @@ -13,18 +29,28 @@ "special_defence": 35, "speed": 34 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 150, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:harden", "1:thundershock", + "1:harden", "8:tailwhip", "16:headbutt", "24:thunderwave", @@ -38,54 +64,53 @@ "tm:irondefense", "tm:protect", "tm:rest", - "tm:round", "tm:sleeptalk", - "tm:snore", + "tm:steelbeam", "tm:substitute", + "tm:terablast", "tm:thunderbolt", "tm:thunderwave", - "tm:toxic", - "tutor:acidarmor", "tutor:flashcannon", - "tutor:harden", - "tutor:headbutt", - "tutor:protect", + "tutor:irondefense", "tutor:rest", + "tutor:sleeptalk", "tutor:steelbeam", - "tutor:substitute", - "tutor:tailwhip", "tutor:thunderbolt", - "tutor:thundershock", - "tutor:thunderwave", - "tutor:toxic" - ], - "labels": [ - "gen7", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.meltan.desc" + "legacy:round", + "legacy:snore", + "legacy:toxic" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 2, - "weight": 80, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "meltan", + "tier": 1 + }, + { + "pokemon": "melmetal", + "tier": 2 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 f9c1ad221..54c7c8702 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/appletun.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/appletun.json @@ -1,13 +1,28 @@ { - "name": "Appletun", + "implemented": true, "nationalPokedexNumber": 842, + "name": "Appletun", "primaryType": "grass", "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 4, + "weight": 130, + "pokedex": [ + "cobblemon.species.appletun.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "ripen", "gluttony", "h:thickfat" ], + "eggGroups": [ + "grass", + "dragon" + ], "baseStats": { "hp": 110, "attack": 85, @@ -16,71 +31,44 @@ "special_defence": 80, "speed": 30 }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "grass", - "secondaryType": "dragon", - "abilities": [ - "ripen", - "gluttony", - "h:thickfat" - ], - "baseStats": { - "hp": 110, - "attack": 85, - "defence": 80, - "special_attack": 100, - "special_defence": 80, - "speed": 30 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 170, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "erratic", - "eggCycles": 20, - "eggGroups": [ - "grass", - "dragon" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 240, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 2, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 170, "experienceGroup": "erratic", + "catchRate": 45, "eggCycles": 20, - "eggGroups": [ - "grass", - "dragon" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:apple" + }, + { + "item": "cobblemon:yache_berry", + "percentage": 10.0 + } + ] + }, "moves": [ + "1:headbutt", + "1:recycle", + "1:withdraw", "1:astonish", "1:growth", - "1:recycle", "1:sweetscent", - "1:withdraw", "4:curse", "8:stomp", "12:leechseed", @@ -92,8 +80,11 @@ "36:irondefense", "40:dragonpulse", "44:energyball", + "egg:defensecurl", + "egg:recycle", + "egg:rollout", + "egg:suckerpunch", "tm:amnesia", - "tm:attract", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -112,6 +103,7 @@ "tm:grassyglide", "tm:grassyterrain", "tm:gyroball", + "tm:headbutt", "tm:heavyslam", "tm:helpinghand", "tm:highhorsepower", @@ -126,63 +118,86 @@ "tm:pounce", "tm:protect", "tm:raindance", + "tm:recycle", "tm:reflect", "tm:rest", - "tm:round", + "tm:rollout", "tm:safeguard", "tm:seedbomb", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:stompingtantrum", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", "tm:superpower", "tm:takedown", "tm:terablast", "tm:trailblaze", "tm:zenheadbutt", - "tutor:dracometeor", - "tutor:grassyglide" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.appletun.desc" + "tutor:bulldoze", + "tutor:dragonpulse", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "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", + "legacy:attract", + "legacy:round", + "legacy:snore" ], "preEvolution": "applin", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 130, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:apple" - }, - { - "item": "cobblemon:yache_berry", - "percentage": 10.0 + "forms": [ + { + "name": "Gmax", + "primaryType": "grass", + "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 240, + "weight": 0, + "pokedex": [ + "cobblemon.species.appletun-gmax.desc" + ], + "labels": [ + "gen8", + "gmax" + ], + "aspects": [ + "gmax" + ], + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + } + ], + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 31c67c768..7fb052aea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/applin.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/applin.json @@ -1,13 +1,28 @@ { - "name": "Applin", + "implemented": true, "nationalPokedexNumber": 840, + "name": "Applin", "primaryType": "grass", "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 2, + "weight": 5, + "pokedex": [ + "cobblemon.species.applin.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "ripen", "gluttony", "h:bulletproof" ], + "eggGroups": [ + "grass", + "dragon" + ], "baseStats": { "hp": 40, "attack": 40, @@ -16,34 +31,70 @@ "special_defence": 40, "speed": 20 }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 52, "experienceGroup": "erratic", + "catchRate": 255, "eggCycles": 20, - "eggGroups": [ - "grass", - "dragon" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "combat": { + "willDefendOwner": true + } + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:apple" + }, + { + "item": "cobblemon:yache_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:astonish", "1:withdraw", + "1:astonish", "egg:defensecurl", "egg:recycle", "egg:rollout", "egg:suckerpunch", - "tm:attract", "tm:pounce", + "tm:recycle", + "tm:rollout", + "tm:suckerpunch", "tm:terablast", - "tutor:dracometeor", - "tutor:grassyglide" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.applin.desc" + "tutor:recycle", + "tutor:rollout", + "tutor:suckerpunch", + "legacy:attract", + "legacy:dracometeor", + "legacy:grassyglide" ], "evolutions": [ { @@ -77,39 +128,7 @@ "doublehit" ], "requirements": [], - "requiredContext": "generations_core:syrupy_apple" + "requiredContext": "cobblemon:syrupy_apple" } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 2, - "weight": 5, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:apple" - }, - { - "item": "cobblemon:yache_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true + ] } \ No newline at end of file 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 474200690..6ab44170d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/blipbug.json @@ -1,12 +1,26 @@ { - "name": "Blipbug", + "implemented": true, "nationalPokedexNumber": 824, + "name": "Blipbug", "primaryType": "bug", + "maleRatio": 0.5, + "height": 4, + "weight": 80, + "pokedex": [ + "cobblemon.species.blipbug.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "swarm", "compoundeyes", "h:telepathy" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 25, "attack": 20, @@ -15,27 +29,47 @@ "special_defence": 45, "speed": 45 }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 1, + "speed": 0 + }, "baseExperienceYield": 36, "experienceGroup": "medium_fast", + "catchRate": 255, "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:psychic_seed", + "percentage": 2.5 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 2.5 + } + ] + }, "moves": [ "1:strugglebug", "egg:infestation", "egg:recover", "egg:stickyweb", - "egg:supersonic" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.blipbug.desc" + "egg:supersonic", + "tm:infestation", + "tm:strugglebug", + "tm:terablast" ], "evolutions": [ { @@ -44,9 +78,9 @@ "result": "dottler", "consumeHeldItem": false, "learnableMoves": [ - "confusion", + "reflect", "lightscreen", - "reflect" + "confusion" ], "requirements": [ { @@ -56,33 +90,19 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "height": 4, - "weight": 80, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:razz_berry", - "percentage": 2.5 + "behaviour": { + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + } + } } \ No newline at end of file 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 c5678294e..46c16e414 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/calyrex.json @@ -1,10 +1,27 @@ { - "name": "Calyrex", + "implemented": true, "nationalPokedexNumber": 898, + "name": "Calyrex", "primaryType": "psychic", "secondaryType": "grass", + "maleRatio": -1, + "height": 11, + "weight": 77, + "pokedex": [ + "cobblemon.species.calyrex.desc" + ], + "labels": [ + "gen8", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "unnerve" + "unnerve", + "h:unnerve" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,16 +31,148 @@ "special_defence": 80, "speed": 80 }, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 250, + "experienceGroup": "slow", "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "eggCycles": 120, + "baseFriendship": 100, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "moves": [ + "1:pound", + "1:megadrain", + "1:confusion", + "1:growth", + "8:lifedew", + "16:gigadrain", + "24:psyshock", + "32:helpinghand", + "40:aromatherapy", + "40:psychicterrain", + "48:energyball", + "56:psychic", + "64:leechseed", + "72:healpulse", + "80:solarbeam", + "88:futuresight", + "tm:agility", + "tm:allyswitch", + "tm:batonpass", + "tm:bodypress", + "tm:bulletseed", + "tm:calmmind", + "tm:drainingkiss", + "tm:encore", + "tm:endure", + "tm:energyball", + "tm:expandingforce", + "tm:facade", + "tm:futuresight", + "tm:gigadrain", + "tm:gigaimpact", + "tm:grassknot", + "tm:grassyterrain", + "tm:gravity", + "tm:guardswap", + "tm:helpinghand", + "tm:hyperbeam", + "tm:imprison", + "tm:leafstorm", + "tm:lightscreen", + "tm:magicalleaf", + "tm:magicroom", + "tm:metronome", + "tm:mudshot", + "tm:payday", + "tm:pollenpuff", + "tm:powerswap", + "tm:protect", + "tm:psybeam", + "tm:psychic", + "tm:psychicterrain", + "tm:psychup", + "tm:psyshock", + "tm:reflect", + "tm:rest", + "tm:safeguard", + "tm:scaryface", + "tm:seedbomb", + "tm:skillswap", + "tm:sleeptalk", + "tm:snarl", + "tm:solarbeam", + "tm:solarblade", + "tm:speedswap", + "tm:storedpower", + "tm:substitute", + "tm:sunnyday", + "tm:swift", + "tm:takedown", + "tm:terablast", + "tm:triattack", + "tm:trick", + "tm:trickroom", + "tm:wonderroom", + "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", + "legacy:round", + "legacy:snore" + ], + "evolutions": [], "forms": [ { "name": "Ice", "primaryType": "psychic", "secondaryType": "ice", + "maleRatio": -1, + "height": 24, + "weight": 8091, + "pokedex": [ + "cobblemon.species.calyrex-ice.desc" + ], + "labels": [ + "gen8", + "legendary", + "restricted" + ], + "aspects": [ + "ice-rider" + ], "abilities": [ - "asoneglastrier" + "asoneglastrier", + "h:asoneglastrier" ], "baseStats": { "hp": 100, @@ -33,10 +182,6 @@ "special_defence": 130, "speed": 50 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 250, - "baseFriendship": 100, "evYield": { "hp": 0, "attack": 3, @@ -45,37 +190,32 @@ "special_defence": 0, "speed": 0 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseExperienceYield": 340, "moves": [ - "1:avalanche", - "1:confusion", - "1:doubleedge", - "1:doublekick", "1:glaciallance", - "1:growth", - "1:iciclecrash", - "1:irondefense", - "1:megadrain", - "1:mist", - "1:pound", - "1:stomp", - "1:swordsdance", "1:tackle", "1:tailwhip", + "1:doublekick", + "1:avalanche", + "1:stomp", + "1:torment", + "1:mist", + "1:iciclecrash", "1:takedown", - "1:taunt", + "1:irondefense", "1:thrash", - "1:torment", + "1:taunt", + "1:doubleedge", + "1:swordsdance", + "1:pound", + "1:megadrain", + "1:confusion", + "1:growth", "8:lifedew", "16:gigadrain", "24:psyshock", "32:helpinghand", "40:aromatherapy", - "40:grassyterrain", "40:psychicterrain", "48:energyball", "56:psychic", @@ -143,7 +283,6 @@ "tm:reflect", "tm:rest", "tm:roar", - "tm:round", "tm:safeguard", "tm:scaryface", "tm:seedbomb", @@ -151,7 +290,6 @@ "tm:sleeptalk", "tm:smartstrike", "tm:snarl", - "tm:snore", "tm:snowscape", "tm:solarbeam", "tm:solarblade", @@ -167,38 +305,100 @@ "tm:taunt", "tm:terablast", "tm:throatchop", + "tm:torment", "tm:trailblaze", "tm:triattack", "tm:trick", "tm:trickroom", - "tm:uproar", "tm:wonderroom", "tm:zenheadbutt", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:energyball", "tutor:expandingforce", "tutor:gigadrain", - "tutor:glaciallance", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:helpinghand", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", "tutor:irondefense", "tutor:lashout", - "tutor:psychic" - ], - "labels": [ - "gen8", - "legendary" - ], - "aspects": [ - "ice-rider" + "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", + "legacy:round", + "legacy:snore", + "legacy:uproar" ], - "height": 24, - "weight": 8091, - "cannotDynamax": false, - "battleOnly": false + "evolutions": [], + "battleOnly": false, + "behaviour": { + "herd": { + "maxSize": "6" + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:never_melt_ice" + } + ] + } }, { "name": "Shadow", "primaryType": "psychic", "secondaryType": "ghost", + "maleRatio": -1, + "height": 24, + "weight": 536, + "pokedex": [ + "cobblemon.species.calyrex-shadow.desc" + ], + "labels": [ + "gen8", + "legendary", + "restricted" + ], + "aspects": [ + "shadow-rider" + ], "abilities": [ - "asonespectrier" + "asonespectrier", + "h:asonespectrier" ], "baseStats": { "hp": 100, @@ -208,10 +408,6 @@ "special_defence": 100, "speed": 150 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 250, - "baseFriendship": 100, "evYield": { "hp": 0, "attack": 0, @@ -220,37 +416,32 @@ "special_defence": 0, "speed": 0 }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseExperienceYield": 340, "moves": [ - "1:agility", "1:astralbarrage", - "1:confuseray", - "1:confusion", - "1:disable", - "1:doubleedge", + "1:tackle", + "1:tailwhip", "1:doublekick", - "1:growth", - "1:haze", "1:hex", - "1:megadrain", - "1:nastyplot", - "1:pound", - "1:shadowball", "1:stomp", - "1:tackle", - "1:tailwhip", + "1:confuseray", + "1:haze", + "1:shadowball", "1:takedown", + "1:agility", "1:thrash", + "1:disable", + "1:doubleedge", + "1:nastyplot", + "1:pound", + "1:megadrain", + "1:confusion", + "1:growth", "8:lifedew", "16:gigadrain", "24:psyshock", "32:helpinghand", "40:aromatherapy", - "40:grassyterrain", "40:psychicterrain", "48:energyball", "56:psychic", @@ -309,11 +500,11 @@ "tm:psybeam", "tm:psychic", "tm:psychicterrain", + "tm:psychocut", "tm:psychup", "tm:psyshock", "tm:reflect", "tm:rest", - "tm:round", "tm:safeguard", "tm:scaryface", "tm:seedbomb", @@ -321,7 +512,6 @@ "tm:skillswap", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:solarbeam", "tm:solarblade", "tm:speedswap", @@ -336,146 +526,90 @@ "tm:triattack", "tm:trick", "tm:trickroom", - "tm:uproar", "tm:willowisp", "tm:wonderroom", "tm:zenheadbutt", - "tutor:agility", - "tutor:astralbarrage", + "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:psychic" + "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", + "legacy:round", + "legacy:snore", + "legacy:uproar" ], - "labels": [ - "gen8", - "legendary" - ], - "aspects": [ - "shadow-rider" - ], - "height": 24, - "weight": 536, "evolutions": [], - "cannotDynamax": false, - "battleOnly": false + "battleOnly": false, + "behaviour": { + "herd": { + "maxSize": "6" + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:spell_tag" + } + ] + } } ], - "baseExperienceYield": 250, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:confusion", - "1:growth", - "1:megadrain", - "1:pound", - "8:lifedew", - "16:gigadrain", - "24:psyshock", - "32:helpinghand", - "40:aromatherapy", - "40:grassyterrain", - "40:psychicterrain", - "48:energyball", - "56:psychic", - "64:leechseed", - "72:healpulse", - "80:solarbeam", - "88:futuresight", - "tm:agility", - "tm:allyswitch", - "tm:batonpass", - "tm:bodypress", - "tm:bulletseed", - "tm:calmmind", - "tm:drainingkiss", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:futuresight", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:gravity", - "tm:guardswap", - "tm:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:leafstorm", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mudshot", - "tm:payday", - "tm:pollenpuff", - "tm:powerswap", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:reflect", - "tm:rest", - "tm:round", - "tm:safeguard", - "tm:scaryface", - "tm:seedbomb", - "tm:skillswap", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:solarbeam", - "tm:solarblade", - "tm:speedswap", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:triattack", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:expandingforce", - "tutor:gigadrain", - "tutor:psychic" - ], - "labels": [ - "gen8", - "legendary" - ], - "pokedex": [ - "cobblemon.species.calyrex.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 100, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 77, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "5" + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 f22b8fa35..ae5f4a5d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/carkol.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/carkol.json @@ -1,13 +1,27 @@ { - "name": "Carkol", + "implemented": true, "nationalPokedexNumber": 838, + "name": "Carkol", "primaryType": "rock", "secondaryType": "fire", + "maleRatio": 0.5, + "height": 11, + "weight": 780, + "pokedex": [ + "cobblemon.species.carkol.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "steamengine", "flamebody", "h:flashfire" ], + "eggGroups": [ + "mineral" + ], "baseStats": { "hp": 80, "attack": 60, @@ -16,35 +30,100 @@ "special_defence": 70, "speed": 50 }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 144, "experienceGroup": "medium_slow", + "catchRate": 120, "eggCycles": 15, - "eggGroups": [ - "mineral" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + } + }, + "herd": { + "maxSize": "5", + "toleratedLeaders": [ + { + "pokemon": "carkol", + "tier": 1 + }, + { + "pokemon": "coalossal", + "tier": 2 + } + ] + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "fireImmune": true + }, + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:coal", + "quantityRange": "0-2" + }, + { + "item": "cobblemon:black_augurite", + "percentage": 5.0 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 5.0 + } + ] + }, "moves": [ + "1:flamecharge", + "1:tackle", + "1:smokescreen", "1:rapidspin", "1:smackdown", - "1:smokescreen", - "1:tackle", + "1:burnup", "15:rockpolish", "20:ancientpower", "27:incinerate", "35:stealthrock", "41:heatcrash", "48:rockblast", - "55:burnup", "55:stoneedge", - "tm:attract", + "egg:block", + "egg:explosion", + "egg:mudslap", + "tm:ancientpower", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", "tm:curse", "tm:dig", "tm:endure", + "tm:explosion", "tm:facade", "tm:fireblast", "tm:firespin", @@ -55,7 +134,7 @@ "tm:heatcrash", "tm:heatwave", "tm:heavyslam", - "tm:highhorsepower", + "tm:incinerate", "tm:irondefense", "tm:ironhead", "tm:meteorbeam", @@ -66,9 +145,9 @@ "tm:reflect", "tm:rest", "tm:rockblast", + "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:sandtomb", "tm:scald", @@ -76,7 +155,6 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:spikes", "tm:stealthrock", "tm:stoneedge", @@ -86,14 +164,26 @@ "tm:temperflare", "tm:terablast", "tm:willowisp", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:flamethrower", + "tutor:heatwave", + "tutor:irondefense", + "tutor:ironhead", "tutor:meteorbeam", - "tutor:scorchingsands" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.carkol.desc" + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge", + "legacy:attract", + "legacy:highhorsepower", + "legacy:round", + "legacy:snore" ], "preEvolution": "rolycoly", "evolutions": [ @@ -113,41 +203,8 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 11, - "weight": 780, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:coal", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:black_augurite", - "percentage": 5.0 - }, - { - "item": "cobblemon:passho_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true + "lightingData": { + "lightLevel": 7, + "liquidGlowMode": "LAND" + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json b/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json deleted file mode 100644 index 41b352ebc..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/chewtle.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "name": "Chewtle", - "nationalPokedexNumber": 833, - "primaryType": "water", - "abilities": [ - "strongjaw", - "shellarmor", - "h:swiftswim" - ], - "baseStats": { - "hp": 50, - "attack": 64, - "defence": 50, - "special_attack": 38, - "special_defence": 38, - "speed": 44 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 57, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "monster", - "water_1" - ], - "moves": [ - "1:tackle", - "1:watergun", - "7:bite", - "14:protect", - "21:headbutt", - "28:counter", - "35:jawlock", - "42:liquidation", - "49:bodyslam", - "egg:dragontail", - "egg:gastroacid", - "egg:shellsmash", - "egg:skullbash", - "tm:assurance", - "tm:attract", - "tm:bodyslam", - "tm:chillingwater", - "tm:crunch", - "tm:dive", - "tm:dragontail", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:hydropump", - "tm:icefang", - "tm:liquidation", - "tm:mudshot", - "tm:payback", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:revenge", - "tm:round", - "tm:scaryface", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snore", - "tm:stompingtantrum", - "tm:substitute", - "tm:surf", - "tm:takedown", - "tm:terablast", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:scaleshot", - "tutor:skittersmack" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.chewtle.desc" - ], - "evolutions": [ - { - "id": "chewtle_drednaw", - "variant": "level_up", - "result": "drednaw", - "consumeHeldItem": false, - "learnableMoves": [ - "rocktomb" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 22 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 85, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:scute", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:rindo_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json b/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json deleted file mode 100644 index 4cea47ce2..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/clobbopus.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "name": "Clobbopus", - "nationalPokedexNumber": 852, - "primaryType": "fighting", - "abilities": [ - "limber", - "h:technician" - ], - "baseStats": { - "hp": 50, - "attack": 68, - "defence": 60, - "special_attack": 50, - "special_defence": 50, - "speed": 32 - }, - "catchRate": 180, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 62, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "water_1", - "human_like" - ], - "moves": [ - "1:leer", - "1:rocksmash", - "5:feint", - "10:bind", - "15:detect", - "20:brickbreak", - "25:bulkup", - "30:submission", - "35:taunt", - "40:reversal", - "45:superpower", - "egg:circlethrow", - "egg:painsplit", - "egg:poweruppunch", - "egg:seismictoss", - "egg:soak", - "egg:suckerpunch", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:bulkup", - "tm:closecombat", - "tm:dive", - "tm:endure", - "tm:facade", - "tm:focusblast", - "tm:icepunch", - "tm:liquidation", - "tm:megapunch", - "tm:muddywater", - "tm:mudshot", - "tm:payback", - "tm:protect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:superpower", - "tm:taunt", - "tm:waterfall", - "tm:workup", - "tutor:coaching" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.clobbopus.desc" - ], - "evolutions": [ - { - "id": "clobbopus_grapploct", - "variant": "level_up", - "result": "grapploct", - "consumeHeldItem": false, - "learnableMoves": [ - "octolock" - ], - "requirements": [ - { - "variant": "has_move", - "move": "taunt" - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 40, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:ink_sac", - "quantityRange": "1-3" - }, - { - "item": "cobblemon:pinap_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 44ce0ec11..97d800f27 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/coalossal.json @@ -1,13 +1,27 @@ { - "name": "Coalossal", + "implemented": true, "nationalPokedexNumber": 839, + "name": "Coalossal", "primaryType": "rock", "secondaryType": "fire", + "maleRatio": 0.5, + "height": 28, + "weight": 3105, + "pokedex": [ + "cobblemon.species.coalossal.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "steamengine", "flamebody", "h:flashfire" ], + "eggGroups": [ + "mineral" + ], "baseStats": { "hp": 110, "attack": 80, @@ -16,78 +30,87 @@ "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, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "rock", - "secondaryType": "fire", - "abilities": [ - "steamengine", - "flamebody", - "h:flashfire" + "eggCycles": 15, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canSwimInLava": true + } + }, + "herd": { + "maxSize": "7" + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" ], - "baseStats": { - "hp": 110, - "attack": 80, - "defence": 120, - "special_attack": 80, - "special_defence": 90, - "speed": 30 + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "fireImmune": true + }, + "drops": { + "amount": 5, + "entries": [ + { + "item": "minecraft:coal", + "quantityRange": "0-3" }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 255, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 + { + "item": "cobblemon:black_augurite", + "percentage": 10.0 }, - "experienceGroup": "medium_slow", - "eggCycles": 15, - "eggGroups": [ - "mineral" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 420, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 255, - "experienceGroup": "medium_slow", - "eggCycles": 15, - "eggGroups": [ - "mineral" - ], + { + "item": "cobblemon:passho_berry", + "percentage": 10.0 + } + ] + }, "moves": [ + "1:tarshot", "1:flamecharge", + "1:tackle", + "1:smokescreen", "1:rapidspin", "1:smackdown", - "1:smokescreen", - "1:tackle", + "1:burnup", "15:rockpolish", "20:ancientpower", "27:incinerate", "37:stealthrock", "45:heatcrash", "54:rockblast", - "63:burnup", "63:stoneedge", - "tm:attract", + "egg:block", + "egg:explosion", + "egg:mudslap", + "tm:ancientpower", + "tm:block", "tm:bodypress", "tm:bodyslam", "tm:bulldoze", @@ -96,6 +119,7 @@ "tm:earthpower", "tm:earthquake", "tm:endure", + "tm:explosion", "tm:facade", "tm:fireblast", "tm:firepunch", @@ -110,6 +134,7 @@ "tm:heavyslam", "tm:highhorsepower", "tm:hyperbeam", + "tm:incinerate", "tm:irondefense", "tm:ironhead", "tm:megakick", @@ -122,9 +147,9 @@ "tm:reflect", "tm:rest", "tm:rockblast", + "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:sandtomb", "tm:scald", @@ -132,7 +157,6 @@ "tm:selfdestruct", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:solarbeam", "tm:spikes", "tm:stealthrock", @@ -143,52 +167,57 @@ "tm:temperflare", "tm:terablast", "tm:willowisp", + "tutor:ancientpower", + "tutor:block", + "tutor:bulldoze", + "tutor:earthpower", + "tutor:firepunch", + "tutor:flamethrower", + "tutor:gigaimpact", + "tutor:heatwave", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:ironhead", "tutor:meteorbeam", - "tutor:scorchingsands" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.coalossal.desc" + "tutor:mudslap", + "tutor:rest", + "tutor:rockslide", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:spikes", + "tutor:stealthrock", + "tutor:stoneedge", + "legacy:attract", + "legacy:round", + "legacy:snore" ], "preEvolution": "carkol", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 3, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 28, - "weight": 3105, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:coal", - "quantityRange": "0-3" - }, - { - "item": "cobblemon:black_augurite", - "percentage": 10.0 - }, - { - "item": "cobblemon:passho_berry", - "percentage": 10.0 - } - ] - }, - "implemented": true + "forms": [ + { + "name": "Gmax", + "primaryType": "rock", + "secondaryType": "fire", + "maleRatio": 0.5, + "height": 420, + "weight": 0, + "pokedex": [ + "cobblemon.species.coalossal-gmax.desc" + ], + "labels": [ + "gen8", + "gmax" + ], + "aspects": [ + "gmax" + ], + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + } + ], + "lightingData": { + "lightLevel": 6, + "liquidGlowMode": "LAND" + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json b/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json deleted file mode 100644 index 95c7c0b3e..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/cramorant.json +++ /dev/null @@ -1,233 +0,0 @@ -{ - "name": "Cramorant", - "nationalPokedexNumber": 845, - "primaryType": "flying", - "secondaryType": "water", - "abilities": [ - "gulpmissile" - ], - "baseStats": { - "hp": 70, - "attack": 85, - "defence": 55, - "special_attack": 85, - "special_defence": 95, - "speed": 85 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Gulping", - "primaryType": "flying", - "secondaryType": "water", - "abilities": [ - "gulpmissile" - ], - "baseStats": { - "hp": 70, - "attack": 85, - "defence": 55, - "special_attack": 85, - "special_defence": 95, - "speed": 85 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 166, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "flying" - ], - "labels": [ - "gen8" - ], - "aspects": [ - "gulping" - ], - "height": 8, - "weight": 180, - "cannotDynamax": false, - "battleOnly": true - }, - { - "name": "Gorging", - "primaryType": "flying", - "secondaryType": "water", - "abilities": [ - "gulpmissile" - ], - "baseStats": { - "hp": 70, - "attack": 85, - "defence": 55, - "special_attack": 85, - "special_defence": 95, - "speed": 85 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 166, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "flying" - ], - "labels": [ - "gen8" - ], - "aspects": [ - "gorging" - ], - "height": 8, - "weight": 180, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 166, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "flying" - ], - "moves": [ - "1:belch", - "1:peck", - "1:spitup", - "1:stockpile", - "1:swallow", - "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:assurance", - "tm:attract", - "tm:blizzard", - "tm:bravebird", - "tm:chillingwater", - "tm:dive", - "tm:dualwingbeat", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:gigaimpact", - "tm:hurricane", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icywind", - "tm:liquidation", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:reversal", - "tm:round", - "tm:scald", - "tm:sleeptalk", - "tm:snore", - "tm:steelwing", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:uproar", - "tm:waterpulse", - "tm:weatherball", - "tm:whirlpool", - "tutor:dualwingbeat" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.cramorant.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 8, - "weight": 180, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 6, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-2" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "minecraft:cod", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:wacan_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/cursola.json b/common/src/main/resources/data/cobblemon/species/generation8/cursola.json deleted file mode 100644 index a5b53a755..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/cursola.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "name": "Cursola", - "nationalPokedexNumber": 864, - "primaryType": "ghost", - "abilities": [ - "weakarmor", - "h:perishbody" - ], - "baseStats": { - "hp": 60, - "attack": 95, - "defence": 50, - "special_attack": 145, - "special_defence": 130, - "speed": 30 - }, - "catchRate": 30, - "maleRatio": 0.25, - "shoulderMountable": false, - "baseExperienceYield": 179, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "water_3" - ], - "moves": [ - "1:astonish", - "1:disable", - "1:harden", - "1:perishsong", - "1:tackle", - "15:spite", - "20:ancientpower", - "25:hex", - "30:curse", - "35:strengthsap", - "40:powergem", - "45:nightshade", - "50:grudge", - "55:mirrorcoat", - "tm:amnesia", - "tm:attract", - "tm:blizzard", - "tm:bodyslam", - "tm:brine", - "tm:bulldoze", - "tm:calmmind", - "tm:dig", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:gigadrain", - "tm:gigaimpact", - "tm:hail", - "tm:hex", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:iciclespear", - "tm:icywind", - "tm:irondefense", - "tm:leechlife", - "tm:lightscreen", - "tm:liquidation", - "tm:pinmissile", - "tm:powergem", - "tm:protect", - "tm:psychic", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:revenge", - "tm:rockblast", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:safeguard", - "tm:sandstorm", - "tm:scald", - "tm:screech", - "tm:selfdestruct", - "tm:shadowball", - "tm:sleeptalk", - "tm:snore", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:substitute", - "tm:sunnyday", - "tm:surf", - "tm:throatchop", - "tm:whirlpool", - "tm:willowisp", - "tutor:burningjealousy", - "tutor:meteorbeam", - "tutor:poltergeist" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.cursola.desc" - ], - "preEvolution": "corsola galarian", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 10, - "weight": 4, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:kasib_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 ccdc2baa2..b8ab77694 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/dottler.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/dottler.json @@ -1,13 +1,27 @@ { - "name": "Dottler", + "implemented": true, "nationalPokedexNumber": 825, + "name": "Dottler", "primaryType": "bug", "secondaryType": "psychic", + "maleRatio": 0.5, + "height": 4, + "weight": 195, + "pokedex": [ + "cobblemon.species.dottler.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "swarm", "compoundeyes", "h:telepathy" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 50, "attack": 35, @@ -16,29 +30,60 @@ "special_defence": 90, "speed": 30 }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 2, + "speed": 0 + }, "baseExperienceYield": 117, "experienceGroup": "medium_fast", + "catchRate": 120, "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:psychic_seed", + "percentage": 5.0 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 5.0 + } + ] + }, "moves": [ + "1:reflect", + "1:lightscreen", + "1:confusion", "1:strugglebug", + "egg:infestation", + "egg:recover", + "egg:stickyweb", + "egg:supersonic", "tm:allyswitch", - "tm:attract", "tm:bodypress", "tm:bugbuzz", "tm:calmmind", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", "tm:futuresight", "tm:guardswap", "tm:helpinghand", "tm:imprison", + "tm:infestation", "tm:irondefense", "tm:leechlife", "tm:lightscreen", @@ -51,26 +96,38 @@ "tm:psyshock", "tm:reflect", "tm:rest", - "tm:round", "tm:safeguard", "tm:shadowball", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:storedpower", + "tm:strugglebug", "tm:substitute", + "tm:terablast", "tm:trick", "tm:trickroom", "tm:wonderroom", "tm:zenheadbutt", - "tutor:expandingforce" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.dottler.desc" + "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", + "legacy:attract", + "legacy:round", + "legacy:snore" ], "preEvolution": "blipbug", "evolutions": [ @@ -88,33 +145,18 @@ ] } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "height": 4, - "weight": 195, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:razz_berry", - "percentage": 5.0 + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json b/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json deleted file mode 100644 index 42580da1d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/drednaw.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "name": "Drednaw", - "nationalPokedexNumber": 834, - "primaryType": "water", - "secondaryType": "rock", - "abilities": [ - "strongjaw", - "shellarmor", - "h:swiftswim" - ], - "baseStats": { - "hp": 90, - "attack": 115, - "defence": 90, - "special_attack": 48, - "special_defence": 68, - "speed": 74 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "water", - "secondaryType": "rock", - "abilities": [ - "strongjaw", - "shellarmor", - "h:swiftswim" - ], - "baseStats": { - "hp": 90, - "attack": 115, - "defence": 90, - "special_attack": 48, - "special_defence": 68, - "speed": 74 - }, - "catchRate": 75, - "maleRatio": 0.5, - "baseExperienceYield": 170, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "monster", - "water_1" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 240, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 170, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "monster", - "water_1" - ], - "moves": [ - "1:bite", - "1:crunch", - "1:protect", - "1:razorshell", - "1:rockpolish", - "1:tackle", - "1:watergun", - "21:headbutt", - "30:counter", - "39:jawlock", - "48:liquidation", - "57:bodyslam", - "66:headsmash", - "tm:assurance", - "tm:attract", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:chillingwater", - "tm:crunch", - "tm:dig", - "tm:dive", - "tm:doubleedge", - "tm:dragontail", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:gigaimpact", - "tm:highhorsepower", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icespinner", - "tm:irondefense", - "tm:irontail", - "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:rockslide", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:sandtomb", - "tm:scald", - "tm:scaryface", - "tm:skittersmack", - "tm:sleeptalk", - "tm:smartstrike", - "tm:snore", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:substitute", - "tm:superfang", - "tm:superpower", - "tm:surf", - "tm:swordsdance", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tutor:meteorbeam", - "tutor:scaleshot", - "tutor:skittersmack" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.drednaw.desc" - ], - "preEvolution": "chewtle", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 10, - "weight": 1155, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:scute", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:rindo_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 cf9a54920..6fabbe444 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/duraludon.json @@ -1,13 +1,28 @@ { - "name": "Duraludon", + "implemented": true, "nationalPokedexNumber": 884, + "name": "Duraludon", "primaryType": "steel", "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 18, + "weight": 400, + "pokedex": [ + "cobblemon.species.duraludon.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "lightmetal", "heavymetal", "h:stalwart" ], + "eggGroups": [ + "mineral", + "dragon" + ], "baseStats": { "hp": 70, "attack": 95, @@ -16,68 +31,37 @@ "special_defence": 50, "speed": 85 }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "steel", - "secondaryType": "dragon", - "abilities": [ - "lightmetal", - "heavymetal", - "h:stalwart" - ], - "baseStats": { - "hp": 70, - "attack": 95, - "defence": 115, - "special_attack": 120, - "special_defence": 50, - "speed": 85 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 187, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 30, - "eggGroups": [ - "mineral", - "dragon" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 430, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 2, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 187, "experienceGroup": "medium_fast", + "catchRate": 45, "eggCycles": 30, - "eggGroups": [ - "mineral", - "dragon" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "minecraft:iron_ingot", + "quantityRange": "0-1" + } + ] + }, "moves": [ - "1:leer", "1:metalclaw", + "1:leer", "6:rocksmash", "12:honeclaws", "18:metalsound", @@ -85,7 +69,6 @@ "30:dragontail", "36:irondefense", "42:focusenergy", - "42:laserfocus", "48:dragonclaw", "54:flashcannon", "60:metalburst", @@ -93,7 +76,6 @@ "egg:mirrorcoat", "egg:nightslash", "egg:slash", - "tm:attract", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", @@ -108,13 +90,16 @@ "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:lightscreen", "tm:metalclaw", "tm:metalsound", @@ -124,17 +109,16 @@ "tm:rest", "tm:roar", "tm:rockslide", + "tm:rocksmash", "tm:rocktomb", - "tm:round", "tm:scaryface", "tm:screech", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:solarbeam", "tm:stealthrock", "tm:steelbeam", - "tm:stompingtantrum", + "tm:steelroller", "tm:stoneedge", "tm:substitute", "tm:swordsdance", @@ -143,19 +127,36 @@ "tm:thunder", "tm:thunderbolt", "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" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.duraludon.desc" + "tutor:steelroller", + "tutor:stoneedge", + "tutor:thunderbolt", + "legacy:attract", + "legacy:round", + "legacy:snore", + "legacy:stompingtantrum" ], "evolutions": [ { - "id": "duralodon_archaludon", + "id": "duraludon_archaludon", "variant": "item_interact", "result": "archaludon", "consumeHeldItem": false, @@ -163,36 +164,49 @@ "electroshot" ], "requirements": [], - "requiredContext": "minecraft:iron_ingot" + "requiredContext": "cobblemon:metal_alloy" } ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 18, - "weight": 400, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:iron_ingot", - "quantityRange": "0-1" + "forms": [ + { + "name": "Gmax", + "primaryType": "steel", + "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 430, + "weight": 0, + "pokedex": [ + "cobblemon.species.duraludon-gmax.desc" + ], + "labels": [ + "gen8", + "gmax" + ], + "aspects": [ + "gmax" + ], + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + } + ], + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 df12c7d86..588d6c966 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/eternatus.json @@ -1,10 +1,27 @@ { - "name": "Eternatus", + "implemented": true, "nationalPokedexNumber": 890, + "name": "Eternatus", "primaryType": "poison", "secondaryType": "dragon", + "maleRatio": -1, + "height": 200, + "weight": 9500, + "pokedex": [ + "cobblemon.species.eternatus.desc" + ], + "labels": [ + "gen8", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "pressure" + "pressure", + "h:pressure" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 140, @@ -14,66 +31,31 @@ "special_defence": 95, "speed": 130 }, - "catchRate": 255, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Eternamax", - "primaryType": "poison", - "secondaryType": "dragon", - "abilities": [ - "pressure" - ], - "baseStats": { - "hp": 255, - "attack": 115, - "defence": 250, - "special_attack": 125, - "special_defence": 250, - "speed": 130 - }, - "catchRate": 255, - "maleRatio": -1, - "baseExperienceYield": 345, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen8", - "legendary" - ], - "aspects": [ - "eternamax" - ], - "height": 1000, - "weight": 0, - "cannotDynamax": true, - "battleOnly": false - } - ], + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 345, "experienceGroup": "slow", + "catchRate": 255, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "dynamaxBlocked": true, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ - "1:agility", + "1:poisontail", "1:confuseray", "1:dragontail", - "1:poisontail", + "1:agility", "8:toxic", "16:venoshock", "24:dragondance", @@ -85,7 +67,6 @@ "72:recover", "80:hyperbeam", "88:eternabeam", - "88:outrage", "tm:agility", "tm:assurance", "tm:bodyslam", @@ -119,14 +100,12 @@ "tm:raindance", "tm:reflect", "tm:rest", - "tm:round", "tm:scaryface", "tm:screech", "tm:shadowball", "tm:sleeptalk", "tm:sludgebomb", "tm:sludgewave", - "tm:snore", "tm:solarbeam", "tm:substitute", "tm:sunnyday", @@ -136,42 +115,89 @@ "tm:toxicspikes", "tm:venomdrench", "tm:venoshock", - "tutor:crosspoison", "tutor:dracometeor", "tutor:dragonpulse", - "tutor:dynamaxcannon", - "tutor:eternabeam", "tutor:flamethrower", + "tutor:flashcannon", + "tutor:gigaimpact", + "tutor:gravity", + "tutor:gunkshot", + "tutor:hyperbeam", "tutor:meteorbeam", - "tutor:sludgebomb" - ], - "labels": [ - "gen8", - "legendary" - ], - "pokedex": [ - "cobblemon.species.eternatus.desc" + "tutor:mysticalfire", + "tutor:outrage", + "tutor:poisonjab", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "legacy:round", + "legacy:snore" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 + "forms": [ + { + "name": "Eternamax", + "primaryType": "poison", + "secondaryType": "dragon", + "maleRatio": -1, + "height": 1000, + "weight": 0, + "pokedex": [ + "cobblemon.species.eternatus-eternamax.desc" + ], + "labels": [ + "gen8", + "legendary", + "restricted" + ], + "aspects": [ + "eternamax" + ], + "baseStats": { + "hp": 255, + "attack": 115, + "defence": 250, + "special_attack": 125, + "special_defence": 250, + "speed": 130 + }, + "baseExperienceYield": 563, + "evolutions": [], + "battleOnly": true, + "lightingData": { + "lightLevel": 15, + "liquidGlowMode": "BOTH" + } + } + ], + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } }, - "height": 200, - "weight": 9500, - "dynamaxBlocked": true, - "aspects": [], - "cannotDynamax": true, - "implemented": true + "lightingData": { + "lightLevel": 13, + "liquidGlowMode": "BOTH" + } } \ 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 a794aaee8..1f83f4425 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/flapple.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/flapple.json @@ -1,13 +1,28 @@ { - "name": "Flapple", + "implemented": true, "nationalPokedexNumber": 841, + "name": "Flapple", "primaryType": "grass", "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 3, + "weight": 10, + "pokedex": [ + "cobblemon.species.flapple.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "ripen", "gluttony", "h:hustle" ], + "eggGroups": [ + "grass", + "dragon" + ], "baseStats": { "hp": 70, "attack": 110, @@ -16,71 +31,44 @@ "special_defence": 60, "speed": 70 }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "grass", - "secondaryType": "dragon", - "abilities": [ - "ripen", - "gluttony", - "h:hustle" - ], - "baseStats": { - "hp": 70, - "attack": 110, - "defence": 80, - "special_attack": 95, - "special_defence": 60, - "speed": 70 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 170, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "erratic", - "eggCycles": 20, - "eggGroups": [ - "grass", - "dragon" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 240, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 2, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 170, "experienceGroup": "erratic", + "catchRate": 45, "eggCycles": 20, - "eggGroups": [ - "grass", - "dragon" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "minecraft:apple" + }, + { + "item": "cobblemon:yache_berry", + "percentage": 5.0 + } + ] + }, "moves": [ + "1:wingattack", + "1:recycle", + "1:withdraw", "1:astonish", "1:growth", - "1:recycle", "1:twister", - "1:withdraw", "4:acidspray", "8:acrobatics", "12:leechseed", @@ -92,11 +80,14 @@ "36:irondefense", "40:fly", "44:dragonrush", + "egg:defensecurl", + "egg:recycle", + "egg:rollout", + "egg:suckerpunch", "tm:acidspray", "tm:acrobatics", "tm:aerialace", "tm:airslash", - "tm:attract", "tm:bulletseed", "tm:dracometeor", "tm:dragondance", @@ -121,61 +112,99 @@ "tm:outrage", "tm:pounce", "tm:protect", + "tm:recycle", "tm:rest", - "tm:round", + "tm:rollout", "tm:scaryface", "tm:seedbomb", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", "tm:takedown", "tm:terablast", "tm:trailblaze", + "tm:twister", "tm:uturn", - "tutor:dracometeor", + "tutor:aerialace", + "tutor:dragonpulse", "tutor:dualwingbeat", - "tutor:grassyglide" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.flapple.desc" + "tutor:endeavor", + "tutor:energyball", + "tutor:focusenergy", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:irondefense", + "tutor:magicalleaf", + "tutor:outrage", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:twister", + "legacy:attract", + "legacy:round", + "legacy:snore" ], "preEvolution": "applin", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 10, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:apple" + "forms": [ + { + "name": "Gmax", + "primaryType": "grass", + "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 240, + "weight": 0, + "pokedex": [ + "cobblemon.species.flapple-gmax.desc" + ], + "labels": [ + "gen8", + "gmax" + ], + "aspects": [ + "gmax" + ], + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + } + ], + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "flapple", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true }, - { - "item": "cobblemon:yache_berry", - "percentage": 5.0 + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file 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 d791bf5eb..02f5770cb 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/frosmoth.json @@ -1,12 +1,26 @@ { - "name": "Frosmoth", + "implemented": true, "nationalPokedexNumber": 873, + "name": "Frosmoth", "primaryType": "ice", "secondaryType": "bug", + "maleRatio": 0.5, + "height": 13, + "weight": 420, + "pokedex": [ + "cobblemon.species.frosmoth.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "shielddust", "h:icescales" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 70, "attack": 65, @@ -15,27 +29,54 @@ "special_defence": 90, "speed": 65 }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 2, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 166, "experienceGroup": "medium_fast", + "catchRate": 75, "eggCycles": 20, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:snowball", + "quantityRange": "0-2" + }, + { + "item": "cobblemon:silver_powder", + "percentage": 5.0 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:attract", - "1:helpinghand", + "1:icywind", "1:powdersnow", "1:strugglebug", + "1:helpinghand", + "1:attract", "4:stunspore", "8:infestation", "12:mist", "16:defog", "21:featherdance", "24:aurorabeam", - "28:hail", "28:snowscape", "32:bugbuzz", "36:auroraveil", @@ -43,15 +84,20 @@ "44:tailwind", "48:wideguard", "52:quiverdance", + "egg:bugbite", + "egg:fairywind", + "egg:mirrorcoat", "tm:acrobatics", "tm:airslash", "tm:attract", + "tm:auroraveil", "tm:avalanche", "tm:blizzard", "tm:bugbite", "tm:bugbuzz", "tm:calmmind", "tm:dazzlinggleam", + "tm:defog", "tm:endure", "tm:facade", "tm:featherdance", @@ -66,6 +112,7 @@ "tm:iciclespear", "tm:icywind", "tm:imprison", + "tm:infestation", "tm:leechlife", "tm:lightscreen", "tm:lunge", @@ -74,11 +121,9 @@ "tm:protect", "tm:reflect", "tm:rest", - "tm:round", "tm:safeguard", "tm:skittersmack", "tm:sleeptalk", - "tm:snore", "tm:snowscape", "tm:strugglebug", "tm:substitute", @@ -89,53 +134,56 @@ "tm:tripleaxel", "tm:uturn", "tm:weatherball", - "tutor:dualwingbeat", + "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:tripleaxel" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.frosmoth.desc" + "tutor:sleeptalk", + "tutor:swift", + "tutor:tailwind", + "tutor:tripleaxel", + "legacy:dualwingbeat", + "legacy:round", + "legacy:snore" ], "preEvolution": "snom", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 13, - "weight": 420, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:snowball", - "quantityRange": "0-2" + "behaviour": { + "herd": { + "maxSize": "7" + }, + "moving": { + "swim": { + "avoidsWater": true }, - { - "item": "cobblemon:silver_powder", - "percentage": 5.0 + "fly": { + "canFly": true }, - { - "item": "cobblemon:charti_berry", - "percentage": 5.0 + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 0ca1a667f..e222d4004 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/glastrier.json @@ -1,9 +1,25 @@ { - "name": "Glastrier", + "implemented": true, "nationalPokedexNumber": 896, + "name": "Glastrier", "primaryType": "ice", + "maleRatio": -1, + "height": 22, + "weight": 8000, + "pokedex": [ + "cobblemon.species.glastrier.desc" + ], + "labels": [ + "gen8", + "legendary" + ], + "aspects": [], "abilities": [ - "chillingneigh" + "chillingneigh", + "h:chillingneigh" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -13,15 +29,25 @@ "special_defence": 110, "speed": 30 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ "1:tackle", "1:tailwhip", @@ -55,7 +81,6 @@ "tm:highhorsepower", "tm:hyperbeam", "tm:icebeam", - "tm:iciclespear", "tm:icywind", "tm:irondefense", "tm:lashout", @@ -66,12 +91,10 @@ "tm:protect", "tm:rest", "tm:roar", - "tm:round", "tm:scaryface", "tm:sleeptalk", "tm:smartstrike", "tm:snarl", - "tm:snore", "tm:snowscape", "tm:stompingtantrum", "tm:substitute", @@ -81,39 +104,71 @@ "tm:taunt", "tm:terablast", "tm:throatchop", + "tm:torment", "tm:trailblaze", - "tm:uproar", "tm:zenheadbutt", - "tutor:iciclecrash", + "tutor:bulldoze", + "tutor:gigaimpact", + "tutor:highhorsepower", + "tutor:hyperbeam", + "tutor:icebeam", + "tutor:icywind", + "tutor:irondefense", "tutor:lashout", - "tutor:swordsdance" - ], - "labels": [ - "gen8", - "legendary" - ], - "pokedex": [ - "cobblemon.species.glastrier.desc" + "tutor:megahorn", + "tutor:outrage", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:throatchop", + "tutor:zenheadbutt", + "legacy:iciclespear", + "legacy:round", + "legacy:snore", + "legacy:uproar" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 22, - "weight": 8000, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "spectrier", + "tier": 1 + }, + { + "pokemon": "glastrier", + "tier": 2 + }, + { + "pokemon": "calyrex", + "tier": 3 + }, + { + "pokemon": "calyrex shadow", + "tier": 4 + }, + { + "pokemon": "calyrex ice", + "tier": 5 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json b/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json deleted file mode 100644 index 9e4d45b41..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/grapploct.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "name": "Grapploct", - "nationalPokedexNumber": 853, - "primaryType": "fighting", - "abilities": [ - "limber", - "h:technician" - ], - "baseStats": { - "hp": 80, - "attack": 118, - "defence": 90, - "special_attack": 70, - "special_defence": 80, - "speed": 42 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 168, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "water_1", - "human_like" - ], - "moves": [ - "1:bind", - "1:feint", - "1:leer", - "1:octazooka", - "1:rocksmash", - "15:detect", - "20:brickbreak", - "25:bulkup", - "30:submission", - "35:taunt", - "40:reversal", - "45:superpower", - "50:topsyturvy", - "tm:attract", - "tm:bodyslam", - "tm:brickbreak", - "tm:brine", - "tm:brutalswing", - "tm:bulkup", - "tm:closecombat", - "tm:dig", - "tm:dive", - "tm:drainpunch", - "tm:endure", - "tm:facade", - "tm:focusblast", - "tm:gigaimpact", - "tm:hydropump", - "tm:hyperbeam", - "tm:icepunch", - "tm:liquidation", - "tm:megapunch", - "tm:muddywater", - "tm:mudshot", - "tm:payback", - "tm:protect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:round", - "tm:scaryface", - "tm:sleeptalk", - "tm:snore", - "tm:stompingtantrum", - "tm:substitute", - "tm:superpower", - "tm:surf", - "tm:taunt", - "tm:waterfall", - "tm:whirlpool", - "tm:workup", - "tutor:coaching", - "tutor:skittersmack" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.grapploct.desc" - ], - "preEvolution": "clobbopus", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 16, - "weight": 390, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:ink_sac", - "quantityRange": "2-4" - }, - { - "item": "cobblemon:pinap_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/greedent.json b/common/src/main/resources/data/cobblemon/species/generation8/greedent.json deleted file mode 100644 index b09aad7e5..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/greedent.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "name": "Greedent", - "nationalPokedexNumber": 820, - "primaryType": "normal", - "abilities": [ - "cheekpouch", - "h:gluttony" - ], - "baseStats": { - "hp": 120, - "attack": 95, - "defence": 95, - "special_attack": 55, - "special_defence": 75, - "speed": 20 - }, - "catchRate": 90, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 161, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:bite", - "1:stuffcheeks", - "1:tackle", - "1:tailwhip", - "15:spitup", - "15:stockpile", - "15:swallow", - "20:bodyslam", - "27:rest", - "34:counter", - "41:bulletseed", - "48:superfang", - "55:belch", - "tm:amnesia", - "tm:assurance", - "tm:attract", - "tm:bodypress", - "tm:bodyslam", - "tm:brutalswing", - "tm:bulldoze", - "tm:bulletseed", - "tm:crunch", - "tm:curse", - "tm:dig", - "tm:doubleedge", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:fling", - "tm:gigaimpact", - "tm:gyroball", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icefang", - "tm:irontail", - "tm:knockoff", - "tm:mudshot", - "tm:mudslap", - "tm:payback", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:rest", - "tm:round", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snore", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:superpower", - "tm:swordsdance", - "tm:tailslap", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunderfang", - "tm:trailblaze", - "tm:uproar", - "tm:wildcharge" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.greedent.desc" - ], - "preEvolution": "skwovet", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 60, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:oran_berry", - "quantityRange": "0-2" - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json b/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json deleted file mode 100644 index 74a7a26e2..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatenna.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "name": "Hatenna", - "nationalPokedexNumber": 856, - "primaryType": "psychic", - "abilities": [ - "healer", - "anticipation", - "h:magicbounce" - ], - "baseStats": { - "hp": 42, - "attack": 30, - "defence": 45, - "special_attack": 56, - "special_defence": 53, - "speed": 39 - }, - "catchRate": 235, - "maleRatio": 0, - "shoulderMountable": false, - "baseExperienceYield": 53, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "fairy" - ], - "moves": [ - "1:confusion", - "1:playnice", - "5:lifedew", - "10:disarmingvoice", - "15:aromatherapy", - "15:aromaticmist", - "20:psybeam", - "25:healpulse", - "30:dazzlinggleam", - "35:calmmind", - "40:psychic", - "45:healingwish", - "egg:afteryou", - "egg:aromaticmist", - "egg:mysticalfire", - "egg:nuzzle", - "egg:quash", - "tm:attract", - "tm:batonpass", - "tm:calmmind", - "tm:charm", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:futuresight", - "tm:gigadrain", - "tm:helpinghand", - "tm:imprison", - "tm:lightscreen", - "tm:magicalleaf", - "tm:metronome", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:playrough", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:reflect", - "tm:rest", - "tm:round", - "tm:safeguard", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:swift", - "tm:terablast", - "tm:thunderwave", - "tm:trick", - "tm:trickroom", - "tutor:expandingforce" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.hatenna.desc" - ], - "evolutions": [ - { - "id": "hatenna_hattrem", - "variant": "level_up", - "result": "hattrem", - "consumeHeldItem": false, - "learnableMoves": [ - "brutalswing" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 32 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 34, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:babiri_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json b/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json deleted file mode 100644 index 478163036..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/hatterene.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "name": "Hatterene", - "nationalPokedexNumber": 858, - "primaryType": "psychic", - "secondaryType": "fairy", - "abilities": [ - "healer", - "anticipation", - "h:magicbounce" - ], - "baseStats": { - "hp": 57, - "attack": 90, - "defence": 95, - "special_attack": 136, - "special_defence": 103, - "speed": 29 - }, - "catchRate": 45, - "maleRatio": 0, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "psychic", - "secondaryType": "fairy", - "abilities": [ - "healer", - "anticipation", - "h:magicbounce" - ], - "baseStats": { - "hp": 57, - "attack": 90, - "defence": 95, - "special_attack": 136, - "special_defence": 103, - "speed": 29 - }, - "catchRate": 45, - "maleRatio": 0, - "baseExperienceYield": 255, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "fairy" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 260, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 255, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "fairy" - ], - "moves": [ - "1:brutalswing", - "1:confusion", - "1:disarmingvoice", - "1:lifedew", - "1:playnice", - "15:aromatherapy", - "15:aromaticmist", - "20:psybeam", - "25:healpulse", - "30:dazzlinggleam", - "37:calmmind", - "46:psychic", - "55:healingwish", - "64:magicpowder", - "tm:agility", - "tm:attract", - "tm:batonpass", - "tm:brutalswing", - "tm:calmmind", - "tm:charm", - "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:helpinghand", - "tm:hyperbeam", - "tm:imprison", - "tm:lightscreen", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:painsplit", - "tm:playrough", - "tm:powerswap", - "tm:powerwhip", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychocut", - "tm:psychup", - "tm:psyshock", - "tm:reflect", - "tm:rest", - "tm:round", - "tm:safeguard", - "tm:shadowball", - "tm:shadowclaw", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:swift", - "tm:swordsdance", - "tm:terablast", - "tm:thunderwave", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tutor:expandingforce", - "tutor:mistyexplosion" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.hatterene.desc" - ], - "preEvolution": "hattrem", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 21, - "weight": 51, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:babiri_berry", - "percentage": 10.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json b/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json deleted file mode 100644 index 60fa79a00..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/hattrem.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "name": "Hattrem", - "nationalPokedexNumber": 857, - "primaryType": "psychic", - "abilities": [ - "healer", - "anticipation", - "h:magicbounce" - ], - "baseStats": { - "hp": 57, - "attack": 40, - "defence": 65, - "special_attack": 86, - "special_defence": 73, - "speed": 49 - }, - "catchRate": 120, - "maleRatio": 0, - "shoulderMountable": false, - "baseExperienceYield": 130, - "experienceGroup": "slow", - "eggCycles": 20, - "eggGroups": [ - "fairy" - ], - "moves": [ - "1:confusion", - "1:disarmingvoice", - "1:lifedew", - "1:playnice", - "15:aromatherapy", - "15:aromaticmist", - "20:psybeam", - "25:healpulse", - "30:dazzlinggleam", - "37:calmmind", - "44:psychic", - "51:healingwish", - "tm:attract", - "tm:batonpass", - "tm:brutalswing", - "tm:calmmind", - "tm:charm", - "tm:darkpulse", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:endure", - "tm:expandingforce", - "tm:facade", - "tm:futuresight", - "tm:gigadrain", - "tm:helpinghand", - "tm:imprison", - "tm:lightscreen", - "tm:magicalleaf", - "tm:metronome", - "tm:mistyterrain", - "tm:mysticalfire", - "tm:playrough", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:reflect", - "tm:rest", - "tm:round", - "tm:safeguard", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:swift", - "tm:terablast", - "tm:thunderwave", - "tm:trick", - "tm:trickroom", - "tutor:expandingforce" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.hattrem.desc" - ], - "preEvolution": "hatenna", - "evolutions": [ - { - "id": "hattrem_hatterene", - "variant": "level_up", - "result": "hatterene", - "consumeHeldItem": false, - "learnableMoves": [ - "psychocut" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 42 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 6, - "weight": 48, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:babiri_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 fd8a34dec..293680f4a 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/indeedee.json @@ -1,14 +1,29 @@ { "implemented": true, - "name": "Indeedee", "nationalPokedexNumber": 876, + "name": "Indeedee", "primaryType": "psychic", "secondaryType": "normal", + "maleRatio": 1, + "height": 9, + "weight": 280, + "pokedex": [ + "cobblemon.species.indeedee.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [ + "male" + ], "abilities": [ "innerfocus", "synchronize", "h:psychicsurge" ], + "eggGroups": [ + "fairy" + ], "baseStats": { "hp": 60, "attack": 65, @@ -17,14 +32,151 @@ "special_defence": 95, "speed": 95 }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 2, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 166, + "experienceGroup": "fast", "catchRate": 30, - "maleRatio": 0.5, - "shoulderMountable": false, + "eggCycles": 40, + "baseFriendship": 140, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:room_service", + "percentage": 5.0 + }, + { + "item": "cobblemon:bluk_berry", + "percentage": 5.0 + } + ] + }, + "moves": [ + "1:storedpower", + "1:playnice", + "5:encore", + "10:disarmingvoice", + "15:psybeam", + "20:helpinghand", + "25:afteryou", + "30:healingwish", + "35:psychic", + "40:calmmind", + "45:powersplit", + "50:psychicterrain", + "55:lastresort", + "egg:aromatherapy", + "egg:extrasensory", + "egg:fakeout", + "egg:psychup", + "tm:afteryou", + "tm:allyswitch", + "tm:bodyslam", + "tm:calmmind", + "tm:dazzlinggleam", + "tm:disarmingvoice", + "tm:drainingkiss", + "tm:drainpunch", + "tm:encore", + "tm:endure", + "tm:energyball", + "tm:expandingforce", + "tm:facade", + "tm:gravity", + "tm:helpinghand", + "tm:hypervoice", + "tm:imprison", + "tm:lastresort", + "tm:magicalleaf", + "tm:magicroom", + "tm:metronome", + "tm:mysticalfire", + "tm:payday", + "tm:playrough", + "tm:powerswap", + "tm:protect", + "tm:psybeam", + "tm:psychic", + "tm:psychicnoise", + "tm:psychicterrain", + "tm:psychup", + "tm:psyshock", + "tm:rest", + "tm:shadowball", + "tm:skillswap", + "tm:sleeptalk", + "tm:storedpower", + "tm:substitute", + "tm:swift", + "tm:takedown", + "tm:terablast", + "tm:terrainpulse", + "tm:triattack", + "tm:trick", + "tm:trickroom", + "tm:wonderroom", + "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", + "legacy:attract", + "legacy:futuresight", + "legacy:round", + "legacy:snore" + ], + "evolutions": [], "forms": [ { - "name": "female", + "name": "F", "primaryType": "psychic", "secondaryType": "normal", + "maleRatio": 0, + "height": 9, + "weight": 280, + "pokedex": [ + "cobblemon.species.indeedee-f.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [ + "female" + ], "abilities": [ "owntempo", "synchronize", @@ -38,10 +190,6 @@ "special_defence": 105, "speed": 85 }, - "catchRate": 30, - "maleRatio": 0, - "baseExperienceYield": 166, - "baseFriendship": 140, "evYield": { "hp": 0, "attack": 0, @@ -50,32 +198,26 @@ "special_defence": 2, "speed": 0 }, - "experienceGroup": "fast", - "eggCycles": 40, - "eggGroups": [ - "fairy" - ], "moves": [ - "1:playnice", "1:storedpower", + "1:playnice", "5:batonpass", "10:disarmingvoice", "15:psybeam", "20:helpinghand", "25:followme", - "30:aromatherapy", "30:healingwish", "35:psychic", "40:calmmind", "45:guardsplit", "50:psychicterrain", + "egg:aromatherapy", "egg:fakeout", "egg:healpulse", "egg:psychoshift", "egg:psychup", "tm:alluringvoice", "tm:allyswitch", - "tm:attract", "tm:batonpass", "tm:bodyslam", "tm:calmmind", @@ -87,7 +229,6 @@ "tm:endure", "tm:energyball", "tm:facade", - "tm:futuresight", "tm:guardswap", "tm:helpinghand", "tm:hypervoice", @@ -106,143 +247,68 @@ "tm:psyshock", "tm:reflect", "tm:rest", - "tm:round", "tm:safeguard", "tm:shadowball", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:storedpower", "tm:substitute", "tm:swift", "tm:takedown", "tm:terablast", + "tm:terrainpulse", "tm:trick", "tm:trickroom", "tm:zenheadbutt", - "tutor:expandingforce", - "tutor:terrainpulse" + "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", + "legacy:attract", + "legacy:expandingforce", + "legacy:futuresight", + "legacy:round", + "legacy:snore" ], - "labels": [ - "gen8" - ], - "aspects": [ - "female" - ], - "height": 9, - "weight": 280, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false } ], - "baseExperienceYield": 166, - "experienceGroup": "fast", - "eggCycles": 40, - "eggGroups": [ - "fairy" - ], - "moves": [ - "1:playnice", - "1:storedpower", - "5:encore", - "10:disarmingvoice", - "15:psybeam", - "20:helpinghand", - "25:afteryou", - "30:aromatherapy", - "30:healingwish", - "35:psychic", - "40:calmmind", - "45:powersplit", - "50:psychicterrain", - "55:lastresort", - "egg:extrasensory", - "egg:fakeout", - "egg:psychup", - "tm:allyswitch", - "tm:attract", - "tm:bodyslam", - "tm:calmmind", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:futuresight", - "tm:gravity", - "tm:helpinghand", - "tm:hypervoice", - "tm:imprison", - "tm:magicalleaf", - "tm:magicroom", - "tm:metronome", - "tm:mysticalfire", - "tm:payday", - "tm:playrough", - "tm:powerswap", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:rest", - "tm:round", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:triattack", - "tm:trick", - "tm:trickroom", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:expandingforce", - "tutor:terrainpulse" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.indeedee.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 140, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 9, - "weight": 280, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:bluk_berry", - "percentage": 5.0 + "behaviour": { + "herd": { + "toleratedLeaders": [ + { + "pokemon": "indeedee", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true } - ] + }, + "combat": { + "willDefendOwner": true + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } } -} +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json b/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json new file mode 100644 index 000000000..46a49de5c --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation8/kubfu.json @@ -0,0 +1,177 @@ +{ + "implemented": true, + "nationalPokedexNumber": 891, + "name": "Kubfu", + "primaryType": "fighting", + "maleRatio": 0.875, + "height": 6, + "weight": 120, + "pokedex": [ + "cobblemon.species.kubfu.desc" + ], + "labels": [ + "gen8", + "legendary" + ], + "aspects": [], + "abilities": [ + "innerfocus", + "h:innerfocus" + ], + "eggGroups": [ + "undiscovered" + ], + "baseStats": { + "hp": 60, + "attack": 90, + "defence": 60, + "special_attack": 53, + "special_defence": 50, + "speed": 72 + }, + "evYield": { + "hp": 0, + "attack": 1, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 77, + "experienceGroup": "slow", + "catchRate": 3, + "eggCycles": 120, + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "moves": [ + "1:rocksmash", + "1:leer", + "4:endure", + "8: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:bodyslam", + "tm:brickbreak", + "tm:bulkup", + "tm:closecombat", + "tm:dig", + "tm:doubleedge", + "tm:endure", + "tm:facade", + "tm:firepunch", + "tm:fling", + "tm:focusenergy", + "tm:focuspunch", + "tm:headbutt", + "tm:helpinghand", + "tm:icepunch", + "tm:ironhead", + "tm:lowkick", + "tm:lowsweep", + "tm:megakick", + "tm:megapunch", + "tm:metalclaw", + "tm:protect", + "tm:rest", + "tm:retaliate", + "tm:revenge", + "tm:reversal", + "tm:rocksmash", + "tm:scaryface", + "tm:sleeptalk", + "tm:substitute", + "tm:superpower", + "tm:swordsdance", + "tm:takedown", + "tm:terablast", + "tm:thunderpunch", + "tm:uturn", + "tm:workup", + "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", + "legacy:attract", + "legacy:coaching", + "legacy:round", + "legacy:snore" + ], + "evolutions": [ + { + "id": "kubfu_urshifu", + "variant": "item_interact", + "result": "urshifu wushu_style=single_strike", + "consumeHeldItem": false, + "learnableMoves": [ + "wickedblow" + ], + "requirements": [], + "requiredContext": "cobblemon:scroll_of_darkness" + }, + { + "id": "kubfu_urshifurapidstrike", + "variant": "item_interact", + "result": "urshifu wushu_style=rapid_strike", + "consumeHeldItem": false, + "learnableMoves": [ + "surgingstrikes" + ], + "requirements": [], + "requiredContext": "cobblemon:scroll_of_waters" + } + ], + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "urshifu", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json b/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json deleted file mode 100644 index bca7967c9..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/morpeko.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "name": "Morpeko", - "nationalPokedexNumber": 877, - "primaryType": "electric", - "secondaryType": "dark", - "abilities": [ - "hungerswitch" - ], - "baseStats": { - "hp": 58, - "attack": 95, - "defence": 58, - "special_attack": 70, - "special_defence": 58, - "speed": 97 - }, - "catchRate": 180, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 153, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "field", - "fairy" - ], - "moves": [ - "1:tailwhip", - "1:thundershock", - "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:attract", - "tm:batonpass", - "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:faketears", - "tm:firefang", - "tm:fling", - "tm:foulplay", - "tm:icefang", - "tm:knockoff", - "tm:lashout", - "tm:nastyplot", - "tm:outrage", - "tm:payback", - "tm:protect", - "tm:psychicfangs", - "tm:rest", - "tm:revenge", - "tm:reversal", - "tm:round", - "tm:scaryface", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:spite", - "tm:stompingtantrum", - "tm:substitute", - "tm:superfang", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderpunch", - "tm:thunderwave", - "tm:uproar", - "tm:voltswitch", - "tm:wildcharge", - "tutor:lashout", - "tutor:risingvoltage" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.morpeko.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "height": 3, - "weight": 30, - "forms": [ - { - "name": "Hangry", - "primaryType": "electric", - "secondaryType": "dark", - "abilities": [ - "hungerswitch" - ], - "baseStats": { - "hp": 58, - "attack": 95, - "defence": 58, - "special_attack": 70, - "special_defence": 58, - "speed": 97 - }, - "catchRate": 180, - "maleRatio": 0.5, - "baseExperienceYield": 153, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 10, - "eggGroups": [ - "field", - "fairy" - ], - "labels": [ - "gen8" - ], - "aspects": [ - "hangry" - ], - "height": 3, - "weight": 30, - "cannotDynamax": false, - "battleOnly": true - } - ], - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:roseli_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json b/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json deleted file mode 100644 index f1016a76a..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/mrrime.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "name": "Mr. Rime", - "nationalPokedexNumber": 866, - "primaryType": "ice", - "secondaryType": "psychic", - "abilities": [ - "tangledfeet", - "screencleaner", - "h:icebody" - ], - "baseStats": { - "hp": 80, - "attack": 85, - "defence": 75, - "special_attack": 110, - "special_defence": 100, - "speed": 70 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 182, - "experienceGroup": "medium_fast", - "eggCycles": 25, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:afteryou", - "1:batonpass", - "1:block", - "1:copycat", - "1:dazzlinggleam", - "1:encore", - "1:faketears", - "1:iceshard", - "1:lightscreen", - "1:mimic", - "1:mistyterrain", - "1:pound", - "1:protect", - "1:rapidspin", - "1:recycle", - "1:reflect", - "1:roleplay", - "1:safeguard", - "1:slackoff", - "12:confusion", - "16:allyswitch", - "20:icywind", - "24:doublekick", - "28:psybeam", - "32:hypnosis", - "36:mirrorcoat", - "40:suckerpunch", - "44:freezedry", - "48:psychic", - "52:teeterdance", - "tm:allyswitch", - "tm:attract", - "tm:avalanche", - "tm:batonpass", - "tm:blizzard", - "tm:bodyslam", - "tm:brickbreak", - "tm:calmmind", - "tm:charm", - "tm:dazzlinggleam", - "tm:drainpunch", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:faketears", - "tm:fling", - "tm:focusblast", - "tm:foulplay", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:guardswap", - "tm:hail", - "tm:helpinghand", - "tm:hyperbeam", - "tm:icebeam", - "tm:icepunch", - "tm:iciclespear", - "tm:icywind", - "tm:irondefense", - "tm:lightscreen", - "tm:magicroom", - "tm:megakick", - "tm:megapunch", - "tm:metronome", - "tm:mistyterrain", - "tm:nastyplot", - "tm:payback", - "tm:powerswap", - "tm:protect", - "tm:psychic", - "tm:psychicterrain", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:round", - "tm:safeguard", - "tm:screech", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:taunt", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:wonderroom", - "tm:zenheadbutt", - "tutor:expandingforce", - "tutor:tripleaxel" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.mrrime.desc" - ], - "preEvolution": "mrmime galarian", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 15, - "weight": 582, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:aspear_berry", - "percentage": 10.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 3f14c4dfb..79ae3e13c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/orbeetle.json @@ -1,13 +1,27 @@ { - "name": "Orbeetle", + "implemented": true, "nationalPokedexNumber": 826, + "name": "Orbeetle", "primaryType": "bug", "secondaryType": "psychic", + "maleRatio": 0.5, + "height": 4, + "weight": 408, + "pokedex": [ + "cobblemon.species.orbeetle.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "swarm", "frisk", "h:telepathy" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 60, "attack": 45, @@ -16,67 +30,42 @@ "special_defence": 120, "speed": 90 }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "bug", - "secondaryType": "psychic", - "abilities": [ - "swarm", - "frisk", - "h:telepathy" - ], - "baseStats": { - "hp": 60, - "attack": 45, - "defence": 110, - "special_attack": 80, - "special_defence": 120, - "speed": 90 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 253, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 140, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 3, + "speed": 0 + }, "baseExperienceYield": 253, "experienceGroup": "medium_fast", + "catchRate": 45, "eggCycles": 15, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:psychic_seed", + "percentage": 10.0 + }, + { + "item": "cobblemon:razz_berry", + "percentage": 10.0 + } + ] + }, "moves": [ - "1:confusion", - "1:lightscreen", "1:reflect", + "1:lightscreen", + "1:confusion", "1:strugglebug", "4:confuseray", "8:magiccoat", @@ -90,15 +79,21 @@ "40:afteryou", "44:calmmind", "48:psychicterrain", + "egg:infestation", + "egg:recover", + "egg:stickyweb", + "egg:supersonic", + "tm:afteryou", "tm:agility", "tm:allyswitch", - "tm:attract", "tm:batonpass", "tm:bodypress", "tm:bugbuzz", "tm:calmmind", + "tm:confuseray", "tm:endure", "tm:energyball", + "tm:expandingforce", "tm:facade", "tm:futuresight", "tm:gigadrain", @@ -107,70 +102,111 @@ "tm:helpinghand", "tm:hyperbeam", "tm:imprison", + "tm:infestation", "tm:irondefense", "tm:leechlife", "tm:lightscreen", + "tm:magiccoat", "tm:magicroom", "tm:payback", "tm:powerswap", "tm:protect", + "tm:psybeam", "tm:psychic", "tm:psychicterrain", "tm:psychocut", "tm:psyshock", "tm:reflect", "tm:rest", - "tm:round", "tm:safeguard", "tm:shadowball", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:solarbeam", "tm:storedpower", + "tm:strugglebug", "tm:substitute", + "tm:terablast", "tm:trick", "tm:trickroom", "tm:uturn", "tm:wonderroom", "tm:zenheadbutt", - "tutor:expandingforce" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.orbeetle.desc" + "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", + "legacy:attract", + "legacy:round", + "legacy:snore" ], "preEvolution": "dottler", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 3, - "speed": 0 - }, - "height": 4, - "weight": 408, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:razz_berry", - "percentage": 10.0 + "forms": [ + { + "name": "Gmax", + "primaryType": "bug", + "secondaryType": "psychic", + "maleRatio": 0.5, + "height": 140, + "weight": 0, + "pokedex": [ + "cobblemon.species.orbeetle-gmax.desc" + ], + "labels": [ + "gen8", + "gmax" + ], + "aspects": [ + "gmax" + ], + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + } + ], + "behaviour": { + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json b/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json deleted file mode 100644 index aaca445cb..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/pincurchin.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "name": "Pincurchin", - "nationalPokedexNumber": 871, - "primaryType": "electric", - "abilities": [ - "lightningrod", - "h:electricsurge" - ], - "baseStats": { - "hp": 48, - "attack": 101, - "defence": 95, - "special_attack": 91, - "special_defence": 85, - "speed": 15 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 152, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "amorphous" - ], - "moves": [ - "1:peck", - "1:thundershock", - "5:watergun", - "10:charge", - "15:furyattack", - "20:spark", - "25:bubblebeam", - "30:recover", - "35:curse", - "40:electricterrain", - "45:poisonjab", - "50:zingzap", - "55:acupressure", - "60:discharge", - "egg:memento", - "egg:suckerpunch", - "tm:assurance", - "tm:attract", - "tm:bodyslam", - "tm:brine", - "tm:charge", - "tm:chargebeam", - "tm:chillingwater", - "tm:curse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:gigaimpact", - "tm:hex", - "tm:hydropump", - "tm:hyperbeam", - "tm:liquidation", - "tm:muddywater", - "tm:painsplit", - "tm:payback", - "tm:pinmissile", - "tm:poisonjab", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:reversal", - "tm:round", - "tm:scald", - "tm:selfdestruct", - "tm:sleeptalk", - "tm:snore", - "tm:spikes", - "tm:substitute", - "tm:supercellslam", - "tm:surf", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxicspikes", - "tm:venomdrench", - "tm:venoshock", - "tm:wildcharge", - "tutor:risingvoltage" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.pincurchin.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 10, - "aspects": [], - "cannotDynamax": false, - "implemented": true -} \ 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 deleted file mode 100644 index ce69dff23..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/polteageist.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "name": "Polteageist", - "nationalPokedexNumber": 855, - "primaryType": "ghost", - "abilities": [ - "weakarmor", - "h:cursedbody" - ], - "baseStats": { - "hp": 60, - "attack": 65, - "defence": 65, - "special_attack": 134, - "special_defence": 114, - "speed": 70 - }, - "catchRate": 60, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Antique", - "primaryType": "ghost", - "abilities": [ - "weakarmor", - "h:cursedbody" - ], - "baseStats": { - "hp": 60, - "attack": 65, - "defence": 65, - "special_attack": 134, - "special_defence": 114, - "speed": 70 - }, - "catchRate": 60, - "maleRatio": -1, - "baseExperienceYield": 178, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "undiscovered" - ], - "labels": [ - "gen8" - ], - "aspects": [ - "antique" - ], - "height": 2, - "weight": 4, - "preEvolution": "sinistea antique", - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 178, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "mineral", - "amorphous" - ], - "moves": [ - "1:aromaticmist", - "1:astonish", - "1:megadrain", - "1:strengthsap", - "1:withdraw", - "18:protect", - "24:suckerpunch", - "30:aromatherapy", - "30:sweetscent", - "36:gigadrain", - "42:nastyplot", - "48:shadowball", - "54:memento", - "60:shellsmash", - "66:curse", - "tm:allyswitch", - "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: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:round", - "tm:selfdestruct", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:terablast", - "tm:trick", - "tm:trickroom", - "tm:willowisp", - "tm:wonderroom", - "tutor:poltergeist" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.polteageist.desc" - ], - "preEvolution": "sinistea", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 2, - "weight": 4, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:spell_tag", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 7ee973463..3cbb7469d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/regidrago.json @@ -1,9 +1,25 @@ { - "name": "Regidrago", + "implemented": true, "nationalPokedexNumber": 895, + "name": "Regidrago", "primaryType": "dragon", + "maleRatio": -1, + "height": 21, + "weight": 2000, + "pokedex": [ + "cobblemon.species.regidrago.desc" + ], + "labels": [ + "gen8", + "legendary" + ], + "aspects": [], "abilities": [ - "dragonsmaw" + "dragonsmaw", + "h:dragonsmaw" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 200, @@ -13,15 +29,56 @@ "special_defence": 50, "speed": 80 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 2, + "height": 2.75, + "fixed": false + }, + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "regigigas", + "tier": 1 + } + ] + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, "moves": [ "1:twister", "1:visegrip", @@ -34,10 +91,10 @@ "48:dragondance", "54:thrash", "60:focusenergy", - "60:laserfocus", "66:dragonenergy", "72:hyperbeam", "78:explosion", + "tm:ancientpower", "tm:bodyslam", "tm:breakingswipe", "tm:crunch", @@ -49,61 +106,48 @@ "tm:earthpower", "tm:earthquake", "tm:endure", + "tm:explosion", "tm:facade", "tm:firefang", "tm:focusenergy", "tm:gigaimpact", "tm:hyperbeam", "tm:icefang", + "tm:laserfocus", "tm:lightscreen", "tm:outrage", "tm:protect", "tm:reflect", "tm:rest", "tm:reversal", - "tm:round", "tm:scaleshot", "tm:selfdestruct", "tm:sleeptalk", - "tm:snore", "tm:substitute", "tm:swift", "tm:takedown", "tm:terablast", "tm:thunderfang", + "tm:twister", + "tutor:ancientpower", "tutor:dracometeor", - "tutor:dragonclaw", - "tutor:dragonenergy", - "tutor:hammerarm", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:firefang", + "tutor:focusenergy", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icefang", "tutor:laserfocus", - "tutor:scaleshot" + "tutor:outrage", + "tutor:rest", + "tutor:scaleshot", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderfang", + "tutor:twister", + "legacy:round", + "legacy:snore" ], - "labels": [ - "gen8", - "legendary" - ], - "pokedex": [ - "cobblemon.species.regidrago.desc" - ], - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 21, - "weight": 2000, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "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 6cf8e2dd7..7d519dee4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/regieleki.json @@ -1,9 +1,25 @@ { - "name": "Regieleki", + "implemented": true, "nationalPokedexNumber": 894, + "name": "Regieleki", "primaryType": "electric", + "maleRatio": -1, + "height": 12, + "weight": 1450, + "pokedex": [ + "cobblemon.species.regieleki.desc" + ], + "labels": [ + "gen8", + "legendary" + ], + "aspects": [], "abilities": [ - "transistor" + "transistor", + "h:transistor" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 80, @@ -13,18 +29,28 @@ "special_defence": 50, "speed": 200 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 3 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1.5, + "height": 2.5, + "fixed": false + }, "moves": [ - "1:rapidspin", "1:thundershock", + "1:rapidspin", "6:electroweb", "12:ancientpower", "18:shockwave", @@ -40,6 +66,7 @@ "78:explosion", "tm:acrobatics", "tm:agility", + "tm:ancientpower", "tm:assurance", "tm:bodyslam", "tm:bounce", @@ -50,19 +77,21 @@ "tm:electroball", "tm:electroweb", "tm:endure", + "tm:explosion", "tm:facade", "tm:gigaimpact", "tm:hyperbeam", "tm:lightscreen", + "tm:magnetrise", "tm:protect", "tm:raindance", "tm:reflect", "tm:rest", - "tm:round", + "tm:risingvoltage", "tm:screech", "tm:selfdestruct", + "tm:shockwave", "tm:sleeptalk", - "tm:snore", "tm:substitute", "tm:supercellslam", "tm:swift", @@ -73,38 +102,57 @@ "tm:thunderwave", "tm:voltswitch", "tm:wildcharge", - "tutor:lockon", + "tutor:ancientpower", + "tutor:bounce", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:magnetrise", + "tutor:rest", "tutor:risingvoltage", - "tutor:thrash", - "tutor:thundercage", - "tutor:zapcannon" - ], - "labels": [ - "gen8", - "legendary" - ], - "pokedex": [ - "cobblemon.species.regieleki.desc" + "tutor:shockwave", + "tutor:sleeptalk", + "tutor:swift", + "tutor:thunderbolt", + "tutor:wildcharge", + "legacy:round", + "legacy:snore" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 3 + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "regigigas", + "tier": 1 + } + ] + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } }, - "height": 12, - "weight": 1450, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "lightingData": { + "lightLevel": 15, + "liquidGlowMode": "BOTH" + } } \ No newline at end of file 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 82f49281d..cd11bbe32 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/rolycoly.json @@ -1,12 +1,26 @@ { - "name": "Rolycoly", + "implemented": true, "nationalPokedexNumber": 837, + "name": "Rolycoly", "primaryType": "rock", + "maleRatio": 0.5, + "height": 3, + "weight": 120, + "pokedex": [ + "cobblemon.species.rolycoly.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "steamengine", "heatproof", "h:flashfire" ], + "eggGroups": [ + "mineral" + ], "baseStats": { "hp": 30, "attack": 40, @@ -15,18 +29,82 @@ "special_defence": 50, "speed": 30 }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 48, "experienceGroup": "medium_slow", + "catchRate": 255, "eggCycles": 15, - "eggGroups": [ - "mineral" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + } + }, + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "rolycoly", + "tier": 1 + }, + { + "pokemon": "carkol", + "tier": 2 + }, + { + "pokemon": "coalossal", + "tier": 3 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "combat": { + "willDefendOwner": true + }, + "fireImmune": true + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:coal", + "quantityRange": "0-1" + }, + { + "item": "cobblemon:black_augurite", + "percentage": 2.5 + }, + { + "item": "cobblemon:passho_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:smokescreen", "1:tackle", + "1:smokescreen", "5:rapidspin", "10:smackdown", "15:rockpolish", @@ -38,15 +116,18 @@ "egg:block", "egg:explosion", "egg:mudslap", - "tm:attract", + "tm:ancientpower", + "tm:block", "tm:bodyslam", "tm:bulldoze", "tm:curse", "tm:dig", "tm:endure", + "tm:explosion", "tm:facade", "tm:gyroball", "tm:heatcrash", + "tm:incinerate", "tm:irondefense", "tm:ironhead", "tm:meteorbeam", @@ -56,15 +137,14 @@ "tm:reflect", "tm:rest", "tm:rockblast", + "tm:rockpolish", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:sandstorm", "tm:sandtomb", "tm:selfdestruct", "tm:sleeptalk", "tm:smackdown", - "tm:snore", "tm:spikes", "tm:stealthrock", "tm:stoneedge", @@ -73,13 +153,22 @@ "tm:temperflare", "tm:terablast", "tm:willowisp", - "tutor:meteorbeam" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.rolycoly.desc" + "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", + "legacy:attract", + "legacy:round", + "legacy:snore" ], "evolutions": [ { @@ -97,42 +186,5 @@ } ] } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 120, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:coal", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:black_augurite", - "percentage": 2.5 - }, - { - "item": "cobblemon:passho_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true + ] } \ No newline at end of file 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 40e0e2466..a0f650a6d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/runerigus.json @@ -1,10 +1,28 @@ { - "name": "Runerigus", + "implemented": true, "nationalPokedexNumber": 867, + "name": "Runerigus", "primaryType": "ground", "secondaryType": "ghost", + "maleRatio": 0.5, + "height": 16, + "weight": 666, + "pokedex": [ + "cobblemon.species.runerigus.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [ + "galarian" + ], "abilities": [ - "wanderingspirit" + "wanderingspirit", + "h:wanderingspirit" + ], + "eggGroups": [ + "mineral", + "amorphous" ], "baseStats": { "hp": 58, @@ -14,22 +32,41 @@ "special_defence": 105, "speed": 30 }, - "catchRate": 90, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 169, "experienceGroup": "medium_fast", + "catchRate": 90, "eggCycles": 25, - "eggGroups": [ - "mineral", - "amorphous" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:kasib_berry", + "percentage": 5.0 + } + ] + }, "moves": [ + "1:shadowclaw", + "1:scaryface", "1:astonish", + "1:protect", "1:haze", "1:nightshade", - "1:protect", - "1:scaryface", "12:disable", "16:brutalswing", "20:craftyshield", @@ -39,16 +76,17 @@ "38:curse", "44:shadowball", "50:earthquake", - "56:guardsplit", "56:powersplit", + "56:guardsplit", "62:destinybond", + "egg:memento", "tm:allyswitch", "tm:amnesia", - "tm:attract", "tm:bodypress", "tm:brutalswing", "tm:bulldoze", "tm:calmmind", + "tm:curse", "tm:darkpulse", "tm:dragonpulse", "tm:earthpower", @@ -60,13 +98,16 @@ "tm:gigaimpact", "tm:grassknot", "tm:guardswap", + "tm:haze", "tm:hex", "tm:hyperbeam", "tm:imprison", "tm:irondefense", "tm:nastyplot", + "tm:nightshade", "tm:payback", "tm:phantomforce", + "tm:poltergeist", "tm:powerswap", "tm:protect", "tm:psychic", @@ -76,7 +117,6 @@ "tm:rockblast", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:safeguard", "tm:sandstorm", "tm:sandtomb", @@ -85,11 +125,11 @@ "tm:shadowclaw", "tm:skillswap", "tm:sleeptalk", - "tm:snore", "tm:stealthrock", "tm:stoneedge", "tm:substitute", "tm:taunt", + "tm:terablast", "tm:thief", "tm:toxicspikes", "tm:trick", @@ -97,43 +137,58 @@ "tm:willowisp", "tm:wonderroom", "tm:zenheadbutt", - "tutor:poltergeist" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.runerigus.desc" + "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:stealthrock", + "tutor:stoneedge", + "tutor:trick", + "tutor:wonderroom", + "tutor:zenheadbutt", + "legacy:attract", + "legacy:round", + "legacy:snore" ], "preEvolution": "yamask galarian", "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 16, - "weight": 666, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:kasib_berry", - "percentage": 5.0 + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json b/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json deleted file mode 100644 index 0fffb47b5..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/sandaconda.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "name": "Sandaconda", - "nationalPokedexNumber": 844, - "primaryType": "ground", - "abilities": [ - "sandspit", - "shedskin", - "h:sandveil" - ], - "baseStats": { - "hp": 72, - "attack": 107, - "defence": 125, - "special_attack": 65, - "special_defence": 70, - "speed": 71 - }, - "catchRate": 120, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Gmax", - "primaryType": "ground", - "abilities": [ - "sandspit", - "shedskin", - "h:sandveil" - ], - "baseStats": { - "hp": 72, - "attack": 107, - "defence": 125, - "special_attack": 65, - "special_defence": 70, - "speed": 71 - }, - "catchRate": 120, - "maleRatio": 0.5, - "baseExperienceYield": 179, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field", - "dragon" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 220, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 179, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field", - "dragon" - ], - "moves": [ - "1:brutalswing", - "1:minimize", - "1:sandattack", - "1:skullbash", - "1:wrap", - "15:bulldoze", - "20:headbutt", - "25:glare", - "30:dig", - "35:sandstorm", - "42:slam", - "49:coil", - "51:sandtomb", - "tm:attract", - "tm:bodypress", - "tm:bodyslam", - "tm:brutalswing", - "tm:bulldoze", - "tm:dig", - "tm:drillrun", - "tm:earthpower", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:gigaimpact", - "tm:highhorsepower", - "tm:hurricane", - "tm:hyperbeam", - "tm:irondefense", - "tm:ironhead", - "tm:mudshot", - "tm:mudslap", - "tm:outrage", - "tm:poisontail", - "tm:protect", - "tm:rest", - "tm:rockblast", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaleshot", - "tm:scaryface", - "tm:scorchingsands", - "tm:screech", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snore", - "tm:stealthrock", - "tm:stoneedge", - "tm:substitute", - "tm:takedown", - "tm:terablast", - "tm:thunderfang", - "tm:zenheadbutt", - "tutor:scaleshot", - "tutor:scorchingsands", - "tutor:skittersmack" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.sandaconda.desc" - ], - "preEvolution": "silicobra", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 38, - "weight": 655, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:soft_sand", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json b/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json deleted file mode 100644 index 83fd0561f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/silicobra.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "name": "Silicobra", - "nationalPokedexNumber": 843, - "primaryType": "ground", - "abilities": [ - "sandspit", - "shedskin", - "h:sandveil" - ], - "baseStats": { - "hp": 52, - "attack": 57, - "defence": 75, - "special_attack": 35, - "special_defence": 50, - "speed": 46 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 63, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field", - "dragon" - ], - "moves": [ - "1:sandattack", - "1:wrap", - "5:minimize", - "10:brutalswing", - "15:bulldoze", - "20:headbutt", - "25:glare", - "30:dig", - "35:sandstorm", - "40:slam", - "45:coil", - "50:sandtomb", - "egg:belch", - "egg:dragonrush", - "egg:lastresort", - "egg:mudslap", - "egg:poisontail", - "tm:attract", - "tm:bodyslam", - "tm:brutalswing", - "tm:bulldoze", - "tm:dig", - "tm:drillrun", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:mudshot", - "tm:mudslap", - "tm:poisontail", - "tm:protect", - "tm:rest", - "tm:rockblast", - "tm:rockslide", - "tm:rocktomb", - "tm:round", - "tm:sandstorm", - "tm:sandtomb", - "tm:scaleshot", - "tm:scaryface", - "tm:scorchingsands", - "tm:screech", - "tm:skittersmack", - "tm:sleeptalk", - "tm:snore", - "tm:stealthrock", - "tm:stoneedge", - "tm:substitute", - "tm:takedown", - "tm:terablast", - "tutor:scaleshot", - "tutor:scorchingsands", - "tutor:skittersmack" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.silicobra.desc" - ], - "evolutions": [ - { - "id": "silicobra_sandaconda", - "variant": "level_up", - "result": "sandaconda", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 36 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 22, - "weight": 76, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:soft_sand", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json b/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json deleted file mode 100644 index baa05a6e1..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/sinistea.json +++ /dev/null @@ -1,235 +0,0 @@ -{ - "name": "Sinistea", - "nationalPokedexNumber": 854, - "primaryType": "ghost", - "abilities": [ - "weakarmor", - "h:cursedbody" - ], - "baseStats": { - "hp": 40, - "attack": 45, - "defence": 45, - "special_attack": 74, - "special_defence": 54, - "speed": 50 - }, - "catchRate": 120, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Antique", - "primaryType": "ghost", - "abilities": [ - "weakarmor", - "h:cursedbody" - ], - "baseStats": { - "hp": 40, - "attack": 45, - "defence": 45, - "special_attack": 74, - "special_defence": 54, - "speed": 50 - }, - "catchRate": 120, - "maleRatio": -1, - "baseExperienceYield": 62, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:astonish", - "1:withdraw", - "6:aromaticmist", - "12:megadrain", - "24:suckerpunch", - "30:sweetscent", - "36:gigadrain", - "42:nastyplot", - "48:shadowball", - "54:memento", - "60:shellsmash", - "egg:allyswitch", - "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:metronome", - "tm:nastyplot", - "tm:nightshade", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psyshock", - "tm:rest", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:terablast", - "tm:trick", - "tm:trickroom", - "tm:willowisp", - "tutor:aromatherapy", - "tutor:celebrate", - "tutor:memento", - "tutor:metronome" - ], - "labels": [ - "gen8" - ], - "aspects": [ - "antique" - ], - "height": 1, - "weight": 2, - "evolutions": [ - { - "id": "sinistea_polteageist", - "variant": "item_interact", - "result": "polteageist antique", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "cobblemon:chipped_pot" - } - ], - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseExperienceYield": 62, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "mineral", - "amorphous" - ], - "moves": [ - "1:astonish", - "1:withdraw", - "6:aromaticmist", - "12:megadrain", - "18:protect", - "24:suckerpunch", - "30:aromatherapy", - "30:sweetscent", - "36:gigadrain", - "42:nastyplot", - "48:shadowball", - "54:memento", - "60:shellsmash", - "egg:allyswitch", - "tm:allyswitch", - "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:metronome", - "tm:nastyplot", - "tm:nightshade", - "tm:payback", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psyshock", - "tm:rest", - "tm:round", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:snore", - "tm:spite", - "tm:storedpower", - "tm:substitute", - "tm:terablast", - "tm:trick", - "tm:trickroom", - "tm:willowisp", - "tm:wonderroom", - "tutor:poltergeist" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.sinistea.desc" - ], - "evolutions": [ - { - "id": "sinistea_polteageist", - "variant": "item_interact", - "result": "polteageist", - "consumeHeldItem": false, - "learnableMoves": [ - "teatime" - ], - "requirements": [], - "requiredContext": "cobblemon:cracked_pot" - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 1, - "weight": 2, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:spell_tag", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json b/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json deleted file mode 100644 index 0d6b2ed03..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/skwovet.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "name": "Skwovet", - "nationalPokedexNumber": 819, - "primaryType": "normal", - "abilities": [ - "cheekpouch", - "h:gluttony" - ], - "baseStats": { - "hp": 70, - "attack": 55, - "defence": 55, - "special_attack": 35, - "special_defence": 35, - "speed": 25 - }, - "catchRate": 255, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 55, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:tackle", - "1:tailwhip", - "5:bite", - "10:stuffcheeks", - "15:spitup", - "15:stockpile", - "15:swallow", - "20:bodyslam", - "25:rest", - "30:counter", - "35:bulletseed", - "40:superfang", - "45:belch", - "egg:bellydrum", - "egg:defensecurl", - "egg:lastresort", - "egg:rollout", - "tm:amnesia", - "tm:assurance", - "tm:attract", - "tm:bodyslam", - "tm:brutalswing", - "tm:bulletseed", - "tm:crunch", - "tm:curse", - "tm:dig", - "tm:doubleedge", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:gyroball", - "tm:hypervoice", - "tm:irontail", - "tm:mudshot", - "tm:mudslap", - "tm:payback", - "tm:protect", - "tm:rest", - "tm:round", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:superfang", - "tm:tailslap", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:trailblaze", - "tm:uproar" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.skwovet.desc" - ], - "evolutions": [ - { - "id": "skwovet_greedent", - "variant": "level_up", - "result": "greedent", - "consumeHeldItem": false, - "learnableMoves": [ - "covet" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 24 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 25, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:oran_berry", - "quantityRange": "0-1" - } - ] - }, - "implemented": true -} \ No newline at end of file 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 2441cf168..c4c8f3fc7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/snom.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/snom.json @@ -1,12 +1,26 @@ { - "name": "Snom", + "implemented": true, "nationalPokedexNumber": 872, + "name": "Snom", "primaryType": "ice", "secondaryType": "bug", + "maleRatio": 0.5, + "height": 3, + "weight": 38, + "pokedex": [ + "cobblemon.species.snom.desc" + ], + "labels": [ + "gen8" + ], + "aspects": [], "abilities": [ "shielddust", "h:icescales" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 30, "attack": 25, @@ -15,25 +29,74 @@ "special_defence": 30, "speed": 20 }, - "catchRate": 190, - "maleRatio": 0.5, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 1, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 37, "experienceGroup": "medium_fast", + "catchRate": 190, "eggCycles": 20, - "eggGroups": [ - "bug" - ], + "baseFriendship": 50, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "snom", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + } + }, + "drops": { + "amount": 3, + "entries": [ + { + "item": "minecraft:snowball", + "quantityRange": "0-1" + }, + { + "item": "cobblemon:silver_powder", + "percentage": 2.5 + }, + { + "item": "cobblemon:charti_berry", + "percentage": 2.5 + } + ] + }, "moves": [ "1:powdersnow", "1:strugglebug", "egg:bugbite", "egg:fairywind", "egg:mirrorcoat", - "tm:attract", "tm:bugbite", "tm:bugbuzz", - "tm:endure", "tm:facade", "tm:iciclespear", "tm:icywind", @@ -41,20 +104,20 @@ "tm:pounce", "tm:protect", "tm:rest", - "tm:round", "tm:skittersmack", "tm:sleeptalk", - "tm:snore", "tm:strugglebug", "tm:substitute", "tm:terablast", - "tutor:skittersmack" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.snom.desc" + "tutor:bugbite", + "tutor:icywind", + "tutor:rest", + "tutor:skittersmack", + "tutor:sleeptalk", + "legacy:attract", + "legacy:endure", + "legacy:round", + "legacy:snore" ], "evolutions": [ { @@ -76,42 +139,5 @@ } ] } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 3, - "weight": 38, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:snowball", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:silver_powder", - "percentage": 2.5 - }, - { - "item": "cobblemon:charti_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true + ] } \ No newline at end of file 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 864ade009..a22ef14d2 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/spectrier.json @@ -1,9 +1,25 @@ { - "name": "Spectrier", + "implemented": true, "nationalPokedexNumber": 897, + "name": "Spectrier", "primaryType": "ghost", + "maleRatio": -1, + "height": 20, + "weight": 445, + "pokedex": [ + "cobblemon.species.spectrier.desc" + ], + "labels": [ + "gen8", + "legendary" + ], + "aspects": [], "abilities": [ - "grimneigh" + "grimneigh", + "h:grimneigh" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -13,15 +29,25 @@ "special_defence": 80, "speed": 130 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 0, + "special_attack": 3, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 290, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 35, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, "moves": [ "1:tackle", "1:tailwhip", @@ -67,49 +93,81 @@ "tm:psychic", "tm:psychocut", "tm:rest", - "tm:round", "tm:scaryface", "tm:shadowball", "tm:sleeptalk", "tm:snarl", - "tm:snore", "tm:stompingtantrum", "tm:substitute", "tm:swift", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:uproar", "tm:willowisp", + "tutor:bulldoze", + "tutor:calmmind", + "tutor:darkpulse", + "tutor:foulplay", + "tutor:gigaimpact", + "tutor:hyperbeam", "tutor:lashout", - "tutor:nastyplot" - ], - "labels": [ - "gen8", - "legendary" - ], - "pokedex": [ - "cobblemon.species.spectrier.desc" + "tutor:painsplit", + "tutor:poltergeist", + "tutor:psychic", + "tutor:psychocut", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:swift", + "legacy:round", + "legacy:snore", + "legacy:uproar" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 35, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "height": 20, - "weight": 445, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "glastrier", + "tier": 1 + }, + { + "pokemon": "spectrier", + "tier": 2 + }, + { + "pokemon": "calyrex", + "tier": 3 + }, + { + "pokemon": "calyrex ice", + "tier": 4 + }, + { + "pokemon": "calyrex shadow", + "tier": 5 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json b/common/src/main/resources/data/cobblemon/species/generation8/toxel.json deleted file mode 100644 index 5bb8a2f37..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxel.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "name": "Toxel", - "nationalPokedexNumber": 848, - "primaryType": "electric", - "secondaryType": "poison", - "abilities": [ - "rattled", - "static", - "h:klutz" - ], - "baseStats": { - "hp": 40, - "attack": 38, - "defence": 35, - "special_attack": 54, - "special_defence": 35, - "speed": 40 - }, - "catchRate": 75, - "maleRatio": 0.5, - "shoulderMountable": false, - "baseExperienceYield": 48, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:acid", - "1:belch", - "1:flail", - "1:growl", - "1:nuzzle", - "1:tearfullook", - "egg:endeavor", - "egg:metalsound", - "egg:poweruppunch", - "tm:attract", - "tm:charm", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:metalsound", - "tm:protect", - "tm:rest", - "tm:round", - "tm:sleeptalk", - "tm:snore", - "tm:substitute", - "tm:terablast", - "tutor:acid", - "tutor:flail", - "tutor:growl", - "tutor:nuzzle" - ], - "labels": [ - "gen8", - "baby" - ], - "pokedex": [ - "cobblemon.species.toxel.desc" - ], - "evolutions": [ - { - "id": "toxel_toxtricity", - "variant": "level_up", - "result": "toxtricity", - "consumeHeldItem": false, - "learnableMoves": [ - "spark" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 30 - } - ] - }, - { - "id": "toxel_toxtricity", - "variant": "level_up", - "result": "toxtricity lowkey", - "consumeHeldItem": false, - "learnableMoves": [ - "spark" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 30 - } - ] - } - ], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "height": 4, - "weight": 110, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:shuca_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json b/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json deleted file mode 100644 index ff0b48b6b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation8/toxtricity.json +++ /dev/null @@ -1,389 +0,0 @@ -{ - "name": "Toxtricity", - "nationalPokedexNumber": 849, - "primaryType": "electric", - "secondaryType": "poison", - "abilities": [ - "punkrock", - "plus", - "h:technician" - ], - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 70, - "special_attack": 114, - "special_defence": 70, - "speed": 75 - }, - "catchRate": 45, - "maleRatio": 0.5, - "shoulderMountable": false, - "forms": [ - { - "name": "Low-Key", - "primaryType": "electric", - "secondaryType": "poison", - "abilities": [ - "punkrock", - "minus", - "h:technician" - ], - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 70, - "special_attack": 114, - "special_defence": 70, - "speed": 75 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 176, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:acid", - "1:acidspray", - "1:belch", - "1:eerieimpulse", - "1:flail", - "1:growl", - "1:leer", - "1:nobleroar", - "1:nuzzle", - "1:tearfullook", - "1:thundershock", - "4:charge", - "8:shockwave", - "12:scaryface", - "16:taunt", - "20:venomdrench", - "24:screech", - "28:swagger", - "32:toxic", - "36:discharge", - "40:poisonjab", - "44:overdrive", - "48:boomburst", - "52:magneticflux", - "tm:acidspray", - "tm:attract", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:drainpunch", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firepunch", - "tm:fling", - "tm:gigaimpact", - "tm:gunkshot", - "tm:helpinghand", - "tm:hex", - "tm:hyperbeam", - "tm:hypervoice", - "tm:megakick", - "tm:megapunch", - "tm:metalsound", - "tm:metronome", - "tm:payback", - "tm:poisonjab", - "tm:poisontail", - "tm:protect", - "tm:psychicnoise", - "tm:raindance", - "tm:rest", - "tm:round", - "tm:scaryface", - "tm:screech", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snarl", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:toxicspikes", - "tm:trailblaze", - "tm:uproar", - "tm:venomdrench", - "tm:venoshock", - "tm:voltswitch", - "tm:wildcharge", - "tutor:risingvoltage" - ], - "labels": [ - "gen8" - ], - "aspects": [ - "low-key" - ], - "height": 16, - "weight": 400, - "preEvolution": "toxel", - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Gmax", - "primaryType": "electric", - "secondaryType": "poison", - "abilities": [ - "punkrock", - "plus", - "h:technician" - ], - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 70, - "special_attack": 114, - "special_defence": 70, - "speed": 75 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 176, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "human_like" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "gmax" - ], - "height": 240, - "weight": 0, - "cannotDynamax": false, - "battleOnly": false - }, - { - "name": "Low-Key-Gmax", - "primaryType": "electric", - "secondaryType": "poison", - "abilities": [ - "punkrock", - "minus", - "h:technician" - ], - "baseStats": { - "hp": 75, - "attack": 98, - "defence": 70, - "special_attack": 114, - "special_defence": 70, - "speed": 75 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 176, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "human_like" - ], - "labels": [ - "gen8", - "gmax" - ], - "aspects": [ - "low-key-gmax" - ], - "height": 240, - "weight": 0, - "cannotDynamax": false, - "battleOnly": true - } - ], - "baseExperienceYield": 176, - "experienceGroup": "medium_slow", - "eggCycles": 25, - "eggGroups": [ - "human_like" - ], - "moves": [ - "1:acid", - "1:acidspray", - "1:belch", - "1:eerieimpulse", - "1:flail", - "1:growl", - "1:leer", - "1:nobleroar", - "1:nuzzle", - "1:tearfullook", - "1:thundershock", - "4:charge", - "8:shockwave", - "12:scaryface", - "16:taunt", - "20:venoshock", - "24:screech", - "28:swagger", - "32:toxic", - "36:discharge", - "40:poisonjab", - "44:overdrive", - "48:boomburst", - "52:shiftgear", - "tm:acidspray", - "tm:attract", - "tm:brickbreak", - "tm:charge", - "tm:chargebeam", - "tm:charm", - "tm:drainpunch", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firepunch", - "tm:fling", - "tm:gigaimpact", - "tm:gunkshot", - "tm:helpinghand", - "tm:hex", - "tm:hyperbeam", - "tm:hypervoice", - "tm:megakick", - "tm:megapunch", - "tm:metalsound", - "tm:metronome", - "tm:payback", - "tm:poisonjab", - "tm:poisontail", - "tm:protect", - "tm:psychicnoise", - "tm:raindance", - "tm:rest", - "tm:round", - "tm:scaryface", - "tm:screech", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:sludgewave", - "tm:snarl", - "tm:snore", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderfang", - "tm:thunderpunch", - "tm:thunderwave", - "tm:toxic", - "tm:toxicspikes", - "tm:trailblaze", - "tm:uproar", - "tm:venoshock", - "tm:voltswitch", - "tm:wildcharge", - "tutor:boomburst", - "tutor:overdrive", - "tutor:risingvoltage", - "tutor:sludgewave" - ], - "labels": [ - "gen8" - ], - "pokedex": [ - "cobblemon.species.toxtricity.desc" - ], - "preEvolution": "toxel", - "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "height": 16, - "weight": 400, - "aspects": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:shuca_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json b/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json new file mode 100644 index 000000000..fc8b88af0 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation8/urshifu.json @@ -0,0 +1,477 @@ +{ + "implemented": true, + "nationalPokedexNumber": 892, + "name": "Urshifu", + "primaryType": "fighting", + "secondaryType": "dark", + "maleRatio": 0.875, + "height": 19, + "weight": 1050, + "pokedex": [ + "cobblemon.species.urshifu.desc" + ], + "labels": [ + "gen8", + "legendary" + ], + "aspects": [ + "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, + "baseScale": 1, + "hitbox": { + "width": 1, + "height": 1, + "fixed": false + }, + "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:crunch", + "tm:darkestlariat", + "tm:darkpulse", + "tm:dig", + "tm:doubleedge", + "tm:drainpunch", + "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: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:workup", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "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", + "legacy:attract", + "legacy:round", + "legacy:snore" + ], + "preEvolution": "kubfu", + "evolutions": [], + "forms": [ + { + "name": "Rapid-Strike", + "primaryType": "fighting", + "secondaryType": "water", + "maleRatio": 0.875, + "height": 19, + "weight": 1050, + "pokedex": [ + "cobblemon.species.urshifu-rapidstrike.desc" + ], + "labels": [ + "gen8", + "legendary" + ], + "aspects": [ + "rapid_strike-style" + ], + "moves": [ + "1:surgingstrikes", + "1:aquajet", + "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:aurasphere", + "tm:bodypress", + "tm:bodyslam", + "tm:brickbreak", + "tm:brine", + "tm:bulkup", + "tm:chillingwater", + "tm:closecombat", + "tm:coaching", + "tm:dig", + "tm:dive", + "tm:doubleedge", + "tm:drainpunch", + "tm:endure", + "tm:facade", + "tm:falseswipe", + "tm:firepunch", + "tm:fling", + "tm:focusblast", + "tm:focusenergy", + "tm:focuspunch", + "tm:gigaimpact", + "tm:headbutt", + "tm:helpinghand", + "tm:icepunch", + "tm:icespinner", + "tm:irondefense", + "tm:ironhead", + "tm:liquidation", + "tm:lowkick", + "tm:lowsweep", + "tm:megakick", + "tm:megapunch", + "tm:poisonjab", + "tm:protect", + "tm:raindance", + "tm:rest", + "tm:retaliate", + "tm:revenge", + "tm:reversal", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:scaryface", + "tm:sleeptalk", + "tm:stoneedge", + "tm:substitute", + "tm:superpower", + "tm:swift", + "tm:swordsdance", + "tm:takedown", + "tm:taunt", + "tm:terablast", + "tm:thunderpunch", + "tm:trailblaze", + "tm:uturn", + "tm:waterfall", + "tm:whirlpool", + "tm:workup", + "tm:zenheadbutt", + "tutor:aerialace", + "tutor:bulkup", + "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", + "legacy:attract", + "legacy:round", + "legacy:scald", + "legacy:snore" + ], + "preEvolution": "kubfu", + "evolutions": [], + "battleOnly": false + }, + { + "name": "Gmax", + "primaryType": "fighting", + "secondaryType": "dark", + "maleRatio": 0.875, + "height": 290, + "weight": 0, + "pokedex": [ + "cobblemon.species.urshifu-gmax.desc" + ], + "labels": [ + "gen8", + "gmax" + ], + "aspects": [ + "gmax", + "single_strike-style" + ], + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + }, + { + "name": "Rapid-Strike-Gmax", + "primaryType": "fighting", + "secondaryType": "water", + "maleRatio": 0.875, + "height": 260, + "weight": 0, + "pokedex": [ + "cobblemon.species.urshifu-rapidstrikegmax.desc" + ], + "labels": [ + "gen8", + "gmax" + ], + "aspects": [ + "gmax", + "rapid_strike-style" + ], + "dynamaxBlocked": true, + "moves": [ + "1:surgingstrikes", + "1:aquajet", + "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:aurasphere", + "tm:bodypress", + "tm:bodyslam", + "tm:brickbreak", + "tm:brine", + "tm:bulkup", + "tm:chillingwater", + "tm:closecombat", + "tm:coaching", + "tm:dig", + "tm:dive", + "tm:doubleedge", + "tm:drainpunch", + "tm:endure", + "tm:facade", + "tm:falseswipe", + "tm:firepunch", + "tm:fling", + "tm:focusblast", + "tm:focusenergy", + "tm:focuspunch", + "tm:gigaimpact", + "tm:headbutt", + "tm:helpinghand", + "tm:icepunch", + "tm:icespinner", + "tm:irondefense", + "tm:ironhead", + "tm:liquidation", + "tm:lowkick", + "tm:lowsweep", + "tm:megakick", + "tm:megapunch", + "tm:poisonjab", + "tm:protect", + "tm:raindance", + "tm:rest", + "tm:retaliate", + "tm:revenge", + "tm:reversal", + "tm:rockslide", + "tm:rocksmash", + "tm:rocktomb", + "tm:scaryface", + "tm:sleeptalk", + "tm:stoneedge", + "tm:substitute", + "tm:superpower", + "tm:swift", + "tm:swordsdance", + "tm:takedown", + "tm:taunt", + "tm:terablast", + "tm:thunderpunch", + "tm:trailblaze", + "tm:uturn", + "tm:waterfall", + "tm:whirlpool", + "tm:workup", + "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 + } + ], + "behaviour": { + "herd": { + "maxSize": "3" + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json index ac8103984..584d0a100 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zacian.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zacian.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 888, "name": "Zacian", "primaryType": "fairy", @@ -51,6 +52,46 @@ "height": 1, "fixed": false }, + "behaviour": { + "entityInteract": { + "avoidedBySkeleton": true + }, + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "zacian", + "tier": 1 + }, + { + "pokemon": "zamazenta", + "tier": 1 + }, + { + "pokemon": "zacian crowned", + "tier": 2 + }, + { + "pokemon": "zamazenta crowned", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, "moves": [ "1:sacredsword", "1:quickguard", @@ -135,7 +176,6 @@ "tutor:laserfocus", "tutor:playrough", "tutor:poisonjab", - "tutor:psychic", "tutor:psychocut", "tutor:rest", "tutor:sleeptalk", @@ -143,7 +183,9 @@ "tutor:steelbeam", "tutor:swift", "tutor:thunderfang", - "tutor:wildcharge" + "tutor:wildcharge", + "legacy:round", + "legacy:snore" ], "evolutions": [], "forms": [ @@ -157,101 +199,6 @@ "pokedex": [ "cobblemon.species.zacian-crowned.desc" ], - "moves": [ - "form_change:behemothblade", - "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: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:hyperbeam", - "tm:hypervoice", - "tm:icefang", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:laserfocus", - "tm:metalclaw", - "tm:mistyterrain", - "tm:playrough", - "tm:poisonjab", - "tm:protect", - "tm:psychicfangs", - "tm:psychocut", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:scaryface", - "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", - "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" - ], "labels": [ "gen8", "legendary", @@ -270,7 +217,39 @@ }, "baseExperienceYield": 350, "evolutions": [], - "battleOnly": true + "battleOnly": true, + "behaviour": { + "herd": { + "maxSize": "5", + "toleratedLeaders": [ + { + "pokemon": "zacian crowned", + "tier": 1 + }, + { + "pokemon": "zamazenta crowned", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "entityInteract": { + "avoidedBySkeleton": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } ], "drops": { 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 99a340596..55e67d002 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zamazenta.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 889, "name": "Zamazenta", "primaryType": "fighting", @@ -51,6 +52,46 @@ "height": 1, "fixed": false }, + "behaviour": { + "entityInteract": { + "avoidedBySkeleton": true + }, + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "zacian", + "tier": 1 + }, + { + "pokemon": "zamazenta", + "tier": 1 + }, + { + "pokemon": "zacian crowned", + "tier": 2 + }, + { + "pokemon": "zamazenta crowned", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, "moves": [ "1:wideguard", "1:metalclaw", @@ -139,7 +180,6 @@ "tutor:irontail", "tutor:laserfocus", "tutor:playrough", - "tutor:psychic", "tutor:rest", "tutor:sleeptalk", "tutor:snarl", @@ -147,7 +187,9 @@ "tutor:stoneedge", "tutor:swift", "tutor:thunderfang", - "tutor:wildcharge" + "tutor:wildcharge", + "legacy:round", + "legacy:snore" ], "evolutions": [], "forms": [ @@ -161,105 +203,6 @@ "pokedex": [ "cobblemon.species.zamazenta-crowned.desc" ], - "moves": [ - "form_change:behemothbash", - "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: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:hyperbeam", - "tm:hypervoice", - "tm:icefang", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:irontail", - "tm:laserfocus", - "tm:lightscreen", - "tm:metalclaw", - "tm:payback", - "tm:playrough", - "tm:powerswap", - "tm:protect", - "tm:psychicfangs", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:retaliate", - "tm:revenge", - "tm:reversal", - "tm:roar", - "tm:safeguard", - "tm:sandstorm", - "tm:scaryface", - "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:wildcharge", - "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" - ], "labels": [ "gen8", "legendary", @@ -278,7 +221,39 @@ }, "baseExperienceYield": 350, "evolutions": [], - "battleOnly": true + "battleOnly": true, + "behaviour": { + "herd": { + "maxSize": "5", + "toleratedLeaders": [ + { + "pokemon": "zacian crowned", + "tier": 1 + }, + { + "pokemon": "zamazenta crowned", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "entityInteract": { + "avoidedBySkeleton": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } ], "drops": { 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 70e14d99f..e4351c02e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/zarude.json +++ b/common/src/main/resources/data/cobblemon/species/generation8/zarude.json @@ -1,10 +1,26 @@ { - "name": "Zarude", + "implemented": true, "nationalPokedexNumber": 893, + "name": "Zarude", "primaryType": "dark", "secondaryType": "grass", + "maleRatio": -1, + "height": 18, + "weight": 700, + "pokedex": [ + "cobblemon.species.zarude.desc" + ], + "labels": [ + "gen8", + "mythical" + ], + "aspects": [], "abilities": [ - "leafguard" + "leafguard", + "h:leafguard" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 105, @@ -14,157 +30,25 @@ "special_defence": 95, "speed": 105 }, - "catchRate": 3, - "maleRatio": -1, - "shoulderMountable": false, - "forms": [ - { - "name": "Dada", - "primaryType": "dark", - "secondaryType": "grass", - "abilities": [ - "leafguard" - ], - "baseStats": { - "hp": 105, - "attack": 120, - "defence": 105, - "special_attack": 70, - "special_defence": 95, - "speed": 105 - }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 300, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], - "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: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:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hyperbeam", - "tm:hypervoice", - "tm:irontail", - "tm:knockoff", - "tm:lashout", - "tm:leafstorm", - "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:round", - "tm:scaryface", - "tm:seedbomb", - "tm:sleeptalk", - "tm:snarl", - "tm:snore", - "tm:solarbeam", - "tm:solarblade", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superpower", - "tm:swift", - "tm:swordsdance", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:trailblaze", - "tm:uturn", - "tutor:energyball", - "tutor:grassyglide", - "tutor:hammerarm", - "tutor:junglehealing", - "tutor:lashout", - "tutor:powerwhip" - ], - "labels": [ - "gen8", - "mythical", - "legendary" - ], - "aspects": [ - "dada" - ], - "height": 18, - "weight": 700, - "cannotDynamax": false, - "battleOnly": false - } - ], + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 120, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "baseScale": 1, + "hitbox": { + "width": 1.4, + "height": 3, + "fixed": false + }, "moves": [ "1:bind", "1:scratch", @@ -186,6 +70,7 @@ "tm:acrobatics", "tm:aerialace", "tm:assurance", + "tm:bind", "tm:bodyslam", "tm:brickbreak", "tm:brutalswing", @@ -232,20 +117,20 @@ "tm:roar", "tm:rockslide", "tm:rocktomb", - "tm:round", "tm:scaryface", "tm:seedbomb", "tm:sleeptalk", "tm:snarl", - "tm:snore", "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", @@ -253,40 +138,83 @@ "tm:throatchop", "tm:trailblaze", "tm:uturn", - "tutor:closecombat", + "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:powerwhip", + "tutor:lowkick", + "tutor:magicalleaf", + "tutor:rest", + "tutor:rockslide", + "tutor:seedbomb", + "tutor:sleeptalk", "tutor:snarl", - "tutor:swagger" - ], - "labels": [ - "gen8", - "mythical", - "legendary" - ], - "pokedex": [ - "cobblemon.species.zarude.desc" + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:swift", + "tutor:synthesis", + "tutor:throatchop", + "legacy:round", + "legacy:snore" ], "evolutions": [], - "baseScale": 1, - "hitbox": { - "width": 1, - "height": 1, - "fixed": false - }, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "height": 18, - "weight": 700, - "aspects": [], - "cannotDynamax": false, - "implemented": true + "forms": [ + { + "name": "Dada", + "primaryType": "dark", + "secondaryType": "grass", + "maleRatio": -1, + "height": 18, + "weight": 700, + "pokedex": [ + "cobblemon.species.zarude-dada.desc" + ], + "labels": [ + "gen8", + "mythical" + ], + "aspects": [ + "dada-cape" + ], + "evolutions": [], + "battleOnly": false + } + ], + "behaviour": { + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "zarude", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation8/enamorus.json b/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json similarity index 54% rename from common/src/main/resources/data/cobblemon/species/generation8/enamorus.json rename to common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json index b2fca9040..5bf775d21 100644 --- a/common/src/main/resources/data/cobblemon/species/generation8/enamorus.json +++ b/common/src/main/resources/data/cobblemon/species/generation8a/enamorus.json @@ -1,12 +1,29 @@ { - "name": "Enamorus", + "implemented": true, "nationalPokedexNumber": 905, + "name": "Enamorus", "primaryType": "fairy", "secondaryType": "flying", + "maleRatio": 0, + "height": 16, + "weight": 480, + "pokedex": [ + "cobblemon.species.enamorus.desc" + ], + "labels": [ + "gen8a", + "legendary" + ], + "aspects": [ + "incarnate-forme" + ], "abilities": [ "cutecharm", "h:contrary" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 74, "attack": 115, @@ -15,11 +32,6 @@ "special_defence": 80, "speed": 106 }, - "catchRate": 3, - "maleRatio": 0, - "shoulderMountable": false, - "baseExperienceYield": 116, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -28,11 +40,11 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 116, "experienceGroup": "slow", - "eggCycles": 0, - "eggGroups": [ - "undiscovered" - ], + "catchRate": 3, + "eggCycles": 20, + "baseFriendship": 50, "moves": [ "1:astonish", "1:fairywind", @@ -72,43 +84,76 @@ "tm:ironhead", "tm:mistyexplosion", "tm:mistyterrain", + "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:substitute", "tm:sunnyday", + "tm:superpower", "tm:tailwind", "tm:takedown", "tm:taunt", "tm:terablast", + "tm:torment", + "tm:twister", "tm:uproar", "tm:weatherball", - "tm:zenheadbutt" - ], - "labels": [ - "gen8", - "legendary" - ], - "pokedex": [ - "cobblemon.species.enamorus.desc" + "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" ], - "height": 16, - "weight": 480, "evolutions": [], "forms": [ { "name": "Therian", "primaryType": "fairy", "secondaryType": "flying", + "maleRatio": 0, + "height": 16, + "weight": 480, + "pokedex": [ + "cobblemon.species.enamorus-therian.desc" + ], + "labels": [ + "gen8a", + "legendary" + ], + "aspects": [ + "therian-forme" + ], "abilities": [ - "overcoat" + "overcoat", + "h:overcoat" ], "baseStats": { "hp": 74, @@ -118,96 +163,30 @@ "special_defence": 100, "speed": 46 }, - "catchRate": 3, - "maleRatio": 0, - "baseExperienceYield": 116, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 0, - "eggGroups": [ - "undiscovered" - ], - "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:bodyslam", - "tm:calmmind", - "tm:dazzlinggleam", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:earthpower", - "tm:endure", - "tm:facade", - "tm:fly", - "tm:focusblast", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:hyperbeam", - "tm:imprison", - "tm:irondefense", - "tm:ironhead", - "tm:mistyexplosion", - "tm:mistyterrain", - "tm:outrage", - "tm:playrough", - "tm:protect", - "tm:psychic", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:scaryface", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:substitute", - "tm:sunnyday", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:uproar", - "tm:weatherball", - "tm:zenheadbutt" - ], - "labels": [ - "gen8", - "legendary" - ], - "aspects": [ - "therian" - ], - "height": 16, - "weight": 480, - "cannotDynamax": false, + "evolutions": [], "battleOnly": false } ], - "aspects": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json b/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json deleted file mode 100644 index e604e92e6..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/arboliva.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "name": "Arboliva", - "nationalPokedexNumber": 930, - "primaryType": "grass", - "secondaryType": "normal", - "abilities": [ - "seedsower", - "h:harvest" - ], - "baseStats": { - "hp": 78, - "attack": 69, - "defence": 90, - "special_attack": 125, - "special_defence": 109, - "speed": 39 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 255, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 3, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:mirrorcoat", - "1:safeguard", - "1:sweetscent", - "1:tackle", - "5:absorb", - "7:growth", - "10:razorleaf", - "13:helpinghand", - "16:flail", - "20:megadrain", - "23:grassyterrain", - "29:seedbomb", - "34:energyball", - "39:leechseed", - "46:terrainpulse", - "52:petalblizzard", - "58:petaldance", - "tm:alluringvoice", - "tm:bulletseed", - "tm:charm", - "tm:dazzlinggleam", - "tm:earthpower", - "tm:encore", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hyperbeam", - "tm:hypervoice", - "tm:leafstorm", - "tm:lightscreen", - "tm:magicalleaf", - "tm:metronome", - "tm:petalblizzard", - "tm:pollenpuff", - "tm:protect", - "tm:psychup", - "tm:reflect", - "tm:rest", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:terablast", - "tm:trailblaze", - "tm:weatherball" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 14, - "weight": 482, - "preEvolution": "dolliv", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.arboliva.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:big_root", - "percentage": 10.0 - }, - { - "item": "cobblemon:kebia_berry", - "percentage": 10.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 e91b19955..f65c19702 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/archaludon.json @@ -1,13 +1,28 @@ { - "name": "Archaludon", + "implemented": true, "nationalPokedexNumber": 1018, + "name": "Archaludon", "primaryType": "steel", "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 20, + "weight": 600, + "pokedex": [ + "cobblemon.species.archaludon.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "stamina", "sturdy", "h:stalwart" ], + "eggGroups": [ + "mineral", + "dragon" + ], "baseStats": { "hp": 90, "attack": 105, @@ -16,10 +31,6 @@ "special_defence": 65, "speed": 85 }, - "catchRate": 10, - "maleRatio": 0.5, - "baseExperienceYield": 0, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 0, @@ -28,13 +39,13 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 300, "experienceGroup": "medium_fast", + "catchRate": 10, "eggCycles": 30, - "eggGroups": [ - "mineral", - "dragon" - ], + "baseFriendship": 50, "moves": [ + "1:electroshot", "1:leer", "1:metalclaw", "6:rocksmash", @@ -48,6 +59,9 @@ "54:flashcannon", "60:metalburst", "66:hyperbeam", + "egg:mirrorcoat", + "egg:nightslash", + "egg:slash", "tm:aurasphere", "tm:bodypress", "tm:bodyslam", @@ -64,11 +78,13 @@ "tm:endure", "tm:facade", "tm:flashcannon", + "tm:focusenergy", "tm:foulplay", "tm:gigaimpact", "tm:gyroball", "tm:hardpress", "tm:heavyslam", + "tm:honeclaws", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", @@ -82,6 +98,7 @@ "tm:rest", "tm:roar", "tm:rockslide", + "tm:rocksmash", "tm:rocktomb", "tm:scaryface", "tm:sleeptalk", @@ -97,16 +114,52 @@ "tm:terablast", "tm:thunder", "tm:thunderbolt", - "tm:thunderwave" - ], - "labels": [ - "gen9" + "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", + "legacy:attract", + "legacy:round", + "legacy:snore", + "legacy:stompingtantrum" ], - "aspects": [], - "height": 20, - "weight": 600, "preEvolution": "duraludon", "evolutions": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 06b11a675..331fc0f26 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/arctibax.json @@ -1,12 +1,27 @@ { - "name": "Arctibax", + "implemented": true, "nationalPokedexNumber": 997, + "name": "Arctibax", "primaryType": "dragon", "secondaryType": "ice", + "maleRatio": 0.5, + "height": 8, + "weight": 300, + "pokedex": [ + "cobblemon.species.arctibax.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "thermalexchange", "h:icebody" ], + "eggGroups": [ + "dragon", + "mineral" + ], "baseStats": { "hp": 90, "attack": 95, @@ -15,10 +30,6 @@ "special_defence": 65, "speed": 62 }, - "catchRate": 25, - "maleRatio": 0.5, - "baseExperienceYield": 148, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 2, @@ -27,16 +38,24 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 148, "experienceGroup": "slow", + "catchRate": 25, "eggCycles": 40, - "eggGroups": [ - "dragon", - "mineral" - ], + "baseFriendship": 50, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:haban_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:dragontail", - "1:leer", "1:tackle", + "1:leer", + "1:dragontail", "6:icywind", "12:dragonbreath", "18:focusenergy", @@ -46,7 +65,12 @@ "45:icebeam", "50:crunch", "55:iciclecrash", + "egg:aquatail", + "egg:dragonrush", + "egg:freezedry", + "egg:iciclespear", "tm:aerialace", + "tm:aquatail", "tm:avalanche", "tm:blizzard", "tm:bodyslam", @@ -59,6 +83,7 @@ "tm:dragontail", "tm:endure", "tm:facade", + "tm:focusenergy", "tm:helpinghand", "tm:icebeam", "tm:icefang", @@ -75,14 +100,21 @@ "tm:substitute", "tm:swordsdance", "tm:takedown", - "tm:terablast" - ], - "labels": [ - "gen9" + "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" ], - "aspects": [], - "height": 8, - "weight": 300, "preEvolution": "frigibax", "evolutions": [ { @@ -101,18 +133,33 @@ ] } ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.arctibax.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:haban_berry", - "percentage": 5.0 + "behaviour": { + "herd": { + "maxSize": "5", + "toleratedLeaders": [ + { + "pokemon": "arctibax", + "tier": 1 + }, + { + "pokemon": "baxcalibur", + "tier": 2 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 cea311023..58453ee5e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/baxcalibur.json @@ -1,12 +1,28 @@ { - "name": "Baxcalibur", + "implemented": true, "nationalPokedexNumber": 998, + "name": "Baxcalibur", "primaryType": "dragon", "secondaryType": "ice", + "maleRatio": 0.5, + "height": 21, + "weight": 2100, + "pokedex": [ + "cobblemon.species.baxcalibur.desc" + ], + "labels": [ + "gen9", + "powerhouse" + ], + "aspects": [], "abilities": [ "thermalexchange", "h:icebody" ], + "eggGroups": [ + "dragon", + "mineral" + ], "baseStats": { "hp": 115, "attack": 145, @@ -15,10 +31,6 @@ "special_defence": 86, "speed": 87 }, - "catchRate": 10, - "maleRatio": 0.5, - "baseExperienceYield": 300, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 3, @@ -27,20 +39,28 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 300, "experienceGroup": "slow", + "catchRate": 10, "eggCycles": 40, - "eggGroups": [ - "dragon", - "mineral" - ], + "baseFriendship": 50, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:haban_berry", + "percentage": 10.0 + } + ] + }, "moves": [ + "1:glaiverush", + "1:snowscape", "1:breakingswipe", "1:dragontail", "1:iceshard", - "1:leer", - "1:snowscape", "1:tackle", - "1:glaiverush", + "1:leer", "6:icywind", "12:dragonbreath", "18:focusenergy", @@ -51,7 +71,12 @@ "48:icebeam", "55:crunch", "62:iciclecrash", + "egg:aquatail", + "egg:dragonrush", + "egg:freezedry", + "egg:iciclespear", "tm:aerialace", + "tm:aquatail", "tm:avalanche", "tm:blizzard", "tm:bodypress", @@ -72,6 +97,7 @@ "tm:endure", "tm:facade", "tm:falseswipe", + "tm:focusenergy", "tm:gigaimpact", "tm:helpinghand", "tm:highhorsepower", @@ -95,29 +121,49 @@ "tm:takedown", "tm:terablast", "tm:thunderfang", - "tm:zenheadbutt" - ], - "labels": [ - "gen9", - "pseudo_legendary" + "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" ], - "aspects": [], - "height": 21, - "weight": 2100, "preEvolution": "arctibax", "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.baxcalibur.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:haban_berry", - "percentage": 10.0 + "behaviour": { + "herd": { + "maxSize": "7" + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json b/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json deleted file mode 100644 index 7e59f95f2..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/bellibolt.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "name": "Bellibolt", - "nationalPokedexNumber": 939, - "primaryType": "electric", - "abilities": [ - "electromorphosis", - "static", - "h:damp" - ], - "baseStats": { - "hp": 109, - "attack": 64, - "defence": 91, - "special_attack": 103, - "special_defence": 83, - "speed": 45 - }, - "catchRate": 50, - "maleRatio": 0.5, - "baseExperienceYield": 173, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1" - ], - "moves": [ - "1:mudslap", - "1:slackoff", - "1:tackle", - "7:thundershock", - "11:watergun", - "17:charge", - "21:spark", - "24:mudshot", - "25:flail", - "32:discharge", - "36:weatherball", - "40:electricterrain", - "45:suckerpunch", - "50:zapcannon", - "tm:acidspray", - "tm:charge", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:gigaimpact", - "tm:hyperbeam", - "tm:hypervoice", - "tm:lightscreen", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:sleeptalk", - "tm:substitute", - "tm:supercellslam", - "tm:swift", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:toxic", - "tm:voltswitch", - "tm:waterpulse", - "tm:weatherball", - "tm:wildcharge" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 12, - "weight": 1130, - "preEvolution": "tadbulb", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.bellibolt.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:ochre_froglight", - "percentage": 5.0 - }, - { - "item": "cobblemon:wepear_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 18a138a79..78ae45804 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/bombirdier.json @@ -1,13 +1,27 @@ { - "name": "Bombirdier", + "implemented": true, "nationalPokedexNumber": 962, + "name": "Bombirdier", "primaryType": "flying", "secondaryType": "dark", + "maleRatio": 0.5, + "height": 15, + "weight": 429, + "pokedex": [ + "cobblemon.species.bombirdier.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "bigpecks", "keeneye", "h:rockypayload" ], + "eggGroups": [ + "flying" + ], "baseStats": { "hp": 70, "attack": 103, @@ -16,10 +30,6 @@ "special_defence": 85, "speed": 82 }, - "catchRate": 25, - "maleRatio": 0.5, - "baseExperienceYield": 243, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 2, @@ -28,17 +38,33 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 243, "experienceGroup": "slow", + "catchRate": 25, "eggCycles": 35, - "eggGroups": [ - "flying" - ], + "baseFriendship": 50, + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:feather", + "quantityRange": "0-2" + }, + { + "item": "minecraft:chicken" + }, + { + "item": "cobblemon:razz_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:honeclaws", + "1:wingattack", "1:leer", - "1:memento", "1:peck", - "1:wingattack", + "1:memento", + "1:honeclaws", "7:thief", "11:rockthrow", "16:whirlwind", @@ -72,6 +98,7 @@ "tm:foulplay", "tm:gigaimpact", "tm:heatwave", + "tm:honeclaws", "tm:hurricane", "tm:hyperbeam", "tm:hypervoice", @@ -79,6 +106,8 @@ "tm:knockoff", "tm:lashout", "tm:nastyplot", + "tm:payback", + "tm:pluck", "tm:powergem", "tm:protect", "tm:psychup", @@ -87,47 +116,76 @@ "tm:rockblast", "tm:rockslide", "tm:rocktomb", + "tm:roost", "tm:sandstorm", "tm:scaryface", + "tm:skyattack", "tm:sleeptalk", "tm:snarl", "tm:stealthrock", "tm:stoneedge", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", "tm:tailwind", "tm:takedown", "tm:taunt", "tm:terablast", "tm:thief", - "tm:uturn" + "tm:torment", + "tm:uturn", + "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" ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 15, - "weight": 429, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.bombirdier.desc" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-2" + "behaviour": { + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "bombirdier", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:razz_berry", - "percentage": 5.0 + "fly": { + "canFly": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 deleted file mode 100644 index 0e212e3b9..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/brambleghast.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "name": "Brambleghast", - "nationalPokedexNumber": 947, - "primaryType": "grass", - "secondaryType": "ghost", - "abilities": [ - "windrider", - "h:infiltrator" - ], - "baseStats": { - "hp": 55, - "attack": 115, - "defence": 70, - "special_attack": 80, - "special_defence": 70, - "speed": 90 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 168, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:astonish", - "1:defensecurl", - "1:rollout", - "5:absorb", - "9:rapidspin", - "13:bulletseed", - "17:infestation", - "21:hex", - "25:megadrain", - "29:disable", - "35:phantomforce", - "40:gigadrain", - "45:curse", - "50:painsplit", - "55:powerwhip", - "tm:bulletseed", - "tm:confuseray", - "tm:curse", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:hex", - "tm:hyperbeam", - "tm:leafstorm", - "tm:nightshade", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:pounce", - "tm:protect", - "tm:rest", - "tm:scaryface", - "tm:seedbomb", - "tm:shadowball", - "tm:skittersmack", - "tm:sleeptalk", - "tm:solarbeam", - "tm:spikes", - "tm:spite", - "tm:substitute", - "tm:terablast", - "tm:thief", - "tm:trailblaze" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 12, - "weight": 60, - "preEvolution": "bramblin", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.brambleghast.desc" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:stick", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:kasib_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json b/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json deleted file mode 100644 index c8b4bff64..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/bramblin.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "name": "Bramblin", - "nationalPokedexNumber": 946, - "primaryType": "grass", - "secondaryType": "ghost", - "abilities": [ - "windrider", - "h:infiltrator" - ], - "baseStats": { - "hp": 40, - "attack": 65, - "defence": 30, - "special_attack": 45, - "special_defence": 35, - "speed": 60 - }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 55, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:astonish", - "1:defensecurl", - "1:rollout", - "5:absorb", - "9:rapidspin", - "13:bulletseed", - "17:infestation", - "21:hex", - "25:megadrain", - "29:disable", - "35:phantomforce", - "40:gigadrain", - "45:curse", - "50:painsplit", - "55:powerwhip", - "egg:beatup", - "egg:block", - "egg:leechseed", - "egg:shadowsneak", - "egg:strengthsap", - "tm:bulletseed", - "tm:confuseray", - "tm:curse", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:hex", - "tm:leafstorm", - "tm:nightshade", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:pounce", - "tm:protect", - "tm:rest", - "tm:scaryface", - "tm:seedbomb", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:spikes", - "tm:spite", - "tm:substitute", - "tm:terablast", - "tm:thief", - "tm:trailblaze" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 6, - "weight": 6, - "evolutions": [ - { - "id": "bramblin_brambleghast", - "variant": "level_up", - "result": "brambleghast", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "blocks_traveled", - "amount": 1000 - } - ] - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.bramblin.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:stick", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:kasib_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 18995c804..daaf919a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/brutebonnet.json @@ -1,10 +1,26 @@ { - "name": "Brute Bonnet", + "implemented": true, "nationalPokedexNumber": 986, + "name": "Brute Bonnet", "primaryType": "grass", "secondaryType": "dark", + "maleRatio": -1, + "height": 12, + "weight": 210, + "pokedex": [ + "cobblemon.species.brutebonnet.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "protosynthesis" + "protosynthesis", + "h:protosynthesis" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 111, @@ -14,10 +30,6 @@ "special_defence": 99, "speed": 55 }, - "catchRate": 50, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -26,15 +38,15 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 50, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ "1:absorb", - "1:astonish", "1:growth", + "1:astonish", "1:sunnyday", "7:stunspore", "14:megadrain", @@ -70,6 +82,7 @@ "tm:leafstorm", "tm:magicalleaf", "tm:outrage", + "tm:payback", "tm:pollenpuff", "tm:protect", "tm:rest", @@ -79,25 +92,56 @@ "tm:solarbeam", "tm:stompingtantrum", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", + "tm:synthesis", "tm:taunt", "tm:terablast", "tm:thief", "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 12, - "weight": 210, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.brutebonnet.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "brutebonnet", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 deleted file mode 100644 index af2a38961..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/capsakid.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "name": "Capsakid", - "nationalPokedexNumber": 951, - "primaryType": "grass", - "abilities": [ - "chlorophyll", - "insomnia", - "h:klutz" - ], - "baseStats": { - "hp": 52, - "attack": 62, - "defence": 40, - "special_attack": 62, - "special_defence": 40, - "speed": 50 - }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 61, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 1, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:leafage", - "1:leer", - "4:bite", - "10:growth", - "13:razorleaf", - "17:sunnyday", - "21:bulletseed", - "24:headbutt", - "28:zenheadbutt", - "38:crunch", - "44:seedbomb", - "48:solarbeam", - "egg:ingrain", - "egg:leechseed", - "egg:ragepowder", - "egg:rollout", - "egg:worryseed", - "tm:bulletseed", - "tm:crunch", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:helpinghand", - "tm:leafstorm", - "tm:magicalleaf", - "tm:protect", - "tm:rest", - "tm:sandstorm", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:trailblaze", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 3, - "weight": 30, - "evolutions": [ - { - "id": "capsakid_scovillain", - "variant": "item_interact", - "result": "scovillain", - "consumeHeldItem": false, - "learnableMoves": [ - "flamethrower", - "spicyextract" - ], - "requirements": [], - "requiredContext": "cobblemon:fire_stone" - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.capsakid.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:roasted_leek", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:rawst_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 5b7cc36ba..2cb0e815d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/chienpao.json @@ -1,10 +1,26 @@ { - "name": "Chien-Pao", + "implemented": true, "nationalPokedexNumber": 1002, + "name": "Chien-Pao", "primaryType": "dark", "secondaryType": "ice", + "maleRatio": -1, + "height": 19, + "weight": 1522, + "pokedex": [ + "cobblemon.species.chienpao.desc" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [], "abilities": [ - "swordofruin" + "swordofruin", + "h:swordofruin" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 80, @@ -14,10 +30,6 @@ "special_defence": 65, "speed": 135 }, - "catchRate": 6, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,19 +38,42 @@ "special_defence": 0, "speed": 3 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 6, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "behaviour": { + "entityInteract": { + "avoidedByCreeper": true, + "avoidedByPhantom": true + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + }, "moves": [ - "1:meanlook", - "1:powdersnow", "1:spite", + "1:powdersnow", + "1:meanlook", "5:icywind", "10:payback", - "15:haze", "15:mist", + "15:haze", "20:iceshard", "25:swordsdance", "30:snowscape", @@ -69,6 +104,7 @@ "tm:icespinner", "tm:icywind", "tm:lashout", + "tm:payback", "tm:protect", "tm:psychicfangs", "tm:raindance", @@ -79,23 +115,26 @@ "tm:snowscape", "tm:spite", "tm:substitute", + "tm:suckerpunch", "tm:swordsdance", "tm:takedown", "tm:taunt", "tm:terablast", - "tm:throatchop" - ], - "labels": [ - "gen9", - "legendary" - ], - "aspects": [], - "height": 19, - "weight": 1522, - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.chienpao.desc" + "tm:throatchop", + "tutor:aerialace", + "tutor:darkpulse", + "tutor:falseswipe", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:icefang", + "tutor:icywind", + "tutor:lashout", + "tutor:rest", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:spite", + "tutor:suckerpunch", + "tutor:throatchop" ], - "implemented": true + "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 3a5502562..f392e602c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/chiyu.json @@ -1,10 +1,26 @@ { - "name": "Chi-Yu", + "implemented": true, "nationalPokedexNumber": 1004, + "name": "Chi-Yu", "primaryType": "dark", "secondaryType": "fire", + "maleRatio": -1, + "height": 4, + "weight": 49, + "pokedex": [ + "cobblemon.species.chiyu.desc" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [], "abilities": [ - "beadsofruin" + "beadsofruin", + "h:beadsofruin" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 55, @@ -14,10 +30,6 @@ "special_defence": 120, "speed": 100 }, - "catchRate": 6, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,15 +38,15 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 6, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ "1:ember", - "1:meanlook", "1:spite", + "1:meanlook", "5:flamewheel", "10:payback", "15:willowisp", @@ -50,6 +62,7 @@ "65:inferno", "70:memento", "75:overheat", + "tm:bounce", "tm:burningjealousy", "tm:confuseray", "tm:crunch", @@ -65,10 +78,12 @@ "tm:heatwave", "tm:hex", "tm:hyperbeam", + "tm:incinerate", "tm:lashout", "tm:lightscreen", "tm:nastyplot", "tm:overheat", + "tm:payback", "tm:protect", "tm:psychic", "tm:reflect", @@ -79,24 +94,67 @@ "tm:spite", "tm:substitute", "tm:sunnyday", + "tm:swagger", "tm:takedown", "tm:taunt", "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" ], - "labels": [ - "gen9", - "legendary" - ], - "aspects": [], - "height": 4, - "weight": 49, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.chiyu.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "chiyu", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "canBreatheUnderwater": true, + "canSwimInLava": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "fireImmune": true + }, + "lightingData": { + "lightLevel": 8, + "liquidGlowMode": "BOTH" + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json b/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json deleted file mode 100644 index 27ec0bde7..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/cyclizar.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "name": "Cyclizar", - "nationalPokedexNumber": 967, - "primaryType": "dragon", - "secondaryType": "normal", - "abilities": [ - "shedskin", - "h:regenerator" - ], - "baseStats": { - "hp": 70, - "attack": 95, - "defence": 65, - "special_attack": 85, - "special_defence": 65, - "speed": 121 - }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 175, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_slow", - "eggCycles": 30, - "eggGroups": [ - "field" - ], - "moves": [ - "1:growl", - "1:tackle", - "7:rapidspin", - "11:taunt", - "14:breakingswipe", - "18:quickattack", - "23:bite", - "27:uturn", - "31:shedtail", - "36:dragonclaw", - "40:shiftgear", - "45:dragonpulse", - "51:doubleedge", - "57:dragonrush", - "egg:aquatail", - "egg:irontail", - "egg:knockoff", - "egg:powerwhip", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:bodyslam", - "tm:breakingswipe", - "tm:crunch", - "tm:doubleedge", - "tm:dracometeor", - "tm:dragoncheer", - "tm:dragonclaw", - "tm:dragonpulse", - "tm:dragontail", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:firefang", - "tm:gigaimpact", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icespinner", - "tm:ironhead", - "tm:knockoff", - "tm:mudshot", - "tm:mudslap", - "tm:outrage", - "tm:overheat", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:scaleshot", - "tm:sleeptalk", - "tm:substitute", - "tm:sunnyday", - "tm:supercellslam", - "tm:takedown", - "tm:taunt", - "tm:temperflare", - "tm:terablast", - "tm:thief", - "tm:thunderbolt", - "tm:thunderfang", - "tm:trailblaze", - "tm:uproar", - "tm:uturn", - "tm:wildcharge" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 16, - "weight": 630, - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.cyclizar.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:haban_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 a95386be8..0eb5c136e 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/dipplin.json @@ -1,13 +1,28 @@ { - "name": "Dipplin", + "implemented": true, "nationalPokedexNumber": 1011, + "name": "Dipplin", "primaryType": "grass", "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 4, + "weight": 44, + "pokedex": [ + "cobblemon.species.dipplin.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "supersweetsyrup", "gluttony", "h:stickyhold" ], + "eggGroups": [ + "grass", + "dragon" + ], "baseStats": { "hp": 80, "attack": 80, @@ -16,10 +31,6 @@ "special_defence": 80, "speed": 40 }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 0, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -28,18 +39,18 @@ "special_defence": 0, "speed": 0 }, - "experienceGroup": "slow", + "baseExperienceYield": 170, + "experienceGroup": "erratic", + "catchRate": 45, "eggCycles": 20, - "eggGroups": [ - "grass", - "dragon" - ], + "baseFriendship": 50, "moves": [ + "1:doublehit", + "1:withdraw", + "1:sweetscent", + "1:recycle", "1:astonish", "1:infestation", - "1:recycle", - "1:sweetscent", - "1:withdraw", "4:dragontail", "8:growth", "12:dragonbreath", @@ -50,6 +61,10 @@ "36:recover", "40:energyball", "44:substitute", + "egg:defensecurl", + "egg:recycle", + "egg:rollout", + "egg:suckerpunch", "tm:bodyslam", "tm:bugbite", "tm:bulletseed", @@ -67,27 +82,39 @@ "tm:grassyterrain", "tm:gyroball", "tm:hyperbeam", + "tm:infestation", "tm:leafstorm", "tm:outrage", "tm:pollenpuff", "tm:pounce", "tm:protect", + "tm:recycle", "tm:reflect", "tm:rest", + "tm:rollout", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", "tm:takedown", - "tm:terablast" - ], - "labels": [ - "gen9" + "tm:terablast", + "tutor:bugbite", + "tutor:dragonpulse", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:outrage", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:suckerpunch", + "legacy:attract" ], - "aspects": [], - "height": 4, - "weight": 44, "preEvolution": "applin", "evolutions": [ { @@ -106,6 +133,19 @@ ] } ], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json b/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json deleted file mode 100644 index eb269ef9e..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/dolliv.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "name": "Dolliv", - "nationalPokedexNumber": 929, - "primaryType": "grass", - "secondaryType": "normal", - "abilities": [ - "earlybird", - "h:harvest" - ], - "baseStats": { - "hp": 52, - "attack": 53, - "defence": 60, - "special_attack": 78, - "special_defence": 78, - "speed": 33 - }, - "catchRate": 120, - "maleRatio": 0.5, - "baseExperienceYield": 124, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:sweetscent", - "1:tackle", - "5:absorb", - "7:growth", - "10:razorleaf", - "13:helpinghand", - "16:flail", - "20:megadrain", - "23:grassyterrain", - "29:seedbomb", - "34:energyball", - "37:leechseed", - "42:terrainpulse", - "tm:bulletseed", - "tm:charm", - "tm:earthpower", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:helpinghand", - "tm:leafstorm", - "tm:magicalleaf", - "tm:protect", - "tm:rest", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:terablast", - "tm:trailblaze", - "tm:weatherball" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 6, - "weight": 119, - "preEvolution": "smoliv", - "evolutions": [ - { - "id": "dolliv_arboliva", - "variant": "level_up", - "result": "arboliva", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 35 - } - ] - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.dolliv.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:big_root", - "percentage": 5.0 - }, - { - "item": "cobblemon:kebia_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json b/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json deleted file mode 100644 index 336a75690..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "name": "Dondozo", - "nationalPokedexNumber": 977, - "primaryType": "water", - "abilities": [ - "unaware", - "oblivious", - "h:waterveil" - ], - "baseStats": { - "hp": 150, - "attack": 100, - "defence": 115, - "special_attack": 65, - "special_defence": 65, - "speed": 35 - }, - "catchRate": 25, - "maleRatio": 0.5, - "baseExperienceYield": 265, - "baseFriendship": 50, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "water_2" - ], - "moves": [ - "1:supersonic", - "1:tackle", - "1:watergun", - "5:tickle", - "10:flail", - "15:rest", - "15:sleeptalk", - "20:dive", - "25:nobleroar", - "30:soak", - "35:bodyslam", - "40:aquatail", - "45:raindance", - "50:orderup", - "55:heavyslam", - "60:doubleedge", - "65:wavecrash", - "egg:curse", - "egg:fissure", - "egg:thrash", - "egg:yawn", - "tm:avalanche", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:chillingwater", - "tm:crunch", - "tm:curse", - "tm:doubleedge", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:gigaimpact", - "tm:heavyslam", - "tm:hydropump", - "tm:hyperbeam", - "tm:icefang", - "tm:liquidation", - "tm:outrage", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:rockslide", - "tm:scaryface", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:substitute", - "tm:surf", - "tm:takedown", - "tm:terablast", - "tm:waterfall", - "tm:waterpulse", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 120, - "weight": 2200, - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.dondozo.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:salmon" - }, - { - "item": "minecraft:bone_meal", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ 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 deleted file mode 100644 index 9b240c1b4..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/dudunsparce.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "name": "Dudunsparce", - "nationalPokedexNumber": 982, - "primaryType": "normal", - "abilities": [ - "serenegrace", - "runaway", - "h:rattled" - ], - "baseStats": { - "hp": 125, - "attack": 100, - "defence": 80, - "special_attack": 85, - "special_defence": 75, - "speed": 55 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 182, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:defensecurl", - "1:flail", - "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", - "tm:agility", - "tm:airslash", - "tm:amnesia", - "tm:batonpass", - "tm:blizzard", - "tm:bodypress", - "tm:bodyslam", - "tm:breakingswipe", - "tm:bulldoze", - "tm:calmmind", - "tm:chillingwater", - "tm:curse", - "tm:dig", - "tm:doubleedge", - "tm:dragontail", - "tm:drillrun", - "tm:dualwingbeat", - "tm:earthpower", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fireblast", - "tm:flamethrower", - "tm:gigaimpact", - "tm:gyroball", - "tm:heavyslam", - "tm:helpinghand", - "tm:hex", - "tm:hurricane", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icespinner", - "tm:lunge", - "tm:mudshot", - "tm:mudslap", - "tm:outrage", - "tm:painsplit", - "tm:poisonjab", - "tm:poisontail", - "tm:pounce", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:rockslide", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaleshot", - "tm:scaryface", - "tm:shadowball", - "tm:skittersmack", - "tm:sleeptalk", - "tm:smartstrike", - "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:uproar", - "tm:wildcharge", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 36, - "weight": 392, - "preEvolution": "dunsparce", - "evolutions": [], - "cannotDynamax": false, - "forms": [ - { - "name": "Three-Segment", - "primaryType": "normal", - "abilities": [ - "serenegrace", - "runaway", - "h:rattled" - ], - "baseStats": { - "hp": 125, - "attack": 100, - "defence": 80, - "special_attack": 85, - "special_defence": 75, - "speed": 55 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 0, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [], - "labels": [ - "gen9" - ], - "aspects": [ - "three-segment" - ], - "height": 45, - "weight": 474, - "preEvolution": "dunsparce", - "cannotDynamax": false, - "battleOnly": false - } - ], - "pokedex": [ - "cobblemon.species.dudunsparce.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:rocky_helmet", - "percentage": 5.0 - }, - { - "item": "cobblemon:cheri_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json b/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json deleted file mode 100644 index da49baeca..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/farigiraf.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "name": "Farigiraf", - "nationalPokedexNumber": 981, - "primaryType": "normal", - "secondaryType": "psychic", - "abilities": [ - "cudchew", - "armortail", - "h:sapsipper" - ], - "baseStats": { - "hp": 120, - "attack": 90, - "defence": 70, - "special_attack": 110, - "special_defence": 70, - "speed": 60 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 260, - "baseFriendship": 50, - "evYield": { - "hp": 3, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "field" - ], - "moves": [ - "1:astonish", - "1:growl", - "1:guardswap", - "1:powerswap", - "1:tackle", - "5:confusion", - "10:assurance", - "14:stomp", - "19:psybeam", - "23:agility", - "28:doublehit", - "32:twinbeam", - "37:crunch", - "41:batonpass", - "46:nastyplot", - "50:psychic", - "tm:agility", - "tm:amnesia", - "tm:batonpass", - "tm:bodyslam", - "tm:bulldoze", - "tm:calmmind", - "tm:chargebeam", - "tm:confuseray", - "tm:crunch", - "tm:curse", - "tm:dazzlinggleam", - "tm:doubleedge", - "tm:earthquake", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:foulplay", - "tm:futuresight", - "tm:gigaimpact", - "tm:grassknot", - "tm:gravity", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:imprison", - "tm:ironhead", - "tm:lightscreen", - "tm:lowkick", - "tm:nastyplot", - "tm:nightshade", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicfangs", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:roar", - "tm:shadowball", - "tm:skillswap", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:storedpower", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:trailblaze", - "tm:trick", - "tm:trickroom", - "tm:uproar", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 32, - "weight": 1600, - "preEvolution": "girafarig", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.farigiraf.desc" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:leather", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:razor_fang", - "percentage": 5.0 - }, - { - "item": "cobblemon:persim_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 20063ada8..afa27bb21 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fezandipiti.json @@ -1,12 +1,27 @@ { - "name": "Fezandipiti", + "implemented": true, "nationalPokedexNumber": 1016, + "name": "Fezandipiti", "primaryType": "poison", "secondaryType": "fairy", + "maleRatio": 1, + "height": 14, + "weight": 301, + "pokedex": [ + "cobblemon.species.fezandipiti.desc" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [], "abilities": [ "toxicchain", "h:technician" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 88, "attack": 91, @@ -15,10 +30,6 @@ "special_defence": 125, "speed": 99 }, - "catchRate": 3, - "maleRatio": 1, - "baseExperienceYield": 0, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -27,24 +38,32 @@ "special_defence": 3, "speed": 0 }, + "baseExperienceYield": 278, "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "catchRate": 3, + "eggCycles": 120, + "baseFriendship": 0, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:fairy_feather" + } + ] + }, "moves": [ - "1:disarmingvoice", "1:doublekick", "1:peck", "1:poisongas", + "1:disarmingvoice", "8:quickattack", "16:attract", "24:wingattack", "32:crosspoison", "40:tailslap", "48:beatup", - "56:flatter", "56:swagger", + "56:flatter", "64:roost", "72:moonblast", "tm:acidspray", @@ -54,9 +73,12 @@ "tm:aircutter", "tm:airslash", "tm:alluringvoice", + "tm:attract", + "tm:beatup", "tm:bravebird", "tm:calmmind", "tm:charm", + "tm:crosspoison", "tm:darkpulse", "tm:dazzlinggleam", "tm:disarmingvoice", @@ -80,14 +102,17 @@ "tm:protect", "tm:psychup", "tm:rest", + "tm:roost", "tm:shadowball", "tm:shadowclaw", "tm:sleeptalk", "tm:sludgebomb", "tm:spite", "tm:substitute", + "tm:swagger", "tm:swift", "tm:swordsdance", + "tm:tailslap", "tm:tailwind", "tm:takedown", "tm:taunt", @@ -96,24 +121,71 @@ "tm:toxic", "tm:uproar", "tm:uturn", - "tm:venoshock" - ], - "labels": [ - "gen9", - "legendary" + "tm:venoshock", + "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" ], - "aspects": [], - "height": 14, - "weight": 301, "evolutions": [], - "cannotDynamax": false, - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:fairy_feather" + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "okidogi", + "tier": 1 + }, + { + "pokemon": "munkidori", + "tier": 1 + }, + { + "pokemon": "fezandipiti", + "tier": 2 + }, + { + "pokemon": "pecharunt", + "tier": 3 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/finizen.json b/common/src/main/resources/data/cobblemon/species/generation9/finizen.json deleted file mode 100644 index e983200fe..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/finizen.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "name": "Finizen", - "nationalPokedexNumber": 963, - "primaryType": "water", - "abilities": [ - "waterveil" - ], - "baseStats": { - "hp": 70, - "attack": 45, - "defence": 40, - "special_attack": 45, - "special_defence": 40, - "speed": 75 - }, - "catchRate": 200, - "maleRatio": 0.5, - "baseExperienceYield": 63, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "field", - "water_2" - ], - "moves": [ - "1:supersonic", - "1:watergun", - "7:astonish", - "10:focusenergy", - "13:aquajet", - "17:doublehit", - "21:dive", - "25:charm", - "29:acrobatics", - "34:encore", - "39:aquatail", - "44:mist", - "50:hydropump", - "egg:boomburst", - "egg:bounce", - "egg:counter", - "egg:haze", - "egg:tickle", - "tm:acrobatics", - "tm:agility", - "tm:blizzard", - "tm:bodyslam", - "tm:charm", - "tm:chillingwater", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:encore", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:haze", - "tm:helpinghand", - "tm:hydropump", - "tm:icebeam", - "tm:icywind", - "tm:liquidation", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:sleeptalk", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:waterfall", - "tm:waterpulse", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 13, - "weight": 602, - "evolutions": [ - { - "id": "finizen_palafin", - "variant": "level_up", - "result": "palafin", - "consumeHeldItem": false, - "learnableMoves": [ - "flipturn" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 38 - } - ] - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.finizen.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:cod", - "quantityRange": "0-1" - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json b/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json deleted file mode 100644 index 840cf5424..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/flamigo.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "name": "Flamigo", - "nationalPokedexNumber": 973, - "primaryType": "flying", - "secondaryType": "fighting", - "abilities": [ - "scrappy", - "tangledfeet", - "h:costar" - ], - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-2" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:payapa_berry", - "percentage": 5.0 - }, - { - "item": "cobblemon:fairy_feather", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 82, - "attack": 115, - "defence": 74, - "special_attack": 75, - "special_defence": 64, - "speed": 90 - }, - "catchRate": 100, - "maleRatio": 0.5, - "baseExperienceYield": 175, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "flying" - ], - "moves": [ - "1:copycat", - "1:peck", - "5:doublekick", - "9:detect", - "12:wingattack", - "15:focusenergy", - "18:lowkick", - "21:feint", - "27:payback", - "31:roost", - "35:airslash", - "39:megakick", - "44:wideguard", - "48:throatchop", - "54:bravebird", - "egg:doubleteam", - "egg:quickguard", - "egg:skyattack", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:bravebird", - "tm:bulkup", - "tm:chillingwater", - "tm:closecombat", - "tm:dualwingbeat", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fling", - "tm:fly", - "tm:gigaimpact", - "tm:hurricane", - "tm:hyperbeam", - "tm:liquidation", - "tm:lowkick", - "tm:lowsweep", - "tm:lunge", - "tm:pounce", - "tm:protect", - "tm:psychup", - "tm:rest", - "tm:reversal", - "tm:sleeptalk", - "tm:substitute", - "tm:swordsdance", - "tm:tailwind", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:upperhand", - "tm:uturn", - "tm:waterpulse" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 16, - "weight": 370, - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.flamigo.desc" - ], - "implemented": true -} \ No newline at end of file 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 b4f1711b0..670309672 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/fluttermane.json @@ -1,10 +1,26 @@ { - "name": "Flutter Mane", + "implemented": true, "nationalPokedexNumber": 987, + "name": "Flutter Mane", "primaryType": "ghost", "secondaryType": "fairy", + "maleRatio": -1, + "height": 14, + "weight": 40, + "pokedex": [ + "cobblemon.species.fluttermane.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "protosynthesis" + "protosynthesis", + "h:protosynthesis" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 55, @@ -14,10 +30,6 @@ "special_defence": 135, "speed": 135 }, - "catchRate": 30, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,15 +38,27 @@ "special_defence": 1, "speed": 1 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "drops": { + "amount": 4, + "entries": [ + { + "item": "minecraft:phantom_membrane", + "quantityRange": "0-3" + }, + { + "item": "cobblemon:fairy_feather" + } + ] + }, "moves": [ - "1:astonish", "1:confuseray", "1:spite", + "1:astonish", "1:sunnyday", "7:psybeam", "14:meanlook", @@ -69,6 +93,7 @@ "tm:imprison", "tm:magicalleaf", "tm:mistyterrain", + "tm:mysticalfire", "tm:nightshade", "tm:painsplit", "tm:phantomforce", @@ -90,31 +115,61 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", - "tm:trickroom" + "tm:trickroom", + "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 14, - "weight": 40, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.fluttermane.desc" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:phantom_membrane", - "quantityRange": "0-3" + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "fluttermane", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true }, - { - "item": "cobblemon:fairy_feather" + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + } + } } \ 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 2f9415743..bee967e17 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/frigibax.json @@ -1,12 +1,27 @@ { - "name": "Frigibax", + "implemented": true, "nationalPokedexNumber": 996, + "name": "Frigibax", "primaryType": "dragon", "secondaryType": "ice", + "maleRatio": 0.5, + "height": 5, + "weight": 170, + "pokedex": [ + "cobblemon.species.frigibax.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "thermalexchange", "h:icebody" ], + "eggGroups": [ + "dragon", + "mineral" + ], "baseStats": { "hp": 65, "attack": 75, @@ -15,10 +30,6 @@ "special_defence": 45, "speed": 55 }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 64, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 1, @@ -27,16 +38,24 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 64, "experienceGroup": "slow", + "catchRate": 45, "eggCycles": 40, - "eggGroups": [ - "dragon", - "mineral" - ], + "baseFriendship": 50, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:haban_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:dragontail", - "1:leer", "1:tackle", + "1:leer", + "1:dragontail", "6:icywind", "12:dragonbreath", "18:focusenergy", @@ -51,6 +70,7 @@ "egg:dragonrush", "egg:freezedry", "egg:iciclespear", + "tm:aquatail", "tm:avalanche", "tm:blizzard", "tm:bodyslam", @@ -62,6 +82,7 @@ "tm:dragontail", "tm:endure", "tm:facade", + "tm:focusenergy", "tm:helpinghand", "tm:icebeam", "tm:icefang", @@ -76,14 +97,19 @@ "tm:substitute", "tm:swordsdance", "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" ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 5, - "weight": 170, "evolutions": [ { "id": "frigibax_arctibax", @@ -99,18 +125,38 @@ ] } ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.frigibax.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:haban_berry", - "percentage": 2.5 + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "frigibax", + "tier": 1 + }, + { + "pokemon": "arctibax", + "tier": 2 + }, + { + "pokemon": "baxcalibur", + "tier": 3 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file 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 b315284ec..b58cf28c6 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/gougingfire.json @@ -1,10 +1,26 @@ { - "name": "Gouging Fire", + "implemented": true, "nationalPokedexNumber": 1020, + "name": "Gouging Fire", "primaryType": "fire", "secondaryType": "dragon", + "maleRatio": -1, + "height": 35, + "weight": 5900, + "pokedex": [ + "cobblemon.species.gougingfire.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "protosynthesis" + "protosynthesis", + "h:protosynthesis" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 105, @@ -14,10 +30,6 @@ "special_defence": 93, "speed": 91 }, - "catchRate": 10, - "maleRatio": -1, - "baseExperienceYield": 0, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,19 +38,19 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 295, "experienceGroup": "slow", + "catchRate": 10, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:ancientpower", - "1:doublekick", - "1:incinerate", - "1:leer", - "1:nobleroar", "1:stomp", + "1:leer", + "1:incinerate", "1:sunnyday", + "1:doublekick", + "1:ancientpower", + "1:nobleroar", "7:firefang", "14:howl", "21:bite", @@ -52,6 +64,7 @@ "77:outrage", "84:flareblitz", "91:ragingfury", + "tm:ancientpower", "tm:bodyslam", "tm:breakingswipe", "tm:bulldoze", @@ -76,6 +89,7 @@ "tm:heatcrash", "tm:heatwave", "tm:hyperbeam", + "tm:incinerate", "tm:ironhead", "tm:outrage", "tm:overheat", @@ -98,16 +112,53 @@ "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:rest", + "tutor:scaleshot", + "tutor:scorchingsands", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:stoneedge", + "tutor:thunderfang" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 35, - "weight": 5900, "evolutions": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "gougingfire", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInLava": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "fireImmune": true + } } \ No newline at end of file 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 d61049ee8..88f0e6a8f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/greattusk.json @@ -1,10 +1,26 @@ { - "name": "Great Tusk", + "implemented": true, "nationalPokedexNumber": 984, + "name": "Great Tusk", "primaryType": "ground", "secondaryType": "fighting", + "maleRatio": -1, + "height": 22, + "weight": 3200, + "pokedex": [ + "cobblemon.species.greattusk.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "protosynthesis" + "protosynthesis", + "h:protosynthesis" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 115, @@ -14,10 +30,6 @@ "special_defence": 53, "speed": 87 }, - "catchRate": 30, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -26,14 +38,14 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:defensecurl", "1:hornattack", + "1:defensecurl", "1:rollout", "1:sunnyday", "7:bulldoze", @@ -72,6 +84,7 @@ "tm:icespinner", "tm:ironhead", "tm:knockoff", + "tm:megahorn", "tm:mudshot", "tm:mudslap", "tm:playrough", @@ -82,6 +95,7 @@ "tm:roar", "tm:rockslide", "tm:rocktomb", + "tm:rollout", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", @@ -99,19 +113,57 @@ "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 22, - "weight": 3200, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.greattusk.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "9", + "toleratedLeaders": [ + { + "pokemon": "greattusk", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 47aa4ffea..9184bc3b5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/greavard.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/greavard.json @@ -1,11 +1,25 @@ { - "name": "Greavard", + "implemented": true, "nationalPokedexNumber": 971, + "name": "Greavard", "primaryType": "ghost", + "maleRatio": 0.5, + "height": 6, + "weight": 350, + "pokedex": [ + "cobblemon.species.greavard.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "pickup", "h:fluffy" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 50, "attack": 61, @@ -14,10 +28,6 @@ "special_defence": 55, "speed": 34 }, - "catchRate": 120, - "maleRatio": 0.5, - "baseExperienceYield": 58, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 1, @@ -26,17 +36,38 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 58, "experienceGroup": "medium_slow", + "catchRate": 120, "eggCycles": 20, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "drops": { + "amount": 5, + "entries": [ + { + "item": "minecraft:bone", + "quantityRange": "1-2" + }, + { + "item": "minecraft:rotten_flesh", + "quantityRange": "0-1" + }, + { + "item": "minecraft:candle", + "percentage": 2.5 + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:growl", "1:tackle", + "1:growl", "3:lick", - "6:bite", "6:tailwhip", + "6:bite", "9:roar", "12:headbutt", "16:dig", @@ -54,6 +85,7 @@ "egg:memento", "egg:shadowsneak", "egg:yawn", + "tm:allyswitch", "tm:bulldoze", "tm:charm", "tm:confuseray", @@ -64,6 +96,7 @@ "tm:endure", "tm:facade", "tm:firefang", + "tm:headbutt", "tm:helpinghand", "tm:hex", "tm:icefang", @@ -92,14 +125,26 @@ "tm:thief", "tm:thunderfang", "tm:trick", - "tm:uproar" - ], - "labels": [ - "gen9" + "tm:uproar", + "tutor:allyswitch", + "tutor:bulldoze", + "tutor:endeavor", + "tutor:firefang", + "tutor:helpinghand", + "tutor:icefang", + "tutor:mudslap", + "tutor:painsplit", + "tutor:playrough", + "tutor:poltergeist", + "tutor:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang", + "tutor:trick", + "tutor:uproar" ], - "aspects": [], - "height": 6, - "weight": 350, "evolutions": [ { "id": "greavard_houndstone", @@ -121,30 +166,35 @@ ] } ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.greavard.desc" - ], - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:bone", - "quantityRange": "1-2" - }, - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-1" - }, - { - "item": "minecraft:candle", - "percentage": 2.5 - }, - { - "item": "cobblemon:kasib_berry", - "percentage": 2.5 + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "houndstone", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] + }, + "combat": { + "willDefendOwner": true + } }, - "implemented": true + "lightingData": { + "lightLevel": 8, + "liquidGlowMode": "LAND" + } } \ No newline at end of file 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 c4c940466..2f04a01e3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/houndstone.json @@ -1,11 +1,25 @@ { - "name": "Houndstone", + "implemented": true, "nationalPokedexNumber": 972, + "name": "Houndstone", "primaryType": "ghost", + "maleRatio": 0.5, + "height": 20, + "weight": 150, + "pokedex": [ + "cobblemon.species.houndstone.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "sandrush", "h:fluffy" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 72, "attack": 101, @@ -14,10 +28,6 @@ "special_defence": 97, "speed": 68 }, - "catchRate": 60, - "maleRatio": 0.5, - "baseExperienceYield": 171, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 2, @@ -26,18 +36,35 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 171, "experienceGroup": "medium_slow", + "catchRate": 60, "eggCycles": 20, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "drops": { + "amount": 6, + "entries": [ + { + "item": "minecraft:bone", + "quantityRange": "1-3" + }, + { + "item": "minecraft:rotten_flesh", + "quantityRange": "0-2" + }, + { + "item": "cobblemon:kasib_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:growl", - "1:tackle", "1:lastrespects", + "1:tackle", + "1:growl", "3:lick", - "6:bite", "6:tailwhip", + "6:bite", "9:roar", "12:headbutt", "16:dig", @@ -48,6 +75,14 @@ "46:phantomforce", "51:charm", "58:doubleedge", + "egg:allyswitch", + "egg:destinybond", + "egg:disable", + "egg:howl", + "egg:memento", + "egg:shadowsneak", + "egg:yawn", + "tm:allyswitch", "tm:bodypress", "tm:bulldoze", "tm:charm", @@ -60,6 +95,7 @@ "tm:facade", "tm:firefang", "tm:gigaimpact", + "tm:headbutt", "tm:helpinghand", "tm:hex", "tm:hyperbeam", @@ -90,36 +126,50 @@ "tm:thunderfang", "tm:trick", "tm:uproar", - "tm:willowisp" - ], - "labels": [ - "gen9" + "tm:willowisp", + "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:rest", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:snarl", + "tutor:stompingtantrum", + "tutor:thunderfang", + "tutor:trick", + "tutor:uproar" ], - "aspects": [], - "height": 20, - "weight": 150, "preEvolution": "greavard", "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.houndstone.desc" - ], - "drops": { - "amount": 6, - "entries": [ - { - "item": "minecraft:bone", - "quantityRange": "1-3" - }, - { - "item": "minecraft:rotten_flesh", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:kasib_berry", - "percentage": 5.0 + "behaviour": { + "herd": { + "maxSize": "3" + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file 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 d25337a82..19c7233fe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/hydrapple.json @@ -1,13 +1,28 @@ { - "name": "Hydrapple", + "implemented": true, "nationalPokedexNumber": 1019, + "name": "Hydrapple", "primaryType": "grass", "secondaryType": "dragon", + "maleRatio": 0.5, + "height": 18, + "weight": 930, + "pokedex": [ + "cobblemon.species.hydrapple.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "supersweetsyrup", "regenerator", "h:stickyhold" ], + "eggGroups": [ + "grass", + "dragon" + ], "baseStats": { "hp": 106, "attack": 80, @@ -16,10 +31,6 @@ "special_defence": 80, "speed": 44 }, - "catchRate": 10, - "maleRatio": 0.5, - "baseExperienceYield": 0, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 0, @@ -28,20 +39,20 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 270, "experienceGroup": "erratic", + "catchRate": 10, "eggCycles": 20, - "eggGroups": [ - "grass", - "dragon" - ], + "baseFriendship": 50, "moves": [ + "1:ficklebeam", + "1:withdraw", + "1:sweetscent", + "1:recycle", "1:astonish", + "1:yawn", "1:doublehit", "1:infestation", - "1:recycle", - "1:sweetscent", - "1:withdraw", - "1:yawn", "4:dragontail", "8:growth", "12:dragonbreath", @@ -53,6 +64,10 @@ "40:energyball", "44:substitute", "54:powerwhip", + "egg:defensecurl", + "egg:recycle", + "egg:rollout", + "egg:suckerpunch", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", @@ -78,33 +93,63 @@ "tm:heavyslam", "tm:hydropump", "tm:hyperbeam", + "tm:infestation", "tm:leafstorm", "tm:magicalleaf", "tm:nastyplot", "tm:outrage", "tm:pollenpuff", "tm:pounce", + "tm:powerwhip", "tm:protect", "tm:raindance", + "tm:recycle", "tm:reflect", "tm:rest", + "tm:rollout", "tm:seedbomb", "tm:sleeptalk", "tm:solarbeam", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", "tm:takedown", "tm:terablast", - "tm:uproar" + "tm:uproar", + "tutor:bugbite", + "tutor:dragonpulse", + "tutor:earthpower", + "tutor:energyball", + "tutor:gigadrain", + "tutor:gigaimpact", + "tutor:hyperbeam", + "tutor:magicalleaf", + "tutor:outrage", + "tutor:recycle", + "tutor:rest", + "tutor:rollout", + "tutor:seedbomb", + "tutor:sleeptalk", + "tutor:suckerpunch", + "tutor:uproar", + "legacy:attract" ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 18, - "weight": 930, "preEvolution": "dipplin", "evolutions": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 0e6bd99fc..e14ee2930 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironboulder.json @@ -1,10 +1,26 @@ { - "name": "Iron Boulder", + "implemented": true, "nationalPokedexNumber": 1022, + "name": "Iron Boulder", "primaryType": "rock", "secondaryType": "psychic", + "maleRatio": -1, + "height": 15, + "weight": 1625, + "pokedex": [ + "cobblemon.species.ironboulder.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "quarkdrive" + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 90, @@ -14,10 +30,6 @@ "special_defence": 108, "speed": 124 }, - "catchRate": 10, - "maleRatio": -1, - "baseExperienceYield": 0, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,16 +38,16 @@ "special_defence": 0, "speed": 3 }, + "baseExperienceYield": 295, "experienceGroup": "slow", + "catchRate": 10, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:electricterrain", "1:hornattack", "1:leer", "1:rockthrow", + "1:electricterrain", "7:quickattack", "14:slash", "21:agility", @@ -65,10 +77,12 @@ "tm:hyperbeam", "tm:irondefense", "tm:ironhead", + "tm:megahorn", "tm:meteorbeam", "tm:poisonjab", "tm:protect", "tm:psychic", + "tm:psychocut", "tm:psyshock", "tm:rest", "tm:rockblast", @@ -86,16 +100,53 @@ "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 15, - "weight": 1625, "evolutions": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 6, + "liquidGlowMode": "BOTH" + } } \ 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 e6995af28..f1143d646 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironbundle.json @@ -1,10 +1,26 @@ { - "name": "Iron Bundle", + "implemented": true, "nationalPokedexNumber": 991, + "name": "Iron Bundle", "primaryType": "ice", "secondaryType": "water", + "maleRatio": -1, + "height": 6, + "weight": 110, + "pokedex": [ + "cobblemon.species.ironbundle.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "quarkdrive" + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 56, @@ -14,10 +30,6 @@ "special_defence": 60, "speed": 136 }, - "catchRate": 50, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,14 +38,14 @@ "special_defence": 0, "speed": 3 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 50, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:electricterrain", "1:present", + "1:electricterrain", "7:powdersnow", "14:whirlpool", "21:takedown", @@ -50,6 +62,7 @@ "tm:acrobatics", "tm:agility", "tm:aircutter", + "tm:auroraveil", "tm:avalanche", "tm:blizzard", "tm:bodyslam", @@ -82,19 +95,48 @@ "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 6, - "weight": 110, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.ironbundle.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 6, + "liquidGlowMode": "BOTH" + } } \ 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 075329a35..48830b374 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironcrown.json @@ -1,10 +1,26 @@ { - "name": "Iron Crown", + "implemented": true, "nationalPokedexNumber": 1023, + "name": "Iron Crown", "primaryType": "steel", "secondaryType": "psychic", + "maleRatio": -1, + "height": 16, + "weight": 1560, + "pokedex": [ + "cobblemon.species.ironcrown.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "quarkdrive" + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 90, @@ -14,10 +30,6 @@ "special_defence": 108, "speed": 98 }, - "catchRate": 10, - "maleRatio": -1, - "baseExperienceYield": 0, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,15 +38,15 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 295, "experienceGroup": "slow", + "catchRate": 10, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:confusion", - "1:electricterrain", "1:leer", + "1:electricterrain", + "1:confusion", "1:metalclaw", "7:smartstrike", "14:slash", @@ -74,6 +86,7 @@ "tm:protect", "tm:psychic", "tm:psychicnoise", + "tm:psychocut", "tm:psyshock", "tm:rest", "tm:scaryface", @@ -89,16 +102,51 @@ "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 16, - "weight": 1560, "evolutions": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 6, + "liquidGlowMode": "BOTH" + } } \ 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 4f78202af..77b09051d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironhands.json @@ -1,10 +1,26 @@ { - "name": "Iron Hands", + "implemented": true, "nationalPokedexNumber": 992, + "name": "Iron Hands", "primaryType": "fighting", "secondaryType": "electric", + "maleRatio": -1, + "height": 18, + "weight": 3807, + "pokedex": [ + "cobblemon.species.ironhands.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "quarkdrive" + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 154, @@ -14,10 +30,6 @@ "special_defence": 68, "speed": 50 }, - "catchRate": 50, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -26,17 +38,17 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 50, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:armthrust", - "1:electricterrain", - "1:focusenergy", "1:sandattack", "1:tackle", + "1:focusenergy", + "1:armthrust", + "1:electricterrain", "7:fakeout", "14:whirlwind", "21:thunderpunch", @@ -65,6 +77,7 @@ "tm:firepunch", "tm:fling", "tm:focusblast", + "tm:focusenergy", "tm:focuspunch", "tm:gigaimpact", "tm:hardpress", @@ -94,19 +107,54 @@ "tm:thunderbolt", "tm:thunderpunch", "tm:voltswitch", - "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 18, - "weight": 3807, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.ironhands.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 7, + "liquidGlowMode": "BOTH" + } } \ 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 7f644ea35..606dee9a7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironjugulis.json @@ -1,10 +1,26 @@ { - "name": "Iron Jugulis", + "implemented": true, "nationalPokedexNumber": 993, + "name": "Iron Jugulis", "primaryType": "dark", "secondaryType": "flying", + "maleRatio": -1, + "height": 13, + "weight": 1110, + "pokedex": [ + "cobblemon.species.ironjugulis.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "quarkdrive" + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 94, @@ -14,10 +30,6 @@ "special_defence": 80, "speed": 108 }, - "catchRate": 30, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,17 +38,17 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:aircutter", "1:electricterrain", + "1:workup", "1:focusenergy", "1:triattack", - "1:workup", + "1:aircutter", "7:roar", "14:assurance", "21:dragonbreath", @@ -52,6 +64,7 @@ "tm:acrobatics", "tm:aircutter", "tm:airslash", + "tm:assurance", "tm:bodyslam", "tm:chargebeam", "tm:crunch", @@ -71,6 +84,7 @@ "tm:flashcannon", "tm:fly", "tm:focusblast", + "tm:focusenergy", "tm:gigaimpact", "tm:heatwave", "tm:hurricane", @@ -98,20 +112,68 @@ "tm:taunt", "tm:terablast", "tm:throatchop", + "tm:triattack", "tm:uturn", - "tm:zenheadbutt" - ], - "labels": [ - "gen9", - "paradox" + "tm:workup", + "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" ], - "aspects": [], - "height": 13, - "weight": 1110, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.ironjugulis.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canBreatheUnderwater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 7, + "liquidGlowMode": "BOTH" + } } \ 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 new file mode 100644 index 000000000..483148f15 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironleaves.json @@ -0,0 +1,175 @@ +{ + "implemented": true, + "nationalPokedexNumber": 1010, + "name": "Iron Leaves", + "primaryType": "grass", + "secondaryType": "psychic", + "maleRatio": -1, + "height": 15, + "weight": 1250, + "pokedex": [ + "cobblemon.species.ironleaves.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], + "abilities": [ + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" + ], + "baseStats": { + "hp": 90, + "attack": 130, + "defence": 88, + "special_attack": 70, + "special_defence": 108, + "speed": 104 + }, + "evYield": { + "hp": 0, + "attack": 3, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 295, + "experienceGroup": "slow", + "catchRate": 5, + "eggCycles": 50, + "baseFriendship": 0, + "baseScale": 0.9, + "hitbox": { + "width": 0.9, + "height": 2.3, + "fixed": false + }, + "behaviour": { + "resting": { + "canSleep": true, + "light": "0-4", + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "herd": { + "maxSize": "4" + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "moves": [ + "1:leer", + "1:quickattack", + "1:helpinghand", + "1:workup", + "1:quash", + "1:electricterrain", + "7:magicalleaf", + "14:retaliate", + "21:quickguard", + "28:nightslash", + "35:swordsdance", + "42:sacredsword", + "49:leafblade", + "56:psyblade", + "63:closecombat", + "70:imprison", + "77:megahorn", + "84:allyswitch", + "91:solarblade", + "tm:aerialace", + "tm:agility", + "tm:airslash", + "tm:allyswitch", + "tm:brickbreak", + "tm:calmmind", + "tm:closecombat", + "tm:coaching", + "tm:doubleedge", + "tm:electricterrain", + "tm:endure", + "tm:energyball", + "tm:facade", + "tm:falseswipe", + "tm:focusblast", + "tm:gigadrain", + "tm:gigaimpact", + "tm:grassknot", + "tm:grassyterrain", + "tm:gravity", + "tm:helpinghand", + "tm:hyperbeam", + "tm:imprison", + "tm:irondefense", + "tm:leafblade", + "tm:leafstorm", + "tm:magicalleaf", + "tm:megahorn", + "tm:metalsound", + "tm:protect", + "tm:psychicterrain", + "tm:quash", + "tm:rest", + "tm:retaliate", + "tm:reversal", + "tm:scaryface", + "tm:sleeptalk", + "tm:smartstrike", + "tm:solarbeam", + "tm:solarblade", + "tm:substitute", + "tm:swift", + "tm:swordsdance", + "tm:takedown", + "tm:taunt", + "tm:terablast", + "tm:throatchop", + "tm:trailblaze", + "tm:wildcharge", + "tm:workup", + "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:rest", + "tutor:sleeptalk", + "tutor:swift", + "tutor:throatchop", + "tutor:wildcharge", + "tutor:xscissor" + ], + "evolutions": [], + "lightingData": { + "lightLevel": 6, + "liquidGlowMode": "BOTH" + } +} \ 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 3786b7fda..d24440068 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironmoth.json @@ -1,10 +1,26 @@ { - "name": "Iron Moth", + "implemented": true, "nationalPokedexNumber": 994, + "name": "Iron Moth", "primaryType": "fire", "secondaryType": "poison", + "maleRatio": -1, + "height": 12, + "weight": 360, + "pokedex": [ + "cobblemon.species.ironmoth.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "quarkdrive" + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 80, @@ -14,10 +30,6 @@ "special_defence": 110, "speed": 110 }, - "catchRate": 30, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,17 +38,17 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:acidspray", - "1:electricterrain", - "1:ember", "1:gust", "1:whirlwind", + "1:ember", + "1:acidspray", + "1:electricterrain", "7:strugglebug", "14:firespin", "21:takedown", @@ -82,6 +94,7 @@ "tm:protect", "tm:psychic", "tm:rest", + "tm:screech", "tm:sleeptalk", "tm:sludgewave", "tm:solarbeam", @@ -94,19 +107,56 @@ "tm:toxic", "tm:toxicspikes", "tm:uturn", - "tm:venoshock" + "tm:venoshock", + "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:swift" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 12, - "weight": 360, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.ironmoth.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canBreatheUnderwater": true, + "canSwimInLava": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "fireImmune": true + }, + "lightingData": { + "lightLevel": 8, + "liquidGlowMode": "BOTH" + } } \ 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 e3d4a8b6f..8afa6fb44 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironthorns.json @@ -1,10 +1,26 @@ { - "name": "Iron Thorns", + "implemented": true, "nationalPokedexNumber": 995, + "name": "Iron Thorns", "primaryType": "rock", "secondaryType": "electric", + "maleRatio": -1, + "height": 16, + "weight": 3030, + "pokedex": [ + "cobblemon.species.ironthorns.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "quarkdrive" + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,10 +30,6 @@ "special_defence": 84, "speed": 72 }, - "catchRate": 30, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -26,18 +38,18 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:electricterrain", + "1:rockthrow", "1:firefang", "1:icefang", "1:irondefense", - "1:rockthrow", "1:thunderfang", + "1:electricterrain", "7:screech", "21:rocktomb", "28:bite", @@ -91,6 +103,7 @@ "tm:lowkick", "tm:metalclaw", "tm:meteorbeam", + "tm:pinmissile", "tm:powergem", "tm:protect", "tm:raindance", @@ -101,6 +114,7 @@ "tm:sandstorm", "tm:sandtomb", "tm:scaryface", + "tm:screech", "tm:sleeptalk", "tm:smackdown", "tm:snarl", @@ -121,19 +135,64 @@ "tm:thunderpunch", "tm:thunderwave", "tm:voltswitch", - "tm:wildcharge" - ], - "labels": [ - "gen9", - "paradox" + "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" ], - "aspects": [], - "height": 16, - "weight": 3030, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.ironthorns.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 7, + "liquidGlowMode": "BOTH" + } } \ 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 b23e9ee3f..4feb786be 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/irontreads.json @@ -1,10 +1,26 @@ { - "name": "Iron Treads", + "implemented": true, "nationalPokedexNumber": 990, + "name": "Iron Treads", "primaryType": "ground", "secondaryType": "steel", + "maleRatio": -1, + "height": 9, + "weight": 2400, + "pokedex": [ + "cobblemon.species.irontreads.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "quarkdrive" + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 90, @@ -14,10 +30,6 @@ "special_defence": 70, "speed": 106 }, - "catchRate": 30, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,16 +38,16 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:defensecurl", - "1:electricterrain", "1:hornattack", + "1:defensecurl", "1:rollout", + "1:electricterrain", "7:bulldoze", "21:rapidspin", "28:ironhead", @@ -70,6 +82,7 @@ "tm:irondefense", "tm:ironhead", "tm:knockoff", + "tm:megahorn", "tm:metalsound", "tm:mudshot", "tm:mudslap", @@ -77,12 +90,14 @@ "tm:rest", "tm:rockslide", "tm:rocktomb", + "tm:rollout", "tm:sandstorm", "tm:scaryface", "tm:sleeptalk", "tm:smartstrike", "tm:stealthrock", "tm:steelbeam", + "tm:steelroller", "tm:stompingtantrum", "tm:stoneedge", "tm:substitute", @@ -93,19 +108,60 @@ "tm:thunderfang", "tm:voltswitch", "tm:wildcharge", - "tm:zenheadbutt" - ], - "labels": [ - "gen9", - "paradox" + "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" ], - "aspects": [], - "height": 9, - "weight": 2400, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.irontreads.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 7, + "liquidGlowMode": "BOTH" + } } \ 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 714a3b455..02e78dc2d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ironvaliant.json @@ -1,10 +1,26 @@ { - "name": "Iron Valiant", + "implemented": true, "nationalPokedexNumber": 1006, + "name": "Iron Valiant", "primaryType": "fairy", "secondaryType": "fighting", + "maleRatio": -1, + "height": 14, + "weight": 350, + "pokedex": [ + "cobblemon.species.ironvaliant.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "quarkdrive" + "quarkdrive", + "h:quarkdrive" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 74, @@ -14,10 +30,6 @@ "special_defence": 60, "speed": 116 }, - "catchRate": 10, - "maleRatio": -1, - "baseExperienceYield": 295, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -26,17 +38,17 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 295, "experienceGroup": "slow", + "catchRate": 10, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ "1:disable", "1:doubleteam", - "1:electricterrain", - "1:furycutter", "1:shadowsneak", + "1:furycutter", + "1:electricterrain", "7:hypnosis", "14:feint", "21:futuresight", @@ -48,8 +60,8 @@ "63:closecombat", "70:knockoff", "77:destinybond", - "84:quickguard", "84:wideguard", + "84:quickguard", "91:spiritbreak", "tm:aerialace", "tm:agility", @@ -61,6 +73,7 @@ "tm:coaching", "tm:confuseray", "tm:dazzlinggleam", + "tm:doubleteam", "tm:drainpunch", "tm:electricterrain", "tm:encore", @@ -71,6 +84,7 @@ "tm:firepunch", "tm:fling", "tm:focusblast", + "tm:furycutter", "tm:futuresight", "tm:gigaimpact", "tm:grassknot", @@ -82,6 +96,7 @@ "tm:icywind", "tm:imprison", "tm:knockoff", + "tm:leafblade", "tm:lightscreen", "tm:liquidation", "tm:lowkick", @@ -93,6 +108,7 @@ "tm:psybeam", "tm:psychic", "tm:psychicterrain", + "tm:psychocut", "tm:psychup", "tm:psyshock", "tm:reflect", @@ -116,19 +132,72 @@ "tm:trickroom", "tm:vacuumwave", "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 14, - "weight": 350, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.ironvaliant.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canSwimInWater": false, + "canBreatheUnderwater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 6, + "liquidGlowMode": "BOTH" + } } \ 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 deleted file mode 100644 index b72ffecf7..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/kilowattrel.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "name": "Kilowattrel", - "nationalPokedexNumber": 941, - "primaryType": "electric", - "secondaryType": "flying", - "abilities": [ - "windpower", - "voltabsorb", - "h:competitive" - ], - "baseStats": { - "hp": 70, - "attack": 70, - "defence": 60, - "special_attack": 105, - "special_defence": 60, - "speed": 125 - }, - "catchRate": 90, - "maleRatio": 0.5, - "baseExperienceYield": 172, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "flying" - ], - "moves": [ - "1:growl", - "1:peck", - "1:electroball", - "4:thundershock", - "7:quickattack", - "11:pluck", - "15:spark", - "19:uproar", - "24:roost", - "30:dualwingbeat", - "36:agility", - "43:voltswitch", - "48:discharge", - "55:hurricane", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:bravebird", - "tm:charge", - "tm:chargebeam", - "tm:dualwingbeat", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:gigaimpact", - "tm:hurricane", - "tm:hyperbeam", - "tm:protect", - "tm:rest", - "tm:scaryface", - "tm:sleeptalk", - "tm:substitute", - "tm:supercellslam", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:voltswitch", - "tm:weatherball", - "tm:wildcharge" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 14, - "weight": 386, - "preEvolution": "wattrel", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.kilowattrel.desc" - ], - "drops": { - "amount": 5, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-2" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:sharp_beak", - "percentage": 2.5 - }, - { - "item": "cobblemon:razz_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 83b2f4250..ca6d80b10 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/kingambit.json @@ -1,13 +1,27 @@ { - "name": "Kingambit", + "implemented": true, "nationalPokedexNumber": 983, + "name": "Kingambit", "primaryType": "dark", "secondaryType": "steel", + "maleRatio": 0.5, + "height": 20, + "weight": 1200, + "pokedex": [ + "cobblemon.species.kingambit.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "defiant", "supremeoverlord", "h:pressure" ], + "eggGroups": [ + "human_like" + ], "baseStats": { "hp": 100, "attack": 135, @@ -16,10 +30,6 @@ "special_defence": 85, "speed": 50 }, - "catchRate": 25, - "maleRatio": 0.5, - "baseExperienceYield": 275, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 3, @@ -28,18 +38,32 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 275, "experienceGroup": "medium_fast", + "catchRate": 25, "eggCycles": 20, - "eggGroups": [ - "human_like" - ], + "baseFriendship": 50, + "drops": { + "amount": 2, + "entries": [ + { + "item": "cobblemon:rocky_helmet", + "percentage": 5.0 + }, + { + "item": "cobblemon:cheri_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:furycutter", - "1:leer", + "1:kowtowcleave", "1:metalburst", "1:metalclaw", + "1:furycutter", "1:scratch", - "1:kowtowcleave", + "1:leer", + "1:feintattack", "15:torment", "20:scaryface", "25:assurance", @@ -51,8 +75,15 @@ "57:ironhead", "64:swordsdance", "71:guillotine", + "egg:feintattack", + "egg:headbutt", + "egg:meanlook", + "egg:pursuit", + "egg:quickguard", + "egg:suckerpunch", "tm:aerialace", "tm:airslash", + "tm:assurance", "tm:brickbreak", "tm:darkpulse", "tm:dig", @@ -63,8 +94,10 @@ "tm:fling", "tm:focusblast", "tm:foulplay", + "tm:furycutter", "tm:gigaimpact", "tm:grassknot", + "tm:headbutt", "tm:hyperbeam", "tm:irondefense", "tm:ironhead", @@ -77,6 +110,7 @@ "tm:protect", "tm:raindance", "tm:rest", + "tm:retaliate", "tm:reversal", "tm:rocktomb", "tm:sandstorm", @@ -89,6 +123,7 @@ "tm:steelbeam", "tm:stoneedge", "tm:substitute", + "tm:suckerpunch", "tm:swordsdance", "tm:takedown", "tm:taunt", @@ -96,33 +131,66 @@ "tm:thief", "tm:throatchop", "tm:thunderwave", + "tm:torment", "tm:xscissor", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" + "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", + "legacy:attract", + "legacy:confide", + "legacy:doubleteam", + "legacy:frustration", + "legacy:hiddenpower", + "legacy:knockoff", + "legacy:return", + "legacy:round", + "legacy:secretpower", + "legacy:snore", + "legacy:swagger", + "legacy:toxic" ], - "aspects": [], - "height": 20, - "weight": 1200, "preEvolution": "bisharp", "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.kingambit.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:rocky_helmet", - "percentage": 5.0 - }, - { - "item": "cobblemon:cheri_berry", - "percentage": 5.0 + "behaviour": { + "herd": { + "maxSize": "9" + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/klawf.json b/common/src/main/resources/data/cobblemon/species/generation9/klawf.json deleted file mode 100644 index 9ca395354..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/klawf.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "name": "Klawf", - "nationalPokedexNumber": 950, - "primaryType": "rock", - "abilities": [ - "angershell", - "shellarmor", - "h:regenerator" - ], - "baseStats": { - "hp": 70, - "attack": 100, - "defence": 115, - "special_attack": 35, - "special_defence": 55, - "speed": 75 - }, - "catchRate": 120, - "maleRatio": 0.5, - "baseExperienceYield": 158, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 35, - "eggGroups": [ - "water_3" - ], - "moves": [ - "1:rockthrow", - "1:visegrip", - "6:harden", - "9:rocksmash", - "13:rocktomb", - "17:metalclaw", - "21:protect", - "24:rockblast", - "29:xscissor", - "33:swordsdance", - "37:flail", - "42:rockslide", - "47:highhorsepower", - "51:irondefense", - "56:guillotine", - "egg:ancientpower", - "egg:crabhammer", - "egg:endeavor", - "egg:knockoff", - "tm:bodyslam", - "tm:brickbreak", - "tm:bulldoze", - "tm:dig", - "tm:earthpower", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:gigaimpact", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:irondefense", - "tm:knockoff", - "tm:metalclaw", - "tm:meteorbeam", - "tm:mudshot", - "tm:mudslap", - "tm:powergem", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:reversal", - "tm:rockblast", - "tm:rockslide", - "tm:rocktomb", - "tm:sandstorm", - "tm:scaryface", - "tm:shadowclaw", - "tm:skittersmack", - "tm:sleeptalk", - "tm:smackdown", - "tm:stealthrock", - "tm:stompingtantrum", - "tm:stoneedge", - "tm:substitute", - "tm:sunnyday", - "tm:swordsdance", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:trailblaze", - "tm:xscissor" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 13, - "weight": 790, - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.klawf.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:pinap_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ 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 8cd0144f8..399492454 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/koraidon.json @@ -1,10 +1,27 @@ { - "name": "Koraidon", + "implemented": true, "nationalPokedexNumber": 1007, + "name": "Koraidon", "primaryType": "fighting", "secondaryType": "dragon", + "maleRatio": -1, + "height": 25, + "weight": 3030, + "pokedex": [ + "cobblemon.species.koraidon.desc" + ], + "labels": [ + "gen9", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "orichalcumpulse" + "orichalcumpulse", + "h:orichalcumpulse" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,10 +31,6 @@ "special_defence": 100, "speed": 135 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 335, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -26,14 +39,14 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 335, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:breakingswipe", "1:sunnyday", + "1:breakingswipe", "7:rocksmash", "14:ancientpower", "21:drainpunch", @@ -50,6 +63,7 @@ "98:gigaimpact", "tm:acrobatics", "tm:agility", + "tm:ancientpower", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", @@ -96,8 +110,10 @@ "tm:rest", "tm:reversal", "tm:roar", + "tm:rocksmash", "tm:scaleshot", "tm:scaryface", + "tm:screech", "tm:shadowclaw", "tm:sleeptalk", "tm:snarl", @@ -114,19 +130,60 @@ "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" ], - "labels": [ - "gen9", - "legendary" - ], - "aspects": [], - "height": 25, - "weight": 3030, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.koraidon.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 6078189c6..8ed4aa2d3 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/lokix.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/lokix.json @@ -1,12 +1,26 @@ { - "name": "Lokix", + "implemented": true, "nationalPokedexNumber": 920, + "name": "Lokix", "primaryType": "bug", "secondaryType": "dark", + "maleRatio": 0.5, + "height": 10, + "weight": 175, + "pokedex": [ + "cobblemon.species.lokix.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "swarm", "h:tintedlens" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 71, "attack": 102, @@ -15,10 +29,6 @@ "special_defence": 55, "speed": 92 }, - "catchRate": 30, - "maleRatio": 0.5, - "baseExperienceYield": 158, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 2, @@ -27,17 +37,26 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 158, "experienceGroup": "medium_fast", + "catchRate": 30, "eggCycles": 20, - "eggGroups": [ - "bug" - ], + "baseFriendship": 0, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:coba_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:detect", + "1:lunge", + "1:tackle", "1:leer", "1:lowkick", - "1:tackle", - "1:lunge", + "1:detect", "4:strugglebug", "6:astonish", "9:assurance", @@ -52,8 +71,12 @@ "44:firstimpression", "48:bounce", "53:axekick", + "egg:counter", + "egg:skittersmack", "tm:aerialace", "tm:agility", + "tm:assurance", + "tm:bounce", "tm:brickbreak", "tm:bugbite", "tm:bugbuzz", @@ -75,11 +98,13 @@ "tm:rest", "tm:reversal", "tm:scaryface", + "tm:screech", "tm:skittersmack", "tm:sleeptalk", "tm:spite", "tm:strugglebug", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", "tm:swordsdance", "tm:takedown", @@ -89,28 +114,41 @@ "tm:throatchop", "tm:trailblaze", "tm:uturn", - "tm:xscissor" - ], - "labels": [ - "gen9" + "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" ], - "aspects": [], - "height": 10, - "weight": 175, "preEvolution": "nymble", "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.lokix.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:coba_berry", - "percentage": 5.0 + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file 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 71c4582a2..fe40ac765 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/miraidon.json @@ -1,10 +1,27 @@ { - "name": "Miraidon", + "implemented": true, "nationalPokedexNumber": 1008, + "name": "Miraidon", "primaryType": "electric", "secondaryType": "dragon", + "maleRatio": -1, + "height": 35, + "weight": 2400, + "pokedex": [ + "cobblemon.species.miraidon.desc" + ], + "labels": [ + "gen9", + "legendary", + "restricted" + ], + "aspects": [], "abilities": [ - "hadronengine" + "hadronengine", + "h:hadronengine" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 100, @@ -14,10 +31,6 @@ "special_defence": 115, "speed": 135 }, - "catchRate": 3, - "maleRatio": -1, - "baseExperienceYield": 335, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,15 +39,15 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 335, "experienceGroup": "slow", + "catchRate": 3, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ + "1:thundershock", "1:dragonbreath", "1:electricterrain", - "1:thundershock", "7:shockwave", "14:charge", "21:paraboliccharge", @@ -81,6 +94,7 @@ "tm:reflect", "tm:rest", "tm:scaryface", + "tm:shockwave", "tm:sleeptalk", "tm:snarl", "tm:solarbeam", @@ -96,19 +110,54 @@ "tm:uturn", "tm:voltswitch", "tm:wildcharge", - "tm:zenheadbutt" - ], - "labels": [ - "gen9", - "legendary" + "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" ], - "aspects": [], - "height": 35, - "weight": 2400, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.miraidon.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4" + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true, + "canBreatheUnderwater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 10, + "liquidGlowMode": "BOTH" + } } \ 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 e1ccd8c0e..faabca102 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/munkidori.json @@ -1,12 +1,27 @@ { - "name": "Munkidori", + "implemented": true, "nationalPokedexNumber": 1015, + "name": "Munkidori", "primaryType": "poison", "secondaryType": "psychic", + "maleRatio": 1, + "height": 10, + "weight": 122, + "pokedex": [ + "cobblemon.species.munkidori.desc" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [], "abilities": [ "toxicchain", "h:frisk" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 88, "attack": 75, @@ -15,10 +30,6 @@ "special_defence": 90, "speed": 106 }, - "catchRate": 3, - "maleRatio": 1, - "baseExperienceYield": 0, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -27,16 +38,16 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 278, "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "catchRate": 3, + "eggCycles": 120, + "baseFriendship": 0, "moves": [ + "1:scratch", "1:confusion", "1:fakeout", "1:flatter", - "1:scratch", "8:helpinghand", "16:psybeam", "24:clearsmog", @@ -95,16 +106,63 @@ "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" ], - "labels": [ - "gen9", - "legendary" - ], - "aspects": [], - "height": 10, - "weight": 122, "evolutions": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "okidogi", + "tier": 1 + }, + { + "pokemon": "fezandipiti", + "tier": 1 + }, + { + "pokemon": "munkidori", + "tier": 2 + }, + { + "pokemon": "pecharunt", + "tier": 3 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file 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 edd1de258..05a9416a9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/nymble.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/nymble.json @@ -1,11 +1,25 @@ { - "name": "Nymble", + "implemented": true, "nationalPokedexNumber": 919, + "name": "Nymble", "primaryType": "bug", + "maleRatio": 0.5, + "height": 2, + "weight": 10, + "pokedex": [ + "cobblemon.species.nymble.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "swarm", "h:tintedlens" ], + "eggGroups": [ + "bug" + ], "baseStats": { "hp": 33, "attack": 46, @@ -14,10 +28,6 @@ "special_defence": 25, "speed": 45 }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 42, - "baseFriendship": 20, "evYield": { "hp": 0, "attack": 1, @@ -26,14 +36,23 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 42, "experienceGroup": "medium_fast", + "catchRate": 190, "eggCycles": 20, - "eggGroups": [ - "bug" - ], + "baseFriendship": 20, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:coba_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:leer", "1:tackle", + "1:leer", "4:strugglebug", "6:astonish", "9:assurance", @@ -48,6 +67,7 @@ "egg:counter", "egg:skittersmack", "tm:agility", + "tm:assurance", "tm:bugbite", "tm:bugbuzz", "tm:endure", @@ -57,24 +77,27 @@ "tm:protect", "tm:raindance", "tm:rest", + "tm:screech", "tm:skittersmack", "tm:sleeptalk", "tm:strugglebug", "tm:substitute", + "tm:suckerpunch", "tm:sunnyday", "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" ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 2, - "weight": 10, "evolutions": [ { "id": "nymble_lokix", @@ -92,18 +115,19 @@ ] } ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.nymble.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:coba_berry", - "percentage": 2.5 + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 bd58e7410..eead57d91 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ogerpon.json @@ -1,9 +1,27 @@ { - "name": "Ogerpon", + "implemented": true, "nationalPokedexNumber": 1017, + "name": "Ogerpon", "primaryType": "grass", + "maleRatio": 0, + "height": 12, + "weight": 398, + "pokedex": [ + "cobblemon.species.ogerpon.desc" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [ + "teal-mask" + ], "abilities": [ - "defiant" + "defiant", + "h:defiant" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 80, @@ -13,10 +31,6 @@ "special_defence": 96, "speed": 110 }, - "catchRate": 5, - "maleRatio": 0, - "baseExperienceYield": 0, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -25,20 +39,20 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 275, "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "catchRate": 5, + "eggCycles": 10, + "baseFriendship": 50, "moves": [ - "1:counter", - "1:doublekick", - "1:followme", - "1:hornleech", + "1:vinewhip", "1:leechseed", "1:quickattack", + "1:followme", + "1:doublekick", + "1:counter", "1:retaliate", - "1:vinewhip", + "1:hornleech", "6:focusenergy", "12:growth", "18:slam", @@ -59,6 +73,7 @@ "tm:facade", "tm:falseswipe", "tm:fling", + "tm:focusenergy", "tm:gigadrain", "tm:gigaimpact", "tm:grassknot", @@ -72,9 +87,11 @@ "tm:lowsweep", "tm:magicalleaf", "tm:playrough", + "tm:powerwhip", "tm:protect", "tm:raindance", "tm:rest", + "tm:retaliate", "tm:reversal", "tm:rocktomb", "tm:sandstorm", @@ -87,58 +104,49 @@ "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: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" ], - "labels": [ - "gen9", - "legendary" - ], - "aspects": [ - "teal-mask" - ], - "height": 12, - "weight": 398, "evolutions": [], - "cannotDynamax": false, "forms": [ { "name": "Wellspring", "primaryType": "grass", "secondaryType": "water", - "abilities": [ - "waterabsorb" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "catchRate": 5, "maleRatio": 0, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" + "height": 12, + "weight": 398, + "pokedex": [ + "cobblemon.species.ogerpon-wellspring.desc" ], "labels": [ "gen9", @@ -147,42 +155,23 @@ "aspects": [ "wellspring-mask" ], - "height": 12, - "weight": 398, - "cannotDynamax": false, + "abilities": [ + "waterabsorb", + "h:waterabsorb" + ], + "eggCycles": 5, + "evolutions": [], "battleOnly": false }, { "name": "Hearthflame", "primaryType": "grass", "secondaryType": "fire", - "abilities": [ - "moldbreaker" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "catchRate": 5, "maleRatio": 0, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" + "height": 12, + "weight": 398, + "pokedex": [ + "cobblemon.species.ogerpon-hearthflame.desc" ], "labels": [ "gen9", @@ -191,42 +180,23 @@ "aspects": [ "hearthflame-mask" ], - "height": 12, - "weight": 398, - "cannotDynamax": false, + "abilities": [ + "moldbreaker", + "h:moldbreaker" + ], + "eggCycles": 5, + "evolutions": [], "battleOnly": false }, { "name": "Cornerstone", "primaryType": "grass", "secondaryType": "rock", - "abilities": [ - "sturdy" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "catchRate": 5, "maleRatio": 0, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" + "height": 12, + "weight": 398, + "pokedex": [ + "cobblemon.species.ogerpon-cornerstone.desc" ], "labels": [ "gen9", @@ -235,190 +205,145 @@ "aspects": [ "cornerstone-mask" ], - "height": 12, - "weight": 398, - "cannotDynamax": false, + "abilities": [ + "sturdy", + "h:sturdy" + ], + "eggCycles": 5, + "evolutions": [], "battleOnly": false }, { "name": "Teal-Tera", "primaryType": "grass", - "abilities": [ - "embodyaspectteal" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "catchRate": 5, "maleRatio": 0, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" + "height": 12, + "weight": 398, + "pokedex": [ + "cobblemon.species.ogerpon-tealtera.desc" ], "labels": [ "gen9", "legendary" ], "aspects": [ - "embody_aspect", + "embody-aspect", "teal-mask" ], - "height": 12, - "weight": 398, - "cannotDynamax": false, - "battleOnly": true + "abilities": [ + "embodyaspectteal", + "h:embodyaspectteal" + ], + "eggCycles": 5, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": false }, { "name": "Wellspring-Tera", "primaryType": "grass", "secondaryType": "water", - "abilities": [ - "embodyaspectwellspring" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "catchRate": 5, "maleRatio": 0, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" + "height": 12, + "weight": 398, + "pokedex": [ + "cobblemon.species.ogerpon-wellspringtera.desc" ], "labels": [ "gen9", "legendary" ], "aspects": [ - "embody_aspect", + "embody-aspect", "wellspring-mask" ], - "height": 12, - "weight": 398, - "cannotDynamax": false, - "battleOnly": true + "abilities": [ + "embodyaspectwellspring", + "h:embodyaspectwellspring" + ], + "eggCycles": 5, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": false }, { "name": "Hearthflame-Tera", "primaryType": "grass", "secondaryType": "fire", - "abilities": [ - "embodyaspecthearthflame" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "catchRate": 5, "maleRatio": 0, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" + "height": 12, + "weight": 398, + "pokedex": [ + "cobblemon.species.ogerpon-hearthflametera.desc" ], "labels": [ "gen9", "legendary" ], "aspects": [ - "embody_aspect", + "embody-aspect", "hearthflame-mask" ], - "height": 12, - "weight": 398, - "cannotDynamax": false, - "battleOnly": true + "abilities": [ + "embodyaspecthearthflame", + "h:embodyaspecthearthflame" + ], + "eggCycles": 5, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": false }, { "name": "Cornerstone-Tera", "primaryType": "grass", "secondaryType": "rock", - "abilities": [ - "embodyaspectcornerstone" - ], - "baseStats": { - "hp": 80, - "attack": 120, - "defence": 84, - "special_attack": 60, - "special_defence": 96, - "speed": 110 - }, - "catchRate": 5, "maleRatio": 0, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 3, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" + "height": 12, + "weight": 398, + "pokedex": [ + "cobblemon.species.ogerpon-cornerstonetera.desc" ], "labels": [ "gen9", "legendary" ], "aspects": [ - "embody_aspect", + "embody-aspect", "cornerstone-mask" ], - "height": 12, - "weight": 398, - "cannotDynamax": false, - "battleOnly": true + "abilities": [ + "embodyaspectcornerstone", + "h:embodyaspectcornerstone" + ], + "eggCycles": 5, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": false } ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "ogerpon", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json b/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json deleted file mode 100644 index 2770e4a1f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/oinkologne.json +++ /dev/null @@ -1,227 +0,0 @@ -{ - "implemented": true, - "name": "Oinkologne", - "nationalPokedexNumber": 916, - "primaryType": "normal", - "abilities": [ - "lingeringaroma", - "gluttony", - "h:thickfat" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:porkchop", - "quantityRange": "1-3" - }, - { - "item": "cobblemon:oran_berry", - "percentage": 5.0 - } - ] - }, - "baseStats": { - "hp": 110, - "attack": 100, - "defence": 75, - "special_attack": 59, - "special_defence": 80, - "speed": 65 - }, - "catchRate": 100, - "maleRatio": 0.5, - "baseExperienceYield": 171, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:tackle", - "1:tailwhip", - "5:disarmingvoice", - "8:echoedvoice", - "12:mudshot", - "15:covet", - "17:dig", - "23:headbutt", - "26:takedown", - "27:yawn", - "34:workup", - "38:uproar", - "42:doubleedge", - "48:earthpower", - "54:belch", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:bulletseed", - "tm:chillingwater", - "tm:curse", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleedge", - "tm:earthpower", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:gigaimpact", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:ironhead", - "tm:lashout", - "tm:mudshot", - "tm:mudslap", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:seedbomb", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:trailblaze", - "tm:uproar", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 10, - "weight": 1200, - "preEvolution": "lechonk", - "evolutions": [], - "cannotDynamax": false, - "forms": [ - { - "name": "female", - "primaryType": "normal", - "abilities": [ - "aromaveil", - "gluttony", - "h:thickfat" - ], - "baseStats": { - "hp": 115, - "attack": 90, - "defence": 70, - "special_attack": 59, - "special_defence": 90, - "speed": 65 - }, - "catchRate": 100, - "maleRatio": 0, - "baseExperienceYield": 171, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 15, - "eggGroups": [ - "field" - ], - "moves": [ - "1:tackle", - "1:tailwhip", - "3:disarmingvoice", - "6:echoedvoice", - "9:mudshot", - "12:covet", - "15:dig", - "17:headbutt", - "23:yawn", - "28:takedown", - "30:workup", - "34:uproar", - "39:doubleedge", - "45:earthpower", - "51:belch", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:bulletseed", - "tm:chillingwater", - "tm:curse", - "tm:dig", - "tm:disarmingvoice", - "tm:doubleedge", - "tm:earthpower", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:gigaimpact", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:hypervoice", - "tm:ironhead", - "tm:lashout", - "tm:mudshot", - "tm:mudslap", - "tm:playrough", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:seedbomb", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:trailblaze", - "tm:uproar", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [ - "female" - ], - "height": 10, - "weight": 1200, - "preEvolution": "lechonk", - "evolutions": [], - "cannotDynamax": false, - "battleOnly": false - } - ], - "baseScale": 1.0, - "hitbox": { - "width": 0.8, - "height": 1.1, - "fixed": false - }, - "pokedex": [ - "cobblemon.species.oinkologne.desc" - ] -} 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 8410363f9..2f56b0fb5 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/okidogi.json @@ -1,12 +1,27 @@ { - "name": "Okidogi", + "implemented": true, "nationalPokedexNumber": 1014, + "name": "Okidogi", "primaryType": "poison", "secondaryType": "fighting", + "maleRatio": 1, + "height": 18, + "weight": 922, + "pokedex": [ + "cobblemon.species.okidogi.desc" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [], "abilities": [ "toxicchain", "h:guarddog" ], + "eggGroups": [ + "undiscovered" + ], "baseStats": { "hp": 88, "attack": 128, @@ -15,10 +30,6 @@ "special_defence": 86, "speed": 80 }, - "catchRate": 3, - "maleRatio": 1, - "baseExperienceYield": 0, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -27,15 +38,15 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 278, "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "catchRate": 3, + "eggCycles": 120, + "baseFriendship": 0, "moves": [ "1:bite", - "1:bulkup", "1:lowkick", + "1:bulkup", "8:howl", "16:poisonfang", "24:forcepalm", @@ -48,6 +59,7 @@ "tm:bodypress", "tm:bodyslam", "tm:brickbreak", + "tm:brutalswing", "tm:bulkup", "tm:closecombat", "tm:crunch", @@ -93,6 +105,7 @@ "tm:spite", "tm:stompingtantrum", "tm:substitute", + "tm:superpower", "tm:takedown", "tm:taunt", "tm:terablast", @@ -102,16 +115,73 @@ "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:rest", + "tutor:shadowclaw", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:snarl", + "tutor:spite", + "tutor:stompingtantrum", + "tutor:superpower", + "tutor:throatchop", + "tutor:thunderfang", + "tutor:thunderpunch", + "tutor:uproar" ], - "labels": [ - "gen9", - "legendary" - ], - "aspects": [], - "height": 18, - "weight": 920, "evolutions": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "munkidori", + "tier": 1 + }, + { + "pokemon": "fezandipiti", + "tier": 1 + }, + { + "pokemon": "okidogi", + "tier": 2 + }, + { + "pokemon": "pecharunt", + "tier": 3 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 deleted file mode 100644 index 74320a136..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/orthworm.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "name": "Orthworm", - "nationalPokedexNumber": 968, - "primaryType": "steel", - "abilities": [ - "eartheater", - "h:sandveil" - ], - "baseStats": { - "hp": 70, - "attack": 85, - "defence": 145, - "special_attack": 60, - "special_defence": 55, - "speed": 65 - }, - "catchRate": 25, - "maleRatio": 0.5, - "baseExperienceYield": 240, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 35, - "eggGroups": [ - "field" - ], - "moves": [ - "1:harden", - "1:tackle", - "1:wrap", - "7:mudslap", - "12:smackdown", - "16:bulldoze", - "21:ironhead", - "26:takedown", - "30:dig", - "34:sandstorm", - "38:irondefense", - "43:irontail", - "47:earthquake", - "52:shedtail", - "egg:coil", - "egg:curse", - "egg:metalburst", - "tm:bodypress", - "tm:bodyslam", - "tm:bulldoze", - "tm:curse", - "tm:dig", - "tm:doubleedge", - "tm:earthpower", - "tm:earthquake", - "tm:endure", - "tm:facade", - "tm:flashcannon", - "tm:gigaimpact", - "tm:heavyslam", - "tm:helpinghand", - "tm:highhorsepower", - "tm:hyperbeam", - "tm:irondefense", - "tm:ironhead", - "tm:metalsound", - "tm:mudshot", - "tm:mudslap", - "tm:protect", - "tm:rest", - "tm:rockblast", - "tm:rockslide", - "tm:rocktomb", - "tm:sandstorm", - "tm:sandtomb", - "tm:sleeptalk", - "tm:smackdown", - "tm:spikes", - "tm:stealthrock", - "tm:steelbeam", - "tm:stompingtantrum", - "tm:substitute", - "tm:takedown", - "tm:terablast" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 25, - "weight": 3100, - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.orthworm.desc" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:iron_nugget", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:shuca_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ 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 deleted file mode 100644 index fc8ea7c03..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/palafin.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "name": "Palafin", - "nationalPokedexNumber": 964, - "primaryType": "water", - "abilities": [ - "zerotohero" - ], - "baseStats": { - "hp": 100, - "attack": 70, - "defence": 72, - "special_attack": 53, - "special_defence": 62, - "speed": 100 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 160, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "field", - "water_2" - ], - "moves": [ - "1:jetpunch", - "1:supersonic", - "1:watergun", - "1:flipturn", - "7:astonish", - "10:focusenergy", - "13:aquajet", - "17:doublehit", - "21:dive", - "25:charm", - "29:acrobatics", - "34:encore", - "39:aquatail", - "44:mist", - "50:hydropump", - "55:focuspunch", - "61:wavecrash", - "tm:acrobatics", - "tm:agility", - "tm:aurasphere", - "tm:blizzard", - "tm:bodyslam", - "tm:bulkup", - "tm:charm", - "tm:chillingwater", - "tm:closecombat", - "tm:disarmingvoice", - "tm:drainingkiss", - "tm:drainpunch", - "tm:encore", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:flipturn", - "tm:focusblast", - "tm:focuspunch", - "tm:gigaimpact", - "tm:grassknot", - "tm:hardpress", - "tm:haze", - "tm:helpinghand", - "tm:hydropump", - "tm:hyperbeam", - "tm:hypervoice", - "tm:icebeam", - "tm:icepunch", - "tm:icywind", - "tm:ironhead", - "tm:liquidation", - "tm:outrage", - "tm:protect", - "tm:psychup", - "tm:raindance", - "tm:rest", - "tm:reversal", - "tm:sleeptalk", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:throatchop", - "tm:waterfall", - "tm:waterpulse", - "tm:whirlpool", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 13, - "weight": 602, - "preEvolution": "finizen", - "evolutions": [], - "cannotDynamax": false, - "forms": [ - { - "name": "Hero", - "primaryType": "water", - "abilities": [ - "zerotohero" - ], - "baseStats": { - "hp": 100, - "attack": 160, - "defence": 97, - "special_attack": 106, - "special_defence": 87, - "speed": 100 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 160, - "baseFriendship": 50, - "evYield": { - "hp": 2, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 40, - "eggGroups": [ - "field", - "water_2" - ], - "labels": [ - "gen9" - ], - "aspects": [ - "hero" - ], - "height": 18, - "weight": 974, - "cannotDynamax": false, - "battleOnly": true - } - ], - "pokedex": [ - "cobblemon.species.palafin.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:cod", - "quantityRange": "0-2" - } - ] - }, - "implemented": true -} \ No newline at end of file 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 43fec9c97..660c935cc 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmi.json @@ -1,12 +1,26 @@ { - "name": "Pawmi", + "implemented": true, "nationalPokedexNumber": 921, + "name": "Pawmi", "primaryType": "electric", + "maleRatio": 0.5, + "height": 3, + "weight": 25, + "pokedex": [ + "cobblemon.species.pawmi.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "static", "naturalcure", "h:ironfist" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 45, "attack": 50, @@ -15,10 +29,6 @@ "special_defence": 25, "speed": 60 }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 48, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 0, @@ -27,14 +37,23 @@ "special_defence": 0, "speed": 1 }, + "baseExperienceYield": 48, "experienceGroup": "medium_fast", + "catchRate": 190, "eggCycles": 15, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 2.5 + } + ] + }, "moves": [ - "1:growl", "1:scratch", + "1:growl", "3:thundershock", "6:quickattack", "8:charge", @@ -86,14 +105,20 @@ "tm:thunderfang", "tm:thunderwave", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "tutor:chargebeam", + "tutor:electroweb", + "tutor:helpinghand", + "tutor:playrough", + "tutor:rest", + "tutor:sleeptalk", + "tutor:superfang", + "tutor:swift", + "tutor:thunderbolt", + "tutor:thunderfang", + "tutor:wildcharge", + "special:celebrate" ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 3, - "weight": 25, "evolutions": [ { "id": "pawmi_pawmo", @@ -111,18 +136,36 @@ ] } ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.pawmi.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:cheri_berry", - "percentage": 2.5 + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "pawmi", + "tier": 1 + }, + { + "pokemon": "pawmo", + "tier": 2 + }, + { + "pokemon": "pawmot", + "tier": 3 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendOwner": true + } + } } \ No newline at end of file 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 0c918e77c..5c71e653f 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmo.json @@ -1,13 +1,27 @@ { - "name": "Pawmo", + "implemented": true, "nationalPokedexNumber": 922, + "name": "Pawmo", "primaryType": "electric", "secondaryType": "fighting", + "maleRatio": 0.5, + "height": 4, + "weight": 65, + "pokedex": [ + "cobblemon.species.pawmo.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "voltabsorb", "naturalcure", "h:ironfist" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 60, "attack": 75, @@ -16,10 +30,6 @@ "special_defence": 40, "speed": 85 }, - "catchRate": 80, - "maleRatio": 0.5, - "baseExperienceYield": 123, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 0, @@ -28,15 +38,24 @@ "special_defence": 0, "speed": 2 }, + "baseExperienceYield": 123, "experienceGroup": "medium_fast", + "catchRate": 80, "eggCycles": 15, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 5.0 + } + ] + }, "moves": [ - "1:growl", - "1:scratch", "1:armthrust", + "1:scratch", + "1:growl", "3:thundershock", "6:quickattack", "8:charge", @@ -50,6 +69,10 @@ "42:discharge", "46:agility", "52:wildcharge", + "egg:fakeout", + "egg:machpunch", + "egg:sweetkiss", + "egg:wish", "tm:agility", "tm:batonpass", "tm:charge", @@ -91,14 +114,25 @@ "tm:thunderwave", "tm:upperhand", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "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", + "special:celebrate" ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 4, - "weight": 65, "preEvolution": "pawmi", "evolutions": [ { @@ -117,18 +151,34 @@ ] } ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.pawmo.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:cheri_berry", - "percentage": 5.0 + "behaviour": { + "herd": { + "maxSize": "5", + "toleratedLeaders": [ + { + "pokemon": "pawmo", + "tier": 1 + }, + { + "pokemon": "pawmot", + "tier": 2 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ No newline at end of file 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 44c1fd50d..fcedd81e8 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/pawmot.json @@ -1,13 +1,27 @@ { - "name": "Pawmot", + "implemented": true, "nationalPokedexNumber": 923, + "name": "Pawmot", "primaryType": "electric", "secondaryType": "fighting", + "maleRatio": 0.5, + "height": 9, + "weight": 410, + "pokedex": [ + "cobblemon.species.pawmot.desc" + ], + "labels": [ + "gen9" + ], + "aspects": [], "abilities": [ "voltabsorb", "naturalcure", "h:ironfist" ], + "eggGroups": [ + "field" + ], "baseStats": { "hp": 70, "attack": 115, @@ -16,10 +30,6 @@ "special_defence": 60, "speed": 105 }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 245, - "baseFriendship": 50, "evYield": { "hp": 0, "attack": 3, @@ -28,17 +38,25 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 245, "experienceGroup": "medium_fast", + "catchRate": 45, "eggCycles": 15, - "eggGroups": [ - "field" - ], + "baseFriendship": 50, + "drops": { + "amount": 1, + "entries": [ + { + "item": "cobblemon:cheri_berry", + "percentage": 10.0 + } + ] + }, "moves": [ - "1:growl", + "1:revivalblessing", "1:scratch", + "1:growl", "1:wildcharge", - "1:armthrust", - "1:revivalblessing", "3:thundershock", "6:quickattack", "8:charge", @@ -54,6 +72,10 @@ "49:discharge", "54:agility", "60:doubleshock", + "egg:fakeout", + "egg:machpunch", + "egg:sweetkiss", + "egg:wish", "tm:agility", "tm:batonpass", "tm:bodypress", @@ -111,28 +133,58 @@ "tm:thunderwave", "tm:upperhand", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "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", + "special:celebrate" ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 9, - "weight": 410, "preEvolution": "pawmo", "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.pawmot.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:cheri_berry", - "percentage": 10.0 + "behaviour": { + "herd": { + "maxSize": "6", + "toleratedLeaders": [ + { + "pokemon": "pawmot", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true } - ] - }, - "implemented": true + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ 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 deleted file mode 100644 index 39dc9997f..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/poltchageist.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "name": "Poltchageist", - "nationalPokedexNumber": 1012, - "primaryType": "grass", - "secondaryType": "ghost", - "abilities": [ - "hospitality", - "h:heatproof" - ], - "baseStats": { - "hp": 40, - "attack": 45, - "defence": 45, - "special_attack": 74, - "special_defence": 54, - "speed": 50 - }, - "catchRate": 120, - "maleRatio": -1, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "mineral", - "amorphous" - ], - "moves": [ - "1:astonish", - "1:stunspore", - "1:withdraw", - "6:absorb", - "12:lifedew", - "18:foulplay", - "24:megadrain", - "30:hex", - "36:ragepowder", - "42:gigadrain", - "48:shadowball", - "54:memento", - "60:leafstorm", - "tm:calmmind", - "tm:curse", - "tm:endure", - "tm:energyball", - "tm:foulplay", - "tm:gigadrain", - "tm:grassyterrain", - "tm:hex", - "tm:imprison", - "tm:irondefense", - "tm:leafstorm", - "tm:magicalleaf", - "tm:nastyplot", - "tm:nightshade", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psychup", - "tm:reflect", - "tm:rest", - "tm:scald", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:terablast", - "tm:trickroom", - "tm:uproar" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 1, - "weight": 11, - "evolutions": [ - { - "id": "poltchageist_sinistcha", - "variant": "item_interact", - "result": "sinistcha", - "consumeHeldItem": false, - "learnableMoves": [ - "matchagotcha" - ], - "requirements": [], - "requiredContext": "cobblemon:unremarkable_teacup" - } - ], - "cannotDynamax": false, - "forms": [ - { - "name": "Artisan", - "primaryType": "grass", - "secondaryType": "ghost", - "abilities": [ - "hospitality", - "h:heatproof" - ], - "baseStats": { - "hp": 40, - "attack": 45, - "defence": 45, - "special_attack": 74, - "special_defence": 54, - "speed": 50 - }, - "catchRate": 120, - "maleRatio": -1, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:astonish", - "1:stunspore", - "1:withdraw", - "6:absorb", - "12:lifedew", - "18:foulplay", - "24:megadrain", - "30:hex", - "36:ragepowder", - "42:gigadrain", - "48:shadowball", - "54:memento", - "60:leafstorm", - "tm:calmmind", - "tm:curse", - "tm:endure", - "tm:energyball", - "tm:foulplay", - "tm:gigadrain", - "tm:grassyterrain", - "tm:hex", - "tm:imprison", - "tm:irondefense", - "tm:leafstorm", - "tm:magicalleaf", - "tm:nastyplot", - "tm:nightshade", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psychup", - "tm:reflect", - "tm:rest", - "tm:scald", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:terablast", - "tm:trickroom", - "tm:uproar" - ], - "labels": [ - "gen9" - ], - "aspects": [ - "artisan" - ], - "height": 1, - "weight": 11, - "evolutions": [ - { - "id": "poltchageist_sinistcha", - "variant": "item_interact", - "result": "sinistcha masterpiece", - "consumeHeldItem": false, - "learnableMoves": [ - "matchagotcha" - ], - "requirements": [], - "requiredContext": "cobblemon:masterpiece_teacup" - } - ], - "cannotDynamax": false, - "battleOnly": false - } - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:rawst_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json b/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json deleted file mode 100644 index a4e3c905d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/rabsca.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "name": "Rabsca", - "nationalPokedexNumber": 954, - "primaryType": "bug", - "secondaryType": "psychic", - "abilities": [ - "synchronize", - "h:telepathy" - ], - "baseStats": { - "hp": 75, - "attack": 50, - "defence": 85, - "special_attack": 115, - "special_defence": 100, - "speed": 45 - }, - "catchRate": 45, - "maleRatio": 0.5, - "baseExperienceYield": 165, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:confusion", - "1:defensecurl", - "1:psychup", - "1:safeguard", - "1:tackle", - "1:revivalblessing", - "4:sandattack", - "7:strugglebug", - "11:rollout", - "15:psybeam", - "20:bugbite", - "24:takedown", - "29:extrasensory", - "35:lunge", - "40:guardswap", - "40:powerswap", - "40:speedswap", - "45:bugbuzz", - "50:psychic", - "tm:bugbite", - "tm:bugbuzz", - "tm:calmmind", - "tm:confuseray", - "tm:dazzlinggleam", - "tm:dig", - "tm:earthpower", - "tm:electroball", - "tm:endure", - "tm:energyball", - "tm:expandingforce", - "tm:facade", - "tm:fling", - "tm:futuresight", - "tm:gigaimpact", - "tm:gravity", - "tm:gunkshot", - "tm:hyperbeam", - "tm:imprison", - "tm:irondefense", - "tm:leechlife", - "tm:lightscreen", - "tm:lunge", - "tm:mudshot", - "tm:mudslap", - "tm:poltergeist", - "tm:pounce", - "tm:powergem", - "tm:protect", - "tm:psybeam", - "tm:psychic", - "tm:psychicnoise", - "tm:psychicterrain", - "tm:psychup", - "tm:psyshock", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:rocktomb", - "tm:sandstorm", - "tm:shadowball", - "tm:skillswap", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:storedpower", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:trick", - "tm:trickroom", - "tm:weatherball", - "tm:xscissor", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 3, - "weight": 35, - "preEvolution": "rellor", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.rabsca.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:ender_pearl" - } - ] - }, - "implemented": true -} \ No newline at end of file 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 39bd85be7..37e0a90f1 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/ragingbolt.json @@ -1,10 +1,26 @@ { - "name": "Raging Bolt", + "implemented": true, "nationalPokedexNumber": 1021, + "name": "Raging Bolt", "primaryType": "electric", "secondaryType": "dragon", + "maleRatio": -1, + "height": 52, + "weight": 4800, + "pokedex": [ + "cobblemon.species.ragingbolt.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "protosynthesis" + "protosynthesis", + "h:protosynthesis" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 125, @@ -14,10 +30,6 @@ "special_defence": 89, "speed": 75 }, - "catchRate": 10, - "maleRatio": -1, - "baseExperienceYield": 0, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,17 +38,17 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 295, "experienceGroup": "slow", + "catchRate": 10, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:ancientpower", + "1:twister", + "1:sunnyday", "1:shockwave", "1:stomp", - "1:sunnyday", - "1:twister", + "1:ancientpower", "7:charge", "14:dragonbreath", "21:electricterrain", @@ -50,6 +62,7 @@ "77:zapcannon", "84:bodypress", "91:thunder", + "tm:ancientpower", "tm:bodypress", "tm:bodyslam", "tm:breakingswipe", @@ -76,8 +89,10 @@ "tm:outrage", "tm:protect", "tm:rest", + "tm:risingvoltage", "tm:roar", "tm:scaryface", + "tm:shockwave", "tm:sleeptalk", "tm:snarl", "tm:solarbeam", @@ -92,18 +107,55 @@ "tm:thunderbolt", "tm:thunderfang", "tm:thunderwave", + "tm:twister", "tm:voltswitch", "tm:weatherball", - "tm:wildcharge" - ], - "labels": [ - "gen9", - "paradox" + "tm:wildcharge", + "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" ], - "aspects": [], - "height": 52, - "weight": 4800, "evolutions": [], - "cannotDynamax": false, - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "ragingbolt", + "tier": 1 + } + ] + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 deleted file mode 100644 index 2f36e88f6..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/rellor.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "name": "Rellor", - "nationalPokedexNumber": 953, - "primaryType": "bug", - "abilities": [ - "compoundeyes", - "h:shedskin" - ], - "baseStats": { - "hp": 41, - "attack": 50, - "defence": 60, - "special_attack": 31, - "special_defence": 58, - "speed": 30 - }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 54, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:defensecurl", - "1:tackle", - "4:sandattack", - "7:strugglebug", - "11:rollout", - "15:mudshot", - "20:bugbite", - "24:takedown", - "29:dig", - "35:lunge", - "egg:cosmicpower", - "egg:memento", - "egg:recover", - "egg:weatherball", - "tm:bugbite", - "tm:bugbuzz", - "tm:dig", - "tm:endure", - "tm:facade", - "tm:fling", - "tm:gunkshot", - "tm:irondefense", - "tm:leechlife", - "tm:lunge", - "tm:mudshot", - "tm:mudslap", - "tm:pounce", - "tm:protect", - "tm:rest", - "tm:rocktomb", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:strugglebug", - "tm:substitute", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:weatherball", - "tm:xscissor" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 2, - "weight": 10, - "evolutions": [ - { - "id": "rellor_rabsca", - "variant": "level_up", - "result": "rabsca", - "consumeHeldItem": false, - "learnableMoves": [ - "revivalblessing" - ], - "requirements": [ - { - "variant": "blocks_traveled", - "amount": 1000 - } - ] - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.rellor.desc" - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "minecraft:mud" - } - ] - }, - "implemented": true -} \ No newline at end of file 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 4f8bd6916..cc978cc81 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/roaringmoon.json @@ -1,10 +1,26 @@ { - "name": "Roaring Moon", + "implemented": true, "nationalPokedexNumber": 1005, + "name": "Roaring Moon", "primaryType": "dragon", "secondaryType": "dark", + "maleRatio": -1, + "height": 20, + "weight": 3800, + "pokedex": [ + "cobblemon.species.roaringmoon.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "protosynthesis" + "protosynthesis", + "h:protosynthesis" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 105, @@ -14,10 +30,6 @@ "special_defence": 101, "speed": 119 }, - "catchRate": 10, - "maleRatio": -1, - "baseExperienceYield": 295, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -26,20 +38,20 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 295, "experienceGroup": "slow", + "catchRate": 10, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:bite", - "1:breakingswipe", "1:dragonbreath", + "1:leer", + "1:bite", "1:focusenergy", + "1:sunnyday", "1:jawlock", - "1:leer", + "1:breakingswipe", "1:scaleshot", - "1:sunnyday", "7:incinerate", "14:headbutt", "21:scaryface", @@ -78,12 +90,15 @@ "tm:firespin", "tm:flamethrower", "tm:fly", + "tm:focusenergy", "tm:gigaimpact", + "tm:headbutt", "tm:heatwave", "tm:hurricane", "tm:hydropump", "tm:hyperbeam", "tm:hypervoice", + "tm:incinerate", "tm:ironhead", "tm:knockoff", "tm:lashout", @@ -93,6 +108,7 @@ "tm:rest", "tm:roar", "tm:rockslide", + "tm:roost", "tm:scaleshot", "tm:scaryface", "tm:shadowclaw", @@ -110,19 +126,55 @@ "tm:thunderfang", "tm:uturn", "tm:xscissor", - "tm:zenheadbutt" - ], - "labels": [ - "gen9", - "paradox" + "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" ], - "aspects": [], - "height": 20, - "weight": 3800, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.roaringmoon.desc" - ], - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ 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 8d2dd3325..a957a1f90 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/sandyshocks.json @@ -1,10 +1,26 @@ { - "name": "Sandy Shocks", + "implemented": true, "nationalPokedexNumber": 989, + "name": "Sandy Shocks", "primaryType": "electric", "secondaryType": "ground", + "maleRatio": -1, + "height": 23, + "weight": 600, + "pokedex": [ + "cobblemon.species.sandyshocks.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "protosynthesis" + "protosynthesis", + "h:protosynthesis" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 85, @@ -14,10 +30,6 @@ "special_defence": 85, "speed": 101 }, - "catchRate": 30, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,17 +38,17 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ + "1:thunderwave", "1:electricterrain", - "1:sunnyday", "1:supersonic", "1:thundershock", - "1:thunderwave", + "1:sunnyday", "7:spark", "14:bulldoze", "21:chargebeam", @@ -80,6 +92,7 @@ "tm:sandstorm", "tm:sandtomb", "tm:scorchingsands", + "tm:screech", "tm:sleeptalk", "tm:spikes", "tm:stealthrock", @@ -93,20 +106,56 @@ "tm:thunder", "tm:thunderbolt", "tm:thunderwave", + "tm:triattack", "tm:voltswitch", - "tm:wildcharge" + "tm:wildcharge", + "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 23, - "weight": 600, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.sandyshocks.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "4", + "toleratedLeaders": [ + { + "pokemon": "sandyshocks", + "tier": 1 + } + ] + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } } \ 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 deleted file mode 100644 index ef37888ba..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/scovillain.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "name": "Scovillain", - "nationalPokedexNumber": 952, - "primaryType": "grass", - "secondaryType": "fire", - "abilities": [ - "chlorophyll", - "insomnia", - "h:moody" - ], - "baseStats": { - "hp": 65, - "attack": 108, - "defence": 65, - "special_attack": 108, - "special_defence": 65, - "speed": 75 - }, - "catchRate": 75, - "maleRatio": 0.5, - "baseExperienceYield": 170, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:firefang", - "1:leafage", - "1:leer", - "1:spicyextract", - "1:flamethrower", - "4:bite", - "10:growth", - "13:razorleaf", - "17:sunnyday", - "21:bulletseed", - "24:headbutt", - "28:zenheadbutt", - "33:worryseed", - "38:crunch", - "44:seedbomb", - "48:overheat", - "48:solarbeam", - "tm:bulletseed", - "tm:burningjealousy", - "tm:crunch", - "tm:endeavor", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:fireblast", - "tm:firefang", - "tm:flamethrower", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:helpinghand", - "tm:hyperbeam", - "tm:lashout", - "tm:leafstorm", - "tm:magicalleaf", - "tm:overheat", - "tm:protect", - "tm:rest", - "tm:sandstorm", - "tm:scaryface", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:stompingtantrum", - "tm:substitute", - "tm:sunnyday", - "tm:superfang", - "tm:takedown", - "tm:temperflare", - "tm:terablast", - "tm:thief", - "tm:trailblaze", - "tm:willowisp", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 9, - "weight": 150, - "preEvolution": "capsakid", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.scovillain.desc" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "cobblemon:roasted_leek", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:rawst_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 bff1d4ba4..7a7514477 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/screamtail.json @@ -1,10 +1,26 @@ { - "name": "Scream Tail", + "implemented": true, "nationalPokedexNumber": 985, + "name": "Scream Tail", "primaryType": "fairy", "secondaryType": "psychic", + "maleRatio": -1, + "height": 12, + "weight": 80, + "pokedex": [ + "cobblemon.species.screamtail.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "protosynthesis" + "protosynthesis", + "h:protosynthesis" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 115, @@ -14,10 +30,6 @@ "special_defence": 115, "speed": 111 }, - "catchRate": 50, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 3, "attack": 0, @@ -26,15 +38,15 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 50, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ - "1:disable", "1:pound", "1:sing", + "1:disable", "1:sunnyday", "7:howl", "14:nobleroar", @@ -119,19 +131,55 @@ "tm:trickroom", "tm:uproar", "tm:waterpulse", - "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" ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 12, - "weight": 80, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.screamtail.desc" - ], - "implemented": true + "behaviour": { + "herd": { + "maxSize": "5" + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json b/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json deleted file mode 100644 index ea85430e0..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/sinistcha.json +++ /dev/null @@ -1,194 +0,0 @@ -{ - "name": "Sinistcha", - "nationalPokedexNumber": 1013, - "primaryType": "grass", - "secondaryType": "ghost", - "abilities": [ - "hospitality", - "h:heatproof" - ], - "baseStats": { - "hp": 71, - "attack": 60, - "defence": 106, - "special_attack": 121, - "special_defence": 80, - "speed": 70 - }, - "catchRate": 60, - "maleRatio": -1, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "mineral", - "amorphous" - ], - "moves": [ - "1:astonish", - "1:stunspore", - "1:withdraw", - "6:absorb", - "12:lifedew", - "18:foulplay", - "24:megadrain", - "30:hex", - "36:ragepowder", - "42:strengthsap", - "48:shadowball", - "54:memento", - "60:leafstorm", - "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:magicalleaf", - "tm:nastyplot", - "tm:nightshade", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psychup", - "tm:reflect", - "tm:rest", - "tm:scald", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:terablast", - "tm:trickroom", - "tm:uproar" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 2, - "weight": 22, - "preEvolution": "poltchageist", - "evolutions": [], - "cannotDynamax": false, - "forms": [ - { - "name": "Masterpiece", - "primaryType": "grass", - "secondaryType": "ghost", - "abilities": [ - "hospitality", - "h:heatproof" - ], - "baseStats": { - "hp": 71, - "attack": 60, - "defence": 106, - "special_attack": 121, - "special_defence": 80, - "speed": 70 - }, - "catchRate": 60, - "maleRatio": -1, - "baseExperienceYield": 0, - "baseFriendship": 0, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 2, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "slow", - "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], - "moves": [ - "1:astonish", - "1:stunspore", - "1:withdraw", - "6:absorb", - "12:lifedew", - "18:foulplay", - "24:megadrain", - "30:hex", - "36:ragepowder", - "42:strengthsap", - "48:shadowball", - "54:memento", - "60:leafstorm", - "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:magicalleaf", - "tm:nastyplot", - "tm:nightshade", - "tm:painsplit", - "tm:phantomforce", - "tm:poltergeist", - "tm:protect", - "tm:psychup", - "tm:reflect", - "tm:rest", - "tm:scald", - "tm:shadowball", - "tm:sleeptalk", - "tm:solarbeam", - "tm:spite", - "tm:substitute", - "tm:terablast", - "tm:trickroom", - "tm:uproar" - ], - "labels": [ - "gen9" - ], - "aspects": [ - "masterpiece" - ], - "height": 2, - "weight": 22, - "preEvolution": "poltchageist artisan", - "cannotDynamax": false, - "battleOnly": false - } - ], - "drops": { - "amount": 1, - "entries": [ - { - "item": "cobblemon:rawst_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file 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 5a81d3475..62959d8b9 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/slitherwing.json @@ -1,10 +1,26 @@ { - "name": "Slither Wing", + "implemented": true, "nationalPokedexNumber": 988, + "name": "Slither Wing", "primaryType": "bug", "secondaryType": "fighting", + "maleRatio": -1, + "height": 32, + "weight": 920, + "pokedex": [ + "cobblemon.species.slitherwing.desc" + ], + "labels": [ + "gen9", + "paradox" + ], + "aspects": [], "abilities": [ - "protosynthesis" + "protosynthesis", + "h:protosynthesis" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 85, @@ -14,10 +30,6 @@ "special_defence": 105, "speed": 81 }, - "catchRate": 30, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 3, @@ -26,15 +38,34 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 30, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "day" + ], + "drowsyChance": 0.0033, + "rouseChance": 0.0042 + } + }, "moves": [ - "1:bugbite", - "1:ember", "1:gust", + "1:ember", + "1:bugbite", "1:sunnyday", "7:poisonpowder", "7:stunspore", @@ -89,6 +120,7 @@ "tm:stompingtantrum", "tm:substitute", "tm:sunnyday", + "tm:superpower", "tm:takedown", "tm:temperflare", "tm:terablast", @@ -96,19 +128,25 @@ "tm:uturn", "tm:wildcharge", "tm:willowisp", - "tm:zenheadbutt" - ], - "labels": [ - "gen9", - "paradox" - ], - "aspects": [], - "height": 32, - "weight": 920, - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.slitherwing.desc" + "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" ], - "implemented": true + "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 deleted file mode 100644 index beef9dca9..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/smoliv.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "name": "Smoliv", - "nationalPokedexNumber": 928, - "primaryType": "grass", - "secondaryType": "normal", - "abilities": [ - "earlybird", - "h:harvest" - ], - "baseStats": { - "hp": 41, - "attack": 35, - "defence": 45, - "special_attack": 58, - "special_defence": 51, - "speed": 30 - }, - "catchRate": 255, - "maleRatio": 0.5, - "baseExperienceYield": 52, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 1, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:sweetscent", - "1:tackle", - "5:absorb", - "7:growth", - "10:razorleaf", - "13:helpinghand", - "16:flail", - "20:megadrain", - "23:grassyterrain", - "27:seedbomb", - "30:energyball", - "34:leechseed", - "38:terrainpulse", - "egg:memento", - "egg:strengthsap", - "egg:synthesis", - "egg:weatherball", - "tm:bulletseed", - "tm:charm", - "tm:earthpower", - "tm:endure", - "tm:energyball", - "tm:facade", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyterrain", - "tm:helpinghand", - "tm:leafstorm", - "tm:magicalleaf", - "tm:protect", - "tm:rest", - "tm:seedbomb", - "tm:sleeptalk", - "tm:solarbeam", - "tm:solarblade", - "tm:substitute", - "tm:sunnyday", - "tm:swift", - "tm:terablast", - "tm:trailblaze", - "tm:weatherball" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 3, - "weight": 65, - "evolutions": [ - { - "id": "smoliv_dolliv", - "variant": "level_up", - "result": "dolliv", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 25 - } - ] - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.smoliv.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "cobblemon:big_root", - "percentage": 2.5 - }, - { - "item": "cobblemon:kebia_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/spidops.json b/common/src/main/resources/data/cobblemon/species/generation9/spidops.json deleted file mode 100644 index ce7a18664..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/spidops.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "name": "Spidops", - "nationalPokedexNumber": 918, - "primaryType": "bug", - "abilities": [ - "insomnia", - "h:stakeout" - ], - "baseStats": { - "hp": 60, - "attack": 79, - "defence": 92, - "special_attack": 52, - "special_defence": 86, - "speed": 35 - }, - "catchRate": 120, - "maleRatio": 0.5, - "baseExperienceYield": 141, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 2, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "erratic", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:stringshot", - "1:tackle", - "1:silktrap", - "5:strugglebug", - "8:assurance", - "11:feint", - "14:bugbite", - "19:block", - "24:counter", - "28:headbutt", - "33:stickyweb", - "37:gastroacid", - "41:circlethrow", - "45:throatchop", - "49:skittersmack", - "tm:aerialace", - "tm:bodyslam", - "tm:brickbreak", - "tm:bugbite", - "tm:bugbuzz", - "tm:bulletseed", - "tm:electroweb", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:fling", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:knockoff", - "tm:leechlife", - "tm:lowkick", - "tm:lunge", - "tm:painsplit", - "tm:poisonjab", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:reversal", - "tm:rocktomb", - "tm:scaryface", - "tm:shadowclaw", - "tm:skittersmack", - "tm:sleeptalk", - "tm:spikes", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:takedown", - "tm:taunt", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:toxicspikes", - "tm:trailblaze", - "tm:upperhand", - "tm:uturn", - "tm:xscissor" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 10, - "weight": 165, - "preEvolution": "tarountula", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.spidops.desc" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-2" - }, - { - "item": "minecraft:spider_eye", - "quantityRange": "0-2" - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json b/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json deleted file mode 100644 index 29c73bf5b..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/tadbulb.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "name": "Tadbulb", - "nationalPokedexNumber": 938, - "primaryType": "electric", - "abilities": [ - "owntempo", - "static", - "h:damp" - ], - "baseStats": { - "hp": 61, - "attack": 31, - "defence": 41, - "special_attack": 59, - "special_defence": 35, - "speed": 45 - }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 54, - "baseFriendship": 50, - "evYield": { - "hp": 1, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_1" - ], - "moves": [ - "1:mudslap", - "1:tackle", - "7:thundershock", - "11:watergun", - "17:charge", - "21:spark", - "24:mudshot", - "25:flail", - "32:discharge", - "36:weatherball", - "40:electricterrain", - "45:suckerpunch", - "50:zapcannon", - "egg:muddywater", - "egg:paraboliccharge", - "egg:soak", - "tm:acidspray", - "tm:charge", - "tm:chargebeam", - "tm:chillingwater", - "tm:confuseray", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endure", - "tm:hypervoice", - "tm:lightscreen", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:sleeptalk", - "tm:substitute", - "tm:swift", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:voltswitch", - "tm:waterpulse", - "tm:weatherball", - "tm:wildcharge" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 3, - "weight": 4, - "evolutions": [ - { - "id": "tadbulb_bellibolt", - "variant": "item_interact", - "result": "bellibolt", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [], - "requiredContext": "cobblemon:thunder_stone" - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.tadbulb.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:ochre_froglight", - "percentage": 2.5 - }, - { - "item": "cobblemon:wepear_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json b/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json deleted file mode 100644 index b4204381d..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/tarountula.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "name": "Tarountula", - "nationalPokedexNumber": 917, - "primaryType": "bug", - "abilities": [ - "insomnia", - "h:stakeout" - ], - "baseStats": { - "hp": 35, - "attack": 41, - "defence": 45, - "special_attack": 29, - "special_defence": 40, - "speed": 20 - }, - "catchRate": 255, - "maleRatio": 0.5, - "baseExperienceYield": 42, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 1, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "erratic", - "eggCycles": 15, - "eggGroups": [ - "bug" - ], - "moves": [ - "1:stringshot", - "1:tackle", - "5:strugglebug", - "8:assurance", - "11:feint", - "14:bugbite", - "18:block", - "22:counter", - "25:headbutt", - "29:stickyweb", - "33:gastroacid", - "36:circlethrow", - "40:throatchop", - "44:skittersmack", - "egg:firstimpression", - "egg:lunge", - "egg:memento", - "egg:suckerpunch", - "tm:bodyslam", - "tm:bugbite", - "tm:bugbuzz", - "tm:bulletseed", - "tm:endure", - "tm:facade", - "tm:falseswipe", - "tm:gigadrain", - "tm:grassknot", - "tm:knockoff", - "tm:leechlife", - "tm:lunge", - "tm:poisonjab", - "tm:pounce", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:shadowclaw", - "tm:skittersmack", - "tm:sleeptalk", - "tm:spikes", - "tm:strugglebug", - "tm:substitute", - "tm:sunnyday", - "tm:takedown", - "tm:terablast", - "tm:thief", - "tm:throatchop", - "tm:toxicspikes", - "tm:trailblaze", - "tm:xscissor" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 3, - "weight": 40, - "evolutions": [ - { - "id": "tarountula_spidops", - "variant": "level_up", - "result": "spidops", - "consumeHeldItem": false, - "learnableMoves": [ - "silktrap" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 15 - } - ] - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.tarountula.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:string", - "quantityRange": "0-1" - }, - { - "item": "minecraft:spider_eye", - "quantityRange": "0-1" - } - ] - }, - "implemented": true -} \ No newline at end of file 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 8f4c809db..ed6f787b4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/tinglu.json @@ -1,10 +1,26 @@ { - "name": "Ting-Lu", + "implemented": true, "nationalPokedexNumber": 1003, + "name": "Ting-Lu", "primaryType": "dark", "secondaryType": "ground", + "maleRatio": -1, + "height": 27, + "weight": 6997, + "pokedex": [ + "cobblemon.species.tinglu.desc" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [], "abilities": [ - "vesselofruin" + "vesselofruin", + "h:vesselofruin" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 155, @@ -14,10 +30,6 @@ "special_defence": 80, "speed": 45 }, - "catchRate": 6, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,11 +38,11 @@ "special_defence": 0, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 6, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ "1:meanlook", "1:sandtomb", @@ -67,6 +79,7 @@ "tm:lashout", "tm:mudshot", "tm:mudslap", + "tm:payback", "tm:protect", "tm:rest", "tm:rockslide", @@ -87,19 +100,44 @@ "tm:taunt", "tm:terablast", "tm:throatchop", - "tm:zenheadbutt" - ], - "labels": [ - "gen9", - "legendary" + "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" ], - "aspects": [], - "height": 27, - "weight": 6997, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.tinglu.desc" - ], - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json b/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json deleted file mode 100644 index aef58ef8a..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/toedscool.json +++ /dev/null @@ -1,141 +0,0 @@ -{ - "name": "Toedscool", - "nationalPokedexNumber": 948, - "primaryType": "ground", - "secondaryType": "grass", - "abilities": [ - "myceliummight" - ], - "baseStats": { - "hp": 40, - "attack": 40, - "defence": 35, - "special_attack": 50, - "special_defence": 100, - "speed": 70 - }, - "catchRate": 190, - "maleRatio": 0.5, - "baseExperienceYield": 67, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 1, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:mudslap", - "1:wrap", - "4:absorb", - "8:poisonpowder", - "8:stunspore", - "12:supersonic", - "15:tackle", - "16:megadrain", - "20:screech", - "24:mudshot", - "28:hex", - "32:seedbomb", - "36:spore", - "40:growth", - "44:gigadrain", - "48:earthpower", - "52:powerwhip", - "egg:acupressure", - "egg:knockoff", - "egg:leechseed", - "egg:mirrorcoat", - "egg:ragepowder", - "egg:rapidspin", - "egg:tickle", - "egg:toxic", - "tm:acidspray", - "tm:bulletseed", - "tm:confuseray", - "tm:dazzlinggleam", - "tm:earthpower", - "tm:endure", - "tm:energyball", - "tm:flashcannon", - "tm:foulplay", - "tm:gigadrain", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:hex", - "tm:knockoff", - "tm:leafstorm", - "tm:lightscreen", - "tm:lunge", - "tm:magicalleaf", - "tm:mudshot", - "tm:mudslap", - "tm:painsplit", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:scaryface", - "tm:seedbomb", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:spikes", - "tm:substitute", - "tm:swift", - "tm:taunt", - "tm:terablast", - "tm:toxic", - "tm:toxicspikes", - "tm:trailblaze", - "tm:trickroom", - "tm:venoshock" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 9, - "weight": 330, - "evolutions": [ - { - "id": "toedscool_toedscruel", - "variant": "level_up", - "result": "toedscruel", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 30 - } - ] - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.toedscool.desc" - ], - "drops": { - "amount": 2, - "entries": [ - { - "item": "minecraft:brown_mushroom", - "quantityRange": "0-1" - }, - { - "item": "cobblemon:yache_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json b/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json deleted file mode 100644 index c6165446a..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/toedscruel.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "name": "Toedscruel", - "nationalPokedexNumber": 949, - "primaryType": "ground", - "secondaryType": "grass", - "abilities": [ - "myceliummight" - ], - "baseStats": { - "hp": 80, - "attack": 70, - "defence": 65, - "special_attack": 80, - "special_defence": 120, - "speed": 100 - }, - "catchRate": 90, - "maleRatio": 0.5, - "baseExperienceYield": 180, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 2, - "speed": 0 - }, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "grass" - ], - "moves": [ - "1:mudslap", - "1:reflecttype", - "1:wrap", - "4:absorb", - "8:poisonpowder", - "8:stunspore", - "12:supersonic", - "15:tackle", - "16:megadrain", - "20:screech", - "24:mudshot", - "28:hex", - "34:seedbomb", - "40:spore", - "44:growth", - "48:gigadrain", - "54:earthpower", - "58:powerwhip", - "tm:acidspray", - "tm:bulletseed", - "tm:confuseray", - "tm:dazzlinggleam", - "tm:earthpower", - "tm:endure", - "tm:energyball", - "tm:flashcannon", - "tm:foulplay", - "tm:gigadrain", - "tm:gigaimpact", - "tm:grassknot", - "tm:grassyglide", - "tm:grassyterrain", - "tm:hex", - "tm:hyperbeam", - "tm:knockoff", - "tm:leafstorm", - "tm:lightscreen", - "tm:lunge", - "tm:magicalleaf", - "tm:mudshot", - "tm:mudslap", - "tm:painsplit", - "tm:protect", - "tm:raindance", - "tm:reflect", - "tm:rest", - "tm:scaryface", - "tm:seedbomb", - "tm:skittersmack", - "tm:sleeptalk", - "tm:sludgebomb", - "tm:solarbeam", - "tm:spikes", - "tm:substitute", - "tm:swift", - "tm:taunt", - "tm:terablast", - "tm:toxic", - "tm:toxicspikes", - "tm:trailblaze", - "tm:trickroom", - "tm:venoshock" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 19, - "weight": 580, - "preEvolution": "toedscool", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.toedscruel.desc" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:brown_mushroom", - "quantityRange": "0-2" - }, - { - "item": "cobblemon:yache_berry", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/veluza.json b/common/src/main/resources/data/cobblemon/species/generation9/veluza.json deleted file mode 100644 index a1915892c..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/veluza.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "name": "Veluza", - "nationalPokedexNumber": 976, - "primaryType": "water", - "secondaryType": "psychic", - "abilities": [ - "moldbreaker", - "h:sharpness" - ], - "baseStats": { - "hp": 90, - "attack": 102, - "defence": 73, - "special_attack": 78, - "special_defence": 65, - "speed": 70 - }, - "catchRate": 100, - "maleRatio": 0.5, - "baseExperienceYield": 167, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 2, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 0 - }, - "experienceGroup": "fast", - "eggCycles": 20, - "eggGroups": [ - "water_2" - ], - "moves": [ - "1:aquajet", - "1:tackle", - "7:pluck", - "11:waterpulse", - "15:focusenergy", - "20:slash", - "25:aquacutter", - "30:filletaway", - "35:nightslash", - "40:psychocut", - "45:liquidation", - "50:crunch", - "55:finalgambit", - "egg:recover", - "egg:thrash", - "tm:agility", - "tm:blizzard", - "tm:bodyslam", - "tm:chillingwater", - "tm:crunch", - "tm:doubleedge", - "tm:drillrun", - "tm:endeavor", - "tm:endure", - "tm:expandingforce", - "tm:flipturn", - "tm:gigaimpact", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:icefang", - "tm:icywind", - "tm:liquidation", - "tm:painsplit", - "tm:protect", - "tm:psychic", - "tm:psychicfangs", - "tm:psychicterrain", - "tm:raindance", - "tm:rest", - "tm:scaleshot", - "tm:sleeptalk", - "tm:snowscape", - "tm:storedpower", - "tm:substitute", - "tm:surf", - "tm:takedown", - "tm:terablast", - "tm:waterfall", - "tm:waterpulse", - "tm:zenheadbutt" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 25, - "weight": 900, - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.veluza.desc" - ], - "drops": { - "amount": 4, - "entries": [ - { - "item": "minecraft:cod", - "quantityRange": "1-3" - }, - { - "item": "minecraft:bone_meal", - "percentage": 5.0 - } - ] - }, - "implemented": true -} \ 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 deleted file mode 100644 index 23b9c0dfd..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/wattrel.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "name": "Wattrel", - "nationalPokedexNumber": 940, - "primaryType": "electric", - "secondaryType": "flying", - "abilities": [ - "windpower", - "voltabsorb", - "h:competitive" - ], - "baseStats": { - "hp": 40, - "attack": 40, - "defence": 35, - "special_attack": 55, - "special_defence": 40, - "speed": 70 - }, - "catchRate": 180, - "maleRatio": 0.5, - "baseExperienceYield": 56, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "experienceGroup": "medium_slow", - "eggCycles": 20, - "eggGroups": [ - "water_1", - "flying" - ], - "moves": [ - "1:growl", - "1:peck", - "4:thundershock", - "7:quickattack", - "11:pluck", - "15:spark", - "19:uproar", - "23:roost", - "27:dualwingbeat", - "32:agility", - "37:voltswitch", - "43:discharge", - "egg:endeavor", - "egg:featherdance", - "egg:spitup", - "egg:stockpile", - "egg:swallow", - "egg:weatherball", - "tm:acrobatics", - "tm:aerialace", - "tm:agility", - "tm:aircutter", - "tm:airslash", - "tm:bravebird", - "tm:charge", - "tm:chargebeam", - "tm:dualwingbeat", - "tm:eerieimpulse", - "tm:electricterrain", - "tm:electroball", - "tm:electroweb", - "tm:endeavor", - "tm:endure", - "tm:facade", - "tm:featherdance", - "tm:fly", - "tm:hurricane", - "tm:protect", - "tm:rest", - "tm:sleeptalk", - "tm:substitute", - "tm:swift", - "tm:tailwind", - "tm:takedown", - "tm:terablast", - "tm:thunder", - "tm:thunderbolt", - "tm:thunderwave", - "tm:uproar", - "tm:uturn", - "tm:voltswitch", - "tm:weatherball", - "tm:wildcharge" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 4, - "weight": 36, - "evolutions": [ - { - "id": "wattrel_kilowattrel", - "variant": "level_up", - "result": "kilowattrel", - "consumeHeldItem": false, - "learnableMoves": [ - "electroball" - ], - "requirements": [ - { - "variant": "level", - "minLevel": 25 - } - ] - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.wattrel.desc" - ], - "drops": { - "amount": 3, - "entries": [ - { - "item": "minecraft:feather", - "quantityRange": "0-1" - }, - { - "item": "minecraft:chicken" - }, - { - "item": "cobblemon:razz_berry", - "percentage": 2.5 - } - ] - }, - "implemented": true -} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json b/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json deleted file mode 100644 index a9428c5d2..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/wiglett.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "name": "Wiglett", - "nationalPokedexNumber": 960, - "primaryType": "water", - "abilities": [ - "gooey", - "rattled", - "h:sandveil" - ], - "baseStats": { - "hp": 10, - "attack": 55, - "defence": 25, - "special_attack": 35, - "special_defence": 25, - "speed": 95 - }, - "catchRate": 255, - "maleRatio": 0.5, - "baseExperienceYield": 49, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 1 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_3" - ], - "moves": [ - "1:sandattack", - "1:watergun", - "4:mudslap", - "8:wrap", - "12:aquajet", - "20:slam", - "20:waterpulse", - "24:headbutt", - "28:dig", - "32:suckerpunch", - "36:throatchop", - "40:liquidation", - "egg:finalgambit", - "egg:memento", - "tm:agility", - "tm:blizzard", - "tm:bulldoze", - "tm:chillingwater", - "tm:dig", - "tm:earthpower", - "tm:endure", - "tm:facade", - "tm:foulplay", - "tm:helpinghand", - "tm:hydropump", - "tm:icebeam", - "tm:liquidation", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:sandstorm", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:waterpulse", - "tm:whirlpool" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 12, - "weight": 18, - "evolutions": [ - { - "id": "wiglett_wugtrio", - "variant": "level_up", - "result": "wugtrio", - "consumeHeldItem": false, - "learnableMoves": [], - "requirements": [ - { - "variant": "level", - "minLevel": 26 - } - ] - } - ], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.wiglett.desc" - ], - "implemented": true -} \ No newline at end of file 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 b038968c3..0ed1df400 100644 --- a/common/src/main/resources/data/cobblemon/species/generation9/wochien.json +++ b/common/src/main/resources/data/cobblemon/species/generation9/wochien.json @@ -1,10 +1,26 @@ { - "name": "Wo-Chien", + "implemented": true, "nationalPokedexNumber": 1001, + "name": "Wo-Chien", "primaryType": "dark", "secondaryType": "grass", + "maleRatio": -1, + "height": 15, + "weight": 742, + "pokedex": [ + "cobblemon.species.wochien.desc" + ], + "labels": [ + "gen9", + "legendary" + ], + "aspects": [], "abilities": [ - "tabletsofruin" + "tabletsofruin", + "h:tabletsofruin" + ], + "eggGroups": [ + "undiscovered" ], "baseStats": { "hp": 85, @@ -14,10 +30,6 @@ "special_defence": 135, "speed": 70 }, - "catchRate": 6, - "maleRatio": -1, - "baseExperienceYield": 285, - "baseFriendship": 0, "evYield": { "hp": 0, "attack": 0, @@ -26,15 +38,15 @@ "special_defence": 3, "speed": 0 }, + "baseExperienceYield": 285, "experienceGroup": "slow", + "catchRate": 6, "eggCycles": 50, - "eggGroups": [ - "undiscovered" - ], + "baseFriendship": 0, "moves": [ "1:absorb", - "1:meanlook", "1:spite", + "1:meanlook", "5:tickle", "10:payback", "15:poisonpowder", @@ -72,7 +84,9 @@ "tm:magicalleaf", "tm:mudshot", "tm:mudslap", + "tm:payback", "tm:pollenpuff", + "tm:powerwhip", "tm:protect", "tm:raindance", "tm:reflect", @@ -90,19 +104,42 @@ "tm:taunt", "tm:terablast", "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" ], - "labels": [ - "gen9", - "legendary" - ], - "aspects": [], - "height": 15, - "weight": 742, "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.wochien.desc" - ], - "implemented": true + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "times": [ + "any" + ], + "drowsyChance": 0.0014, + "rouseChance": 0.0042 + } + } } \ 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 deleted file mode 100644 index 9ac5b62b1..000000000 --- a/common/src/main/resources/data/cobblemon/species/generation9/wugtrio.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "name": "Wugtrio", - "nationalPokedexNumber": 961, - "primaryType": "water", - "abilities": [ - "gooey", - "rattled", - "h:sandveil" - ], - "baseStats": { - "hp": 35, - "attack": 100, - "defence": 50, - "special_attack": 50, - "special_defence": 70, - "speed": 120 - }, - "catchRate": 50, - "maleRatio": 0.5, - "baseExperienceYield": 149, - "baseFriendship": 50, - "evYield": { - "hp": 0, - "attack": 0, - "defence": 0, - "special_attack": 0, - "special_defence": 0, - "speed": 2 - }, - "experienceGroup": "medium_fast", - "eggCycles": 20, - "eggGroups": [ - "water_3" - ], - "moves": [ - "1:mudslap", - "1:sandattack", - "1:watergun", - "1:wrap", - "12:aquajet", - "16:slam", - "20:waterpulse", - "24:headbutt", - "30:tripledive", - "36:dig", - "42:suckerpunch", - "48:throatchop", - "54:liquidation", - "tm:agility", - "tm:blizzard", - "tm:bulldoze", - "tm:chillingwater", - "tm:dig", - "tm:earthpower", - "tm:endure", - "tm:facade", - "tm:foulplay", - "tm:gigaimpact", - "tm:helpinghand", - "tm:hydropump", - "tm:hyperbeam", - "tm:icebeam", - "tm:liquidation", - "tm:muddywater", - "tm:mudshot", - "tm:mudslap", - "tm:painsplit", - "tm:protect", - "tm:raindance", - "tm:rest", - "tm:sandstorm", - "tm:sleeptalk", - "tm:stompingtantrum", - "tm:substitute", - "tm:surf", - "tm:swift", - "tm:takedown", - "tm:terablast", - "tm:throatchop", - "tm:waterpulse", - "tm:whirlpool" - ], - "labels": [ - "gen9" - ], - "aspects": [], - "height": 12, - "weight": 54, - "preEvolution": "wiglett", - "evolutions": [], - "cannotDynamax": false, - "pokedex": [ - "cobblemon.species.wugtrio.desc" - ], - "implemented": true -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 635ba6a69..3ac729819 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.daemon=true minecraft_version=1.21.1 archives_base_name=Generations-Core -mod_version=1.1.0-SNAPSHOT +mod_version=1.2.0-SNAPSHOT maven_group=generations.gg.generations.core description=Core mod for Generations. Required for all other Generations mods. Contains Blocks, Items, Entities, and other things that are used by all other Generations mods. @@ -11,7 +11,7 @@ description=Core mod for Generations. Required for all other Generations mods. C architectury_version=13.0.8 botarium_version=2.3.4 devauth_version=1.2.1 -cobblemon_version=1.7.0+1.21.1 +cobblemon_version=1.7.1+1.21.1 fabric_loader_version=0.17.2 fabric_api_version=0.116.6 diff --git a/settings.gradle.kts b/settings.gradle.kts index dd5214784..614ce2a7a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,6 @@ develocity.buildScan { termsOfUseAgree = "yes" } -include("common", "fabric", "neoforge") +include("common", "fabric") rootProject.name = "Generations-Core" \ No newline at end of file From a557f53db9c5af819ac4b9294b48768bc38c3e94 Mon Sep 17 00:00:00 2001 From: soupbag Date: Fri, 19 Dec 2025 02:45:03 -0800 Subject: [PATCH 2/5] Zygarde cube math and touchups --- CHANGELOG.md | 6 ++ .../dialogues/zygarde_cube.json | 99 ++++++++++--------- settings.gradle.kts | 2 +- 3 files changed, 59 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8507fe20..28280e7af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,20 @@ Bug Fixes - Resolved FPS decay when using smooth models (finally!) +- Fixed Pokemon models sometimes floating way up or appearing invisible - Fixed a Fridge crash - Fixed a client crash that occurred with RKS Machine - Fixed a post battle conditional crash - Fixed Cobblemon profiles and portraits appearing a couple pixels up - Fixed Therian form changes +- Fixed Zygarde Cube dialogue exit - Adjusted Gible and Clefairy evolution line spawn rates in the End to account for some modded biomes and Ultra Beast rates - Adjusted sound volumes for Elevator and Meloetta Relic Song +Resource Packs +- Fixed Unown sprites and models +- Reduced file size slightly +- Fixed Hisuian starter sprites # 1.2.0 diff --git a/common/src/main/resources/data/generations_core/dialogues/zygarde_cube.json b/common/src/main/resources/data/generations_core/dialogues/zygarde_cube.json index 3fbce496d..a4a5b3ae7 100644 --- a/common/src/main/resources/data/generations_core/dialogues/zygarde_cube.json +++ b/common/src/main/resources/data/generations_core/dialogues/zygarde_cube.json @@ -13,7 +13,7 @@ "id": "main_menu", "speaker": "player", "lines": [ - "Zygarde Cube", + "What would you like to do?", { "type": "expression", "expression": "'You currently have ' + q.player.selected_item.damage + ' cells available.'" @@ -23,19 +23,13 @@ "type": "option", "options": [ { - "text": "Create New Zygarde", + "text": "Create", "value": "create", "isVisible": "q.player.selected_item.damage >= 10", "action": "q.dialogue.set_page('create_form');" }, { - "text": "Modify Zygarde", - "value": "modify", - "isVisible": "q.player.has_in_party('cobblemon:zygarde')", - "action": "q.dialogue.set_page('select_zygarde_modify');" - }, - { - "text": "Dissolve Zygarde", + "text": "Disassemble", "value": "dissolve", "isVisible": "q.player.has_in_party('cobblemon:zygarde')", "action": "q.dialogue.set_page('select_zygarde_dissolve');" @@ -350,8 +344,8 @@ "id": "select_zygarde_dissolve", "speaker": "player", "lines": [ - "Select which Zygarde to dissolve:", - "WARNING: This will remove the Pokémon from your party!" + "Which Zygarde would you like to disassemble?", + "WARNING: This will remove the Zygarde completely!" ], "input": { "type": "option", @@ -364,7 +358,7 @@ "v.slot = 0;", "v.pokemon = q.player.party.get(0);", "v.dissolve_form = v.pokemon.get_feature('zygarde_form');", - "v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);", + "v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);", "q.dialogue.set_page('confirm_dissolve');" ] }, @@ -376,7 +370,7 @@ "v.slot = 1;", "v.pokemon = q.player.party.get(1);", "v.dissolve_form = v.pokemon.get_feature('zygarde_form');", - "v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);", + "v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);", "q.dialogue.set_page('confirm_dissolve');" ] }, @@ -388,7 +382,7 @@ "v.slot = 2;", "v.pokemon = q.player.party.get(2);", "v.dissolve_form = v.pokemon.get_feature('zygarde_form');", - "v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);", + "v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);", "q.dialogue.set_page('confirm_dissolve');" ] }, @@ -400,7 +394,7 @@ "v.slot = 3;", "v.pokemon = q.player.party.get(3);", "v.dissolve_form = v.pokemon.get_feature('zygarde_form');", - "v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);", + "v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);", "q.dialogue.set_page('confirm_dissolve');" ] }, @@ -412,7 +406,7 @@ "v.slot = 4;", "v.pokemon = q.player.party.get(4);", "v.dissolve_form = v.pokemon.get_feature('zygarde_form');", - "v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);", + "v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);", "q.dialogue.set_page('confirm_dissolve');" ] }, @@ -424,7 +418,7 @@ "v.slot = 5;", "v.pokemon = q.player.party.get(5);", "v.dissolve_form = v.pokemon.get_feature('zygarde_form');", - "v.cells_to_return = v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100);", + "v.cells_to_return = (v.dissolve_form == '10%' ? 10 : (v.dissolve_form == '50%' ? 50 : 100)) + (v.pokemon.get_ability() == 'powerconstruct' ? 50 : 0);", "q.dialogue.set_page('confirm_dissolve');" ] }, @@ -442,7 +436,7 @@ "lines": [ { "type": "expression", - "expression": "'Are you sure you want to dissolve this ' + v.dissolve_form + ' Zygarde?'" + "expression": "'Are you sure you want to disassemble this ' + v.dissolve_form + ' Zygarde?'" }, { "type": "expression", @@ -454,7 +448,7 @@ "type": "option", "options": [ { - "text": "Yes, dissolve it", + "text": "Yes", "value": "yes", "action": [ "q.player.selected_item.damage(v.cells_to_return);", @@ -463,7 +457,7 @@ ] }, { - "text": "No, cancel", + "text": "No", "value": "no", "action": "q.dialogue.close();" } @@ -474,10 +468,10 @@ "id": "dissolved", "speaker": "player", "lines": [ - "Zygarde dissolved successfully!", + "Zygarde disassembled successfully!", { "type": "expression", - "expression": "v.cells_to_return + ' cells returned to your Zygarde Cube.'" + "expression": "v.cells_to_return + ' cells have been reassembled into your Zygarde Cube.'" } ], "input": { @@ -501,33 +495,51 @@ "type": "option", "options": [ { - "text": "10% Form (10 cells)", + "text": "10% Aura Break", "value": "10", "isVisible": "q.player.selected_item.damage >= 10", "action": [ "v.form = '10%';", "v.cells_needed = 10;", - "q.dialogue.set_page('create_ability');" + "v.ability = 'aurabreak';", + "v.ability_string_cheese = 'Aura Break';", + "q.dialogue.set_page('confirm_create');" + ] + }, + { + "text": "10% PowerConstruct", + "value": "60", + "isVisible": "q.player.selected_item.damage >= 60", + "action": [ + "v.form = '10%';", + "v.cells_needed = 60;", + "v.ability = 'powerconstruct';", + "v.ability_string_cheese = 'Power Construct';", + "q.dialogue.set_page('confirm_create');" ] }, { - "text": "50% Form (50 cells)", + "text": "50% Aura Break", "value": "50", "isVisible": "q.player.selected_item.damage >= 50", "action": [ "v.form = '50%';", "v.cells_needed = 50;", - "q.dialogue.set_page('create_ability');" + "v.ability = 'aurabreak';", + "v.ability_string_cheese = 'Aura Break';", + "q.dialogue.set_page('confirm_create');" ] }, { - "text": "100% Form (Complete) (100 cells)", + "text": "50% PowerConstruct", "value": "100", "isVisible": "q.player.selected_item.damage >= 100", "action": [ - "v.form = '100%';", + "v.form = '50%';", "v.cells_needed = 100;", - "q.dialogue.set_page('create_ability');" + "v.ability = 'powerconstruct';", + "v.ability_string_cheese = 'Power Construct';", + "q.dialogue.set_page('confirm_create');" ] }, { @@ -539,38 +551,31 @@ } }, { - "id": "create_ability", + "id": "confirm_create", "speaker": "player", "lines": [ { "type": "expression", - "expression": "'Creating ' + v.form + ' Zygarde'" + "expression": "'Are you sure you want to create a ' + v.ability_string_cheese + ' ' + v.form + ' Zygarde?'" }, - "Which ability should it have?" + { + "type": "expression", + "expression": "'This will use ' + v.cells_needed + ' cells.'" + } ], "input": { "type": "option", "options": [ { - "text": "Aura Break", - "value": "aurabreak", - "action": [ - "v.ability = 'aurabreak';", - "q.dialogue.set_page('create_congrats');" - ] - }, - { - "text": "Power Construct", - "value": "powerconstruct", - "isVisible": "v.form == '50%' || v.form == '100%'", + "text": "Yes", + "value": "yes", "action": [ - "v.ability = 'powerconstruct';", "q.dialogue.set_page('create_congrats');" ] }, { - "text": "Cancel", - "value": "cancel", + "text": "No", + "value": "no", "action": "q.dialogue.close();" } ] @@ -583,7 +588,7 @@ "Congratulations!", { "type": "expression", - "expression": "'You have created a ' + v.form + ' Zygarde with ' + v.ability + '!'" + "expression": "'You have created a ' + v.form + ' Zygarde with ' + v.ability_string_cheese + '!'" }, "It was added to your party." ], diff --git a/settings.gradle.kts b/settings.gradle.kts index 22bde3a57..614ce2a7a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,6 @@ develocity.buildScan { termsOfUseAgree = "yes" } -include("common", "fabric","neoforge") +include("common", "fabric") rootProject.name = "Generations-Core" \ No newline at end of file From ff129a2ad592e0c159366497ed013f3578bbc560 Mon Sep 17 00:00:00 2001 From: soupbag Date: Fri, 19 Dec 2025 02:47:52 -0800 Subject: [PATCH 3/5] Update settings.gradle.kts --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 614ce2a7a..dd5214784 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,6 @@ develocity.buildScan { termsOfUseAgree = "yes" } -include("common", "fabric") +include("common", "fabric", "neoforge") rootProject.name = "Generations-Core" \ No newline at end of file From 798a0df44cd2c77920d251edfb49ac8925b18288 Mon Sep 17 00:00:00 2001 From: soupbag Date: Mon, 19 Jan 2026 03:45:12 -0800 Subject: [PATCH 4/5] spawning fixes - Tweaked a handful of Pokemon and Legendary spawns - Prevent Legendaries from spawning underground - Fixed some Pokedex implemented entries - Changed Legendary Bird Wings to 64 stack --- .../common/world/item/GenerationsItems.kt | 14 +- .../spawn_pool_world/0132_ditto.json | 2 +- .../cobblemon/spawn_pool_world/0151_mew.json | 4 +- .../spawn_pool_world/0265_wurmple.json | 2 +- .../spawn_pool_world/0266_silcoon.json | 2 +- .../spawn_pool_world/0267_beautifly.json | 2 +- .../spawn_pool_world/0268_cascoon.json | 2 +- .../spawn_pool_world/0269_dustox.json | 2 +- .../spawn_pool_world/0300_skitty.json | 2 +- .../spawn_pool_world/0301_delcatty.json | 2 +- .../spawn_pool_world/0316_gulpin.json | 2 +- .../spawn_pool_world/0317_swalot.json | 2 +- .../spawn_pool_world/0335_zangoose.json | 2 +- .../spawn_pool_world/0336_seviper.json | 2 +- .../spawn_pool_world/0351_castform.json | 2 +- .../spawn_pool_world/0385_jirachi.json | 4 +- .../spawn_pool_world/0412_burmy.json | 2 +- .../spawn_pool_world/0413_wormadam.json | 2 +- .../spawn_pool_world/0414_mothim.json | 2 +- .../spawn_pool_world/0420_cherubi.json | 2 +- .../spawn_pool_world/0421_cherrim.json | 2 +- .../spawn_pool_world/0434_stunky.json | 2 +- .../spawn_pool_world/0435_skuntank.json | 2 +- .../spawn_pool_world/0459_snover.json | 2 +- .../spawn_pool_world/0460_abomasnow.json | 2 +- .../spawn_pool_world/0479_rotom.json | 26 ++ .../spawn_pool_world/0492_shaymin.json | 4 +- .../spawn_pool_world/0493_arceus.json | 2 +- .../spawn_pool_world/0494_victini.json | 4 +- .../spawn_pool_world/0531_audino.json | 2 +- .../spawn_pool_world/0535_tympole.json | 2 +- .../spawn_pool_world/0536_palpitoad.json | 2 +- .../spawn_pool_world/0537_seismitoad.json | 2 +- .../spawn_pool_world/0538_throh.json | 2 +- .../cobblemon/spawn_pool_world/0539_sawk.json | 2 +- .../spawn_pool_world/0624_pawniard.json | 2 +- .../spawn_pool_world/0625_bisharp.json | 2 +- .../spawn_pool_world/0629_vullaby.json | 2 +- .../spawn_pool_world/0630_mandibuzz.json | 2 +- .../spawn_pool_world/0638_cobalion.json | 4 +- .../spawn_pool_world/0639_terrakion.json | 4 +- .../spawn_pool_world/0640_virizion.json | 5 +- .../spawn_pool_world/0647_keldeo.json | 4 +- .../spawn_pool_world/0667_litleo.json | 2 +- .../spawn_pool_world/0668_pyroar.json | 2 +- .../spawn_pool_world/0674_pancham.json | 2 +- .../spawn_pool_world/0675_pangoro.json | 2 +- .../spawn_pool_world/0682_spritzee.json | 2 +- .../spawn_pool_world/0683_aromatisse.json | 2 +- .../spawn_pool_world/0684_swirlix.json | 2 +- .../spawn_pool_world/0685_slurpuff.json | 2 +- .../spawn_pool_world/0694_helioptile.json | 2 +- .../spawn_pool_world/0695_heliolisk.json | 2 +- .../spawn_pool_world/0716_xerneas.json | 4 +- .../spawn_pool_world/0717_yveltal.json | 4 +- .../spawn_pool_world/0719_diancie.json | 4 +- .../spawn_pool_world/0721_volcanion.json | 4 +- .../spawn_pool_world/0736_grubbin.json | 2 +- .../spawn_pool_world/0737_charjabug.json | 2 +- .../spawn_pool_world/0738_vikavolt.json | 2 +- .../spawn_pool_world/0741_oricorio.json | 2 +- .../spawn_pool_world/0744_rockruff.json | 2 +- .../spawn_pool_world/0745_lycanroc.json | 2 +- .../spawn_pool_world/0765_oranguru.json | 2 +- .../spawn_pool_world/0766_passimian.json | 2 +- .../spawn_pool_world/0774_minior.json | 2 +- .../spawn_pool_world/0777_togedemaru.json | 2 +- .../spawn_pool_world/0789_cosmog.json | 2 +- .../spawn_pool_world/0793_nihilego.json | 2 +- .../spawn_pool_world/0794_buzzwole.json | 2 +- .../spawn_pool_world/0795_pheromosa.json | 2 +- .../spawn_pool_world/0796_xurkitree.json | 2 +- .../spawn_pool_world/0797_celesteela.json | 2 +- .../spawn_pool_world/0798_kartana.json | 2 +- .../spawn_pool_world/0799_guzzlord.json | 2 +- .../spawn_pool_world/0800_necrozma.json | 2 +- .../spawn_pool_world/0802_marshadow.json | 4 +- .../spawn_pool_world/0805_stakataka.json | 2 +- .../spawn_pool_world/0806_blacephalon.json | 2 +- .../spawn_pool_world/0807_zeraora.json | 4 +- .../spawn_pool_world/0808_meltan.json | 2 +- .../spawn_pool_world/0824_blipbug.json | 2 +- .../spawn_pool_world/0825_dottler.json | 2 +- .../spawn_pool_world/0826_orbeetle.json | 2 +- .../spawn_pool_world/0837_rolycoly.json | 2 +- .../spawn_pool_world/0838_carkol.json | 2 +- .../spawn_pool_world/0839_coalossal.json | 2 +- .../spawn_pool_world/0840_applin.json | 2 +- .../spawn_pool_world/0841_flapple.json | 2 +- .../spawn_pool_world/0842_appletun.json | 2 +- .../spawn_pool_world/0867_runerigus.json | 2 +- .../cobblemon/spawn_pool_world/0872_snom.json | 2 +- .../spawn_pool_world/0873_frosmoth.json | 2 +- .../spawn_pool_world/0876_indeedee.json | 2 +- .../spawn_pool_world/0884_duraludon.json | 2 +- .../spawn_pool_world/0890_eternatus.json | 4 +- .../spawn_pool_world/0893_zarude.json | 4 +- .../spawn_pool_world/0898_calyrex.json | 4 +- .../spawn_pool_world/0919_nymble.json | 2 +- .../spawn_pool_world/0920_lokix.json | 2 +- .../spawn_pool_world/0921_pawmi.json | 2 +- .../spawn_pool_world/0922_pawmo.json | 2 +- .../spawn_pool_world/0923_pawmot.json | 2 +- .../spawn_pool_world/0927_daschsbun.json | 2 +- .../spawn_pool_world/0962_bombirdier.json | 2 +- .../spawn_pool_world/0971_greavard.json | 2 +- .../spawn_pool_world/0972_houndstone.json | 2 +- .../spawn_pool_world/0983_kingambit.json | 2 +- .../spawn_pool_world/0996_frigibax.json | 2 +- .../spawn_pool_world/0997_arctibax.json | 2 +- .../spawn_pool_world/0998_baxcalibur.json | 2 +- .../spawn_pool_world/1001_wochien.json | 4 +- .../spawn_pool_world/1002_chienpao.json | 4 +- .../spawn_pool_world/1003_tinglu.json | 4 +- .../spawn_pool_world/1004_chiyu.json | 4 +- .../spawn_pool_world/1011_dipplin.json | 2 +- .../spawn_pool_world/1014_okidogi.json | 4 +- .../spawn_pool_world/1015_munkidori.json | 4 +- .../spawn_pool_world/1016_fezandipiti.json | 4 +- .../spawn_pool_world/1017_ogerpon.json | 4 +- .../spawn_pool_world/1024_terapagos.json | 2 +- .../spawn_pool_world/1025_pecharunt.json | 4 +- .../species/generation6/aromatisse.json | 1 + .../species/generation6/diancie.json | 1 + .../species/generation6/heliolisk.json | 1 + .../species/generation6/helioptile.json | 1 + .../cobblemon/species/generation6/hoopa.json | 1 + .../cobblemon/species/generation6/litleo.json | 1 + .../species/generation6/pancham.json | 1 + .../species/generation6/pangoro.json | 1 + .../cobblemon/species/generation6/pyroar.json | 1 + .../species/generation6/slurpuff.json | 1 + .../species/generation6/spritzee.json | 1 + .../species/generation6/swirlix.json | 1 + .../species/generation6/volcanion.json | 1 + .../species/generation6/yveltal.json | 1 + .../species/generation9/pecharunt.json | 130 +++++++++ .../species/generation9/terapagos.json | 273 ++++++++++++++++++ 138 files changed, 623 insertions(+), 127 deletions(-) create mode 100644 common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json create mode 100644 common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json create mode 100644 common/src/main/resources/data/cobblemon/species/generation9/terapagos.json diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt index 17fbb93fb..1bd0ed59b 100644 --- a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt +++ b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt @@ -888,7 +888,7 @@ object GenerationsItems: ItemPlatformRegistry() { val DARK_STONE = register("dark_stone", { TaoTrioStoneItem(it.stacksTo(1).durability(100), LegendKeys.ZEKROM) }, LEGENDARY_ITEMS) val DRAGON_STONE = register("dragon_stone", { TaoTrioStoneItem(it.stacksTo(1).durability(100), LegendKeys.KYUREM) }, LEGENDARY_ITEMS) val RAINBOW_WING = register("rainbow_wing", { WingItem(it, "rainbow", ElementalTypes.FLYING, LegendKeys.HO_OH) }, LEGENDARY_ITEMS) - val SILVER_WING = register("silver_wing", { WingItem(it.stacksTo(1), "silver", ElementalTypes.FLYING, LegendKeys.LUGIA) }, LEGENDARY_ITEMS) + val SILVER_WING = register("silver_wing", { WingItem(it, "silver", ElementalTypes.FLYING, LegendKeys.LUGIA) }, LEGENDARY_ITEMS) val DARK_SOUL = register("dark_soul", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) val DRAGON_SOUL = register("dragon_soul", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) val MELODY_FLUTE = register("melody_flute", ::MelodyFluteItem, LEGENDARY_ITEMS) @@ -928,12 +928,12 @@ object GenerationsItems: ItemPlatformRegistry() { val REGIDRAGO_ORB = register("regidrago_orb", { RegiOrbItem(it, "regidrago") }, LEGENDARY_ITEMS) val REGIELEKI_ORB = register("regieleki_orb", { RegiOrbItem(it, "regieleki") }, LEGENDARY_ITEMS) val MAGMA_CRYSTAL = register("magma_crystal", { MagmaCrystal(it.stacksTo(1)) }, LEGENDARY_ITEMS) - val ICY_WING = register("icy_wing", { WingItem(it.stacksTo(1), "icy", ElementalTypes.ICE, LegendKeys.ARTICUNO) }, LEGENDARY_ITEMS) - val ELEGANT_WING = register("elegant_wing", { WingItem(it.stacksTo(1), "elegant", ElementalTypes.PSYCHIC, LegendKeys.GALARIAN_ARTICUNO) }, LEGENDARY_ITEMS) - val STATIC_WING = register("static_wing", { WingItem(it.stacksTo(1), "static", ElementalTypes.ELECTRIC, LegendKeys.ZAPDOS) }, LEGENDARY_ITEMS) - val BELLIGERENT_WING = register("belligerent_wing", { WingItem(it.stacksTo(1), "belligerent", ElementalTypes.FIGHTING, LegendKeys.GALARIAN_ZAPDOS) }, LEGENDARY_ITEMS) - val FIERY_WING = register("fiery_wing", { WingItem(it.stacksTo(1).fireResistant(), "fiery", ElementalTypes.FIRE, LegendKeys.MOLTRES) }, LEGENDARY_ITEMS) - val SINISTER_WING = register("sinister_wing", { WingItem(it.stacksTo(1), "sinister", ElementalTypes.DARK, LegendKeys.GALARIAN_MOLTRES) }, LEGENDARY_ITEMS) + val ICY_WING = register("icy_wing", { WingItem(it, "icy", ElementalTypes.ICE, LegendKeys.ARTICUNO) }, LEGENDARY_ITEMS) + val ELEGANT_WING = register("elegant_wing", { WingItem(it, "elegant", ElementalTypes.PSYCHIC, LegendKeys.GALARIAN_ARTICUNO) }, LEGENDARY_ITEMS) + val STATIC_WING = register("static_wing", { WingItem(it, "static", ElementalTypes.ELECTRIC, LegendKeys.ZAPDOS) }, LEGENDARY_ITEMS) + val BELLIGERENT_WING = register("belligerent_wing", { WingItem(it, "belligerent", ElementalTypes.FIGHTING, LegendKeys.GALARIAN_ZAPDOS) }, LEGENDARY_ITEMS) + val FIERY_WING = register("fiery_wing", { WingItem(it.fireResistant(), "fiery", ElementalTypes.FIRE, LegendKeys.MOLTRES) }, LEGENDARY_ITEMS) + val SINISTER_WING = register("sinister_wing", { WingItem(it, "sinister", ElementalTypes.DARK, LegendKeys.GALARIAN_MOLTRES) }, LEGENDARY_ITEMS) val MEW_DNA_FIBER = register("mew_dna_fiber", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) val MEW_FOSSIL = register("mew_fossil", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) val LIGHT_SOUL = register("light_soul", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS) diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0132_ditto.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0132_ditto.json index 9916011ce..fcc8fd04b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0132_ditto.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0132_ditto.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "4-29", "weight": 6.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0151_mew.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0151_mew.json index 28184275b..cf56953fd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0151_mew.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0151_mew.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_jungle" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0265_wurmple.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0265_wurmple.json index ba903bc8d..427f8745f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0265_wurmple.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0265_wurmple.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "5-24", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0266_silcoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0266_silcoon.json index 1dd96b891..3b648d27e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0266_silcoon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0266_silcoon.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "4-16", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0267_beautifly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0267_beautifly.json index 5205a660f..285b6e835 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0267_beautifly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0267_beautifly.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "10-44", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0268_cascoon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0268_cascoon.json index af6dce7fc..5be246b65 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0268_cascoon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0268_cascoon.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "4-16", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0269_dustox.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0269_dustox.json index 84033ee05..71e3e324c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0269_dustox.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0269_dustox.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "10-44", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0300_skitty.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0300_skitty.json index 0ba59c9dc..1de36e4b0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0300_skitty.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0300_skitty.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-29", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0301_delcatty.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0301_delcatty.json index 4ea4a422d..7f7fb0789 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0301_delcatty.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0301_delcatty.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "16-55", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0316_gulpin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0316_gulpin.json index b8ac605ad..0925ec7a9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0316_gulpin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0316_gulpin.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-28", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0317_swalot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0317_swalot.json index 9d7b98dfe..9115ba28d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0317_swalot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0317_swalot.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "26-55", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0335_zangoose.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0335_zangoose.json index ce3c32097..c1f1328c9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0335_zangoose.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0335_zangoose.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-55", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0336_seviper.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0336_seviper.json index 56661ede9..db2202ea8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0336_seviper.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0336_seviper.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-55", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0351_castform.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0351_castform.json index 7c90f12ac..692ea8676 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0351_castform.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0351_castform.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "4-55", "weight": 5.94, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0385_jirachi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0385_jirachi.json index 64904e202..95dcbf8cf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0385_jirachi.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0385_jirachi.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_highlands" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0412_burmy.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0412_burmy.json index 12b84e91c..607062e20 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0412_burmy.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0412_burmy.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "5-25", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0413_wormadam.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0413_wormadam.json index 44d519d79..7d5f72798 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0413_wormadam.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0413_wormadam.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "20-50", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0414_mothim.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0414_mothim.json index ba03e35d5..61689fbcc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0414_mothim.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0414_mothim.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "20-50", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0420_cherubi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0420_cherubi.json index 1e2a420f1..1835c49f9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0420_cherubi.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0420_cherubi.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0421_cherrim.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0421_cherrim.json index 8b0836508..01fa0c8af 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0421_cherrim.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0421_cherrim.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-50", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0434_stunky.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0434_stunky.json index cd0cea020..8c20cebf5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0434_stunky.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0434_stunky.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-24", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0435_skuntank.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0435_skuntank.json index 00b7a7a60..9ddade9e1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0435_skuntank.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0435_skuntank.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "34-50", "weight": 5.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0459_snover.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0459_snover.json index d52a32072..9ce00190b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0459_snover.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0459_snover.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "4-40", "weight": 5.94, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0460_abomasnow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0460_abomasnow.json index 060c24300..b5afbccf4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0460_abomasnow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0460_abomasnow.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "40-60", "weight": 5.94, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json new file mode 100644 index 000000000..d43bcfdca --- /dev/null +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0479_rotom.json @@ -0,0 +1,26 @@ +{ + "enabled": true, + "neededInstalledMods": [], + "neededUninstalledMods": [], + "spawns": [ + { + "id": "rotom-1", + "pokemon": "rotom", + "presets": [ + "natural" + ], + "type": "pokemon", + "spawnablePositionType": "grounded", + "bucket": "ultra-rare", + "level": "12-60", + "weight": 9.0, + "condition": { + "canSeeSky": true, + "biomes": [ + "#cobblemon:is_temperate" + ], + "timeRange": "night" + } + } + ] +} diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0492_shaymin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0492_shaymin.json index 75c67a598..f7bd95488 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0492_shaymin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0492_shaymin.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_forest" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json index 3a6d7e913..343f23141 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0493_arceus.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0494_victini.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0494_victini.json index 61905b91a..4c81dc29d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0494_victini.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0494_victini.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "canSeeSky": true, "biomes": [ "#cobblemon:is_temperate" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0531_audino.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0531_audino.json index a6baff220..934b0ce6e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0531_audino.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0531_audino.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0535_tympole.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0535_tympole.json index 53deddb46..bc38472e6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0535_tympole.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0535_tympole.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "6-22", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0536_palpitoad.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0536_palpitoad.json index eb5a3b187..d4ed1dcd0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0536_palpitoad.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0536_palpitoad.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "25-40", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0537_seismitoad.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0537_seismitoad.json index 75d6b9b80..240b2981c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0537_seismitoad.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0537_seismitoad.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "36-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0538_throh.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0538_throh.json index f1328b1c9..eaff411e8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0538_throh.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0538_throh.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0539_sawk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0539_sawk.json index 3958488ae..e1201f1d3 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0539_sawk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0539_sawk.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0624_pawniard.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0624_pawniard.json index f9061e07b..0b0f0b68f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0624_pawniard.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0624_pawniard.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0625_bisharp.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0625_bisharp.json index ed4a268c1..ad138474f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0625_bisharp.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0625_bisharp.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "52-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0629_vullaby.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0629_vullaby.json index 32d9b1a1c..e43d54c41 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0629_vullaby.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0629_vullaby.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "6-54", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0630_mandibuzz.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0630_mandibuzz.json index dcf9aa675..59809df7b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0630_mandibuzz.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0630_mandibuzz.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "54-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0638_cobalion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0638_cobalion.json index 1c97bb4af..951c7cb22 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0638_cobalion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0638_cobalion.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_mountain" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0639_terrakion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0639_terrakion.json index 16c066ec2..3d831ddc8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0639_terrakion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0639_terrakion.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_badlands" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0640_virizion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0640_virizion.json index 38840a6c2..28d4173f6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0640_virizion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0640_virizion.json @@ -10,11 +10,14 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, + "timeRange": "day", "biomes": [ "#cobblemon:is_plains" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0647_keldeo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0647_keldeo.json index 5eaccc84f..c23191562 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0647_keldeo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0647_keldeo.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_river" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0667_litleo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0667_litleo.json index 2b2e9b7d3..65197f344 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0667_litleo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0667_litleo.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-40", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0668_pyroar.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0668_pyroar.json index 78eb6eb69..076efa9f4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0668_pyroar.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0668_pyroar.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "35-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0674_pancham.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0674_pancham.json index 35ff50396..adcb1539b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0674_pancham.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0674_pancham.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "8-40", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0675_pangoro.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0675_pangoro.json index de03335c1..43d2bfb20 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0675_pangoro.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0675_pangoro.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "32-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0682_spritzee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0682_spritzee.json index 777d172a4..9d0b15321 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0682_spritzee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0682_spritzee.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0683_aromatisse.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0683_aromatisse.json index b33fad60e..9d496885a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0683_aromatisse.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0683_aromatisse.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "18-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0684_swirlix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0684_swirlix.json index a367f2949..8caca3efe 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0684_swirlix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0684_swirlix.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0685_slurpuff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0685_slurpuff.json index 2a8f3b479..6d83c95dc 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0685_slurpuff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0685_slurpuff.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "18-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0694_helioptile.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0694_helioptile.json index 9a44c7a06..2dc7cd96b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0694_helioptile.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0694_helioptile.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "6-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0695_heliolisk.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0695_heliolisk.json index 18af2e55b..ed4811c99 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0695_heliolisk.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0695_heliolisk.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "24-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0716_xerneas.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0716_xerneas.json index 1be54b49a..5b77946eb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0716_xerneas.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0716_xerneas.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "day", "biomes": [ "#cobblemon:is_taiga" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0717_yveltal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0717_yveltal.json index f86d070d3..f2c0b6337 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0717_yveltal.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0717_yveltal.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_taiga" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0719_diancie.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0719_diancie.json index 6f6c0ed49..4ff79f77f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0719_diancie.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0719_diancie.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_mountain" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0721_volcanion.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0721_volcanion.json index ed65ee966..b1b7214ed 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0721_volcanion.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0721_volcanion.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_peak" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0736_grubbin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0736_grubbin.json index 98dd6c746..980437f02 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0736_grubbin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0736_grubbin.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "4-24", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0737_charjabug.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0737_charjabug.json index 31b41f9dc..2151e78bf 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0737_charjabug.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0737_charjabug.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "20-44", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0738_vikavolt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0738_vikavolt.json index a5a2b8596..242ddc445 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0738_vikavolt.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0738_vikavolt.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0741_oricorio.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0741_oricorio.json index 9bf756094..1945e4f56 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0741_oricorio.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0741_oricorio.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0744_rockruff.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0744_rockruff.json index bf2ce0abb..c2ff7c535 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0744_rockruff.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0744_rockruff.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-25", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0745_lycanroc.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0745_lycanroc.json index 92a01837a..7cff95328 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0745_lycanroc.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0745_lycanroc.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0765_oranguru.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0765_oranguru.json index 765cb7c4f..559c121e0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0765_oranguru.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0765_oranguru.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0766_passimian.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0766_passimian.json index 49335e1cd..ae48c1e0e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0766_passimian.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0766_passimian.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "12-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0774_minior.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0774_minior.json index 283b45a68..d8abfcd8c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0774_minior.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0774_minior.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "10-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0777_togedemaru.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0777_togedemaru.json index b93d5c680..189b1b26d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0777_togedemaru.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0777_togedemaru.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "10-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json index 1e06d9856..962963362 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0789_cosmog.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json index b7d4c28b5..259cb37a9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0793_nihilego.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json index 88dbb4fd6..eebac622e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0794_buzzwole.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json index e72ff8220..8b942f04e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0795_pheromosa.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json index 89699d39f..ae48c81f6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0796_xurkitree.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json index 346df5f20..8c2ee5e5b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0797_celesteela.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json index 099663ac2..677296852 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0798_kartana.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json index 8fc1c0666..df624105d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0799_guzzlord.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json index bc1ce5f45..4027a959e 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0800_necrozma.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0802_marshadow.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0802_marshadow.json index 10b68baca..71a71cb5b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0802_marshadow.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0802_marshadow.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_spooky" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json index a7288d97c..7ff0f1809 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0805_stakataka.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json index dac8485ca..27d96ac71 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0806_blacephalon.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0807_zeraora.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0807_zeraora.json index 4dc005056..9e73138eb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0807_zeraora.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0807_zeraora.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_plateau" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0808_meltan.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0808_meltan.json index 2a1362adc..5863a4a61 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0808_meltan.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0808_meltan.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.001, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0824_blipbug.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0824_blipbug.json index 6b8a26232..94e652581 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0824_blipbug.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0824_blipbug.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "4-27", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0825_dottler.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0825_dottler.json index 594cc985c..f50bbbfff 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0825_dottler.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0825_dottler.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "10-38", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0826_orbeetle.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0826_orbeetle.json index 28e64432d..5bbac99a0 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0826_orbeetle.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0826_orbeetle.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0837_rolycoly.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0837_rolycoly.json index a4800c7cb..4cf056d9b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0837_rolycoly.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0837_rolycoly.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "5-25", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0838_carkol.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0838_carkol.json index 69f2232d0..5cc5a0cd8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0838_carkol.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0838_carkol.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "18-44", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0839_coalossal.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0839_coalossal.json index df2664ada..aa4bb8f6f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0839_coalossal.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0839_coalossal.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "34-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0840_applin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0840_applin.json index b4a70ffeb..bf6513c2d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0840_applin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0840_applin.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0841_flapple.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0841_flapple.json index 00d28ac2b..271b89175 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0841_flapple.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0841_flapple.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0842_appletun.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0842_appletun.json index c5d59ad7b..6e5ca5402 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0842_appletun.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0842_appletun.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0867_runerigus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0867_runerigus.json index 0c3ed08ac..e07eb5164 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0867_runerigus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0867_runerigus.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "34-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0872_snom.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0872_snom.json index bf0f7a4fd..916e19d83 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0872_snom.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0872_snom.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "5-20", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0873_frosmoth.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0873_frosmoth.json index 9dd76af81..b15b2e299 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0873_frosmoth.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0873_frosmoth.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "5-20", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0876_indeedee.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0876_indeedee.json index 5e881330b..551009de5 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0876_indeedee.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0876_indeedee.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0884_duraludon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0884_duraludon.json index dd9700b20..810144c2f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0884_duraludon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0884_duraludon.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0890_eternatus.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0890_eternatus.json index 9525bac07..6a6f53f7b 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0890_eternatus.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0890_eternatus.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_spooky" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0893_zarude.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0893_zarude.json index 6f0039ae8..59458c379 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0893_zarude.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0893_zarude.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_jungle" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0898_calyrex.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0898_calyrex.json index 01eab8de3..5f9ddd6f9 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0898_calyrex.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0898_calyrex.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "50-60", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_taiga" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0919_nymble.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0919_nymble.json index 97128c73a..3bc1fe464 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0919_nymble.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0919_nymble.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "15-30", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0920_lokix.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0920_lokix.json index dfb389909..58d9b4e70 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0920_lokix.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0920_lokix.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "24-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0921_pawmi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0921_pawmi.json index 6b2ec6b6f..7be7fb224 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0921_pawmi.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0921_pawmi.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "common", "level": "6-20", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0922_pawmo.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0922_pawmo.json index 7703d4e75..f0931999f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0922_pawmo.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0922_pawmo.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "18-40", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0923_pawmot.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0923_pawmot.json index 2cb0bcdea..dfd78d4e7 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0923_pawmot.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0923_pawmot.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "25-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_daschsbun.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_daschsbun.json index 7edd53b18..414b09ce6 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_daschsbun.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0927_daschsbun.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "26-60", "weight": 4.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0962_bombirdier.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0962_bombirdier.json index 749af63f4..dfd05be85 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0962_bombirdier.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0962_bombirdier.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-55", "weight": 2.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0971_greavard.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0971_greavard.json index 22516c75b..c693537c8 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0971_greavard.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0971_greavard.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "uncommon", "level": "10-40", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0972_houndstone.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0972_houndstone.json index 97a15a473..285d85454 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0972_houndstone.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0972_houndstone.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0983_kingambit.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0983_kingambit.json index aa3eb8339..8aa32fd89 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0983_kingambit.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0983_kingambit.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "52-60", "weight": 1.8, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0996_frigibax.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0996_frigibax.json index 4cc4d8c0e..7f1a89a98 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0996_frigibax.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0996_frigibax.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "15-30", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0997_arctibax.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0997_arctibax.json index a12f3d5f6..ae7d68e6f 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0997_arctibax.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0997_arctibax.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "30-42", "weight": 0.9, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0998_baxcalibur.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0998_baxcalibur.json index da82c2a21..efe5a8b78 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/0998_baxcalibur.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/0998_baxcalibur.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "55-60", "weight": 0.1, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1001_wochien.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1001_wochien.json index e5b21ad91..a6a82f552 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1001_wochien.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1001_wochien.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_badlands" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1002_chienpao.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1002_chienpao.json index d022d783d..85ec07977 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1002_chienpao.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1002_chienpao.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_glacial" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1003_tinglu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1003_tinglu.json index 8b57d6ed8..5cc7cea2c 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1003_tinglu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1003_tinglu.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_forest" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1004_chiyu.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1004_chiyu.json index 226aa303c..69afcdd6a 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1004_chiyu.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1004_chiyu.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_volcanic" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1011_dipplin.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1011_dipplin.json index ffca082bb..a8dd9d7aa 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1011_dipplin.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1011_dipplin.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "rare", "level": "20-60", "weight": 9.0, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1014_okidogi.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1014_okidogi.json index 9584f97f3..85ed44b4d 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1014_okidogi.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1014_okidogi.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_jungle" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1015_munkidori.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1015_munkidori.json index 74bfbdb3e..b9b77ffc4 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1015_munkidori.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1015_munkidori.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "night", "biomes": [ "#cobblemon:is_jungle" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1016_fezandipiti.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1016_fezandipiti.json index 63505da11..2340e6128 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1016_fezandipiti.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1016_fezandipiti.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_swamp" ] diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1017_ogerpon.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1017_ogerpon.json index c289293cd..2061b44f1 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1017_ogerpon.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1017_ogerpon.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "timeRange": "day", "biomes": [ "#cobblemon:is_jungle" diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json index 051067657..ef1ef90eb 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1024_terapagos.json @@ -10,7 +10,7 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 0.08, diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/1025_pecharunt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/1025_pecharunt.json index 44450f0fe..dbf9951dd 100644 --- a/common/src/main/resources/data/cobblemon/spawn_pool_world/1025_pecharunt.json +++ b/common/src/main/resources/data/cobblemon/spawn_pool_world/1025_pecharunt.json @@ -10,11 +10,13 @@ "natural" ], "type": "pokemon", - "context": "grounded", + "spawnablePositionType": "grounded", "bucket": "ultra-rare", "level": "70-75", "weight": 2.0, "condition": { + "minSkyLight": 8, + "maxSkyLight": 15, "biomes": [ "#cobblemon:is_swamp" ] 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 99204a94e..27133bb4d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/aromatisse.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 683, "name": "Aromatisse", "primaryType": "fairy", 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 ca6279e1c..ddb33e1d7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/diancie.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/diancie.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 719, "name": "Diancie", "primaryType": "rock", 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 ee0f94a5f..497659d3d 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/heliolisk.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 695, "name": "Heliolisk", "primaryType": "electric", 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 ebec08b50..294a71abd 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/helioptile.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 694, "name": "Helioptile", "primaryType": "electric", 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 648b56108..7c29e45af 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/hoopa.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 720, "name": "Hoopa", "primaryType": "psychic", 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 179dc9778..d018a7276 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/litleo.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/litleo.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 667, "name": "Litleo", "primaryType": "fire", 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 4bc51c2d1..264642691 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pancham.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pancham.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 674, "name": "Pancham", "primaryType": "fighting", 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 1039d22a2..741758fbe 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pangoro.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 675, "name": "Pangoro", "primaryType": "fighting", 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 c36120a4c..029607fa0 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/pyroar.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 668, "name": "Pyroar", "primaryType": "fire", 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 b0ab72be4..13a85aa24 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/slurpuff.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 685, "name": "Slurpuff", "primaryType": "fairy", 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 2d8e3fed7..06f3647ea 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/spritzee.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 682, "name": "Spritzee", "primaryType": "fairy", 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 f5605208a..baaaba691 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/swirlix.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 684, "name": "Swirlix", "primaryType": "fairy", 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 f1b1345e0..8bc49a9ae 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/volcanion.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 721, "name": "Volcanion", "primaryType": "fire", 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 8e223da2c..83d88c81c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json +++ b/common/src/main/resources/data/cobblemon/species/generation6/yveltal.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 717, "name": "Yveltal", "primaryType": "dark", diff --git a/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json new file mode 100644 index 000000000..5135d6d78 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/pecharunt.json @@ -0,0 +1,130 @@ +{ + "implemented": true, + "nationalPokedexNumber": 1025, + "name": "Pecharunt", + "primaryType": "poison", + "secondaryType": "ghost", + "maleRatio": -1, + "height": 3, + "weight": 3, + "pokedex": [ + "cobblemon.species.pecharunt.desc" + ], + "labels": [ + "gen9", + "mythical" + ], + "aspects": [], + "abilities": [ + "poisonpuppeteer", + "h:poisonpuppeteer" + ], + "eggGroups": [ + "undiscovered" + ], + "baseStats": { + "hp": 88, + "attack": 88, + "defence": 160, + "special_attack": 88, + "special_defence": 88, + "speed": 88 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 3, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 300, + "experienceGroup": "slow", + "catchRate": 3, + "eggCycles": 20, + "baseFriendship": 0, + "moves": [ + "1:smog", + "1:poisongas", + "1:memento", + "1:astonish", + "1:defensecurl", + "1:rollout", + "1:meanlook", + "8:withdraw", + "16:destinybond", + "24:faketears", + "32:partingshot", + "40:shadowball", + "48:malignantchain", + "56:toxic", + "64:nastyplot", + "72:recover", + "tm:acidspray", + "tm:curse", + "tm:endure", + "tm:faketears", + "tm:foulplay", + "tm:gunkshot", + "tm:hex", + "tm:imprison", + "tm:nastyplot", + "tm:nightshade", + "tm:phantomforce", + "tm:poltergeist", + "tm:protect", + "tm:rest", + "tm:rollout", + "tm:shadowball", + "tm:sleeptalk", + "tm:sludgebomb", + "tm:sludgewave", + "tm:spite", + "tm:substitute", + "tm:terablast", + "tm:toxic", + "tm:venoshock", + "tutor:foulplay", + "tutor:gunkshot", + "tutor:poltergeist", + "tutor:rest", + "tutor:rollout", + "tutor:shadowball", + "tutor:sleeptalk", + "tutor:sludgebomb", + "tutor:spite" + ], + "evolutions": [], + "behaviour": { + "herd": { + "maxSize": "2", + "toleratedLeaders": [ + { + "pokemon": "pecharunt", + "tier": 1 + } + ] + }, + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + }, + "walk": { + "canWalk": false + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json new file mode 100644 index 000000000..3f8e943ce --- /dev/null +++ b/common/src/main/resources/data/cobblemon/species/generation9/terapagos.json @@ -0,0 +1,273 @@ +{ + "implemented": true, + "nationalPokedexNumber": 1024, + "name": "Terapagos", + "primaryType": "normal", + "maleRatio": 0.5, + "height": 2, + "weight": 65, + "pokedex": [ + "cobblemon.species.terapagos.desc" + ], + "labels": [ + "gen9", + "legendary", + "restricted" + ], + "aspects": [ + "normal-form" + ], + "abilities": [ + "terashift", + "h:terashift" + ], + "eggGroups": [ + "undiscovered" + ], + "baseStats": { + "hp": 90, + "attack": 65, + "defence": 85, + "special_attack": 65, + "special_defence": 85, + "speed": 60 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 1, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 90, + "experienceGroup": "slow", + "catchRate": 255, + "eggCycles": 5, + "baseFriendship": 50, + "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: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:thunder", + "tm:thunderbolt", + "tm:toxic", + "tm:triattack", + "tm:waterpulse", + "tm:weatherball", + "tm:wildcharge", + "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": [ + { + "name": "Terastal", + "primaryType": "normal", + "maleRatio": 0.5, + "height": 3, + "weight": 160, + "pokedex": [ + "cobblemon.species.terapagos-terastal.desc" + ], + "labels": [ + "gen9", + "legendary", + "restricted" + ], + "aspects": [ + "terastal-form" + ], + "abilities": [ + "terashell", + "h:terashell" + ], + "baseStats": { + "hp": 95, + "attack": 95, + "defence": 110, + "special_attack": 105, + "special_defence": 110, + "speed": 85 + }, + "evYield": { + "hp": 0, + "attack": 0, + "defence": 2, + "special_attack": 0, + "special_defence": 2, + "speed": 0 + }, + "baseExperienceYield": 120, + "evolutions": [], + "battleOnly": true, + "behaviour": { + "moving": { + "swim": { + "avoidsWater": true + }, + "fly": { + "canFly": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + }, + "resting": { + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + } + }, + "lightingData": { + "lightLevel": 10, + "liquidGlowMode": "BOTH" + } + }, + { + "name": "Stellar", + "primaryType": "normal", + "maleRatio": 0.5, + "height": 17, + "weight": 770, + "pokedex": [ + "cobblemon.species.terapagos-stellar.desc" + ], + "labels": [ + "gen9", + "legendary", + "restricted" + ], + "aspects": [ + "stellar-form" + ], + "abilities": [ + "teraformzero", + "h:teraformzero" + ], + "baseStats": { + "hp": 160, + "attack": 105, + "defence": 110, + "special_attack": 130, + "special_defence": 110, + "speed": 85 + }, + "evYield": { + "hp": 3, + "attack": 0, + "defence": 0, + "special_attack": 0, + "special_defence": 0, + "speed": 0 + }, + "baseExperienceYield": 140, + "dynamaxBlocked": true, + "evolutions": [], + "battleOnly": true + } + ], + "behaviour": { + "resting": { + "willSleepOnBed": true, + "drowsyChance": 0.0333, + "rouseChance": 0.0042 + }, + "moving": { + "swim": { + "avoidsWater": true + } + }, + "combat": { + "willDefendSelf": true, + "willDefendOwner": true, + "willFlee": false + } + }, + "lightingData": { + "lightLevel": 7, + "liquidGlowMode": "BOTH" + } +} \ No newline at end of file From 067b6c3193979eec0664084ed373f1e914c8a530 Mon Sep 17 00:00:00 2001 From: soupbag Date: Thu, 29 Jan 2026 00:19:56 -0800 Subject: [PATCH 5/5] Added S icon to PC, removed Ruby Rod recipe --- CHANGELOG.md | 23 +++++++++++ .../advancement/recipes/misc/ruby_rod.json | 32 --------------- .../generations_core/recipe/ruby_rod.json | 24 ----------- .../common/client/screen/SpecialAspectIcon.kt | 38 ++++++++++++++++++ .../common/mixin/client/PcGuiMixin.java | 10 +++++ .../textures/gui/special_aspect_icon.png | Bin 0 -> 457 bytes gradle.properties | 4 +- .../generators/recipe/ItemRecipeDatagen.kt | 18 ++++----- 8 files changed, 82 insertions(+), 67 deletions(-) delete mode 100644 common/src/main/generated/resources/data/generations_core/advancement/recipes/misc/ruby_rod.json delete mode 100644 common/src/main/generated/resources/data/generations_core/recipe/ruby_rod.json create mode 100644 common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/SpecialAspectIcon.kt create mode 100644 common/src/main/resources/assets/generations_core/textures/gui/special_aspect_icon.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 28280e7af..3b52b4972 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +# 1.2.2 + +Additions +- Added Cobblemon 1.7.2 compatibility! +- Added an S icon to PC for Galaxy, Pastel, Shadow, Sketch, and Vintage Pokemon + +Changes +- Removed Ruby Rod recipe, Lake Guardian Crystals can be obtained from Cobblemon's fishing treasure loot table +- Changed Legendary Pokemon Wing items to stack at 64 +- Shifted most Legendaries to only spawn above ground + +Bug Fixes +- Fixed Galarian Articuno/Moltres/Zapdos summoning as Kantoian +- Fixed Mythicals not having 3 guaranteed 31 IVs +- Fixed Arceus/Silvally types not changing +- Fixed Terapagos abilities +- Fixed external transformations on shift right click, eg. mega +- Fixed Legendary item charging overflowing into all in inventory +- Fixed Rotom spawns +- Fixed some Pokemon not appearing as implemented for Pokedex completion +- Fixed Pokemon spawn context to spawnablePositionType + + # 1.2.1 Bug Fixes diff --git a/common/src/main/generated/resources/data/generations_core/advancement/recipes/misc/ruby_rod.json b/common/src/main/generated/resources/data/generations_core/advancement/recipes/misc/ruby_rod.json deleted file mode 100644 index 1854cbadb..000000000 --- a/common/src/main/generated/resources/data/generations_core/advancement/recipes/misc/ruby_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_string": { - "conditions": { - "items": [ - { - "items": "minecraft:string" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "generations_core:ruby_rod" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_string" - ] - ], - "rewards": { - "recipes": [ - "generations_core:ruby_rod" - ] - } -} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/generations_core/recipe/ruby_rod.json b/common/src/main/generated/resources/data/generations_core/recipe/ruby_rod.json deleted file mode 100644 index 6ddf8751c..000000000 --- a/common/src/main/generated/resources/data/generations_core/recipe/ruby_rod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "O": { - "item": "generations_core:orb" - }, - "R": { - "item": "generations_core:ruby" - }, - "S": { - "item": "minecraft:string" - } - }, - "pattern": [ - " R", - " RS", - "R O" - ], - "result": { - "count": 1, - "id": "generations_core:ruby_rod" - } -} \ No newline at end of file diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/SpecialAspectIcon.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/SpecialAspectIcon.kt new file mode 100644 index 000000000..c5156412a --- /dev/null +++ b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/SpecialAspectIcon.kt @@ -0,0 +1,38 @@ +package generations.gg.generations.core.generationscore.common.client.screen + +import com.cobblemon.mod.common.api.gui.blitk +import generations.gg.generations.core.generationscore.common.GenerationsCore +import net.minecraft.client.gui.GuiGraphics + +class SpecialAspectIcon( + val x: Number, + val y: Number, + val centeredX: Boolean = false, + val small: Boolean = false, + val opacity: Float = 1F +) { + companion object { + private const val ICON_DIAMETER = 16 + private const val SCALE = 1F + private val iconResource = GenerationsCore.id("textures/gui/special_aspect_icon.png") + } + + fun render(context: GuiGraphics) { + val diameter = if (small) (ICON_DIAMETER / 2) else ICON_DIAMETER + val offsetX = if (centeredX) (((diameter / 2) * SCALE)) else 0F + + blitk( + matrixStack = context.pose(), + texture = iconResource, + x = (x.toFloat() - offsetX) / SCALE, + y = y.toFloat() / SCALE, + height = diameter, + width = diameter, + uOffset = 0F, + textureWidth = diameter, + textureHeight = diameter, + alpha = opacity, + scale = SCALE + ) + } +} \ No newline at end of file diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PcGuiMixin.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PcGuiMixin.java index 73f1cc1e0..ec4345ced 100644 --- a/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PcGuiMixin.java +++ b/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PcGuiMixin.java @@ -19,6 +19,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import generations.gg.generations.core.generationscore.common.client.screen.SpecialAspectIcon; +import java.util.Set; @Mixin(PCGUI.class) public abstract class PcGuiMixin extends Screen { @@ -39,6 +41,14 @@ public void renderThings(GuiGraphics context, int mouseX, int mouseY, float delt var y = (height - BASE_HEIGHT) / 2; new TeraTypeIcon(x + 6 + 1, y + 27 + 66 - 9 - 1, previewPokemon.getTeraType(), false, true, 1f).render(context); + if (generations$hasSpecialAspect(previewPokemon)) { + new SpecialAspectIcon(x + 62, y + 83, false, true, 1f).render(context); + } } } + @Unique + private boolean generations$hasSpecialAspect(Pokemon pokemon) { + Set pokemonAspectsString = pokemon.getAspects(); + return pokemonAspectsString.contains("vintage") || pokemonAspectsString.contains("pastel") || pokemonAspectsString.contains("galaxy") || pokemonAspectsString.contains("sketch") || pokemonAspectsString.contains("shadow"); + } } \ No newline at end of file diff --git a/common/src/main/resources/assets/generations_core/textures/gui/special_aspect_icon.png b/common/src/main/resources/assets/generations_core/textures/gui/special_aspect_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..69b7e189c50c7ccd862071bf1bbe8e18afec82fb GIT binary patch literal 457 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|s0G|-oREAB44B=G_*MS1(&Yg2ojQRinKag#=*7X69;wTC73kHgS0K>iJ zy^%mM&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%=xATcwqM9AC&ooa@Ed~xChm}E!k(GfF$npYWX($`y3k^nQus9QtZOF(3_Ei*+o!QO; z7S95*K_CH$LHc1dnxzcDaG1c(zyefZU}S8-xBy}*NC)czh)Gj`Y!F}qn!^NE8Dwbz zWI=Tq8W@0Nea;{7Q0>3I0LXOkba4#P2(CSUnvX$%$K|3?&;S3)nSxgy>-igXPkb~< zIK^90$Ca7EllfCa%QfkoO^wIoFED#(m7Oqd-ce@#e3j@27P;xNkN<$o^>p=fS?83{ F1OUTNX#)TN literal 0 HcmV?d00001 diff --git a/gradle.properties b/gradle.properties index df90fa4b3..4688cdf7c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.daemon=true minecraft_version=1.21.1 archives_base_name=Generations-Core -mod_version=1.2.1-1.7.1 +mod_version=1.2.2-1.7.2 maven_group=generations.gg.generations.core description=Core mod for Generations. Required for all other Generations mods. Contains Blocks, Items, Entities, and other things that are used by all other Generations mods. @@ -11,7 +11,7 @@ description=Core mod for Generations. Required for all other Generations mods. C architectury_version=13.0.8 botarium_version=2.3.4 devauth_version=1.2.1 -cobblemon_version=1.7.1+1.21.1 +cobblemon_version=1.7.2+1.21.1 fabric_loader_version=0.17.2 fabric_api_version=0.116.6 diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/ItemRecipeDatagen.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/ItemRecipeDatagen.kt index 4cbe9b64f..d2424a0bd 100644 --- a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/ItemRecipeDatagen.kt +++ b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/ItemRecipeDatagen.kt @@ -179,15 +179,15 @@ class ItemRecipeDatagen(arg: PackOutput, registries: CompletableFuture